Make sure tests work regardless of load order.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 28 insertions, 9 deletions

diff --git a/dev-ruby/builder/ChangeLog b/dev-ruby/builder/ChangeLog
index 3faec108dbf0..b8cd00fb45ea 100644
--- a/dev-ruby/builder/ChangeLog
+++ b/dev-ruby/builder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/builder
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/ChangeLog,v 1.43 2010/06/14 19:22:38 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/ChangeLog,v 1.44 2010/06/26 13:50:56 graaff Exp $
+
+  26 Jun 2010; Hans de Graaff <graaff@gentoo.org> builder-2.1.2-r1.ebuild,
+  builder-2.1.2-r2.ebuild, +files/builder-2.1.2-fix-tests.patch:
+  Make sure tests work regardless of load order.
 
   14 Jun 2010; Hans de Graaff <graaff@gentoo.org> +builder-2.1.2-r1.ebuild,
   builder-2.1.2-r2.ebuild:
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index 6d2fb209163d..7f9feca8bd53 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA256
 
 AUX builder-2.1.2-activesupport.patch 650 RMD160 d0bb88565997b211a24d127e1b7b95225f13ef96 SHA1 89d7a2e18f5647946c6778c9f335646ae7a716e4 SHA256 67e25efcd27f213ef511d86a985f0e445b646c24a36a661fc778961b1929c2f0
+AUX builder-2.1.2-fix-tests.patch 346 RMD160 acd98bca0e07fc74e069d633bb40592ecdbc2119 SHA1 232293bb6e52a4f94538b9573788cbb339e630ef SHA256 a195ed4c42ce0f9ae21df26c4e803d58b40f82aaa6692c8672d7285234ca7a77
 DIST builder-2.1.2.gem 22528 RMD160 73f0b0b5d0c2d268edbcee86599962cc94413ebb SHA1 d0ea89ea793c75853abd636ab86a79b7b57d6993 SHA256 0620b1c79431871b3323ff511da891db841419ff25d176e2c6b80e73b77ee542
 DIST builder-2.1.2.tgz 20255 RMD160 f55ccf22fec6b28fb310ee298b3691e9e7f6faab SHA1 8ccc85b7c81ca3ae16e3d07415199eca91e7cffd SHA256 9666250a78b4bfc31865da3ed07b9c714626d7cd976e7692071226554f2c3e7e
-EBUILD builder-2.1.2-r1.ebuild 921 RMD160 510c3341ad643020b640ff0a0312f0b35a85bb89 SHA1 d62a02cceee54fe387aba354dfe289d02d664f45 SHA256 23c5c36ceb2bf9f3836ddcc072e828f62102051ee5464c86f208a709bcc051f5
-EBUILD builder-2.1.2-r2.ebuild 922 RMD160 cbabae6424ba50e9d537b1ccf4f20865c744e91d SHA1 70fcc08fd4a3078df8b862c94e60b55de933fe7c SHA256 7069370d1c6994e5753c16913c3afb72bc78f324d2187e882636b1f51ee61ac6
+EBUILD builder-2.1.2-r1.ebuild 964 RMD160 b60be212dfc2b4de631e88e92ee24d3e169b7279 SHA1 d9a0b238e6ad8ab125cb29d0196dc6333402272d SHA256 1ce0959b488dfb00f00d9a36312e7a8fd6b71da34de9d419b7321a9ddc0030fc
+EBUILD builder-2.1.2-r2.ebuild 968 RMD160 f2119d73b9190982a2d8dbe59dd5f8d38604e2a8 SHA1 2277f255beff7e8ef31b891218b7b2498dffc203 SHA256 ea5a966c89ec14d7aefd875023c2b138de3b779fdcc7610ba366199615e478b0
 EBUILD builder-2.1.2.ebuild 503 RMD160 0116218c92b84e9b054d8a06db77152f925b8db1 SHA1 a3cefcf7adb3670ea3998a598f106c7121684c23 SHA256 1cd0e6f63364243d5bcae31371c55b251bff7586da7c0c414b3c2b0b63dac1d4
