Add icedtea6 and icedtea6-bin to jdk defaults for amd64 and x86.

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

7 files changed, 37 insertions, 115 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 9ad250185657..75bb5d53a445 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,14 @@
 # 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.229 2009/11/18 14:03:40 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.230 2009/12/03 20:17:08 caster Exp $
+
+*java-config-2.1.9-r2 (03 Dec 2009)
+
+  03 Dec 2009; Vlastimil Babka <caster@gentoo.org>
+  -files/java-config-2.1.6-portage-import.patch, -java-config-2.1.7.ebuild,
+  -java-config-2.1.8.ebuild, -java-config-2.1.9.ebuild,
+  +java-config-2.1.9-r2.ebuild, +files/java-config-2.1.9-r2.patch:
+  Add icedtea6 and icedtea6-bin to jdk defaults for amd64 and x86.
 
   18 Nov 2009; Mounir Lamouri <volkmar@gentoo.org>
   java-config-2.1.9-r1.ebuild:
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index aa15b9d1d10e..f7d358dd7423 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,16 +1,13 @@
 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-r2.patch 834 RMD160 0a4f368361e9791251a9af199d78d8ba3c4c8652 SHA1 5f879a2b3a820e54fbbac65e50fc36a54a4199db SHA256 0773971dce17012c3499379a91be1553f3299a89eb677a223a668d196b42a2af
 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
 DIST java-config-2.1.9.tar.bz2 56757 RMD160 08e2cb147681fd71100aa40f892e8a71c503f256 SHA1 9a5c333ac0401d247969910e8165d77eeee86f7a SHA256 0d2ed065225474f030d63e51812b525781ec3325a5297da81c22a27e4d4a7778
 EBUILD java-config-1.3.7-r1.ebuild 1307 RMD160 9e2e1045e452bd4afd834fff437495d5d4c02e05 SHA1 b1f4850230c446a7f39033542707b9b4fe9496c1 SHA256 72ad16124c942d97ad0042c51b61747503b57fc5cc99223426e1d84035a6a0c6
