Add support for the static USE flag, bug #247770.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 99 insertions, 5 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index c3900fbe7d11..2d34ba9fc6a2 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.91 2009/01/06 21:16:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.92 2009/01/22 19:17:41 swegener Exp $
+
+*pinentry-0.7.5-r1 (22 Jan 2009)
+
+  22 Jan 2009; Sven Wegener <swegener@gentoo.org> +pinentry-0.7.5-r1.ebuild:
+  Add support for the static USE flag, bug #247770.
 
   06 Jan 2009; Sven Wegener <swegener@gentoo.org>
   -files/pinentry-0.7.2-grab.patch, -files/0.7.2-info.patch,
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 45ccce1a5f2c..a87e397a17ad 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -4,13 +4,14 @@ Hash: SHA1
 AUX pinentry-0.7.5-grab.patch 536 RMD160 66f86ff0c8c208ec62de1dea2b2c3edeca41d0fb SHA1 cbb4a01242ce73ebb18c38d9541f03017691a265 SHA256 149fadfa505e55fa4f4e1fb5536066b87290566df4d890e6f4087d86f213188a
 AUX pinentry-gmem.patch 880 RMD160 82c41513e47be43a801ec0d2e6cf89857b5e373f SHA1 34abb7caa0aecbd4d8f592695c30e40311425688 SHA256 484dafa00a7fe6e04380d32f3a468082d68923c11f8e3fb007e09018b4b617f5
 DIST pinentry-0.7.5.tar.gz 422801 RMD160 4ed9d06981b647f9fd39b9d30651a36307869c2d SHA1 6699a1ff94c649e8905199d480c6412cc43bad3d SHA256 cb269ac058793b2df343a12a65e3402abc4b68503e105b12e4ca903d8d8e3172
+EBUILD pinentry-0.7.5-r1.ebuild 2587 RMD160 c8fbfd96c388ab5987a4f9fd53c887a7f388644d SHA1 163a6fefa2bed8efb50d19ea3d28f68235cd68c6 SHA256 8d761e1c2486d5acb194ffbafbaec6eb4ec3cc67f80a8ec3ccd03bb3dd15b123
 EBUILD pinentry-0.7.5.ebuild 2114 RMD160 12af233f11922d9f066e359b6c918c4caefca6ed SHA1 2edf6933a43be970d98595c82432aef32983dfa7 SHA256 46817c4628e0433ba8054dbb573f785e2a0b418b7c13ee9cf40027223c31ba90
-MISC ChangeLog 12030 RMD160 788b0592b924b262d8696ba62dd5e9fc433379b7 SHA1 daa592c7801e31cb067ffb4c75debd8211916645 SHA256 efa0422279eb169e6e1b18bcbada9ebb0541c18f0867163739a0305934c6b658
+MISC ChangeLog 12194 RMD160 21598fcbbb6226f8742c98248896bd5cb17dca4c SHA1 8cd29a0f4c7ed38b1b83936f62583eb3fa282f9f SHA256 cc04d00a96ab74724416107ab7a7ca272254d6534f43fb89a796ecbaa7215857
 MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkljyiwACgkQI1lqEGTUzySUsgCeMIY6Uh2NB0adeO6wnkIweqvs
-TlUAoJl7Jj5pOMZUq1UEFJDLpYu4dxgX
-=z+z0
+iEYEARECAAYFAkl4xl0ACgkQI1lqEGTUzyT7HgCgjHwJTNmIcfw68kTx3HLK8410
+KigAoJqCJdoEhaFSlU0EGuZFPC1aAzjR
+=j0uc
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/pinentry/pinentry-0.7.5-r1.ebuild b/app-crypt/pinentry/pinentry-0.7.5-r1.ebuild
new file mode 100644
index 000000000000..a6ed7a8d92de
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.7.5-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.5-r1.ebuild,v 1.1 2009/01/22 19:17:41 swegener Exp $
+
+EAPI="1"
+
+inherit qt3 multilib eutils flag-o-matic
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://www.gnupg.org/aegypten/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gtk ncurses qt3 caps static"
+
+DEPEND="static? ( sys-libs/ncurses )
+	!static? (
+		gtk? ( =x11-libs/gtk+-2* )
+		ncurses? ( sys-libs/ncurses )
+		qt3? ( x11-libs/qt:3 )
+		!gtk? ( !qt3? ( !ncurses? ( sys-libs/ncurses ) ) )
+	)
+	caps? ( sys-libs/libcap )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use static && append-ldflags -static
+
+	if use static && ( use gtk || use qt3 )
+	then
+		ewarn
+		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt3 USE flags."
+		ewarn
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-grab.patch"
+	epatch "${FILESDIR}/${PN}-gmem.patch"
+}
+
+src_compile() {
+	local myconf=""
+
+	if ! ( use qt3 || use gtk || use ncurses )
+	then
+		myconf="--enable-pinentry-curses --enable-fallback-curses"
+	elif use static
+	then
+		myconf="--enable-pinentry-curses --enable-fallback-curses --disable-pinentry-gtk2 --disable-pinentry-qt"
+	fi
+
+	# Issues finding qt on multilib systems
+	export QTLIB="${QTDIR}/$(get_libdir)"
+
+	econf \
+		--disable-dependency-tracking \
+		--enable-maintainer-mode \
+		--disable-pinentry-gtk \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable qt3 pinentry-qt) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_with caps libcap) \
+		${myconf} \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+	elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+	elog "The soft resource limit for memory locking specifies the limit an"
+	elog "unprivileged process may lock into memory. You can also use POSIX"
+	elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+	elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+	elog "your users."
+}