-MISC ChangeLog 5020 RMD160 1a0150513deec7600182b84ad9e0bdf7e0aaa704 SHA1 a36dcdb42b3a6f99087f6bb31f5c464b536c5d71 SHA256 33e0f599b3f0f28c5970ae7fc8f97a6b4809e65e338d0ae3d22645631ebd57e2
+MISC ChangeLog 5210 RMD160 38d6c7503aa68fbfde489393ca76ad78ae36225c SHA1 8e26de3af0902f051820dfda520c3ab0137d0aa3 SHA256 672acca1494fdf9d07eb55d2bc420b53c8480ae1b78f871360d63495ff1fb17c
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwWgYMACgkQZihJkut28Svn5gEAsk5kn1HKdvf8Q2AeVO6D+N0g
-HoMRCKFq/IImyQ1D/4oA/icJgY+azsdHjiFgNfnFLaABYeLPMfbHRnr3EZPeZMf0
-=L6U2
+iF4EAREIAAYFAkwmBcsACgkQZihJkut28Sv7+wD/VR4My9iTVxt+TNYfuvaqfFAD
+mgEtuZ9V24GIlHqLJioA/3lkW3qnP0JfWLBM3vdkic1oxiw/ASEHLxDU9Vel1LS0
+=lGv7
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/builder/builder-2.1.2-r1.ebuild b/dev-ruby/builder/builder-2.1.2-r1.ebuild
index cfaceb6a69d7..a8afa93f11e4 100644
--- a/dev-ruby/builder/builder-2.1.2-r1.ebuild
+++ b/dev-ruby/builder/builder-2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r1.ebuild,v 1.11 2010/06/14 19:22:38 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r1.ebuild,v 1.12 2010/06/26 13:50:56 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 jruby"
@@ -27,4 +27,5 @@ all_ruby_prepare() {
 	sed -i -e '/rdoc\.template .*jamis/d' Rakefile || die
 
 	epatch "${FILESDIR}"/${P}-activesupport.patch
+	epatch "${FILESDIR}"/${P}-fix-tests.patch
 }
diff --git a/dev-ruby/builder/builder-2.1.2-r2.ebuild b/dev-ruby/builder/builder-2.1.2-r2.ebuild
index 9597b2487c05..fe5f8ac4f6e5 100644
--- a/dev-ruby/builder/builder-2.1.2-r2.ebuild
+++ b/dev-ruby/builder/builder-2.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r2.ebuild,v 1.2 2010/06/10 03:20:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r2.ebuild,v 1.3 2010/06/26 13:50:56 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 jruby"
@@ -27,4 +27,5 @@ all_ruby_prepare() {
 	sed -i -e '/rdoc\.template .*jamis/d' Rakefile || die
 
 	epatch "${FILESDIR}"/${P}-activesupport.patch
+	epatch "${FILESDIR}"/${P}-fix-tests.patch
 }
diff --git a/dev-ruby/builder/files/builder-2.1.2-fix-tests.patch b/dev-ruby/builder/files/builder-2.1.2-fix-tests.patch
new file mode 100644
index 000000000000..c58b1a6774d0
--- /dev/null
+++ b/dev-ruby/builder/files/builder-2.1.2-fix-tests.patch
@@ -0,0 +1,12 @@
+Require the needed files explicitly. Otherwise tests might break if this
+test is found first.
+
+--- test/testeventbuilder.rb.~1~	2006-12-24 20:29:01.000000000 +0100
++++ test/testeventbuilder.rb	2010-06-26 15:43:50.853708583 +0200
+@@ -1,3 +1,6 @@
++require 'test/unit'
++require 'builder'
++
+ class TestEvents < Test::Unit::TestCase
+ 
+   class Target