Revision bump wrt #328189 by Federico Zenith. Fix USE static deps wrt #331739 by "wd".

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

3 files changed, 101 insertions, 2 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 01d79aeee5cc..388c91dabd92 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.111 2010/09/05 16:07:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.112 2010/09/25 09:20:32 ssuominen Exp $
+
+*pinentry-0.8.0-r1 (25 Sep 2010)
+
+  25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +pinentry-0.8.0-r1.ebuild:
+  Revision bump wrt #328189 by Federico Zenith. Fix USE static deps wrt
+  #331739 by "wd".
 
   05 Sep 2010; Raúl Porcel <armin76@gentoo.org> pinentry-0.8.0.ebuild:
   ia64/s390/sh/sparc stable wrt #299388
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 7f50bc286525..25f472d8adde 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,6 +1,7 @@
 AUX pinentry-0.7.5-grab.patch 536 RMD160 66f86ff0c8c208ec62de1dea2b2c3edeca41d0fb SHA1 cbb4a01242ce73ebb18c38d9541f03017691a265 SHA256 149fadfa505e55fa4f4e1fb5536066b87290566df4d890e6f4087d86f213188a
 AUX pinentry-0.8.0-qt-fix.patch 1104 RMD160 6fdd963869c237a08447a85d219c51125d17262f SHA1 49741480980c0e16d47ea8fa91df4e8dfecc9db2 SHA256 1375d5675f9c1ba050a0bcf9853df01b73110fffa8580cb90a2095db522c7dbc
 DIST pinentry-0.8.0.tar.gz 487629 RMD160 966e830fb86c1820057979f581ca71f82a4fc9e0 SHA1 381f9ee47b9f198e1be5d3ec4e043067a7e97912 SHA256 426c7ff9ca7d147d21243dffd72e844d84c1f593e323f1d207ee19bdded0f01a
+EBUILD pinentry-0.8.0-r1.ebuild 2866 RMD160 90bf8d5255032e13a30c902945030d6c40127fb4 SHA1 677ad2ca7980da02294b1982d05fe513ba8aa231 SHA256 b2c734e1d852b1df18e57588f64194ad12256c81ad0626c1dc45d6f00d3e1940
 EBUILD pinentry-0.8.0.ebuild 2866 RMD160 45af9e25bedb77d518282887879cdd98c5519010 SHA1 e342e8541882799aece4c69622fd2993f3c197ef SHA256 371c44c1b12ee3e525652e27db2229bed3c1813b540659c80b6d09f294133bd1
-MISC ChangeLog 14868 RMD160 fe26cb5517c890badd9b7c674fe26241bddef4a7 SHA1 8783eebb54ec722527b6255e6ecf4dd002fc33e7 SHA256 19c7e47909c86d106b13ea2e4826a19572be46ae7c71603f63bd205a222d381c
+MISC ChangeLog 15079 RMD160 84b02c812966069dadd9d44edd9a6b4980038b3d SHA1 f7b9ff54dd047c740d53f726d157dbf4d61eaf3d SHA256 6bbf1dc47d63dc067d687b9810c44ea2371129785412fd6a18eaf5bbd66ba2b9
 MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548
diff --git a/app-crypt/pinentry/pinentry-0.8.0-r1.ebuild b/app-crypt/pinentry/pinentry-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..2ad0a4a01c27
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.8.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.0-r1.ebuild,v 1.1 2010/09/25 09:20:32 ssuominen Exp $
+
+EAPI=3
+inherit multilib eutils flag-o-matic
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+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 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk ncurses qt4 caps static"
+
+DEPEND="static? ( >=sys-libs/ncurses-5.7-r5[static-libs] )
+	!static? (
+		gtk? ( x11-libs/gtk+:2 )
+		ncurses? ( sys-libs/ncurses )
+		qt4? ( >=x11-libs/qt-gui-4.4.1 )
+		!gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) )
+	)
+	caps? ( sys-libs/libcap )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use static && append-ldflags -static
+
+	if use static && { use gtk || use qt4; }; then
+		ewarn
+		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt4 USE flags."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.5-grab.patch
+
+	# https://bugs.g10code.com/gnupg/issue1162
+	epatch "${FILESDIR}"/${P}-qt-fix.patch
+
+	if use qt4; then
+		local file
+		for file in qt4/*.moc; do
+			"${EPREFIX}"/usr/bin/moc ${file/.moc/.h} > ${file} || die
+		done
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	if ! { use qt4 || 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-qt4"
+	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) \
+		--disable-pinentry-qt \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable qt4 pinentry-qt4) \
+		$(use_with caps libcap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
+
+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."
+}