Remove masked version.

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

3 files changed, 9 insertions, 53 deletions

diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog
index ae8de655a609..be26c2de73c3 100644
--- a/dev-ruby/activesupport/ChangeLog
+++ b/dev-ruby/activesupport/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/activesupport
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.241 2013/12/25 09:43:57 graaff Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.242 2014/01/18 09:55:26 graaff Exp $
+
+  18 Jan 2014; Hans de Graaff <graaff@gentoo.org> -activesupport-2.3.18.ebuild:
+  Remove masked version.
 
   25 Dec 2013; Hans de Graaff <graaff@gentoo.org> activesupport-4.0.2.ebuild:
   Add ruby20.
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 1c9641a10651..99299a139867 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -6,18 +6,16 @@ AUX activesupport-2.3.15-unvendorize.patch 2403 SHA256 67b1e963a7a824733b99c98aa
 AUX activesupport-2.3.16-unvendorize.patch 2382 SHA256 fda4f0aecd104d7516b8c6b0d3860b8ac257bc5898eebbb9e3761c1f8ab56c25 SHA512 6d53b4b33c04d8fe337687afd4285b72cf68b98a940f2d314cd03cb015d0b13c9fc01904b5a0036ce8a4cf627379a149655d40d0ffbc022dda8226c0504f60e3 WHIRLPOOL a3bcc1e10cd3f70deb353df130b382d43916f1d0a7d16202bd4b9012e3901d574a3476bf6b62a82d08bffd22c0795d3d07b1307ae0eff3da294dab9f1725032d
 AUX activesupport-2.3.5-mocha-0.9.5.patch 1031 SHA256 238be71abfb03ca232d5c80c480da4e8f1ed8f8da6cfd89f7a64513b82cfd811 SHA512 3f98d2c18b7b2cf4cc03c425191201d6e59d83537bf01fbc09c35bfadaf45f05a24f694033edc3a30dab9b02eb865c3ba26f7e376e80d6ed1cbe14fc3c73f8a0 WHIRLPOOL 97e2622840b264bdda41c4ccc50315ff4dafafdaa422acf86e77f02bf5589155b2a7bd55a0a9886b0a8671932fa230d6bb76da07709e02509ce37b3c108964fa
 AUX activesupport-3.0.3-mocha-0.9.5.patch 666 SHA256 61e62f5794f9291f3ad8315d5ce0379c25d491311fd30fb06d35f618ece61a5f SHA512 a2d986bdfd7f4376264af1995626d46abf4331fcd64d081bc6c9480e9dae8f4700a2ca6a995a922846c20bf64660fed2e39a7df537240701d0324be4faeaec32 WHIRLPOOL 5ed28791b7dec003a53e6a5a6454d86196b2201b7b3caa32b9971bf05dca59d8ab36b48cf0be604801d1bbc29f204e90b5d77f026aef9c412ad980ce257867db
-DIST activesupport-2.3.18.gem 434688 SHA256 65b009c10c9c1fe298b04dfc428db7311f1dfbdcafc6c9429517651a679dd36b SHA512 47fa41bb13b8c1bc34133c0adcce5275f977a2148964f3c81da83dc69fea8cd81f3af181606a2a9c047107f2ce7cc6dd6290efa66acf68f6573d482bc6359fa4 WHIRLPOOL 34317e22696d29fe2389a66161dcb7348ea1528f82f120b39a1a7ce1f5d6135c50c0a7ea82ce90c9fd4bc8a8ed3e257efd7ed31fb7b5afce94d0323f28509eea
 DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf8417c37a0cbd24f74a57e SHA512 304ef964c33eccfdd4dc1a1c47d43b05e7498d869c64a2ba7a62e8356a07d03cd3f48e1edb9b80d2de1cafc8d91f6ac491df9b0abf3c30d6d22f34f39571965e WHIRLPOOL 5a6ba360c741a7aa3979722ae20790df65e05347a4bad77eea805a9601de2e4cc50a02b8f75d7b7e827da8bef62e8e4e72bb4d4c1de9e783f8f5b95d156bceac
 DIST rails-4.0.2.tgz 3720518 SHA256 cd973b85cfff735da80d8ed4e11421e2242be735d96cbe4d83ac0c4b6ca7c8d1 SHA512 67d7580c0081deeec4271f96caca6d6db8f65864c876a237e7e3f0e8c6e495d299f103dcbe7627385fa4fd3699dac5015e20be90187ef3b2af49352ad9c8d6af WHIRLPOOL 5b496df36ca4de6a4b55951fab2403bd8b31b3505d17d450bf2edf084429a7689c4fdeb8d19d0be40b2d4d0ada8cefd6c3fc104c2428769d2ca8e434d97c6465
