Remove older versions, only leave around those supporting ruby-ng-installed packages.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

7 files changed, 11 insertions, 668 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index f44c8bb485fa..ea7074f3a143 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.50 2010/01/16 23:34:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.51 2010/01/23 13:51:00 flameeyes Exp $
+
+  23 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/jruby-0.9.8-sandbox.patch, -jruby-1.0.0.ebuild,
+  -jruby-1.0.3.ebuild, -jruby-1.2.0-r1.ebuild, -jruby-1.3.1.ebuild:
+  Remove older versions, only leave around those supporting
+  ruby-ng-installed packages.
 
 *jruby-1.4.0-r3 (16 Jan 2010)
 
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index faa88b4b1827..41c8ce353491 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -6,26 +6,18 @@ AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d7
 AUX ftype-test-fixes.patch 2738 RMD160 9de8f9e14469967b736fbcf48c28a2ee9c366d6e SHA1 4e94c0447dfef6f6f9dd8b78b3f77ffaa4d798bb SHA256 82fd519cc11271e4d475529a308dbcf70526c18f7c1f193a2ef93d6f0b4fdd2b
 AUX gentoo.rb 257 RMD160 3dd119c675829a9196e374f0c290ceac37ddc7c6 SHA1 de86d6471533efb97bbfe24ecb4847610bc1ea42 SHA256 6868b148829f218ff4c739af05e81b1d9da5d295507d99cb1f074ed88d72a1dc
 AUX jruby 97 RMD160 500ca93e1a23897fb3d9ebd0b1a6ba7caec9be1d SHA1 ae79a6d60a9e28034fb08b394cba443fd66ceacf SHA256 579b36ea120de4fc04e384937ecc567a090bb64f276b07cc059d072a5a7d2e60
-AUX jruby-0.9.8-sandbox.patch 522 RMD160 f9aebe3469edb3d2d22d641e616691ff14def7db SHA1 9d983c1bd7cb35239d85af445f5aa7c5d1c143a3 SHA256 1c2701881674a978c9ddc32e2e126cf25690e86011c6301e7f825407fb5810a2
 AUX jruby-1.4.0-system-jars.patch 3113 RMD160 40963d8db934dd5a9a81456af513ba59367317bb SHA1 5d6a571751f06d81f2b0625f82bc0726342f33a9 SHA256 62718a29caf01f5e72670206e1390f94c30011d2bdb6b7903333c134612713a8
 AUX user-test-fixes.patch 5147 RMD160 6258879413ae81a18d0c6bcaa3b0661d86a0d14a SHA1 32d3f80db383cf664c9ad1f9e52c2688ae3cbe5c SHA256 f21469d41de9f9b5fb1682596f64899a71c92332db24bf27e8c50dbb1896a92e
-DIST jruby-src-1.0.3.tar.gz 5218289 RMD160 b717863f8455ea5f323dd2b73824c39732dbd7df SHA1 38c091dbd28102013b61b10d1d24c6c237f44937 SHA256 3d10f92d8fd0815529a2ddefc291af288b8f2f51749c347c29006b84a30a2c0a
-DIST jruby-src-1.0.tar.gz 4840184 RMD160 3de4dfa558a12a1643fa2357f3e144e34c5a718d SHA1 f4e18c6c112e1741024d76b10528fef7a242a018 SHA256 80088e32cceb929b0cd0d0115ed800577b7b800d42dca3356e840d1123047b03
-DIST jruby-src-1.2.0.tar.gz 10858426 RMD160 a12d9243eb7e5338f1674c0bc9f874bc617c2662 SHA1 69f13b5ec216a7e615f4077730908217a6a9f1fc SHA256 8bd4e007f4d132b15fe968d88f474c97b5058e8cdd1e674820363c2cdc5fb048
 DIST jruby-src-1.3.1.tar.gz 12076705 RMD160 ef10395dbdf9490820caa65ff6236dd99e7c62c8 SHA1 e4de71e5c01f71f236b3135e07a5841784767fd8 SHA256 9095b0bec0ee8e6cd96b72c7f2aec8a90fa429b840484d57a48d8fb760aae600
 DIST jruby-src-1.4.0.tar.gz 12731458 RMD160 70b6a34a9e1b174fe1c8f1df8ba8ea7cbfa4da37 SHA1 3d6f634e16b789a5a086327c0f09710dd29d1ec7 SHA256 b9fd84ed097ac136afce4462a13bb0752bab467db203ed3797e228a435e26d23
