Remove old versions of java-config-2 and the whole java-config-1.

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

9 files changed, 9 insertions, 259 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index d4c1d03de257..ed8aea6e11f9 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.242 2010/04/28 12:05:35 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.243 2010/04/28 19:43:28 caster Exp $
+
+  28 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  -files/java-config-1.2.11-shebang.patch, -java-config-1.3.7-r1.ebuild,
+  -java-config-2.1.8-r1.ebuild,
+  -files/java-config-2.1.8-load_packages.patch,
+  -java-config-2.1.9-r1.ebuild, -java-config-2.1.9-r2.ebuild,
+  -files/java-config-2.1.9-r2.patch, -files/java-config-2.1.9.patch:
+  Remove old versions of java-config-2 and the whole java-config-1.
 
   29 Apr 2010; Alistair Bush <ali_bush@gentoo.org>
   java-config-2.1.11.ebuild:
diff --git a/dev-java/java-config/files/java-config-1.2.11-shebang.patch b/dev-java/java-config/files/java-config-1.2.11-shebang.patch
deleted file mode 100644
index 256edc13fd2a..000000000000
--- a/dev-java/java-config/files/java-config-1.2.11-shebang.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- java-config 13 Jan 2005 22:39:18 -0000      1.37
-+++ java-config 18 Jun 2005 13:43:47 -0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-  
-   # Copyright 2001-2005 Gentoo Foundation
-
diff --git a/dev-java/java-config/files/java-config-2.1.8-load_packages.patch b/dev-java/java-config/files/java-config-2.1.8-load_packages.patch
deleted file mode 100644
index dd2855a45a57..000000000000
--- a/dev-java/java-config/files/java-config-2.1.8-load_packages.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: java_config_2/EnvironmentManager.py
-===================================================================
---- src/java_config_2/EnvironmentManager.py	(revision 7809)
-+++ src/java_config_2/EnvironmentManager.py	(working copy)
-@@ -81,7 +81,7 @@
-                 raise UnexistingPackageError(name)
- 
-     def load_packages(self):
--        for package in iter(glob(self.pkg_path) % "*" ):
-+        for package in iter(glob(self.pkg_path % "*" )):
-             name = basename(dirname(package))
-             if name in self.packages:
-                 continue
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
deleted file mode 100644
index 1afe13526a9f..000000000000
--- a/dev-java/java-config/files/java-config-2.1.9-r2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/files/java-config-2.1.9.patch b/dev-java/java-config/files/java-config-2.1.9.patch
deleted file mode 100644
index d2e81af330b8..000000000000
--- a/dev-java/java-config/files/java-config-2.1.9.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: src/depend-java-query
-===================================================================
---- src/depend-java-query	(revision 7909)
-+++ src/depend-java-query	(working copy)
-@@ -40,7 +40,7 @@
- 
- def get_vm(option, opt, value, parser):
-     try:
--        vm = verman.get_vm(value, False)
-+        vm = verman.get_vm(value, True)
-         printer._print(vm)
-     except Exception, ex:
-         printer._printError(str(ex))
-Index: java-config-2
-===================================================================
---- src/java-config-2	(revision 7909)
-+++ src/java-config-2	(working copy)
-@@ -143,12 +143,15 @@
-     printer._print('%HThe following VMs are available for generation-2:%$')
-     for i, vm in vm_list.iteritems():
-         if vm is active:
--            printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'), vm.name(), '%$'))
-+            if not vm.is_build_only():
-+                printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'), vm.name(), '%$'))
-+            else:
-+                printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'), vm.name(), '%$') + '%r (Build Only)%$')
-         else:
-             if not vm.is_build_only():
-                 printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'), vm.name()))
-             else:
--                printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'), vm.name()) + '%r (Build Only)')
-+                printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'), vm.name()) + '%r (Build Only)%$')
- 
-     printer._print('')
-     printer._print('%r' + 'VMs marked as Build Only may contain Security Vulnerabilities and/or be EOL.')
diff --git a/dev-java/java-config/java-config-1.3.7-r1.ebuild b/dev-java/java-config/java-config-1.3.7-r1.ebuild
deleted file mode 100644
index 79533622f75b..000000000000
--- a/dev-java/java-config/java-config-1.3.7-r1.ebuild
+++ /dev/null
@@ -1,46 +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-1.3.7-r1.ebuild,v 1.5 2009/01/07 15:54:04 ranger 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug #208873
-	rm -f ez_setup.py || die
-}
-
-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.8-r1.ebuild b/dev-java/java-config/java-config-2.1.8-r1.ebuild
deleted file mode 100644
index 5cab5b7bdbec..000000000000
--- a/dev-java/java-config/java-config-2.1.8-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 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-r1.ebuild,v 1.7 2010/02/26 19:26:02 arfrever 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_unpack() {
-	distutils_src_unpack
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-load_packages.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_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.9-r1.ebuild b/dev-java/java-config/java-config-2.1.9-r1.ebuild
deleted file mode 100644
index e501861dbe86..000000000000
--- a/dev-java/java-config/java-config-2.1.9-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 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-r1.ebuild,v 1.8 2010/02/26 19:26:02 arfrever 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_unpack() {
-	distutils_src_unpack
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}.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_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.9-r2.ebuild b/dev-java/java-config/java-config-2.1.9-r2.ebuild
deleted file mode 100644
index 75acad056ca8..000000000000
--- a/dev-java/java-config/java-config-2.1.9-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 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-r2.ebuild,v 1.4 2010/02/26 19:26:02 arfrever 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_unpack() {
-	distutils_src_unpack
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}.patch"
-	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() {
-	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
-}