Add special handling of Python-specific variables for support for Jython. #348306

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 108 insertions, 2 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 77a0cfc12613..60123b6b213e 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/java-config
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.256 2010/12/11 16:34:46 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.257 2010/12/13 10:22:32 ali_bush Exp $
+
+*java-config-2.1.11-r3 (13 Dec 2010)
+
+  13 Dec 2010; Alistair Bush <ali_bush@gentoo.org>
+  +java-config-2.1.11-r3.ebuild, +files/python-abi-support.patch:
+  Add special handling of Python-specific variables for support for Jython.
+  #348306.
 
   11 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   java-config-2.1.10.ebuild, java-config-2.1.11.ebuild,
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index ec5e0b3f4e27..3ef01a7edb2c 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,9 +1,11 @@
 AUX java-config-2.1.11-python3.patch 525 RMD160 8a9a9693ea2d9e7a77b4a6803ad627a2bbaf3f5c SHA1 7c483602718877ab11d1793d99b6a16458264a4c SHA256 fbcc731ea0bca626855212f9e1af5fcda538743e5f23e0229a5bbfbd56c619a8
+AUX python-abi-support.patch 1558 RMD160 cd73b97cfaed4071ba020fd4c647a713484dbf86 SHA1 b0068c5b9b4bb97c05b8911f86d7cb5a08122a13 SHA256 790b68ae41fa48587bbf29ae8e8466305b8f29d4d122d3a6551cf9a627d6163b
 DIST java-config-2.1.10.tar.bz2 45507 RMD160 55fc34441a1553035c3e4ae674756df494a1705a SHA1 e78a8032a436a63a583960fe85bd5396144f8a97 SHA256 d0afa1279a2bf91a307e54a78227fe413aad12c1a1beaac4ee90b39cc1485ba5
 DIST java-config-2.1.11.tar.bz2 60763 RMD160 35f62025fe9843769fe164d9bb50419fd2fc7e34 SHA1 df62f76957343108d1b27687132958853434982c SHA256 ffc90aac716f6edc2f99f70e4947eab606e3a70dadb90328dedda16345796bbe
 EBUILD java-config-2.1.10.ebuild 1383 RMD160 0a98d42efc5b487a1628c1b30cc7f56ca77b9512 SHA1 f215d6b67834a4101e2d22ea2cdb0dc819c7e4b8 SHA256 045ace1c5086061fc5429db9a58c1d68651c7b45eb6a1830d43ab2338dc6db3d
 EBUILD java-config-2.1.11-r1.ebuild 1350 RMD160 9d440c0ccf1de019e79d1b738a16155ab70eec5b SHA1 c51c12901622103d72d608563f97adf527a73b92 SHA256 972ed02e5b031049ed359ff95c431526eb2de3192c0c702c90b966b8545e9207
 EBUILD java-config-2.1.11-r2.ebuild 1436 RMD160 2a66983df615472bc2f80f5129bec967703165d3 SHA1 5d746a40ef041b6955f00f41b07bf2d5e3e8decc SHA256 0c6f8191478a43e96a7365876bbc7736784ae1ca9aed52553a3ba41e0e3a906f
+EBUILD java-config-2.1.11-r3.ebuild 1483 RMD160 5b1f876338541f4c55bf10ce6e0f0c46ebfb6e6f SHA1 df2ecb17d40374505b5364577200777f7b0907ac SHA256 f5bc6ec593dcf281ce7b8c286fda73c5b2fb3e1efe2f793af963c1896cce3712
 EBUILD java-config-2.1.11.ebuild 1287 RMD160 b91ac5bd1610300daae1e0d6b266e58d5bc11045 SHA1 d1a37635791957b088d5785b8df10b6361b799d8 SHA256 23fad190f2dc1b0b6f27b02d269bc4fd91f0da1fd2f0b523a12ebaa229de6bee
