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, 48 insertions, 30 deletions

diff --git a/kde-base/kgpg/ChangeLog b/kde-base/kgpg/ChangeLog
index dce54137cce2..b12c005dc862 100644
--- a/kde-base/kgpg/ChangeLog
+++ b/kde-base/kgpg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kgpg
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.72 2007/10/19 22:56:28 philantrop Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.73 2008/01/06 19:41:29 philantrop Exp $
+
+  06 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> kgpg-3.5.7.ebuild,
+  kgpg-3.5.8.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.
 
 *kgpg-3.5.8 (19 Oct 2007)
 
diff --git a/kde-base/kgpg/Manifest b/kde-base/kgpg/Manifest
index b0d3af44551a..a3cd9fd7a8fd 100644
--- a/kde-base/kgpg/Manifest
+++ b/kde-base/kgpg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kdeutils-3.5.5.tar.bz2 2988542 RMD160 28ba45da550fd81f2ff9670cc0a98f7d965c3e92 SHA1 9f81cf7987e23b12861635cfeb69dc46f87f050f SHA256 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457
 DIST kdeutils-3.5.6.tar.bz2 2989659 RMD160 ae0430b4647c259bf730fb427325644b0e8da721 SHA1 4ac4b1a9ecb5c695eaff22b15e45eb043516f816 SHA256 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b
 DIST kdeutils-3.5.7.tar.bz2 3068596 RMD160 0382278d69e71ff77178902f06126bda0f771ee8 SHA1 8e5ba582de84851ed153998f93c8a3789e8df6bd SHA256 e72de75dd40e1422e4da5957acafc06278418f60850aea21524d857abb97adf8
@@ -13,18 +10,18 @@ EBUILD kgpg-3.5.6.ebuild 470 RMD160 775d394fcbd959ae2c985ecec29caba9c7d097ad SHA
 MD5 62a21a0995440637b2dfaf189b12ccb0 kgpg-3.5.6.ebuild 470
 RMD160 775d394fcbd959ae2c985ecec29caba9c7d097ad kgpg-3.5.6.ebuild 470
 SHA256 c195ce4a8a8668bba4c7779b7c872ac31bd21b2b562aacda5c60241c697830f6 kgpg-3.5.6.ebuild 470