-EBUILD activesupport-2.3.18.ebuild 1610 SHA256 4f26909b98177d0c49db48849743e7b6a66acdd611f3109b64c2d3fc7c682bc0 SHA512 acb0ee743ad08a7aaab628e42455be9dc056b6fb0a811a21e947efdcb26004035d11b5aa35ddaf5ec3152f0fb8b14ae8302f000c10e0a1410d67cf98701ca382 WHIRLPOOL de3dd4fde53a5c853be5585d9886ba4fca8261499c013269dc9fd9dd0d90f7bb0e9b239b6e6c01b5fc1a99ab5af880a174b9ffefce40ff9a548d5e73cb25e00a
 EBUILD activesupport-3.2.16.ebuild 2489 SHA256 f49f227fcf22f843c0cd2185a3097bd651826f2256f8af1e364e126da9242c7a SHA512 ab730229707698f9271207d25e4a99d85a12d465c351e35848ca6c1a0b75225e8a134a37cc7888cf12bbcf8ef4855ec54a00baedb1447730193ccca4fae228c5 WHIRLPOOL 75cf1db92fb917da5f2b4e8afefe8a846c55327dcf134e53d6944639c7ed5af8933f6c6ac6f94c66cf6186ddc06a31f70d8cfd2955bb9cec606f635149123526
 EBUILD activesupport-4.0.2.ebuild 1761 SHA256 79e5a682957f83f644ef6acc7fee08fdddb6d1009f5bdc4efb41fb28df0c40c0 SHA512 74b0d9ec46cf741316324b285225550fd660bda59a9edf30a009fa69fd4d9834dd34a34ef967585a7e919ac82d86ea4b12a1bd28e67cb621a225a65d5ec5715c WHIRLPOOL b9159eef619999c2b61d0eb3d4ebbe20205b32f000a85b3c74d28393ba19ba55a00faefda85624c85229654ac64c5848b1d1efb36eee0aeebfc2b8d3f06a315d
-MISC ChangeLog 34334 SHA256 b50f2056be5d04dd1ad404d860cfc85d1aa8674bb0ce11229f7e1e920a5c696e SHA512 c1431e4c7105bb6d47dc682a7a7134c4aaee43a615afbfa57a6a765a212233b14ebd1c58ed71128c34d5d8c88f7342aed9a3afab173210dfdb016ae38b4d8a21 WHIRLPOOL d7adfd59f780f1cbe7573553b058780104a24918b976ccfdc9be24e44e6358c910cd537860aa482e768081d022f904f3560401b7536148a6059569390ed0f93f
+MISC ChangeLog 34440 SHA256 47e6ca5acebcc02ff02b9f3b29d7e1c89dfd7dae0e4961c7112e8dac2dfe2a70 SHA512 dc8c44c250fa26148be6eec5153282a57bb240ee7743dce6dbb95beb10dece49d5c928790ddc3f4b2eb49986098de3627faa7c96978b52dda2a19204aea3449d WHIRLPOOL 5b3aa2af99cdc9899f6bf8ce15aab7c9674c316df2b05b93bdf2891676943cf96f2e7361380ba0550a71ace0cfcdff789ddf7cfbe359907d8fe4fe5ea8256383
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlK6qN8ACgkQiIP6VqMIqNeYPQD/WYuvTY+tvjXHonmRktaF/rR0
-VEA5Io1ihaC0yiOOMg8A/RluFCbkogGb66RzB8VTlC+BRuYpOQVLUNVLM+HNkjvj
-=U+Rn
+iF4EAREIAAYFAlLaT48ACgkQiIP6VqMIqNf67QEAhc0CekTH2Wl51gY1gdKVJ9zS
+xmgn43QTUcytE2lieiwA/1exKVH7/3RwYfel9MmTaveWT2tJjmqOlmmK1MlWuBYv
+=sjw9
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activesupport/activesupport-2.3.18.ebuild b/dev-ruby/activesupport/activesupport-2.3.18.ebuild
deleted file mode 100644
index 572ba82961c3..000000000000
--- a/dev-ruby/activesupport/activesupport-2.3.18.ebuild
+++ /dev/null
@@ -1,45 +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/activesupport/activesupport-2.3.18.ebuild,v 1.5 2013/04/01 14:52:26 ago Exp $
-
-EAPI=2
-USE_RUBY="ruby18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="http://rubyforge.org/projects/activesupport/"
-
-LICENSE="MIT"
-SLOT="2.3"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/builder-2.1.2:0 >=dev-ruby/tzinfo-0.3.16 >=dev-ruby/i18n-0.4.1:0.4"
-
-all_ruby_prepare() {
-	# Remove the bundled packages!
-	rm -r lib/active_support/vendor/{tzinfo,builder,i18n}-* \
-		|| die "failed to remove vendor packages"
-
-	# This patch removes the fallback to local vendorized gems, as well
-	# as fixing the dependencies for i18n to use the correct slot. It
-	# also edits the metadata file so that the dependencies are added to
-	# the specification, which is required for bundler to pick them up
-	# (which in turn is required by radiant 1.0.0rc3 to
-	# work). Furthermore remove the references to the vendorized copies
-	# from the specification, to be safe.
-	mv ../metadata . || die
-	epatch "${FILESDIR}"/${PN}-2.3.16-unvendorize.patch
-	mv metadata .. || die
-	sed -i -e '/\/vendor\//d' ../metadata
-
-	# don't support older mocha versions as the optional codepath
-	# breaks JRuby
-	epatch "${FILESDIR}"/${PN}-2.3.5-mocha-0.9.5.patch
-}