Bump

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@3016 6952d904-891a-0410-993b-d76249ca496b

dev-java/java-config/Manifest

@@ -1,10 +1,12 @@
 AUX java-config-2.1.11-python3.patch 525 RMD160 8a9a9693ea2d9e7a77b4a6803ad627a2bbaf3f5c SHA1 7c483602718877ab11d1793d99b6a16458264a4c SHA256 fbcc731ea0bca626855212f9e1af5fcda538743e5f23e0229a5bbfbd56c619a8
 AUX jdk-defaults-arm.conf 71 RMD160 5d2cbc1a4300baf05c871a0991b46a9c1685ad40 SHA1 4f52ddda48a478ec1747695478d1bfe09693a4f9 SHA256 bd6791555fc860455531da04226adf700f30d227ff8e478c4a294e4b5c87b454
+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 1429 RMD160 7b0350f07bd3563d5c4692f14e0cca7d20019ad3 SHA1 c903e3188dcab75181dcc7c59a13b2315fd53ff4 SHA256 3023d432a1caae36c621c0e570617dc9f274d9ed4c74b27d9b56d1da8c73abc5
 EBUILD java-config-2.1.11-r1.ebuild 1424 RMD160 1445d3c05c7b9c37f6a61e80f5f7e8e6c7ddf228 SHA1 034b7f060b1b23f8af275b74f61a307c4be04681 SHA256 1ea9abf5dd8f0b79997bb64ec44e0637a75906cceaa6b2a6a68866c3f6f59185
 EBUILD java-config-2.1.11-r2.ebuild 1464 RMD160 265dd2aea066fa30868c4eb5cc2e8a6deb9c9657 SHA1 4ee86d602df8cf557f129a7d49be66d88185fbef SHA256 fc761ee85f0c46c78afbdd787b673bed568371a0d84c42b187ced89884d59b17
+EBUILD java-config-2.1.11-r3.ebuild 1553 RMD160 323e5b8b27a95c9daad187dfbef72e2ae9301778 SHA1 75b5f5c6acbce262d3f48059f43b75780cd97927 SHA256 eaa1f0d3956e8de189a290e1190e5066735b2892557af9f4e7c9d042cd5ae6ee
 EBUILD java-config-2.1.11.ebuild 1347 RMD160 dae11e3ab16da1ea8c52bf88218cbde7ad267a83 SHA1 c36cb7257fec4f0bdf9f06db9c14c326a2ed702b SHA256 973d52b6febe66f49ee30a8b883833484c4208527f640bc765dc7bfd334952c2
 MISC ChangeLog 41505 RMD160 35531e1561afabc61d4482d2fc582b1cc1fc534a SHA1 13837028fe7a1aa673b0e98af06850d8a203d542 SHA256 22cce04f386eb717c8d30d6acec3bf85aea55fee42336c6980976e6e493fe471
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5

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
+ # --------
+ 

dev-java/java-config/java-config-2.1.11-r3.ebuild

@@ -0,0 +1,62 @@
+# Copyright 1999-2011 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.6 2011/03/28 08:57:45 ssuominen 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"
+	cp "${FILESDIR}"/*.conf config
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" src/run-test-suite.py
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	rm -rf "${D}"/usr/share/mimelnk #350459
+
+	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
+}