Revbump for support for OPTIONAL_DEPEND in package.env, bug #176182. Also fixes bug #157380. Via patch from trunk.

Package-Manager: portage-2.1.2.7

5 files changed, 203 insertions, 15 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index daad4545556a..d192acffb1ea 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.161 2007/05/28 11:49:15 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.162 2007/05/28 19:25:57 caster Exp $
+
+*java-config-2.0.33-r1 (28 May 2007)
+
+  28 May 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/java-config-2.0.33-r1.patch, +java-config-2.0.33-r1.ebuild:
+  Revbump for support for OPTIONAL_DEPEND in package.env, bug #176182. Also
+  fixes bug #157380. Via patch from trunk.
 
   28 May 2007; nixnut <nixnut@gentoo.org> java-config-2.0.32.ebuild:
   Stable on ppc wrt bug 179810
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index b4106877e994..d9992308fd75 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 60-java 382 RMD160 0794d1592b0e5999effcfa630f6b002d2f172631 SHA1 beaaaa5297bc180a78730661a273fa8d109e03b2 SHA256 06e30c66084aa7fac580004b71c739c09d7ee147ff4a46b4b8a0ea43aaa9738d
 MD5 bff6d7769967e9d0387aa46ca3dda6d4 files/60-java 382
 RMD160 0794d1592b0e5999effcfa630f6b002d2f172631 files/60-java 382
@@ -21,6 +18,10 @@ AUX java-config-1.3.6-jh.patch 1258 RMD160 25a826996f7ee790b1cc74f30eae48c1c6433
 MD5 5c7a18568d0b9b96b11571d2d6fe897b files/java-config-1.3.6-jh.patch 1258
 RMD160 25a826996f7ee790b1cc74f30eae48c1c6433635 files/java-config-1.3.6-jh.patch 1258
 SHA256 7976d6f6a32e5a291049aacab1540a710415f3f8a629c2a0d3a8ffd7237c8bd9 files/java-config-1.3.6-jh.patch 1258
+AUX java-config-2.0.33-r1.patch 4424 RMD160 896e66d699863e31181ac9584805ece0d42fb30c SHA1 fb141b627f9e17b61347b24a112d1f2d1e6df028 SHA256 bc96b7478e57f1e86f3b7a2d97f8cfa5ec0df072fd6ef1c0ca647266a5c47cb6
+MD5 6ada6f32094d0bf1b7d271b67b787383 files/java-config-2.0.33-r1.patch 4424
+RMD160 896e66d699863e31181ac9584805ece0d42fb30c files/java-config-2.0.33-r1.patch 4424
+SHA256 bc96b7478e57f1e86f3b7a2d97f8cfa5ec0df072fd6ef1c0ca647266a5c47cb6 files/java-config-2.0.33-r1.patch 4424
 AUX java-config-2.profiled.csh 803 RMD160 04e096cec16a051199db64bb80315c882d12db16 SHA1 73131af89a53835f3a48af77c191c69a4892794d SHA256 bd2b1a513a7132c184ec8427ffee5cb5e3536a97f4984a169f4721c669f15a22
 MD5 06f0bf363f52918df3167e766c931607 files/java-config-2.profiled.csh 803
 RMD160 04e096cec16a051199db64bb80315c882d12db16 files/java-config-2.profiled.csh 803
@@ -74,14 +75,18 @@ EBUILD java-config-2.0.32.ebuild 1957 RMD160 132a5496cf5a733d94a0554c822688632ad
 MD5 34a48f6ef00ffeb6adc42917ca9d1805 java-config-2.0.32.ebuild 1957
 RMD160 132a5496cf5a733d94a0554c822688632ad4c6af java-config-2.0.32.ebuild 1957
 SHA256 aa0362bcc9383b6feaf8bc30fd17005a9b1bf26d88c6e856a7dd146f89b7336f java-config-2.0.32.ebuild 1957
+EBUILD java-config-2.0.33-r1.ebuild 1515 RMD160 eb9533515c0bec59fd09f2f3c2f65c4852346273 SHA1 4161a7814a442c0a6652896a041229048eb03099 SHA256 364467e86ffc6769ff5630e0250d4a8da34073210cbe5639f88ca215e2b92865
+MD5 fc401b4062efa15e15e91ea7ea023c95 java-config-2.0.33-r1.ebuild 1515
+RMD160 eb9533515c0bec59fd09f2f3c2f65c4852346273 java-config-2.0.33-r1.ebuild 1515
+SHA256 364467e86ffc6769ff5630e0250d4a8da34073210cbe5639f88ca215e2b92865 java-config-2.0.33-r1.ebuild 1515
 EBUILD java-config-2.0.33.ebuild 1435 RMD160 4dc9bee51549255855bf55206eab4e4b04d88ea6 SHA1 5691a7894c8e43d9db7a069c6a3800e0df729251 SHA256 fa0f3b13cf7d571438183abc2fda3a3d698c5ee7d5ab46829efb671c77b8dfaa
 MD5 435944a897cee16c3890339a66ae5532 java-config-2.0.33.ebuild 1435
 RMD160 4dc9bee51549255855bf55206eab4e4b04d88ea6 java-config-2.0.33.ebuild 1435
 SHA256 fa0f3b13cf7d571438183abc2fda3a3d698c5ee7d5ab46829efb671c77b8dfaa java-config-2.0.33.ebuild 1435
