Adding keyword checks for pygtk (resolves bug #103056

(Portage version: 2.1_pre3-r1)

4 files changed, 31 insertions, 19 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 02c1b9a50d43..6508f3e46d38 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/meld
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.30 2005/11/11 16:56:51 allanonjl Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.31 2006/01/08 21:41:21 compnerd Exp $
+
+  08 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org> meld-1.0.0.ebuild,
+  meld-1.1.2.ebuild:
+  Adding keyword checks for pygtk for versions prior to 2.8.0-r2
 
 *meld-1.1.2 (11 Nov 2005)
 
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 1c32dc5f393b..e6755b836e06 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,7 +1,7 @@
-MD5 c6bba68df72a499e5cbf683171a99492 meld-1.1.2.ebuild 1156
-MD5 8918134f77a1ef3cd8fc4d584ecc2b85 meld-1.0.0.ebuild 1563
-MD5 264427198e7eaf191cb9b9929c259b10 ChangeLog 4663
-MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
-MD5 e2cf0267e1fb705025019ee2840d509b files/meld-1.0.0-frpo.patch 377
+MD5 80b97b2782e0228426f889b50e42271d ChangeLog 4825
 MD5 1bd76e477a20630600aeb1d8ff952dc7 files/digest-meld-1.0.0 63
 MD5 dba9f4dc3e45ac0d468532482b381632 files/digest-meld-1.1.2 63
+MD5 e2cf0267e1fb705025019ee2840d509b files/meld-1.0.0-frpo.patch 377
+MD5 482b8df4bb0e020ad3568d8f27cf47ef meld-1.0.0.ebuild 1574
+MD5 5af69a73543c7ec9e05a4da43a9155d3 meld-1.1.2.ebuild 1444
+MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
diff --git a/dev-util/meld/meld-1.0.0.ebuild b/dev-util/meld/meld-1.0.0.ebuild
index 6acca4d1db87..15f53be4afc4 100644
--- a/dev-util/meld/meld-1.0.0.ebuild
+++ b/dev-util/meld/meld-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.0.0.ebuild,v 1.7 2005/10/02 14:29:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.0.0.ebuild,v 1.8 2006/01/08 21:41:21 compnerd Exp $
 
 inherit python gnome2 eutils
 
@@ -24,8 +24,7 @@ DEPEND=">=dev-lang/python-2.2
 #MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
-
-	if ! built_with_use dev-python/pygtk gnome ; then
+	if ! built_with_use '<dev-python/pygtk-2.8.0-r2' gnome ; then
 		einfo ""
 		einfo "Meld requires pygtk be built with the gnome use flag set."
 		einfo "Please re-emerge pygtk with the gnome use flag set."
diff --git a/dev-util/meld/meld-1.1.2.ebuild b/dev-util/meld/meld-1.1.2.ebuild
index 4e4ecd29c57a..9b38f2ee4aa7 100644
--- a/dev-util/meld/meld-1.1.2.ebuild
+++ b/dev-util/meld/meld-1.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.2.ebuild,v 1.1 2005/11/11 16:56:51 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.2.ebuild,v 1.2 2006/01/08 21:41:21 compnerd Exp $
 
 inherit python gnome2 eutils
 
@@ -18,13 +18,25 @@ DEPEND=">=dev-lang/python-2.2
 	>=dev-python/gnome-python-1.99.15
 	>=dev-python/pygtk-1.99.15
 	>=dev-python/pyorbit-1.99.0
-	dev-python/gnome-python-extras
-	"
+	dev-python/gnome-python-extras"
 
-src_unpack() {
+USE_DESTDIR="1"
+DOCS="AUTHORS COPYING INSTALL README.CVS changelog help/"
+
+pkg_setup() {
+	if ! built_with_use '<dev-python/pygtk-2.8.0-r2' gnome ; then
+		einfo
+		einfo "Meld requires pygtk to be built with the gnome use flag set."
+		einfo "Please re-emerge pygtk with the gnome use flag set."
+		einfo
+		die "You need to re-emerge pygtk with gnome use flag."
+	fi
+}
 
+src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	# Fix the .desktop icon name
 	sed -i -e "s:Icon=meld:Icon=/usr/share/pixmaps/meld.png:" ./meld.desktop.in
 
@@ -39,9 +51,6 @@ src_compile() {
 	emake || die "make failed"
 }
 
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING INSTALL README.CVS changelog help/"
-
 pkg_postinst() {
 	python_mod_optimize /usr/lib/meld
 }