Remove old as requested by Arfrever.

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

6 files changed, 15 insertions, 536 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 3ce32e33bc27..af9eeec98244 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jython
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.73 2012/04/13 18:47:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.74 2012/06/05 19:04:51 sera Exp $
+
+  05 Jun 2012; Ralph Sennhauser <sera@gentoo.org> -jython-2.5.0-r1.ebuild,
+  -files/jython-2.5.0-build.patch, -jython-2.5.1.ebuild,
+  -jython-2.5.1-r1.ebuild:
+  Remove old as requested by Arfrever.
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> jython-2.2.1-r1.ebuild,
   jython-2.5.0-r1.ebuild, jython-2.5.1.ebuild, jython-2.5.1-r1.ebuild,
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 4b869c545829..28e3e869f5c8 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -4,41 +4,29 @@ Hash: SHA1
 AUX 2.1-assert-SimpleCompiler.py.patch 504 RMD160 111d742b9eaf6f5801a01b33627d7e02acbc63ab SHA1 96876d3987c0a9f67e8b0de882516e3079a2de95 SHA256 bc7c86f2e0355c33cf3dee92be54b8174c3c69a468c59766d6706980ba9ad00f
 AUX 2.1-assert.patch 2052 RMD160 6d9696543b015511c3e041e02fd7cd68eec70c99 SHA1 dbedce9e606a8c4daf0455a8d6b18ca056e1f8b3 SHA256 b7f491be967853107f47a7b7da489a66ae7c8acedc9d51261b3999ba4f877567
 AUX jython-2.2.1-build.patch 3285 RMD160 47328536902b8e344079e7f21f01d68cc286a295 SHA1 84d60b1bc4968fcb533da6263a9e5b2a89a4c6c5 SHA256 3078b381ac9a4ef0edf03b6c3253cbe436497b9f843aa45e43194e8b36f2d7e4
-AUX jython-2.5.0-build.patch 2911 RMD160 e8008a340333a28aa382cc17e12efb65f9408644 SHA1 f938d6d04caf85e973ed953c6dba950a3d6b6149 SHA256 be396792dcf5b4619f2047b58b6bbd395d3ccf1c064856b8ea62749902a0375f
 AUX jython-2.5.1-build.patch 1821 RMD160 fa4ea2fcde449b460fd553baa872847140ca41d3 SHA1 ea1d9932d29950e56c41e719c981404950bc9fc2 SHA256 284fa97ba5e44a0a0d9945dfc52a5b897d7e58ac010870b83a86fde46f2dca95
 AUX jython-2.5.1-distutils_byte_compilation.patch 1746 RMD160 ed5b5ed557741846e30eb1ef8c9634db760b4e8a SHA1 3c9cbd1503b6c6f781a7e765c60de4b5831a0e45 SHA256 e478fdb1d62e5c656399e3b4b1dc2d9dfe3f4f5dc8efca8634770f7e5fb68a5c
 AUX jython-2.5.1-distutils_scripts_location.patch 346 RMD160 6d5277114bca498aa75c14e0ccce05e105aea9f0 SHA1 a01c1cbdfe198a8936d636fd37652c0594319659 SHA256 240cc2c51aa23738f559a874cc65d9c7de4a4c1d786edece3e865d7922fd6f90
 AUX jython-2.5.1-respect_PYTHONPATH.patch 547 RMD160 394b4e3a39d972ab9551a3f5ff966a992c6cb86a SHA1 d02360ca2f4d54ef8b49a5fe9725eaa80fb5e6c1 SHA256 23d5008763e4abb6bd3b491b74a7428ae29f629b4c87f1a65659a3c46d51620c
 AUX python-2.5.5-distutils_byte_compilation.patch 1208 RMD160 b556cd09f917cf4d6ea40014af068642ea95c640 SHA1 63334f1eeb4c7ae61a61dcdf84939f7e9a9df718 SHA256 b520641c4b4117a231b4798c82a60ac458081cca71c56e9838dd8a9c51116fc8
 DIST Python-2.2.3.tgz 6709556 RMD160 3590f813582d65194b467f4ab450e360e35eb40e SHA1 177d587e77e0eaa14131ab0d0d0b470777de4400 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188
