Tweaked output to be similar to java-config-1. A notice is displayed when a user or system VM is set.

Package-Manager: portage-2.1.2_pre1

4 files changed, 12 insertions, 93 deletions

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 48eb3858b09b..2acdf7f6051a 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -14,17 +14,13 @@ 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.28-classpath.patch 406 RMD160 02650f4d09df8932b973a268f082a8df165b841f SHA1 64c2de77ee1d8c5af48ca1851ef8426fb569429f SHA256 def7f1db8e8fb6a441610e27d29a22578e63a4f566079e750b11fcb928d6c870
-MD5 e386b6137061c69cc309ca3f8d940bec files/java-config-2.0.28-classpath.patch 406
-RMD160 02650f4d09df8932b973a268f082a8df165b841f files/java-config-2.0.28-classpath.patch 406
-SHA256 def7f1db8e8fb6a441610e27d29a22578e63a4f566079e750b11fcb928d6c870 files/java-config-2.0.28-classpath.patch 406
 AUX java-config-2.profiled 762 RMD160 07d9d403a9adb62ecb5bb10a91bee81e6be1ac4e SHA1 2b26f31322dea6b74ca7208b346194bdb13da9b4 SHA256 47a56170921e2f806efa0b3cc76f84db75f212cf687f019052cfb56de49c6e81
 MD5 93060fff650a2b3577256baebaf8ea64 files/java-config-2.profiled 762
 RMD160 07d9d403a9adb62ecb5bb10a91bee81e6be1ac4e files/java-config-2.profiled 762
 SHA256 47a56170921e2f806efa0b3cc76f84db75f212cf687f019052cfb56de49c6e81 files/java-config-2.profiled 762
 DIST java-config-1.2.11.tar.bz2 15743 RMD160 e1175474e87f234f9428d7db6827a3a4435e6aba SHA1 fd2ffdda515005ef7a9358b650f59674c13bc0b7 SHA256 f17bdce2b97dca14daf77dbefb6d6c0935fbc444b67e9a0d7cc68538575a6b83
 DIST java-config-1.3.7.tar.bz2 14362 RMD160 243739cdef9ea5b2baa708eabd5358d1804631de SHA1 48a46198ceace1a27d49c5176b2b6d720aaa9eff SHA256 bed302b9643d19caa3f1bbb75ebb8d9373a4ccf68a0b437a158f7265171f56d1
-DIST java-config-2.0.29.tar.bz2 16503 RMD160 1b583c261e16bd4deb919bca434c42d3b10ce576 SHA1 f567dbc34e42eb5c1cc86fdb2ff57b7fddbd7c6f SHA256 66064a3e04deedbf3dba909335d0e1505a7f939b6ec241e3b9eebf1971b494f4
+DIST java-config-2.0.30.tar.bz2 16515 RMD160 8eefa3a8bca334c61c3cca1429fcdd0339167b6a SHA1 b6ed21c95f674e8c9fd277b04b6282edd56f26f2 SHA256 934fd8fe9498e5158f91e6f48d604ee15750737918cddcd92c187ed3dfac36d4
 EBUILD java-config-1.2.11-r1.ebuild 874 RMD160 caf41840d1b96596b88464edf9e476e8debe621d SHA1 f669e17d7153660b532671a6e3696c86d8d21ae7 SHA256 abf7e6e4ebc06bcd838ab4e9466d7c8e076d6f808242203693c46cdddb9c081f
 MD5 7e9562363f495fbef6591ad21366d0a4 java-config-1.2.11-r1.ebuild 874
 RMD160 caf41840d1b96596b88464edf9e476e8debe621d java-config-1.2.11-r1.ebuild 874
@@ -33,14 +29,14 @@ EBUILD java-config-1.3.7.ebuild 1231 RMD160 972e57978309dfba4110f621fa83949a62bd
 MD5 f197bf53c1965c3acfa0cbe6f0449493 java-config-1.3.7.ebuild 1231
 RMD160 972e57978309dfba4110f621fa83949a62bdd960 java-config-1.3.7.ebuild 1231
 SHA256 df187e46e0af6e4bd9ac9414b57e87bb6341032a54dc8c4cb912dac98fb927c6 java-config-1.3.7.ebuild 1231
