gtk2 fix - bug #106560. Fixed USE test cludge

Package-Manager: portage-2.0.52-r1

diff --git a/app-admin/kedpm/ChangeLog b/app-admin/kedpm/ChangeLog
index 4ff0af90f5ac2f7c42786904432206157887609e..148561064a8035c29037d3215aa5142fed23803c 100644 (file)
--- a/app-admin/kedpm/ChangeLog
+++ b/app-admin/kedpm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/kedpm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/ChangeLog,v 1.10 2005/04/21 14:13:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/ChangeLog,v 1.11 2005/09/24 23:36:58 dragonheart Exp $
+
+  24 Sep 2005; Daniel Black <dragonheart@gentoo.org> kedpm-0.4.0.ebuild:
+  gtk2 fix - bug #106560. Fixed USE test cludge
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> kedpm-0.4.0.ebuild:
   stable on amd64

diff --git a/app-admin/kedpm/Manifest b/app-admin/kedpm/Manifest
index 98fa375a5bcd0959eda40eae1df16d3f601cf028..9562ebec5c5d8656648bcced6faeb5ea525535c0 100644 (file)
--- a/app-admin/kedpm/Manifest
+++ b/app-admin/kedpm/Manifest
@@ -1,5 +1,15 @@
-MD5 988f4d19da8938a0459c378aee6c0e27 ChangeLog 1088
-MD5 02ceb1dde621ec07ebad50ff44b1f63e kedpm-0.4.0.ebuild 1563
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9fc63480d5a838f1e6f47aac642d53d1 kedpm-0.4.0.ebuild 1409
 MD5 f18362b0e6199455a0da169b4f9298cf metadata.xml 362
+MD5 b8ef04297f6841b017bb01c5cd6f4047 ChangeLog 1216
 MD5 34870b4494ae80b5bdc9cc16ee6e4410 files/digest-kedpm-0.4.0 62
 MD5 3b9db9ce461473c5671acd122eb92b15 files/setup-doc.patch 627
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDNeMpmdTrptrqvGERAtXXAJ9lY8Pc8gmT5PcRY7TvmadDhFaqPwCfT0Ai
+hN7mBtYf9gvCiFBPRdVCUlo=
+=uyLO
+-----END PGP SIGNATURE-----

diff --git a/app-admin/kedpm/kedpm-0.4.0.ebuild b/app-admin/kedpm/kedpm-0.4.0.ebuild
index 66d1a85796aadd8b0651f813883ae5c1194b3ea6..18f1cbd5c66a5bdae3ba2dacec5091721b056f9a 100644 (file)
--- a/app-admin/kedpm/kedpm-0.4.0.ebuild
+++ b/app-admin/kedpm/kedpm-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/kedpm-0.4.0.ebuild,v 1.11 2005/04/21 14:13:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/kedpm-0.4.0.ebuild,v 1.12 2005/09/24 23:36:58 dragonheart Exp $
 
 inherit distutils eutils
 
@@ -11,21 +11,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc amd64"
-IUSE="gtk2"
+IUSE="gtk"
 
 DEPEND="virtual/python
        >=sys-apps/sed-4"
 RDEPEND="dev-python/pycrypto
-       gtk2? ( >=dev-python/pygtk-2 )"
+       gtk? ( >=dev-python/pygtk-2 )"
 
 pkg_setup() {
-       # If pygtk was compiled without gnome support, this command fails.
-       # Dirty hack but there is no way to depend on package compiled
-       # with specified USE flag.
-       if use gtk2
+       if use gtk
        then
-               grep gnome /var/db/pkg/dev-python/pygtk-*/USE &>/dev/null ||
-                       die "You need to compile pygtk-2 with gnome support!"
+               if ! built_with_use dev-python/pygtk gnome
+               then
+                       die "You need to compile dev-python/pygtk with gnome USE flag!"
+               fi
        fi
 }
 
@@ -39,7 +38,7 @@ src_unpack() {
 
        # If we don't compiling with GTK support, let's change default
        # frontend for kedpm to CLI.
-       use gtk2 || sed -i -e 's/"gtk"  # default/"cli"  # default/' scripts/kedpm
+       use gtk || sed -i -e 's/"gtk"  # default/"cli"  # default/' scripts/kedpm
 }
 
 src_install() {