-EBUILD jruby-1.0.0.ebuild 4643 RMD160 6da48b87bdb363864e78d8b5011033899ca03a6f SHA1 67508a52174b5efc940282094e93e9517ca0d306 SHA256 bfbcb8a3a02979527967408102b639bf510eb3eda96972c47c888d50da576cc3
-EBUILD jruby-1.0.3.ebuild 4462 RMD160 83c55f4dd8b7d4c2c92843dd26608da2485b004d SHA1 febe0773f61e855d8926ce880104a805a31f81fb SHA256 bb7b90dab07750d0ed11ba62ef73f98ca35db0b682c1f9d35d84fc993f04ad19
-EBUILD jruby-1.2.0-r1.ebuild 5023 RMD160 8239a5ba7e717c3a434e98a81eb60875f97e3055 SHA1 e02cefc8138981f6d100bf6e633f04db3327000a SHA256 513ec2c93efaa444220c5ca1c2bfeb46c1244de43b900b38386e8d63f9f94d52
 EBUILD jruby-1.3.1-r1.ebuild 5502 RMD160 94388e24d29a24d3b23013125ae38e5a0e3f4846 SHA1 4c66c6df3aab698f950dc28e57208a4c94d523c7 SHA256 b5b064f8bec2f7ab2c045c684dda9171e57d7942dd22dfaec715dbeba3adc620
-EBUILD jruby-1.3.1.ebuild 5552 RMD160 fd6520487dd38cc12dbc5204b985117c700d454f SHA1 5208c74e8b4a45d8198ccf93c2283bc9b2fe7d69 SHA256 af93273763993cf81cfc14efe1735eb00d1fbf256c2164c74602eceb4eafd1bd
 EBUILD jruby-1.4.0-r3.ebuild 5979 RMD160 4a7a381dbc1044209821823ba9c238256afe6b8d SHA1 658ea797f6d4d9a1a4dba95036759a42d66ac3a4 SHA256 fcf5a1af6b541ea78eb7624590d2362b6d024297a7e52a76b07e147d1a920942
-MISC ChangeLog 8992 RMD160 0d39a4820437f0165a67cd15598c030de969ccd5 SHA1 16c48e937fa8be7c9dba772d570a7d3a586ea648 SHA256 b5005bab226f2579da657323b5a58e986a758a56018923c0d90f2b62cdd1289a
+MISC ChangeLog 9264 RMD160 3c5483c696596c5d92eea495f91f9599235c4e39 SHA1 cb717e762708fe71808dae75853771282822b18b SHA256 2d923351baef4037a147450b6bb493d904b2fec603c4254eca61a317ef4ce4a8
 MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktSTNkACgkQAiZjviIA2XgG1gCgvjJ7nyek4RJNL8s468vFSjWO
