break out built_with_use test, wrap in has_version. fixes #136402

Package-Manager: portage-2.1.1_pre2-r2

3 files changed, 38 insertions, 29 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 25acc7fb0c1d..e9f2f6ff4c52 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.32 2006/02/21 18:29:33 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.33 2006/07/03 18:33:42 allanonjl Exp $
+
+  03 Jul 2006; John N. Laliberte <allanonjl@gentoo.org> meld-1.1.3.ebuild:
+  break out built_with_use test, wrap in has_version.  fixes #136402
 
 *meld-1.1.3 (21 Feb 2006)
 
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 12f5073a355c..3c815f9b8d0b 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,27 +1,36 @@
-MD5 27f079da3d19001ba875fbc9e58b2e8a ChangeLog 4991
-RMD160 3f95b440e927a7cdde734fb5ead519179ea9b49d ChangeLog 4991
-SHA256 c0e13ae722cf0617c2e1de3a476957deb11325e5bc91fbe28a286b2a4cea6c3a ChangeLog 4991
-MD5 1bd76e477a20630600aeb1d8ff952dc7 files/digest-meld-1.0.0 63
-RMD160 e06fc9137a22b236360775a48be2dd56edbde9c9 files/digest-meld-1.0.0 63
-SHA256 6d98c0df07aed235d8e85b21a70a1c7294c964231afe133c8d6d33705b9757eb files/digest-meld-1.0.0 63
-MD5 dba9f4dc3e45ac0d468532482b381632 files/digest-meld-1.1.2 63
-RMD160 4b9dbde73f05721f8f56d534ea2a048aa88e964b files/digest-meld-1.1.2 63
-SHA256 732bf8ddab33cf4e55164bd3ea978014cb5067fefcbefe25dd2eb6666e3a5ab3 files/digest-meld-1.1.2 63
-MD5 1d95dee1f5a4b23fa11a334ef1ea4a75 files/digest-meld-1.1.3 235
-RMD160 2cfbdd98b0f1aacc04e05cf05d676a666354f117 files/digest-meld-1.1.3 235
-SHA256 59fc6d05cf97b39dca34fdfc4161642aa1bad60c3f811bb668064191c8e2ebdb files/digest-meld-1.1.3 235
+AUX meld-1.0.0-frpo.patch 377 RMD160 abb6c33943585bca10ca4d05989dfcc25717bf55 SHA1 f9f7ebf30dc6720cc4048e9d7b1cccabf0347bc7 SHA256 35f4c08a692f5c7c0c9cd5983924ea6466dd0f6eba104eece52a2ae43a9a2a16
 MD5 e2cf0267e1fb705025019ee2840d509b files/meld-1.0.0-frpo.patch 377
 RMD160 abb6c33943585bca10ca4d05989dfcc25717bf55 files/meld-1.0.0-frpo.patch 377
 SHA256 35f4c08a692f5c7c0c9cd5983924ea6466dd0f6eba104eece52a2ae43a9a2a16 files/meld-1.0.0-frpo.patch 377
+DIST meld-1.0.0.tar.bz2 304181
+DIST meld-1.1.2.tar.bz2 588213
+DIST meld-1.1.3.tar.bz2 597967 RMD160 43134e32b33aa2f5a405c4ad2ba90eb22b632fbc SHA1 e7f17e8426f29aa448cfed306dccb00ac0a3e43b SHA256 0494636661aadf07520e6d75c986a53af136b6d6c4e71bdcb9dde01554dcbdb9
+EBUILD meld-1.0.0.ebuild 1574 RMD160 38b330437ad576eb380dca44b8dbcd2502922886 SHA1 ae9ff7c4a6793be73b7247d35772a11b318c6502 SHA256 14a2568e31efca9335dcf54b1aa1be6ca5c89d1a64ca57a5a9d00ab338f1422e
 MD5 3648682f5d11b70e80cf429d2593615a meld-1.0.0.ebuild 1574
 RMD160 38b330437ad576eb380dca44b8dbcd2502922886 meld-1.0.0.ebuild 1574
 SHA256 14a2568e31efca9335dcf54b1aa1be6ca5c89d1a64ca57a5a9d00ab338f1422e meld-1.0.0.ebuild 1574
+EBUILD meld-1.1.2.ebuild 1443 RMD160 70ed85e8e1cb801e9693d2d8ffc4561f56b61e4e SHA1 9bc226a79e230b9b7b8b590dea8b5d5bcb6efdc6 SHA256 255e6d640a7484f1f26c67a4ebe3f9d06300e31fa00184834d31798d798a537e
 MD5 edec3470faa5e4d845ea3dc560fe0b6f meld-1.1.2.ebuild 1443
 RMD160 70ed85e8e1cb801e9693d2d8ffc4561f56b61e4e meld-1.1.2.ebuild 1443
 SHA256 255e6d640a7484f1f26c67a4ebe3f9d06300e31fa00184834d31798d798a537e meld-1.1.2.ebuild 1443
