Added a check for app-crypt/pinentry having been built with either the gtk or qt3 USE flag as otherwise essential functionality of kgpg won't be accessible. Fixes bug 204139.

Package-Manager: portage-2.1.4_rc14

4 files changed, 49 insertions, 31 deletions

diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index b38edabe7b99..0cd5b14d5514 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeutils
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.215 2007/11/20 13:46:02 philantrop Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.216 2008/01/06 21:18:52 philantrop Exp $
+
+  06 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  kdeutils-3.5.7-r1.ebuild, kdeutils-3.5.8-r1.ebuild:
+  Added a check for app-crypt/pinentry having been built with either the gtk
+  or qt3 USE flag as otherwise essential functionality of kgpg won't be
+  accessible. Fixes bug 204139.
 
 *kdeutils-3.5.8-r1 (20 Nov 2007)
 
diff --git a/kde-base/kdeutils/Manifest b/kde-base/kdeutils/Manifest
index e43a676ddd48..21a08d3c9cc8 100644
--- a/kde-base/kdeutils/Manifest
+++ b/kde-base/kdeutils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX klaptopdaemon-3.5.7-has_acpi_sleep.patch 1138 RMD160 b0962ab67f13688c7bf169b3337b8e34ddfb9c99 SHA1 24d51da049f13bf4ea1927b2d10be6e6a828dd69 SHA256 40df6cc42c49ae615c27f1ea8b8ae7f4d1cd9dcd5e295c1396b00e3daae083b7
 MD5 4071a9d553ac1ff2c7b5f64652b49cf0 files/klaptopdaemon-3.5.7-has_acpi_sleep.patch 1138
 RMD160 b0962ab67f13688c7bf169b3337b8e34ddfb9c99 files/klaptopdaemon-3.5.7-has_acpi_sleep.patch 1138
@@ -35,26 +32,26 @@ EBUILD kdeutils-3.5.6.ebuild 1183 RMD160 b3495e5f7e638411911172c57fe7dcdbec9c865
 MD5 e1275d672e07c682216ea3cced95ba78 kdeutils-3.5.6.ebuild 1183
 RMD160 b3495e5f7e638411911172c57fe7dcdbec9c865d kdeutils-3.5.6.ebuild 1183
 SHA256 41dfacc22d6447a37b78d0ecd9ddb3d80c4b601c3ace6950d4d3410c634b923f kdeutils-3.5.6.ebuild 1183
-EBUILD kdeutils-3.5.7-r1.ebuild 1528 RMD160 aa7feb76b9b9f802dcae920656ee2730d14c97a5 SHA1 22a8ec125f60718047b9e2bf9d7d25c33ab99e16 SHA256 95ad2ee8dab683fb840c99efefd2d426dfa7832247b5a0109858d003e9b8320b
-MD5 c30cea3bf0eebe1f82d8a143d9635c11 kdeutils-3.5.7-r1.ebuild 1528
-RMD160 aa7feb76b9b9f802dcae920656ee2730d14c97a5 kdeutils-3.5.7-r1.ebuild 1528
-SHA256 95ad2ee8dab683fb840c99efefd2d426dfa7832247b5a0109858d003e9b8320b kdeutils-3.5.7-r1.ebuild 1528
+EBUILD kdeutils-3.5.7-r1.ebuild 1928 RMD160 5a52633ae82164fee51512ee2070a2b2ceec2c06 SHA1 476ef91f050c06d1846e8b578ec285b1a6398510 SHA256 7488a5baa34f2a2b70d66884c5cb15d829d547e82d9e38daa4f31f66eae8ee7e
+MD5 b3823404ca7fb20b6c9b61e13de9443e kdeutils-3.5.7-r1.ebuild 1928
+RMD160 5a52633ae82164fee51512ee2070a2b2ceec2c06 kdeutils-3.5.7-r1.ebuild 1928
+SHA256 7488a5baa34f2a2b70d66884c5cb15d829d547e82d9e38daa4f31f66eae8ee7e kdeutils-3.5.7-r1.ebuild 1928
 EBUILD kdeutils-3.5.7.ebuild 1456 RMD160 31b571f3d9e971c0f7b6d8434b049d7448346c91 SHA1 aa5ff2cf8d748e131d901697852c71297c64a39e SHA256 faacdb17b467d04c707749b9c980d9af622dd44718cbc602061c5e45aad847d5
 MD5 c5919a58518f6bb5fbdcd51b1b21df22 kdeutils-3.5.7.ebuild 1456
 RMD160 31b571f3d9e971c0f7b6d8434b049d7448346c91 kdeutils-3.5.7.ebuild 1456
 SHA256 faacdb17b467d04c707749b9c980d9af622dd44718cbc602061c5e45aad847d5 kdeutils-3.5.7.ebuild 1456
