Remove some cruft.

(Portage version: 2.2_rc20/cvs/Linux 2.6.28-gentoo-perfctr x86_64)

5 files changed, 6 insertions, 217 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index c17ecf07bb8d..b5105510b944 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/java-config
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.205 2009/01/07 20:24:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.206 2009/01/07 21:41:14 caster Exp $
+
+  07 Jan 2009; Vlastimil Babka <caster@gentoo.org>
+  -files/java-config-2.0.33-r1.patch, -files/java-config-2.1.2-r1.patch,
+  -java-config-1.3.7.ebuild, -java-config-2.1.6.ebuild:
+  Remove some cruft.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> java-config-2.1.6-r1.ebuild:
   Marking java-config-2.1.6-r1 ppc64 for bug 250773
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
deleted file mode 100644
index 9b49cd53f55e..000000000000
--- a/dev-java/java-config/files/java-config-2.0.33-r1.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-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/files/java-config-2.1.2-r1.patch b/dev-java/java-config/files/java-config-2.1.2-r1.patch
deleted file mode 100644
index 4c644c26d182..000000000000
--- a/dev-java/java-config/files/java-config-2.1.2-r1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- tags/2.1.2/src/java_config_2/EnvironmentManager.py	2007-10-14 16:00:23.000000000 +1300
-+++ src/java_config_2/EnvironmentManager.py	2007-10-14 20:22:03.000000000 +1300
-@@ -36,8 +36,7 @@
-             self.load_active_vm()
-         except InvalidVMError:
-             pass
--        finally:
--            pass
-+        pass
- 
-     def __call__(self):
-         return self
diff --git a/dev-java/java-config/java-config-1.3.7.ebuild b/dev-java/java-config/java-config-1.3.7.ebuild
deleted file mode 100644
index 4b49c7b37562..000000000000
--- a/dev-java/java-config/java-config-1.3.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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-1.3.7.ebuild,v 1.9 2007/03/09 14:01:43 betelgeuse Exp $
-
-inherit base 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="0"
-KEYWORDS="amd64 ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="virtual/python
-	dev-java/java-config-wrapper"
-
-src_install() {
-	distutils_src_install
-	newbin java-config java-config-1
-	doman java-config.1
-
-	doenvd 30java-finalclasspath
-}
-
-pkg_postinst() {
-	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"
-}
diff --git a/dev-java/java-config/java-config-2.1.6.ebuild b/dev-java/java-config/java-config-2.1.6.ebuild
deleted file mode 100644
index 9aeab1028c1c..000000000000
--- a/dev-java/java-config/java-config-2.1.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.ebuild,v 1.6 2008/06/26 16:34:09 nixnut 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_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
-}