-MISC ChangeLog 29999 RMD160 386d3a421787074bc2a4e9fb970c8e89fa4b9321 SHA1 9884c53173873f205f96ea8c78e1fe88869b9d67 SHA256 0d82cdc384262018d40cc492fc67ac0c305cc0872e1692fcca1bf059d4d7c43b
-MD5 90f2b11543748907803822ff858b3a9f ChangeLog 29999
-RMD160 386d3a421787074bc2a4e9fb970c8e89fa4b9321 ChangeLog 29999
-SHA256 0d82cdc384262018d40cc492fc67ac0c305cc0872e1692fcca1bf059d4d7c43b ChangeLog 29999
+MISC ChangeLog 30277 RMD160 23e586891dd68d61c05102e123ca5c6729285ed7 SHA1 8ce93b84747d51c09863555bad19929a54acfa2e SHA256 8bb58b98273ddf8730cced49f8df9c819f8bd2cdd35e0a5de817de3df04b14ae
+MD5 7a148a2cc1c0bc1621ae5a3767a13707 ChangeLog 30277
+RMD160 23e586891dd68d61c05102e123ca5c6729285ed7 ChangeLog 30277
+SHA256 8bb58b98273ddf8730cced49f8df9c819f8bd2cdd35e0a5de817de3df04b14ae ChangeLog 30277
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
 MD5 b4d3814b9ce4be88a25d99b3cfe2c076 metadata.xml 482
 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 metadata.xml 482
@@ -110,10 +115,6 @@ SHA256 b8eea6096b1e1142cb7ea7d93a9d0a99b2fac82a97da5046ed56cfaa2825fb0e files/di
 MD5 97bab73ca0e5f109e5d3dc94ea43dfb2 files/digest-java-config-2.0.33 256
 RMD160 6abc1ba55a4314888c09fd690d169c498e888f24 files/digest-java-config-2.0.33 256
 SHA256 02f17f90a44ca3c2a1df78ae7df91d5c9bf6a407c076ff06149308181b0907cf files/digest-java-config-2.0.33 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGWyAs8bi6rjpTunYRAkrsAKDUHfXjkDnE+g/QoPxqyJZOJd4TEACeKuV1
