Permit newer thor on railties 3.0/3.1.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 25 insertions, 10 deletions

diff --git a/dev-ruby/railties/ChangeLog b/dev-ruby/railties/ChangeLog
index 621d8eda72f5..bd86b5d22e49 100644
--- a/dev-ruby/railties/ChangeLog
+++ b/dev-ruby/railties/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/railties
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.35 2012/08/11 08:38:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.36 2012/08/22 00:18:15 flameeyes Exp $
+
+  22 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> railties-3.0.17.ebuild,
+  railties-3.1.8.ebuild:
+  Permit newer thor on railties 3.0/3.1.
 
 *railties-3.1.8 (11 Aug 2012)
 *railties-3.0.17 (11 Aug 2012)
@@ -155,4 +159,3 @@
   05 Dec 2010; Hans de Graaff <graaff@gentoo.org> +railties-3.0.3.ebuild,
   +metadata.xml:
   Initial import for Rails 3. Split off from dev-ruby/rails.
-
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 1d935fa9422e..b3f2da660300 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -9,18 +9,22 @@ DIST rails-3.1.8.tgz 3647373 SHA256 df6718da6475a8cbc102f84ff426f086981f9ea44db2
 DIST rails-3.2.7.tgz 3802538 SHA256 3a16047cd010d5834d5c33a0a9f1843a0ae21e63f2322d9bb0a5820dd9ddd099 SHA512 cf46c3b3684f3493b37fb62bf78c05f28452d6e37d2fc097527a6c9d21fd839aa940c45e816363aaad4cf5d25fbac099e445eecabfad95d1c1de1b291d12fb7c WHIRLPOOL d2ad4e00728d5603b0b85154fa2783646f7749591b529506a4425c727748bff72a02b72e2f5ba9f762c13ea149f847430472ad76fce43a3096e93e334f57fee9
 DIST rails-3.2.8.tgz 3802639 SHA256 312b8c3b42be96015f24354c48cc11e9c3f84da61b426cf271c8dac961e9603c SHA512 d03a4bd95b34ed796097ac9b8c0d37fb612c008a03d29032f2384f15e306ef998537c84ef8a30e5608263efad457ddc76480cedcf5ce1aeeff374c4384f7ff8c WHIRLPOOL c07273181e6b599de7d6b8e873c3935b92c41f76552198f0bf440009cc1a882749e84cf822ddd2fa3ed89df705a6cd1fc219e0629c8312311f9a10b448f43e93
 EBUILD railties-3.0.16.ebuild 1297 SHA256 84db9b4c2bed683b5b2d5b4bbd142279006f15d28a0f85463b37d94e1a9df564 SHA512 9b46c9a992949ec44a16e7d91efd41b7f95980311d2f52e3dd390b588f084a0cd4cddb490905a83bd21274311f0754419ebb9d4df81bbc407e4dee20c22a6203 WHIRLPOOL 9176f248b98f95fb580ed1e23638faac8b6ad8794f51e08f3090dfaa1b330c112a0e225483ef3f378d7f905f3ee39c1519770f1b630f78e9603297ed75d48d98
