Fix bug #273284

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

4 files changed, 71 insertions, 2 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 6f53c9f90215..b324349bd37a 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.215 2009/05/23 11:04:39 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.216 2009/06/09 06:35:35 ali_bush Exp $
+
+*java-config-2.1.8-r1 (09 Jun 2009)
+
+  09 Jun 2009; Alistair Bush <ali_bush@gentoo.org>
+  +java-config-2.1.8-r1.ebuild,
+  +files/java-config-2.1.8-load_packages.patch:
+  Fix bug #273284
 
 *java-config-2.1.8 (23 May 2009)
 
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 93379506984b..64327277f66b 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,5 +1,6 @@
 AUX java-config-1.2.11-shebang.patch 229 RMD160 e201dafad76307123139861371ade56f03887342 SHA1 e91f77077bb0b5793bda7ffc58442019dc66db09 SHA256 4068a51515b7510260de57a5872d6e04b1a33d2f9728d77ed00fe7f41cced83a
 AUX java-config-2.1.6-portage-import.patch 1251 RMD160 6dac699aca050493ade1aa127b9eca62c28a302e SHA1 6a4735f80363e5bb3b302e21e821de5fa254c235 SHA256 07429735dc5ed6d037e621fb636f92df2aecd417e03843dea9b03722b225105e
+AUX java-config-2.1.8-load_packages.patch 560 RMD160 e09d06a132ac9caaef2239abd76132051899bfc5 SHA1 da884f8fa297a9e4cb3da199b43628927a6f119c SHA256 f77b4e42619514c98718762534ec6eb5743ffdf29afbd5988400ca8c5d94ce60
 DIST java-config-1.2.11.tar.bz2 15743 RMD160 e1175474e87f234f9428d7db6827a3a4435e6aba SHA1 fd2ffdda515005ef7a9358b650f59674c13bc0b7 SHA256 f17bdce2b97dca14daf77dbefb6d6c0935fbc444b67e9a0d7cc68538575a6b83
 DIST java-config-1.3.7.tar.bz2 14362 RMD160 243739cdef9ea5b2baa708eabd5358d1804631de SHA1 48a46198ceace1a27d49c5176b2b6d720aaa9eff SHA256 bed302b9643d19caa3f1bbb75ebb8d9373a4ccf68a0b437a158f7265171f56d1
 DIST java-config-2.1.4.tar.bz2 41558 RMD160 3b8533ecabc7eaf729e3a46009dcfe96b10f57ae SHA1 40a5fb44b800b347a02830dde0bd24ef6a621800 SHA256 e5dc436cb1927989769097941af8758e7070fc5c1e984d7b421bebcf0e816509
@@ -11,6 +12,7 @@ EBUILD java-config-1.3.7-r1.ebuild 1307 RMD160 9e2e1045e452bd4afd834fff437495d5d
 EBUILD java-config-2.1.4.ebuild 1417 RMD160 0011ffef63d5e6132960019a000913a9fe5e7359 SHA1 64f30467117da6173ae2e0a20a682572aaa194d5 SHA256 ae79289c918b1f55cefa3de8af87db84dae209306c59cf743bfca85eda0035ce
 EBUILD java-config-2.1.6-r1.ebuild 1121 RMD160 8764ddc4360dfe2f0e5d1ef90db1da653a2c3e05 SHA1 edeef20e9c3f2f4ee4e965b8888d5c2ccec81129 SHA256 75dd405cdeb26f751ac0aa0d568f2029157eeab79f83e09440f6caa87a81c4a2
 EBUILD java-config-2.1.7.ebuild 1022 RMD160 31a796c092a34616ddc423dd4eee8896fffd04e2 SHA1 dc516ec14f5db9650a2c04459622ce013a99ce3a SHA256 d8f4d41accf6e939c02e57b61f6ba2acdca3a29a605584a9fa87f41f3e3f32a5
+EBUILD java-config-2.1.8-r1.ebuild 1133 RMD160 c78af0386fecd833906e2dc2d4394aa19b724188 SHA1 13376dd89802616eeb19e51e0cfc7be132c59483 SHA256 64f3a07f03401aad09a0bbb89792b55c866ac6b625127ea403d375dcc20a6db6
 EBUILD java-config-2.1.8.ebuild 1031 RMD160 c44445ca6274c0d78bfd8cde3e18474f129bbedc SHA1 f11b468ee68135e0ac95a28a5e83767e2b73299d SHA256 4048500ae910da10e2eddf69bec4fe9f927f541c582c0022b1a50ad542e9835e
-MISC ChangeLog 37804 RMD160 b7926be8ab52bc6ffbc570ae0a79bc1221903002 SHA1 4042df8a7e52d050f57cc63ebab442bc6404f0cf SHA256 5801d40919508c32af6220a916fbcba5188176b9f59a3636c77d96b00b414774
+MISC ChangeLog 37991 RMD160 d97e77c742a8ce8e9e591ce0875d2917dc88902f SHA1 31d6dc9580e7bc8989f1fcf2676fbcfcef67eb6a SHA256 8be38bf88e0d4d905d5b4c2aa57ee7f846204a8e1d6983ef2e98cf8f2c1700a2
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
diff --git a/dev-java/java-config/files/java-config-2.1.8-load_packages.patch b/dev-java/java-config/files/java-config-2.1.8-load_packages.patch
new file mode 100644
index 000000000000..dd2855a45a57
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.1.8-load_packages.patch
@@ -0,0 +1,13 @@
+Index: java_config_2/EnvironmentManager.py
+===================================================================
+--- src/java_config_2/EnvironmentManager.py	(revision 7809)
++++ src/java_config_2/EnvironmentManager.py	(working copy)
+@@ -81,7 +81,7 @@
+                 raise UnexistingPackageError(name)
+ 
+     def load_packages(self):
+-        for package in iter(glob(self.pkg_path) % "*" ):
++        for package in iter(glob(self.pkg_path % "*" )):
+             name = basename(dirname(package))
+             if name in self.packages:
+                 continue
diff --git a/dev-java/java-config/java-config-2.1.8-r1.ebuild b/dev-java/java-config/java-config-2.1.8-r1.ebuild
new file mode 100644
index 000000000000..38c3dfff5220
--- /dev/null
+++ b/dev-java/java-config/java-config-2.1.8-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2009 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.8-r1.ebuild,v 1.1 2009/06/09 06:35:35 ali_bush Exp $
+
+inherit fdo-mime gnome2-utils distutils eutils
+
+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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+	>=dev-java/java-config-wrapper-0.15"
+
+PYTHON_MODNAME="java_config_2"
+
+src_unpack() {
+	distutils_src_unpack
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-load_packages.patch"
+}
+
+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_python_version
+	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
+}