* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2015-09-02 21:57 Patrice Clement
0 siblings, 0 replies; 36+ messages in thread
From: Patrice Clement @ 2015-09-02 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 7cd6b42d9d7f94807685eff4a8deb03a08765d42
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 2 21:44:03 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 21:57:26 2015 +0000
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 <monsieurp <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2015-09-07 13:54 Patrice Clement
0 siblings, 0 replies; 36+ messages in thread
From: Patrice Clement @ 2015-09-07 13:54 UTC (permalink / raw
To: gentoo-commits
commit: 3d0958a5f4adea51e4bc849a6af79b40c2974abf
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 13:43:37 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 13:53:35 2015 +0000
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 <monsieurp <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2015-11-12 16:03 Michał Górny
0 siblings, 0 replies; 36+ messages in thread
From: Michał Górny @ 2015-11-12 16:03 UTC (permalink / raw
To: gentoo-commits
commit: 2760c354e8b63484471582fb7aa443e83c145ba7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 15:06:45 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 16:03:16 2015 +0000
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2016-01-16 14:20 James Le Cuirot
0 siblings, 0 replies; 36+ messages in thread
From: James Le Cuirot @ 2016-01-16 14:20 UTC (permalink / raw
To: gentoo-commits
commit: 1af42232fd5356aa4a398771d91be9a9434d24fc
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 14:19:55 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 14:19:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1af42232
dev-java/jython: Remove old
Package-Manager: portage-2.2.26
dev-java/jython/Manifest | 1 -
dev-java/jython/jython-2.1-r11.ebuild | 109 --------------------------
dev-java/jython/jython-2.2.1-r1.ebuild | 138 ---------------------------------
3 files changed, 248 deletions(-)
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index a03255d..98c97d0 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,5 +1,4 @@
DIST Python-2.2.3.tgz 6709556 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 SHA512 2e2c881f8819ed3d91b3e98e7087b23ced9715c80eb9e5fe4144cca5b82220e035d0f50ac4a098b3bbdca3c588f70b8021f68a5d52f653c013470579342943e4 WHIRLPOOL dbef6f9f0545f4f4ddf6e4535b67bb936a2ef596f17a1ff6acca89755729420588d845bc291eed0d19b433b3eff017166c7d68a1a352a5612b00da2f8f0c20d7
-DIST jython-2.1.tar.bz2 1301528 SHA256 faa57a55d137268e80221cd628b234ca67de13504b813be1c0499c9f4d5872b2 SHA512 397ad2819eb5bb39e1b0c0673922af7fbb75f680d707a7c344d21f680901a6fd96eddbbed8b464fb91cccd6f38a9f9b1a8f8327a530ac870002b72c38bf75ad3 WHIRLPOOL 00a1e7376b1883fc835dc801d718041a623ab0406393135d452df613fbbb9a87ab6bf4429b07260e93530f04031e531d4e041bacf22491d7ec0db76a41d77061
DIST jython-2.7.0-sources.jar 15371691 SHA256 2b534595d4a08059ebb71b881c58ee830499bb6e9daba7c828a7f1f6c8943f7a SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6 WHIRLPOOL e0dbd289c522b41ef2d3f54b01a2f6d44de8755e2eeb7863c8b807d1b179839f20d925e102db324cf85cd82503cd03106b5287ffa7a322a3902d6f24e9cd2a41
DIST jython-installer-2.5.3.jar 18487200 SHA256 05405966cdfa57abc8e705dd6aab92b8240097ce709fb916c8a0dbcaa491f99e SHA512 92d00cc8d885806749c67d1dc820e7b402c807b9a40277073fc3ea1f3dd10e1e506dc241a342874db8109120e8f0031a8dc7a4db6a88dfdc6c89906eeb9d454d WHIRLPOOL e8e3adf741a35b5e4de6c67b8805582cabc8590afac28c2e4ae3b61c4bd38d41904d7d1e4a23de21e7870d628e33a52f540fc89780a4724403b0bd92e1159768
DIST jython_installer-2.2.1.jar 4663097 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68 SHA512 d33262dec95dbecfc007a738ed8d8cd4844c215e451b7ab126940f1157079aa846a104f3587ad84c4a009249632e3aaa3c83479ee8f47c30c4b4833bcdd582b3 WHIRLPOOL bae264f67547a975bf648b3de0cc2becb5d51e14b2ca1a977f7c3d45ec96bd3fd4fd99b0ff6912fb38d54d57656225c51c4b8a474c6ca8fe7fc16e12ab4bbec8
diff --git a/dev-java/jython/jython-2.1-r11.ebuild b/dev-java/jython/jython-2.1-r11.ebuild
deleted file mode 100644
index 0f0f221..0000000
--- a/dev-java/jython/jython-2.1-r11.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit base java-pkg-2
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-MY_PV="21"
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.class"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
-IUSE="readline source doc"
-# servlet
-
-CDEPEND="=dev-java/jakarta-oro-2.0*
- readline? ( >=dev-java/libreadline-java-0.8.0 )"
-# servlet? ( >=www-servers/tomcat-5.0 )
-RDEPEND=">=virtual/jre-1.4
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
- source? ( app-arch/zip )
- ${CDEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- epatch ${FILESDIR}/${PV}-assert.patch
- epatch ${FILESDIR}/${PV}-assert-SimpleCompiler.py.patch
-
- # bug #160861
- rm -rf org/apache
-}
-
-src_compile() {
- local cp="$(java-pkg_getjars jakarta-oro-2.0)"
- local exclude=""
-
- if use readline ; then
- cp=${cp}:$(java-pkg_getjars libreadline-java)
- else
- exclude="${exclude} ! -name ReadlineConsole.java"
- fi
-
- #if use servlet; then
- # cp=${cp}:$(java-pkg_getjars servlet)
- #else
- exclude="${exclude} ! -name PyServlet.java"
- #fi
-
- ejavac -classpath ${cp} -nowarn $(find org -name "*.java" ${exclude})
-
- find org -name "*.class" | xargs jar cf ${PN}.jar
-
- # bug 115551
- cd Lib/jxxload_help
- ejavac -classpath ${S}/${PN}.jar -nowarn *.java
- rm -f *.java Makefile
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- dodoc README.txt NEWS ACKNOWLEDGMENTS
- use doc && java-pkg_dohtml -A .css .jpg .gif -r Doc/*
-
- java-pkg_dolauncher jythonc \
- --main "org.python.util.jython" \
- --java_args "-Dpython.home=/usr/share/jython" \
- --pkg_args "/usr/share/jython/tools/jythonc/jythonc.py"
-
- java-pkg_dolauncher jython \
- --main "org.python.util.jython" \
- --java_args "-Dpython.home=/usr/share/jython"
-
- dodir /usr/share/jython/cachedir
- chmod a+rw ${D}/usr/share/jython/cachedir
-
- rm Demo/jreload/example.jar
- insinto /usr/share/${PN}
- doins -r Lib Demo registry
-
- insinto /usr/share/${PN}/tools
- doins -r Tools/*
-
- use source && java-pkg_dosrc com org
-}
-
-pkg_postinst() {
- if use readline; then
- elog "To use readline you need to add the following to your registry"
- elog
- elog "python.console=org.python.util.ReadlineConsole"
- elog "python.console.readlinelib=GnuReadline"
- elog
- elog "The global registry can be found in /usr/share/${PN}/registry"
- elog "User registry in \$HOME/.jython"
- elog "See http://www.jython.org/docs/registry.html for more information"
- elog ""
- fi
-
- elog "This revision renames org.python.core.Py.assert to assert_."
- elog "This is the solution that upstream will use in the next release."
- elog "Just note that this revision is not API compatible with vanilla 2.1."
- elog "https://bugs.gentoo.org/show_bug.cgi?id=142099"
-}
diff --git a/dev-java/jython/jython-2.2.1-r1.ebuild b/dev-java/jython/jython-2.2.1-r1.ebuild
deleted file mode 100644
index 95743ea..0000000
--- a/dev-java/jython/jython-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-
-JAVA_PKG_IUSE="readline source doc servletapi mysql postgres examples oracle"
-#jdnc
-
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-
-MY_PV="installer-2.2.1"
-PYVER="2.2.3"
-
-SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
-mirror://sourceforge/${PN}/${PN}_${MY_PV}.jar"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="=dev-java/jakarta-oro-2.0*
- readline? ( >=dev-java/libreadline-java-0.8.0 )
- mysql? ( >=dev-java/jdbc-mysql-3.1 )
- postgres? ( dev-java/jdbc-postgresql )
- oracle? ( dev-java/jdbc-oracle-bin:10.2 )
- servletapi? ( java-virtuals/servlet-api:2.5 )
- !<=dev-java/freemarker-2.3.10"
-RDEPEND=">=virtual/jre-1.4
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
- dev-java/javacc
- ${CDEPEND}"
-
-S="${WORKDIR}"
-
-#Tests currently very broken. Need to investigate whether that
-#is jython's or gentoo's doing.
-RESTRICT="test"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-build.patch"
-
- rm -Rfv org || die "Unable to remove class files."
- find . -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
-
- echo javacc.jar="$(java-pkg_getjars --build-only javacc)" > ant.properties
-
- if use readline; then
- echo "readline.jar=$(java-pkg_getjars libreadline-java)" >> \
- ant.properties
- fi
- if use servletapi; then
- echo "servlet.jar=$(java-pkg_getjar --virtual servlet-api-2.5 servlet-api.jar)" \
- >> ant.properties
- fi
- if use mysql; then
- echo "mysql.jar=$(java-pkg_getjar jdbc-mysql jdbc-mysql.jar)" \
- >> ant.properties
- fi
-
- if use postgres; then
- echo \
- "postgresql.jar=$(java-pkg_getjar jdbc-postgresql jdbc-postgresql.jar)"\
- >> ant.properties
- fi
-
- if use oracle; then
- echo \
- "oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \
- >> ant.properties
- fi
-}
-
-src_compile() {
- local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
- local pylib="Python-${PYVER}/Lib"
- antflags="${antflags} -Dpython.lib=${pylib} -Dsvn.checkout.dir=."
- LC_ALL=C eant ${antflags} developer-build $(use_doc javadoc)
-}
-
-src_test() {
- local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
- antflags="${antflags} -Dpython.home=dist"
- local pylib="Python-${PYVER}/Lib"
- antflags="${antflags} -Dpython.lib=${pylib}"
- eant ${antflags} bugtest
-}
-
-src_install() {
- java-pkg_dojar "dist/${PN}.jar"
-
- dodoc README.txt NEWS ACKNOWLEDGMENTS
- use doc && dohtml -A .css .jpg .gif -r Doc/*
-
- local java_args="-Dpython.home=/usr/share/jython"
- java_args="${java_args} -Dpython.cachedir=\${HOME}/.jythoncachedir"
-
- java-pkg_dolauncher jythonc \
- --main "org.python.util.jython" \
- --java_args "${java_args}" \
- --pkg_args "${java_args} /usr/share/jython/tools/jythonc/jythonc.py"
-
- java-pkg_dolauncher jython \
- --main "org.python.util.jython" \
- --pkg_args "${java_args}"
-
- insinto /usr/share/${PN}
- doins -r dist/Lib registry
-
- insinto /usr/share/${PN}/tools
- doins -r dist/Tools/*
-
- use doc && java-pkg_dojavadoc dist/Doc/javadoc
- use source && java-pkg_dosrc src
- use examples && java-pkg_doexamples dist/Demo/*
-}
-
-pkg_postinst() {
- if use readline; then
- elog "To use readline you need to add the following to your registry"
- elog
- elog "python.console=org.python.util.ReadlineConsole"
- elog "python.console.readlinelib=GnuReadline"
- elog
- elog "The global registry can be found in /usr/share/${PN}/registry"
- elog "User registry in \$HOME/.jython"
- elog "See http://www.jython.org/docs/registry.html for more information"
- elog ""
- fi
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2016-01-16 14:50 James Le Cuirot
0 siblings, 0 replies; 36+ messages in thread
From: James Le Cuirot @ 2016-01-16 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 7329034a0ef1720ddbf488ad0515e0c12ee1099b
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 14:49:16 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 14:49:54 2016 +0000
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="
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2016-02-14 17:02 Patrick Lauer
0 siblings, 0 replies; 36+ messages in thread
From: Patrick Lauer @ 2016-02-14 17:02 UTC (permalink / raw
To: gentoo-commits
commit: 9a80f6b2646e84a1aaa278ecebb8ac69218c5bcb
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 16:59:14 2016 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 17:01:53 2016 +0000
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 @@
</maintainer>
<use>
<flag name="readline">Use GNU readline instead of jline</flag>
- <flag name="servletapi">Add optional support for servlet-api</flag>
</use>
<upstream>
<remote-id type="sourceforge">jython</remote-id>
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2017-10-03 0:42 Thomas Deutschmann
0 siblings, 0 replies; 36+ messages in thread
From: Thomas Deutschmann @ 2017-10-03 0:42 UTC (permalink / raw
To: gentoo-commits
commit: bff8b9e0e9b9162593a6429ace5f3209b35afefc
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 3 00:33:51 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 3 00:33:51 2017 +0000
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2017-10-25 9:31 Agostino Sarubbo
0 siblings, 0 replies; 36+ messages in thread
From: Agostino Sarubbo @ 2017-10-25 9:31 UTC (permalink / raw
To: gentoo-commits
commit: 8bb707c615b05a3d58fcd2b65fe070e536af042a
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 25 09:30:13 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 09:30:13 2017 +0000
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 <ago <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2017-10-27 18:27 Patrice Clement
0 siblings, 0 replies; 36+ messages in thread
From: Patrice Clement @ 2017-10-27 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 9e509506285cd9c23476eb409931bd752f21fbb0
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 17:26:17 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 18:27:41 2017 +0000
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..00000000000
--- 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.executable="${EPREFIX}"/usr/bin/jython${SLOT}
- -Dpython.cachedir="\${HOME}/.jythoncachedir"
- )
-
- java-pkg_dolauncher jython${SLOT} \
- --main org.python.util.jython \
- --java_args "${java_args[*]}"
-
- if use readline; then
- sed \
- -e "s/#\(python.console=org.python.util.ReadlineConsole\)/\1/" \
- -e "/#python.console.readlinelib=JavaReadline/a python.console.readlinelib=GnuReadline" \
- -i "${ED}"/usr/share/${PN}-${SLOT}/registry || die
- fi
-
- # we need a wrapper to help python_optimize
- cat <<-EOF > "${T}"/jython
- exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
- -Dpython.home="${ED}${instdir}" \
- -Dpython.cachedir="${T}/.jythoncachedir" \
- -Duser.home="${T}" \
- org.python.util.jython "\${@}"
- EOF
- chmod +x "${T}"/jython || die
-
- local -x PYTHON="${T}"/jython
- # we can't get the path from the interpreter since it does some
- # magic that fails on non-installed copy...
- local PYTHON_SITEDIR=${EPREFIX}/usr/share/jython-${SLOT}/Lib/site-packages
- python_export jython${SLOT} EPYTHON
-
- # compile tests (everything else is compiled already)
- # we're keeping it quiet since jython reports errors verbosely
- # and some of the tests are supposed to trigger compile errors
- python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
- # for python-exec
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_domodule epython.py
-
- # some of the class files end up with newer timestamps than the files they
- # were generated from, make sure this doesn't happen
- find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
-
-pkg_postinst() {
- if ! has_version dev-java/jython ; then
- elog
- elog "readline can be configured in the registry:"
- elog
- elog "python.console=org.python.util.ReadlineConsole"
- elog "python.console.readlinelib=GnuReadline"
- elog
- elog "Global registry: '${EROOT}usr/share/${PN}-${SLOT}/registry'"
- elog "User registry: '~/.jython'"
- elog "See http://www.jython.org/docs/registry.html for more information."
- elog
- fi
-}
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
index 6034fcc96aa..d20250bf86a 100644
--- a/dev-java/jython/metadata.xml
+++ b/dev-java/jython/metadata.xml
@@ -5,9 +5,6 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
- <use>
- <flag name="readline">Use GNU readline instead of jline</flag>
- </use>
<upstream>
<remote-id type="sourceforge">jython</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2020-05-17 16:55 Aaron Bauman
0 siblings, 0 replies; 36+ messages in thread
From: Aaron Bauman @ 2020-05-17 16:55 UTC (permalink / raw
To: gentoo-commits
commit: 2fafd3a1b8f74ddf7784dc502ce87405db9201d6
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Fri May 8 14:22:43 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 17 16:55:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fafd3a1
dev-java/jython: update homepage
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov <sokolov <AT> google.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
dev-java/jython/jython-2.7.0-r2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild b/dev-java/jython/jython-2.7.0-r2.ebuild
index d8fb023be8a..6a11902e67b 100644
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,8 +10,8 @@ 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"
+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"
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2021-10-19 0:15 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2021-10-19 0:15 UTC (permalink / raw
To: gentoo-commits
commit: b8c66b21d6e7cac6116c4005061bef3f1948b9ef
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 19 00:14:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 19 00:14:13 2021 +0000
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 <sam <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2021-11-13 10:24 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2021-11-13 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 2d565de9ee70694ab90d0adba26c937a5a08a997
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon May 3 23:01:40 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 13 10:24:35 2021 +0000
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 <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/22895
Signed-off-by: Sam James <sam <AT> 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 00000000000..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="${T}" \
+ org.python.util.jython "\${@}"
+ EOF
+ chmod +x "${T}"/jython || die
+
+ local -x PYTHON="${T}"/jython
+ # we can't get the path from the interpreter since it does some
+ # magic that fails on non-installed copy...
+ _python_export jython${SLOT} EPYTHON
+
+ # compile tests (everything else is compiled already)
+ # we're keeping it quiet since jython reports errors verbosely
+ # and some of the tests are supposed to trigger compile errors
+ python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
+
+ # for python-exec
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
+ python_domodule epython.py
+
+ # some of the class files end up with newer timestamps than the files they
+ # were generated from, make sure this doesn't happen
+ find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2021-11-13 10:25 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2021-11-13 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 16a412d246d87b56a8dbec6ad6be1b020de37c37
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 13 10:25:00 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 13 10:25:00 2021 +0000
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 <sam <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2021-11-19 7:24 Arthur Zamarin
0 siblings, 0 replies; 36+ messages in thread
From: Arthur Zamarin @ 2021-11-19 7:24 UTC (permalink / raw
To: gentoo-commits
commit: ee3641d3eacd2c691a307b970ffeeb4d087f2b70
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 07:23:43 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 07:24:20 2021 +0000
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 <arthurzam <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2021-11-21 16:31 Miroslav Šulc
0 siblings, 0 replies; 36+ messages in thread
From: Miroslav Šulc @ 2021-11-21 16:31 UTC (permalink / raw
To: gentoo-commits
commit: 756755f4c2d6092298371f3a3ef3b759606e949c
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Nov 20 23:12:45 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 16:31:31 2021 +0000
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 <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20661
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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 000000000000..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
+ chmod +x "${T}"/jython || die
+
+ local -x PYTHON="${T}"/jython
+ # we can't get the path from the interpreter since it does some
+ # magic that fails on non-installed copy...
+ _python_export jython${SLOT} EPYTHON
+
+ # compile tests (everything else is compiled already)
+ # we're keeping it quiet since jython reports errors verbosely
+ # and some of the tests are supposed to trigger compile errors
+ python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
+
+ # for python-exec
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
+ python_domodule epython.py
+
+ # some of the class files end up with newer timestamps than the files they
+ # were generated from, make sure this doesn't happen
+ find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2021-11-21 17:01 Miroslav Šulc
0 siblings, 0 replies; 36+ messages in thread
From: Miroslav Šulc @ 2021-11-21 17:01 UTC (permalink / raw
To: gentoo-commits
commit: b65cc982eadc19bcacbb5aa0932dc8a6c1399e68
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 17:00:52 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 17:01:00 2021 +0000
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 <fordfrog <AT> 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..000000000000
--- 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 get the path from the interpreter since it does some
- # magic that fails on non-installed copy...
- _python_export jython${SLOT} EPYTHON
-
- # compile tests (everything else is compiled already)
- # we're keeping it quiet since jython reports errors verbosely
- # and some of the tests are supposed to trigger compile errors
- python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
- # for python-exec
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
- python_domodule epython.py
-
- # some of the class files end up with newer timestamps than the files they
- # were generated from, make sure this doesn't happen
- find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2021-11-25 4:14 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2021-11-25 4:14 UTC (permalink / raw
To: gentoo-commits
commit: 424e78e25f2ba9a1200598c3a8db74d9d88d9053
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 04:13:44 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 25 04:13:44 2021 +0000
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 <sam <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2021-12-31 9:55 Arthur Zamarin
0 siblings, 0 replies; 36+ messages in thread
From: Arthur Zamarin @ 2021-12-31 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 56a02f9f29dab5da048b684869f54db1af7b5faf
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 09:55:26 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 31 09:55:26 2021 +0000
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 <arthurzam <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-01-02 0:04 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2022-01-02 0:04 UTC (permalink / raw
To: gentoo-commits
commit: 3dff3cb6e6b058a3e26117a75e12ac3051d03e6f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 2 00:02:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 2 00:02:41 2022 +0000
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 <sam <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-01-02 10:54 Jakov Smolić
0 siblings, 0 replies; 36+ messages in thread
From: Jakov Smolić @ 2022-01-02 10:54 UTC (permalink / raw
To: gentoo-commits
commit: bd7d8759355689bf2a5053479c05536b726d91b1
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 2 10:52:17 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Jan 2 10:53:59 2022 +0000
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ć <jsmolic <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-01-02 10:56 Miroslav Šulc
0 siblings, 0 replies; 36+ messages in thread
From: Miroslav Šulc @ 2022-01-02 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 91f6dde18f1f416164bfc8bb0a503399061789ff
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 2 10:56:14 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jan 2 10:56:20 2022 +0000
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 <fordfrog <AT> 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..000000000000
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="https://www.jython.org"
-SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
- dev-java/netty-transport:0
- >=dev-java/asm-5:4
- dev-java/commons-compress:0
- dev-java/guava:20
- dev-java/jffi:1.2
- dev-java/jline:2
- dev-java/icu4j:52
- dev-java/jnr-constants:0
- dev-java/jnr-posix:3.0
- dev-java/jnr-netdb:1.0
- dev-java/stringtemplate:0
- dev-java/xerces:2
- java-virtuals/script-api:0
- java-virtuals/servlet-api:3.0"
-RDEPEND="${CP_DEPEND}
- >=virtual/jre-1.7"
-DEPEND="${CP_DEPEND}
- >=virtual/jdk-1.7
- app-arch/unzip
- dev-java/ant-core:0
- test? (
- dev-java/junit:4
- dev-java/ant-junit:0
- )"
-
-S=${WORKDIR}
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" java"
-
-EANT_BUILD_TARGET="developer-build"
-EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
-
-# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
-# Uncomment and add to CDEPEND if you want either of them
-#EANT_GENTOO_CLASSPATH+=",jdbc-informix" EANT_EXTRA_ARGS+=" -Dinformix.present"
-#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
- "${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
- "${FILESDIR}"/${PN}-2.7_beta1-ant.patch
- "${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
- "${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
- "${FILESDIR}"/${PN}-2.7.0-build.xml.patch
- "${FILESDIR}"/CVE-2016-4000.patch
-)
-
-src_prepare() {
- default
-
- find \( -name '*.jar' -o -name '*.class' \
- -o -name '*.pyc' -o -name '*.exe' \) -delete
-
- # needed for launchertest
- chmod +x tests/shell/test-jython.sh || die
-
- java-pkg-2_src_prepare
-}
-
-src_configure() {
- # apparently this can cause problems
- append-flags -fno-stack-protector
-
- EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local instdir=/usr/share/${PN}-${SLOT}
-
- java-pkg_newjar dist/${PN}-dev.jar
-
- java-pkg_register-optional-dependency jdbc-mysql
- java-pkg_register-optional-dependency jdbc-postgresql
-
- insinto ${instdir}
- doins -r dist/{Lib,registry}
-
- dodoc ACKNOWLEDGMENTS NEWS README.txt
-
- use doc && java-pkg_dohtml -r dist/Doc/javadoc
- use source && java-pkg_dosrc src/*
- use examples && java-pkg_doexamples Demo/*
-
- local java_args=(
- -Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
- -Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
- -Dpython.cachedir="\${HOME}/.jythoncachedir"
- )
-
- java-pkg_dolauncher jython${SLOT} \
- --main org.python.util.jython \
- --java_args "${java_args[*]}"
-
- # we need a wrapper to help python_optimize
- cat <<-EOF > "${T}"/jython
- exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
- -Dpython.home="${ED}${instdir}" \
- -Dpython.cachedir="${T}/.jythoncachedir" \
- -Duser.home="${T}" \
- org.python.util.jython "\${@}"
- EOF
- chmod +x "${T}"/jython || die
-
- local -x PYTHON="${T}"/jython
- # we can't get the path from the interpreter since it does some
- # magic that fails on non-installed copy...
- local PYTHON_SITEDIR=${EPREFIX}/usr/share/jython-${SLOT}/Lib/site-packages
- python_export jython${SLOT} EPYTHON
-
- # compile tests (everything else is compiled already)
- # we're keeping it quiet since jython reports errors verbosely
- # and some of the tests are supposed to trigger compile errors
- python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
- # for python-exec
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_domodule epython.py
-
- # some of the class files end up with newer timestamps than the files they
- # were generated from, make sure this doesn't happen
- find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-01-10 19:10 Arthur Zamarin
0 siblings, 0 replies; 36+ messages in thread
From: Arthur Zamarin @ 2022-01-10 19:10 UTC (permalink / raw
To: gentoo-commits
commit: a27fdc5ac9443f34785a9595d3e3e25fb80eab84
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 10 19:10:26 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 19:10:26 2022 +0000
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 <arthurzam <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-01-14 8:43 Miroslav Šulc
0 siblings, 0 replies; 36+ messages in thread
From: Miroslav Šulc @ 2022-01-14 8:43 UTC (permalink / raw
To: gentoo-commits
commit: 98940f05495405e989d7affd6f89c107a0eaaded
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jan 12 10:29:19 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 08:43:35 2022 +0000
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 <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-01-28 8:58 Miroslav Šulc
0 siblings, 0 replies; 36+ messages in thread
From: Miroslav Šulc @ 2022-01-28 8:58 UTC (permalink / raw
To: gentoo-commits
commit: 7505a7e99cc27f34535d6933966e532f491aaa46
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Jan 27 13:30:46 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 08:58:52 2022 +0000
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 <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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:*"
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-04-23 12:00 Florian Schmaus
0 siblings, 0 replies; 36+ messages in thread
From: Florian Schmaus @ 2022-04-23 12:00 UTC (permalink / raw
To: gentoo-commits
commit: 4d035ea5cb1154add0ee4675dc1e76aa21514f2a
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr 23 08:08:26 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 12:00:37 2022 +0000
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 <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25165
Signed-off-by: Florian Schmaus <flow <AT> 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 000000000000..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}"/jython || die
+
+ local -x PYTHON="${T}"/jython
+ # we can't get the path from the interpreter since it does some
+ # magic that fails on non-installed copy...
+ _python_export jython${SLOT} EPYTHON
+
+ # compile tests (everything else is compiled already)
+ # we're keeping it quiet since jython reports errors verbosely
+ # and some of the tests are supposed to trigger compile errors
+ python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
+
+ # for python-exec
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
+ python_domodule epython.py
+
+ # some of the class files end up with newer timestamps than the files they
+ # were generated from, make sure this doesn't happen
+ find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-04-29 8:46 Florian Schmaus
0 siblings, 0 replies; 36+ messages in thread
From: Florian Schmaus @ 2022-04-29 8:46 UTC (permalink / raw
To: gentoo-commits
commit: 0bca1def40c7da7411b990da428e1ca81f30397a
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Apr 28 08:15:04 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 08:46:41 2022 +0000
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 <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> 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 000000000000..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}" \
+ -Dpython.cachedir="${T}/.jythoncachedir" \
+ -Duser.home="${T}" \
+ org.python.util.jython "\${@}"
+ EOF
+ chmod +x "${T}"/jython || die
+
+ local -x PYTHON="${T}"/jython
+ # we can't get the path from the interpreter since it does some
+ # magic that fails on non-installed copy...
+ _python_export jython${SLOT} EPYTHON
+
+ # compile tests (everything else is compiled already)
+ # we're keeping it quiet since jython reports errors verbosely
+ # and some of the tests are supposed to trigger compile errors
+ python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
+
+ # for python-exec
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
+ python_domodule epython.py
+
+ # some of the class files end up with newer timestamps than the files they
+ # were generated from, make sure this doesn't happen
+ find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-04-29 8:46 Florian Schmaus
0 siblings, 0 replies; 36+ messages in thread
From: Florian Schmaus @ 2022-04-29 8:46 UTC (permalink / raw
To: gentoo-commits
commit: f68880d59c4e876227df2f8bb326140a58a428fb
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Apr 28 09:30:33 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 08:46:42 2022 +0000
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 <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25235
Signed-off-by: Florian Schmaus <flow <AT> 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..000000000000
--- 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
-
- 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...
- _python_export jython${SLOT} EPYTHON
-
- # compile tests (everything else is compiled already)
- # we're keeping it quiet since jython reports errors verbosely
- # and some of the tests are supposed to trigger compile errors
- python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
- # for python-exec
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
- python_domodule epython.py
-
- # some of the class files end up with newer timestamps than the files they
- # were generated from, make sure this doesn't happen
- find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-04-29 19:21 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2022-04-29 19:21 UTC (permalink / raw
To: gentoo-commits
commit: 41d162a19fe2eb76a096c0c0614e1c745d5366b5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 19:19:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 19:19:52 2022 +0000
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 <sam <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-06-16 15:15 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2022-06-16 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 3c4bdb9722bd5c95b717fb70c7ba478e563004fd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 15:13:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 15:13:28 2022 +0000
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 <sam <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-06-16 15:15 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2022-06-16 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 990408313b9457bea7a7f0052d27f16124327e03
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 15:14:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 15:14:37 2022 +0000
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 <sam <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-06-17 12:45 Arthur Zamarin
0 siblings, 0 replies; 36+ messages in thread
From: Arthur Zamarin @ 2022-06-17 12:45 UTC (permalink / raw
To: gentoo-commits
commit: c2a7918f8205f5560c16b65588186d4e5901d2d9
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 12:45:08 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 12:45:08 2022 +0000
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 <arthurzam <AT> 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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-06-17 13:50 Arthur Zamarin
0 siblings, 0 replies; 36+ messages in thread
From: Arthur Zamarin @ 2022-06-17 13:50 UTC (permalink / raw
To: gentoo-commits
commit: e549bfc78a4923be98e671cad3a345e3087beb53
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Jun 17 11:40:35 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 13:50:13 2022 +0000
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 <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> 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..000000000000
--- 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
-
- 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...
- _python_export jython${SLOT} EPYTHON
-
- # compile tests (everything else is compiled already)
- # we're keeping it quiet since jython reports errors verbosely
- # and some of the tests are supposed to trigger compile errors
- python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
- # for python-exec
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
- python_domodule epython.py
-
- # some of the class files end up with newer timestamps than the files they
- # were generated from, make sure this doesn't happen
- find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-08-26 12:36 Florian Schmaus
0 siblings, 0 replies; 36+ messages in thread
From: Florian Schmaus @ 2022-08-26 12:36 UTC (permalink / raw
To: gentoo-commits
commit: 9e60213f5c0880c167d9d035248365b30d6bad30
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Aug 24 09:57:04 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 12:36:33 2022 +0000
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 <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/26998
Signed-off-by: Florian Schmaus <flow <AT> 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 000000000000..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}${instdir}" \
+ -Dpython.cachedir="${T}/.jythoncachedir" \
+ -Duser.home="${T}" \
+ org.python.util.jython "\${@}"
+ EOF
+ chmod +x "${T}"/jython || die
+
+ local -x PYTHON="${T}"/jython
+ # we can't get the path from the interpreter since it does some
+ # magic that fails on non-installed copy...
+ _python_export jython${SLOT} EPYTHON
+
+ # compile tests (everything else is compiled already)
+ # we're keeping it quiet since jython reports errors verbosely
+ # and some of the tests are supposed to trigger compile errors
+ python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
+
+ # for python-exec
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
+ python_domodule epython.py
+
+ # some of the class files end up with newer timestamps than the files they
+ # were generated from, make sure this doesn't happen
+ find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-08-26 12:58 Florian Schmaus
0 siblings, 0 replies; 36+ messages in thread
From: Florian Schmaus @ 2022-08-26 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 29a0776d522dae4c492a8eca94c7a4864bb10c98
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 12:56:28 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 12:58:15 2022 +0000
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 <flow <AT> 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..000000000000
--- 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 need a wrapper to help python_optimize
- cat <<-EOF > "${T}"/jython
- exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
- -Dpython.home="${ED}${instdir}" \
- -Dpython.cachedir="${T}/.jythoncachedir" \
- -Duser.home="${T}" \
- org.python.util.jython "\${@}"
- EOF
- chmod +x "${T}"/jython || die
-
- local -x PYTHON="${T}"/jython
- # we can't get the path from the interpreter since it does some
- # magic that fails on non-installed copy...
- _python_export jython${SLOT} EPYTHON
-
- # compile tests (everything else is compiled already)
- # we're keeping it quiet since jython reports errors verbosely
- # and some of the tests are supposed to trigger compile errors
- python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
- # for python-exec
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
- python_domodule epython.py
-
- # some of the class files end up with newer timestamps than the files they
- # were generated from, make sure this doesn't happen
- find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-09-04 9:19 Florian Schmaus
0 siblings, 0 replies; 36+ messages in thread
From: Florian Schmaus @ 2022-09-04 9:19 UTC (permalink / raw
To: gentoo-commits
commit: fcb0698408a7c7e7688bda817bf3873f76246211
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Aug 24 09:57:04 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 09:14:37 2022 +0000
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 <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/27116
Signed-off-by: Florian Schmaus <flow <AT> 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 000000000000..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}${instdir}" \
+ -Dpython.cachedir="${T}/.jythoncachedir" \
+ -Duser.home="${T}" \
+ org.python.util.jython "\${@}"
+ EOF
+ chmod +x "${T}"/jython || die
+
+ local -x PYTHON="${T}"/jython
+ # we can't get the path from the interpreter since it does some
+ # magic that fails on non-installed copy...
+ _python_export jython${SLOT} EPYTHON
+
+ # compile tests (everything else is compiled already)
+ # we're keeping it quiet since jython reports errors verbosely
+ # and some of the tests are supposed to trigger compile errors
+ python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
+
+ # for python-exec
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
+ python_domodule epython.py
+
+ # some of the class files end up with newer timestamps than the files they
+ # were generated from, make sure this doesn't happen
+ find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/
@ 2022-09-05 8:00 Florian Schmaus
0 siblings, 0 replies; 36+ messages in thread
From: Florian Schmaus @ 2022-09-05 8:00 UTC (permalink / raw
To: gentoo-commits
commit: ad57118c772796532563168fa867352e0cae7669
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Sep 5 04:54:43 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Sep 5 08:00:29 2022 +0000
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 <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> 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..000000000000
--- 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" \
- -Duser.home="${T}" \
- org.python.util.jython "\${@}"
- EOF
- chmod +x "${T}"/jython || die
-
- local -x PYTHON="${T}"/jython
- # we can't get the path from the interpreter since it does some
- # magic that fails on non-installed copy...
- _python_export jython${SLOT} EPYTHON
-
- # compile tests (everything else is compiled already)
- # we're keeping it quiet since jython reports errors verbosely
- # and some of the tests are supposed to trigger compile errors
- python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
- # for python-exec
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
- python_domodule epython.py
-
- # some of the class files end up with newer timestamps than the files they
- # were generated from, make sure this doesn't happen
- find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread
end of thread, other threads:[~2022-09-05 8:00 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-25 4:14 [gentoo-commits] repo/gentoo:master commit in: dev-java/jython/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-09-05 8:00 Florian Schmaus
2022-09-04 9:19 Florian Schmaus
2022-08-26 12:58 Florian Schmaus
2022-08-26 12:36 Florian Schmaus
2022-06-17 13:50 Arthur Zamarin
2022-06-17 12:45 Arthur Zamarin
2022-06-16 15:15 Sam James
2022-06-16 15:15 Sam James
2022-04-29 19:21 Sam James
2022-04-29 8:46 Florian Schmaus
2022-04-29 8:46 Florian Schmaus
2022-04-23 12:00 Florian Schmaus
2022-01-28 8:58 Miroslav Šulc
2022-01-14 8:43 Miroslav Šulc
2022-01-10 19:10 Arthur Zamarin
2022-01-02 10:56 Miroslav Šulc
2022-01-02 10:54 Jakov Smolić
2022-01-02 0:04 Sam James
2021-12-31 9:55 Arthur Zamarin
2021-11-21 17:01 Miroslav Šulc
2021-11-21 16:31 Miroslav Šulc
2021-11-19 7:24 Arthur Zamarin
2021-11-13 10:25 Sam James
2021-11-13 10:24 Sam James
2021-10-19 0:15 Sam James
2020-05-17 16:55 Aaron Bauman
2017-10-27 18:27 Patrice Clement
2017-10-25 9:31 Agostino Sarubbo
2017-10-03 0:42 Thomas Deutschmann
2016-02-14 17:02 Patrick Lauer
2016-01-16 14:50 James Le Cuirot
2016-01-16 14:20 James Le Cuirot
2015-11-12 16:03 Michał Górny
2015-09-07 13:54 Patrice Clement
2015-09-02 21:57 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox