Remove masked Rails 3.1.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 8 insertions, 77 deletions

diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index 1a9a26b0d1a3..daa51f05e4b8 100644
--- a/dev-ruby/actionpack/ChangeLog
+++ b/dev-ruby/actionpack/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/actionpack
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.261 2013/11/10 14:43:24 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.262 2013/11/29 14:53:54 graaff Exp $
+
+  29 Nov 2013; Hans de Graaff <graaff@gentoo.org> -actionpack-3.1.12.ebuild:
+  Remove masked Rails 3.1.
 
   10 Nov 2013; Hans de Graaff <graaff@gentoo.org> -actionpack-3.2.13.ebuild,
   -actionpack-3.2.14.ebuild:
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 073f7af1f311..305d2a189631 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -5,19 +5,17 @@ AUX actionpack-2.3.10-i18n-0.4.2.patch 2671 SHA256 7060319a5037c3623e8c5beb36133
 AUX actionpack-2.3.11-rails3.patch 416 SHA256 8b2dc793f9e8b996c57dc77b3898a54757f330b8c95ee94c9bdf3b0013350093 SHA512 3e9540bb1777b29736285561ce1d7466f0497150927d40169fd5ce222f803df595105c9f222ff223e923b8b5411d90a92d265b727104f1f494693a7bb100b3d2 WHIRLPOOL 3000e6b584ff572e246d2b281cda1075449af85f905dff6bf591f75de60145868e81af7753882b29af48d45e69f79db3898610646ac5af7862e13f0e24dfbdfe
 AUX actionpack-2.3.8-custom-cookie-fix.patch 3009 SHA256 9368cd7b35fbc0b5d4161e121aa9ced113ea831b738a47b6c59828bb17f24c04 SHA512 4e8a1ed63446c946722922b2cd5901b27df4ddcd7125b0c1777148e675117537e9394ba998093667f79e1349ec79a61b7e2e9c6d704327a3e000992f7ae3deb9 WHIRLPOOL e7a716f7b45b8f20eeb0be4faacdb973b172a7f44168862a228ce242afd88db512c73b64cf9bb8faab1e5ca698e65dad8746ca1fbf7cbdf9273819d722c3d32e
 DIST actionpack-2.3.18.gem 749568 SHA256 304a9759801fe00928c14991e6ab252dbbbfa560e41ff9e5fdc66a65a2cf2ebd SHA512 d08af1e8a15b4b16f2160fe431b41b081f9442d0680bd30af20075186cec07febff85ac467924fd65cf8ed4f2fb808c5dd2e8f7d50c9e24d12e177659f30c3ce WHIRLPOOL 8d8aade452b5e715060ef327f41f78677624134ec0a9953a61dbf26ed0ab54bfdc7ed4f43e19f5ea190038c997cf25146912349bd35a1840c635d7713bfdfd1e
-DIST rails-3.1.12.tgz 3394369 SHA256 2321d18cd5b5c4929f09472d17fd05e21cc6470d7efd2886bfcf52bb89dbdfcc SHA512 49b886bf05c1c51b67cdf4a7ad688e633bdd0b180ef328f18c942cd13095668ed70cfe3b40ed2d77a2c8ca8c3d8474413dfa25c282afabe21ce790567874716f WHIRLPOOL 66e9d9709b7e8b00b096c43a5c5703fd20addf020c10df5764457ebf6ac515451f9e6db93a4925da9ab88e6942427f5a7fc0d20cf6381e8530f830605db7503e
 DIST rails-3.2.15.tgz 3566493 SHA256 6fc98f28742e6423efd151d4a0005c10cdf83bf1cef3350042f305d15474b286 SHA512 c2fa25a81b5c77a9054fc8b42a9fdc0733ef175a981ccdbff77eb33a08aa299c3a3ca9469ab80234b01fbc4eef7ccf09c4b3f55dd04e81bf4f8cbfc7eaf58719 WHIRLPOOL 18e8f8b2b90886bca4572efe24508fb77f5a227fd3f3d4732da68f52baea9a2fdf7b620023c8cf229354e4fca85eb9f28886b7b27f862693dbd383a063e961cd
 DIST rails-4.0.0.tgz 3705371 SHA256 644601ae66881313346ffeacd9ea372d249df55aa7abe853acdcb231fffe6bbf SHA512 3e03f25de83ff894a7affdebe948fd151cff81c8ec906692119036633d891c9ba5cbb312e3ab32f1e62f4a383fcfc2e878daeb62fc04336e932b2e2bda63f7cf WHIRLPOOL 792513f2fdfcbc2a57633e3ef344943948e5614c638b06cae1245fd84716d84b5391a7906123a94a1a325ad789bdc465a4f7e2b774924bd0f18d341c29109a82
 EBUILD actionpack-2.3.18.ebuild 2333 SHA256 1ca52f8abc2833f4e1284fb8c91630a4a8781fadfbfdd2c73a935ae0b473d936 SHA512 a7b6d6cac222d9dc34aa15e9d52e188f76c8701703a235580b3fddda9e2d11966e43c18eabd4303a3a3911115073f203c4c9843795bffbdaeed86b112e571c7c WHIRLPOOL f61842f109e5d167f38481ea7a6e4505ea5d1b5bf69a37754a968558ba83dc128647afebe0d195c14bea5a8857a712a7a95344b0019da0b34670bd42ef9705c3
