Fix file ordering issues with tests, fixing bug 323059.

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

4 files changed, 33 insertions, 8 deletions

diff --git a/dev-ruby/hoe/ChangeLog b/dev-ruby/hoe/ChangeLog
index f1544735b1f9..86e1b79a70e8 100644
--- a/dev-ruby/hoe/ChangeLog
+++ b/dev-ruby/hoe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/hoe
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/ChangeLog,v 1.88 2010/08/22 16:40:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/ChangeLog,v 1.89 2010/08/28 07:42:22 graaff Exp $
+
+  28 Aug 2010; Hans de Graaff <graaff@gentoo.org> hoe-2.6.1.ebuild,
+  +files/hoe-2.6.1-test-file-ordering.patch:
+  Fix file ordering issues with tests, fixing bug 323059.
 
   22 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> hoe-2.6.0-r1.ebuild:
   Remove ruby19/ree18 support from 2.6.0-r1 so that it can be marked stable.
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 89ecb09121c9..ddf2c8e69544 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX hoe-2.5.0-tests.patch 2155 RMD160 898487c6847136041b79d37127ba6ad5ebb3a28d SHA1 8dbd252b198d53ac874672f3394f5741e46fe8bf SHA256 872f08a36126c6fad69405eb529993fcef94d8134cee8f70294ddb4075fb1a54
 AUX hoe-2.6.0-rubyforge-without-account.patch 694 RMD160 b37bdce247b5acc1bd9bca080cbf1a129b3f19f3 SHA1 cb1df3dbf4302da16b08dc4c179d7f6bf28d132a SHA256 5a6d5a2d30b9fc49a9255ba46bbc6c4847c1ffcda2fd720fff54b5a9002076e2
+AUX hoe-2.6.1-test-file-ordering.patch 755 RMD160 f097bebc47177296132ea5afffc05a40d0ce9d54 SHA1 40f83990a1a0f5138d4c776a1594b41808dfa71b SHA256 1fe30c21a33baba740b03518f53c0b173009bfac9e85323c5e4ce03bd5b3bbff
 DIST hoe-2.3.2.gem 29696 RMD160 63862c20c7098297a92755c5bad279856468aec7 SHA1 e47df36832b0c08c8f95807acad624151d9874da SHA256 3a90318b42ce02a019c8d248dbb42a9ce281f5ef9bf4566cefe6b27128b851ab
 DIST hoe-2.5.0.gem 113664 RMD160 60cde1696168764857be1b5cfc62f1a9fad4f3d4 SHA1 384af5f4a78d93cc46fa21dc56258f7ce878bd2c SHA256 b9476f4c5f6f82314520dbe9ef6e9e2777cf6bcc73ef3ad6197ab5276b369928
 DIST hoe-2.6.0.gem 114176 RMD160 16a250681d19fde968fa0a7fa2ef726192733931 SHA1 5f04eb4005025e84962c465e0c3d643b2fb2df46 SHA256 36d7009de42d23162c3c9b3355231906080868c07774db006c2dffd43b6fa723
@@ -10,13 +11,13 @@ DIST hoe-2.6.1.gem 115200 RMD160 d99f5973f5f83bcb58bb2824d18e97ea8e4ef1fa SHA1 a
 EBUILD hoe-2.3.2.ebuild 528 RMD160 3256802acd8292ee9bd3f50879d70eb6e79275c0 SHA1 88f7a1e7e51b54f28d40104ee2af2a2f2ecdc63d SHA256 b33557f0ff18c29708e14a4c57edf79d0474b6c2a3cbbecbb7e9064d9199b386
 EBUILD hoe-2.5.0.ebuild 1151 RMD160 7d8528ec4db88a82c16e6c027a77134959329319 SHA1 9aff1bf2e1b71f04374988eda6349bcd9c173cc2 SHA256 b4b2aecd45abb51e7c30f17f13fcd06ea6b87ec17bfe95620942041aa643497f
 EBUILD hoe-2.6.0-r1.ebuild 1148 RMD160 dd84c2bcdfe4d8cd5883664ecab56e81238e0579 SHA1 a82e38feeb204ca13032e37fbf51e5eb1db269b9 SHA256 ce0ceae5455db730451d882aa7cdf1a774afcdf957c65094e9dc19f75cce1c0a
