Backport fix for compatibility with Python 3.

(Portage version: 2.2.0_alpha4_p14/cvs/Linux x86_64)

3 files changed, 88 insertions, 1 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index dabe6e5156f8..9f07b46ba223 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,12 @@
 # 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.251 2010/11/08 11:59:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.252 2010/11/08 18:38:18 arfrever Exp $
+
+*java-config-2.1.11-r2 (08 Nov 2010)
+
+  08 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +java-config-2.1.11-r2.ebuild, +files/java-config-2.1.11-python3.patch:
+  Backport fix for compatibility with Python 3.
 
   08 Nov 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   java-config-2.1.11-r1.ebuild:
diff --git a/dev-java/java-config/files/java-config-2.1.11-python3.patch b/dev-java/java-config/files/java-config-2.1.11-python3.patch
new file mode 100644
index 000000000000..bbf56df9af34
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.1.11-python3.patch
@@ -0,0 +1,22 @@
+http://overlays.gentoo.org/proj/java/changeset/8184
+
+--- src/gjl
++++ src/gjl
+@@ -23,7 +23,7 @@
+ 
+ #Depreciated.
+ def get_needed_target(pkg):
+-    highest_target = None
++    highest_target = ""
+     needs_jdk = False
+     for pkg in get_needed_packages(pkg):
+         pkg_needs_jdk = False
+@@ -43,7 +43,7 @@
+     return highest_target, needs_jdk
+ 
+ def get_needed_target2(pkg):
+-    highest_target = None
++    highest_target = ""
+     needs_jdk = set()
+     for pkg in get_needed_packages(pkg):
+         target = pkg.target()
diff --git a/dev-java/java-config/java-config-2.1.11-r2.ebuild b/dev-java/java-config/java-config-2.1.11-r2.ebuild
new file mode 100644
index 000000000000..69fabc45aaaf
--- /dev/null
+++ b/dev-java/java-config/java-config-2.1.11-r2.ebuild
@@ -0,0 +1,59 @@
+# 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-r2.ebuild,v 1.1 2010/11/08 18:38:18 arfrever 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"
+
+PYTHON_MODNAME="java_config_2"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-python3.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
+}