-DIST Python-2.5.4.tgz 11604497 RMD160 9935f2c5c7065b5f47c639e45136b4b0f85cbeb9 SHA1 44f4a6e5ca54a4316d3d9d8b82653b2888bdbb79 SHA256 3d3b205611ee503a38a9433d5645a571668420bb219242c7f51af85f05664da6
 DIST Python-2.5.5.tgz 11606370 RMD160 dd590e38ed1f1a46c00e39b6f616acd599253a44 SHA1 bf99e2d7bdf60bc4e8b6236cd98f95a079996393 SHA256 03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854cbd57e24e16f6bf63e2392
 DIST jython-2.1.tar.bz2 1301528 RMD160 94ae22604c1a816af7d066f2ed88b2abaf5c51d1 SHA1 16fea6f4515bda49d17abd0d3d52e2100eeb7fc0 SHA256 faa57a55d137268e80221cd628b234ca67de13504b813be1c0499c9f4d5872b2
-DIST jython-2.5.0.tar.bz2 12054458 RMD160 236f02512332da4669692fdd08de6c9a4ebe1779 SHA1 54064da96655e77a34c396164f3a07fd3977104e SHA256 ba36049adb0ae8d56620c2b5aa4cb4b93cbb0cc9003ed2fff42b89c179f168bb
 DIST jython-2.5.1.tar.bz2 14470421 RMD160 199a5ae54413cf364b2e5ecd6ffb04c921b1b899 SHA1 eaf34719ebfc78351b82d3b4d1ce92afcb3b9128 SHA256 23bc356ac6e1037cc305dc9791a247f4cfffe7b9e3ceb5b2a97449529cf4aa1d
 DIST jython_installer-2.2.1.jar 4663097 RMD160 73959d072925644b2959bc0c28ddd6a847e5c2ab SHA1 6fea1e8985af955fc843789e2d60fcfc38a76fd8 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68
 EBUILD jython-2.1-r11.ebuild 2934 RMD160 543c44c7b3814c2476d9ec11a028471a9483df57 SHA1 8c3645675c5ede2994440f4211623f7368229d20 SHA256 9ce1e028309ecc0d8f804fad81ce80f9ed81ef9f089aa01c26c17a47b79baf3f
 EBUILD jython-2.2.1-r1.ebuild 3769 RMD160 5ea16be644bf44d45681ec66f21bf94caefff13a SHA1 98119a865da11b57de77275ac7c7ead2e6661740 SHA256 936d381297b273398a608fc879331f147f555ea19174ff12722003c4ec90cd9f
-EBUILD jython-2.5.0-r1.ebuild 4480 RMD160 107230ccc1f7e2e0ec26bf35843d6d106c721f54 SHA1 94a93f9f7aee639f10bee81b6da370579a7ab696 SHA256 dffb916f5ea94797dfae8b2d444462232dd454fe2f86ad09504b976e1755e6c7
-EBUILD jython-2.5.1-r1.ebuild 5022 RMD160 0f2ca4ea71532e8f39d7efd372b40abcbcfdf577 SHA1 f53471d63a1a079251434c28030e9ff644dd2a5f SHA256 3e73d1f4579c600f3c49621ff3623efd59a1c2123a6144540582db68a176bc3c
 EBUILD jython-2.5.1-r2.ebuild 5606 RMD160 a0ae8c17846ee6a068b6fab7a6875cd1db13194e SHA1 1d86fe061ec5a10614e186c991e2823bd8fbd5a9 SHA256 a6c0b84a70d266616ffe73062986615502e60ed39426d517f6089640fdc689ec
