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

(Portage version: 2.2_rc55/cvs/Linux x86_64)

6 files changed, 34 insertions, 109 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/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
-}