Bump eapi in the ebuild and solve the log message print. Wrt bug#440540.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 53 insertions, 62 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 295e590823d5..4ae363623405 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.128 2012/10/29 10:52:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.129 2012/11/16 14:41:37 scarabeus Exp $
+
+  16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> pinentry-0.8.2.ebuild:
+  Bump eapi in the ebuild and solve the log message print. Wrt bug#440540.
 
   29 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/pinentry-0.7.5-grab.patch, -files/pinentry-0.8.0-qt-fix.patch,
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 56c71788e643..6b2ed613803f 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -4,23 +4,23 @@ Hash: SHA256
 DIST pinentry-0.8.1.tar.gz 504101 SHA256 3e17e1d410686d197f96b61b04e3fad28bd6bcb029077bdfd902780934de9132 SHA512 a7f9a582b1d9c347c65f4a842dc4f3270199dc23eab2487e5150e37b71d666628a8a60d44f85d64bba5b1a7018379dd181e810bc373994c9a94fafe706adf76a WHIRLPOOL ee6ea273cf1307c9d6946f9dabaca076ea563f57e64a044d169200a95944173ae8ac60d9fe167bf5e9e1a21216ac41ff680f8097d5a6431e9e80a0a4ec77d024
 DIST pinentry-0.8.2.tar.bz2 428514 SHA256 5084b7b6aac5725303f3b0185f126daa8b33ee78ade538edf1e20034594a39b1 SHA512 f012ed163b8905e10714e8667a4434eb192e9519e0fa91a686b097224252bf2e73c3b35d682b6fd4a9df80eefcb3afbf2ec763aef58a3ab5a1e71268fd83e158 WHIRLPOOL 0a17bf30390895dddbaad14bcf07b3064fb7e3c1ed97ba22231e13201f24cfc194a8ef110da7316f137ed3942c094c1990aa51a80b352c5572748b42f40a77d7
 EBUILD pinentry-0.8.1.ebuild 2976 SHA256 6d0b40950df094c43ab4534f44dc7fbded607562af42447a3953ce4b23c6ee59 SHA512 9dc24d522d5634badae37aeb7dce8b407ef4a484e0438d024bb0a3973976d7a7f2a3963e82b2ac4698ba76ddf11162c1b20aa1221e17661c5924cf79c237c964 WHIRLPOOL e2f04fe49dc76f0a93e5167dac1f1b438a86dfa4ddc37809d47e11c05606d3625f9aeea53325f31ae5a69d0dbbfffb1d69977bacab4540484bfe971b9ad63adf