-EBUILD kgpg-3.5.7.ebuild 461 RMD160 bcd93ad46b60c39adcffc96875dee85c69fe9acc SHA1 232a0b7de2989b71d2e3fbfcc70384b7d8726c20 SHA256 cc6de09ef023e79837defae30287e39851a9192cbd9a8c3d4b92a8e18125507f
-MD5 afd52148bc4fce35e4eec783bc5e0501 kgpg-3.5.7.ebuild 461
-RMD160 bcd93ad46b60c39adcffc96875dee85c69fe9acc kgpg-3.5.7.ebuild 461
-SHA256 cc6de09ef023e79837defae30287e39851a9192cbd9a8c3d4b92a8e18125507f kgpg-3.5.7.ebuild 461
-EBUILD kgpg-3.5.8.ebuild 471 RMD160 ab084893399e5d78781fbe06c799a72b3c1a07fe SHA1 556fd3be3b4300ca968b0b5afac4c9790343c30b SHA256 20bde4671bf0ec40ca38cf0b739f8895b0abb4ef51777df85cae264296b9dad9
-MD5 978d0867a154971b0b426635667ae798 kgpg-3.5.8.ebuild 471
-RMD160 ab084893399e5d78781fbe06c799a72b3c1a07fe kgpg-3.5.8.ebuild 471
-SHA256 20bde4671bf0ec40ca38cf0b739f8895b0abb4ef51777df85cae264296b9dad9 kgpg-3.5.8.ebuild 471
-MISC ChangeLog 8334 RMD160 e0bbc816c3d4790a9bfda9f7720dc8b8223c5fee SHA1 b798c356c3a2ee15181a6440a0679a23c817615f SHA256 fcfc1497df5e37bb528d26fe411769c02f2e5e7ce94c468bc267af88febbdab4
-MD5 68614792f3a696c068e4a66dbe4612fd ChangeLog 8334
-RMD160 e0bbc816c3d4790a9bfda9f7720dc8b8223c5fee ChangeLog 8334
-SHA256 fcfc1497df5e37bb528d26fe411769c02f2e5e7ce94c468bc267af88febbdab4 ChangeLog 8334
+EBUILD kgpg-3.5.7.ebuild 848 RMD160 6852f7345d6820dd7a0eeb15a2396dc4171f6089 SHA1 c70d4ab8afff1f1c40a117340e82b9f9dce74b2f SHA256 61fc5df92d4c9a2430d325c442f0c13bbe99e1cfbe0ccb4919c3d6635db04cd7
+MD5 508dde43bcfef21ddb31ebc1fbe0abd3 kgpg-3.5.7.ebuild 848
+RMD160 6852f7345d6820dd7a0eeb15a2396dc4171f6089 kgpg-3.5.7.ebuild 848
+SHA256 61fc5df92d4c9a2430d325c442f0c13bbe99e1cfbe0ccb4919c3d6635db04cd7 kgpg-3.5.7.ebuild 848
+EBUILD kgpg-3.5.8.ebuild 855 RMD160 6c3d10dc1ad10e00ab9b60e15cb98680421b4b39 SHA1 e8da53c271c041700db0e7d32a54f81f3902b6e8 SHA256 fef7b5af7cf1d29ff4707ad26366ce3ef96fb3db2ea077e3c5e18ca2ba4c9bd6
+MD5 867ce613f41e45b9045a2f48da9ccdd8 kgpg-3.5.8.ebuild 855
+RMD160 6c3d10dc1ad10e00ab9b60e15cb98680421b4b39 kgpg-3.5.8.ebuild 855
+SHA256 fef7b5af7cf1d29ff4707ad26366ce3ef96fb3db2ea077e3c5e18ca2ba4c9bd6 kgpg-3.5.8.ebuild 855
+MISC ChangeLog 8611 RMD160 97f32b8b104bddd363889fe1b586599ffde796fa SHA1 395aff3982c321113dbc78a815d28bcacad54358 SHA256 f99599299a076aef2a579b56e5613b7d3169e7bf27817176d79ee5517bc2d565
+MD5 1b0b49e6c9f734b3cdd02fad1e23dfa7 ChangeLog 8611
+RMD160 97f32b8b104bddd363889fe1b586599ffde796fa ChangeLog 8611
+SHA256 f99599299a076aef2a579b56e5613b7d3169e7bf27817176d79ee5517bc2d565 ChangeLog 8611
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -41,10 +38,3 @@ SHA256 99f0e78e5ee73c73c2d6d4e437abd401a6147e753bc7034d9e249e6914e15dfe files/di
 MD5 4c35967e18b3133fbde508b0c1520030 files/digest-kgpg-3.5.8 250
 RMD160 947cea52e8d439cce8af4510e36dff85c9de75ca files/digest-kgpg-3.5.8 250
 SHA256 3ec6f73ab1cbfebf588f43c38ccc7f6caef20363a013cc44b7ce90e3b31f0077 files/digest-kgpg-3.5.8 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHGTYwCkvF58q80IkRAhpNAKCZawCFUlyOM045DBblIK4Ii3wi5QCfV57r
-a8M7n6OdnpvM+4mYtLxVxUc=
-=rLwa
------END PGP SIGNATURE-----
diff --git a/kde-base/kgpg/kgpg-3.5.7.ebuild b/kde-base/kgpg/kgpg-3.5.7.ebuild
index be6e3179c28f..8921c9df3e9b 100644
--- a/kde-base/kgpg/kgpg-3.5.7.ebuild
+++ b/kde-base/kgpg/kgpg-3.5.7.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/kgpg/kgpg-3.5.7.ebuild,v 1.7 2007/08/11 15:16:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-3.5.7.ebuild,v 1.8 2008/01/06 19:41:29 philantrop Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -12,4 +12,15 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
 RDEPEND="${RDEPEND}
-	app-crypt/gnupg"
+	app-crypt/gnupg
+	app-crypt/pinentry"
+
+pkg_setup() {
+	if ! built_with_use app-crypt/pinentry gtk && ! built_with_use app-crypt/pinentry qt3 ; then
+		eerror "${PN} 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
+}
diff --git a/kde-base/kgpg/kgpg-3.5.8.ebuild b/kde-base/kgpg/kgpg-3.5.8.ebuild
index 79b54d9ba760..8d6cbf461a8c 100644
--- a/kde-base/kgpg/kgpg-3.5.8.ebuild
+++ b/kde-base/kgpg/kgpg-3.5.8.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/kgpg/kgpg-3.5.8.ebuild,v 1.1 2007/10/19 22:56:28 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-3.5.8.ebuild,v 1.2 2008/01/06 19:41:29 philantrop Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -12,4 +12,15 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
 RDEPEND="${RDEPEND}
-	app-crypt/gnupg"
+	app-crypt/gnupg
+	app-crypt/pinentry"
+
+pkg_setup() {
+	if ! built_with_use app-crypt/pinentry gtk && ! built_with_use app-crypt/pinentry qt3 ; then
+		eerror "${PN} 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
+}