summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2016-11-27 23:01:30 +0000
committerJames Le Cuirot <chewi@gentoo.org>2016-11-27 23:09:49 +0000
commit69029b5305a7dd70a86e3121b9de5a8893888a4d (patch)
treed0c92cfa7fbac6f3a1a4aa9acbd957c9ef7f2d1a /dev-java/jython/files
parentsys-auth/oath-toolkit: remove vulnerable wrt sec bug #600520 (diff)
downloadgentoo-69029b5305a7dd70a86e3121b9de5a8893888a4d.tar.gz
gentoo-69029b5305a7dd70a86e3121b9de5a8893888a4d.tar.bz2
gentoo-69029b5305a7dd70a86e3121b9de5a8893888a4d.zip
dev-java/jython: Bump guava SLOT, drop readline, EAPI bump
guava:20 is needed so that Java 7 can be dropped from Gentoo. Support for GNU Readline was dropped from Jython in an earlier version so the flag and its associated code is of no use now. There is no need to fix the CLASSPATH in src/shell/jython as this script is not installed or used at all. I have verified this by grepping the installed result and deleting the script before building. Package-Manager: portage-2.3.2
Diffstat (limited to 'dev-java/jython/files')
-rw-r--r--dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch4
-rw-r--r--dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch4
-rw-r--r--dev-java/jython/files/jython-2.7.0-build.xml.patch4
3 files changed, 6 insertions, 6 deletions
diff --git a/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch b/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
index 150d463f1db..fc9a95be89f 100644
--- a/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
+++ b/dev-java/jython/files/jython-2.5.2-distutils_scripts_location.patch
@@ -1,5 +1,5 @@
---- Lib/distutils/command/install.py
-+++ Lib/distutils/command/install.py
+--- a/Lib/distutils/command/install.py
++++ b/Lib/distutils/command/install.py
@@ -70,7 +70,7 @@
'purelib': '$base/Lib/site-packages',
'platlib': '$base/Lib/site-packages',
diff --git a/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch b/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
index 8d028d01b56..e695122ba1d 100644
--- a/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
+++ b/dev-java/jython/files/jython-2.5.2-respect_PYTHONPATH.patch
@@ -1,5 +1,5 @@
---- src/org/python/core/PySystemState.java
-+++ src/org/python/core/PySystemState.java
+--- a/src/org/python/core/PySystemState.java
++++ b/src/org/python/core/PySystemState.java
@@ -646,6 +646,12 @@
if (jythonpath != null) {
registry.setProperty("python.path", jythonpath);
diff --git a/dev-java/jython/files/jython-2.7.0-build.xml.patch b/dev-java/jython/files/jython-2.7.0-build.xml.patch
index 4e27af771eb..1f0be614dbe 100644
--- a/dev-java/jython/files/jython-2.7.0-build.xml.patch
+++ b/dev-java/jython/files/jython-2.7.0-build.xml.patch
@@ -1,5 +1,5 @@
---- build.xml.orig 2015-06-27 16:12:08.442000000 +0000
-+++ build.xml 2015-06-27 16:12:15.684000000 +0000
+--- a/build.xml.orig 2015-06-27 16:12:08.442000000 +0000
++++ b/build.xml 2015-06-27 16:12:15.684000000 +0000
@@ -448,7 +448,7 @@
</target>