-EBUILD jython-2.5.1.ebuild 4772 RMD160 b852a39cc68cd085b995ce916feb349596c6c47b SHA1 b2aa9700db516abb4481f8d310ec2f89942db0b9 SHA256 0c8c5b05dbf5529a50c773f40eda451385c4f8a9268f99a73f732a450313dea5
-MISC ChangeLog 10945 RMD160 b205f032424e6af8935e3dc020029d83187503cd SHA1 e11bc02aa29a802aed5b850b149b8fce7b6348e4 SHA256 d264f7330e7e368788207732b1da7a946aac41f713186bc3d398415bfeed56cb
+MISC ChangeLog 11145 RMD160 87e4a359cd70d4a35edb3d754c6969fbb661c5e7 SHA1 60b2320df08993f39c0d8e2065336101a7633c23 SHA256 5a2928deee5792d8fdcdcc22002b20c58d76f13b33b7a61ab23e0d3f56d746ef
 MISC metadata.xml 248 RMD160 2f209fd2ecdd173d50305f140d7154e1c9a634fa SHA1 25e0f2914006e3cc39f704309e8644af57608a44 SHA256 7faa9b92889ac0d4fe4b02b2dd8e534b534fc4241386fe769803b047f467d6bf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPiHWsAAoJEDxpGckxwJCBUTIQAKI75yNo19hPMtONV57zBnhA