-EBUILD kdeutils-3.5.8-r1.ebuild 1706 RMD160 98cb2286e3feba5dc05ddb27ae6d1f9ac8b223a9 SHA1 70240c2885af2ef5fbf89876975d60a7b6243c63 SHA256 4c67f34d573ddec7f1ea2f85f41490c3fd2934d59f3e5c52089202a4cfbc9057
-MD5 998cfe61befa6eb9e9aeaa6e5a355937 kdeutils-3.5.8-r1.ebuild 1706
-RMD160 98cb2286e3feba5dc05ddb27ae6d1f9ac8b223a9 kdeutils-3.5.8-r1.ebuild 1706
-SHA256 4c67f34d573ddec7f1ea2f85f41490c3fd2934d59f3e5c52089202a4cfbc9057 kdeutils-3.5.8-r1.ebuild 1706
+EBUILD kdeutils-3.5.8-r1.ebuild 2105 RMD160 632a35ee0e9aec2c7b92327d0b9ee3272bc5817b SHA1 179c3921658e0c34d49e91eae5b8ddabf5841f80 SHA256 3a99079efc213e0a2c69903d672e2fc27e2b80885374f65d5a9209dc23bbbc7b
+MD5 99f264f84b36b7f364caafdf92779a7a kdeutils-3.5.8-r1.ebuild 2105
+RMD160 632a35ee0e9aec2c7b92327d0b9ee3272bc5817b kdeutils-3.5.8-r1.ebuild 2105
+SHA256 3a99079efc213e0a2c69903d672e2fc27e2b80885374f65d5a9209dc23bbbc7b kdeutils-3.5.8-r1.ebuild 2105
 EBUILD kdeutils-3.5.8.ebuild 1654 RMD160 eadc48ad2ae063fd55e51fade9f782c0013d62c6 SHA1 9a0fc8a85fff2e11a43bfa051b922b94446819e4 SHA256 97791182ca4315f61f9daa9cc5221bc30b553ce4e04cbec3b8261d6722c6ceaa
 MD5 aba61cb6ece7d9932f7a92a8c975d57f kdeutils-3.5.8.ebuild 1654
 RMD160 eadc48ad2ae063fd55e51fade9f782c0013d62c6 kdeutils-3.5.8.ebuild 1654
 SHA256 97791182ca4315f61f9daa9cc5221bc30b553ce4e04cbec3b8261d6722c6ceaa kdeutils-3.5.8.ebuild 1654
-MISC ChangeLog 26083 RMD160 fa5bfedf6f0bb7bd4a7da3f762f3b036122ba78b SHA1 a70b0d6c7321559b56572acd9225b9eefc553faf SHA256 a27fe4a3f1e07cd0246bf6ddd06c8aa21698149418059bbfc898591a99b4d792
-MD5 ef5065777cd425afd2980527a3b962ce ChangeLog 26083
-RMD160 fa5bfedf6f0bb7bd4a7da3f762f3b036122ba78b ChangeLog 26083
-SHA256 a27fe4a3f1e07cd0246bf6ddd06c8aa21698149418059bbfc898591a99b4d792 ChangeLog 26083
+MISC ChangeLog 26374 RMD160 64bb3b7dc2a8af824f8a578a567a568f03a4ea1b SHA1 2bc6d1ccd685bfc3d5d3edaf54c39f08c653401c SHA256 92522f7a4a2549ac75a8a499e151eea4ffb7d9c247e141d9672d71df108743e4
+MD5 a6d61a9c6e0c17c3af3aee21183a0333 ChangeLog 26374
+RMD160 64bb3b7dc2a8af824f8a578a567a568f03a4ea1b ChangeLog 26374
+SHA256 92522f7a4a2549ac75a8a499e151eea4ffb7d9c247e141d9672d71df108743e4 ChangeLog 26374
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -80,10 +77,3 @@ SHA256 876863f3b586ed7dbb1354812325faf565977118b00c2c003733910043e7d32c files/di
 MD5 a771930ed5525bfe68207ad9b6451d08 files/digest-kdeutils-3.5.8-r1 521
 RMD160 269e7a9823549adae058c3df50c0a67659a1cf14 files/digest-kdeutils-3.5.8-r1 521
 SHA256 876863f3b586ed7dbb1354812325faf565977118b00c2c003733910043e7d32c files/digest-kdeutils-3.5.8-r1 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHQuUhCkvF58q80IkRApB3AJ42tRrfTm1IPRQFmXLoi4Y3qqL1pwCfUl/V