-kg+jyBo9lFf5P9MEyxG0CJA=
-=Byrn
------END PGP SIGNATURE-----
+MD5 97bab73ca0e5f109e5d3dc94ea43dfb2 files/digest-java-config-2.0.33-r1 256
+RMD160 6abc1ba55a4314888c09fd690d169c498e888f24 files/digest-java-config-2.0.33-r1 256
+SHA256 02f17f90a44ca3c2a1df78ae7df91d5c9bf6a407c076ff06149308181b0907cf files/digest-java-config-2.0.33-r1 256
diff --git a/dev-java/java-config/files/digest-java-config-2.0.33-r1 b/dev-java/java-config/files/digest-java-config-2.0.33-r1
new file mode 100644
index 000000000000..fe3854bb83bf
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-2.0.33-r1
@@ -0,0 +1,3 @@
+MD5 fb714ebd37a8186fa31a87aed99fa2fe java-config-2.0.33.tar.bz2 25491
+RMD160 f8ac8a9c8707ccc62e6258935b4578260f60eaf2 java-config-2.0.33.tar.bz2 25491
+SHA256 3576c22ffd474b02080f257f6ddedd92c453c786f29d893f2d4f7bafc98194da java-config-2.0.33.tar.bz2 25491
diff --git a/dev-java/java-config/files/java-config-2.0.33-r1.patch b/dev-java/java-config/files/java-config-2.0.33-r1.patch
new file mode 100644
index 000000000000..9b49cd53f55e
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.0.33-r1.patch
@@ -0,0 +1,126 @@
+diff -ru --exclude .svn tags/2.0.33/src/gjl trunk/src/gjl
+--- tags/2.0.33/src/gjl	2007-05-26 11:10:15.000000000 +0200
++++ trunk/src/gjl	2007-05-28 13:59:52.000000000 +0200
+@@ -34,7 +34,7 @@
+         pkg = unresolved.pop()
+         resolved.add(pkg)
+         # dep is in the form of (jar, pkg)
+-        for dep in pkg.deps():
++        for dep in manager.get_pkg_deps(pkg):
+             dep_pkg = dep[-1]
+             p = manager.get_package(dep_pkg)
+             if p is None:
+diff -ru --exclude .svn tags/2.0.33/src/java_config/EnvironmentManager.py trunk/src/java_config/EnvironmentManager.py
+--- tags/2.0.33/src/java_config/EnvironmentManager.py	2007-05-26 11:10:15.000000000 +0200
++++ trunk/src/java_config/EnvironmentManager.py	2007-05-28 11:40:03.000000000 +0200
+@@ -263,6 +263,19 @@
+     def build_classpath(self, pkgs):
+         return self.build_path(pkgs, "CLASSPATH")
+ 
++    def get_pkg_deps(self, pkg):
++        """
++        Returns list of package's deps and optional deps.
++        Filters out optional deps that are not present.
++        """
++        deps = pkg.deps();
++        for opt_dep in pkg.opt_deps():
++            p = self.get_package(opt_dep[-1])
++            if p:
++                deps.append(opt_dep)
++
++        return deps
++
+     def add_dep_classpath(self, pkg, dep, classpath): 
+         pkg_cp = pkg.classpath()
+         if pkg_cp:
+@@ -295,7 +308,7 @@
+                 lpath = pkg.query(query)
+                 self.add_path_elements(lpath, path)
+ 
+-            for dep in pkg.deps():
++            for dep in self.get_pkg_deps(pkg):
+                 p = self.get_package(dep[-1])
+ 
+                 if p:
+@@ -344,7 +357,7 @@
+ 
+             self.add_pkg_env_vars(pkg, env)
+ 
+-            for dep in pkg.deps():
++            for dep in self.get_pkg_deps(pkg):
+                 p = self.get_package(dep[-1])
+ 
+                 if p:
+diff -ru --exclude .svn tags/2.0.33/src/java_config/Package.py trunk/src/java_config/Package.py
+--- tags/2.0.33/src/java_config/Package.py	2007-05-26 11:10:15.000000000 +0200
++++ trunk/src/java_config/Package.py	2007-05-28 11:36:50.000000000 +0200
+@@ -55,11 +55,13 @@
+         """
+         Return all packages this package depends on
+         """
+-        depstr = self.query("DEPEND")
+-        if depstr:
+-            return [dep.split("@") for dep in depstr.split(":")]
+-        else:
+-            return []
++        return self.__get_deps("DEPEND")
++        
++    def opt_deps(self):
++        """
++        Return all packages this package optionally depends on
++        """
++        return self.__get_deps("OPTIONAL_DEPEND")
+ 
+     def provides(self):
+         """
+@@ -69,5 +71,18 @@
+         if pv:
+             return pv.split(" ")
+         return []
++    
++    def __get_deps(self, query):
++        """
++        Internal function to get package's (optional) dependencies;
++        @param query: variable to read from package.env
++        """
++        depstr = self.query(query)
++        if depstr:
++            return [dep.split("@") for dep in depstr.split(":")]
++        else:
++            return []
++        
++    
+ 
+ # vim:set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:
+diff -ru --exclude .svn tags/2.0.33/src/java_config/VersionManager.py trunk/src/java_config/VersionManager.py
+--- tags/2.0.33/src/java_config/VersionManager.py	2007-05-26 11:10:15.000000000 +0200
++++ trunk/src/java_config/VersionManager.py	2007-05-27 17:43:01.000000000 +0200
+@@ -127,6 +127,7 @@
+ 
+         prefs = self.get_prefs()
+ 
++        # first try to find vm based on preferences
+         low = self.get_lowest(atoms) # Lowest vm version we can use
+         for atom in matched_atoms: 
+             for pref in prefs:
+@@ -143,12 +144,14 @@
+                             else:
+                                 return gvm          # use it!
+ 
+-        low = self.get_lowest_atom(matched_atoms)
+-        vm = self.find_vm("", low)
+-        if vm:
+-            return vm
+-        else:
+-            raise Exception("Couldn't find suitable VM. Possible invalid dependency string.")
++        # no match in preferences, find anything we have
++        for atom in matched_atoms:
++            vm = self.find_vm("", atom)
++            if vm:
++                return vm
++
++        # nothing found
++        raise Exception("Couldn't find suitable VM. Possible invalid dependency string.")
+ 
+     def find_vm(self, vm, atom):
+         vm_list = EnvironmentManager().find_vm(vm)
diff --git a/dev-java/java-config/java-config-2.0.33-r1.ebuild b/dev-java/java-config/java-config-2.0.33-r1.ebuild
new file mode 100644
index 000000000000..c70dddeab30b
--- /dev/null
+++ b/dev-java/java-config/java-config-2.0.33-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 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.0.33-r1.ebuild,v 1.1 2007/05/28 19:25:57 caster Exp $
+
+inherit 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 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+	dev-java/java-config-wrapper"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PF}.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() {
+	python_mod_cleanup /usr/share/java-config-2/pym/java_config
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/java-config-2/pym/java_config
+
+	elog "The way Java is handled on Gentoo has been recently updated."
+	elog "If you have not done so already, you should follow the"
+	elog "instructions available at:"
+	elog "\thttp://www.gentoo.org/proj/en/java/java-upgrade.xml"
+	elog
+	elog "While we are moving towards the new Java system, we only allow"
+	elog "1.3 or 1.4 JDKs to be used with java-config-1 to ensure"
+	elog "backwards compatibility with the old system."
+	elog "For more details about this, please see:"
+	elog "\thttp://www.gentoo.org/proj/en/java/why-we-need-java-14.xml"
+}