-J4wAoMb+eqp4S/DBS05v1XTMY7xAPjyr
-=Z9hV
+iEYEARECAAYFAkta/r8ACgkQAiZjviIA2XifkgCg0XoyygWD1DQHg2lJ18GJXDhO
+Mp8AoM+kNc4E/l0Ao+ORgGa/S/c1lnfT
+=IEkk
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jruby/files/jruby-0.9.8-sandbox.patch b/dev-java/jruby/files/jruby-0.9.8-sandbox.patch
deleted file mode 100644
index d7a436f363fa..000000000000
--- a/dev-java/jruby/files/jruby-0.9.8-sandbox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru jruby-0.9.8/build.xml jruby-0.9.8-patched/build.xml
---- jruby-0.9.8/build.xml	2007-03-05 18:44:49.000000000 -0500
-+++ jruby-0.9.8-patched/build.xml	2007-03-11 15:54:01.000000000 -0400
-@@ -137,6 +137,7 @@
-       <classpath refid="build.classpath"/>
-       <classpath path="${jruby.classes.dir}"/>
-       <sysproperty key="jruby.dump_invocations" value="${jruby.classes.dir}"/>
-+      <jvmarg value="-Djruby.home=${basedir}"/>
-       <arg value="-rjava"/>
-       <arg value="${build.dir}/__empty.rb"/>
-     </java>
diff --git a/dev-java/jruby/jruby-1.0.0.ebuild b/dev-java/jruby/jruby-1.0.0.ebuild
deleted file mode 100644
index faf7d4ec7e57..000000000000
--- a/dev-java/jruby/jruby-1.0.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.0.0.ebuild,v 1.4 2007/12/17 13:58:17 caleb Exp $
-
-JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2
-
-# 1.0 < 1.0.0_rcX
-# so, we'll pretend 1.0 is actually 1.0.0
-# remove this for next release
-# TODO complain to upstream
-MY_PV="1.0"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Java based ruby interpreter implementation"
-HOMEPAGE="http://jruby.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/${PN}-src-${MY_PV}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bsf"
-
-COMMON_DEPEND=">=dev-java/jline-0.9.91
-	=dev-java/asm-2.2*
-	dev-java/backport-util-concurrent"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-	bsf? ( >=dev-java/bsf-2.3 )
-	test? (
-		=dev-java/junit-3*
-		dev-java/ant-junit
-		dev-java/ant-trax
-	)
-	${COMMON_DEPEND}"
-PDEPEND="dev-ruby/rubygems
-	>=dev-ruby/rake-0.7.3
-	>=dev-ruby/rspec-1.0.4"
-
-S="${WORKDIR}/${MY_P}"
-
-RUBY_HOME=/usr/share/${PN}/lib/ruby
-SITE_RUBY=${RUBY_HOME}/site_ruby
-GEMS=${RUBY_HOME}/gems
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if [[ -d ${SITE_RUBY} && ! -L ${SITE_RUBY} ]]; then
-		ewarn "dev-java/jruby now uses dev-lang/ruby's site_ruby directory by creating symlinks."
-		ewarn "${SITE_RUBY} is a directory right now, which will cause problems when being merged onto the filesystem."
-	fi
-	if [[ -d ${GEMS} && ! -L ${GEMS} ]]; then
-		ewarn "dev-java/jruby now uses dev-lang/ruby's gems directory by creating symlinks."
-		ewarn "${GEMS} is a directory right now, which will cause problems when being merged onto the filesystem."
-	fi
-
-	# only use javac, see http://jira.codehaus.org/browse/JRUBY-675
-	java-pkg_force-compiler javac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# prevents /root/.jruby being created at build time with
-	# FEATURES="-userpriv"
-	# see http://bugs.gentoo.org/show_bug.cgi?id=170058
-	epatch "${FILESDIR}"/${PN}-0.9.8-sandbox.patch
-	# search only lib, kills jdk1.4+ property which we set manually
-	java-ant_ignore-system-classes
-
-	cd "${S}"/lib
-	rm -v *.jar || die
-
-	java-pkg_jar-from --build-only ant-core ant.jar
-	java-pkg_jar-from asm-2.2 asm.jar
-	java-pkg_jar-from asm-2.2 asm-commons.jar
-	java-pkg_jar-from jline
-	java-pkg_jar-from backport-util-concurrent
-	use test && java-pkg_jar-from --build-only junit
-
-	# build-only because it's just BSF adapter classes and won't be used
-	# unless invoked from bsf itself, so no need to pollute classpath
-	if use bsf; then
-		java-pkg_jar-from --build-only bsf-2.3
-	else
-		cd "${S}"
-		# testcases depending on bsf
-		rm test/org/jruby/test/TestAdoptedThreading.java || die
-		rm test/org/jruby/javasupport/test/TestBSF.java || die
-		sed -i -e '/TestBSF.class/d' \
-			test/org/jruby/javasupport/test/JavaSupportTestSuite.java || die
-		sed -i -e '/TestAdoptedThreading.class/d' \
-			test/org/jruby/test/MainTestSuite.java || die
-	fi
-}
-
-src_compile() {
-	eant jar $(use_doc create-apidocs) -Djruby.home="${T}"/.jruby -Djdk1.4+=true
-}
-
-src_test() {
-	# needs bsf's runtime deps to work
-	use bsf && java-pkg_jar-from --into lib --with-dependencies bsf-2.3
-	ANT_TASKS="ant-junit ant-trax" eant test -Djdk1.4+=true
-}
-
-src_install() {
-	java-pkg_dojar lib/${PN}.jar
-
-	dodoc README docs/{*.txt,README.*,BeanScriptingFramework} || die
-	dohtml docs/getting_involved.html || die
-
-	if use doc; then
-		java-pkg_dojavadoc docs/api
-	fi
-	use source && java-pkg_dosrc src/org
-	java-pkg_dolauncher ${PN} \
-		--main 'org.jruby.Main' \
-		--java_args '-Djruby.base=/usr/share/jruby -Djruby.home=/usr/share/jruby -Djruby.lib=/usr/share/jruby/lib -Djruby.script=jruby -Djruby.shell=/bin/sh'
-	dobin "${S}"/bin/jirb
-
-	dodir "/usr/share/${PN}/lib"
-	insinto "/usr/share/${PN}/lib"
-	doins -r "${S}/lib/ruby"
-
-	# Share gems with regular ruby
-	rm -r "${D}"/usr/share/${PN}/lib/ruby/gems || die
-	dosym /usr/lib/ruby/gems /usr/share/${PN}/lib/ruby/gems || die
-
-	# Share site_ruby with regular ruby
-	rm -r "${D}"/usr/share/${PN}/lib/ruby/site_ruby || die
-	dosym /usr/lib/ruby/site_ruby /usr/share/${PN}/lib/ruby/site_ruby || die
-}
-
-pkg_preinst() {
-	local bad_directory=0
-
-	if [[ -d ${SITE_RUBY} && ! -L ${SITE_RUBY} ]]; then
-		eerror "${SITE_RUBY} is a directory. Please move this directory out of the way, and then emerge --resume."
-		bad_directory=1
-	fi
-
-	if [[ -d ${GEMS} && ! -L ${GEMS} ]]; then
-		eerror "${GEMS} is a directory. Please move this directory out of the way, and then emerge --resume."
-		bad_directory=1
-	fi
-
-	if [[ ! ${bad_directory} ]]; then
-		die "Please address the above errors, then emerge --resume."
-	fi
-}
diff --git a/dev-java/jruby/jruby-1.0.3.ebuild b/dev-java/jruby/jruby-1.0.3.ebuild
deleted file mode 100644
index ce20a2aa7676..000000000000
--- a/dev-java/jruby/jruby-1.0.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.0.3.ebuild,v 1.1 2007/12/17 13:58:17 caleb Exp $
-
-JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java based ruby interpreter implementation"
-HOMEPAGE="http://jruby.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bsf"
-
-COMMON_DEPEND=">=dev-java/jline-0.9.91
-	=dev-java/asm-2.2*
-	dev-java/backport-util-concurrent"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-	bsf? ( >=dev-java/bsf-2.3 )
-	test? (
-		=dev-java/junit-3*
-		dev-java/ant-junit
-		dev-java/ant-trax
-	)
-	${COMMON_DEPEND}"
-PDEPEND="dev-ruby/rubygems
-	>=dev-ruby/rake-0.7.3
-	>=dev-ruby/rspec-1.0.4"
-
-RUBY_HOME=/usr/share/${PN}/lib/ruby
-SITE_RUBY=${RUBY_HOME}/site_ruby
-GEMS=${RUBY_HOME}/gems
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if [[ -d ${SITE_RUBY} && ! -L ${SITE_RUBY} ]]; then
-		ewarn "dev-java/jruby now uses dev-lang/ruby's site_ruby directory by creating symlinks."
-		ewarn "${SITE_RUBY} is a directory right now, which will cause problems when being merged onto the filesystem."
-	fi
-	if [[ -d ${GEMS} && ! -L ${GEMS} ]]; then
-		ewarn "dev-java/jruby now uses dev-lang/ruby's gems directory by creating symlinks."
-		ewarn "${GEMS} is a directory right now, which will cause problems when being merged onto the filesystem."
-	fi
-
-	# only use javac, see http://jira.codehaus.org/browse/JRUBY-675
-	java-pkg_force-compiler javac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# prevents /root/.jruby being created at build time with
-	# FEATURES="-userpriv"
-	# see http://bugs.gentoo.org/show_bug.cgi?id=170058
-	epatch "${FILESDIR}"/${PN}-0.9.8-sandbox.patch
-	# search only lib, kills jdk1.4+ property which we set manually
-	java-ant_ignore-system-classes
-
-	cd "${S}"/lib
-	rm -v *.jar || die
-
-	java-pkg_jar-from --build-only ant-core ant.jar
-	java-pkg_jar-from asm-2.2 asm.jar
-	java-pkg_jar-from asm-2.2 asm-commons.jar
-	java-pkg_jar-from jline
-	java-pkg_jar-from backport-util-concurrent
-	use test && java-pkg_jar-from --build-only junit
-
-	# build-only because it's just BSF adapter classes and won't be used
-	# unless invoked from bsf itself, so no need to pollute classpath
-	if use bsf; then
-		java-pkg_jar-from --build-only bsf-2.3
-	else
-		cd "${S}"
-		# testcases depending on bsf
-		rm test/org/jruby/test/TestAdoptedThreading.java || die
-		rm test/org/jruby/javasupport/test/TestBSF.java || die
-		sed -i -e '/TestBSF.class/d' \
-			test/org/jruby/javasupport/test/JavaSupportTestSuite.java || die
-		sed -i -e '/TestAdoptedThreading.class/d' \
-			test/org/jruby/test/MainTestSuite.java || die
-	fi
-}
-
-src_compile() {
-	eant jar $(use_doc create-apidocs) -Djruby.home="${T}"/.jruby -Djdk1.4+=true
-}
-
-src_test() {
-	# needs bsf's runtime deps to work
-	use bsf && java-pkg_jar-from --into lib --with-dependencies bsf-2.3
-	ANT_TASKS="ant-junit ant-trax" eant test -Djdk1.4+=true
-}
-
-src_install() {
-	java-pkg_dojar lib/${PN}.jar
-
-	dodoc README docs/{*.txt,README.*,BeanScriptingFramework} || die
-	dohtml docs/getting_involved.html || die
-
-	if use doc; then
-		java-pkg_dojavadoc docs/api
-	fi
-	use source && java-pkg_dosrc src/org
-	java-pkg_dolauncher ${PN} \
-		--main 'org.jruby.Main' \
-		--java_args '-Djruby.base=/usr/share/jruby -Djruby.home=/usr/share/jruby -Djruby.lib=/usr/share/jruby/lib -Djruby.script=jruby -Djruby.shell=/bin/sh'
-	dobin "${S}"/bin/jirb
-
-	dodir "/usr/share/${PN}/lib"
-	insinto "/usr/share/${PN}/lib"
-	doins -r "${S}/lib/ruby"
-
-	# Share gems with regular ruby
-	rm -r "${D}"/usr/share/${PN}/lib/ruby/gems || die
-	dosym /usr/lib/ruby/gems /usr/share/${PN}/lib/ruby/gems || die
-
-	# Share site_ruby with regular ruby
-	rm -r "${D}"/usr/share/${PN}/lib/ruby/site_ruby || die
-	dosym /usr/lib/ruby/site_ruby /usr/share/${PN}/lib/ruby/site_ruby || die
-}
-
-pkg_preinst() {
-	local bad_directory=0
-
-	if [[ -d ${SITE_RUBY} && ! -L ${SITE_RUBY} ]]; then
-		eerror "${SITE_RUBY} is a directory. Please move this directory out of the way, and then emerge --resume."
-		bad_directory=1
-	fi
-
-	if [[ -d ${GEMS} && ! -L ${GEMS} ]]; then
-		eerror "${GEMS} is a directory. Please move this directory out of the way, and then emerge --resume."
-		bad_directory=1
-	fi
-
-	if [[ ! ${bad_directory} ]]; then
-		die "Please address the above errors, then emerge --resume."
-	fi
-}
diff --git a/dev-java/jruby/jruby-1.2.0-r1.ebuild b/dev-java/jruby/jruby-1.2.0-r1.ebuild
deleted file mode 100644
index e432e028ac77..000000000000
--- a/dev-java/jruby/jruby-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.2.0-r1.ebuild,v 1.4 2009/10/25 21:51:27 volkmar Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java-based Ruby interpreter implementation"
-HOMEPAGE="http://jruby.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bsf java6 ssl"
-
-CDEPEND=">=dev-java/bytelist-1.0.2:0
-	>=dev-java/constantine-0.5:0
-	>=dev-java/jline-0.9.94:0
-	>=dev-java/joni-1.1.3:0
-	>=dev-java/jna-posix-1.0:0
-	>=dev-java/jvyamlb-0.2.5:0
-	dev-java/asm:3
-	dev-java/jcodings:0
-	dev-java/jffi:0
-	dev-java/jna:0
-	dev-java/joda-time:0
-	dev-util/jay:0[java]
-	!java6? ( dev-java/backport-util-concurrent )"
-
-RDEPEND="${CDEPEND}
-	!java6? ( =virtual/jre-1.5* )
-	java6? ( >=virtual/jre-1.6 )"
-
-# using 1.6 produces 1.6 bytecode, not sure why
-DEPEND="${CDEPEND}
-	!java6? ( =virtual/jdk-1.5* )
-	java6? ( >=virtual/jdk-1.6 )
-	bsf? ( dev-java/bsf:2.3 )
-	test? (
-		dev-java/ant-junit
-		dev-java/ant-trax
-	)"
-
-PDEPEND="dev-ruby/rubygems
-	>=dev-ruby/rake-0.7.3
-	>=dev-ruby/rspec-1.0.4
-	ssl? ( dev-ruby/jruby-openssl )"
-
-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="asm-3 bytelist constantine jay jcodings jffi jline joda-time joni jna jna-posix jvyamlb"
-EANT_NEEDS_TOOLS="true"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	use java6 || EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} backport-util-concurrent"
-
-	local fail
-
-	if [[ -d "${GEMS}" && ! -L "${GEMS}" ]]; then
-		eerror "${GEMS} is a directory. Please remove this directory."
-		fail="true"
-	fi
-
-	# the symlink creates a collision with rubygems, bug #270953
-	# cannot be currently solved by removing in pkg_preinst, bug #233278
-	if [[ -L "${SITE_RUBY}" ]]; then
-		eerror "${SITE_RUBY} is a symlink. Please remove this symlink."
-		fail="true"
-	fi
-
-	if [[ -n ${fail} ]]; then
-		eerror "Unmerging the old jruby version should also fix the problem(s)."
-		die "Please address the above errors, then run emerge --resume"
-	fi
-}
-
-java_prepare() {
-	epatch "${FILESDIR}/ftype-test-fixes.patch"
-	epatch "${FILESDIR}/user-test-fixes.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
-
-	# Delete the bundled JARs but keep invokedynamic.jar.
-	# No source is available and it's only a dummy anyway.
-	find build_lib lib -name "*.jar" ! -name "invokedynamic.jar" -delete || die
-
-	if ! use bsf; then
-		# Remove BSF test cases.
-		cd "${S}/test/org/jruby"
-		rm -f test/TestAdoptedThreading.java || die
-		rm -f javasupport/test/TestBSF.java || die
-		sed -i '/TestBSF.class/d' javasupport/test/JavaSupportTestSuite.java || die
-		sed -i '/TestAdoptedThreading.class/d' test/MainTestSuite.java || die
-	fi
-}
-
-src_compile() {
-	eant jar $(use_doc create-apidocs) -Djdk1.5+=true
-}
-
-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
-
-	# BSF is a compile-time only dependency because it's just the adapter
-	# classes and they won't be used unless invoked from BSF itself.
-	use bsf && java-pkg_jar-from --into build_lib --with-dependencies bsf-2.3
-
-	# 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
-
-	ANT_TASKS="ant-junit ant-trax" JRUBY_CP=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,}` JRUBY_OPTS="" eant test -Djdk1.5+=true
-}
-
-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
-
-	dobin "${FILESDIR}/jruby" || die
-	exeinto "/usr/share/${PN}/bin"
-	doexe "${S}/bin/jruby" || die
-
-	# Install some jruby tools.
-	dobin "${S}"/bin/j{gem,irb{,_swing},rubyc} || die
-
-	# Symlink some common tools so that jruby can launch them internally.
-	for bin in {j,}gem jirb jrubyc rake rdoc ri spec{,_translator} ; do
-		dosym "/usr/bin/${bin}" "/usr/share/${PN}/bin/${bin}" || die
-	done
-
-	insinto "${RUBY_HOME}"
-	doins -r "${S}/lib/ruby/1.8" || die
-	doins -r "${S}/lib/ruby/site_ruby" || die
-
-	# Share gems with regular Ruby.
-	dosym /usr/$(get_libdir)/ruby/gems "${GEMS}" || die
-
-	# Autoload rubygems and append regular site_ruby to $LOAD_PATH.
-	# Unfortunately the -I option prepends instead.
-	insinto "${SITE_RUBY}"
-	doins "${FILESDIR}/gentoo.rb" || die
-	doenvd "${FILESDIR}/10jruby" || die
-}
diff --git a/dev-java/jruby/jruby-1.3.1.ebuild b/dev-java/jruby/jruby-1.3.1.ebuild
deleted file mode 100644
index b27875462a66..000000000000
--- a/dev-java/jruby/jruby-1.3.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.3.1.ebuild,v 1.4 2009/10/25 21:51:27 volkmar 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://dist.codehaus.org/${PN}/${MY_PV}/${PN}-src-${MY_PV}.tar.gz"
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bsf java6 ssl"
-
-CDEPEND=">=dev-java/bytelist-1.0.2:0
-	>=dev-java/constantine-0.6:0
-	>=dev-java/jline-0.9.94:0
-	>=dev-java/joni-1.1.3:0
-	>=dev-java/jna-posix-1.0.1:0
-	>=dev-java/jvyamlb-0.2.5:0
-	dev-java/asm:3
-	dev-java/jcodings:0
-	dev-java/jffi:0.4
-	dev-java/jna:0
-	dev-java/joda-time:0
-	dev-util/jay:0[java]
-	!java6? ( dev-java/backport-util-concurrent:0 )
-	dev-java/nailgun:0"
-
-RDEPEND="${CDEPEND}
-	!java6? ( =virtual/jre-1.5* )
-	java6? ( >=virtual/jre-1.6 )"
-
-# using 1.6 produces 1.6 bytecode, not sure why
-DEPEND="${CDEPEND}
-	!java6? ( =virtual/jdk-1.5* )
-	java6? ( >=virtual/jdk-1.6 )
-	bsf? ( dev-java/bsf:2.3 )
-	test? (
-		dev-java/ant-junit
-		dev-java/ant-trax
-	)"
-
-PDEPEND="dev-ruby/rubygems
-	>=dev-ruby/rake-0.7.3
-	>=dev-ruby/rspec-1.0.4
-	ssl? ( dev-ruby/jruby-openssl )"
-
-# Tests work for ali_bush.  But fail for flameeyes see #282439.
-# Tests work for ali_bush inside the ebuild env
-# but fail when using vanilla src tarball.
-# Restrict tests so we can stablise this package.
-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="asm-3 bytelist constantine jay jcodings jffi-0.4 jline \
-joda-time joni jna jna-posix jvyamlb,nailgun"
-EANT_NEEDS_TOOLS="true"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	use java6 || EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} backport-util-concurrent"
-
-	local fail
-
-	if [[ -d "${GEMS}" && ! -L "${GEMS}" ]]; then
-		eerror "${GEMS} is a directory. Please remove this directory."
-		fail="true"
-	fi
-
-	# the symlink creates a collision with rubygems, bug #270953
-	# cannot be currently solved by removing in pkg_preinst, bug #233278
-	if [[ -L "${SITE_RUBY}" ]]; then
-		eerror "${SITE_RUBY} is a symlink. Please remove this symlink."
-		fail="true"
-	fi
-
-	if [[ -n ${fail} ]]; then
-		eerror "Unmerging the old jruby version should also fix the problem(s)."
-		die "Please address the above errors, then run emerge --resume"
-	fi
-}
-
-java_prepare() {
-	epatch "${FILESDIR}/ftype-test-fixes.patch"
-	epatch "${FILESDIR}/user-test-fixes.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
-
-	# Delete the bundled JARs but keep invokedynamic.jar.
-	# No source is available and it's only a dummy anyway.
-	find build_lib lib -name "*.jar" ! -name "invokedynamic.jar" -delete || die
-
-	if ! use bsf; then
-		# Remove BSF test cases.
-		cd "${S}/test/org/jruby"
-		rm -f test/TestAdoptedThreading.java || die
-		rm -f javasupport/test/TestBSF.java || die
-		sed -i '/TestBSF.class/d' javasupport/test/JavaSupportTestSuite.java || die
-		sed -i '/TestAdoptedThreading.class/d' test/MainTestSuite.java || die
-	fi
-}
-
-src_compile() {
-	eant jar $(use_doc create-apidocs) -Djdk1.5+=true
-}
-
-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
-
-	# ali_bush was getting crashes while attempting to run a test.
-	# No info about why it crashed seemed to be produced.
-	# remove it as temp fix.
-	sed -i -e '/MRI/d' build.xml || die "Failed to sed build.xml"
-
-	# BSF is a compile-time only dependency because it's just the adapter
-	# classes and they won't be used unless invoked from BSF itself.
-	use bsf && java-pkg_jar-from --into build_lib --with-dependencies bsf-2.3
-
-	# 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
-
-	ANT_TASKS="ant-junit ant-trax" JRUBY_CP=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,}` JRUBY_OPTS="" eant test -Djdk1.5+=true
-}
-
-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
-
-	dobin "${FILESDIR}/jruby" || die
-	exeinto "/usr/share/${PN}/bin"
-	doexe "${S}/bin/jruby" || die
-
-	# Install some jruby tools.
-	dobin "${S}"/bin/j{gem,irb{,_swing},rubyc} || die
-
-	# Symlink some common tools so that jruby can launch them internally.
-	for bin in {j,}gem jirb jrubyc rake rdoc ri spec{,_translator} ; do
-		dosym "/usr/bin/${bin}" "/usr/share/${PN}/bin/${bin}" || die
-	done
-
-	insinto "${RUBY_HOME}"
-	doins -r "${S}/lib/ruby/1.8" || die
-	doins -r "${S}/lib/ruby/site_ruby" || die
-
-	# Share gems with regular Ruby.
-	dosym /usr/$(get_libdir)/ruby/gems "${GEMS}" || die
-
-	# Autoload rubygems and append regular site_ruby to $LOAD_PATH.
-	# Unfortunately the -I option prepends instead.
-	insinto "${SITE_RUBY}"
-	doins "${FILESDIR}/gentoo.rb" || die
-	doenvd "${FILESDIR}/10jruby" || die
-}