-EBUILD hoe-2.6.1.ebuild 1110 RMD160 f49e59189724ef0c9bd2036272dc50fc0a3911d1 SHA1 2903258b2959dee10f1d1ec0d8c97462c8153114 SHA256 a85cb628478e94ced27b5bc5b219ff4f22799fcba731376b549f26cd7f022b2e
-MISC ChangeLog 11295 RMD160 26466ec81b3be7246b22eb23632355d5ff0987ae SHA1 7e98213aaf123bb7580c481864f8f8e29955b9a6 SHA256 9ea8b3bedc573d54b9ac1f1821f8e300422855c2c091ca2440d97f6ba90708d3
+EBUILD hoe-2.6.1.ebuild 1157 RMD160 42f62fcbc0ef775bcac676a63f9582aca7eec8b8 SHA1 d71ea2a3d92dc60cdf6c580eeffa335f9f2575f7 SHA256 af3f9e60c13b7bbf8f2e1dd99e14cbe5b8b32b5c3ea3a63a87293b1426dc7caf
+MISC ChangeLog 11464 RMD160 5388e0274d314b0aa3c17409614b67fe9122ba6d SHA1 220afe4eee7bebf2cb160b09e310df185c7777d1 SHA256 ac868688fd128df227e5ebfc9f5e8677dbd91ea1dd6102138ede37b608202169
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxxUygACgkQAiZjviIA2XhtzgCgj8ivM8hCx589qzPyePiRiSL/
-o7sAoMNs4YRKsVX9vtnVHY8qM4N4dDsB
-=V0nc
+iF4EAREIAAYFAkx4vekACgkQZihJkut28StDkAD/cCvbthd9MOWWapef/xxofpTe
+D8ZjuX5saIYDfyZ+zeQA/3XmM+lCBBF17TOuLI7D5MCJz1M0b03iGk2m0ao2zhmX
+=BYA8
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/hoe/files/hoe-2.6.1-test-file-ordering.patch b/dev-ruby/hoe/files/hoe-2.6.1-test-file-ordering.patch
new file mode 100644
index 000000000000..130715062d36
--- /dev/null
+++ b/dev-ruby/hoe/files/hoe-2.6.1-test-file-ordering.patch
@@ -0,0 +1,18 @@
+--- test/test_hoe_gemcutter.rb.orig	2010-08-28 09:35:26.129730713 +0200
++++ test/test_hoe_gemcutter.rb	2010-08-28 09:35:53.673730929 +0200
+@@ -1,3 +1,4 @@
++require "hoe"
+ require "hoe/gemcutter" unless defined? Hoe::Gemcutter
+ 
+ class TestHoeGemcutter < MiniTest::Unit::TestCase
+--- test/test_hoe.rb.orig	2010-08-28 09:35:34.929980884 +0200
++++ test/test_hoe.rb	2010-08-28 09:37:21.978230874 +0200
+@@ -49,7 +49,7 @@
+     assert_equal 'blah', spec.rubyforge_project
+     assert_equal Gem::RubyGemsVersion, spec.rubygems_version
+     assert_match(/^Hoe.*Rakefiles$/, spec.summary)
+-    assert_equal files.grep(/^test/), spec.test_files
++    assert_equal files.grep(/^test/), spec.test_files.sort
+ 
+     deps = spec.dependencies.sort_by { |dep| dep.name }
+ 
diff --git a/dev-ruby/hoe/hoe-2.6.1.ebuild b/dev-ruby/hoe/hoe-2.6.1.ebuild
index 8c7aec1c6016..5c877b4d5d1e 100644
--- a/dev-ruby/hoe/hoe-2.6.1.ebuild
+++ b/dev-ruby/hoe/hoe-2.6.1.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/hoe/hoe-2.6.1.ebuild,v 1.3 2010/08/18 11:05:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.6.1.ebuild,v 1.4 2010/08/28 07:42:22 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -22,6 +22,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
+RUBY_PATCHES=( "${P}-test-file-ordering.patch" )
+
 # - also requires dev-ruby/hoe-seattlerb for 1.9;
 # - dev-ruby/gemcutter is an optional dependency at both runtime and
 #   test-time, at least for us;