-EBUILD pinentry-0.8.2.ebuild 2990 SHA256 d622b4d1e7958ac0ebd133de82fc537745cc8144f83d50ca5f2b208d2dc7bc3b SHA512 c64c49f46dbfab8de94c59fe96a9ee89cccf8e35bc67fef9c45387e467a3624542d61526383195db1063200b42dd2037f116476ce55e2196bc2d0f43206ccc99 WHIRLPOOL c0661816505641b7a411266ab46db0efe0b9f85844c65520d743d633c3a22a3644897c5f8f85c1b7742e82ac4deee8be1e702241d80a267361fab98ef5124c4d
-MISC ChangeLog 17360 SHA256 62114612172cee5307131d59ac2659468a01a2dd38c35496409c7b6285800a30 SHA512 eef7f6c0e81c1b6c85b80125514c7095d05bed69ee7d8b946bfc3a720f93c09d651ed71fd7714e1ec884a0f460f3acf7e1d765a7ec121f60b43b45d18d147e0d WHIRLPOOL a10f7dfe2efd64f6ae2d02d05a3687b3754a00e0b08c2aa8dc98158e68502dd2337b2c61ad823584668ac54471747f5fe5c608dac3c50c912536e9e998375b37
+EBUILD pinentry-0.8.2.ebuild 2587 SHA256 f52e39b5c444fbad2da43fee800ed1eb480cf90f8cfa069151ce19884b931ee1 SHA512 eac52180115d0e1689c2ec6d0b08f6e92db288fceb90ac167ea5dec0b771e4b9bdba46f314b070241978db787af0298f706e6c943d5c29a52145293119709a12 WHIRLPOOL aeb918ab888ab38bb33926b9e26f9356b4b41078b0acb4ebcc69993c618a331b30987dd2c62105a2039bbf9db8b7cfe77aa5c53ffb2e3b0ca4fb8b4242a19e74
+MISC ChangeLog 17514 SHA256 43cb1dc9fa948f26e92c94ef306222031a371f03127d1ca0ac50340c6281de18 SHA512 b4557228465d26c103688eb1addf8dda5c2e41ab9b22ca7033e74fad075970292cf38fb427a24a77a5d7d68d43b93b2b49265f4e3f209f6332064bcf28df3661 WHIRLPOOL 55fb842709a3b2c7ff24721e5a89782addc3613842f649de17dcb5a4c7c498369ab27a561438733a989c6c37524b32e1eade1374a8b898d8e5751a66438f840b
 MISC metadata.xml 253 SHA256 2fba4104c545c30062d3a1ff0bd60ab0ca161820464ed8591113009d0497adbf SHA512 6d95b4ce1f38639a811d66f7ea3b2b5f509a78e8f8401deb2ecbbfde63a651f7161f8b5a64bf0657dbe5e8ef725f6fc1c8b79ccc2f6f373f9bcb1b32b8830f48 WHIRLPOOL 335828c341d9ae0c768cadd787e6def4736778c6b59c3bc3cece9eb4d8973d5b13aac2313f31447bba0d8b9f3593e0b16ed1262a4d8200054e9c01614c63e448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQjl/qAAoJEOSiRoyO7jvoPwEP/1zCEgDNMXPuQd5wikt7xlbn
-UharH7NI6YL3NJNP3FrVlIhDnkxQflci4ZUM0nzAq7NkRSXyPAEgbXbQymurFpRa
-HQ6jKZYIcUVBOTqhdm0j7OHoEx0N/6MyLwmQsaH29WiX7ba7LJM5xP2Acm1rx7/X
-ztB+/lycYpaDjyS6oBibUeYEuinmrUV21wy9j1nkjo80aQUomfDOHEL44d6tbfeM
-pb8rK/zCL6LOKTxyZet38lQ0/8zE13jOdC1B3qsT/LXkJecBmzhmj+/w+QYnCLCT
-BBP9YdRxKVsM0DqSoaFAnR9nlwQnjXS9V2TDV960Oe07f+YEZNXOblXB3AjxDD9/
-1TH6yP2vnCsszICElZxCq7Vnftr05F3gwpIXD0KWqaWkTrbD1RNwoeT8ThehixFH
-3JdXo7msBxzq72E9QelUN5a2adUmvxk7t4gnFiKteVf46RRn/fR58XdNDwulVwUr
-jDcaPOVfvEGRE8lmJtEktYEryKOVNVGjKCu98GU+lTnf5a4k9+/eOROss9ZgPqrE
-NVN7U1SxA13T9ZwHdGAqD99i+LvVZ3qLUlxQO6Eu6BrlgftFdc5Y3mQqMF+LBqCf
-MB1y/EGpzIRfd7PLhUd8Wf+jsS4gcMkgamL0eEfssuAOxYMauBIqyjCGmEmWT3DR
-iZ/oXXvVf8G4pV0oxRxq
-=vOx/
+iQIcBAEBCAAGBQJQplCnAAoJEOSiRoyO7jvoDwwP/3WFOn+8XN3pBzlb8cvvy3XO
+pluOdFT8uhKxgaclPL3O+x+Guzxdt298HjdrzCaWJzklO0eSHICSYmBZsjO3c99g
+6Je4CVew6f9AjCK1VOCUPKeXRW5H6VnckyVIS2d6Chj8Ws1g0RrxhkoiHQ2hX4mF
+SyxlOb14zRSAJmJdac4aWzaZOMAymizFrYGOLoVbZ3xLs/bOlGLX7+weGlc248Q7
+QAxA0dlEvokdo3XJfW1rPeUkYPeJZyEl3Ht/okVgjC3A4HK4KS4xrdRA5jDe/5ab
+fXC9XDxmaidO/MlyThinat0ohSYUZXc4YmYHbSZBSVzEOiFegQmRwWDX0wsxlnaz
+yvcYSQ+TBmAg8n7kZVDrgbn0Kfx9J93e9WXdxjT3Q5A3nmQ/rbouMX/c3yejGXV5
+/3JA4aGubbuFUzGNbs3JWGnhYO06N1oTEzwIxTKBvtQbt0AGkaObvnDz/w/9PmVo
++tBaSZmin3usA2lMaPG65wlWyZ6crzKHEcoZCvb4eAfmdKNTtuAK1C85erikenhr
+JikZp/0pxjlzjFGwY7K039iJxPlzw9B7u/431BPfUT7xjWoOWCO9btwcHa+/Q2Em
+zWeQeprz4+pyXO0oCK5VPe8hwSf0MPHRzO73vv2ce0mjYERks4VbOF9ftLrXvAgP
+loDAyBdZH4BMY3T/URex
+=ZeK3
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/pinentry/pinentry-0.8.2.ebuild b/app-crypt/pinentry/pinentry-0.8.2.ebuild
index 4a70b1709cd3..d8ba6ebb9eb3 100644
--- a/app-crypt/pinentry/pinentry-0.8.2.ebuild
+++ b/app-crypt/pinentry/pinentry-0.8.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild,v 1.2 2012/09/03 13:53:02 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild,v 1.3 2012/11/16 14:41:37 scarabeus Exp $
 
