diff options
author | Ralph Sennhauser <sera@gentoo.org> | 2014-08-03 16:30:14 +0000 |
---|---|---|
committer | Ralph Sennhauser <sera@gentoo.org> | 2014-08-03 16:30:14 +0000 |
commit | dc20af9127fb1f98c048d90b757392f4d531e4cd (patch) | |
tree | efeb2e00ddfb8f5b7032783c5cee6ff4fd228728 /dev-java/jython/files | |
parent | arm64, initial support (diff) | |
download | gentoo-2-dc20af9127fb1f98c048d90b757392f4d531e4cd.tar.gz gentoo-2-dc20af9127fb1f98c048d90b757392f4d531e4cd.tar.bz2 gentoo-2-dc20af9127fb1f98c048d90b757392f4d531e4cd.zip |
Remove old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)
Diffstat (limited to 'dev-java/jython/files')
4 files changed, 0 insertions, 112 deletions
diff --git a/dev-java/jython/files/jython-2.5.1-build.patch b/dev-java/jython/files/jython-2.5.1-build.patch deleted file mode 100644 index e3c40f1c0f42..000000000000 --- a/dev-java/jython/files/jython-2.5.1-build.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- build.xml.old 2010-03-06 07:34:18.000000000 +1300 -+++ build.xml 2010-03-06 07:38:24.000000000 +1300 -@@ -191,7 +191,8 @@ - <pathelement path="${extlibs.dir}/asm-commons-3.1.jar" /> - <pathelement path="${extlibs.dir}/constantine-0.4.jar" /> - <pathelement path="${extlibs.dir}/jna.jar"/> -- <pathelement path="${extlibs.dir}/jna-posix.jar"/> -+ <pathelement path="${extlibs.dir}/jna-posix.jar"/> -+ <pathelement path="${extlibs.dir}/ant.jar" /> - </path> - - <available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" /> -@@ -200,7 +201,8 @@ - <path id="test.classpath"> - <path refid="main.classpath"/> - <pathelement path="${extlibs.dir}/asm-commons-3.1.jar" /> -- <pathelement path="${extlibs.dir}/junit-3.8.2.jar" /> -+ <pathelement path="${extlibs.dir}/junit-3.8.2.jar" /> -+ <pathelement path="${extlibs.dir}/xercesImpl.jar" /> - <pathelement path="${exposed.dir}" /> - <pathelement path="${compile.dir}" /> - <pathelement path="${cpptasks.jar.dir}" /> -@@ -236,15 +238,6 @@ - <istrue value="${has.repositories.connection}" /> - </condition> - -- <!-- classpath for svn ant task --> -- <path id="svn.classpath"> -- <pathelement path="${java.class.path}" /> -- <fileset dir="${svnant.jar.dir}"> -- <include name="*.jar"/> -- </fileset> -- </path> -- <!-- taskdef for svn ant task --> -- <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" /> - </target> - <target name="full-check" depends="full-preinit, init, dump-env"> - <!-- Require all of the optional jars for a full build --> diff --git a/dev-java/jython/files/jython-2.5.1-distutils_byte_compilation.patch b/dev-java/jython/files/jython-2.5.1-distutils_byte_compilation.patch deleted file mode 100644 index 9ba2cc51924c..000000000000 --- a/dev-java/jython/files/jython-2.5.1-distutils_byte_compilation.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- Lib/distutils/tests/test_build_py.py -+++ Lib/distutils/tests/test_build_py.py -@@ -92,6 +92,25 @@ - os.chdir(cwd) - sys.stdout = sys.__stdout__ - -+ def test_dont_write_bytecode(self): -+ # makes sure byte_compile is not used -+ pkg_dir, dist = self.create_dist() -+ cmd = build_py(dist) -+ cmd.compile = 1 -+ cmd.optimize = 1 -+ -+ old_dont_write_bytecode = os.environ.get("PYTHONDONTWRITEBYTECODE") -+ os.environ["PYTHONDONTWRITEBYTECODE"] = "1" -+ try: -+ cmd.byte_compile([]) -+ finally: -+ if old_dont_write_bytecode is None: -+ del os.environ["PYTHONDONTWRITEBYTECODE"] -+ else: -+ os.environ["PYTHONDONTWRITEBYTECODE"] = old_dont_write_bytecode -+ -+ self.assertTrue('byte-compiling is disabled' in self.logs[0][1]) -+ - def test_suite(): - return unittest.makeSuite(BuildPyTestCase) - ---- Lib/distutils/util.py -+++ Lib/distutils/util.py -@@ -11,6 +11,7 @@ - from distutils.dep_util import newer - from distutils.spawn import spawn - from distutils import log -+from distutils.errors import DistutilsByteCompileError - - def get_platform (): - """Return a string that identifies the current platform. This is used -@@ -397,6 +398,9 @@ - generated in indirect mode; unless you know what you're doing, leave - it set to None. - """ -+ # nothing is done if PYTHONDONTWRITEBYTECODE environment variable is set -+ if os.environ.get("PYTHONDONTWRITEBYTECODE") is not None: -+ raise DistutilsByteCompileError('byte-compiling is disabled.') - - # First, if the caller didn't force us into direct or indirect mode, - # figure out which mode we should be in. We take a conservative diff --git a/dev-java/jython/files/jython-2.5.1-distutils_scripts_location.patch b/dev-java/jython/files/jython-2.5.1-distutils_scripts_location.patch deleted file mode 100644 index 150d463f1db1..000000000000 --- a/dev-java/jython/files/jython-2.5.1-distutils_scripts_location.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/distutils/command/install.py -+++ Lib/distutils/command/install.py -@@ -70,7 +70,7 @@ - 'purelib': '$base/Lib/site-packages', - 'platlib': '$base/Lib/site-packages', - 'headers': '$base/Include/$dist_name', -- 'scripts': '$base/bin', -+ 'scripts': '/usr/bin', - 'data' : '$base', - } - } diff --git a/dev-java/jython/files/jython-2.5.1-respect_PYTHONPATH.patch b/dev-java/jython/files/jython-2.5.1-respect_PYTHONPATH.patch deleted file mode 100644 index 8d028d01b567..000000000000 --- a/dev-java/jython/files/jython-2.5.1-respect_PYTHONPATH.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/org/python/core/PySystemState.java -+++ src/org/python/core/PySystemState.java -@@ -646,6 +646,12 @@ - if (jythonpath != null) { - registry.setProperty("python.path", jythonpath); - } -+ else { -+ jythonpath = System.getenv("PYTHONPATH"); -+ if (jythonpath != null) { -+ registry.setProperty("python.path", jythonpath); -+ } -+ } - } catch (SecurityException e) { - } - registry.putAll(postProperties); |