Fixing Tk USE flag test, bug 258893.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 35 insertions, 11 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index e52927e22460..aa4291ee4e48 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.379 2009/02/23 18:11:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.380 2009/02/24 10:15:24 a3li Exp $
+
+  24 Feb 2009; Alex Legler <a3li@gentoo.org> ruby-1.8.6_p287-r5.ebuild,
+  ruby-1.8.6_p287-r12.ebuild, ruby-1.8.7_p72-r2.ebuild:
+  Fixing Tk USE flag test, bug 258893.
 
   23 Feb 2009; Brent Baude <ranger@gentoo.org> ruby-1.8.6_p287-r5.ebuild:
   Marking ruby-1.8.6_p287-r5 ppc64 for bug 260006
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 3c81becadb9f..fe24824746aa 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ruby-1.8.6-memory-leak.diff 1351 RMD160 cba1335fcd52df26b4b2884dea14e0c74852b67a SHA1 184c1743592684abfc1cce8ffa38ae749fe0a1b1 SHA256 90dbc7b444ed936ed8a1fadb443240ec494a6c748d38ff089af423e50bdd9528
 AUX ruby-1.8.6-openssl.patch 4892 RMD160 7ffca1f0d339c60f3a4d1cd452c78eace3bd1f62 SHA1 d5279868d614cfeb2e0eba984096096515baafe0 SHA256 ad98b05dc7a2ba9ac5fac21094660c919a987222db19ff5f8bad8e16ae1a6f49
 AUX ruby-1.8.6-shortname_constants.patch 1390 RMD160 0920bf92ddccf7f01626f705ddba65258531fd29 SHA1 ad3e0ec4867d86a2b94cbd483ea621ef9ca5359e SHA256 c9ba2a01c622017d6863b8ccbf68211d3b691099e0f3cd75b66949bc2b6896fe
@@ -13,11 +16,19 @@ EBUILD ruby-1.8.6_p114.ebuild 4931 RMD160 2c4ebea5ed7e80ca3473397cdd126a987bdfe9
 EBUILD ruby-1.8.6_p287-r1.ebuild 4646 RMD160 39915495b9f14fa349360553ef26b405fade5a4a SHA1 70861c23eed9eeabd4b1b1353c5258a1d0a832c9 SHA256 ad5cc4a5320fb83349b14e98cf8cd6f2e791cb4bc82919e21f562bd5ac4b044e
 EBUILD ruby-1.8.6_p287-r10.ebuild 4731 RMD160 146d3835bf6b3c90a17cebe12189e960b0f59540 SHA1 5676c1882d1b5d8d38fb4fac8766bcaeda0ab146 SHA256 cca23cc42f3e619ab14a2ae4520614a1401e7866d9d9979f05a96a37f41ff8ba
 EBUILD ruby-1.8.6_p287-r11.ebuild 4794 RMD160 fb6e51eb819314a35360fbc397a6541d670a24b9 SHA1 e752bad43c64ea2fc59d7bafe9b2fe4155aaf24b SHA256 be1ad42428ddbbfc9b54381cd1f5a74b46f0d5e944ef21f24584d0bfff809b73
-EBUILD ruby-1.8.6_p287-r12.ebuild 5279 RMD160 0eee72218f6a50b389b0d14d761b1308bf96c314 SHA1 a926529124f6ca5706897a2c133c67ae35443bce SHA256 ed89c5760c6dfd89a58af9c7681a43ffc914f02b7225338a7fe469468da2e891
+EBUILD ruby-1.8.6_p287-r12.ebuild 5349 RMD160 5a11079d81af731b90aec937cfba10c25286e4b7 SHA1 f0c54658349017eaddb870d0e5dd104dd3f0b73f SHA256 6eaf9116a0244ddd0cc3c8fb2d79b34f532c3cb82246c7255d172ac02b8d08ed
 EBUILD ruby-1.8.6_p287-r3.ebuild 4716 RMD160 bd81fadaeacb6fd6e2186b6620fd5f7771de7279 SHA1 200d8db91cf95b5aee62d50c44c1e84a7340319d SHA256 e6a082b15adfb9f713eff21e97a40b435e167d4ce37a3fd47272b26ae4507dc4
 EBUILD ruby-1.8.6_p287-r4.ebuild 4754 RMD160 1d177a447f5a28788c7da5fb1f28ab58ea5a47e7 SHA1 b0ac9d1a58a06fe66c9eb17febabde0e19f047c0 SHA256 aece074422486b145727eaa2181317f0e7d2c1b5f476542c76117b50892be880
-EBUILD ruby-1.8.6_p287-r5.ebuild 5249 RMD160 a2fa1ccac85b182e01b00945fec46d4bb7359e71 SHA1 235aacd77aa4da844b75e59b44986c7d5d534f16 SHA256 51a8474a2f49c942a976364f8accabf8089ea46ed1c931e7619c90441919bf70
+EBUILD ruby-1.8.6_p287-r5.ebuild 5317 RMD160 c21c088ff9d86c542f9467c07f7249bf5ffe4240 SHA1 d251846cec512dee4da3f77487e7eb5c415e8f32 SHA256 8d918544d0efbbb5af86973338f06d43181f1785e8e5acdd2fe44522da440b51
 EBUILD ruby-1.8.7_p72-r1.ebuild 4996 RMD160 fbb788ad0a6e6084843954bc4d26d18d6e3084f2 SHA1 30e2c7f785fa3ec124baa41476e0642005e366cb SHA256 dacdfba23768e420afdf3331072bc47247aa0049cd3e913a3d3e76e9f72ea46e
