Backport fix for compatibility with Python 3.

Package-Manager: portage-2.2.0_alpha4_p14/cvs/Linux x86_64

4 files changed, 91 insertions, 2 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/Manifest b/dev-java/java-config/Manifest
index 03d526f1b4a5..821a71e1d8e3 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,7 +1,9 @@
+AUX java-config-2.1.11-python3.patch 525 RMD160 8a9a9693ea2d9e7a77b4a6803ad627a2bbaf3f5c SHA1 7c483602718877ab11d1793d99b6a16458264a4c SHA256 fbcc731ea0bca626855212f9e1af5fcda538743e5f23e0229a5bbfbd56c619a8
 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 1373 RMD160 7c8bfacf3cde458b5875a4197a7817033913d054 SHA1 f17a29c9d2bf227cdf1bdf16d86d1b61f8fca809 SHA256 09e3ca9de826901e967094cbbc7ef50b100fa820da2eff52d5908f1050c0b0b4
 EBUILD java-config-2.1.11-r1.ebuild 1345 RMD160 4d62f0431c1d7c3225af8de9cb1b7023ad152805 SHA1 645f5e747bbe686ee93dd1e4aedc087339a6a814 SHA256 d120790dd4166f73a32251bbca4dba284f2a35e2672239c81ebebcdc9b6344b4
+EBUILD java-config-2.1.11-r2.ebuild 1427 RMD160 9377dcead6a6a6fe233a30c2a3d4a30eed28791f SHA1 2a0678417d837ef73547f9bd80e2a9fd3203b4c1 SHA256 6ea627ad199f959ec6978b12ff4d60430ade84a8ab9c0a0b33c3956a135b7a68
 EBUILD java-config-2.1.11.ebuild 1270 RMD160 5c00cabe2fa4278101af56880592e7d6e3cffa29 SHA1 9370f6d6ce9f175b75a0edacbe72caeb348b39ea SHA256 138c3529d699087afa798198ee3c32efbedf0886f6f46e0e8df7246f6cbf9446
-MISC ChangeLog 42989 RMD160 0e1713cedaa7ecc33eba081ff5e8ab24bb71aa13 SHA1 2cadd17b55a26ad03f1f47ad7c4517d29737296d SHA256 b3a577862c61a81989d476b33782bd65c71e8e047a1b509a23ea3dff891c9574
+MISC ChangeLog 43221 RMD160 aa4363a762d9959a55777cc552946cf5808a31cb SHA1 86c3f8b663d42d23caf5201cba86f6a07ddb6a50 SHA256 a2af30552de03dbb93c9a8b0154288b08f6e12ae4dc45cce5864bac1b909da7e
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
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
+}