[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/files/, dev-java/jython/, profiles/
commit: e4d717fb45ff9bf0ae328dccee5dd761630c3436
Author: David Seifert gentoo org>
AuthorDate: Thu May 11 10:12:23 2023 +
Commit: David Seifert gentoo org>
CommitDate: Thu May 11 10:12:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d717fb
dev-java/jython: treeclean
Closes: https://bugs.gentoo.org/825486
Closes: https://bugs.gentoo.org/828473
Closes: https://bugs.gentoo.org/886363
Signed-off-by: David Seifert gentoo.org>
dev-java/jython/Manifest | 1 -
dev-java/jython/files/CVE-2016-4000.patch | 158 -
.../jython-2.5.2-distutils_scripts_location.patch | 11 --
.../files/jython-2.5.2-respect_PYTHONPATH.patch| 15 --
dev-java/jython/files/jython-2.7.0-build.xml.patch | 11 --
dev-java/jython/files/jython-2.7_beta1-ant.patch | 28
...n-2.7_beta1-dont-always-recompile-classes.patch | 11 --
.../files/jython-2.7_beta2-maxrepeat-import.patch | 16 ---
dev-java/jython/jython-2.7.0-r7.ebuild | 156
dev-java/jython/metadata.xml | 11 --
profiles/package.mask | 5 -
11 files changed, 423 deletions(-)
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
deleted file mode 100644
index 37e6fec3e242..
--- a/dev-java/jython/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jython-2.7.0-sources.jar 15371691 BLAKE2B
7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24
SHA512
7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
diff --git a/dev-java/jython/files/CVE-2016-4000.patch
b/dev-java/jython/files/CVE-2016-4000.patch
deleted file mode 100644
index 81785eb05b07..
--- a/dev-java/jython/files/CVE-2016-4000.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-
-# HG changeset patch
-# User Jim Baker
-# Date 1454384221 25200
-# Node ID d06e29d100c04576735e86c75a26c5f33669bb72
-# Parent b6735606c13df95f770527e629954407f82808c5
-Do not deserialize PyFunction objects. Fixes #2454
-
-Instead use standard Python pickling; or subclass PyFunction.
-
-diff --git a/Lib/test/test_java_integration.py
b/Lib/test/test_java_integration.py
a/Lib/test/test_java_integration.py
-+++ b/Lib/test/test_java_integration.py
-@@ -14,8 +14,9 @@ import re
- from collections import deque
- from test import test_support
-
--from java.lang import (ClassCastException, ExceptionInInitializerError,
String, Runnable, System,
--Runtime, Math, Byte)
-+from java.lang import (
-+ClassCastException, ExceptionInInitializerError,
UnsupportedOperationException,
-+String, Runnable, System, Runtime, Math, Byte)
- from java.math import BigDecimal, BigInteger
- from java.net import URI
- from java.io import (ByteArrayInputStream, ByteArrayOutputStream, File,
FileInputStream,
-@@ -656,13 +657,30 @@ class SerializationTest(unittest.TestCas
- self.assertEqual(date_list, roundtrip_serialization(date_list))
-
- def test_java_serialization_pycode(self):
--
- def universal_answer():
- return 42
-
- serialized_code = roundtrip_serialization(universal_answer.func_code)
- self.assertEqual(eval(serialized_code), universal_answer())
-
-+def test_java_serialization_pyfunction(self):
-+# Not directly supported due to lack of general utility
-+# (globals will usually be in the function object in
-+# func_globals), and problems with unserialization
-+# vulnerabilities. Users can always subclass from PyFunction
-+# for specific cases, as seen in PyCascading
-+import new
-+def f():
-+return 6 * 7 + max(0, 1, 2)
-+# However, using the new module, it's possible to create a
-+# function with no globals, which means the globals will come
-+# from the current context
-+g = new.function(f.func_code, {}, "g")
-+# But still forbid Java deserialization of this function
-+# object. Use pickling or other support instead.
-+with self.assertRaises(UnsupportedOperationException):
-+roundtrip_serialization(g)
-+
- def test_builtin_names(self):
- import __builtin__
- names = [x for x in dir(__builtin__)]
-@@ -872,7 +890,7 @@ class SingleMethodInterfaceTest(unittest
- future.get()
- self.assertEqual(x, [42])
-
--@unittest.skip("FIXME: not working")
-+@unittest.skip("FIXME: not working; see http://bugs.jython.org/issue2115";)
- def test_callable_object(self):
- callable_obj = CallableObject()
- future = self.executor.submit(callable_obj)
-diff --git a/Lib/test/test_new.py b/Lib/test/test_new.py
a/Lib/test/test_new.py
-+++ b/Lib/test/test_new.py
-@@ -24,18 +24,10 @@ class NewTest(unittest.TestCase):
- c = new.instance(C, {'y
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: ad57118c772796532563168fa867352e0cae7669
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Sep 5 04:54:43 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Mon Sep 5 08:00:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad57118c
dev-java/jython: drop 2.7.0-r6
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/jython/jython-2.7.0-r6.ebuild | 156 -
1 file changed, 156 deletions(-)
diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild
b/dev-java/jython/jython-2.7.0-r6.ebuild
deleted file mode 100644
index d2b1a1703775..
--- a/dev-java/jython/jython-2.7.0-r6.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.python:jython:2.7.0"
-
-inherit 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 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
- dev-java/netty:0
- dev-java/asm:9
- dev-java/commons-compress:0
- dev-java/guava:0
- dev-java/jffi:1.2
- dev-java/jline:2
- dev-java/icu4j:70
- 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/servlet-api:3.0"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/ant-core:0
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-BDEPEND="app-arch/unzip"
-
-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
-
- # https://bugs.gentoo.org/show_bug.cgi?id=833785
- sed -e 's:\(CharMatcher.\)ASCII:\1ascii():' \
- -i src/org/python/core/Py{,BaseCode,Unicode}.java || 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" \
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: fcb0698408a7c7e7688bda817bf3873f76246211
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Wed Aug 24 09:57:04 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sun Sep 4 09:14:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb06984
dev-java/jython: dependency switch dev-java/jffi slot 1.3
also update EAPI 7 -> 8
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/27116
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/jython/jython-2.7.0-r7.ebuild | 156 +
1 file changed, 156 insertions(+)
diff --git a/dev-java/jython/jython-2.7.0-r7.ebuild
b/dev-java/jython/jython-2.7.0-r7.ebuild
new file mode 100644
index ..b05f5ed59d82
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0-r7.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.python:jython:2.7.0"
+
+inherit 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 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+CP_DEPEND="dev-java/antlr:3
+ dev-java/netty:0
+ dev-java/asm:9
+ dev-java/commons-compress:0
+ dev-java/guava:0
+ dev-java/jffi:1.3
+ dev-java/jline:2
+ dev-java/icu4j:70
+ 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/servlet-api:3.0"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ dev-java/ant-core:0
+ test? (
+ dev-java/junit:4
+ dev-java/ant-junit:0
+ )"
+BDEPEND="app-arch/unzip"
+
+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
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=833785
+ sed -e 's:\(CharMatcher.\)ASCII:\1ascii():' \
+ -i src/org/python/core/Py{,BaseCode,Unicode}.java || 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}${i
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 29a0776d522dae4c492a8eca94c7a4864bb10c98
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Aug 26 12:56:28 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Aug 26 12:58:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29a0776d
Revert "dev-java/jython: dependency switch dev-java/jffi slot 1.3"
This reverts commit 9e60213f5c0880c167d9d035248365b30d6bad30 due to
NonsolvableDepsInStable nonsolvable depset(depend) keyword(~arm) stable profile
(default/linux/arm/17.0) (3 total): solutions: [ dev-java/jffi:1.3 ]
NonsolvableDepsInStable nonsolvable depset(rdepend) keyword(~arm) stable
profile (default/linux/arm/17.0) (3 total): solutions: [ dev-java/jffi:1.3 ]
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/jython/jython-2.7.0-r7.ebuild | 156 -
1 file changed, 156 deletions(-)
diff --git a/dev-java/jython/jython-2.7.0-r7.ebuild
b/dev-java/jython/jython-2.7.0-r7.ebuild
deleted file mode 100644
index b05f5ed59d82..
--- a/dev-java/jython/jython-2.7.0-r7.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.python:jython:2.7.0"
-
-inherit 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 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
- dev-java/netty:0
- dev-java/asm:9
- dev-java/commons-compress:0
- dev-java/guava:0
- dev-java/jffi:1.3
- dev-java/jline:2
- dev-java/icu4j:70
- 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/servlet-api:3.0"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/ant-core:0
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-BDEPEND="app-arch/unzip"
-
-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
-
- # https://bugs.gentoo.org/show_bug.cgi?id=833785
- sed -e 's:\(CharMatcher.\)ASCII:\1ascii():' \
- -i src/org/python/core/Py{,BaseCode,Unicode}.java || 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 nee
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 9e60213f5c0880c167d9d035248365b30d6bad30
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Wed Aug 24 09:57:04 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Aug 26 12:36:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e60213f
dev-java/jython: dependency switch dev-java/jffi slot 1.3
also update EAPI 7 -> 8
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/26998
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/jython/jython-2.7.0-r7.ebuild | 156 +
1 file changed, 156 insertions(+)
diff --git a/dev-java/jython/jython-2.7.0-r7.ebuild
b/dev-java/jython/jython-2.7.0-r7.ebuild
new file mode 100644
index ..b05f5ed59d82
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0-r7.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.python:jython:2.7.0"
+
+inherit 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 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+CP_DEPEND="dev-java/antlr:3
+ dev-java/netty:0
+ dev-java/asm:9
+ dev-java/commons-compress:0
+ dev-java/guava:0
+ dev-java/jffi:1.3
+ dev-java/jline:2
+ dev-java/icu4j:70
+ 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/servlet-api:3.0"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ dev-java/ant-core:0
+ test? (
+ dev-java/junit:4
+ dev-java/ant-junit:0
+ )"
+BDEPEND="app-arch/unzip"
+
+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
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=833785
+ sed -e 's:\(CharMatcher.\)ASCII:\1ascii():' \
+ -i src/org/python/core/Py{,BaseCode,Unicode}.java || 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}${i
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: e549bfc78a4923be98e671cad3a345e3087beb53
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Jun 17 11:40:35 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Jun 17 13:50:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e549bfc7
dev-java/jython: drop 2.7.0-r4
Closes: https://bugs.gentoo.org/833785
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jython/jython-2.7.0-r4.ebuild | 152 -
1 file changed, 152 deletions(-)
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild
b/dev-java/jython/jython-2.7.0-r4.ebuild
deleted file mode 100644
index 3da94ca9ebbe..
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.python:jython:2.7.0"
-
-inherit 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 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
- dev-java/netty-transport:0
- dev-java/asm:9
- dev-java/commons-compress:0
- dev-java/guava:20
- dev-java/jffi:1.2
- dev-java/jline:2
- dev-java/icu4j:70
- 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/servlet-api:3.0"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/ant-core:0
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-BDEPEND="app-arch/unzip"
-
-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
-
- l
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: c2a7918f8205f5560c16b65588186d4e5901d2d9
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Jun 17 12:45:08 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Jun 17 12:45:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2a7918f
dev-java/jython: Stabilize 2.7.0-r6 ppc64, #837749
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jython/jython-2.7.0-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild
b/dev-java/jython/jython-2.7.0-r6.ebuild
index 174af66e4e42..d2b1a1703775 100644
--- a/dev-java/jython/jython-2.7.0-r6.ebuild
+++ b/dev-java/jython/jython-2.7.0-r6.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 3c4bdb9722bd5c95b717fb70c7ba478e563004fd
Author: Sam James gentoo org>
AuthorDate: Thu Jun 16 15:13:28 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 16 15:13:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4bdb97
dev-java/jython: Stabilize 2.7.0-r6 amd64, #837749
Signed-off-by: Sam James gentoo.org>
dev-java/jython/jython-2.7.0-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild
b/dev-java/jython/jython-2.7.0-r6.ebuild
index 7000a802e098..28237f5d22e2 100644
--- a/dev-java/jython/jython-2.7.0-r6.ebuild
+++ b/dev-java/jython/jython-2.7.0-r6.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 990408313b9457bea7a7f0052d27f16124327e03
Author: Sam James gentoo org>
AuthorDate: Thu Jun 16 15:14:37 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 16 15:14:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99040831
dev-java/jython: Stabilize 2.7.0-r6 x86, #837749
Signed-off-by: Sam James gentoo.org>
dev-java/jython/jython-2.7.0-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild
b/dev-java/jython/jython-2.7.0-r6.ebuild
index 28237f5d22e2..b9a9876e0798 100644
--- a/dev-java/jython/jython-2.7.0-r6.ebuild
+++ b/dev-java/jython/jython-2.7.0-r6.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 41d162a19fe2eb76a096c0c0614e1c745d5366b5
Author: Sam James gentoo org>
AuthorDate: Fri Apr 29 19:19:52 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 29 19:19:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d162a1
dev-java/jython: Stabilize 2.7.0-r4 ppc64, #710208
Signed-off-by: Sam James gentoo.org>
dev-java/jython/jython-2.7.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild
b/dev-java/jython/jython-2.7.0-r4.ebuild
index 9a24865883be..3da94ca9ebbe 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 0bca1def40c7da7411b990da428e1ca81f30397a
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Apr 28 08:15:04 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Apr 29 08:46:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bca1def
dev-java/jython: dependency switch guava:20 -> guava:0
Bug: https://bugs.gentoo.org/833785
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/jython/jython-2.7.0-r6.ebuild | 156 +
1 file changed, 156 insertions(+)
diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild
b/dev-java/jython/jython-2.7.0-r6.ebuild
new file mode 100644
index ..7000a802e098
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0-r6.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.python:jython:2.7.0"
+
+inherit 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 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+CP_DEPEND="dev-java/antlr:3
+ dev-java/netty:0
+ dev-java/asm:9
+ dev-java/commons-compress:0
+ dev-java/guava:0
+ dev-java/jffi:1.2
+ dev-java/jline:2
+ dev-java/icu4j:70
+ 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/servlet-api:3.0"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ dev-java/ant-core:0
+ test? (
+ dev-java/junit:4
+ dev-java/ant-junit:0
+ )"
+BDEPEND="app-arch/unzip"
+
+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
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=833785
+ sed -e 's:\(CharMatcher.\)ASCII:\1ascii():' \
+ -i src/org/python/core/Py{,BaseCode,Unicode}.java || 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}" \
+ -Dpyt
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: f68880d59c4e876227df2f8bb326140a58a428fb
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Apr 28 09:30:33 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Apr 29 08:46:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68880d5
dev-java/jython: drop 2.7.0-r5
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25235
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/jython/jython-2.7.0-r5.ebuild | 152 -
1 file changed, 152 deletions(-)
diff --git a/dev-java/jython/jython-2.7.0-r5.ebuild
b/dev-java/jython/jython-2.7.0-r5.ebuild
deleted file mode 100644
index b0257f478623..
--- a/dev-java/jython/jython-2.7.0-r5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.python:jython:2.7.0"
-
-inherit 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 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
- dev-java/netty:0
- dev-java/asm:9
- dev-java/commons-compress:0
- dev-java/guava:20
- dev-java/jffi:1.2
- dev-java/jline:2
- dev-java/icu4j:70
- 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/servlet-api:3.0"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.8:*"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/ant-core:0
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-BDEPEND="app-arch/unzip"
-
-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
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 4d035ea5cb1154add0ee4675dc1e76aa21514f2a
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Apr 23 08:08:26 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sat Apr 23 12:00:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d035ea5
dev-java/jython: dependency switch to dev-java/netty
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25165
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/jython/jython-2.7.0-r5.ebuild | 152 +
1 file changed, 152 insertions(+)
diff --git a/dev-java/jython/jython-2.7.0-r5.ebuild
b/dev-java/jython/jython-2.7.0-r5.ebuild
new file mode 100644
index ..b0257f478623
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0-r5.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.python:jython:2.7.0"
+
+inherit 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 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+CP_DEPEND="dev-java/antlr:3
+ dev-java/netty:0
+ dev-java/asm:9
+ dev-java/commons-compress:0
+ dev-java/guava:20
+ dev-java/jffi:1.2
+ dev-java/jline:2
+ dev-java/icu4j:70
+ 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/servlet-api:3.0"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ dev-java/ant-core:0
+ test? (
+ dev-java/junit:4
+ dev-java/ant-junit:0
+ )"
+BDEPEND="app-arch/unzip"
+
+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
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 7505a7e99cc27f34535d6933966e532f491aaa46
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Jan 27 13:30:46 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Jan 28 08:58:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7505a7e9
dev-java/jython: Drop dependency on script-api
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/jython/jython-2.7.0-r4.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild
b/dev-java/jython/jython-2.7.0-r4.ebuild
index c24d236dc549..9a24865883be 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -33,7 +33,6 @@ CP_DEPEND="dev-java/antlr:3
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.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 98940f05495405e989d7affd6f89c107a0eaaded Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Jan 12 10:29:19 2022 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Jan 14 08:43:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98940f05 dev-java/jython: MAVEN_ID Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/jython/jython-2.7.0-r4.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild b/dev-java/jython/jython-2.7.0-r4.ebuild index 5abd3a99bb64..c24d236dc549 100644 --- a/dev-java/jython/jython-2.7.0-r4.ebuild +++ b/dev-java/jython/jython-2.7.0-r4.ebuild @@ -4,6 +4,7 @@ EAPI=7 JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.python:jython:2.7.0" inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: a27fdc5ac9443f34785a9595d3e3e25fb80eab84
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Jan 10 19:10:26 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Jan 10 19:10:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27fdc5a
dev-java/jython: Keyword 2.7.0-r4 arm, #828049
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jython/jython-2.7.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild
b/dev-java/jython/jython-2.7.0-r4.ebuild
index 06257d2dd02c..5abd3a99bb64 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -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 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 91f6dde18f1f416164bfc8bb0a503399061789ff
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Jan 2 10:56:14 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Jan 2 10:56:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f6dde1
dev-java/jython: removed obsolete 2.7.0-r2
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/jython/jython-2.7.0-r2.ebuild | 151 -
1 file changed, 151 deletions(-)
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..
--- 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
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: bd7d8759355689bf2a5053479c05536b726d91b1
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Jan 2 10:52:17 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Jan 2 10:53:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7d8759
dev-java/jython: Stabilize 2.7.0-r4 amd64, #822933
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/jython/jython-2.7.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild
b/dev-java/jython/jython-2.7.0-r4.ebuild
index cd2ac4294edb..06257d2dd02c 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -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 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 3dff3cb6e6b058a3e26117a75e12ac3051d03e6f
Author: Sam James gentoo org>
AuthorDate: Sun Jan 2 00:02:41 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 2 00:02:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dff3cb6
dev-java/jython: Stabilize 2.7.0-r4 x86, #822933
Signed-off-by: Sam James gentoo.org>
dev-java/jython/jython-2.7.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild
b/dev-java/jython/jython-2.7.0-r4.ebuild
index 45f520a8644b..cd2ac4294edb 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 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 56a02f9f29dab5da048b684869f54db1af7b5faf
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 31 09:55:26 2021 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 31 09:55:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a02f9f
dev-java/jython: Keyword 2.7.0-r4 ppc64, #824770
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jython/jython-2.7.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild
b/dev-java/jython/jython-2.7.0-r4.ebuild
index 424604dcc202..45f520a8644b 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -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
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 424e78e25f2ba9a1200598c3a8db74d9d88d9053
Author: Sam James gentoo org>
AuthorDate: Thu Nov 25 04:13:44 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 25 04:13:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424e78e2
dev-java/jython: Stabilize 2.7.0-r4 arm64, #822933
Signed-off-by: Sam James gentoo.org>
dev-java/jython/jython-2.7.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild
b/dev-java/jython/jython-2.7.0-r4.ebuild
index d8c735f6426a..424604dcc202 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -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 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: b65cc982eadc19bcacbb5aa0932dc8a6c1399e68
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Nov 21 17:00:52 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Nov 21 17:01:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65cc982
dev-java/jython: removed obsolete 2.7.0-r3
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/jython/jython-2.7.0-r3.ebuild | 152 -
1 file changed, 152 deletions(-)
diff --git a/dev-java/jython/jython-2.7.0-r3.ebuild
b/dev-java/jython/jython-2.7.0-r3.ebuild
deleted file mode 100644
index e4c5606e1118..
--- a/dev-java/jython/jython-2.7.0-r3.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit 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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
- dev-java/netty-transport:0
- dev-java/asm:9
- dev-java/commons-compress:0
- dev-java/guava:20
- dev-java/jffi:1.2
- dev-java/jline:2
- dev-java/icu4j:55
- 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.8:*"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.8:*
- dev-java/ant-core:0
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-BDEPEND="app-arch/unzip"
-
-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 g
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 756755f4c2d6092298371f3a3ef3b759606e949c
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Nov 20 23:12:45 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Nov 21 16:31:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=756755f4
dev-java/jython: use icu4j:70
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20661
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/jython/jython-2.7.0-r4.ebuild | 152 +
1 file changed, 152 insertions(+)
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild
b/dev-java/jython/jython-2.7.0-r4.ebuild
new file mode 100644
index ..d8c735f6426a
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit 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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+CP_DEPEND="dev-java/antlr:3
+ dev-java/netty-transport:0
+ dev-java/asm:9
+ dev-java/commons-compress:0
+ dev-java/guava:20
+ dev-java/jffi:1.2
+ dev-java/jline:2
+ dev-java/icu4j:70
+ 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.8:*"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ dev-java/ant-core:0
+ test? (
+ dev-java/junit:4
+ dev-java/ant-junit:0
+ )"
+BDEPEND="app-arch/unzip"
+
+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
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: ee3641d3eacd2c691a307b970ffeeb4d087f2b70
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Nov 19 07:23:43 2021 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Nov 19 07:24:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3641d3
dev-java/jython: Keyword 2.7.0-r2 ppc64, #822945
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jython/jython-2.7.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild
b/dev-java/jython/jython-2.7.0-r2.ebuild
index 51252ea7dfa7..f4ecf1593584 100644
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -15,7 +15,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
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 16a412d246d87b56a8dbec6ad6be1b020de37c37
Author: Sam James gentoo org>
AuthorDate: Sat Nov 13 10:25:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 13 10:25:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16a412d2
dev-java/jython: keyword 2.7.0-r3 for ~arm64
Signed-off-by: Sam James gentoo.org>
dev-java/jython/jython-2.7.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r3.ebuild
b/dev-java/jython/jython-2.7.0-r3.ebuild
index 0533d97b355..e4c5606e111 100644
--- a/dev-java/jython/jython-2.7.0-r3.ebuild
+++ b/dev-java/jython/jython-2.7.0-r3.ebuild
@@ -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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 2d565de9ee70694ab90d0adba26c937a5a08a997
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon May 3 23:01:40 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 13 10:24:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d565de9
dev-java/jython: min java 1.8, icu4j:55, asm:9
Closes: https://bugs.gentoo.org/758881
Closes: https://bugs.gentoo.org/645808
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/22895
Signed-off-by: Sam James gentoo.org>
dev-java/jython/jython-2.7.0-r3.ebuild | 152 +
1 file changed, 152 insertions(+)
diff --git a/dev-java/jython/jython-2.7.0-r3.ebuild
b/dev-java/jython/jython-2.7.0-r3.ebuild
new file mode 100644
index 000..0533d97b355
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0-r3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit 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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+CP_DEPEND="dev-java/antlr:3
+ dev-java/netty-transport:0
+ dev-java/asm:9
+ dev-java/commons-compress:0
+ dev-java/guava:20
+ dev-java/jffi:1.2
+ dev-java/jline:2
+ dev-java/icu4j:55
+ 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.8:*"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ dev-java/ant-core:0
+ test? (
+ dev-java/junit:4
+ dev-java/ant-junit:0
+ )"
+BDEPEND="app-arch/unzip"
+
+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="$
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: b8c66b21d6e7cac6116c4005061bef3f1948b9ef
Author: Sam James gentoo org>
AuthorDate: Tue Oct 19 00:14:13 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 19 00:14:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8c66b21
dev-java/jython: Keyword 2.7.0-r2 arm64, #802609
Signed-off-by: Sam James gentoo.org>
dev-java/jython/jython-2.7.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild
b/dev-java/jython/jython-2.7.0-r2.ebuild
index 82ca2983998..51252ea7dfa 100644
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 9e509506285cd9c23476eb409931bd752f21fbb0
Author: Patrice Clement gentoo org>
AuthorDate: Fri Oct 27 17:26:17 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Oct 27 18:27:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e509506
dev-java/jython: remove vulnerable version.
Bug: https://bugs.gentoo.org/621876
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-java/jython/jython-2.7.0.ebuild | 191
dev-java/jython/metadata.xml| 3 -
2 files changed, 194 deletions(-)
diff --git a/dev-java/jython/jython-2.7.0.ebuild
b/dev-java/jython/jython-2.7.0.ebuild
deleted file mode 100644
index 18b533ce367..000
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc examples 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="http://www.jython.org";
-SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar";
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="+readline test"
-REQUIRED_USE="test? ( readline )"
-
-CDEPEND="dev-java/ant-core:0
- dev-java/antlr:3
- dev-java/netty-transport:0
- =dev-java/asm-5.0.3:4
- dev-java/commons-compress:0
- dev-java/guava:13
- >=dev-java/java-config-2.1.11-r3
- 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
- readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.7"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.7
- app-arch/unzip
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-
-S=${WORKDIR}
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline-2,"
-EANT_GENTOO_CLASSPATH+="jnr-constants,script-api,servlet-api-3.0,"
-EANT_GENTOO_CLASSPATH+="stringtemplate,xerces-2,icu4j-52,netty-transport,jnr-posix-3.0"
-
-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
-)
-
-java_prepare() {
- find \( -name '*.jar' -o -name '*.class' \
- -o -name '*.pyc' -o -name '*.exe' \) -delete
-
- epatch "${PATCHES[@]}"
-
- if ! use readline; then
- rm -v src/org/python/util/ReadlineConsole.java || die
- fi
-
- # needed for launchertest
- chmod +x tests/shell/test-jython.sh || die
-
- # apparently this can cause problems
- append-flags -fno-stack-protector
-}
-
-src_compile() {
- use readline && EANT_GENTOO_CLASSPATH+=",libreadline-java"
-
- 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)"
-
- sed -i -e "1 a\
- CLASSPATH=\"$(java-pkg_getjars
"${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}\"" \
- src/shell/jython || die
-
- java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-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.e
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 8bb707c615b05a3d58fcd2b65fe070e536af042a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Oct 25 09:30:13 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Oct 25 09:30:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb707c6
dev-java/jython: amd64 stable wrt bug #621876
Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/jython/jython-2.7.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild
b/dev-java/jython/jython-2.7.0-r2.ebuild
index 852db859cfd..d8fb023be8a 100644
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -15,7 +15,7 @@
SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: bff8b9e0e9b9162593a6429ace5f3209b35afefc
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Oct 3 00:33:51 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Oct 3 00:33:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff8b9e0
dev-java/jython: x86 stable (bug #621876)
Package-Manager: Portage-2.3.10, Repoman-2.3.3
dev-java/jython/jython-2.7.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild
b/dev-java/jython/jython-2.7.0-r2.ebuild
index c0b7572345d..852db859cfd 100644
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -15,7 +15,7 @@
SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV
LICENSE="PSF-2"
SLOT="2.7"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="examples test"
CP_DEPEND="dev-java/antlr:3
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/, dev-java/jython/files/
commit: 4d4181e97c8eb35dbb021f4d6a8daca122aa52c3
Author: James Le Cuirot gentoo org>
AuthorDate: Thu Aug 31 21:15:12 2017 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Aug 31 21:16:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d4181e9
dev-java/jython: Patch against CVE-2016-4000 (bug #621876)
Also unpeg the dev-java/asm version as 5.1 works fine. 5.0.3 was the
latest when that restriction was put in place so a newer version could
not have been breaking it.
Package-Manager: Portage-2.3.8, Repoman-2.3.2
dev-java/jython/files/CVE-2016-4000.patch | 158 +
...thon-2.7.0-r1.ebuild => jython-2.7.0-r2.ebuild} | 3 +-
2 files changed, 160 insertions(+), 1 deletion(-)
diff --git a/dev-java/jython/files/CVE-2016-4000.patch
b/dev-java/jython/files/CVE-2016-4000.patch
new file mode 100644
index 000..81785eb05b0
--- /dev/null
+++ b/dev-java/jython/files/CVE-2016-4000.patch
@@ -0,0 +1,158 @@
+
+# HG changeset patch
+# User Jim Baker
+# Date 1454384221 25200
+# Node ID d06e29d100c04576735e86c75a26c5f33669bb72
+# Parent b6735606c13df95f770527e629954407f82808c5
+Do not deserialize PyFunction objects. Fixes #2454
+
+Instead use standard Python pickling; or subclass PyFunction.
+
+diff --git a/Lib/test/test_java_integration.py
b/Lib/test/test_java_integration.py
+--- a/Lib/test/test_java_integration.py
b/Lib/test/test_java_integration.py
+@@ -14,8 +14,9 @@ import re
+ from collections import deque
+ from test import test_support
+
+-from java.lang import (ClassCastException, ExceptionInInitializerError,
String, Runnable, System,
+-Runtime, Math, Byte)
++from java.lang import (
++ClassCastException, ExceptionInInitializerError,
UnsupportedOperationException,
++String, Runnable, System, Runtime, Math, Byte)
+ from java.math import BigDecimal, BigInteger
+ from java.net import URI
+ from java.io import (ByteArrayInputStream, ByteArrayOutputStream, File,
FileInputStream,
+@@ -656,13 +657,30 @@ class SerializationTest(unittest.TestCas
+ self.assertEqual(date_list, roundtrip_serialization(date_list))
+
+ def test_java_serialization_pycode(self):
+-
+ def universal_answer():
+ return 42
+
+ serialized_code = roundtrip_serialization(universal_answer.func_code)
+ self.assertEqual(eval(serialized_code), universal_answer())
+
++def test_java_serialization_pyfunction(self):
++# Not directly supported due to lack of general utility
++# (globals will usually be in the function object in
++# func_globals), and problems with unserialization
++# vulnerabilities. Users can always subclass from PyFunction
++# for specific cases, as seen in PyCascading
++import new
++def f():
++return 6 * 7 + max(0, 1, 2)
++# However, using the new module, it's possible to create a
++# function with no globals, which means the globals will come
++# from the current context
++g = new.function(f.func_code, {}, "g")
++# But still forbid Java deserialization of this function
++# object. Use pickling or other support instead.
++with self.assertRaises(UnsupportedOperationException):
++roundtrip_serialization(g)
++
+ def test_builtin_names(self):
+ import __builtin__
+ names = [x for x in dir(__builtin__)]
+@@ -872,7 +890,7 @@ class SingleMethodInterfaceTest(unittest
+ future.get()
+ self.assertEqual(x, [42])
+
+-@unittest.skip("FIXME: not working")
++@unittest.skip("FIXME: not working; see http://bugs.jython.org/issue2115";)
+ def test_callable_object(self):
+ callable_obj = CallableObject()
+ future = self.executor.submit(callable_obj)
+diff --git a/Lib/test/test_new.py b/Lib/test/test_new.py
+--- a/Lib/test/test_new.py
b/Lib/test/test_new.py
+@@ -24,18 +24,10 @@ class NewTest(unittest.TestCase):
+ c = new.instance(C, {'yolks': 3})
+
+ o = new.instance(C)
+-
+-# __dict__ is a non dict mapping in Jython
+-if test_support.is_jython:
+-self.assertEqual(len(o.__dict__), 0, "new __dict__ should be
empty")
+-else:
+-self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
++self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
+ del o
+ o = new.instance(C, None)
+-if test_support.is_jython:
+-self.assertEqual(len(o.__dict__), 0, "new __dict__ should be
empty")
+-else:
+-self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
++self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
+ del o
+
+ def break_yolks(self):
+@@ -109,7 +101,14 @@ class NewTest(unittest.TestCase):
+ test_closure(g, (1, 1), ValueError) # closure is wrong size
+ test_closure(f, g.func_closure, ValueError) #
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/files/, dev-java/jython/
commit: 69029b5305a7dd70a86e3121b9de5a8893888a4d
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Nov 27 23:01:30 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Nov 27 23:09:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69029b53
dev-java/jython: Bump guava SLOT, drop readline, EAPI bump
guava:20 is needed so that Java 7 can be dropped from Gentoo.
Support for GNU Readline was dropped from Jython in an earlier version
so the flag and its associated code is of no use now.
There is no need to fix the CLASSPATH in src/shell/jython as this
script is not installed or used at all. I have verified this by
grepping the installed result and deleting the script before building.
Package-Manager: portage-2.3.2
.../jython-2.5.2-distutils_scripts_location.patch | 4 +-
.../files/jython-2.5.2-respect_PYTHONPATH.patch| 4 +-
dev-java/jython/files/jython-2.7.0-build.xml.patch | 4 +-
dev-java/jython/jython-2.7.0-r1.ebuild | 151 +
4 files changed, 157 insertions(+), 6 deletions(-)
diff --git
a/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
b/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
index 150d463..fc9a95b 100644
--- a/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
+++ b/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
@@ -1,5 +1,5 @@
Lib/distutils/command/install.py
-+++ Lib/distutils/command/install.py
+--- a/Lib/distutils/command/install.py
b/Lib/distutils/command/install.py
@@ -70,7 +70,7 @@
'purelib': '$base/Lib/site-packages',
'platlib': '$base/Lib/site-packages',
diff --git a/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
b/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
index 8d028d0..e695122 100644
--- a/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
+++ b/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
@@ -1,5 +1,5 @@
src/org/python/core/PySystemState.java
-+++ src/org/python/core/PySystemState.java
+--- a/src/org/python/core/PySystemState.java
b/src/org/python/core/PySystemState.java
@@ -646,6 +646,12 @@
if (jythonpath != null) {
registry.setProperty("python.path", jythonpath);
diff --git a/dev-java/jython/files/jython-2.7.0-build.xml.patch
b/dev-java/jython/files/jython-2.7.0-build.xml.patch
index 4e27af7..1f0be61 100644
--- a/dev-java/jython/files/jython-2.7.0-build.xml.patch
+++ b/dev-java/jython/files/jython-2.7.0-build.xml.patch
@@ -1,5 +1,5 @@
build.xml.orig 2015-06-27 16:12:08.44200 +
-+++ build.xml 2015-06-27 16:12:15.68400 +
+--- a/build.xml.orig 2015-06-27 16:12:08.44200 +
b/build.xml2015-06-27 16:12:15.68400 +
@@ -448,7 +448,7 @@
diff --git a/dev-java/jython/jython-2.7.0-r1.ebuild
b/dev-java/jython/jython-2.7.0-r1.ebuild
new file mode 100644
index ..db0069c
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://www.jython.org";
+SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar";
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~amd64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="examples test"
+
+CP_DEPEND="dev-java/antlr:3
+ dev-java/netty-transport:0
+ =dev-java/asm-5.0.3: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
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 9a80f6b2646e84a1aaa278ecebb8ac69218c5bcb Author: Patrick Lauer gentoo org> AuthorDate: Sun Feb 14 16:59:14 2016 + Commit: Patrick Lauer gentoo org> CommitDate: Sun Feb 14 17:01:53 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a80f6b2 dev-java/jython: Remove unneeded useflag description from metadata.xml Package-Manager: portage-2.2.27 dev-java/jython/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml index 302dca3..6034fcc 100644 --- a/dev-java/jython/metadata.xml +++ b/dev-java/jython/metadata.xml @@ -7,7 +7,6 @@ Use GNU readline instead of jline -Add optional support for servlet-api jython
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/files/, dev-java/jython/
commit: 0096ee21291b5aa9fbba4c6636a2dd529957d42a
Author: Patrice Clement gentoo org>
AuthorDate: Sun Feb 7 19:48:09 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Feb 7 19:48:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0096ee21
dev-java/jython: Remove vulnerable versions. Fixes security bug 552452.
Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jython/Manifest | 3 -
.../files/2.1-assert-SimpleCompiler.py.patch | 11 --
dev-java/jython/files/2.1-assert.patch | 50 ---
dev-java/jython/files/jython-2.2.1-build.patch | 76 ---
dev-java/jython/files/jython-2.2.1-build.xml.patch | 92 -
dev-java/jython/files/jython-2.5.2-build.xml.patch | 27
.../jython-2.5.2-distutils_byte_compilation.patch | 85
.../jython-2.5.2-sax-parser-class-not-found.patch | 39 --
.../jython/files/jython-2.5.2-sax-parser-fix.patch | 94 -
.../python-2.5.5-distutils_byte_compilation.patch | 37 -
dev-java/jython/jython-2.2.1-r2.ebuild | 135 ---
dev-java/jython/jython-2.5.3-r3.ebuild | 149 -
12 files changed, 798 deletions(-)
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 98c97d0..a83f948 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,4 +1 @@
-DIST Python-2.2.3.tgz 6709556 SHA256
a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 SHA512
2e2c881f8819ed3d91b3e98e7087b23ced9715c80eb9e5fe4144cca5b82220e035d0f50ac4a098b3bbdca3c588f70b8021f68a5d52f653c013470579342943e4
WHIRLPOOL
dbef6f9f0545f4f4ddf6e4535b67bb936a2ef596f17a1ff6acca89755729420588d845bc291eed0d19b433b3eff017166c7d68a1a352a5612b00da2f8f0c20d7
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/files/2.1-assert-SimpleCompiler.py.patch
b/dev-java/jython/files/2.1-assert-SimpleCompiler.py.patch
deleted file mode 100644
index 55e1549..000
--- a/dev-java/jython/files/2.1-assert-SimpleCompiler.py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
jython-2.1/Tools/jythonc/SimpleCompiler.py.orig2006-09-08
13:21:29.0 -0600
-+++ jython-2.1/Tools/jythonc/SimpleCompiler.py 2006-09-08 13:22:15.0
-0600
-@@ -577,7 +577,7 @@
- args.append(message.asAny())
-
- return jast.If(self.frame.getglobal("__debug__").nonzero(),
-- jast.InvokeStatic("Py", "assert", args))
-+ jast.InvokeStatic("Py", "assert_", args))
-
- def return_stmt(self, value=None):
- if value is None:
diff --git a/dev-java/jython/files/2.1-assert.patch
b/dev-java/jython/files/2.1-assert.patch
deleted file mode 100644
index 1f06848..000
--- a/dev-java/jython/files/2.1-assert.patch
+++ /dev/null
@@ -1,50 +0,0 @@
jython-2.1/com/ziclix/python/sql/pipe/Pipe.java.orig 2006-07-29
21:31:34.0 +0200
-+++ jython-2.1/com/ziclix/python/sql/pipe/Pipe.java2006-07-29
21:31:41.0 +0200
-@@ -93,7 +93,7 @@
-
new Integer(sinkRunner.getCount()) };
- String msg = zxJDBC.getString("inconsistentRowCount",
counts);
-
-- Py.assert(Py.Zero, Py.newString(msg));
-+ Py.assert_(Py.Zero, Py.newString(msg));
- }
-
- return Py.newInteger(sinkRunner.getCount());
jython-2.1/org/python/compiler/CodeCompiler.java.orig 2006-07-29
21:28:47.0 +0200
-+++ jython-2.1/org/python/compiler/CodeCompiler.java 2006-07-29
21:30:13.0 +0200
-@@ -817,14 +817,14 @@
- node.getChild(1).visit(this);
- if (mrefs.assert2 =
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 7329034a0ef1720ddbf488ad0515e0c12ee1099b
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Jan 16 14:49:16 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Jan 16 14:49:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7329034a
dev-java/jython: Stable on ppc64 in accordance with ALLARCHES policy
Sorry for breaking the tree!
Package-Manager: portage-2.2.26
dev-java/jython/jython-2.2.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jython/jython-2.2.1-r2.ebuild
b/dev-java/jython/jython-2.2.1-r2.ebuild
index 0232e3e..338dd9a 100644
--- a/dev-java/jython/jython-2.2.1-r2.ebuild
+++ b/dev-java/jython/jython-2.2.1-r2.ebuild
@@ -19,7 +19,7 @@ mirror://sourceforge/${PN}/${PN}_${MY_PV}.jar"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc64 x86"
IUSE=""
CDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 1af42232fd5356aa4a398771d91be9a9434d24fc
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Jan 16 14:19:55 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Jan 16 14:19:55 2016 +
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..000
--- 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" \
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 2760c354e8b63484471582fb7aa443e83c145ba7
Author: Michał Górny gentoo org>
AuthorDate: Thu Nov 12 15:06:45 2015 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Nov 12 16:03:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2760c354
dev-java/jython: Fix epython.py module first install
dev-java/jython/jython-2.5.3-r3.ebuild | 4 ++--
dev-java/jython/jython-2.7.0.ebuild| 9 ++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dev-java/jython/jython-2.5.3-r3.ebuild
b/dev-java/jython/jython-2.5.3-r3.ebuild
index f35e893..e455cff 100644
--- a/dev-java/jython/jython-2.5.3-r3.ebuild
+++ b/dev-java/jython/jython-2.5.3-r3.ebuild
@@ -135,8 +135,8 @@ exec java -cp "$(java-pkg_getjars
"${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLAS
_EOF_
chmod +x "${T}"/jython || die
+ local -x PYTHON="${T}"/jython
python_export jython${SLOT} EPYTHON PYTHON_SITEDIR
- local PYTHON="${T}"/jython
# compile tests (everything else is compiled already)
# we're keeping it quiet since jython reports errors verbosely
@@ -144,6 +144,6 @@ _EOF_
python_optimize "${ED}"/usr/share/jython-${SLOT}/Lib/test &>/dev/null
# for python-exec
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-java/jython/jython-2.7.0.ebuild
b/dev-java/jython/jython-2.7.0.ebuild
index f46891f..4d60a40 100644
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ b/dev-java/jython/jython-2.7.0.ebuild
@@ -156,8 +156,11 @@ src_install() {
EOF
chmod +x "${T}"/jython || die
- python_export jython${SLOT} EPYTHON PYTHON_SITEDIR
- local PYTHON="${T}"/jython
+ 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
@@ -165,7 +168,7 @@ src_install() {
python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
# for python-exec
- echo "EPYTHON='${EPYTHON}'" > epython.py
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
# some of the class files end up with newer timestamps than the files
they
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 3d0958a5f4adea51e4bc849a6af79b40c2974abf
Author: Patrice Clement gentoo org>
AuthorDate: Mon Sep 7 13:43:37 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Sep 7 13:53:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0958a5
dev-java/jython: Reset requierement lowering to 1.7.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jython/jython-2.7.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/jython/jython-2.7.0.ebuild
b/dev-java/jython/jython-2.7.0.ebuild
index fdf4a09..f46891f 100644
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ b/dev-java/jython/jython-2.7.0.ebuild
@@ -39,9 +39,9 @@ CDEPEND="dev-java/ant-core:0
java-virtuals/servlet-api:3.0
readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
+ >=virtual/jre-1.7"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
+ >=virtual/jdk-1.7
app-arch/unzip
test? (
dev-java/junit:4
[gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
commit: 7cd6b42d9d7f94807685eff4a8deb03a08765d42
Author: Patrice Clement gentoo org>
AuthorDate: Wed Sep 2 21:44:03 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Sep 2 21:57:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd6b42d
dev-java/jython: Lower {jre,jdk} requirements to 1.6.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jython/jython-2.7.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/jython/jython-2.7.0.ebuild
b/dev-java/jython/jython-2.7.0.ebuild
index f46891f..fdf4a09 100644
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ b/dev-java/jython/jython-2.7.0.ebuild
@@ -39,9 +39,9 @@ CDEPEND="dev-java/ant-core:0
java-virtuals/servlet-api:3.0
readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
RDEPEND="${CDEPEND}
- >=virtual/jre-1.7"
+ >=virtual/jre-1.6"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.7
+ >=virtual/jdk-1.6
app-arch/unzip
test? (
dev-java/junit:4
