Remove old versions.

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

5 files changed, 9 insertions, 602 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 37f937433abe..d8f0dab3d541 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.79 2012/04/14 07:08:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.80 2012/04/14 07:12:32 graaff Exp $
+
+  14 Apr 2012; Hans de Graaff <graaff@gentoo.org> -jruby-1.5.2.ebuild,
+  -jruby-1.5.2-r1.ebuild, -jruby-1.5.3.ebuild:
+  Remove old versions.
 
   14 Apr 2012; Hans de Graaff <graaff@gentoo.org>
   +files/jruby-bash-launcher.patch:
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index c116292a3de3..27167ab432e2 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -15,24 +15,19 @@ AUX jruby-bash-launcher.patch 5505 RMD160 b6cf97294339d2b3319434576e01482d7d6d9c
 AUX user-test-fixes.patch 5147 RMD160 6258879413ae81a18d0c6bcaa3b0661d86a0d14a SHA1 32d3f80db383cf664c9ad1f9e52c2688ae3cbe5c SHA256 f21469d41de9f9b5fb1682596f64899a71c92332db24bf27e8c50dbb1896a92e
 DIST jruby-src-1.3.1.tar.gz 12076705 RMD160 ef10395dbdf9490820caa65ff6236dd99e7c62c8 SHA1 e4de71e5c01f71f236b3135e07a5841784767fd8 SHA256 9095b0bec0ee8e6cd96b72c7f2aec8a90fa429b840484d57a48d8fb760aae600
 DIST jruby-src-1.4.1.tar.gz 12351374 RMD160 079036e7df373d444221083a9487b6ad8a676879 SHA1 282a730d33fe5ba0686297de6ff68eee443e67ab SHA256 685e6ba0a4709e06fab1158ef6e4d2b246ab91a770fe8b5c1b642d55d22c725a
-DIST jruby-src-1.5.2.tar.gz 11259922 RMD160 add2181d47b90cae6ea601b27cb8331f682375da SHA1 796cf6f3f7d6b6cec752d160bcab0cd442547568 SHA256 fd951b93f8917b59bfa687656ee0612c61cd29f5b32bd562e4f71eb2a4a70ee0
-DIST jruby-src-1.5.3.tar.gz 11262937 RMD160 594fa82b15a44e9f0fcf3ced1121e68ad7adfed5 SHA1 d31ea5d9dd7bdc838b82cd5cd64eb2eab83ca92b SHA256 3805b36dd56212352c4ca35f761377604f75212c9ce6a7c735c7232ed77e97a5
 DIST jruby-src-1.5.6.tar.gz 11166177 RMD160 ecb3d9f08837c1d0c4342bcf0bcaa0fe0c16a0e1 SHA1 99c084b669a92ce548aa5ed731c2fb102a8fc293 SHA256 c0217d6852a1fbf8edd55c1ec866af623e7aaf5f7b0be7abfaf1baf365655efa
 DIST jruby-src-1.6.5.1.tar.gz 14284770 RMD160 a96de6c66055cbcebf48109c972d46f7d22a67c2 SHA1 8e1f6fbf609ed98ad848d3636aac1bcdcb63e3ff SHA256 1126f29b888b5427c2d416042a6c010849ab1d29ee9be97e592caf6859921be5
 EBUILD jruby-1.3.1-r1.ebuild 5350 RMD160 19a52b4bdb5fcc48a6a7d94ad9ede6aea3583327 SHA1 a92b88d5934a1e3e060c595d190782ce34165aaf SHA256 3f85aa08aa29e0f209544109f18b54318d450a28320a3692448213bee8521da4
 EBUILD jruby-1.4.1.ebuild 5998 RMD160 208b070013917131cc2b1fdf31ee38d038212a68 SHA1 250fea0c35426c0ea50e9fa44ad89c9ed953d7cb SHA256 7d3171a7b8b4faaa4917d692dfedcb5196c3e3c282f72cf5f43c3c9346e13237
