Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: app-crypt/pinentry/files/, app-crypt/pinentry/
Date: Sat, 31 Oct 2015 17:18:22
Message-Id: 1446311023.1b1e664cf555b7531f6aef354aafd94fb1847d2e.pesa@gentoo
1 commit: 1b1e664cf555b7531f6aef354aafd94fb1847d2e
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 31 17:03:43 2015 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 31 17:03:43 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1b1e664c
7
8 app-crypt/pinentry: drop live ebuild
9
10 It doesn't belong here, and is poorly maintained by us. A different herd
11 (crypto) maintains the in-tree versions. As a result the live ebuild is
12 significantly outdated and not useful.
13
14 Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
15
16 .../pinentry/files/pinentry-0.8.2-ncurses.patch | 25 ------
17 app-crypt/pinentry/metadata.xml | 8 --
18 app-crypt/pinentry/pinentry-9999.ebuild | 98 ----------------------
19 3 files changed, 131 deletions(-)
20
21 diff --git a/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch b/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch
22 deleted file mode 100644
23 index 3bb92c6..0000000
24 --- a/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch
25 +++ /dev/null
26 @@ -1,25 +0,0 @@
27 -From bafe8608fc525ef103b3d1f3048ca28958bef596 Mon Sep 17 00:00:00 2001
28 -From: Alon Bar-Lev <alon.barlev@×××××.com>
29 -Date: Sun, 5 May 2013 02:23:08 +0300
30 -Subject: [PATCH] ncurses: link with optional tinfo
31 -
32 ----
33 - m4/curses.m4 | 2 ++
34 - 1 file changed, 2 insertions(+)
35 -
36 -diff --git a/m4/curses.m4 b/m4/curses.m4
37 -index 3a01881..ffb6bd1 100644
38 ---- a/m4/curses.m4
39 -+++ b/m4/curses.m4
40 -@@ -36,6 +36,8 @@ AC_DEFUN([IU_LIB_NCURSES], [
41 - have_ncursesw=no
42 - fi
43 - if test "$LIBNCURSES"; then
44 -+ AC_CHECK_LIB(tinfow, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfow",
45 -+ AC_CHECK_LIB(tinfo, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfo"))
46 - # Use ncurses header files instead of the ordinary ones, if possible;
47 - # is there a better way of doing this, that avoids looking in specific
48 - # directories?
49 ---
50 -1.8.1.5
51 -
52
53 diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml
54 deleted file mode 100644
55 index 3c50ec9..0000000
56 --- a/app-crypt/pinentry/metadata.xml
57 +++ /dev/null
58 @@ -1,8 +0,0 @@
59 -<?xml version="1.0" encoding="UTF-8"?>
60 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
61 -<pkgmetadata>
62 -<herd>crypto</herd>
63 -<use>
64 - <flag name='clipboard'>Enable clipboard integration</flag>
65 -</use>
66 -</pkgmetadata>
67
68 diff --git a/app-crypt/pinentry/pinentry-9999.ebuild b/app-crypt/pinentry/pinentry-9999.ebuild
69 deleted file mode 100644
70 index bb8830c..0000000
71 --- a/app-crypt/pinentry/pinentry-9999.ebuild
72 +++ /dev/null
73 @@ -1,98 +0,0 @@
74 -# Copyright 1999-2015 Gentoo Foundation
75 -# Distributed under the terms of the GNU General Public License v2
76 -# $Id$
77 -
78 -EAPI=5
79 -
80 -inherit qmake-utils autotools multilib eutils flag-o-matic git-r3 toolchain-funcs
81 -
82 -DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
83 -HOMEPAGE="http://gnupg.org/aegypten2/index.html"
84 -EGIT_REPO_URI="git://git.gnupg.org/pinentry.git"
85 -
86 -LICENSE="GPL-2"
87 -SLOT="0"
88 -KEYWORDS=""
89 -IUSE="clipboard gtk ncurses qt4 caps static"
90 -
91 -RDEPEND="
92 - app-eselect/eselect-pinentry
93 - caps? ( sys-libs/libcap )
94 - gtk? ( x11-libs/gtk+:2 )
95 - ncurses? ( sys-libs/ncurses:0 )
96 - qt4? ( >=dev-qt/qtgui-4.4.1:4 )
97 - static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
98 -"
99 -DEPEND="${RDEPEND}
100 - sys-devel/gettext
101 - gtk? ( virtual/pkgconfig )
102 - qt4? ( virtual/pkgconfig )
103 - ppc-aix? ( dev-libs/gnulib )
104 -"
105 -REQUIRED_USE="
106 - || ( ncurses gtk qt4 )
107 - gtk? ( !static )
108 - qt4? ( !static )
109 - static? ( ncurses )
110 -"
111 -
112 -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
113 -
114 -src_prepare() {
115 - if use qt4; then
116 - local f
117 - for f in qt4/*.moc; do
118 - "$(qt4_get_bindir)"/moc ${f/.moc/.h} > ${f} || die
119 - done
120 - fi
121 - epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
122 - eautoreconf
123 -}
124 -
125 -src_configure() {
126 - use static && append-ldflags -static
127 -
128 - if [[ ${CHOST} == *-aix* ]] ; then
129 - append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include"
130 - append-ldflags -L"${EPREFIX}/usr/$(get_libdir)/gnulib/$(get_libdir)"
131 - append-libs -lgnu
132 - fi
133 -
134 - # Issues finding qt on multilib systems
135 - export QTLIB="${QTDIR}/$(get_libdir)"
136 -
137 - econf \
138 - --enable-pinentry-tty \
139 - $(use_enable gtk pinentry-gtk2) \
140 - $(use_enable ncurses pinentry-curses) \
141 - $(use_enable ncurses fallback-curses) \
142 - $(use_enable qt4 pinentry-qt4) \
143 - $(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \
144 - $(use_with caps libcap)
145 -}
146 -
147 -src_compile() {
148 - emake AR="$(tc-getAR)"
149 -}
150 -
151 -src_install() {
152 - default
153 - rm -f "${ED}"/usr/bin/pinentry || die
154 -}
155 -
156 -pkg_postinst() {
157 - if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
158 - elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
159 - elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
160 - elog "The soft resource limit for memory locking specifies the limit an"
161 - elog "unprivileged process may lock into memory. You can also use POSIX"
162 - elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
163 - elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
164 - elog "your users."
165 - fi
166 - eselect pinentry update ifunset
167 -}
168 -
169 -pkg_postrm() {
170 - eselect pinentry update ifunset
171 -}