-EBUILD railties-3.0.17.ebuild 1297 SHA256 d5accb45bd156975fc0d13be0aea7b04f3db4c6fa7c9c84ab72513066fe7e0a3 SHA512 38b63fa914c790a9e2a8c3cd579308dabc778158040e323edcf15ef19c30e0b27d667857584631ae593b05e03579c4c2cfa701bb86fb4e181ef6e83e6baf38e4 WHIRLPOOL 28913d834b48a8dc15794945941b3776c0342bb9850ccdca038056bb7c023b13027e4e11e279b9049600a17606487bb1477e183ad147b78bd33610615b8789f8
+EBUILD railties-3.0.17.ebuild 1415 SHA256 104a005cfa3699d2466930f46b1eb1d6916ddd8b70a0d1813496e0fe85b3d9ce SHA512 dc12c1bcb51064bda697978b8798035d677d2d8dacf7f01bedeb8b15d774886bd7fcff6ca33ece98846a9434c46285c33efbd1e7d9c378e82a43d540a8e2dde7 WHIRLPOOL 843afd5d4cc357a492465635c5f6692aa59a945aa559b9ffad7922d14ddef11e427554d5d1ea5844568466ef50606cdb39c439e575a54d6eb6497216a13afade
 EBUILD railties-3.1.3.ebuild 1590 SHA256 1f20e522d6f85b890ed782a71ed184d214892329518399ab8deb9201f013439f SHA512 18184aac325d0246fcffe4f263c488ac5e5423beceda832ae7fad575aca011de6c3cb5f98a2525ae721ad83e965de95082d8351ee14311c35dd2fa05767e81ee WHIRLPOOL 6ce546b87f9f728371d73fbc200ac94e483d1ba22ba3675fee4aeddd816538a80a391c7019887eb67a014209cb307bb9d1be5f944a4c221f2dda179df402b4a3
 EBUILD railties-3.1.7.ebuild 1595 SHA256 b776ac1fb903917b44d0f1e4896576c61fd867c32a0e53c9a7ddf26569c4cbf6 SHA512 08b600e5232c9a494cdd2550ba5c824f353af66d30f7feaf2d2ca4df19221ad84f59ef114135a1c7e21bd8c74ed17b5d9ba57d221401ed8e66dde9e18d93ad7e WHIRLPOOL e178198f6d849658b13df89db522a4cc17a41772be0c927e7f720a8636eb7bbfd35315f90d76892c8d6ea01792e87558a47fc1ae32255f3fa7e20fa5972ec4a5
-EBUILD railties-3.1.8.ebuild 1595 SHA256 2936b02719ea9e10140d6b8bf44d6bf90210213b08cfb1a1414db2f842bb17bb SHA512 4bdb57cd91ae88946cc7f50aa5967af474c2d56ce0939a99de03fead2722892f2245e0f130e2a9050372f76cedb71ce5599a2c51f4c76d4cee16a167d825018f WHIRLPOOL e8dfa2ccdac1df8a8c0a113fe61b2a665cfbd171bef4ff5d731aad3c9e7a4ef66a47a7c6771dd4a9a3c6bf70f54e96e481c6b70842a4aee503e921c76052b2dc
+EBUILD railties-3.1.8.ebuild 1690 SHA256 9e818a594212532abbc47c4f52115ec941920c8b5b35a8c77958e082b4811cc0 SHA512 2ba2f98f93b9053d2b83e87241907cfe4124b13360f5ad6985436f3d1d6dccce1e2f9b891a0cf153769f665f4242b7558151f0e396add31ccc296559689df66e WHIRLPOOL 8ccb44be7f7290f70583e4b211c6731d618a083545a11893e2da61ba26754a97fd47add2cd733f683defa8ada6365d3b625d97df788d90d4e8c0a9e0ed3f14ed
 EBUILD railties-3.2.7.ebuild 1942 SHA256 34660eb15a05e9fd65eee97fadc7c749d9def194ef8715cf872a9c92138eace9 SHA512 d40e13fa88ad27825be65c5745acf2dafde905d81e0f15a4d230ef8d9f15fd9850f8ff92ee6f851e9f4c47d3fa1b17df49ab213d977f359c9b3d73ce2284b049 WHIRLPOOL fe339c9f734d9d13fd119eabe0f918d9cec475ee69ff777e9c11e7148e46301f3e6ceaf594b5df8bf42b9a68c45b23193001fa61154f979df9446dc881ca426b
 EBUILD railties-3.2.8.ebuild 1942 SHA256 2dcca305ee12bd8ccb684b936bb0ff15da74ef87ab7ac8928d58ea55956d70ab SHA512 b733814e51cf78f4e8c275646f87fe49927113bfe423294a1e7a8c0325f292eb336587bf7c2afbcec1aefec331d3e6636f4b354d1808dcabecf4db247787fcb4 WHIRLPOOL eea3682e20f425c4b91b8309f72f1396857bc998583777f01577e91dc3750381ad71aa53782816f460a41214638f2179422077ff98043b89818d3a24d18da87a
