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.

(Portage version: 2.1.4_rc14)

3 files changed, 37 insertions, 9 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/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