Cleanup old versions and files.

(Portage version: 2.1.2.9)

15 files changed, 10 insertions, 344 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 658fc7e1ba3f..411c8aaa794a 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,15 @@
 # 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.164 2007/06/07 10:44:28 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.165 2007/06/07 12:15:36 caster Exp $
+
+  07 Jun 2007; Vlastimil Babka <caster@gentoo.org>
+  -files/java-config-1.3.1-no20java.patch,
+  -files/java-config-1.3.5-javahomestacktrace.patch,
+  -files/java-config-1.3.6-jh.patch, -files/jdk-defaults-ia64.conf.patch,
+  -files/java-config-2.profiled.sh, -files/jdk-defaults-x86-fbsd.conf,
+  -java-config-2.0.31.ebuild, -java-config-2.0.31-r5.ebuild,
+  -java-config-2.0.31-r6.ebuild, -java-config-2.0.31-r7.ebuild:
+  Cleanup old versions and files.
 
   07 Jun 2007; Markus Rothe <corsair@gentoo.org> java-config-2.0.32.ebuild:
   Stable on ppc64; bug #179810
diff --git a/dev-java/java-config/files/digest-java-config-2.0.31 b/dev-java/java-config/files/digest-java-config-2.0.31
deleted file mode 100644
index 393d9dbec4ef..000000000000
--- a/dev-java/java-config/files/digest-java-config-2.0.31
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 36b7893b20b9f4b6f0af6dd632703745 java-config-2.0.31.tar.bz2 17001
-RMD160 4b3d8362538b435a642312ee7289824d6662e309 java-config-2.0.31.tar.bz2 17001
-SHA256 314ec1783da8190d60e757aaef2af8eae7281c3c9754024e3e59643ce7a30752 java-config-2.0.31.tar.bz2 17001
diff --git a/dev-java/java-config/files/digest-java-config-2.0.31-r5 b/dev-java/java-config/files/digest-java-config-2.0.31-r5
deleted file mode 100644
index 393d9dbec4ef..000000000000
--- a/dev-java/java-config/files/digest-java-config-2.0.31-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 36b7893b20b9f4b6f0af6dd632703745 java-config-2.0.31.tar.bz2 17001
-RMD160 4b3d8362538b435a642312ee7289824d6662e309 java-config-2.0.31.tar.bz2 17001
-SHA256 314ec1783da8190d60e757aaef2af8eae7281c3c9754024e3e59643ce7a30752 java-config-2.0.31.tar.bz2 17001
diff --git a/dev-java/java-config/files/digest-java-config-2.0.31-r6 b/dev-java/java-config/files/digest-java-config-2.0.31-r6
deleted file mode 100644
index 393d9dbec4ef..000000000000
--- a/dev-java/java-config/files/digest-java-config-2.0.31-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 36b7893b20b9f4b6f0af6dd632703745 java-config-2.0.31.tar.bz2 17001
-RMD160 4b3d8362538b435a642312ee7289824d6662e309 java-config-2.0.31.tar.bz2 17001
-SHA256 314ec1783da8190d60e757aaef2af8eae7281c3c9754024e3e59643ce7a30752 java-config-2.0.31.tar.bz2 17001
diff --git a/dev-java/java-config/files/digest-java-config-2.0.31-r7 b/dev-java/java-config/files/digest-java-config-2.0.31-r7
deleted file mode 100644
index 393d9dbec4ef..000000000000
--- a/dev-java/java-config/files/digest-java-config-2.0.31-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 36b7893b20b9f4b6f0af6dd632703745 java-config-2.0.31.tar.bz2 17001
-RMD160 4b3d8362538b435a642312ee7289824d6662e309 java-config-2.0.31.tar.bz2 17001
-SHA256 314ec1783da8190d60e757aaef2af8eae7281c3c9754024e3e59643ce7a30752 java-config-2.0.31.tar.bz2 17001
diff --git a/dev-java/java-config/files/java-config-1.3.1-no20java.patch b/dev-java/java-config/files/java-config-1.3.1-no20java.patch
deleted file mode 100644
index a62c1fc5bbfd..000000000000
--- a/dev-java/java-config/files/java-config-1.3.1-no20java.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru java-config-1.3.1-orig/java_config/jc_util.py java-config-1.3.1/java_config/jc_util.py
---- java-config-1.3.1-orig/java_config/jc_util.py	2006-08-23 23:54:30.000000000 -0400
-+++ java-config-1.3.1/java_config/jc_util.py	2006-08-24 20:26:25.000000000 -0400
-@@ -80,6 +80,7 @@
- 		except:
- 			continue
- 		# Read VMHANDLE from /etc/env.d/20java
-+		envVmHandle = ''
- 		try:
- 			fh = open('/etc/env.d/20java')
- 			for line in fh.readlines():
diff --git a/dev-java/java-config/files/java-config-1.3.5-javahomestacktrace.patch b/dev-java/java-config/files/java-config-1.3.5-javahomestacktrace.patch
deleted file mode 100644
index a4c9a3fc35d9..000000000000
--- a/dev-java/java-config/files/java-config-1.3.5-javahomestacktrace.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru java-config-1.3.5-orig/java_config/jc_util.py java-config-1.3.5/java_config/jc_util.py
---- java-config-1.3.5-orig/java_config/jc_util.py	2006-09-06 08:52:24.000000000 -0400
-+++ java-config-1.3.5/java_config/jc_util.py	2006-09-06 08:56:53.000000000 -0400
-@@ -104,10 +104,10 @@
- 	can't be found
- 	"""
- 
--	jh = JAVA_HOME
--
- 	if java_home is not None:
- 		jh = java_home
-+	else:
-+		jh = get_java_home()
- 
- 	exec_0 = jh+'/bin/'+exe
- 	exec_1 = jh+'/jre/bin/'+exe
diff --git a/dev-java/java-config/files/java-config-1.3.6-jh.patch b/dev-java/java-config/files/java-config-1.3.6-jh.patch
deleted file mode 100644
index c984c30e0c9e..000000000000
--- a/dev-java/java-config/files/java-config-1.3.6-jh.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Only in java-config-1.3.6/java_config: .jc_options.py.swp
-Only in java-config-1.3.6/java_config: .jc_util.py.swp
-diff -ru java-config-1.3.6-orig/java_config/jc_options.py java-config-1.3.6/java_config/jc_options.py
---- java-config-1.3.6-orig/java_config/jc_options.py	2006-09-11 13:49:21.000000000 -0400
-+++ java-config-1.3.6/java_config/jc_options.py	2006-09-11 14:00:25.000000000 -0400
-@@ -515,13 +515,13 @@
- 
- 	for exe in executables_a_system_vm_should_have:
- 		try:
--			find_exec(exe, java_home=java_home)
-+			find_exec(exe, java_home)
- 		except OptionRuntimeError, e:
- 			suk = True
- 			warn(str(e))	
- 
- 	try:
--		find_exec('rmic', java_home=java_home)
-+		find_exec('rmic', java_home)
- 	except OptionRuntimeError, e:
- 		warn(str(e))
- 
-diff -ru java-config-1.3.6-orig/java_config/jc_util.py java-config-1.3.6/java_config/jc_util.py
---- java-config-1.3.6-orig/java_config/jc_util.py	2006-09-11 13:49:21.000000000 -0400
-+++ java-config-1.3.6/java_config/jc_util.py	2006-09-11 13:49:56.000000000 -0400
-@@ -97,7 +97,7 @@
- 			'Virtual Machine'
- 
- 
--def find_exec(exe, java_home):
-+def find_exec(exe, jh):
- 	"""
- 	Find executable 'exe' and return it, search the /bin and /jre/bin dirs 
- 	of current JVM. Raises an error if the command isn't executable or if it
diff --git a/dev-java/java-config/files/java-config-2.profiled.sh b/dev-java/java-config/files/java-config-2.profiled.sh
deleted file mode 100644
index 8f317fa59e04..000000000000
--- a/dev-java/java-config/files/java-config-2.profiled.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.sh,v 1.1 2007/01/12 17:57:48 betelgeuse Exp $
-
-# If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
-gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
-gentoo_system_vm="/etc/java-config-2/current-system-vm"
-
-if [[ ${UID} != 0 && -L ${gentoo_user_vm} ]]; then
-	export JAVA_HOME=${gentoo_user_vm}
-# Otherwise set to the current system vm
-elif [[ -L /etc/java-config-2/current-system-vm ]]; then
-	export JAVA_HOME=${gentoo_system_vm}
-fi
-export JDK_HOME=${JAVA_HOME}
-export JAVAC=${JDK_HOME}/bin/javac
-unset gentoo_user_vm gentoo_system_vm
diff --git a/dev-java/java-config/files/jdk-defaults-ia64.conf.patch b/dev-java/java-config/files/jdk-defaults-ia64.conf.patch
deleted file mode 100644
index 2be011bb2f6b..000000000000
--- a/dev-java/java-config/files/jdk-defaults-ia64.conf.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-Index: config/jdk-defaults-ia64.conf
-===================================================================
---- config/jdk-defaults-ia64.conf	(revision 3624)
-+++ config/jdk-defaults-ia64.conf	(revision 4152)
-@@ -1,2 +1,2 @@
- # This files contain the default support jdk's
--*= jrockit-bin-jdk
-+*= jrockit-jdk-bin
diff --git a/dev-java/java-config/files/jdk-defaults-x86-fbsd.conf b/dev-java/java-config/files/jdk-defaults-x86-fbsd.conf
deleted file mode 100644
index 2af5546093a4..000000000000
--- a/dev-java/java-config/files/jdk-defaults-x86-fbsd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# This files contain the default support jdk's
-*= diablo-jdk
diff --git a/dev-java/java-config/java-config-2.0.31-r5.ebuild b/dev-java/java-config/java-config-2.0.31-r5.ebuild
deleted file mode 100644
index cf6e7e0285cd..000000000000
--- a/dev-java/java-config/java-config-2.0.31-r5.ebuild
+++ /dev/null
@@ -1,61 +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-2.0.31-r5.ebuild,v 1.5 2007/04/15 13:14:03 nixnut 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="2"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-lang/python"
-RDEPEND="${DEPEND}
-	dev-java/java-config-wrapper"
-
-src_install() {
-	distutils_src_install
-
-	insinto /usr/share/java-config-2/config/
-	for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86 x86-fbsd; do
-		if use ${i}; then
-			newins config/jdk-defaults-${i}.conf jdk-defaults.conf || die "arch	config not found"
-		fi
-	done
-
-	for tool in $(< config/symlink-tools); do
-		dosym /usr/bin/run-java-tool /usr/bin/${tool}
-	done
-
-	# Install profile.d for setting JAVA_HOME
-	dodir /etc/profile.d
-	exeinto /etc/profile.d
-	newexe ${FILESDIR}/${PN}-${SLOT}.profiled.sh-r1 ${PN}-${SLOT}.sh || die "newexe failed"
-	newexe ${FILESDIR}/${PN}-${SLOT}.profiled.csh ${PN}-${SLOT}.csh || die "newexe failed"
-
-	insinto /etc/revdep-rebuild/
-	doins "${FILESDIR}/60-java" || die
-}
-
-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"
-}
diff --git a/dev-java/java-config/java-config-2.0.31-r6.ebuild b/dev-java/java-config/java-config-2.0.31-r6.ebuild
deleted file mode 100644
index 980c8de272a9..000000000000
--- a/dev-java/java-config/java-config-2.0.31-r6.ebuild
+++ /dev/null
@@ -1,63 +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-2.0.31-r6.ebuild,v 1.2 2007/03/31 20:59:38 armin76 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="2"
-KEYWORDS="ia64"
-IUSE=""
-
-DEPEND="dev-lang/python"
-RDEPEND="${DEPEND}
-	dev-java/java-config-wrapper"
-
-PATCHES="${FILESDIR}/jdk-defaults-ia64.conf.patch"
-
-src_install() {
-	distutils_src_install
-
-	insinto /usr/share/java-config-2/config/
-	for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86 x86-fbsd; do
-		if use ${i}; then
-			newins config/jdk-defaults-${i}.conf jdk-defaults.conf || die "arch	config not found"
-		fi
-	done
-
-	for tool in $(< config/symlink-tools); do
-		dosym /usr/bin/run-java-tool /usr/bin/${tool}
-	done
-
-	# Install profile.d for setting JAVA_HOME
-	dodir /etc/profile.d
-	exeinto /etc/profile.d
-	newexe ${FILESDIR}/${PN}-${SLOT}.profiled.sh-r1 ${PN}-${SLOT}.sh || die "newexe failed"
-	newexe ${FILESDIR}/${PN}-${SLOT}.profiled.csh ${PN}-${SLOT}.csh || die "newexe failed"
-
-	insinto /etc/revdep-rebuild/
-	doins "${FILESDIR}/60-java" || die
-}
-
-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"
-}
diff --git a/dev-java/java-config/java-config-2.0.31-r7.ebuild b/dev-java/java-config/java-config-2.0.31-r7.ebuild
deleted file mode 100644
index 8be542f2d92a..000000000000
--- a/dev-java/java-config/java-config-2.0.31-r7.ebuild
+++ /dev/null
@@ -1,65 +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-2.0.31-r7.ebuild,v 1.1 2007/04/15 20:31:41 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="2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-lang/python"
-RDEPEND="${DEPEND}
-	dev-java/java-config-wrapper"
-
-PATCHES="${FILESDIR}/jdk-defaults-ia64.conf.patch"
-
-src_install() {
-	distutils_src_install
-
-	insinto /usr/share/java-config-2/config/
-	for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86 x86-fbsd; do
-		if use ${i}; then
-			newins config/jdk-defaults-${i}.conf jdk-defaults.conf || die "arch	config not found"
-		fi
-	done
-
-	for tool in $(< config/symlink-tools); do
-		dosym /usr/bin/run-java-tool /usr/bin/${tool}
-	done
-	# Remove in the next release
-	dosym /usr/bin/run-java-tool /usr/bin/keytool
-
-	# Install profile.d for setting JAVA_HOME
-	dodir /etc/profile.d
-	exeinto /etc/profile.d
-	newexe ${FILESDIR}/${PN}-${SLOT}.profiled.sh-r1 ${PN}-${SLOT}.sh || die "newexe failed"
-	newexe ${FILESDIR}/${PN}-${SLOT}.profiled.csh ${PN}-${SLOT}.csh || die "newexe failed"
-
-	insinto /etc/revdep-rebuild/
-	doins "${FILESDIR}/60-java" || die
-}
-
-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"
-}
diff --git a/dev-java/java-config/java-config-2.0.31.ebuild b/dev-java/java-config/java-config-2.0.31.ebuild
deleted file mode 100644
index f281ed0db37e..000000000000
--- a/dev-java/java-config/java-config-2.0.31.ebuild
+++ /dev/null
@@ -1,55 +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-2.0.31.ebuild,v 1.7 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="2"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-java/java-config-wrapper"
-
-src_install() {
-	distutils_src_install
-
-	insinto /usr/share/java-config-2/config/
-	for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86 x86-fbsd; do
-		if use ${i}; then
-			newins config/jdk-defaults-${i}.conf jdk-defaults.conf || die "arch	config not found"
-		fi
-	done
-
-	for tool in $(< config/symlink-tools); do
-		dosym /usr/bin/run-java-tool /usr/bin/${tool}
-	done
-
-	# Install profile.d for setting JAVA_HOME
-	dodir /etc/profile.d
-	exeinto /etc/profile.d
-	newexe ${FILESDIR}/${PN}-${SLOT}.profiled.sh ${PN}-${SLOT}.sh || die "newexe failed"
-}
-
-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"
-}