-EBUILD jruby-1.5.2-r1.ebuild 5991 RMD160 c6d8fb7b61dd530e7ec6e6703e066c24f306ea5c SHA1 2732485cdcd5d8a2ec62632e03c3ff929bf1f9ba SHA256 5a1bde40da907e466e09ae4f8ee207c8019a6b4b7b85bb2bd63ff647f5a535cd
-EBUILD jruby-1.5.2.ebuild 5988 RMD160 fde151524377a1cd48accb0778a2d6ecc77a4bbf SHA1 31d7cccb02d15273a61f6052e1e0436c10b4fdba SHA256 1c0839a925f9fc7d25148ceeb776abce26351b6196712ba55d22572cabb66971
-EBUILD jruby-1.5.3.ebuild 6206 RMD160 d5dcd3884fcb76c069237a38fb7af7adf7dbaabf SHA1 2ed7f31ae65b196d52bb07f5164e829d33beb957 SHA256 d9ae2e1895ecf07dc32cda587bec28199e4ee23b071f2d2da00256790866b459
 EBUILD jruby-1.5.6-r1.ebuild 6226 RMD160 652ce387de90b5374ac561f6dc6999ef422c4b5f SHA1 4a37c4d0d6438b5471163427b5382155f507834f SHA256 591df79a8e86dc7c2b966cf73e23f3aac943a7bc39de2c339eaff4ea630aa60e
 EBUILD jruby-1.5.6.ebuild 6175 RMD160 b36494f1a6ac8a8eede19295dd232eab319bd07e SHA1 f470dc94162f1d33fb1d5f1d68c77704d7ac7d01 SHA256 740bccc78a4130e3824678e06c46e8f8c665e41ee1cc077f01e70da3ce354613
 EBUILD jruby-1.6.5.1.ebuild 6166 RMD160 9a03ee1f5c5afb071fcb37921fd95d445b23c6e8 SHA1 04c09370eaf6ff53c58b04bd7ad78b6362ba91f4 SHA256 dbb1ce214ac109379bb4efb100e1c1d5fdd9cd1278e10c6c977d295d8c0be724
-MISC ChangeLog 14746 RMD160 6413b253758ac84bdca33150a1845b220e969334 SHA1 e9c202ba80cdc43e9fb566c08f4e61105f7058d6 SHA256 d38f6001983e3dee06c5fb3457ea1b4e606546150540026572ddd0eba1eefb64
+MISC ChangeLog 14888 RMD160 1398d063593e3761f7744065244b8765e7775101 SHA1 0cf8e86c6c4889c39349e1a97e4f64d2329651f3 SHA256 85c89bf83d15453ab776dedfb976cd49b3585edcd12edb8c78b1459cde948267
 MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+JIoMACgkQiIP6VqMIqNczIwD/a4j+zRmniaq0+VOQgJV1JCPH
