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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

10 files changed, 10 insertions, 271 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/Manifest b/dev-java/java-config/Manifest
index 0994efdf24a5..755ff8ddf568 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,17 +1,6 @@
-AUX java-config-1.2.11-shebang.patch 229 RMD160 e201dafad76307123139861371ade56f03887342 SHA1 e91f77077bb0b5793bda7ffc58442019dc66db09 SHA256 4068a51515b7510260de57a5872d6e04b1a33d2f9728d77ed00fe7f41cced83a
-AUX java-config-2.1.8-load_packages.patch 560 RMD160 e09d06a132ac9caaef2239abd76132051899bfc5 SHA1 da884f8fa297a9e4cb3da199b43628927a6f119c SHA256 f77b4e42619514c98718762534ec6eb5743ffdf29afbd5988400ca8c5d94ce60
-AUX java-config-2.1.9-r2.patch 834 RMD160 0a4f368361e9791251a9af199d78d8ba3c4c8652 SHA1 5f879a2b3a820e54fbbac65e50fc36a54a4199db SHA256 0773971dce17012c3499379a91be1553f3299a89eb677a223a668d196b42a2af
-AUX java-config-2.1.9.patch 1630 RMD160 2b41d8bf1146b3d986e7161dee652a3471b5a556 SHA1 d21906d76fa8c67fd9519056dca78d962510be74 SHA256 df1f0d7320826adfaeec10edf6880621aaee1839e7e8f53f8fc3654576398bbb
-DIST java-config-1.3.7.tar.bz2 14362 RMD160 243739cdef9ea5b2baa708eabd5358d1804631de SHA1 48a46198ceace1a27d49c5176b2b6d720aaa9eff SHA256 bed302b9643d19caa3f1bbb75ebb8d9373a4ccf68a0b437a158f7265171f56d1
 DIST java-config-2.1.10.tar.bz2 45507 RMD160 55fc34441a1553035c3e4ae674756df494a1705a SHA1 e78a8032a436a63a583960fe85bd5396144f8a97 SHA256 d0afa1279a2bf91a307e54a78227fe413aad12c1a1beaac4ee90b39cc1485ba5
 DIST java-config-2.1.11.tar.bz2 60763 RMD160 35f62025fe9843769fe164d9bb50419fd2fc7e34 SHA1 df62f76957343108d1b27687132958853434982c SHA256 ffc90aac716f6edc2f99f70e4947eab606e3a70dadb90328dedda16345796bbe
-DIST java-config-2.1.8.tar.bz2 56913 RMD160 d16f8ae852580ee26644c086c12d1ca81e30ca87 SHA1 1d4a3f2c2bec42f192b49343b3ef86870261fb74 SHA256 c7b7953d1c601727904970f92df544a1508f5768d337591674a6356207967abe
-DIST java-config-2.1.9.tar.bz2 56757 RMD160 08e2cb147681fd71100aa40f892e8a71c503f256 SHA1 9a5c333ac0401d247969910e8165d77eeee86f7a SHA256 0d2ed065225474f030d63e51812b525781ec3325a5297da81c22a27e4d4a7778
-EBUILD java-config-1.3.7-r1.ebuild 1307 RMD160 9e2e1045e452bd4afd834fff437495d5d4c02e05 SHA1 b1f4850230c446a7f39033542707b9b4fe9496c1 SHA256 72ad16124c942d97ad0042c51b61747503b57fc5cc99223426e1d84035a6a0c6
 EBUILD java-config-2.1.10.ebuild 1373 RMD160 1ed799496e1473e04ba6ce3dfe46a8afa7424700 SHA1 c711ae1fbd96de480303ba373d80519670ebcb72 SHA256 492af964bbbf398e105f925c7ebc4c80713fd33a9e605b117badd6f48f3caf75
 EBUILD java-config-2.1.11.ebuild 1276 RMD160 b9b2966861b93618d3af3486774ebbbc23bfa4f8 SHA1 de4c27ece4049fa7a0ff6584f9ddf323c2cd575e SHA256 20396656312831bf2759e433b245704023a96fb03ea44b8d405b882567f7050a
-EBUILD java-config-2.1.8-r1.ebuild 1100 RMD160 9c2cdf3be8f0c4657bba57e8bee3b110139cabf0 SHA1 6eb468fc29d4a2f6f3f065cc9475c2f067ffb261 SHA256 34b0464f1513ba884ca830f748bb5aa6b9f7ffac8c0280a38090289a30a1ca97
-EBUILD java-config-2.1.9-r1.ebuild 1086 RMD160 69cac90e3adc54815cbfc35f3446e422bfb9c904 SHA1 3ea1dbcc00f94e969b31e2936c5900f949e4c58f SHA256 71b615aef705ebf77190551496fd20431e436c2b95bbe4c8db7bdc681048512f
-EBUILD java-config-2.1.9-r2.ebuild 1125 RMD160 df2e99dd49e7a4cae8d9596d5b55909f5d896ce0 SHA1 edd29e0e0746d2b1791ad4cf5f16bd90ede121d7 SHA256 e51552023b80b625563113bd3ac51f999fedbf8dfb07f65e7da07c8eedd13619
-MISC ChangeLog 41414 RMD160 8b70ca06bdd012b8d11bfb6fe67219366255e931 SHA1 3828ff648bdfc435fb4b18f7d8b68f32ba0839b2 SHA256 8018bb8fb30d5e623d56622320023e78737947ba4dd5de9565ed9b166b3126dc
+MISC ChangeLog 41816 RMD160 2ca2769d5fe670322e33f7b7d48819587fcc2994 SHA1 39101f1a85e38472f6be2d6688342ee7a1b55529 SHA256 350789a350a61f4862c13b92f04275cae35725399e933e0cdea68af670ef72d4
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
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
-}