Cleanup for security bug 493284.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

3 files changed, 5 insertions, 134 deletions

diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog
index 990aeb5173e7..cf12cd253991 100644
--- a/dev-ruby/activesupport/ChangeLog
+++ b/dev-ruby/activesupport/ChangeLog
@@ -1,6 +1,10 @@
 # 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.239 2013/12/05 07:41:06 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.240 2013/12/16 20:11:36 graaff Exp $
+
+  16 Dec 2013; Hans de Graaff <graaff@gentoo.org> -activesupport-3.2.15.ebuild,
+  -activesupport-4.0.0.ebuild:
+  Cleanup for security bug 493284.
 
 *activesupport-4.0.2 (05 Dec 2013)
 
diff --git a/dev-ruby/activesupport/activesupport-3.2.15.ebuild b/dev-ruby/activesupport/activesupport-3.2.15.ebuild
deleted file mode 100644
index 9fc30f16637c..000000000000
--- a/dev-ruby/activesupport/activesupport-3.2.15.ebuild
+++ /dev/null
@@ -1,75 +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-3.2.15.ebuild,v 1.1 2013/10/17 06:33:48 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="http://rubyforge.org/projects/activesupport/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/multi_json-1.0
-	>=dev-ruby/i18n-0.6.4:0.6
-	!!<dev-ruby/activesupport-3.0.11-r1:3.0"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	>=dev-ruby/memcache-client-1.5.8
-	dev-ruby/nokogiri
-	>=dev-ruby/builder-3.0.3:3
-	>=dev-ruby/tzinfo-0.3.29
-	)"
-
-# libxml is not strictly needed, there are tests using this code. jruby
-# uses a different xml implementation.
-USE_RUBY=${USE_RUBY/jruby/} ruby_add_bdepend "test? ( >=dev-ruby/libxml-2.0.0 )"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Make sure we use the test-unit gem since ruby18 does not provide
-	# all the test-unit features needed.
-	sed -i -e '1igem "test-unit"' test/abstract_unit.rb || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby18)
-			# Skip failing ruby18 tests related to JSON serialization
-			rm test/message_encryptor_test.rb test/message_verifier_test.rb || die
-			;;
-		*jruby)
-			# Ignore failing tests on jruby in the interest of a security update
-			sed -i -e '/test_not_allowed_to_expand_parameter_entities_to_files/,/^    end/ s:^:#:' \
-				-e '/test_exception_thrown_on_expansion_attack/,/^    end/ s:^:#:' \
-				test/xml_mini/jdom_engine_test.rb || die
-			sed -i \
-				-e '/test_exception_thrown_on_expansion_attack/,/^  end/ s:^:#:' \
-				test/xml_mini/nokogiri_engine_test.rb || die
-			;;
-	esac
-}
diff --git a/dev-ruby/activesupport/activesupport-4.0.0.ebuild b/dev-ruby/activesupport/activesupport-4.0.0.ebuild
deleted file mode 100644
index 0479010d9f16..000000000000
--- a/dev-ruby/activesupport/activesupport-4.0.0.ebuild
+++ /dev/null
@@ -1,58 +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-4.0.0.ebuild,v 1.5 2013/10/13 22:05:36 maekke Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="http://rubyforge.org/projects/activesupport/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS=" ~amd64 ~arm"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/multi_json-1.3:0
-	>=dev-ruby/i18n-0.6.4:0.6
-	>=dev-ruby/tzinfo-0.3.37:0
-	>=dev-ruby/minitest-4.2:0
-	>=dev-ruby/thread_safe-0.1:0
-	!!<dev-ruby/activesupport-3.0.11-r1:3.0"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0:3.1
-	>=dev-ruby/libxml-2.0.0
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Set test environment to our hand.
-#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Make sure a compatible version of minitest is used everywhere.
-	sed -i -e "s/gem 'minitest'/gem 'minitest', '~> 4.2'/" lib/active_support/test_case.rb || die
-	sed -i -e "1igem 'minitest', '~> 4.2'" test/abstract_unit.rb || die
-}