-MD5 fba620880ce85c954be3ca5bd54dc328 meld-1.1.3.ebuild 1440
-RMD160 83dcab279fda2c7b9d3f0120a317ddb78e72c696 meld-1.1.3.ebuild 1440
-SHA256 b952c583706d081c06e24e141c89b53a5ff7f1263c3bf7fcae0093ba888cdfa9 meld-1.1.3.ebuild 1440
+EBUILD meld-1.1.3.ebuild 1409 RMD160 b51a48dc7192144251caf47b1ef9718d2ad5911b SHA1 cfffd4718b3127c3fe537e145454a48077c08b59 SHA256 6fe9a1899fcb9e4ce3107505e022b733196ce50f664b11b3976bc7736cfa51d6
+MD5 166365278b6024ca11d0f6010755689c meld-1.1.3.ebuild 1409
+RMD160 b51a48dc7192144251caf47b1ef9718d2ad5911b meld-1.1.3.ebuild 1409
+SHA256 6fe9a1899fcb9e4ce3107505e022b733196ce50f664b11b3976bc7736cfa51d6 meld-1.1.3.ebuild 1409
+MISC ChangeLog 5136 RMD160 f276a29d8765e81699de9f47d44ae41a1806fc2b SHA1 51fa27c81ec5983267bea2d29cc542d107d39a96 SHA256 7bb92d7e710d4afe755905c9a46d4c173494e6c418cda2136842eb3bf749ab7f
+MD5 d9a1d2324da1404d072d5653d2685314 ChangeLog 5136
+RMD160 f276a29d8765e81699de9f47d44ae41a1806fc2b ChangeLog 5136
+SHA256 7bb92d7e710d4afe755905c9a46d4c173494e6c418cda2136842eb3bf749ab7f ChangeLog 5136
+MISC metadata.xml 222 RMD160 96c8a2e104ee15c6bce7aaf7c73398f3287e6357 SHA1 e78ebe8223fab03acef8562079599d6d962e494e SHA256 c7f626d802a17a56823c72e1d7ffab65565e530144d38af0caec6198f12c5f5f
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
 RMD160 96c8a2e104ee15c6bce7aaf7c73398f3287e6357 metadata.xml 222
 SHA256 c7f626d802a17a56823c72e1d7ffab65565e530144d38af0caec6198f12c5f5f metadata.xml 222
+MD5 1bd76e477a20630600aeb1d8ff952dc7 files/digest-meld-1.0.0 63
+RMD160 e06fc9137a22b236360775a48be2dd56edbde9c9 files/digest-meld-1.0.0 63
+SHA256 6d98c0df07aed235d8e85b21a70a1c7294c964231afe133c8d6d33705b9757eb files/digest-meld-1.0.0 63
+MD5 dba9f4dc3e45ac0d468532482b381632 files/digest-meld-1.1.2 63
+RMD160 4b9dbde73f05721f8f56d534ea2a048aa88e964b files/digest-meld-1.1.2 63
+SHA256 732bf8ddab33cf4e55164bd3ea978014cb5067fefcbefe25dd2eb6666e3a5ab3 files/digest-meld-1.1.2 63
+MD5 1d95dee1f5a4b23fa11a334ef1ea4a75 files/digest-meld-1.1.3 235
+RMD160 2cfbdd98b0f1aacc04e05cf05d676a666354f117 files/digest-meld-1.1.3 235
+SHA256 59fc6d05cf97b39dca34fdfc4161642aa1bad60c3f811bb668064191c8e2ebdb files/digest-meld-1.1.3 235
diff --git a/dev-util/meld/meld-1.1.3.ebuild b/dev-util/meld/meld-1.1.3.ebuild
index cca97543b791..e2312e393071 100644
--- a/dev-util/meld/meld-1.1.3.ebuild
+++ b/dev-util/meld/meld-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2006/02/21 18:29:33 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.3.ebuild,v 1.2 2006/07/03 18:33:42 allanonjl Exp $
 
 inherit python gnome2 eutils
 
@@ -20,29 +20,26 @@ DEPEND=">=dev-lang/python-2.3
 	>=dev-python/pyorbit-1.99.0
 	dev-python/gnome-python-extras"
 
-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."
+	if has_version "=dev-python/pygtk-2.6*"; then
+		if ! built_with_use "dev-python/pygtk" 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
 	fi
 }
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	gnome2_src_unpack
 
 	# Fix the .desktop icon name
 	sed -i -e "s:Icon=meld:Icon=/usr/share/pixmaps/meld.png:" ./meld.desktop.in
 
-	# fix omf scrollkeeper
-	gnome2_omf_fix help/*/GNUmakefile
-
 	# fix the prefix so its not in */local/*
 	sed -i -e 's:/usr/local:/usr:' INSTALL
 }