-EBUILD actionpack-3.1.12.ebuild 2573 SHA256 d391d7857505616a418243aacf10617f15d9acc3378fe028e6465fdee1ef059f SHA512 2ae079f48424cff524e86cc85bc8e86816476bc48e6631fc00e92086e352a86e16948361c4edb05083f21a3bc10efa325e18432a1a17425706d0b97776cac4dd WHIRLPOOL 057dc514ab996167aec2f3670424effd9cf5d3531444714d2926a5f3a3d0d2a850f8b73eaf97168daa2f28e5a017effb87ad3b678e3c370449ecda05f3e76422
 EBUILD actionpack-3.2.15.ebuild 2702 SHA256 f73b96d5bdad658005bfb7a1d742dd2965ff7d2989dbefa757c2553555e93a23 SHA512 163b7db4d989bd3a0221500c1a2f3a89f2eba5b477e873a46ff90b0d2eea3b7fdacc41167819a3b01d68e1ac8ca66d8987e67bfaa5165c87dc98f3a39522835f WHIRLPOOL d380cddbd41389168e09b52d2488ef93ba4ec7e51c94f0085b647f86cea31c445976106d42841a916b663936a81dee5200d76bcd53414829e4722264613f30fa
 EBUILD actionpack-4.0.0.ebuild 2768 SHA256 527ccec953879e51fed121185225c237a9818862daf030d401dd56ae420975de SHA512 639687a105b01c08358bc44a6ebc149fec91a5e4d46546d6ae1d902e70ef91f691eaa4b07446e523380d5e83971fc2abcecc63afd797a61b2468cff872a4f3dd WHIRLPOOL 059d29a645c87a9cfcf0a57986212202e9a99463411a2992917c14996074d4066f1e285aaa9366f8efaffa95fa5bfbc42b27f97769829ca5770d5715a591052c
-MISC ChangeLog 35181 SHA256 1f744ac3544abebddd5c3697c472b49a529e85c6952f40109225d0fe2ccad9b4 SHA512 fef2718dcf93c4f1b93570ec48e6869ee94eb6882d0506b2bfbe90356f6c90d1ef698a7f1b08f331cbcb31d5b126ade85669891ae33afaae0746e4caf89f9231 WHIRLPOOL cb23473a39a5f04905756476a225bab9490483b4b918c7feb37154029e3b4b63baf47ee7f80e3c06352aa33164ec8c72901619f51a95f76bab77937b3324c7aa
+MISC ChangeLog 35286 SHA256 2ed62a2d12b7c9b7c817e4e7c1589dfd8e3376e83ac1c9f0142b5ca06c7ad800 SHA512 f7efefbfae83ab44b341b29f30a3cd08432ca5109ece5fc0ef638d28891352c5c1ed5b21372a21ce318593029791f19c07565eeb519426fcb5902f02aa2fb538 WHIRLPOOL 9650100bdfdc2b669181b441ed51aa51c274850b7894f587150262b884fdbfad454353ead1109b86fc7afe3fc3f8126305890df25868cc70e9306050f8bbb977
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJ/m40ACgkQiIP6VqMIqNeibgD9HdmrXBS0YHB3jnp9lDEd4WJT
-XNnlBTBQCA8RHPD3mlMA/0FNfaDSW0Ul6GttQQrnZh2t/79CM9c4gcuG9tIVjMj6
-=xzvk
+iF4EAREIAAYFAlKYqoMACgkQiIP6VqMIqNdW4AEAl/kkMqag1B/5bLE3N3WpV0BX
+GThRw9acXWHLByj644QBAI6SDbkSGtEiHg7Qw2uWmQjqMK5MkI4HV7+eS1ra94Ca
+=+Hsn
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-3.1.12.ebuild b/dev-ruby/actionpack/actionpack-3.1.12.ebuild
deleted file mode 100644
index d31e68e94f66..000000000000
--- a/dev-ruby/actionpack/actionpack-3.1.12.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-3.1.12.ebuild,v 1.2 2013/10/13 16:02:43 graaff Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19"
-
-# The default test task tries to test activerecord with SQLite as well.
-RUBY_FAKEGEM_TASK_TEST="test_action_pack"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response."
-HOMEPAGE="http://rubyforge.org/projects/actionpack/"
-SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-rails-*/actionpack"
-
-ruby_add_rdepend "
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/rack-cache-1.2
-	>=dev-ruby/builder-3.0.0:3
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/i18n-0.6:0.6
-	>=dev-ruby/rack-1.3.6:1.3
-	>=dev-ruby/rack-mount-0.8.2:0.8
-	>=dev-ruby/rack-test-0.6.1:0.6
-	>=dev-ruby/sprockets-2.0.4:2.0"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		dev-ruby/bundler
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/tzinfo-0.3.29:0
-	)"
-
-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\|jquery-rails\|"mysql"\|ruby-prof\|benchmark-ips\)/d' ../Gemfile || die
-
-	sed -i -e '/\(rack-ssl\|thor\)/d' ../railties/railties.gemspec || die
-	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
-	sed -i -e "s/, '< 1.3'//" ../activesupport/activesupport.gemspec || die
-
-	# Loosen mocha version restriction
-	sed -i -e 's/0.10.5/>= 0.10.5/' ../Gemfile || die
-
-	# Avoid fragile tests depending on hash ordering
-	sed -i -e '/cookie_3=chocolate/ s:^:#:' test/controller/integration_test.rb || die
-	sed -i -e '/test_to_s/,/end/ s:^:#:' test/template/html-scanner/tag_node_test.rb || die
-	sed -i -e '/"name":"david"/ s:^:#:' test/controller/mime_responds_test.rb || die
-	sed -i -e '/test_option_html_attributes_with_multiple_element_hash/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
-	sed -i -e '/test_option_html_attributes_with_multiple_hashes/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
-}