From 503cc5826c336788efe7bfc62b4836b61bdbb279 Mon Sep 17 00:00:00 2001 From: Alistair Bush Date: Tue, 26 Feb 2008 10:30:51 +0000 Subject: [PATCH] Version bump jython Package-Manager: portage-2.1.4.4 --- dev-java/jython/ChangeLog | 10 +- dev-java/jython/Manifest | 6 +- .../jython/files/jython-2.2.1-build.patch | 76 ++++++++++ dev-java/jython/jython-2.2.1-r1.ebuild | 139 ++++++++++++++++++ 4 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 dev-java/jython/files/jython-2.2.1-build.patch create mode 100644 dev-java/jython/jython-2.2.1-r1.ebuild diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog index 0bda0af3f1f4..7a5bab3ad16c 100644 --- a/dev-java/jython/ChangeLog +++ b/dev-java/jython/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/jython -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.53 2007/04/12 14:02:21 welp Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.54 2008/02/26 10:30:51 ali_bush Exp $ + +*jython-2.2.1-r1 (26 Feb 2008) + + 26 Feb 2008; Alistair Bush + +files/jython-2.2.1-build.patch, +jython-2.2.1-r1.ebuild: + Version bump jython. 12 Apr 2007; jython-2.1-r11.ebuild: Stable on amd64 wrt bug 172025 diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest index 9790dbaf361d..26a6a9c2b140 100644 --- a/dev-java/jython/Manifest +++ b/dev-java/jython/Manifest @@ -1,7 +1,11 @@ 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 +DIST Python-2.2.3.tgz 6709556 RMD160 3590f813582d65194b467f4ab450e360e35eb40e SHA1 177d587e77e0eaa14131ab0d0d0b470777de4400 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 DIST jython-2.1.tar.bz2 1301528 RMD160 94ae22604c1a816af7d066f2ed88b2abaf5c51d1 SHA1 16fea6f4515bda49d17abd0d3d52e2100eeb7fc0 SHA256 faa57a55d137268e80221cd628b234ca67de13504b813be1c0499c9f4d5872b2 +DIST jython_installer-2.2.1.jar 4663097 RMD160 73959d072925644b2959bc0c28ddd6a847e5c2ab SHA1 6fea1e8985af955fc843789e2d60fcfc38a76fd8 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68 EBUILD jython-2.1-r10.ebuild 2674 RMD160 85b56e5d602522d25e722a77123826920e01413a SHA1 80e584728ea84918ee057c477d829aa6ca57fc91 SHA256 9b7660235fb4583d02fc5799cf2aa80bb0a195c5490ee56c4a1bbcb3f2ee38ab EBUILD jython-2.1-r11.ebuild 2948 RMD160 960108d66f0fad28090222179e947f70cd699027 SHA1 9ab5b19ff83ea2a573b614d6bacbceb6d8adc9d7 SHA256 b66850640319a2339e1f51cef4f94f15d1006b87f307ca0dfc3f7d1e9ff5c5df -MISC ChangeLog 7341 RMD160 871a292cde059b743179af7a50032dc7995b0bb4 SHA1 9fda38af529ba73e358c5d7f6464793c72ed1e01 SHA256 d0226a3ab8a8c65ce4bd323ccf8bb0421382eb2b8a65f177422eb63537ab6302 +EBUILD jython-2.2.1-r1.ebuild 3749 RMD160 ddd64add31ed05458f5827580079e6a4cb42343a SHA1 d2639c72c87ed6632ed75ff8f2475e61e08b572a SHA256 0891a70b85762ca1d5c08236236f287cc6c5337ba610ca439452e396cf083f87 +MISC ChangeLog 7512 RMD160 4cef7aa4ecbf1a56d0b44952db829654d9aa5df8 SHA1 b0f491b6851a5350807eb171ad8f3d69f78673ff SHA256 bb37d79501c8a9b25ae3e032ca3274b08e531c6a577e288dba41e87dc2c806a2 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 diff --git a/dev-java/jython/files/jython-2.2.1-build.patch b/dev-java/jython/files/jython-2.2.1-build.patch new file mode 100644 index 000000000000..29df77621303 --- /dev/null +++ b/dev-java/jython/files/jython-2.2.1-build.patch @@ -0,0 +1,76 @@ +--- build.xml.org 2008-02-26 22:35:07.000000000 +1300 ++++ build.xml 2008-02-26 22:35:48.000000000 +1300 +@@ -373,21 +373,13 @@ + + + +- ++ + + + + + +- +- +- +- +- +- +- +- +- ++ + + + +@@ -551,28 +543,13 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ + + + + +- ++ + +- ++ + + copy misc files from ${jython.base.dir} + +@@ -599,7 +576,7 @@ + + + copy CPython LICENSE from ${svn.checkout.dir}/python +- ++ + + + copy sources from ${jython.base.dir} diff --git a/dev-java/jython/jython-2.2.1-r1.ebuild b/dev-java/jython/jython-2.2.1-r1.ebuild new file mode 100644 index 000000000000..07e29199f1de --- /dev/null +++ b/dev-java/jython/jython-2.2.1-r1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.2.1-r1.ebuild,v 1.1 2008/02/26 10:30:51 ali_bush Exp $ + +JAVA_PKG_IUSE="readline source doc servletapi mysql postgres examples oracle" +#jdnc + +EAPI=1 + +inherit base java-pkg-2 java-ant-2 + +DESCRIPTION="An implementation of Python written in Java" +HOMEPAGE="http://www.jython.org" + +MY_PV="installer-2.2.1" +PYVER="2.2.3" + +SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz +mirror://sourceforge/${PN}/${PN}_${MY_PV}.jar" + +LICENSE="JPython" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +CDEPEND="=dev-java/jakarta-oro-2.0* + readline? ( >=dev-java/libreadline-java-0.8.0 ) + mysql? ( >=dev-java/jdbc-mysql-3.1 ) + postgres? ( dev-java/jdbc-postgresql ) + oracle? ( dev-java/jdbc-oracle-bin:10.2 ) + servletapi? ( java-virtuals/servlet-api:2.5 )" +RDEPEND=">=virtual/jre-1.4 + ${CDEPEND}" +DEPEND=">=virtual/jdk-1.4 + dev-java/javacc + ${CDEPEND}" + +S="${WORKDIR}" + +#Tests currently very broken. Need to investigate whether that +#is jython's or gentoo's doing. +RESTRICT="test" + +src_unpack() { + unpack ${A} + cd "${S}" + + 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" + + echo javacc.jar="$(java-pkg_getjars --build-only javacc)" > ant.properties + + if use readline; then + echo "readline.jar=$(java-pkg_getjars libreadline-java)" >> \ + ant.properties + fi + if use servletapi; then + echo "servlet.jar=$(java-pkg_getjar --build-only servlet-api-2.5 servlet.jar)" \ + >> ant.properties + fi + if use mysql; then + echo "mysql.jar=$(java-pkg_getjar jdbc-mysql jdbc-mysql.jar)" \ + >> ant.properties + fi + + if use postgres; then + echo \ + "postgresql.jar=$(java-pkg_getjar jdbc-postgresql jdbc-postgresql.jar)"\ + >> ant.properties + fi + + if use oracle; then + echo \ + "oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \ + >> ant.properties + fi +} + + +src_compile() { + local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src" + local pylib="Python-${PYVER}/Lib" + antflags="${antflags} -Dpython.lib=${pylib} -Dsvn.checkout.dir=." + LC_ALL=C eant ${antflags} developer-build $(use_doc javadoc) +} + +src_test() { + local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src" + antflags="${antflags} -Dpython.home=dist" + local pylib="Python-${PYVER}/Lib" + antflags="${antflags} -Dpython.lib=${pylib}" + eant ${antflags} bugtest +} + + +src_install() { + java-pkg_dojar "dist/${PN}.jar" + + dodoc README.txt NEWS ACKNOWLEDGMENTS + use doc && dohtml -A .css .jpg .gif -r Doc/* + + local java_args="-Dpython.home=/usr/share/jython" + java_args="${java_args} -Dpython.cachedir=\${HOME}/.jythoncachedir" + + java-pkg_dolauncher jythonc \ + --main "org.python.util.jython" \ + --java_args "${java_args}" \ + --pkg_args "${java_args} /usr/share/jython/tools/jythonc/jythonc.py" + + java-pkg_dolauncher jython \ + --main "org.python.util.jython" \ + --pkg_args "${java_args}" + + insinto /usr/share/${PN} + doins -r dist/Lib registry + + insinto /usr/share/${PN}/tools + doins -r dist/Tools/* + + use doc && java-pkg_dojavadoc dist/Doc/javadoc + use source && java-pkg_dosrc src + use examples && java-pkg_doexamples dist/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 +} -- 2.26.2