commit: 1af42232fd5356aa4a398771d91be9a9434d24fc Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Jan 16 14:19:55 2016 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Jan 16 14:19:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1af42232
dev-java/jython: Remove old Package-Manager: portage-2.2.26 dev-java/jython/Manifest | 1 - dev-java/jython/jython-2.1-r11.ebuild | 109 -------------------------- dev-java/jython/jython-2.2.1-r1.ebuild | 138 --------------------------------- 3 files changed, 248 deletions(-) diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest index a03255d..98c97d0 100644 --- a/dev-java/jython/Manifest +++ b/dev-java/jython/Manifest @@ -1,5 +1,4 @@ DIST Python-2.2.3.tgz 6709556 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 SHA512 2e2c881f8819ed3d91b3e98e7087b23ced9715c80eb9e5fe4144cca5b82220e035d0f50ac4a098b3bbdca3c588f70b8021f68a5d52f653c013470579342943e4 WHIRLPOOL dbef6f9f0545f4f4ddf6e4535b67bb936a2ef596f17a1ff6acca89755729420588d845bc291eed0d19b433b3eff017166c7d68a1a352a5612b00da2f8f0c20d7 -DIST jython-2.1.tar.bz2 1301528 SHA256 faa57a55d137268e80221cd628b234ca67de13504b813be1c0499c9f4d5872b2 SHA512 397ad2819eb5bb39e1b0c0673922af7fbb75f680d707a7c344d21f680901a6fd96eddbbed8b464fb91cccd6f38a9f9b1a8f8327a530ac870002b72c38bf75ad3 WHIRLPOOL 00a1e7376b1883fc835dc801d718041a623ab0406393135d452df613fbbb9a87ab6bf4429b07260e93530f04031e531d4e041bacf22491d7ec0db76a41d77061 DIST jython-2.7.0-sources.jar 15371691 SHA256 2b534595d4a08059ebb71b881c58ee830499bb6e9daba7c828a7f1f6c8943f7a SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6 WHIRLPOOL e0dbd289c522b41ef2d3f54b01a2f6d44de8755e2eeb7863c8b807d1b179839f20d925e102db324cf85cd82503cd03106b5287ffa7a322a3902d6f24e9cd2a41 DIST jython-installer-2.5.3.jar 18487200 SHA256 05405966cdfa57abc8e705dd6aab92b8240097ce709fb916c8a0dbcaa491f99e SHA512 92d00cc8d885806749c67d1dc820e7b402c807b9a40277073fc3ea1f3dd10e1e506dc241a342874db8109120e8f0031a8dc7a4db6a88dfdc6c89906eeb9d454d WHIRLPOOL e8e3adf741a35b5e4de6c67b8805582cabc8590afac28c2e4ae3b61c4bd38d41904d7d1e4a23de21e7870d628e33a52f540fc89780a4724403b0bd92e1159768 DIST jython_installer-2.2.1.jar 4663097 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68 SHA512 d33262dec95dbecfc007a738ed8d8cd4844c215e451b7ab126940f1157079aa846a104f3587ad84c4a009249632e3aaa3c83479ee8f47c30c4b4833bcdd582b3 WHIRLPOOL bae264f67547a975bf648b3de0cc2becb5d51e14b2ca1a977f7c3d45ec96bd3fd4fd99b0ff6912fb38d54d57656225c51c4b8a474c6ca8fe7fc16e12ab4bbec8 diff --git a/dev-java/jython/jython-2.1-r11.ebuild b/dev-java/jython/jython-2.1-r11.ebuild deleted file mode 100644 index 0f0f221..0000000 --- a/dev-java/jython/jython-2.1-r11.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit base java-pkg-2 - -DESCRIPTION="An implementation of Python written in Java" -HOMEPAGE="http://www.jython.org"; -MY_PV="21" -#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.class" -SRC_URI="mirror://gentoo/${P}.tar.bz2" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc64 x86 ~x86-fbsd" -IUSE="readline source doc" -# servlet - -CDEPEND="=dev-java/jakarta-oro-2.0* - readline? ( >=dev-java/libreadline-java-0.8.0 )" -# servlet? ( >=www-servers/tomcat-5.0 ) -RDEPEND=">=virtual/jre-1.4 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.4 - source? ( app-arch/zip ) - ${CDEPEND}" - -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${PV}-assert.patch - epatch ${FILESDIR}/${PV}-assert-SimpleCompiler.py.patch - - # bug #160861 - rm -rf org/apache -} - -src_compile() { - local cp="$(java-pkg_getjars jakarta-oro-2.0)" - local exclude="" - - if use readline ; then - cp=${cp}:$(java-pkg_getjars libreadline-java) - else - exclude="${exclude} ! -name ReadlineConsole.java" - fi - - #if use servlet; then - # cp=${cp}:$(java-pkg_getjars servlet) - #else - exclude="${exclude} ! -name PyServlet.java" - #fi - - ejavac -classpath ${cp} -nowarn $(find org -name "*.java" ${exclude}) - - find org -name "*.class" | xargs jar cf ${PN}.jar - - # bug 115551 - cd Lib/jxxload_help - ejavac -classpath ${S}/${PN}.jar -nowarn *.java - rm -f *.java Makefile -} - -src_install() { - java-pkg_dojar ${PN}.jar - - dodoc README.txt NEWS ACKNOWLEDGMENTS - use doc && java-pkg_dohtml -A .css .jpg .gif -r Doc/* - - java-pkg_dolauncher jythonc \ - --main "org.python.util.jython" \ - --java_args "-Dpython.home=/usr/share/jython" \ - --pkg_args "/usr/share/jython/tools/jythonc/jythonc.py" - - java-pkg_dolauncher jython \ - --main "org.python.util.jython" \ - --java_args "-Dpython.home=/usr/share/jython" - - dodir /usr/share/jython/cachedir - chmod a+rw ${D}/usr/share/jython/cachedir - - rm Demo/jreload/example.jar - insinto /usr/share/${PN} - doins -r Lib Demo registry - - insinto /usr/share/${PN}/tools - doins -r Tools/* - - use source && java-pkg_dosrc com org -} - -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 - - elog "This revision renames org.python.core.Py.assert to assert_." - elog "This is the solution that upstream will use in the next release." - elog "Just note that this revision is not API compatible with vanilla 2.1." - elog "https://bugs.gentoo.org/show_bug.cgi?id=142099"; -} diff --git a/dev-java/jython/jython-2.2.1-r1.ebuild b/dev-java/jython/jython-2.2.1-r1.ebuild deleted file mode 100644 index 95743ea..0000000 --- a/dev-java/jython/jython-2.2.1-r1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=1 - -JAVA_PKG_IUSE="readline source doc servletapi mysql postgres examples oracle" -#jdnc - -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="PSF-2" -SLOT="0" -KEYWORDS="amd64 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 ) - !<=dev-java/freemarker-2.3.10" -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 --virtual servlet-api-2.5 servlet-api.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 -}