-bCEHf6/QcqHEO7RdbPQNsHU=
-=EZzj
------END PGP SIGNATURE-----
diff --git a/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild b/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild
index 45335a87b38f..60d254dae655 100644
--- a/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild,v 1.1 2007/08/17 08:57:02 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild,v 1.2 2008/01/06 21:18:52 philantrop Exp $
 
 inherit kde-dist eutils
 
@@ -20,7 +20,8 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
 	x11-libs/libXtst"
 
 RDEPEND="${BOTH_DEPEND}
-	crypt? ( app-crypt/gnupg )
+	crypt? ( app-crypt/gnupg
+			app-crypt/pinentry )
 	!x11-misc/superkaramba"
 
 DEPEND="${BOTH_DEPEND}
@@ -34,6 +35,16 @@ PATCHES="${FILESDIR}/klaptopdaemon-3.5.7-libXss-linking.patch
 		${FILESDIR}/klaptopdaemon-3.5.7-has_acpi_sleep.patch"
 EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff"
 
+pkg_setup() {
+	if use crypt && ! built_with_use app-crypt/pinentry gtk && ! built_with_use app-crypt/pinentry qt3 ; then
+		eerror "kgpg needs app-crypt/pinentry built with either the gtk or qt3 USE flag."
+		eerror "Please enable either USE flag and re-install app-crypt/pinentry."
+		die "app-crypt/pinentry needs to be rebuilt with gtk or qt3 support."
+	fi
+
+	kde_pkg_setup
+}
+
 src_unpack() {
 	kde_src_unpack
 	sed -i -e "s:Hidden=true:Hidden=false:" ksim/ksim.desktop || die "sed failed"
@@ -52,5 +63,5 @@ src_compile() {
 src_install() {
 	kde_src_install
 	# see bug 144731
-	rm ${D}${KDEDIR}/share/applications/kde/ksim.desktop
+	rm "${D}${KDEDIR}/share/applications/kde/ksim.desktop"
 }
diff --git a/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild b/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild
index 43a2fffd87fd..8591cba0662b 100644
--- a/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild,v 1.1 2007/11/20 13:46:02 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild,v 1.2 2008/01/06 21:18:52 philantrop Exp $
 
 inherit kde-dist eutils
 
@@ -20,7 +20,8 @@ BOTH_DEPEND="~kde-base/kdebase-${PV}
 		x11-libs/libXtst"
 
 RDEPEND="${BOTH_DEPEND}
-		crypt? ( app-crypt/gnupg )"
+		crypt? ( app-crypt/gnupg
+				app-crypt/pinentry )"
 
 DEPEND="${BOTH_DEPEND}
 		xscreensaver? ( x11-libs/libXScrnSaver )
@@ -34,6 +35,16 @@ PATCHES="${FILESDIR}/superkaramba-3.5.7-network_sensor.patch
 EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff
 				klaptopdaemon-3.5-lock-and-hibernate.diff"
 
+pkg_setup() {
+	if use crypt && ! built_with_use app-crypt/pinentry gtk && ! built_with_use app-crypt/pinentry qt3 ; then
+		eerror "kgpg needs app-crypt/pinentry built with either the gtk or qt3 USE flag."
+		eerror "Please enable either USE flag and re-install app-crypt/pinentry."
+		die "app-crypt/pinentry needs to be rebuilt with gtk or qt3 support."
+	fi
+
+	kde_pkg_setup
+}
+
 src_unpack() {
 	kde_src_unpack