Silence warnings given by portage-2.2.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686)

3 files changed, 80 insertions, 1 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index ea30dbc52f34..1bb2013af052 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/java-config
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.191 2008/06/26 16:34:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.192 2008/07/02 17:36:27 betelgeuse Exp $
+
+*java-config-2.1.6-r1 (02 Jul 2008)
+
+  02 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/java-config-2.1.6-portage-import.patch,
+  +java-config-2.1.6-r1.ebuild:
+  Silence warnings given by portage-2.2.
 
   26 Jun 2008; nixnut <nixnut@gentoo.org> java-config-2.1.6.ebuild:
   Stable on ppc wrt bug 228827
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
new file mode 100644
index 000000000000..01509277e5d4
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.1.6-portage-import.patch
@@ -0,0 +1,27 @@
+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/java-config-2.1.6-r1.ebuild b/dev-java/java-config/java-config-2.1.6-r1.ebuild
new file mode 100644
index 000000000000..2948d167cb42
--- /dev/null
+++ b/dev-java/java-config/java-config-2.1.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 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.6-r1.ebuild,v 1.1 2008/07/02 17:36:27 betelgeuse 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="~amd64 ~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
+	epatch "${FILESDIR}/java-config-2.1.6-portage-import.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
+}