-EBUILD ruby-1.8.7_p72-r2.ebuild 5483 RMD160 42d8ca02a69aacac9132e0541ea8bdfc8ec704b0 SHA1 739230e1bf6149e80e708d804fc90bebbae33525 SHA256 9a02f0d4da895bb4f7177ddbf95493f75c03fe4239c09fe7fc2f4239f543475b
-MISC ChangeLog 57179 RMD160 1eb361a43eab4161e20957fa8435314e18a6b38e SHA1 8e516bb9dd5a307c2623af456b9fdfae7c7ecd00 SHA256 c24d88b6de7cba7af252f3ac533b5bccdbcb333abbd285a4c5f108657d3943fe
+EBUILD ruby-1.8.7_p72-r2.ebuild 5553 RMD160 203e6c9d9c5db10550881df8faa08f63f4689413 SHA1 ed63bbde428bd5c40459582607a45295ede48a98 SHA256 1fb5b660f269a925aa3c799c9a9973e604fdc01158958e4e79dad51fdfe8b91b
+MISC ChangeLog 57345 RMD160 5f7cca17855b1d619731612d5757650e96a3ecad SHA1 525958bf3c1aa84de28ca87bf17437a934169e6c SHA256 50b50e2c906108129be1363146ecc630ace04361f0f86fd2a4db641ed3e43ea0
 MISC metadata.xml 262 RMD160 f8642aa78425fe09dc0e0660cb20a5bd4233d5bb SHA1 64def0369477ecf76b9285fb9c1cf0e6a4f334e5 SHA256 5ee3c0cfedcb966505e4fafcfc5321a8ee20c128da9bbcafff5aa268df588d59
+MISC ruby-1.8.7_p72-r2.ebuild.orig 5483 RMD160 42d8ca02a69aacac9132e0541ea8bdfc8ec704b0 SHA1 739230e1bf6149e80e708d804fc90bebbae33525 SHA256 9a02f0d4da895bb4f7177ddbf95493f75c03fe4239c09fe7fc2f4239f543475b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmjyMYACgkQk3qunHEll7OFfwCgtL4ZG9ecY7nAsZxdb2tsav9L
+HpUAn3EmUfDKio115L6UfW1MrgCMmuNt
+=/2tK
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.8.6_p287-r12.ebuild b/dev-lang/ruby/ruby-1.8.6_p287-r12.ebuild
index c712ad0a9f07..0fbd4a447061 100644
--- a/dev-lang/ruby/ruby-1.8.6_p287-r12.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p287-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r12.ebuild,v 1.1 2009/02/23 14:05:31 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r12.ebuild,v 1.2 2009/02/24 10:15:24 a3li Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -40,7 +40,10 @@ PDEPEND="emacs? ( app-emacs/ruby-mode )
 PROVIDE="virtual/ruby"
 
 pkg_setup() {
-	if use tk && ! (use threads == built_with_use dev-lang/tk threads) ; then
+	use tk || return
+
+	if (use threads && ! built_with_use dev-lang/tk threads) \
+		|| (! use threads && built_with_use dev-lang/tk threads) ; then
 		eerror
 		eerror "You have Tk support enabled."
 		eerror
diff --git a/dev-lang/ruby/ruby-1.8.6_p287-r5.ebuild b/dev-lang/ruby/ruby-1.8.6_p287-r5.ebuild
index 8770193296f2..3d767548bf77 100644
--- a/dev-lang/ruby/ruby-1.8.6_p287-r5.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p287-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r5.ebuild,v 1.5 2009/02/23 18:11:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r5.ebuild,v 1.6 2009/02/24 10:15:24 a3li Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -40,7 +40,10 @@ PDEPEND="emacs? ( app-emacs/ruby-mode )
 PROVIDE="virtual/ruby"
 
 pkg_setup() {
-	if use tk && ! (use threads == built_with_use dev-lang/tk threads) ; then
+	use tk || return
+
+	if (use threads && ! built_with_use dev-lang/tk threads) \
+		|| (! use threads && built_with_use dev-lang/tk threads) ; then
 		eerror
 		eerror "You have Tk support enabled."
 		eerror
diff --git a/dev-lang/ruby/ruby-1.8.7_p72-r2.ebuild b/dev-lang/ruby/ruby-1.8.7_p72-r2.ebuild
index 4a542562187b..403140a27a55 100644
--- a/dev-lang/ruby/ruby-1.8.7_p72-r2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.7_p72-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p72-r2.ebuild,v 1.1 2009/02/23 14:05:31 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p72-r2.ebuild,v 1.2 2009/02/24 10:15:24 a3li Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -42,7 +42,10 @@ PDEPEND="emacs? ( app-emacs/ruby-mode )
 PROVIDE="virtual/ruby"
 
 pkg_setup() {
-	if use tk && ! (use threads == built_with_use dev-lang/tk threads) ; then
+	use tk || return
+
+	if (use threads && ! built_with_use dev-lang/tk threads) \
+		|| (! use threads && built_with_use dev-lang/tk threads) ; then
 		eerror
 		eerror "You have Tk support enabled."
 		eerror