Fix spec order issue in a different way to cater to even more variation.

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

4 files changed, 15 insertions, 11 deletions

diff --git a/dev-ruby/markaby/ChangeLog b/dev-ruby/markaby/ChangeLog
index f07d2ad496a4..04c77307f62b 100644
--- a/dev-ruby/markaby/ChangeLog
+++ b/dev-ruby/markaby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/markaby
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/markaby/ChangeLog,v 1.26 2011/08/24 06:06:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/markaby/ChangeLog,v 1.27 2011/08/28 09:29:38 graaff Exp $
+
+  28 Aug 2011; Hans de Graaff <graaff@gentoo.org> markaby-0.7.1.ebuild,
+  markaby-0.7.2.ebuild:
+  Fix spec order issue in a different way to cater to even more variation.
 
   24 Aug 2011; Hans de Graaff <graaff@gentoo.org> markaby-0.7.1.ebuild:
   Also apply fix for bug 343693.
diff --git a/dev-ruby/markaby/Manifest b/dev-ruby/markaby/Manifest
index 4993d6370ade..b1a5b14cc585 100644
--- a/dev-ruby/markaby/Manifest
+++ b/dev-ruby/markaby/Manifest
@@ -7,14 +7,14 @@ DIST markaby-0.7.1.gem 29696 RMD160 45df4d9c58df11a8f97ddf4eaf2d04b66e36ee58 SHA
 DIST markaby-0.7.2.gem 29696 RMD160 d80d1226faf525e941d95c3c2517cc7bc0db5a18 SHA1 4c17dfe07a78d7b51c5b8a5beb8f6fbcee3e6952 SHA256 715400f5bd16457d0e20f875faab90a4418b00633ab03a6ff07f990ee8321959
 EBUILD markaby-0.5.ebuild 555 RMD160 eb49d158a506f31342b3aabe1a17318637ad769a SHA1 11d0f77ed0026d23f8584d7d84999f247d06e2e7 SHA256 456a2ebf1d948ce3322e951c3896d7304db5d9b9af717466527e4d5ae57b23e3
 EBUILD markaby-0.6.9-r1.ebuild 946 RMD160 bbc0d18d1a238e67975fdeb3610c560a6ef86f80 SHA1 49aeaa3e9c2c777663908a9533b1b92117a03204 SHA256 e3ca20b6f1fde345c38f96e07f4c8610f7ab7f967f5bfe066f85f99b8ee1ad4e
-EBUILD markaby-0.7.1.ebuild 986 RMD160 70375a38d5ff1f2aedafab37d667fd5adf1a2947 SHA1 8d699d391c007b0eea58dcab0486c55ea313ccb9 SHA256 6776cf297b57849e372200676fec0dcb0d96db3b8fece21dd218475e4fb5042e
-EBUILD markaby-0.7.2.ebuild 999 RMD160 f0ccb51f744162e78b5c45316578875219422256 SHA1 22ed3bc055ec5864232a9414f1232e0e9e945c80 SHA256 45ff5e7a2609d09aa0a2b783e483d7d468d941b1b92bb6db62ed4c3cd78f7389
-MISC ChangeLog 3246 RMD160 e22e8ac7f5ed2bca4a08e84dc7a58df07a6bd9e6 SHA1 30bf5cfcf17c4de19e8deef46adb0454be4057ff SHA256 72c8e1bf590593afca0cade941722b47d01ecfe5c319d91b7e617b797fcdf761
+EBUILD markaby-0.7.1.ebuild 981 RMD160 df5178ad50779c8bb315434794f17095e72ec0b0 SHA1 1b4584b8fe4398760faf0dfe484463b2ec8ec9f2 SHA256 7bc31caf2c25217d9e333ac9f14fc9cbdff44f021c7d6b2d3b626bbfb131043d
+EBUILD markaby-0.7.2.ebuild 994 RMD160 a3371b804586e19e5323ad35dfc4ff347f5c84dc SHA1 1a9ddd45b72e68743988d0b6fa9bd1594ae13e90 SHA256 543b94abe9befc7fc95889a6e29eaac2f213a07f2e7120cd6eca3edb9f8a7893
+MISC ChangeLog 3418 RMD160 ac6c7f43c3f35c7760e2cb2d7c98af1ca53d0944 SHA1 6213743c317525fbc22a2fd7bcf5298f4e79a217 SHA256 201024bc13b2176e1282882b0f2ba29795c39755950e629fbbb0663258e70e36
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5UlOQACgkQiIP6VqMIqNdxnQD/QuCNVNuA5en6Cfs/5JwkYV5F
-6s7+yUdCrzm/pHtVbTcA/j5F28e5PbYodOaFbeJZkYmKEbIMfzCf8vvVTECU3Ths
-=Tr2d
+iF4EAREIAAYFAk5aCo8ACgkQiIP6VqMIqNfZ+gD+LdTcCTc+i+XRwgad7ukqYnmg
+8I91n1IGrDPeDu85xaYA/0b3Sm93no4kF38GRD9n5J7i4yPmMZtUfwyJpqTcAazZ
+=ee8R
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/markaby/markaby-0.7.1.ebuild b/dev-ruby/markaby/markaby-0.7.1.ebuild
index 12e21646868f..6e6038a75d0b 100644
--- a/dev-ruby/markaby/markaby-0.7.1.ebuild
+++ b/dev-ruby/markaby/markaby-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/markaby/markaby-0.7.1.ebuild,v 1.7 2011/08/24 06:06:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/markaby/markaby-0.7.1.ebuild,v 1.8 2011/08/28 09:29:38 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -28,5 +28,5 @@ ruby_add_rdepend ">=dev-ruby/builder-2.0.0"
 all_ruby_prepare() {
 	# Add missing require to fix spec. The associated failure depended
 	# on load order of the specs, bug 343693.
-	sed -i -e '1irequire "markaby/tilt"' spec/markaby/tilt_spec.rb || die
+	sed -i -e "10irequire 'markaby/tilt'" spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/markaby/markaby-0.7.2.ebuild b/dev-ruby/markaby/markaby-0.7.2.ebuild
index 8b5bfba9d26f..956064e8c162 100644
--- a/dev-ruby/markaby/markaby-0.7.2.ebuild
+++ b/dev-ruby/markaby/markaby-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/markaby/markaby-0.7.2.ebuild,v 1.1 2011/08/24 06:00:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/markaby/markaby-0.7.2.ebuild,v 1.2 2011/08/28 09:29:38 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -28,5 +28,5 @@ ruby_add_rdepend ">=dev-ruby/builder-2.0.0"
 all_ruby_prepare() {
 	# Add missing require to fix spec. The associated failure depended
 	# on load order of the specs, bug 343693.
-	sed -i -e '1irequire "markaby/tilt"' spec/markaby/tilt_spec.rb || die
+	sed -i -e "10irequire 'markaby/tilt'" spec/spec_helper.rb || die
 }