Cleanup first rev. New slot for 2.5.0. Tests now work, mostly.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 45 insertions, 23 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 51fe1c778618..fb08b99a6629 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jython
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.63 2009/06/18 10:51:11 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.64 2009/06/22 10:02:39 ali_bush Exp $
+
+*jython-2.5.0-r1 (22 Jun 2009)
+
+  22 Jun 2009; Alistair Bush <ali_bush@gentoo.org> -jython-2.5.0.ebuild,
+  +jython-2.5.0-r1.ebuild, files/jython-2.5.0-build.patch:
+  Cleanup first rev. New slot for 2.5.0. Tests now work, mostly.
 
 *jython-2.5.0 (18 Jun 2009)
 
diff --git a/dev-java/jython/files/jython-2.5.0-build.patch b/dev-java/jython/files/jython-2.5.0-build.patch
index 82923f06dc13..098fed8bd434 100644
--- a/dev-java/jython/files/jython-2.5.0-build.patch
+++ b/dev-java/jython/files/jython-2.5.0-build.patch
@@ -1,5 +1,5 @@
---- build.xml.old	2009-06-18 19:12:11.000000000 +1200
-+++ build.xml	2009-06-18 19:14:11.000000000 +1200
+--- 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" />
@@ -10,6 +10,17 @@
          </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}" />
diff --git a/dev-java/jython/jython-2.5.0.ebuild b/dev-java/jython/jython-2.5.0-r1.ebuild
index 6693d5f1a84d..74184c9a40f9 100644
--- a/dev-java/jython/jython-2.5.0.ebuild
+++ b/dev-java/jython/jython-2.5.0-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2009 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.ebuild,v 1.1 2009/06/18 10:51:11 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.0-r1.ebuild,v 1.1 2009/06/22 10:02:39 ali_bush Exp $
 
 JAVA_PKG_IUSE="source doc examples oracle"
-#jdnc
+#informix missing.  This is a jdbc driver, similar to oracle use flag
+#functionality.
 
 EAPI="2"
 
@@ -12,7 +13,7 @@ inherit base java-pkg-2 java-ant-2
 DESCRIPTION="An implementation of Python written in Java"
 HOMEPAGE="http://www.jython.org"
 
-PYVER="2.5"
+PYVER="2.5.4"
 
 SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
 	mirror://gentoo/${P}.tar.bz2"
@@ -22,10 +23,10 @@ SLOT="2.5"
 KEYWORDS="~amd64 ~ppc ~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/jdbc-mysql-3.1
-	dev-java/jdbc-postgresql
 	dev-java/asm:3
 	oracle? ( dev-java/jdbc-oracle-bin:10.2 )
 	java-virtuals/servlet-api:2.5
@@ -36,7 +37,8 @@ CDEPEND="=dev-java/jakarta-oro-2.0*
 	dev-java/jna:0
 	dev-java/antlr:0
 	dev-java/antlr:3
-	dev-java/stringtemplate:0"
+	dev-java/stringtemplate:0
+	dev-java/xerces:2"
 RDEPEND=">=virtual/jre-1.5
 	${CDEPEND}"
 DEPEND=">=virtual/jdk-1.5
@@ -44,16 +46,12 @@ DEPEND=">=virtual/jdk-1.5
 		dev-java/junit:0
 		${CDEPEND}"
 
-#Tests currently very broken. Need to investigate whether that
-#is jython's or gentoo's doing.
-#RESTRICT="test"
-
 java_prepare() {
 	epatch "${FILESDIR}/${P}-build.patch"
 
 	rm -Rfv org || die "Unable to remove class files."
-	find . -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
-
+	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
@@ -62,10 +60,6 @@ java_prepare() {
 		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 jdbc-mysql jdbc-mysql.jar \
-		mysql-connector-java-5.1.6.jar
-	java-pkg_jar-from --into extlibs jdbc-postgresql \
-		jdbc-postgresql.jar postgresql-8.3-603.jdbc4.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
@@ -78,6 +72,8 @@ java_prepare() {
 	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
 
@@ -96,12 +92,14 @@ src_compile() {
 }
 
 src_test() {
-	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
+	# 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"
+	local pylib="../Python-${PYVER}/Lib"
 	antflags="${antflags} -Dpython.lib=${pylib}"
-	eant ${antflags} bugtest
+	ANT_TASKS="ant-junit" eant ${antflags} test
 }
 
 src_install() {
@@ -112,10 +110,13 @@ src_install() {
 	local java_args="-Dpython.home=/usr/share/${PN}-${SLOT}"
 	java_args="${java_args} -Dpython.cachedir=\${HOME}/.jythoncachedir"
 
-	java-pkg_dolauncher jython \
+	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
 
@@ -125,7 +126,11 @@ src_install() {
 }
 
 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"