-EBUILD java-config-2.0.29.ebuild 1799 RMD160 acd74086a95f43c477c806c0985edf6c09ed7da1 SHA1 b72fca03c350b93841e1dbffdc6a3c5d2fdb187a SHA256 50e2b5f5a09e8eb1fa179b90acd6917fd395b5e051546e99f8202edb1e02d7f2
-MD5 1ddb1d7a698eab13b80def4527556f08 java-config-2.0.29.ebuild 1799
-RMD160 acd74086a95f43c477c806c0985edf6c09ed7da1 java-config-2.0.29.ebuild 1799
-SHA256 50e2b5f5a09e8eb1fa179b90acd6917fd395b5e051546e99f8202edb1e02d7f2 java-config-2.0.29.ebuild 1799
-MISC ChangeLog 23470 RMD160 2b531cfb1b4fe99763274e457c01725d846fac2c SHA1 7408361abde12a2b35ffcffa041c13b7ebb1c5dd SHA256 e06785fef39df94c36c9f63209db4e90f76013a48bfb4b8d05af1562a312658c
-MD5 c645b0e136e4aed52ae39152b4ec9a1f ChangeLog 23470
-RMD160 2b531cfb1b4fe99763274e457c01725d846fac2c ChangeLog 23470
-SHA256 e06785fef39df94c36c9f63209db4e90f76013a48bfb4b8d05af1562a312658c ChangeLog 23470
+EBUILD java-config-2.0.30.ebuild 1799 RMD160 1a7319910c2ad9590c0a9a53c1c4261c0c9d41c8 SHA1 86cc7b9e4e37d0fc805b8f2c5c74825f7f83d503 SHA256 3b83d170dd143c44fe617dbed83e3ce65df4c162f7fcf2d093c81b0e6b96dbb7
+MD5 c5080a7ee0141ec4a8bb103d1cc761e3 java-config-2.0.30.ebuild 1799
+RMD160 1a7319910c2ad9590c0a9a53c1c4261c0c9d41c8 java-config-2.0.30.ebuild 1799
+SHA256 3b83d170dd143c44fe617dbed83e3ce65df4c162f7fcf2d093c81b0e6b96dbb7 java-config-2.0.30.ebuild 1799
+MISC ChangeLog 23765 RMD160 874d4621cc57ab54a00185c20e289a9373202885 SHA1 3356de961e74c4c581604f2dee39a6c5603cb195 SHA256 a804602781cec6b6a5c01d6bfd2309be257dc8cede22900f167675e6175661bf
+MD5 016d72a273a11164ab1ed0a2d46068b4 ChangeLog 23765
+RMD160 874d4621cc57ab54a00185c20e289a9373202885 ChangeLog 23765
+SHA256 a804602781cec6b6a5c01d6bfd2309be257dc8cede22900f167675e6175661bf ChangeLog 23765
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
 MD5 b4d3814b9ce4be88a25d99b3cfe2c076 metadata.xml 482
 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 metadata.xml 482
@@ -51,6 +47,6 @@ SHA256 da2af16dd2d187eb5301706d751663c290362f05f8a84eed14ecf5c21284c7da files/di
 MD5 764e769fb80b4c3af66a654f3bf0e355 files/digest-java-config-1.3.7 253
 RMD160 acb6de241d4f8fbb826e26b960d5bdc8d4b4c7ad files/digest-java-config-1.3.7 253
 SHA256 2159b501a5193cde183ec9c8b6a4f1b358d4e2e02c156405a4b01c9100a5207a files/digest-java-config-1.3.7 253
-MD5 30d6cb012426e3dec82312a1589e7841 files/digest-java-config-2.0.29 256
-RMD160 6726e9aab1a0ec9e42e188b81451a0a8452af699 files/digest-java-config-2.0.29 256
-SHA256 81a687d465cdb3c8dc8628ab73570c4d56bba8fff22b0b84fc4034261809defb files/digest-java-config-2.0.29 256
+MD5 46c3bc6bfa51018218ebe3c55e471739 files/digest-java-config-2.0.30 256
+RMD160 eaa598710c997eaa020dbd8d77fb5202e470cf42 files/digest-java-config-2.0.30 256
+SHA256 c538263f8965d72090e73bce94903981faa6196d12b56959f4f5abc2e2c5daac files/digest-java-config-2.0.30 256
diff --git a/dev-java/java-config/files/digest-java-config-2.0.29 b/dev-java/java-config/files/digest-java-config-2.0.29
deleted file mode 100644
index f6d8f82ac15f..000000000000
--- a/dev-java/java-config/files/digest-java-config-2.0.29
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bb1b626ee2c503b8fc16bafb6c6f54b3 java-config-2.0.29.tar.bz2 16503
-RMD160 1b583c261e16bd4deb919bca434c42d3b10ce576 java-config-2.0.29.tar.bz2 16503
-SHA256 66064a3e04deedbf3dba909335d0e1505a7f939b6ec241e3b9eebf1971b494f4 java-config-2.0.29.tar.bz2 16503
diff --git a/dev-java/java-config/files/java-config-2.0.28-classpath.patch b/dev-java/java-config/files/java-config-2.0.28-classpath.patch
deleted file mode 100644
index 1ba6afb625eb..000000000000
--- a/dev-java/java-config/files/java-config-2.0.28-classpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/gjl
-===================================================================
---- src/gjl	(revision 2712)
-+++ src/gjl	(working copy)
-@@ -89,6 +89,11 @@
- 
-     classpath, library = get_pkg_args(pkg)
-     if classpath:
-+        envcp = os.getenv('CLASSPATH')
-+
-+        if envcp:
-+            classpath = ':'.join((envcp, classpath))
-+
-         args += ' -classpath %s' % (classpath)
- 
-     if library:
diff --git a/dev-java/java-config/java-config-2.0.29.ebuild b/dev-java/java-config/java-config-2.0.29.ebuild
deleted file mode 100644
index c5da4cd1fbf1..000000000000
--- a/dev-java/java-config/java-config-2.0.29.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2006 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.29.ebuild,v 1.4 2006/09/22 17:16:48 caster 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 ~sparc ~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; 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 ${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 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 "\thttps://overlays.gentoo.org/proj/java/wiki/Why_We_Need_Java14"
-}