-EAPI=3
+EAPI=5
 
 inherit multilib eutils flag-o-matic
 
@@ -15,50 +15,38 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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"
 
-RDEPEND="app-admin/eselect-pinentry
+RDEPEND="
+	app-admin/eselect-pinentry
+	caps? ( sys-libs/libcap )
+	gtk? ( x11-libs/gtk+:2 )
+	ncurses? ( sys-libs/ncurses )
+	qt4? ( >=x11-libs/qt-gui-4.4.1:4 )
 	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:4 )
-		!gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) )
-	)
-	caps? ( sys-libs/libcap )"
+"
 DEPEND="${RDEPEND}
-	!static? (
-		gtk? ( virtual/pkgconfig )
-		qt4? ( virtual/pkgconfig )
-	)"
+	gtk? ( virtual/pkgconfig )
+	qt4? ( virtual/pkgconfig )
+"
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 )
+	gtk? ( !static )
+	qt4? ( !static )
+	static? ( ncurses )
+"
 
-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
-}
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
 src_prepare() {
 	if use qt4; then
-		local file
-		for file in qt4/*.moc; do
-			"${EPREFIX}"/usr/bin/moc ${file/.moc/.h} > ${file} || die
+		local f
+		for f in qt4/*.moc; do
+			"${EPREFIX}"/usr/bin/moc ${f/.moc/.h} > ${f} || 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
+	use static && append-ldflags -static
 
 	# Issues finding qt on multilib systems
 	export QTLIB="${QTDIR}/$(get_libdir)"
@@ -73,24 +61,24 @@ src_configure() {
 		$(use_enable ncurses fallback-curses) \
 		$(use_enable qt4 pinentry-qt4) \
 		$(use_with caps libcap) \
-		--without-x \
-		${myconf}
+		--without-x
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	default
 	rm -f "${ED}"/usr/bin/pinentry || 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."
+	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+		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."
+	fi
 	eselect pinentry update ifunset
 }