-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 1112 RMD160 a06035220fe341af721bf912106e1d60c9729414 SHA1 6519667460c2099cd8601924d41c29df9449ae84 SHA256 621a3ce8fa6105ad8d71f413c4dfb2ee01ea0dccdd28260405b0fb6e346e0272
-EBUILD java-config-2.1.9.ebuild 1031 RMD160 eaf896d0dc4bfe27a5580682284ae738990fabc3 SHA1 2bdd87d40d366afc0e868c8b326f30634ab74305 SHA256 1dd02d86f9284c9138720970f4f843cdf34f35ee5efba25133c2c3007a653aa3
-MISC ChangeLog 39630 RMD160 d7f542358827b49f0dbce82c6e575d5f1ac952c3 SHA1 664508f3b541ede29244ca98abe2185806e760b8 SHA256 d6a0e80108b675d74e9ed6c145302f5ae366fd4f0642e7dd781043d6f539e330
+EBUILD java-config-2.1.9-r2.ebuild 1151 RMD160 f36474a25d978ad4629f152e85686cb1cea3b4ea SHA1 f9985f5b4fb9f6b1cb2a3be61f543860748f6e35 SHA256 32eb8aae634ac7ae32965fbaeab6028099d70b43b6dc374c657617941d5f367e
+MISC ChangeLog 39984 RMD160 a7b25bf506de693b4227738296dc869e886481df SHA1 da26eb6f4422c7b7a92940bdfe55dbb27c794a51 SHA256 c93d26c4909779d5611d091187add4a80454adf2618cfe2f9c839fbc5c456d92
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
diff --git a/dev-java/java-config/files/java-config-2.1.6-portage-import.patch b/dev-java/java-config/files/java-config-2.1.6-portage-import.patch
deleted file mode 100644
index 01509277e5d4..000000000000
--- a/dev-java/java-config/files/java-config-2.1.6-portage-import.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru --exclude .svn tags/2.1.6/src/eselect/java-nsplugin.eselect trunk/src/eselect/java-nsplugin.eselect
---- tags/2.1.6/src/eselect/java-nsplugin.eselect	2008-04-28 02:58:44.000000000 +0300
-+++ trunk/src/eselect/java-nsplugin.eselect	2008-06-16 22:00:26.000000000 +0300
-@@ -68,7 +68,7 @@
- 		system_name=$(get_system_plugin_vm)
- 
- 		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
--			twaek_list_item ${targets[${i}]} ${system_name}
-+			tweak_list_item ${targets[${i}]} ${system_name}
- 		done
- 	}
- 	
-diff -ru --exclude .svn tags/2.1.6/src/java_config_2/VersionManager.py trunk/src/java_config_2/VersionManager.py
---- tags/2.1.6/src/java_config_2/VersionManager.py	2008-04-28 02:58:44.000000000 +0300
-+++ trunk/src/java_config_2/VersionManager.py	2008-07-02 20:24:01.000000000 +0300
-@@ -71,7 +71,10 @@
-             use = os.environ["USE"]
- 
-             # Local import to avoid initializing portage elsewhere
--            from portage_dep import use_reduce,paren_reduce
-+            try:
-+                from portage.dep import use_reduce,paren_reduce
-+            except ImportError:
-+                from portage_dep import use_reduce,paren_reduce
-             from portage import flatten
- 
-             # Normalize white space for Portage
diff --git a/dev-java/java-config/files/java-config-2.1.9-r2.patch b/dev-java/java-config/files/java-config-2.1.9-r2.patch
new file mode 100644
index 000000000000..1afe13526a9f
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.1.9-r2.patch
@@ -0,0 +1,16 @@
+Index: trunk/config/jdk-defaults-x86.conf
+===================================================================
+--- trunk/config/jdk-defaults-x86.conf	(revision 7989)
++++ trunk/config/jdk-defaults-x86.conf	(revision 7990)
+@@ -1,2 +1,2 @@
+ # This files contain the default support jdk's
+-*= sun-jdk blackdown-jdk ibm-jdk-bin jrockit-jdk-bin
++*= icedtea6 icedtea6-bin sun-jdk blackdown-jdk ibm-jdk-bin jrockit-jdk-bin
+Index: trunk/config/jdk-defaults-amd64.conf
+===================================================================
+--- trunk/config/jdk-defaults-amd64.conf	(revision 7989)
++++ trunk/config/jdk-defaults-amd64.conf	(revision 7990)
+@@ -1,2 +1,2 @@
+ # This files contain the default support jdk's
+-*= sun-jdk blackdown-jdk ibm-jdk-bin jrockit-jdk-bin
++*= icedtea6 icedtea6-bin sun-jdk blackdown-jdk ibm-jdk-bin jrockit-jdk-bin
diff --git a/dev-java/java-config/java-config-2.1.7.ebuild b/dev-java/java-config/java-config-2.1.7.ebuild
deleted file mode 100644
index d40d8de9a5dc..000000000000
--- a/dev-java/java-config/java-config-2.1.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.7.ebuild,v 1.8 2009/03/18 15:01:39 ranger 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_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
-}
diff --git a/dev-java/java-config/java-config-2.1.8.ebuild b/dev-java/java-config/java-config-2.1.9-r2.ebuild
index b33119ea6c4b..3c08593bb4b6 100644
--- a/dev-java/java-config/java-config-2.1.8.ebuild
+++ b/dev-java/java-config/java-config-2.1.9-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2009/05/23 11:04:39 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.9-r2.ebuild,v 1.1 2009/12/03 20:17:08 caster Exp $
 
 inherit fdo-mime gnome2-utils distutils eutils
 
@@ -19,6 +19,14 @@ RDEPEND="${DEPEND}
 
 PYTHON_MODNAME="java_config_2"
 
+src_unpack() {
+	distutils_src_unpack
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.patch"
+	epatch "${FILESDIR}/${PF}.patch"
+}
+
 src_install() {
 	distutils_src_install
 
diff --git a/dev-java/java-config/java-config-2.1.9.ebuild b/dev-java/java-config/java-config-2.1.9.ebuild
deleted file mode 100644
index 8e4c457a3f17..000000000000
--- a/dev-java/java-config/java-config-2.1.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.ebuild,v 1.1 2009/08/27 19:31:29 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_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
-}