From 3517852e3b8a68d1e997770fc0650c5053bafc6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Jan 2022 01:27:12 +0000 Subject: gentoo resync : 04.01.2022 --- dev-java/jython/Manifest | 3 +- dev-java/jython/jython-2.7.0-r2.ebuild | 151 --------------------------------- dev-java/jython/jython-2.7.0-r4.ebuild | 4 +- 3 files changed, 3 insertions(+), 155 deletions(-) delete mode 100644 dev-java/jython/jython-2.7.0-r2.ebuild (limited to 'dev-java/jython') diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest index 3c117b49b716..91ce455ae8d2 100644 --- a/dev-java/jython/Manifest +++ b/dev-java/jython/Manifest @@ -6,6 +6,5 @@ AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6 -EBUILD jython-2.7.0-r2.ebuild 4300 BLAKE2B 0fe18858265152bb9ee70f08dfd91ef6e11772b6f418d6babf003a609fb287ef3ecdfa58d4328d139da2b635317f0d58896816db6b6118a1fb9e1ebb93b964da SHA512 1a19bfc4b4cb676d9336d7ed3911a2cf816ebc7af6abfe9fbe9ad259d4e96e39d371cbdbdbe2790c372ea443ab60ae8d0ca7406d382f97676d035485f669241a -EBUILD jython-2.7.0-r4.ebuild 4287 BLAKE2B f5f2c337993a92e0aa635dd086cc4f27e7a82657cd486cde2a5a4e7303198d4694e7d3d3967368823a355761b33bab3702fe91b56ec5940a31f19771a5c5c344 SHA512 046257a31b38ef29aa4f8dfd962c1bba65f6dba37b2c45c0656d3f064b0c8336de30f21c4044f36a52639ad67dd3b4c034f758e73c6278a003437b32cb5fe5c5 +EBUILD jython-2.7.0-r4.ebuild 4292 BLAKE2B eed667f0e6c069444978bc4ba013b321f11ce9e73cab284c1ac95d1cbed5dc66358ebce85382703ab2ce7b8752ac4976e01861f1f245dec55d013780d616ce13 SHA512 c5b73640dc31a4b72d2ff54213921747770bdff7a9ce35969c5bfa000ccafe62480b53ae2fb1c6d3089764fac77d652f023ad889922a90af372113349e64bba8 MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464 diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild b/dev-java/jython/jython-2.7.0-r2.ebuild deleted file mode 100644 index f4ecf1593584..000000000000 --- a/dev-java/jython/jython-2.7.0-r2.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic - -MY_PV=${PV/_beta/-b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="An implementation of Python written in Java" -HOMEPAGE="https://www.jython.org" -SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar" - -LICENSE="PSF-2" -SLOT="2.7" -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="examples test" - -CP_DEPEND="dev-java/antlr:3 - dev-java/netty-transport:0 - >=dev-java/asm-5:4 - dev-java/commons-compress:0 - dev-java/guava:20 - dev-java/jffi:1.2 - dev-java/jline:2 - dev-java/icu4j:52 - dev-java/jnr-constants:0 - dev-java/jnr-posix:3.0 - dev-java/jnr-netdb:1.0 - dev-java/stringtemplate:0 - dev-java/xerces:2 - java-virtuals/script-api:0 - java-virtuals/servlet-api:3.0" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.7" -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.7 - app-arch/unzip - dev-java/ant-core:0 - test? ( - dev-java/junit:4 - dev-java/ant-junit:0 - )" - -S=${WORKDIR} - -RESTRICT="test" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS+=" java" - -EANT_BUILD_TARGET="developer-build" -EANT_TEST_EXTRA_ARGS="-Dpython.home=dist" - -# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed. -# Uncomment and add to CDEPEND if you want either of them -#EANT_GENTOO_CLASSPATH+=",jdbc-informix" EANT_EXTRA_ARGS+=" -Dinformix.present" -#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present" - -PATCHES=( - "${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch - "${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch - "${FILESDIR}"/${PN}-2.7_beta1-ant.patch - "${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch - "${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch - "${FILESDIR}"/${PN}-2.7.0-build.xml.patch - "${FILESDIR}"/CVE-2016-4000.patch -) - -src_prepare() { - default - - find \( -name '*.jar' -o -name '*.class' \ - -o -name '*.pyc' -o -name '*.exe' \) -delete - - # needed for launchertest - chmod +x tests/shell/test-jython.sh || die - - java-pkg-2_src_prepare -} - -src_configure() { - # apparently this can cause problems - append-flags -fno-stack-protector - - EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)" - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)" -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - local instdir=/usr/share/${PN}-${SLOT} - - java-pkg_newjar dist/${PN}-dev.jar - - java-pkg_register-optional-dependency jdbc-mysql - java-pkg_register-optional-dependency jdbc-postgresql - - insinto ${instdir} - doins -r dist/{Lib,registry} - - dodoc ACKNOWLEDGMENTS NEWS README.txt - - use doc && java-pkg_dohtml -r dist/Doc/javadoc - use source && java-pkg_dosrc src/* - use examples && java-pkg_doexamples Demo/* - - local java_args=( - -Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT} - -Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT} - -Dpython.cachedir="\${HOME}/.jythoncachedir" - ) - - java-pkg_dolauncher jython${SLOT} \ - --main org.python.util.jython \ - --java_args "${java_args[*]}" - - # we need a wrapper to help python_optimize - cat <<-EOF > "${T}"/jython - exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \ - -Dpython.home="${ED}${instdir}" \ - -Dpython.cachedir="${T}/.jythoncachedir" \ - -Duser.home="${T}" \ - org.python.util.jython "\${@}" - EOF - chmod +x "${T}"/jython || die - - local -x PYTHON="${T}"/jython - # we can't get the path from the interpreter since it does some - # magic that fails on non-installed copy... - local PYTHON_SITEDIR=${EPREFIX}/usr/share/jython-${SLOT}/Lib/site-packages - python_export jython${SLOT} EPYTHON - - # compile tests (everything else is compiled already) - # we're keeping it quiet since jython reports errors verbosely - # and some of the tests are supposed to trigger compile errors - python_optimize "${ED}${instdir}"/Lib/test &>/dev/null - - # for python-exec - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # some of the class files end up with newer timestamps than the files they - # were generated from, make sure this doesn't happen - find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch -} diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild b/dev-java/jython/jython-2.7.0-r4.ebuild index 424604dcc202..06257d2dd02c 100644 --- a/dev-java/jython/jython-2.7.0-r4.ebuild +++ b/dev-java/jython/jython-2.7.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P LICENSE="PSF-2" SLOT="2.7" -KEYWORDS="~amd64 arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="examples test" CP_DEPEND="dev-java/antlr:3 -- cgit v1.2.3