-MISC ChangeLog 43766 RMD160 03d0baac78c939113d0abe6b477fe36f01dbdc9c SHA1 989889ab24edfcd4725f5ed4cb17299d0a520b1a SHA256 9d7809f03e1bd63c1bca48807350869ea2a40d7e29bd89f337b8d9abac7235b6
+MISC ChangeLog 44009 RMD160 ea5e37a91912b60464697383bfc452e1c568b3ce SHA1 c6c951ce2feea66beefd4145b4b1163800eaeaf1 SHA256 832ca4e5613480fd52bfe0fdbf78fd4aa1331861f2f6d97465b44e9e4d4cc29a
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
diff --git a/dev-java/java-config/files/python-abi-support.patch b/dev-java/java-config/files/python-abi-support.patch
new file mode 100644
index 000000000000..bff9559021eb
--- /dev/null
+++ b/dev-java/java-config/files/python-abi-support.patch
@@ -0,0 +1,37 @@
+--- src/launcher.bash
++++ src/launcher.bash
+@@ -6,6 +6,19 @@
+ 	exit 1
+ }
+ 
++# Save Python-specific variables for support for Jython
++# ---------------------
++_EPYTHON="${EPYTHON}"
++_GENTOO_PYTHON_PROCESS_NAME="${GENTOO_PYTHON_PROCESS_NAME}"
++_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH="${GENTOO_PYTHON_WRAPPER_SCRIPT_PATH}"
++_GENTOO_PYTHON_TARGET_SCRIPT_PATH="${GENTOO_PYTHON_TARGET_SCRIPT_PATH}"
++_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION="${GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION}"
++unset EPYTHON
++unset GENTOO_PYTHON_PROCESS_NAME
++unset GENTOO_PYTHON_WRAPPER_SCRIPT_PATH
++unset GENTOO_PYTHON_TARGET_SCRIPT_PATH
++unset GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION
++
+ # Source package env
+ # ---------------------
+ gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}"
+@@ -54,6 +67,14 @@
+ 	abort "Dont know what to run :(("
+ fi
+ 
++# Restore Python-specific variables for support for Jython
++# ---------------------
++[[ -n ${_EPYTHON} ]] && export EPYTHON="${_EPYTHON}"
++[[ -n ${_GENTOO_PYTHON_PROCESS_NAME} ]] && export GENTOO_PYTHON_PROCESS_NAME="${_GENTOO_PYTHON_PROCESS_NAME}"
++[[ -n ${_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH} ]] && export GENTOO_PYTHON_WRAPPER_SCRIPT_PATH="${_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH}"
++[[ -n ${_GENTOO_PYTHON_TARGET_SCRIPT_PATH} ]] && export GENTOO_PYTHON_TARGET_SCRIPT_PATH="${_GENTOO_PYTHON_TARGET_SCRIPT_PATH}"
++[[ -n ${_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION} ]] && export GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION="${_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION}"
++
+ # Run it
+ # --------
+ 
diff --git a/dev-java/java-config/java-config-2.1.11-r3.ebuild b/dev-java/java-config/java-config-2.1.11-r3.ebuild
new file mode 100644
index 000000000000..bf7981352a09
--- /dev/null
+++ b/dev-java/java-config/java-config-2.1.11-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.11-r3.ebuild,v 1.1 2010/12/13 10:22:32 ali_bush Exp $
+
+EAPI="2"
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils fdo-mime gnome2-utils
+
+DESCRIPTION="Java environment configuration tool"
+HOMEPAGE="http://www.gentoo.org/proj/en/java/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-java/java-config-wrapper-0.15"
+# https://bugs.gentoo.org/show_bug.cgi?id=315229
+PDEPEND=">=virtual/jre-1.5"
+# Tests fail when java-config isn't already installed.
+RESTRICT="test"
+RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython"
+
+PYTHON_MODNAME="java_config_2"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-python3.patch"
+	epatch "${FILESDIR}/python-abi-support.patch"
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" src/run-test-suite.py
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	insinto /usr/share/java-config-2/config/
+	newins config/jdk-defaults-${ARCH}.conf jdk-defaults.conf || die "arch config not found"
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}