Make Distutils install scripts into /usr/bin (bug #305103). Respect PYTHONPATH variable (bug #305103).

Package-Manager: portage-15835-svn/cvs/Linux x86_64

5 files changed, 53 insertions, 19 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 782478e96604..453cd69146c0 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jython
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.68 2010/03/19 09:59:29 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.69 2010/03/20 13:17:20 arfrever Exp $
+
+  20 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  jython-2.5.1-r1.ebuild,
+  +files/jython-2.5.1-distutils_scripts_location.patch,
+  +files/jython-2.5.1-respect_PYTHONPATH.patch:
+  Make Distutils install scripts into /usr/bin (bug #305103). Respect
+  PYTHONPATH variable (bug #305103).
 
 *jython-2.5.1-r1 (19 Mar 2010)
 
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 4c1d0dc01c54..f56cd3687aa0 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -3,6 +3,8 @@ AUX 2.1-assert.patch 2052 RMD160 6d9696543b015511c3e041e02fd7cd68eec70c99 SHA1 d
 AUX jython-2.2.1-build.patch 3285 RMD160 47328536902b8e344079e7f21f01d68cc286a295 SHA1 84d60b1bc4968fcb533da6263a9e5b2a89a4c6c5 SHA256 3078b381ac9a4ef0edf03b6c3253cbe436497b9f843aa45e43194e8b36f2d7e4
 AUX jython-2.5.0-build.patch 2911 RMD160 e8008a340333a28aa382cc17e12efb65f9408644 SHA1 f938d6d04caf85e973ed953c6dba950a3d6b6149 SHA256 be396792dcf5b4619f2047b58b6bbd395d3ccf1c064856b8ea62749902a0375f
 AUX jython-2.5.1-build.patch 1821 RMD160 fa4ea2fcde449b460fd553baa872847140ca41d3 SHA1 ea1d9932d29950e56c41e719c981404950bc9fc2 SHA256 284fa97ba5e44a0a0d9945dfc52a5b897d7e58ac010870b83a86fde46f2dca95
+AUX jython-2.5.1-distutils_scripts_location.patch 346 RMD160 6d5277114bca498aa75c14e0ccce05e105aea9f0 SHA1 a01c1cbdfe198a8936d636fd37652c0594319659 SHA256 240cc2c51aa23738f559a874cc65d9c7de4a4c1d786edece3e865d7922fd6f90
+AUX jython-2.5.1-respect_PYTHONPATH.patch 547 RMD160 394b4e3a39d972ab9551a3f5ff966a992c6cb86a SHA1 d02360ca2f4d54ef8b49a5fe9725eaa80fb5e6c1 SHA256 23d5008763e4abb6bd3b491b74a7428ae29f629b4c87f1a65659a3c46d51620c
 DIST Python-2.2.3.tgz 6709556 RMD160 3590f813582d65194b467f4ab450e360e35eb40e SHA1 177d587e77e0eaa14131ab0d0d0b470777de4400 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188
 DIST Python-2.5.4.tgz 11604497 RMD160 9935f2c5c7065b5f47c639e45136b4b0f85cbeb9 SHA1 44f4a6e5ca54a4316d3d9d8b82653b2888bdbb79 SHA256 3d3b205611ee503a38a9433d5645a571668420bb219242c7f51af85f05664da6
 DIST Python-2.5.5.tgz 11606370 RMD160 dd590e38ed1f1a46c00e39b6f616acd599253a44 SHA1 bf99e2d7bdf60bc4e8b6236cd98f95a079996393 SHA256 03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854cbd57e24e16f6bf63e2392
@@ -13,7 +15,7 @@ DIST jython_installer-2.2.1.jar 4663097 RMD160 73959d072925644b2959bc0c28ddd6a84
 EBUILD jython-2.1-r11.ebuild 2939 RMD160 a1f3596dfc5d6f15fc60fe522b4ef3ab2c4fc00e SHA1 75f8317afdb1366a7fc9d72fa620d9717a133a8e SHA256 350f0ca38c869a06ad20b73f41b22c54f9b8017a676cc550069d87c5f8593338
 EBUILD jython-2.2.1-r1.ebuild 3772 RMD160 ed33983e8e7f44513d346c20fda80b7b4a91e8e1 SHA1 da67f232692f2cb81db93beb371d31aeaba72585 SHA256 9765c773d4a910bfbe0a88490605af71a897e891a38ba9c12f3da8eb10d14bcf
 EBUILD jython-2.5.0-r1.ebuild 4487 RMD160 08048d243aaa4cc39a17d4ca261af38e733f7cb2 SHA1 ee626b767dae47542a0d59e11b05b0c777fc2f78 SHA256 b69561dc67fa6b203269f93ad7c3b9535107ff3d96eff31fce7a1e18f4d65200
-EBUILD jython-2.5.1-r1.ebuild 4964 RMD160 d5c49876a67148c4f38ba41538024ff991339e0a SHA1 f16c9a9957cc3064ed6d4d4bfe7927dd9c48152a SHA256 1e363f6a982c91e7650bace01f26faabf09d5d754ddff95222d9bf9bc2dc000a
+EBUILD jython-2.5.1-r1.ebuild 5029 RMD160 33928c74618b1a0c1528852b1e787ebcd8131226 SHA1 67dc391172ea8140336e73f85243cbef91d35679 SHA256 fac43bcbc0a97efb79d3fc6639638980a8f37fa6a2b21f01a3b8a422727e7881
 EBUILD jython-2.5.1.ebuild 4779 RMD160 12c91d7aa83219aaeff34bf73869926c56de44b4 SHA1 4e2a5d8f8911ddb56e3150a5f97e37d71ae4cfb1 SHA256 cc751451690cf9efce8a3573aa1a0e8e6f47959b46321f5afcb3cbb800f986b1
-MISC ChangeLog 9594 RMD160 63b40728422eccf3f653768a534c80017b008dee SHA1 b0be78faa61e63ea5ab27554221eb87354a01678 SHA256 b402a68921d406a58e5ceb0f63bf3c1a1d147627dea5c72ef4e239284cff4d9a
+MISC ChangeLog 9905 RMD160 a59cb7e448e5f46f2ac9c9545fac1eb86303635e SHA1 3f060ec21b19647dfdcf804d93d0ccfd1bf007cb SHA256 ec3a8447d054f0dd292ec990d9f3f9ea9a261532d94538a6fec438c2fa5861db
 MISC metadata.xml 248 RMD160 2f209fd2ecdd173d50305f140d7154e1c9a634fa SHA1 25e0f2914006e3cc39f704309e8644af57608a44 SHA256 7faa9b92889ac0d4fe4b02b2dd8e534b534fc4241386fe769803b047f467d6bf
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
new file mode 100644
index 000000000000..150d463f1db1
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.1-distutils_scripts_location.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..8d028d01b567
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.1-respect_PYTHONPATH.patch
@@ -0,0 +1,15 @@
+--- 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);
diff --git a/dev-java/jython/jython-2.5.1-r1.ebuild b/dev-java/jython/jython-2.5.1-r1.ebuild
index f841be35d3d4..1fb9958fd24d 100644
--- a/dev-java/jython/jython-2.5.1-r1.ebuild
+++ b/dev-java/jython/jython-2.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild,v 1.1 2010/03/19 09:59:29 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.1-r1.ebuild,v 1.2 2010/03/20 13:17:20 arfrever Exp $
 
 JAVA_PKG_IUSE="source doc examples oracle"
 #informix missing.  This is a jdbc driver, similar to oracle use flag
@@ -49,6 +49,8 @@ DEPEND=">=virtual/jdk-1.5
 
 java_prepare() {
 	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-distutils_scripts_location.patch"
+	epatch "${FILESDIR}/${P}-respect_PYTHONPATH.patch"
 
 	rm -Rfv org || die "Unable to remove class files."
 	find extlibs -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
@@ -117,14 +119,13 @@ src_install() {
 	java-pkg_newjar "${PN}-dev.jar"
 
 	local java_args="-Dpython.home=/usr/share/${PN}-${SLOT}"
-	java_args="${java_args}	-Dpython.cachedir=\${JYTHON_CACHEDIR-\${HOME}/.jythoncachedir}"
+	java_args="${java_args} -Dpython.cachedir=\${JYTHON_CACHEDIR-\${HOME}/.jythoncachedir}"
 	java_args="${java_args} -Dpython.executable=${ROOT}/usr/bin/jython-${SLOT}"
 
 	java-pkg_dolauncher jython-${SLOT} \
 						--main "org.python.util.jython" \
 						--pkg_args "${java_args}"
-	sed -i -e 's_#!/bin/bash_#!/bin/bash\nunset EPYTHON_g' \
-		"${D}/usr/binjython-2.5"
+	sed -e "1a unset EPYTHON" -i "${D}usr/bin/${PN}-${SLOT}" || die "sed failed"
 
 	java-pkg_register-optional-dependency jdbc-mysql
 	java-pkg_register-optional-dependency jdbc-postgresql
@@ -142,16 +143,14 @@ pkg_postinst() {
 	einfo "Version of jython > 2.2* no longer has jythonc. Please see"
 	einfo "http://www.jython.org/Project/jythonc.html for details"
 
-	if use readline; then
-		elog
-		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
+	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
 }