From 9f988ef76cae00fd8f431e6d56fdab0bd606a535 Mon Sep 17 00:00:00 2001 From: Alistair Bush Date: Mon, 22 Jun 2009 10:02:39 +0000 Subject: Cleanup first rev. New slot for 2.5.0. Tests now work, mostly. (Portage version: 2.1.6.13/cvs/Linux x86_64) --- dev-java/jython/ChangeLog | 8 +- dev-java/jython/files/jython-2.5.0-build.patch | 15 ++- dev-java/jython/jython-2.5.0-r1.ebuild | 144 +++++++++++++++++++++++++ dev-java/jython/jython-2.5.0.ebuild | 139 ------------------------ 4 files changed, 164 insertions(+), 142 deletions(-) create mode 100644 dev-java/jython/jython-2.5.0-r1.ebuild delete mode 100644 dev-java/jython/jython-2.5.0.ebuild (limited to 'dev-java/jython') 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 -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 @@ @@ -10,6 +10,17 @@ +@@ -166,8 +167,8 @@ + + + +- +- ++ ++ + + + @@ -236,17 +237,8 @@ diff --git a/dev-java/jython/jython-2.5.0-r1.ebuild b/dev-java/jython/jython-2.5.0-r1.ebuild new file mode 100644 index 000000000000..74184c9a40f9 --- /dev/null +++ b/dev-java/jython/jython-2.5.0-r1.ebuild @@ -0,0 +1,144 @@ +# 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-r1.ebuild,v 1.1 2009/06/22 10:02:39 ali_bush Exp $ + +JAVA_PKG_IUSE="source doc examples oracle" +#informix missing. This is a jdbc driver, similar to oracle use flag +#functionality. + +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.4" + +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="" + +#>=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 + 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.0.ebuild b/dev-java/jython/jython-2.5.0.ebuild deleted file mode 100644 index 6693d5f1a84d..000000000000 --- a/dev-java/jython/jython-2.5.0.ebuild +++ /dev/null @@ -1,139 +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/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 -} -- cgit v1.2.3-65-gdbad