-MISC ChangeLog 5183 SHA256 457862b475e70e703cd627610291949d19ca5fe2a9fb63a558f1668ffe21c1fe SHA512 c0dcb5fe9556ccdd50ff67af8cdb674a34535c8b0aba0ef935682b5646259cb97f31ea22c51761262d55cf54a97889b0ee848849502b353982ae13070b200df5 WHIRLPOOL 2bea1644381af118f0797480e9850560ac6aa5d9dfd50bbaa0984fc0ca94ed8647362465a8cdb96c4d39078eef39b22f62f97a5350d4d9756c276fbbb318af7b
+MISC ChangeLog 5332 SHA256 2bc1ae9475f23240e50711771bf3db34022f0faed72b78fabeb35d63dd64f698 SHA512 4cc9a6749812184163f1111166a2632d6f812f8936bd24b74f955e267c0bd0e13eda7cd15a66428b521bdf3e738260eb746909b7dbc177a8ca9348c27e81e11f WHIRLPOOL 1c34f8f2c54ecd55ae981526cde00a57694104f98df4a883de0e1b1460ec217695e2fb1d86b92e9f48ff972527ee4c99026b06a6ad42bbdd6891ffc4774bd874
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAmGg0ACgkQiIP6VqMIqNctFgD/VwbylkCn1TaOgQJWIFuob8L/
-Ejgy382j3tZlJ4moyPwBAIX1n/eqO4m0yxvrPW4PxPom2HZ71/Awo4YCURlT2oYX
-=FCGV
+iQEcBAEBCAAGBQJQNCVhAAoJEBzRPIrUMBNCab8H/Rl/7Bs+3CLotr33jMrIe0TB
+xrMKj/3QHrGYE+HQdGhZFjD/RMgR+hc+K7SyJ4TUyK0ZTXPqj5XuM/9/5jatVNIg
+/AmMHUzVURlBycTe+2nC72KX2UbzyubE4MBnGXYNcJpIZOYiihLTJPElIU4LAtQ/
+PRTotIujpgl+vRv77R90pAcY+I845ODIBz/ZyTRBgdkvWWUYkYN4skF8n9c2Rqdn
+Uje9yIf1hmgpwAPz8q2yagvwHEKp+AuzgBWQuEqi97tBoK08np3p3J4EzaUpMlZx
+zlC1IvMXu/nChtC7T2bk4NFPw56mAFkcKKcf9nLOVLegHH3e5v4AYNMBLARcKmU=
+=iw3f
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/railties/railties-3.0.17.ebuild b/dev-ruby/railties/railties-3.0.17.ebuild
index 82098cf8b8be..af2bc0686af3 100644
--- a/dev-ruby/railties/railties-3.0.17.ebuild
+++ b/dev-ruby/railties/railties-3.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.0.17.ebuild,v 1.1 2012/08/11 08:38:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.0.17.ebuild,v 1.2 2012/08/22 00:18:15 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18"
@@ -45,3 +45,8 @@ ruby_add_bdepend "
 	doc? (
 		>=dev-ruby/redcloth-4.1.1
 	)"
+
+all_ruby_prepare() {
+	# allow newer thor
+	sed -i -e '/dependency.*thor/s:~>:>=:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/railties/railties-3.1.8.ebuild b/dev-ruby/railties/railties-3.1.8.ebuild
index 52e18e8d4387..907213333a5c 100644
--- a/dev-ruby/railties/railties-3.1.8.ebuild
+++ b/dev-ruby/railties/railties-3.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.1.8.ebuild,v 1.1 2012/08/11 08:38:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.1.8.ebuild,v 1.2 2012/08/22 00:18:15 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -51,4 +51,7 @@ all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
 	sed -i -e '/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\)/d' ../Gemfile || die
+
+	# allow newer thor
+	sed -i -e '/dependency.*thor/s:~>:>=:' ${RUBY_FAKEGEM_GEMSPEC} || die
 }