-Z5/gZUMDr87ZyMNlPR0BAJTi8jAHbF7FdUO6aq94qUxiRc+wT9lmqcu8gUGafOPM
-=y4cH
+iF0EAREIAAYFAk+JI2UACgkQiIP6VqMIqNeTngD+OMIu+MSq3J7w4hVQKERZbjUh
+HY3NlXF0KI+bqQDkhaIA9Aw8NloUnZ1o/FI9tsdA2+jUre/uONLyWn4iFP19Vbw=
+=DoCV
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jruby/jruby-1.5.2-r1.ebuild b/dev-java/jruby/jruby-1.5.2-r1.ebuild
deleted file mode 100644
index f9cb06ef9a5b..000000000000
--- a/dev-java/jruby/jruby-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.2-r1.ebuild,v 1.1 2010/09/05 01:49:27 ali_bush Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV/_rc1/RC1}"
-
-DESCRIPTION="Java-based Ruby interpreter implementation"
-HOMEPAGE="http://jruby.codehaus.org/"
-SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz"
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bsf ssl"
-
-CDEPEND=">=dev-java/bytelist-1.0.6:0
-	>=dev-java/constantine-0.6:0
-	>=dev-java/jline-0.9.94:0
-	>=dev-java/joni-1.1.3:0
-	>=dev-java/jnr-posix-1.1.3:0
-	>=dev-java/jnr-netdb-1.0:0
-	>=dev-java/jvyamlb-0.2.5:0
-	>=dev-java/asm-3.2:3
-	dev-java/jcodings:0
-	>=dev-java/jffi-0.7_pre:0.4
-	dev-java/joda-time:0
-	dev-util/jay:0[java]
-	dev-java/nailgun:0
-	dev-java/jaffl:0
-	dev-java/jgrapht:0
-	dev-java/ant-core:0
-	dev-java/bsf:2.3"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/ant-trax:0
-		dev-java/junit:4
-		java-virtuals/jdk-with-com-sun
-		dev-java/commons-logging:0
-		dev-java/xalan:0
-		>=dev-java/jna-posix-1.0.1:0
-	)
-	!!<dev-ruby/jruby-1.3.1-r1"
-
-PDEPEND="ssl? ( dev-ruby/jruby-openssl )"
-
-# Tests fail.
-# Need to stop injecting jar's into classpath.
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-RUBY_HOME=/usr/share/${PN}/lib/ruby
-SITE_RUBY=${RUBY_HOME}/site_ruby
-GEMS=${RUBY_HOME}/gems
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist constantine jay \
-jcodings jffi-0.4 jline constantine \
-joda-time joni jnr-posix jnr-netdb jvyamlb nailgun jaffl jgrapht"
-EANT_NEEDS_TOOLS="true"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	local fail
-
-	for directory in "${GEMS}" "${SITE_RUBY}"; do
-		if [[ -L ${directory} ]]; then
-			eerror "${directory} is a symlink. Please do the following to resolve the situation:"
-			echo 'emerge -an app-portage/gentoolkit'
-			echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > ~/jruby.fix'
-			echo 'emerge -1C $(< ~/jruby.fix)'
-			echo "rm ${directory}"
-			echo 'emerge -1 $(< ~/jruby.fix)'
-			echo 'rm ~/jruby.fix'
-
-			eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187"
-			fail="true"
-		fi
-	done
-
-	if [[ -n ${fail} ]]; then
-		die "Please address the above errors, then run emerge --resume"
-	fi
-}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.0-system-jars.patch
-	epatch "${FILESDIR}/1.5.1/build.xml.patch"
-	epatch "${FILESDIR}/1.5.1/testfixes.patch"
-
-	# We don't need to use Retroweaver. There is a jarjar and a regular jar
-	# target but even with jarjarclean, both are a pain. The latter target
-	# is slightly easier so go with this one.
-	sed -r -i \
-		-e 's/maxmemory="128m"/maxmemory="192m"/' \
-		-e "/RetroWeaverTask/d" \
-		-e "/<zipfileset .+\/>/d" \
-		build.xml || die
-
-	sed -i -e '/Arndt/d' src/org/jruby/RubyBigDecimal.java
-
-	# Delete the bundled JARs but keep invokedynamic.jar.
-	# No source is available and it's only a dummy anyway.
-	find build_lib -name "*.jar" ! -name "jsr292-mock.jar" -delete || die
-	rm lib/profile.jar || die
-
-	# change some defaults for Gentoo to work properly
-	cat - >> src/org/jruby/jruby.properties <<EOF
-jruby.bindir = /usr/bin
-EOF
-}
-
-src_compile() {
-	local flags=""
-	use bsf && flags="-Dbsf.present=true"
-
-	eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
-}
-
-src_test() {
-	if [ ${UID} == 0 ] ; then
-		ewarn 'The tests will fail if run as root so skipping them.'
-		ewarn 'Enable FEATURES="userpriv" if you want to run them.'
-		return
-	fi
-	# Our jruby.jar is unbundled so we need to add the classpath to this test.
-	sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" test/test_load_compiled_ruby_class_from_classpath.rb || die
-	sed -i "s@:refid => 'build.classpath'@:path =>\"#{ENV['JRUBY_CP']}:lib/jruby.jar\"@g" \
-		rakelib/commands.rake || die
-	#sed -i "s@:refid => 'test.class.path'@:path => \"#{ENV['JRUBY_CP']}@g" \
-	#	rakelib/commands.rake || die
-
-	#bsf optionally depends on jruby, which means that the previously
-	#installed jruby will be added to classpath, nasty things will happen.
-	local cpath=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4`
-	cpath="$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.jar:__g")"
-	cpath="${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan)"
-	EANT_GENTOO_CLASSPATH=""
-
-	local flags=""
-	use bsf && flags="-Dbsf.present=true"
-
-	#Clear RUBYOPT
-	export RUBYOPT=""
-	export JRUBY_CP="${cpath}"
-	ANT_TASKS="ant-junit4 ant-trax" \
-		JRUBY_OPTS="" eant test -Djdk1.5+=true -Djruby.bindir=bin \
-		-Dgentoo.classpath="${cpath}" ${flags}
-}
-
-src_install() {
-	local bin
-
-	java-pkg_dojar lib/${PN}.jar
-	dodoc README docs/{*.txt,README.*} || die
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/org
-
-	# We run the sed here in install so that we don't get the wrong
-	# data during the test phase!
-	sed \
-		-e '/++ebuild-cut-here++/, /--ebuild-cut-here--/ d' \
-		-e '/^JRUBY_HOME=/s:=:=/usr/share/jruby:' \
-		bin/jruby > "${T}"/jruby
-
-	dobin "${T}"/jruby "${S}"/bin/j{irb{,_swing},rubyc} || die
-
-	insinto "${RUBY_HOME}"
-	doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby} || die
-
-	# Remove all the references to RubyGems as we're just going to
-	# install it through dev-ruby/rubygems.
-	find "${D}${RUBY_HOME}" -type f \
-		'(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
-		-delete || die
-}
-
-pkg_postinst() {
-	ewarn "If you're updating from <=jruby-1.4.0, you're going to get errors related"
-	ewarn "to gentoo.rb load failure."
-	ewarn "This is due to a stray definition of JRUBY_OPTS variable from the previous ebuilds."
-	ewarn "To solve the problem, either login in a new shell, use 'env -i ${SHELL} --login'"
-	ewarn "or explicitly unset the variable before running jruby."
-}
diff --git a/dev-java/jruby/jruby-1.5.2.ebuild b/dev-java/jruby/jruby-1.5.2.ebuild
deleted file mode 100644
index 0b649272dd0f..000000000000
--- a/dev-java/jruby/jruby-1.5.2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.2.ebuild,v 1.3 2010/08/23 17:19:54 hwoarang Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV/_rc1/RC1}"
-
-DESCRIPTION="Java-based Ruby interpreter implementation"
-HOMEPAGE="http://jruby.codehaus.org/"
-SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz"
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bsf ssl"
-
-CDEPEND=">=dev-java/bytelist-1.0.6:0
-	>=dev-java/constantine-0.6:0
-	>=dev-java/jline-0.9.94:0
-	>=dev-java/joni-1.1.3:0
-	>=dev-java/jnr-posix-1.1.3:0
-	>=dev-java/jnr-netdb-1.0:0
-	>=dev-java/jvyamlb-0.2.5:0
-	>=dev-java/asm-3.2:3
-	dev-java/jcodings:0
-	>=dev-java/jffi-0.7_pre:0.4
-	dev-java/joda-time:0
-	dev-util/jay:0[java]
-	dev-java/nailgun:0
-	dev-java/jaffl:0
-	dev-java/jgrapht:0
-	dev-java/ant-core:0
-	dev-java/bsf:2.3"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/ant-trax:0
-		dev-java/junit:4
-		java-virtuals/jdk-with-com-sun
-		dev-java/commons-logging:0
-		dev-java/xalan:0
-		>=dev-java/jna-posix-1.0.1:0
-	)
-	!!<dev-ruby/jruby-1.3.1-r1"
-
-PDEPEND="ssl? ( dev-ruby/jruby-openssl )"
-
-# Tests fail.
-# Need to stop injecting jar's into classpath.
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-RUBY_HOME=/usr/share/${PN}/lib/ruby
-SITE_RUBY=${RUBY_HOME}/site_ruby
-GEMS=${RUBY_HOME}/gems
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist constantine jay \
-jcodings jffi-0.4 jline constantine \
-joda-time joni jnr-posix jnr-netdb jvyamlb nailgun jaffl jgrapht"
-EANT_NEEDS_TOOLS="true"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	local fail
-
-	for directory in "${GEMS}" "${SITE_RUBY}"; do
-		if [[ -L ${directory} ]]; then
-			eerror "${directory} is a symlink. Please do the following to resolve the situation:"
-			echo 'emerge -an app-portage/gentoolkit'
-			echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > ~/jruby.fix'
-			echo 'emerge -1C $(< ~/jruby.fix)'
-			echo "rm ${directory}"
-			echo 'emerge -1 $(< ~/jruby.fix)'
-			echo 'rm ~/jruby.fix'
-
-			eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187"
-			fail="true"
-		fi
-	done
-
-	if [[ -n ${fail} ]]; then
-		die "Please address the above errors, then run emerge --resume"
-	fi
-}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.0-system-jars.patch
-	epatch "${FILESDIR}/1.5.1/build.xml.patch"
-	epatch "${FILESDIR}/1.5.1/testfixes.patch"
-
-	# We don't need to use Retroweaver. There is a jarjar and a regular jar
-	# target but even with jarjarclean, both are a pain. The latter target
-	# is slightly easier so go with this one.
-	sed -r -i \
-		-e 's/maxmemory="128m"/maxmemory="192m"/' \
-		-e "/RetroWeaverTask/d" \
-		-e "/<zipfileset .+\/>/d" \
-		build.xml || die
-
-	sed -i -e '/Arndt/d' src/org/jruby/RubyBigDecimal.java
-
-	# Delete the bundled JARs but keep invokedynamic.jar.
-	# No source is available and it's only a dummy anyway.
-	find build_lib -name "*.jar" ! -name "jsr292-mock.jar" -delete || die
-	rm lib/profile.jar || die
-
-	# change some defaults for Gentoo to work properly
-	cat - >> src/org/jruby/jruby.properties <<EOF
-jruby.bindir = /usr/bin
-EOF
-}
-
-src_compile() {
-	local flags=""
-	use bsf && flags="-Dbsf.present=true"
-
-	eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
-}
-
-src_test() {
-	if [ ${UID} == 0 ] ; then
-		ewarn 'The tests will fail if run as root so skipping them.'
-		ewarn 'Enable FEATURES="userpriv" if you want to run them.'
-		return
-	fi
-	# Our jruby.jar is unbundled so we need to add the classpath to this test.
-	sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" test/test_load_compiled_ruby_class_from_classpath.rb || die
-	sed -i "s@:refid => 'build.classpath'@:path =>\"#{ENV['JRUBY_CP']}:lib/jruby.jar\"@g" \
-		rakelib/commands.rake || die
-	#sed -i "s@:refid => 'test.class.path'@:path => \"#{ENV['JRUBY_CP']}@g" \
-	#	rakelib/commands.rake || die
-
-	#bsf optionally depends on jruby, which means that the previously
-	#installed jruby will be added to classpath, nasty things will happen.
-	local cpath=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4`
-	cpath="$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.jar:__g")"
-	cpath="${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan)"
-	EANT_GENTOO_CLASSPATH=""
-
-	local flags=""
-	use bsf && flags="-Dbsf.present=true"
-
-	#Clear RUBYOPT
-	export RUBYOPT=""
-	export JRUBY_CP="${cpath}"
-	ANT_TASKS="ant-junit4 ant-trax" \
-		JRUBY_OPTS="" eant test -Djdk1.5+=true -Djruby.bindir=bin \
-		-Dgentoo.classpath="${cpath}" ${flags}
-}
-
-src_install() {
-	local bin
-
-	java-pkg_dojar lib/${PN}.jar
-	dodoc README docs/{*.txt,README.*} || die
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/org
-
-	# We run the sed here in install so that we don't get the wrong
-	# data during the test phase!
-	sed \
-		-e '/++ebuild-cut-here++/, /--ebuild-cut-here--/ d' \
-		-e '/^JRUBY_HOME=/s:=:=/usr/share/jruby:' \
-		bin/jruby > "${T}"/jruby
-
-	dobin "${T}"/jruby "${S}"/bin/j{irb{,_swing},rubyc} || die
-
-	insinto "${RUBY_HOME}"
-	doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby} || die
-
-	# Remove all the references to RubyGems as we're just going to
-	# install it through dev-ruby/rubygems.
-	find "${D}${RUBY_HOME}" -type f \
-		'(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
-		-delete || die
-}
-
-pkg_postinst() {
-	ewarn "If you're updating from <=jruby-1.4.0, you're going to get errors related"
-	ewarn "to gentoo.rb load failure."
-	ewarn "This is due to a stray definition of JRUBY_OPTS variable from the previous ebuilds."
-	ewarn "To solve the problem, either login in a new shell, use 'env -i ${SHELL} --login'"
-	ewarn "or explicitly unset the variable before running jruby."
-}
diff --git a/dev-java/jruby/jruby-1.5.3.ebuild b/dev-java/jruby/jruby-1.5.3.ebuild
deleted file mode 100644
index 00032be18973..000000000000
--- a/dev-java/jruby/jruby-1.5.3.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.3.ebuild,v 1.1 2010/10/28 10:19:51 ali_bush Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV/_rc1/RC1}"
-
-DESCRIPTION="Java-based Ruby interpreter implementation"
-HOMEPAGE="http://jruby.codehaus.org/"
-SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz"
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bsf ssl"
-
-CDEPEND=">=dev-java/bytelist-1.0.6:0
-	>=dev-java/constantine-0.6:0
-	>=dev-java/jline-0.9.94:0
-	>=dev-java/joni-1.1.3:0
-	>=dev-java/jnr-posix-1.1.3:0
-	>=dev-java/jnr-netdb-1.0:0
-	>=dev-java/jvyamlb-0.2.5:0
-	>=dev-java/asm-3.2:3
-	dev-java/jcodings:0
-	>=dev-java/jffi-0.7_pre:0.4
-	dev-java/joda-time:0
-	dev-util/jay:0[java]
-	dev-java/nailgun:0
-	dev-java/jaffl:0
-	dev-java/jgrapht:0
-	dev-java/ant-core:0
-	dev-java/bsf:2.3"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/ant-trax:0
-		dev-java/junit:4
-		java-virtuals/jdk-with-com-sun
-		dev-java/commons-logging:0
-		dev-java/xalan:0
-		>=dev-java/jna-posix-1.0.1:0
-	)
-	!!<dev-ruby/jruby-1.3.1-r1"
-
-PDEPEND="ssl? ( dev-ruby/jruby-openssl )"
-
-# Tests fail.
-# Need to stop injecting jar's into classpath.
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-RUBY_HOME=/usr/share/${PN}/lib/ruby
-SITE_RUBY=${RUBY_HOME}/site_ruby
-GEMS=${RUBY_HOME}/gems
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist constantine jay \
-jcodings jffi-0.4 jline constantine \
-joda-time joni jnr-posix jnr-netdb jvyamlb nailgun jaffl jgrapht"
-EANT_NEEDS_TOOLS="true"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	local fail
-
-	for directory in "${GEMS}" "${SITE_RUBY}"; do
-		if [[ -L ${directory} ]]; then
-			eerror "${directory} is a symlink. Please do the following to resolve the situation:"
-			echo 'emerge -an app-portage/gentoolkit'
-			echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > ~/jruby.fix'
-			echo 'emerge -1C $(< ~/jruby.fix)'
-			echo "rm ${directory}"
-			echo 'emerge -1 $(< ~/jruby.fix)'
-			echo 'rm ~/jruby.fix'
-
-			eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187"
-			fail="true"
-		fi
-	done
-
-	if [[ -n ${fail} ]]; then
-		die "Please address the above errors, then run emerge --resume"
-	fi
-}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.0-system-jars.patch
-	epatch "${FILESDIR}/1.5.1/build.xml.patch"
-	epatch "${FILESDIR}/1.5.1/testfixes.patch"
-
-	# We don't need to use Retroweaver. There is a jarjar and a regular jar
-	# target but even with jarjarclean, both are a pain. The latter target
-	# is slightly easier so go with this one.
-	sed -r -i \
-		-e 's/maxmemory="128m"/maxmemory="192m"/' \
-		-e "/RetroWeaverTask/d" \
-		-e "/<zipfileset .+\/>/d" \
-		build.xml || die
-
-	sed -i -e '/Arndt/d' src/org/jruby/RubyBigDecimal.java
-
-	# Delete the bundled JARs but keep invokedynamic.jar.
-	# No source is available and it's only a dummy anyway.
-	find build_lib -name "*.jar" ! -name "jsr292-mock.jar" -delete || die
-	rm lib/profile.jar || die
-
-	# change some defaults for Gentoo to work properly
-	cat - >> src/org/jruby/jruby.properties <<EOF
-jruby.bindir = /usr/bin
-EOF
-}
-
-src_compile() {
-	local flags=""
-	use bsf && flags="-Dbsf.present=true"
-
-	eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
-}
-
-src_test() {
-	if [ ${UID} == 0 ] ; then
-		ewarn 'The tests will fail if run as root so skipping them.'
-		ewarn 'Enable FEATURES="userpriv" if you want to run them.'
-		return
-	fi
-	# Our jruby.jar is unbundled so we need to add the classpath to this test.
-	sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" test/test_load_compiled_ruby_class_from_classpath.rb || die
-	sed -i "s@:refid => 'build.classpath'@:path =>\"#{ENV['JRUBY_CP']}:lib/jruby.jar\"@g" \
-		rakelib/commands.rake || die
-	#sed -i "s@:refid => 'test.class.path'@:path => \"#{ENV['JRUBY_CP']}@g" \
-	#	rakelib/commands.rake || die
-
-	#bsf optionally depends on jruby, which means that the previously
-	#installed jruby will be added to classpath, nasty things will happen.
-	local cpath=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4`
-	cpath="$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.jar:__g")"
-	cpath="${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan)"
-	EANT_GENTOO_CLASSPATH=""
-
-	local flags=""
-	use bsf && flags="-Dbsf.present=true"
-
-	#Clear RUBYOPT
-	export RUBYOPT=""
-	export JRUBY_CP="${cpath}"
-	ANT_TASKS="ant-junit4 ant-trax" \
-		JRUBY_OPTS="" eant test -Djdk1.5+=true -Djruby.bindir=bin \
-		-Dgentoo.classpath="${cpath}" ${flags}
-}
-
-src_install() {
-	local bin
-
-	java-pkg_dojar lib/${PN}.jar
-	dodoc README docs/{*.txt,README.*} || die
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/org
-
-	# We run the sed here in install so that we don't get the wrong
-	# data during the test phase!
-	sed \
-		-e '/++ebuild-cut-here++/, /--ebuild-cut-here--/ d' \
-		-e '/^JRUBY_HOME=/s:=:=/usr/share/jruby:' \
-		bin/jruby > "${T}"/jruby
-
-	dobin "${T}"/jruby "${S}"/bin/j{irb{,_swing},rubyc} || die
-
-	insinto "${RUBY_HOME}"
-	doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby} || die
-
-	# Remove all the references to RubyGems as we're just going to
-	# install it through dev-ruby/rubygems.
-	find "${D}${RUBY_HOME}" -type f \
-		'(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
-		-delete || die
-}
-
-pkg_postinst() {
-	ewarn "If you're updating from <=jruby-1.4.0, you're going to get errors related"
-	ewarn "to gentoo.rb load failure."
-	ewarn "This is due to a stray definition of JRUBY_OPTS variable from the previous ebuilds."
-	ewarn "To solve the problem, either login in a new shell, use 'env -i ${SHELL} --login'"
-	ewarn "or explicitly unset the variable before running jruby."
-	ewarn ""
-	ewarn "Currently this package introduces issues/bugs that are not present within upstream"
-	ewarn "releases.  Therefore if you are wanting a stable build of jruby please do not"
-	ewarn "use this package."
-}