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

(Portage version: 2.1.9.25/cvs/Linux x86_64)

3 files changed, 105 insertions, 1 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/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
+}