version bump for bug 308695

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 102 insertions, 5 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index bb66eeb593b1..4f87a1793668 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,12 @@
 # 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.98 2010/04/01 08:32:48 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.99 2010/04/26 07:33:41 fauli Exp $
+
+*pinentry-0.8.0 (26 Apr 2010)
+
+  26 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
+  +pinentry-0.8.0.ebuild:
+  version bump for bug 308695
 
   01 Apr 2010; Jonathan Callen <abcd@gentoo.org> pinentry-0.7.6.ebuild:
   Bump to EAPI=3, add prefix keywords
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index d8aa1d26d32d..eb1cd5d01d68 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -5,15 +5,17 @@ AUX pinentry-0.7.5-grab.patch 536 RMD160 66f86ff0c8c208ec62de1dea2b2c3edeca41d0f
 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
 DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab
+DIST pinentry-0.8.0.tar.gz 487629 RMD160 966e830fb86c1820057979f581ca71f82a4fc9e0 SHA1 381f9ee47b9f198e1be5d3ec4e043067a7e97912 SHA256 426c7ff9ca7d147d21243dffd72e844d84c1f593e323f1d207ee19bdded0f01a
 EBUILD pinentry-0.7.5-r1.ebuild 2390 RMD160 730747a0c9ab73215be997a763280d3105e684d6 SHA1 23b6815ed2d97958534e142ec8b81ea884273ecd SHA256 1dd5feb0db92c0492e5375a9cd87373b0d17bf9b33a84e4b6a34d9ad8451f8b9
 EBUILD pinentry-0.7.5.ebuild 1965 RMD160 c4a3b0d9f7d1d1f4838f36108d6ba812519a5239 SHA1 3886110c38eede87e81440d8231913a766401c51 SHA256 cc7dcc4ab69d7cb53c8d62d640bb9f9fc4d590ddfa5c23fdc9ea20455358c17e
 EBUILD pinentry-0.7.6.ebuild 2787 RMD160 7c6d452834d52a99c29dea21a3ba55104641a696 SHA1 3c45c5e1fdb1aaeb2646f6aa3c459ae638f5dfc5 SHA256 cdaa62b83bda5f36fba3d396366e34ce530f8cbe89ca14fab46f7248b8f493ea
-MISC ChangeLog 13133 RMD160 eab3c0c81cfe73b2eb496c5fbe47439c46258516 SHA1 9f2d08afa720ed3fa1042aa5f1426a026a789172 SHA256 0d355f2a89d5291c6f413937096f6b237803259da78d60c7a7823997084d1cf5
+EBUILD pinentry-0.8.0.ebuild 2737 RMD160 7374b4fad8137d4ebb8fd0f9a576ec8b4a713e49 SHA1 1eb1009b3282b4b255c8122ea4fb148c997200e1 SHA256 97382328312f33a395dd1cebdda231c14ffd2bacc88254c6a95586eb504b7a04
+MISC ChangeLog 13277 RMD160 52deeba3cfbef37dbac1b02d1703faa22f529029 SHA1 2945a7f96148702e6e5e9667a2ad8cbd5e89e875 SHA256 75d9f45eb09197c90350ec4dfd4def37cfec00e07a325521cb9a5be027da3a7c
 MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku0WjoACgkQOypDUo0oQOo4hACgyDKsTAvbZjqCggNgpR4PPz3d
-AzMAn1tuMa88fX2fvSpOBzewkr00hLsz
-=2srU
+iEYEARECAAYFAkvVQeUACgkQNQqtfCuFneOEBQCfQcw+Op4g8r9Svor0VgXsBY0m
+cwEAn0OsVsIXcXF9WBOZFvvhhHt4IUI8
+=AF89
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/pinentry/pinentry-0.8.0.ebuild b/app-crypt/pinentry/pinentry-0.8.0.ebuild
new file mode 100644
index 000000000000..bfbdd09e8e0c
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.8.0.ebuild
@@ -0,0 +1,89 @@
+# 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.ebuild,v 1.1 2010/04/26 07:33:41 fauli 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://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 ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="gtk ncurses qt4 caps static"
+
+DEPEND="static? ( sys-libs/ncurses )
+	!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"
+
+	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-qt --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} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
+}
+
+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."
+}