Revbump for bug fixes

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

4 files changed, 92 insertions, 2 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 622e6f4e5ebf..3b55dfac012f 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.223 2009/08/27 19:31:29 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.224 2009/09/15 22:46:29 ali_bush Exp $
+
+*java-config-2.1.9-r1 (15 Sep 2009)
+
+  15 Sep 2009; Alistair Bush <ali_bush@gentoo.org>
+  +java-config-2.1.9-r1.ebuild, +files/java-config-2.1.9.patch:
+  Bug fixes.
 
 *java-config-2.1.9 (27 Aug 2009)
 
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index d5b576dc9ac1..3ec7ce4017e7 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,6 +1,7 @@
 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
+AUX java-config-2.1.9.patch 1630 RMD160 2b41d8bf1146b3d986e7161dee652a3471b5a556 SHA1 d21906d76fa8c67fd9519056dca78d962510be74 SHA256 df1f0d7320826adfaeec10edf6880621aaee1839e7e8f53f8fc3654576398bbb
 DIST java-config-1.3.7.tar.bz2 14362 RMD160 243739cdef9ea5b2baa708eabd5358d1804631de SHA1 48a46198ceace1a27d49c5176b2b6d720aaa9eff SHA256 bed302b9643d19caa3f1bbb75ebb8d9373a4ccf68a0b437a158f7265171f56d1
 DIST java-config-2.1.7.tar.bz2 53805 RMD160 708f14caec5af3990aeb5f4faeef25f5663f7198 SHA1 ceca067d7e234f90bdd725b289530a2067cd5a4f SHA256 8cd6c12a9c2f4dffb4aa73d3c3d08d10ed468e1943fa8fdeb79efeca2a4539a4
 DIST java-config-2.1.8.tar.bz2 56913 RMD160 d16f8ae852580ee26644c086c12d1ca81e30ca87 SHA1 1d4a3f2c2bec42f192b49343b3ef86870261fb74 SHA256 c7b7953d1c601727904970f92df544a1508f5768d337591674a6356207967abe
@@ -9,6 +10,7 @@ EBUILD java-config-1.3.7-r1.ebuild 1307 RMD160 9e2e1045e452bd4afd834fff437495d5d
 EBUILD java-config-2.1.7.ebuild 1022 RMD160 31a796c092a34616ddc423dd4eee8896fffd04e2 SHA1 dc516ec14f5db9650a2c04459622ce013a99ce3a SHA256 d8f4d41accf6e939c02e57b61f6ba2acdca3a29a605584a9fa87f41f3e3f32a5
 EBUILD java-config-2.1.8-r1.ebuild 1124 RMD160 21a87e5437d2381aefc7b0ee8624b75f47710ee1 SHA1 cdc7a3076cc9e29fdd1cc5afd4cafc4184661d45 SHA256 b78d7a2744cdd274c71834a9a3d5834610e20438def50e64b07a05830e180bf0
 EBUILD java-config-2.1.8.ebuild 1031 RMD160 c44445ca6274c0d78bfd8cde3e18474f129bbedc SHA1 f11b468ee68135e0ac95a28a5e83767e2b73299d SHA256 4048500ae910da10e2eddf69bec4fe9f927f541c582c0022b1a50ad542e9835e
+EBUILD java-config-2.1.9-r1.ebuild 1119 RMD160 d43ab2aa1200781b4169563ec63d85350bd6fa0a SHA1 6df2fe0a15144395b7f00fd8c0d36bef252bdbe5 SHA256 1705b27f93c8e57253ec0c063fbe58963ff528941477552c32d353b37ba7f21e
 EBUILD java-config-2.1.9.ebuild 1031 RMD160 eaf896d0dc4bfe27a5580682284ae738990fabc3 SHA1 2bdd87d40d366afc0e868c8b326f30634ab74305 SHA256 1dd02d86f9284c9138720970f4f843cdf34f35ee5efba25133c2c3007a653aa3
-MISC ChangeLog 38902 RMD160 9cc60ea9df8619590115fa6d8c0a31ae647cf752 SHA1 5eac956dce4701ea4027b485e5f96dfc3de6878b SHA256 014b3d8d4c4acf05e63fe29340b176d6d6452c23dd6ad5e9eb7ef843144b1484
+MISC ChangeLog 39068 RMD160 7bdeb705beaaf9cd2bd206ce73c217b93f9c6a96 SHA1 4e5c2d1d6b00e0f3296b54a35456c0a317252f28 SHA256 36a7b11eea97583fb07139761e33ab41bb9c1cfa73ce42b46ac5bce6d3c67984
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
diff --git a/dev-java/java-config/files/java-config-2.1.9.patch b/dev-java/java-config/files/java-config-2.1.9.patch
new file mode 100644
index 000000000000..d2e81af330b8
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.1.9.patch
@@ -0,0 +1,35 @@
+Index: src/depend-java-query
+===================================================================
+--- src/depend-java-query	(revision 7909)
++++ src/depend-java-query	(working copy)
+@@ -40,7 +40,7 @@
+ 
+ def get_vm(option, opt, value, parser):
+     try:
+-        vm = verman.get_vm(value, False)
++        vm = verman.get_vm(value, True)
+         printer._print(vm)
+     except Exception, ex:
+         printer._printError(str(ex))
+Index: java-config-2
+===================================================================
+--- src/java-config-2	(revision 7909)
++++ src/java-config-2	(working copy)
+@@ -143,12 +143,15 @@
+     printer._print('%HThe following VMs are available for generation-2:%$')
+     for i, vm in vm_list.iteritems():
+         if vm is active:
+-            printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'), vm.name(), '%$'))
++            if not vm.is_build_only():
++                printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'), vm.name(), '%$'))
++            else:
++                printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'), vm.name(), '%$') + '%r (Build Only)%$')
+         else:
+             if not vm.is_build_only():
+                 printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'), vm.name()))
+             else:
+-                printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'), vm.name()) + '%r (Build Only)')
++                printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'), vm.name()) + '%r (Build Only)%$')
+ 
+     printer._print('')
+     printer._print('%r' + 'VMs marked as Build Only may contain Security Vulnerabilities and/or be EOL.')
diff --git a/dev-java/java-config/java-config-2.1.9-r1.ebuild b/dev-java/java-config/java-config-2.1.9-r1.ebuild
new file mode 100644
index 000000000000..f6fed3837baa
--- /dev/null
+++ b/dev-java/java-config/java-config-2.1.9-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.9-r1.ebuild,v 1.1 2009/09/15 22:46:30 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}.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
+}