* [gentoo-commits] gentoo-x86 commit in kde-base/kdeutils: ChangeLog kdeutils-3.5.7-r1.ebuild kdeutils-3.5.8-r1.ebuild
@ 2008-01-06 21:18 Wulf Krueger (philantrop)
0 siblings, 0 replies; only message in thread
From: Wulf Krueger (philantrop) @ 2008-01-06 21:18 UTC (permalink / raw
To: gentoo-commits
philantrop 08/01/06 21:18:52
Modified: ChangeLog kdeutils-3.5.7-r1.ebuild
kdeutils-3.5.8-r1.ebuild
Log:
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)
Revision Changes Path
1.216 kde-base/kdeutils/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/ChangeLog?rev=1.216&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/ChangeLog?rev=1.216&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/ChangeLog?r1=1.215&r2=1.216
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- ChangeLog 20 Nov 2007 13:46:02 -0000 1.215
+++ ChangeLog 6 Jan 2008 21:18:52 -0000 1.216
@@ -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)
1.2 kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild?r1=1.1&r2=1.2
Index: kdeutils-3.5.7-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdeutils-3.5.7-r1.ebuild 17 Aug 2007 08:57:02 -0000 1.1
+++ kdeutils-3.5.7-r1.ebuild 6 Jan 2008 21:18:52 -0000 1.2
@@ -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 @@
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 @@
${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_install() {
kde_src_install
# see bug 144731
- rm ${D}${KDEDIR}/share/applications/kde/ksim.desktop
+ rm "${D}${KDEDIR}/share/applications/kde/ksim.desktop"
}
1.2 kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild?r1=1.1&r2=1.2
Index: kdeutils-3.5.8-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdeutils-3.5.8-r1.ebuild 20 Nov 2007 13:46:02 -0000 1.1
+++ kdeutils-3.5.8-r1.ebuild 6 Jan 2008 21:18:52 -0000 1.2
@@ -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 @@
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 @@
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
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-01-06 21:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-06 21:18 [gentoo-commits] gentoo-x86 commit in kde-base/kdeutils: ChangeLog kdeutils-3.5.7-r1.ebuild kdeutils-3.5.8-r1.ebuild Wulf Krueger (philantrop)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox