| 1 |
philantrop 08/01/06 21:18:52 |
| 2 |
|
| 3 |
Modified: ChangeLog kdeutils-3.5.7-r1.ebuild |
| 4 |
kdeutils-3.5.8-r1.ebuild |
| 5 |
Log: |
| 6 |
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. |
| 7 |
(Portage version: 2.1.4_rc14) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.216 kde-base/kdeutils/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/ChangeLog?rev=1.216&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/ChangeLog?rev=1.216&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/ChangeLog?r1=1.215&r2=1.216 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v |
| 19 |
retrieving revision 1.215 |
| 20 |
retrieving revision 1.216 |
| 21 |
diff -u -r1.215 -r1.216 |
| 22 |
--- ChangeLog 20 Nov 2007 13:46:02 -0000 1.215 |
| 23 |
+++ ChangeLog 6 Jan 2008 21:18:52 -0000 1.216 |
| 24 |
@@ -1,6 +1,12 @@ |
| 25 |
# ChangeLog for kde-base/kdeutils |
| 26 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.215 2007/11/20 13:46:02 philantrop Exp $ |
| 28 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.216 2008/01/06 21:18:52 philantrop Exp $ |
| 30 |
+ |
| 31 |
+ 06 Jan 2008; Wulf C. Krueger <philantrop@g.o> |
| 32 |
+ kdeutils-3.5.7-r1.ebuild, kdeutils-3.5.8-r1.ebuild: |
| 33 |
+ Added a check for app-crypt/pinentry having been built with either the gtk |
| 34 |
+ or qt3 USE flag as otherwise essential functionality of kgpg won't be |
| 35 |
+ accessible. Fixes bug 204139. |
| 36 |
|
| 37 |
*kdeutils-3.5.8-r1 (20 Nov 2007) |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.2 kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild?rev=1.2&view=markup |
| 45 |
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 |
| 46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild?r1=1.1&r2=1.2 |
| 47 |
|
| 48 |
Index: kdeutils-3.5.7-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild,v |
| 51 |
retrieving revision 1.1 |
| 52 |
retrieving revision 1.2 |
| 53 |
diff -u -r1.1 -r1.2 |
| 54 |
--- kdeutils-3.5.7-r1.ebuild 17 Aug 2007 08:57:02 -0000 1.1 |
| 55 |
+++ kdeutils-3.5.7-r1.ebuild 6 Jan 2008 21:18:52 -0000 1.2 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
-# Copyright 1999-2007 Gentoo Foundation |
| 58 |
+# Copyright 1999-2008 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
-# $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 $ |
| 61 |
+# $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 $ |
| 62 |
|
| 63 |
inherit kde-dist eutils |
| 64 |
|
| 65 |
@@ -20,7 +20,8 @@ |
| 66 |
x11-libs/libXtst" |
| 67 |
|
| 68 |
RDEPEND="${BOTH_DEPEND} |
| 69 |
- crypt? ( app-crypt/gnupg ) |
| 70 |
+ crypt? ( app-crypt/gnupg |
| 71 |
+ app-crypt/pinentry ) |
| 72 |
!x11-misc/superkaramba" |
| 73 |
|
| 74 |
DEPEND="${BOTH_DEPEND} |
| 75 |
@@ -34,6 +35,16 @@ |
| 76 |
${FILESDIR}/klaptopdaemon-3.5.7-has_acpi_sleep.patch" |
| 77 |
EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff" |
| 78 |
|
| 79 |
+pkg_setup() { |
| 80 |
+ if use crypt && ! built_with_use app-crypt/pinentry gtk && ! built_with_use app-crypt/pinentry qt3 ; then |
| 81 |
+ eerror "kgpg needs app-crypt/pinentry built with either the gtk or qt3 USE flag." |
| 82 |
+ eerror "Please enable either USE flag and re-install app-crypt/pinentry." |
| 83 |
+ die "app-crypt/pinentry needs to be rebuilt with gtk or qt3 support." |
| 84 |
+ fi |
| 85 |
+ |
| 86 |
+ kde_pkg_setup |
| 87 |
+} |
| 88 |
+ |
| 89 |
src_unpack() { |
| 90 |
kde_src_unpack |
| 91 |
sed -i -e "s:Hidden=true:Hidden=false:" ksim/ksim.desktop || die "sed failed" |
| 92 |
@@ -52,5 +63,5 @@ |
| 93 |
src_install() { |
| 94 |
kde_src_install |
| 95 |
# see bug 144731 |
| 96 |
- rm ${D}${KDEDIR}/share/applications/kde/ksim.desktop |
| 97 |
+ rm "${D}${KDEDIR}/share/applications/kde/ksim.desktop" |
| 98 |
} |
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
1.2 kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild |
| 103 |
|
| 104 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild?rev=1.2&view=markup |
| 105 |
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 |
| 106 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild?r1=1.1&r2=1.2 |
| 107 |
|
| 108 |
Index: kdeutils-3.5.8-r1.ebuild |
| 109 |
=================================================================== |
| 110 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.8-r1.ebuild,v |
| 111 |
retrieving revision 1.1 |
| 112 |
retrieving revision 1.2 |
| 113 |
diff -u -r1.1 -r1.2 |
| 114 |
--- kdeutils-3.5.8-r1.ebuild 20 Nov 2007 13:46:02 -0000 1.1 |
| 115 |
+++ kdeutils-3.5.8-r1.ebuild 6 Jan 2008 21:18:52 -0000 1.2 |
| 116 |
@@ -1,6 +1,6 @@ |
| 117 |
-# Copyright 1999-2007 Gentoo Foundation |
| 118 |
+# Copyright 1999-2008 Gentoo Foundation |
| 119 |
# Distributed under the terms of the GNU General Public License v2 |
| 120 |
-# $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 $ |
| 121 |
+# $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 $ |
| 122 |
|
| 123 |
inherit kde-dist eutils |
| 124 |
|
| 125 |
@@ -20,7 +20,8 @@ |
| 126 |
x11-libs/libXtst" |
| 127 |
|
| 128 |
RDEPEND="${BOTH_DEPEND} |
| 129 |
- crypt? ( app-crypt/gnupg )" |
| 130 |
+ crypt? ( app-crypt/gnupg |
| 131 |
+ app-crypt/pinentry )" |
| 132 |
|
| 133 |
DEPEND="${BOTH_DEPEND} |
| 134 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
| 135 |
@@ -34,6 +35,16 @@ |
| 136 |
EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff |
| 137 |
klaptopdaemon-3.5-lock-and-hibernate.diff" |
| 138 |
|
| 139 |
+pkg_setup() { |
| 140 |
+ if use crypt && ! built_with_use app-crypt/pinentry gtk && ! built_with_use app-crypt/pinentry qt3 ; then |
| 141 |
+ eerror "kgpg needs app-crypt/pinentry built with either the gtk or qt3 USE flag." |
| 142 |
+ eerror "Please enable either USE flag and re-install app-crypt/pinentry." |
| 143 |
+ die "app-crypt/pinentry needs to be rebuilt with gtk or qt3 support." |
| 144 |
+ fi |
| 145 |
+ |
| 146 |
+ kde_pkg_setup |
| 147 |
+} |
| 148 |
+ |
| 149 |
src_unpack() { |
| 150 |
kde_src_unpack |
| 151 |
|
| 152 |
|
| 153 |
|
| 154 |
|
| 155 |
-- |
| 156 |
gentoo-commits@l.g.o mailing list |
Archives