From 774dad73e7ccc10108b14d90036ea0ade4cda2ef Mon Sep 17 00:00:00 2001 From: Alistair Bush Date: Fri, 5 Mar 2010 21:18:49 +0000 Subject: [PATCH] Version Bump jython to 2.5.1 Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- dev-java/jython/ChangeLog | 8 +- dev-java/jython/Manifest | 16 +- .../jython/files/jython-2.5.1-build.patch | 38 +++++ dev-java/jython/jython-2.5.1.ebuild | 154 ++++++++++++++++++ 4 files changed, 204 insertions(+), 12 deletions(-) create mode 100644 dev-java/jython/files/jython-2.5.1-build.patch create mode 100644 dev-java/jython/jython-2.5.1.ebuild diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog index d2c45e1ef0dc..69444eb76b29 100644 --- a/dev-java/jython/ChangeLog +++ b/dev-java/jython/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/jython # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.66 2010/01/15 19:19:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.67 2010/03/05 21:18:48 ali_bush Exp $ + +*jython-2.5.1 (05 Mar 2010) + + 05 Mar 2010; Alistair Bush +jython-2.5.1.ebuild, + +files/jython-2.5.1-build.patch: + Version Bump jython to 2.5.1 15 Jan 2010; Ulrich Mueller jython-2.1-r11.ebuild: LICENSE is identical with BSD, bug 301123. diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest index 8b7d528d5405..da7a87216b3f 100644 --- a/dev-java/jython/Manifest +++ b/dev-java/jython/Manifest @@ -1,24 +1,18 @@ ------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 2911 RMD160 e8008a340333a28aa382cc17e12efb65f9408644 SHA1 f938d6d04caf85e973ed953c6dba950a3d6b6149 SHA256 be396792dcf5b4619f2047b58b6bbd395d3ccf1c064856b8ea62749902a0375f +AUX jython-2.5.1-build.patch 1821 RMD160 fa4ea2fcde449b460fd553baa872847140ca41d3 SHA1 ea1d9932d29950e56c41e719c981404950bc9fc2 SHA256 284fa97ba5e44a0a0d9945dfc52a5b897d7e58ac010870b83a86fde46f2dca95 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 2939 RMD160 a1f3596dfc5d6f15fc60fe522b4ef3ab2c4fc00e SHA1 75f8317afdb1366a7fc9d72fa620d9717a133a8e SHA256 350f0ca38c869a06ad20b73f41b22c54f9b8017a676cc550069d87c5f8593338 EBUILD jython-2.2.1-r1.ebuild 3772 RMD160 ed33983e8e7f44513d346c20fda80b7b4a91e8e1 SHA1 da67f232692f2cb81db93beb371d31aeaba72585 SHA256 9765c773d4a910bfbe0a88490605af71a897e891a38ba9c12f3da8eb10d14bcf EBUILD jython-2.5.0-r1.ebuild 4487 RMD160 08048d243aaa4cc39a17d4ca261af38e733f7cb2 SHA1 ee626b767dae47542a0d59e11b05b0c777fc2f78 SHA256 b69561dc67fa6b203269f93ad7c3b9535107ff3d96eff31fce7a1e18f4d65200 -MISC ChangeLog 9259 RMD160 72855bd1eb25fc5fc222b6e0dd4c3560044164dc SHA1 601d9c5c22fe49b13ba7db18988365b713f0cf35 SHA256 43e7e6e39ebddc192c36065b931ad07806593a3aed6169befc84779092cdae5c +EBUILD jython-2.5.1.ebuild 4779 RMD160 12c91d7aa83219aaeff34bf73869926c56de44b4 SHA1 4e2a5d8f8911ddb56e3150a5f97e37d71ae4cfb1 SHA256 cc751451690cf9efce8a3573aa1a0e8e6f47959b46321f5afcb3cbb800f986b1 +MISC ChangeLog 9433 RMD160 2d4e5c8bd5d8066eab3df9c92a3d60055c6d3f70 SHA1 43802f3ef53a35231056d753c62a6ba938a3ea6b SHA256 a0823fb22a4398049b54b84b0a15e0c4466ad481b3b119ef56106da4ad673bf7 MISC metadata.xml 248 RMD160 2f209fd2ecdd173d50305f140d7154e1c9a634fa SHA1 25e0f2914006e3cc39f704309e8644af57608a44 SHA256 7faa9b92889ac0d4fe4b02b2dd8e534b534fc4241386fe769803b047f467d6bf ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAktQwFUACgkQOeoy/oIi7uyeUQCeOiJb2hZmAhGf9RaUxRBtyxq7 -tBQAn3fzbG7XJsfpfaBe+vHiDe39c35b -=hnt0 ------END PGP SIGNATURE----- diff --git a/dev-java/jython/files/jython-2.5.1-build.patch b/dev-java/jython/files/jython-2.5.1-build.patch new file mode 100644 index 000000000000..e3c40f1c0f42 --- /dev/null +++ b/dev-java/jython/files/jython-2.5.1-build.patch @@ -0,0 +1,38 @@ +--- build.xml.old 2010-03-06 07:34:18.000000000 +1300 ++++ build.xml 2010-03-06 07:38:24.000000000 +1300 +@@ -191,7 +191,8 @@ + + + +- ++ ++ + + + +@@ -200,7 +201,8 @@ + + + +- ++ ++ + + + +@@ -236,15 +238,6 @@ + + + +- +- +- +- +- +- +- +- +- + + + diff --git a/dev-java/jython/jython-2.5.1.ebuild b/dev-java/jython/jython-2.5.1.ebuild new file mode 100644 index 000000000000..2a71dd9158e1 --- /dev/null +++ b/dev-java/jython/jython-2.5.1.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2010 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.1 2010/03/05 21:18:48 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.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 ~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 +} -- 2.26.2