Silence warnings given by portage-2.2.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686

4 files changed, 93 insertions, 2 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/Manifest b/dev-java/java-config/Manifest
index 05cae8f314bb..13a6ec60c0ea 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX java-config-1.2.11-shebang.patch 229 RMD160 e201dafad76307123139861371ade56f03887342 SHA1 e91f77077bb0b5793bda7ffc58442019dc66db09 SHA256 4068a51515b7510260de57a5872d6e04b1a33d2f9728d77ed00fe7f41cced83a
 AUX java-config-2.0.33-r1.patch 4424 RMD160 896e66d699863e31181ac9584805ece0d42fb30c SHA1 fb141b627f9e17b61347b24a112d1f2d1e6df028 SHA256 bc96b7478e57f1e86f3b7a2d97f8cfa5ec0df072fd6ef1c0ca647266a5c47cb6
 AUX java-config-2.1.2-r1.patch 372 RMD160 9db4f747b6e7eccae3408e7aa0ec7e9b636b5eab SHA1 fea6717969effdb0ec0177ba3a78d9852db0e53a SHA256 fc99c0f972fe99d3db34a2c130115b72d6adde910a42b1b4d0a1bfed9f3d2c23
+AUX java-config-2.1.6-portage-import.patch 1251 RMD160 6dac699aca050493ade1aa127b9eca62c28a302e SHA1 6a4735f80363e5bb3b302e21e821de5fa254c235 SHA256 07429735dc5ed6d037e621fb636f92df2aecd417e03843dea9b03722b225105e
 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.0.33.tar.bz2 25491 RMD160 f8ac8a9c8707ccc62e6258935b4578260f60eaf2 SHA1 57c998c09de0dbea08026d9bc8712abc0cfbe767 SHA256 3576c22ffd474b02080f257f6ddedd92c453c786f29d893f2d4f7bafc98194da
@@ -14,6 +18,14 @@ EBUILD java-config-2.0.33-r1.ebuild 1539 RMD160 9fe1756599d998facfb7bbe4d0938274
 EBUILD java-config-2.1.3.ebuild 1421 RMD160 ca58bc011f2d18d13345647522dffeda5e74a02e SHA1 28f0e57779901da38e5ead136fb8721152f0716a SHA256 4556ba43d0608b9319063f9ea2428459bdd65169f01b5b1351c5ba3d92188421
 EBUILD java-config-2.1.4.ebuild 1418 RMD160 a964f9dd05282ce3cb7756d649348a3118b67a84 SHA1 6df4338ada6e8cd5b64bb3e4ced2675c549eb53b SHA256 fe489069c14b617aa0cd96e4422436ae0383263d72960726970673bee481f036
 EBUILD java-config-2.1.5.ebuild 1563 RMD160 3269ec062c5e3f0dcc8fa652407586668f3b5f9e SHA1 2df18dc578f5a3fb094861395f5853d7e5f3f4ba SHA256 75dfdbc10ad208f884c3e363cef4e30fc6446213eb7c76b617cdc52984f06884
+EBUILD java-config-2.1.6-r1.ebuild 1125 RMD160 7aacefe388016f9d9202d42b0d95f879463c110f SHA1 6b94c893d9053cd290b704a2e80af08831d0b607 SHA256 bff909363d24220918d7a8c2d86891d037aeffda92431897c83ad75f37faeab2
 EBUILD java-config-2.1.6.ebuild 1013 RMD160 92acb2b9d7319ef5560cd93e8a400f297985238f SHA1 e0b26a8cb745bc5c468247ff91864223edc94ea0 SHA256 c4e818cc02ac92aca6f020f0a44eeb05c73bd04f08451ee68066bce91b4d3ec8
-MISC ChangeLog 34625 RMD160 63154d186b7cd548ec10b5144424606cb8c06130 SHA1 4b56e6c0b75448724a848d7c17cb3f289617f9b5 SHA256 929c1c17b94b743b828b89e8fdc76b1409d15c5cc38788112951d1aaec2a93a0
+MISC ChangeLog 34842 RMD160 4f8a1795c57199a60de9899e3899fea128e898cd SHA1 fe93d5a61465303aae8ceebff04404907c3ed834 SHA256 ebe0ebe6f014d0c9eecd4147cb17d5857f9f7519a5850d2cf2e2091fa8100f43
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhrvKcACgkQcxLzpIGCsLQ7NQCeIoHBkWOd3PWtyYYB1h3OVkGc
+GzEAn15+g07Bzh/BCopDe4HaAaF3JxXr
+=Xjgz
+-----END PGP SIGNATURE-----
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
+}