Version Bump. New slot as seems to break at least one existing package. Tests still do not work :|

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

4 files changed, 201 insertions, 13 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 998ea3fa94d7..51fe1c778618 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jython
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.62 2009/05/27 10:31:37 fauli Exp $
+# 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 $
+
+*jython-2.5.0 (18 Jun 2009)
+
+  18 Jun 2009; Alistair Bush <ali_bush@gentoo.org> +jython-2.5.0.ebuild,
+  +files/jython-2.5.0-build.patch:
+  Version Bump. New slot as seems to break at least one existing package.
+  Tests still do not work 
 
   27 May 2009; Christian Faulhammer <fauli@gentoo.org>
   jython-2.2.1-r1.ebuild:
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 442c105fa7df..dec84d47e39e 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-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 2388 RMD160 598354f0636b1217cda72ce8f9bcd696fba478e2 SHA1 e95121c2e095141369067e8070ecc55c38d0f385 SHA256 5e0e775de7f36c3a365ff7b4399aece7fe65d73325986658506adb02a3b7d4ed
 DIST Python-2.2.3.tgz 6709556 RMD160 3590f813582d65194b467f4ab450e360e35eb40e SHA1 177d587e77e0eaa14131ab0d0d0b470777de4400 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188
+DIST Python-2.5.tgz 11019675 RMD160 561c5fdf92cfc939b7c74fd69155c44c3d0584c3 SHA1 bab36b91f4d1c542323f4bdbd47e82917a70255b SHA256 d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2
 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_installer-2.2.1.jar 4663097 RMD160 73959d072925644b2959bc0c28ddd6a847e5c2ab SHA1 6fea1e8985af955fc843789e2d60fcfc38a76fd8 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68
 EBUILD jython-2.1-r11.ebuild 2946 RMD160 e9cfd37b2e93166d802cfdba96c7daa84c472fa9 SHA1 68d7d6d2b5be6679a26bc4643a8eb5aebc4b4a53 SHA256 79a2320e1bbad7a56b9673620f336594c4f226c54ea9be02b482501b54b634f1
 EBUILD jython-2.2.1-r1.ebuild 3772 RMD160 ed33983e8e7f44513d346c20fda80b7b4a91e8e1 SHA1 da67f232692f2cb81db93beb371d31aeaba72585 SHA256 9765c773d4a910bfbe0a88490605af71a897e891a38ba9c12f3da8eb10d14bcf
-MISC ChangeLog 8530 RMD160 ff214636af6e35b17c106dd81d59f735a393c749 SHA1 0fb88cf7d8e63526d584eb96fd92b34a93f3da2a SHA256 b5ac83293bddc1b1727f8ff2ca865e95f4f45db36c41c28a0d9d1378e9dc298a
+EBUILD jython-2.5.0.ebuild 4213 RMD160 1692ff2b13a23e695158e5b7b45262d3dc306c8f SHA1 653b0b95027d0c70464c8178196835032c38b130 SHA256 43852cda8e1fc28efa180f81f23631cf4c69204efc4c20a8b512c44f2ad09981
+MISC ChangeLog 8772 RMD160 7234398bcaa4e1b073f5535cdae21ab37836c645 SHA1 3c8b2d0ab40c34b18cc7e0e977b2fd78767d6f1c SHA256 9356e6da6a5f9db477b30f6db25c66ef5bce358dfdd8827a3457b0de4b55beb5
 MISC metadata.xml 248 RMD160 2f209fd2ecdd173d50305f140d7154e1c9a634fa SHA1 25e0f2914006e3cc39f704309e8644af57608a44 SHA256 7faa9b92889ac0d4fe4b02b2dd8e534b534fc4241386fe769803b047f467d6bf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkodFo8ACgkQNQqtfCuFneNNMwCgmGAPa1yQfSIYnO2K+NoGXKuA
-FbYAnjSdzH8TV7VEAqmxwRQ6MSAJzvU6
-=KSlM
------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
new file mode 100644
index 000000000000..82923f06dc13
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.0-build.patch
@@ -0,0 +1,48 @@
+--- build.xml.old	2009-06-18 19:12:11.000000000 +1200
++++ build.xml	2009-06-18 19:14:11.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}" />
+@@ -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.ebuild b/dev-java/jython/jython-2.5.0.ebuild
new file mode 100644
index 000000000000..6693d5f1a84d
--- /dev/null
+++ b/dev-java/jython/jython-2.5.0.ebuild
@@ -0,0 +1,139 @@
+# 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 $
+
+JAVA_PKG_IUSE="source doc examples oracle"
+#jdnc
+
+EAPI="2"
+
+inherit base java-pkg-2 java-ant-2
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+
+PYVER="2.5"
+
+SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
+	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="PSF-2.2"
+SLOT="2.5"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+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
+	!<=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"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+		dev-java/ant-core:0
+		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"
+
+	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 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
+	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
+
+	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() {
+	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
+	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}"
+	eant ${antflags} bugtest
+}
+
+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 \
+						--main "org.python.util.jython" \
+						--pkg_args "${java_args}"
+
+	insinto /usr/share/${PN}-${SLOT}
+	doins -r Lib registry
+
+	use doc && java-pkg_dojavadoc Doc/javadoc
+	use source && java-pkg_dosrc ../src
+	use examples && java-pkg_doexamples Demo/*
+}
+
+pkg_postinst() {
+	if use readline; then
+		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
+}