-jXNM4IRuqBGHocxv58ajVSNTgzC70kf1XYeCrTlwzg2e8xbMQdOdY7+cHQqGAVCk
-U84e22lB0E1UgaqxfjKh5yDKPk+Veyf9NBF9fhmixITRDGRQsH4CSpp2JO9DUYX0
-0HGLaP3KDUXokBTD78UkKkui3RHHReh4y5CBZo+3XTIwuRCiiELSKlTycOlCLCQ0
-fVa8hUYUlmxr0mNVfKA3rwbNQjJDQ/b7y/eF9KpIsl0nJGvGY3FySTTCtqv4OHyY
-1hdMkI4dqWJTewaWUuicMaKk72bizkkAvuA7IUGm47/wRt2pg/Em1VpHSCYRUhxJ
-wvo3h8oLfuRZ84AfaG0k6WxI9+Wwlk9t07i/viFk+r4WZvbw1yZCwD819EPWHnvd
-2IsfTzGUwzCefsXjDDXkehH5cWnp8IJzx+Tac/6LAyFzPeTZDYIOTVw3h+5LLY/J
-wPYZK9hPrDcE+nHU1aOhEWwuJ9/gUrskdeBnlR2NLZEZ9gO9Zf4fImVE9TlAkOks
-aOWh8zKsGqpjmNpQxuWYjtBDDFPBgmq7vbRf1sCXVRrwbgcMf8IK0fb7ipljvqjG
-tsXQ+kPVINkTPePYWmxhraqGC14I+Dvt+Cd61D+WwYKg0VqlBmnBTYAeioI0+tew
-poPWahcWGdtuWeGcGZJn
-=XSMn
+iQEcBAEBAgAGBQJPzlhfAAoJEIUJ+svaV163PxMH/AiNyC6oqBbrpVeBgK/wjtMc
+pUQoWVpNmONGfgrjsaNfmPoKZYTAH4TaiAxPML1qv6UO2Rtujqv7J4Y1+DHYfZ3O
+vZg0hxqXxjWoektjlhbW4LWkMYCFnZZG+eXEZyrgtAfQiz1l2h7T4HBwagxPqAI9
+AqN1YkJYwdYmQawe09oCtSfN6TIq71egkET05DHrXT+2SOx9zwWam0MmtY5tWe5G
+TfiTjZQiQ4i+JWRg4e0xFQa1GjUuhjT9TTv6z4AYVc/cZJ6C/GupLvWPtF1Gb4Ul
+8lXT65A/LN7SW2dTtP83sC+aWgADT2AiWFykg5oGY/1D8/3FS9cMfd/CBUOQAoE=
+=Fvfk
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jython/files/jython-2.5.0-build.patch b/dev-java/jython/files/jython-2.5.0-build.patch
deleted file mode 100644
index 098fed8bd434..000000000000
--- a/dev-java/jython/files/jython-2.5.0-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- build.xml.old	2009-06-20 16:40:26.000000000 +1200
-+++ build.xml	2009-06-20 16:43:57.000000000 +1200
-@@ -158,7 +158,8 @@
-             <pathelement path="${extlibs.dir}/asm-3.1.jar" />
-             <pathelement path="${extlibs.dir}/asm-commons-3.1.jar" />
-             <pathelement path="${extlibs.dir}/constantine-0.4.jar" />
--            <pathelement path="${extlibs.dir}/jna-posix.jar"/>
-+	    <pathelement path="${extlibs.dir}/jna-posix.jar"/>
-+	    <pathelement path="${extlibs.dir}/ant.jar" />
-         </path>
- 
-         <available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" />
-@@ -166,8 +167,8 @@
- 
-         <path id="test.classpath">
-             <path refid="main.classpath"/>
--            <pathelement path="${extlibs.dir}/asm-commons-3.1.jar" />
--            <pathelement path="${extlibs.dir}/junit-3.8.2.jar" />
-+	    <pathelement path="${extlibs.dir}/junit-3.8.2.jar" />
-+	    <pathelement path="${extlibs.dir}/xercesImpl-2.9.1.jar" />
-             <pathelement path="${exposed.dir}" />
-             <pathelement path="${compile.dir}" />
-             <pathelement path="${cpptasks.jar.dir}" />
-@@ -236,17 +237,8 @@
-         <condition property="do.checkout" value="true">
-             <istrue value="${has.repositories.connection}" />
-         </condition>
--
--        <!-- classpath for svn ant task -->
--        <path id="svn.classpath">
--            <pathelement path="${java.class.path}" />
--            <fileset dir="${svnant.jar.dir}">
--              <include name="*.jar"/>
--            </fileset>
--        </path>
--    	<!-- taskdef for svn ant task -->
--    	<taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" />
-     </target>
-+
-     <target name="full-check" depends="full-preinit, init, dump-env">
-         <!-- Require all of the optional jars for a full build -->
-         <fail unless="informix.present" message="informix jar not present" />
-@@ -347,6 +339,16 @@
-     </target>
- 
-     <target name="checkout" depends="prepare" if="do.checkout">
-+        <!-- classpath for svn ant task -->
-+        <path id="svn.classpath">
-+            <pathelement path="${java.class.path}" />
-+            <fileset dir="${svnant.jar.dir}">
-+              <include name="*.jar"/>
-+            </fileset>
-+        </path>
-+    	<!-- taskdef for svn ant task -->
-+    	<taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" />
-+
-         <svn javahl="${javahl.dir}" >
-             <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.installer.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.installer.dir}" />
-             <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.code.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.code.dir}" />
diff --git a/dev-java/jython/jython-2.5.0-r1.ebuild b/dev-java/jython/jython-2.5.0-r1.ebuild
deleted file mode 100644
index 98b506136857..000000000000
--- a/dev-java/jython/jython-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.0-r1.ebuild,v 1.4 2012/04/13 18:47:54 ulm Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc examples oracle"
-#informix missing.  This is a jdbc driver, similar to oracle use flag
-#functionality.
-
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-
-PYVER="2.5.4"
-
-SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="2.5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#>=dev-java/jdbc-mysql-3.1
-#dev-java/jdbc-postgresql
-CDEPEND="=dev-java/jakarta-oro-2.0*
-	>=dev-java/libreadline-java-0.8.0
-	dev-java/asm:3
-	oracle? ( dev-java/jdbc-oracle-bin:10.2 )
-	java-virtuals/servlet-api:2.5
-	!<=dev-java/freemarker-2.3.10
-	dev-java/constantine:0
-	dev-java/jline:0
-	dev-java/jna-posix:0
-	dev-java/jna:0
-	dev-java/antlr:0
-	dev-java/antlr:3
-	dev-java/stringtemplate:0
-	dev-java/xerces:2"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
-		dev-java/ant-core:0
-		dev-java/junit:0
-		${CDEPEND}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
-
-	rm -Rfv org || die "Unable to remove class files."
-	find extlibs -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
-	find "${WORKDIR}" -iname '*.pyc' | xargs rm -fv
-	java-pkg_jar-from --into extlibs libreadline-java libreadline-java.jar \
-		libreadline-java-0.8.jar
-	java-pkg_jar-from --into extlibs antlr-3 antlr3.jar antlr-3.1.2.jar
-	java-pkg_jar-from --into extlibs antlr antlr.jar antlr-2.7.7.jar
-	java-pkg_jar-from --into extlibs stringtemplate stringtemplate.jar \
-		stringtemplate-3.2.jar
-	java-pkg_jar-from --into extlibs servlet-api-2.5 servlet-api.jar \
-		servlet-api-2.5.jar
-	java-pkg_jar-from --into extlibs asm-3 asm.jar asm-3.1.jar
-	java-pkg_jar-from --into extlibs asm-3 asm-commons.jar \
-		asm-commons-3.1.jar
-	java-pkg_jar-from --into extlibs constantine constantine.jar \
-		constantine-0.4.jar
-	java-pkg_jar-from --into extlibs jline jline.jar \
-		jline-0.9.95-SNAPSHOT.jar
-	java-pkg_jar-from --into extlibs jna jna.jar
-	java-pkg_jar-from --into extlibs jna-posix jna-posix.jar
-	java-pkg_jar-from --build-only --into extlibs ant-core ant.jar
-	java-pkg_jar-from --build-only --into extlibs junit junit.jar \
-		junit-3.8.2.jar
-	java-pkg_jar-from --into extlibs xerces-2 xercesImpl.jar \
-		xercesImpl-2.9.1.jar
-
-	echo "has.repositories.connection=false" > ant.properties
-
-	if use oracle; then
-		echo \
-		"oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \
-		>> ant.properties
-	fi
-}
-
-src_compile() {
-	local antflags=""
-	local pylib="../Python-${PYVER}/Lib"
-	antflags="${antflags} -Dpython.lib=${pylib}"
-	eant ${antflags} developer-build $(use_doc javadoc)
-}
-
-src_test() {
-	# 4 regrtests fail,  only 1 is a "valid" failure.
-	# others are X11/awt errors which will never work here.
-	local antflags=""
-	antflags="${antflags} -Dgentoo.library.path=$(java-config -di jna-posix)"
-	antflags="${antflags} -Dpython.home=dist"
-	local pylib="../Python-${PYVER}/Lib"
-	antflags="${antflags} -Dpython.lib=${pylib}"
-	ANT_TASKS="ant-junit" eant ${antflags} test
-}
-
-src_install() {
-	dodoc README.txt NEWS ACKNOWLEDGMENTS README.txt
-	cd dist || die
-	java-pkg_newjar "${PN}-dev.jar"
-
-	local java_args="-Dpython.home=/usr/share/${PN}-${SLOT}"
-	java_args="${java_args} -Dpython.cachedir=\${HOME}/.jythoncachedir"
-
-	java-pkg_dolauncher jython-${SLOT} \
-						--main "org.python.util.jython" \
-						--pkg_args "${java_args}"
-
-	java-pkg_register-optional-dependency jdbc-mysql
-	java-pkg_register-optional-dependency jdbc-postgresql
-
-	insinto /usr/share/${PN}-${SLOT}
-	doins -r Lib registry
-
-	use doc && java-pkg_dojavadoc Doc/javadoc
-	use source && java-pkg_dosrc ../src
-	cd "${S}"
-	use examples && java-pkg_doexamples Demo/*
-}
-
-pkg_postinst() {
-	einfo "Version of jython > 2.2* no longer has jythonc. Please see"
-	einfo "http://www.jython.org/Project/jythonc.html for details"
-
-	if use readline; then
-		elog
-		elog "To use readline you need to add the following to your registry"
-		elog
-		elog "python.console=org.python.util.ReadlineConsole"
-		elog "python.console.readlinelib=GnuReadline"
-		elog
-		elog "The global registry can be found in /usr/share/${PN}/registry"
-		elog "User registry in \$HOME/.jython"
-		elog "See http://www.jython.org/docs/registry.html for more information"
-		elog ""
-	fi
-}
diff --git a/dev-java/jython/jython-2.5.1-r1.ebuild b/dev-java/jython/jython-2.5.1-r1.ebuild
deleted file mode 100644
index f184d31040b9..000000000000
--- a/dev-java/jython/jython-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild,v 1.4 2012/04/13 18:47:54 ulm Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc examples oracle"
-#informix missing.  This is a jdbc driver, similar to oracle use flag
-#functionality.
-
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-
-PYVER="2.5.5"
-
-SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="2.5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#>=dev-java/jdbc-mysql-3.1
-#dev-java/jdbc-postgresql
-CDEPEND="=dev-java/jakarta-oro-2.0*
-	>=dev-java/libreadline-java-0.8.0
-	dev-java/asm:3
-	oracle? ( dev-java/jdbc-oracle-bin:10.2 )
-	java-virtuals/servlet-api:2.5
-	!<=dev-java/freemarker-2.3.10
-	dev-java/constantine:0
-	dev-java/jline:0
-	dev-java/jna-posix:0
-	dev-java/jna:0
-	dev-java/antlr:0
-	dev-java/antlr:3
-	dev-java/stringtemplate:0
-	dev-java/xerces:2
-	dev-java/jsr223:0"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
-		dev-java/ant-core:0
-		dev-java/junit:0
-		${CDEPEND}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
-	epatch "${FILESDIR}/${P}-distutils_scripts_location.patch"
-	epatch "${FILESDIR}/${P}-respect_PYTHONPATH.patch"
-
-	rm -Rfv org || die "Unable to remove class files."
-	find extlibs -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
-	find "${WORKDIR}" -iname '*.pyc' | xargs rm -fv
-	java-pkg_jar-from --into extlibs libreadline-java libreadline-java.jar \
-		libreadline-java-0.8.jar
-	java-pkg_jar-from --into extlibs antlr-3 antlr3.jar antlr-3.1.3.jar
-	java-pkg_jar-from --into extlibs antlr antlr.jar antlr-2.7.7.jar
-	java-pkg_jar-from --into extlibs stringtemplate stringtemplate.jar \
-		stringtemplate-3.2.jar
-	java-pkg_jar-from --into extlibs servlet-api-2.5 servlet-api.jar \
-		servlet-api-2.5.jar
-	java-pkg_jar-from --into extlibs asm-3 asm.jar asm-3.1.jar
-	java-pkg_jar-from --into extlibs asm-3 asm-commons.jar \
-		asm-commons-3.1.jar
-	java-pkg_jar-from --into extlibs constantine constantine.jar \
-		constantine-0.4.jar
-	java-pkg_jar-from --into extlibs jline jline.jar \
-		jline-0.9.95-SNAPSHOT.jar
-	java-pkg_jar-from --into extlibs jna jna.jar
-	java-pkg_jar-from --into extlibs jna-posix jna-posix.jar
-	java-pkg_jar-from --build-only --into extlibs ant-core ant.jar
-	java-pkg_jar-from --build-only --into extlibs junit junit.jar \
-		junit-3.8.2.jar
-	java-pkg_jar-from --into extlibs xerces-2 xercesImpl.jar
-	java-pkg_jar-from --into extlibs jsr223 script-api.jar \
-		livetribe-jsr223-2.0.5.jar
-
-	echo "has.repositories.connection=false" > ant.properties
-
-	if use oracle; then
-		echo \
-		"oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \
-		>> ant.properties
-	fi
-}
-
-src_compile() {
-	local antflags=""
-	local pylib="../Python-${PYVER}/Lib"
-	antflags="${antflags} -Dpython.lib=${pylib}"
-	eant ${antflags} developer-build $(use_doc javadoc)
-}
-
-# Restrict tests as some dont compile and others (a couple) are broken.
-RESTRICT="test"
-src_test() {
-#[exec] 311 tests OK.
-#[exec] 3 tests skipped:
-#[exec]     test_subprocess test_urllib2net test_urllibnet
-#[exec] 2 tests failed:
-#[exec]     test_pbcvm test_pkgimport
-#[exec] 2 fails unexpected:
-#[exec]     test_pbcvm test_pkgimport
-	local antflags=""
-	antflags="${antflags} -Dgentoo.library.path=$(java-config -di jna-posix)"
-	antflags="${antflags} -Dpython.home=dist"
-	local pylib="../Python-${PYVER}/Lib"
-	antflags="${antflags} -Dpython.lib=${pylib}"
-	ANT_TASKS="ant-junit" eant ${antflags} test
-}
-
-src_install() {
-	dodoc README.txt NEWS ACKNOWLEDGMENTS README.txt
-	cd dist || die
-	java-pkg_newjar "${PN}-dev.jar"
-
-	local java_args="-Dpython.home=/usr/share/${PN}-${SLOT}"
-	java_args="${java_args} -Dpython.cachedir=\${JYTHON_CACHEDIR-\${HOME}/.jythoncachedir}"
-	java_args="${java_args} -Dpython.executable=${ROOT}/usr/bin/jython-${SLOT}"
-
-	java-pkg_dolauncher jython-${SLOT} \
-						--main "org.python.util.jython" \
-						--pkg_args "${java_args}"
-	sed -e "1a unset EPYTHON" -i "${D}usr/bin/${PN}-${SLOT}" || die "sed failed"
-
-	java-pkg_register-optional-dependency jdbc-mysql
-	java-pkg_register-optional-dependency jdbc-postgresql
-
-	insinto /usr/share/${PN}-${SLOT}
-	doins -r Lib registry
-
-	use doc && java-pkg_dojavadoc Doc/javadoc
-	use source && java-pkg_dosrc ../src
-	cd "${S}"
-	use examples && java-pkg_doexamples Demo/*
-}
-
-pkg_postinst() {
-	einfo "Version of jython > 2.2* no longer has jythonc. Please see"
-	einfo "http://www.jython.org/Project/jythonc.html for details"
-
-	elog
-	elog "To use readline you need to add the following to your registry"
-	elog
-	elog "python.console=org.python.util.ReadlineConsole"
-	elog "python.console.readlinelib=GnuReadline"
-	elog
-	elog "The global registry can be found in /usr/share/${PN}/registry"
-	elog "User registry in \$HOME/.jython"
-	elog "See http://www.jython.org/docs/registry.html for more information"
-	elog
-}
diff --git a/dev-java/jython/jython-2.5.1.ebuild b/dev-java/jython/jython-2.5.1.ebuild
deleted file mode 100644
index a4cf89d91dcf..000000000000
--- a/dev-java/jython/jython-2.5.1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.1.ebuild,v 1.3 2012/04/13 18:47:54 ulm Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source doc examples oracle"
-#informix missing.  This is a jdbc driver, similar to oracle use flag
-#functionality.
-
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-
-PYVER="2.5.5"
-
-SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="2.5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#>=dev-java/jdbc-mysql-3.1
-#dev-java/jdbc-postgresql
-CDEPEND="=dev-java/jakarta-oro-2.0*
-	>=dev-java/libreadline-java-0.8.0
-	dev-java/asm:3
-	oracle? ( dev-java/jdbc-oracle-bin:10.2 )
-	java-virtuals/servlet-api:2.5
-	!<=dev-java/freemarker-2.3.10
-	dev-java/constantine:0
-	dev-java/jline:0
-	dev-java/jna-posix:0
-	dev-java/jna:0
-	dev-java/antlr:0
-	dev-java/antlr:3
-	dev-java/stringtemplate:0
-	dev-java/xerces:2
-	dev-java/jsr223:0"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
-		dev-java/ant-core:0
-		dev-java/junit:0
-		${CDEPEND}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
-
-	rm -Rfv org || die "Unable to remove class files."
-	find extlibs -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
-	find "${WORKDIR}" -iname '*.pyc' | xargs rm -fv
-	java-pkg_jar-from --into extlibs libreadline-java libreadline-java.jar \
-		libreadline-java-0.8.jar
-	java-pkg_jar-from --into extlibs antlr-3 antlr3.jar antlr-3.1.3.jar
-	java-pkg_jar-from --into extlibs antlr antlr.jar antlr-2.7.7.jar
-	java-pkg_jar-from --into extlibs stringtemplate stringtemplate.jar \
-		stringtemplate-3.2.jar
-	java-pkg_jar-from --into extlibs servlet-api-2.5 servlet-api.jar \
-		servlet-api-2.5.jar
-	java-pkg_jar-from --into extlibs asm-3 asm.jar asm-3.1.jar
-	java-pkg_jar-from --into extlibs asm-3 asm-commons.jar \
-		asm-commons-3.1.jar
-	java-pkg_jar-from --into extlibs constantine constantine.jar \
-		constantine-0.4.jar
-	java-pkg_jar-from --into extlibs jline jline.jar \
-		jline-0.9.95-SNAPSHOT.jar
-	java-pkg_jar-from --into extlibs jna jna.jar
-	java-pkg_jar-from --into extlibs jna-posix jna-posix.jar
-	java-pkg_jar-from --build-only --into extlibs ant-core ant.jar
-	java-pkg_jar-from --build-only --into extlibs junit junit.jar \
-		junit-3.8.2.jar
-	java-pkg_jar-from --into extlibs xerces-2 xercesImpl.jar
-	java-pkg_jar-from --into extlibs jsr223 script-api.jar \
-		livetribe-jsr223-2.0.5.jar
-
-	echo "has.repositories.connection=false" > ant.properties
-
-	if use oracle; then
-		echo \
-		"oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \
-		>> ant.properties
-	fi
-}
-
-src_compile() {
-	local antflags=""
-	local pylib="../Python-${PYVER}/Lib"
-	antflags="${antflags} -Dpython.lib=${pylib}"
-	eant ${antflags} developer-build $(use_doc javadoc)
-}
-
-# Restrict tests as some dont compile and others (a couple) are broken.
-RESTRICT="test"
-src_test() {
-#[exec] 311 tests OK.
-#[exec] 3 tests skipped:
-#[exec]     test_subprocess test_urllib2net test_urllibnet
-#[exec] 2 tests failed:
-#[exec]     test_pbcvm test_pkgimport
-#[exec] 2 fails unexpected:
-#[exec]     test_pbcvm test_pkgimport
-	local antflags=""
-	antflags="${antflags} -Dgentoo.library.path=$(java-config -di jna-posix)"
-	antflags="${antflags} -Dpython.home=dist"
-	local pylib="../Python-${PYVER}/Lib"
-	antflags="${antflags} -Dpython.lib=${pylib}"
-	ANT_TASKS="ant-junit" eant ${antflags} test
-}
-
-src_install() {
-	dodoc README.txt NEWS ACKNOWLEDGMENTS README.txt
-	cd dist || die
-	java-pkg_newjar "${PN}-dev.jar"
-
-	local java_args="-Dpython.home=/usr/share/${PN}-${SLOT}"
-	java_args="${java_args} -Dpython.cachedir=\${HOME}/.jythoncachedir"
-
-	java-pkg_dolauncher jython-${SLOT} \
-						--main "org.python.util.jython" \
-						--pkg_args "${java_args}"
-
-	java-pkg_register-optional-dependency jdbc-mysql
-	java-pkg_register-optional-dependency jdbc-postgresql
-
-	insinto /usr/share/${PN}-${SLOT}
-	doins -r Lib registry
-
-	use doc && java-pkg_dojavadoc Doc/javadoc
-	use source && java-pkg_dosrc ../src
-	cd "${S}"
-	use examples && java-pkg_doexamples Demo/*
-}
-
-pkg_postinst() {
-	einfo "Version of jython > 2.2* no longer has jythonc. Please see"
-	einfo "http://www.jython.org/Project/jythonc.html for details"
-
-	if use readline; then
-		elog
-		elog "To use readline you need to add the following to your registry"
-		elog
-		elog "python.console=org.python.util.ReadlineConsole"
-		elog "python.console.readlinelib=GnuReadline"
-		elog
-		elog "The global registry can be found in /usr/share/${PN}/registry"
-		elog "User registry in \$HOME/.jython"
-		elog "See http://www.jython.org/docs/registry.html for more information"
-		elog ""
-	fi
-}