1 |
commit: 3e8d6a5cbfe7b3a16c59fd90f90c75215d51714d |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 9 20:06:30 2014 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 9 20:06:30 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3e8d6a5c |
7 |
|
8 |
[app-crypt/pinentry] Sync with portage. |
9 |
|
10 |
Package-Manager: portage-2.2.10 |
11 |
|
12 |
--- |
13 |
app-crypt/pinentry/metadata.xml | 6 +- |
14 |
app-crypt/pinentry/pinentry-9999.ebuild | 114 +++++++++++++++++--------------- |
15 |
2 files changed, 63 insertions(+), 57 deletions(-) |
16 |
|
17 |
diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml |
18 |
index 2cfa47f..d68fe97 100644 |
19 |
--- a/app-crypt/pinentry/metadata.xml |
20 |
+++ b/app-crypt/pinentry/metadata.xml |
21 |
@@ -1,9 +1,5 @@ |
22 |
<?xml version="1.0" encoding="UTF-8"?> |
23 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
24 |
<pkgmetadata> |
25 |
- <herd></herd> |
26 |
- <maintainer> |
27 |
- <email>swegener@g.o</email> |
28 |
- <description>Primary Maintainer</description> |
29 |
- </maintainer> |
30 |
+<herd>crypto</herd> |
31 |
</pkgmetadata> |
32 |
|
33 |
diff --git a/app-crypt/pinentry/pinentry-9999.ebuild b/app-crypt/pinentry/pinentry-9999.ebuild |
34 |
index 390de36..3399b9b 100644 |
35 |
--- a/app-crypt/pinentry/pinentry-9999.ebuild |
36 |
+++ b/app-crypt/pinentry/pinentry-9999.ebuild |
37 |
@@ -1,93 +1,103 @@ |
38 |
# Copyright 1999-2014 Gentoo Foundation |
39 |
# Distributed under the terms of the GNU General Public License v2 |
40 |
-# $Header: $ |
41 |
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.3.ebuild,v 1.5 2014/04/03 19:40:59 haubi Exp $ |
42 |
|
43 |
-EAPI="2" |
44 |
+EAPI=5 |
45 |
|
46 |
-inherit autotools multilib eutils flag-o-matic git-r3 |
47 |
+inherit autotools multilib eutils flag-o-matic git-r3 toolchain-funcs |
48 |
|
49 |
DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" |
50 |
-HOMEPAGE="http://www.gnupg.org/aegypten/" |
51 |
+HOMEPAGE="http://gnupg.org/aegypten2/index.html" |
52 |
EGIT_REPO_URI="git://git.gnupg.org/pinentry.git" |
53 |
|
54 |
LICENSE="GPL-2" |
55 |
-KEYWORDS="" |
56 |
SLOT="0" |
57 |
-IUSE="caps gtk ncurses qt4 static" |
58 |
+KEYWORDS="" |
59 |
+IUSE="gtk ncurses qt4 caps static" |
60 |
|
61 |
-DEPEND=" |
62 |
+RDEPEND=" |
63 |
+ app-admin/eselect-pinentry |
64 |
caps? ( sys-libs/libcap ) |
65 |
- static? ( sys-libs/ncurses ) |
66 |
- !static? ( |
67 |
- gtk? ( x11-libs/gtk+:2 ) |
68 |
- !gtk? ( |
69 |
- !qt4? ( sys-libs/ncurses ) |
70 |
- ) |
71 |
- ncurses? ( sys-libs/ncurses ) |
72 |
- qt4? ( dev-qt/qtgui:4 ) |
73 |
- ) |
74 |
+ gtk? ( x11-libs/gtk+:2 ) |
75 |
+ ncurses? ( sys-libs/ncurses ) |
76 |
+ qt4? ( >=dev-qt/qtgui-4.4.1:4 ) |
77 |
+ static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) |
78 |
+" |
79 |
+DEPEND="${RDEPEND} |
80 |
+ sys-devel/gettext |
81 |
+ gtk? ( virtual/pkgconfig ) |
82 |
+ qt4? ( virtual/pkgconfig ) |
83 |
+ ppc-aix? ( dev-libs/gnulib ) |
84 |
+" |
85 |
+REQUIRED_USE=" |
86 |
+ || ( ncurses gtk qt4 ) |
87 |
+ gtk? ( !static ) |
88 |
+ qt4? ( !static ) |
89 |
+ static? ( ncurses ) |
90 |
" |
91 |
-RDEPEND="${DEPEND}" |
92 |
|
93 |
-pkg_setup() { |
94 |
- if use static; then |
95 |
- append-ldflags -static |
96 |
- if use gtk || use qt4; then |
97 |
- ewarn |
98 |
- ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt4 USE flags." |
99 |
- ewarn |
100 |
- fi |
101 |
- fi |
102 |
-} |
103 |
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) |
104 |
|
105 |
src_prepare() { |
106 |
+ if use qt4; then |
107 |
+ local f |
108 |
+ for f in qt4/*.moc; do |
109 |
+ "${EPREFIX}"/usr/bin/moc ${f/.moc/.h} > ${f} || die |
110 |
+ done |
111 |
+ fi |
112 |
+ epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" |
113 |
+ epatch "${FILESDIR}/${PN}-0.8.2-texi.patch" |
114 |
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die |
115 |
eautoreconf |
116 |
- elibtoolize |
117 |
} |
118 |
|
119 |
src_configure() { |
120 |
- local myconf="" |
121 |
+ use static && append-ldflags -static |
122 |
|
123 |
- if use gtk || use ncurses || use qt4; then |
124 |
- myconf="--enable-pinentry-curses --enable-fallback-curses" |
125 |
- elif use static; then |
126 |
- myconf="--enable-pinentry-curses --enable-fallback-curses --disable-pinentry-gtk2 --disable-pinentry-qt --disable-pinentry-qt4" |
127 |
+ if [[ ${CHOST} == *-aix* ]] ; then |
128 |
+ append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include" |
129 |
+ append-ldflags -L"${EPREFIX}/usr/$(get_libdir)/gnulib/$(get_libdir)" |
130 |
+ append-libs -lgnu |
131 |
fi |
132 |
|
133 |
+ # Issues finding qt on multilib systems |
134 |
+ export QTLIB="${QTDIR}/$(get_libdir)" |
135 |
+ |
136 |
econf \ |
137 |
--disable-dependency-tracking \ |
138 |
--enable-maintainer-mode \ |
139 |
--disable-pinentry-gtk \ |
140 |
$(use_enable gtk pinentry-gtk2) \ |
141 |
- $(use_enable qt4 pinentry-qt4) \ |
142 |
+ --disable-pinentry-qt \ |
143 |
$(use_enable ncurses pinentry-curses) \ |
144 |
$(use_enable ncurses fallback-curses) \ |
145 |
+ $(use_enable qt4 pinentry-qt4) \ |
146 |
$(use_with caps libcap) \ |
147 |
- ${myconf} |
148 |
+ --without-x |
149 |
} |
150 |
|
151 |
src_compile() { |
152 |
- # Generated meta-object files manually |
153 |
- if use qt4; then |
154 |
- moc qt4/pinentrydialog.h -o qt4/pinentrydialog.moc && \ |
155 |
- moc qt4/qsecurelineedit.h -o qt4/qsecurelineedit.moc \ |
156 |
- || die "failed to regenerate .moc files" |
157 |
- fi |
158 |
- |
159 |
- emake || die "emake failed" |
160 |
+ emake AR="$(tc-getAR)" |
161 |
} |
162 |
|
163 |
src_install() { |
164 |
- emake DESTDIR="${D}" install || die "make install failed" |
165 |
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed" |
166 |
+ default |
167 |
+ rm -f "${ED}"/usr/bin/pinentry || die |
168 |
} |
169 |
|
170 |
pkg_postinst() { |
171 |
- elog "We no longer install pinentry-curses and pinentry-qt SUID root by default." |
172 |
- elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes." |
173 |
- elog "The soft resource limit for memory locking specifies the limit an" |
174 |
- elog "unprivileged process may lock into memory. You can also use POSIX" |
175 |
- elog "capabilities to allow pinentry to lock memory. To do so activate the caps" |
176 |
- elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" |
177 |
- elog "your users." |
178 |
+ if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then |
179 |
+ elog "We no longer install pinentry-curses and pinentry-qt SUID root by default." |
180 |
+ elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes." |
181 |
+ elog "The soft resource limit for memory locking specifies the limit an" |
182 |
+ elog "unprivileged process may lock into memory. You can also use POSIX" |
183 |
+ elog "capabilities to allow pinentry to lock memory. To do so activate the caps" |
184 |
+ elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" |
185 |
+ elog "your users." |
186 |
+ fi |
187 |
+ eselect pinentry update ifunset |
188 |
+} |
189 |
+ |
190 |
+pkg_postrm() { |
191 |
+ eselect pinentry update ifunset |
192 |
} |