Changed PROVIDES_TYPE from "JDK" to "JDK JRE"

Package-Manager: portage-2.1.2_rc2-r3

3 files changed, 18 insertions, 67 deletions

diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 5dac151912ba..70cf4f054a97 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX jamvm.env 327 RMD160 86b32080858d3fb4859411e6572b3d1865eba297 SHA1 c9e96b7a1feaf1f329e57d968caa408fbcfb4224 SHA256 21f55567c9dda366be3dac8d6063b56ef9b04713d0c332aaadab10cb82f19dc4
-MD5 303152bfab3a96d9d773a16a91dbff22 files/jamvm.env 327
-RMD160 86b32080858d3fb4859411e6572b3d1865eba297 files/jamvm.env 327
-SHA256 21f55567c9dda366be3dac8d6063b56ef9b04713d0c332aaadab10cb82f19dc4 files/jamvm.env 327
+AUX jamvm.env 331 RMD160 33e990fb7c22f310cc9c4ce678a67f3f8062ade1 SHA1 c60faaf90d26c45ceaaf1a84d2b476aed7adb048 SHA256 dca8067931277eb7e919c820d83e3dcfaa46d9c70103f2c023e83eb04b45bd92
+MD5 b0936632c4396565e0a4038ea061decb files/jamvm.env 331
+RMD160 33e990fb7c22f310cc9c4ce678a67f3f8062ade1 files/jamvm.env 331
+SHA256 dca8067931277eb7e919c820d83e3dcfaa46d9c70103f2c023e83eb04b45bd92 files/jamvm.env 331
 DIST jamvm-1.4.2.tar.gz 285593 RMD160 ca9d26f90dd04e5aaefb1c33dda59a4f41456e31 SHA1 cfda95e52261d58e535a0c8ec03878304e9560c7 SHA256 dae915b7f963762385df2f4660eaad497261fa72393ba69339530e5b0b5d8bc3
 DIST jamvm-1.4.4.tar.gz 530157 RMD160 765149cf26314ab6355fcbec37b833b4e4e5fc88 SHA1 1a371a744da6faad3f5edd97966ec6b7fcc10432 SHA256 991a6f4e452e8d05750f33d5bac96b842e9093072c5152255bc75cfcf0b173e5
 EBUILD jamvm-1.4.2.ebuild 1058 RMD160 059f12a824e6177b53d903a65f2cfa56edb047d7 SHA1 91f8cf3b8075ca5109f97e826e30b187c532fc66 SHA256 39b323f11ed4fba94e2ef84a9525d4b7427d08150fd24fd920d85b80b91223b2
 MD5 f14ccf87ebfe20825f7143bd09c31715 jamvm-1.4.2.ebuild 1058
 RMD160 059f12a824e6177b53d903a65f2cfa56edb047d7 jamvm-1.4.2.ebuild 1058
 SHA256 39b323f11ed4fba94e2ef84a9525d4b7427d08150fd24fd920d85b80b91223b2 jamvm-1.4.2.ebuild 1058
-EBUILD jamvm-1.4.4.ebuild 1335 RMD160 ab5efbb3c16948bbab7e2942af666f4dd5d6eb73 SHA1 5d372573e9a4979c1c1dd517d9f6cfd876f153b6 SHA256 90daa183addfb6d504f16a6ad69fcd672c62a0c815323f2810bdfdef18762b98
-MD5 cc21ccc3f4248d1f52ed6c9d38b93494 jamvm-1.4.4.ebuild 1335
-RMD160 ab5efbb3c16948bbab7e2942af666f4dd5d6eb73 jamvm-1.4.4.ebuild 1335
-SHA256 90daa183addfb6d504f16a6ad69fcd672c62a0c815323f2810bdfdef18762b98 jamvm-1.4.4.ebuild 1335
-MISC ChangeLog 3557 RMD160 bee0dcca26c08addddcbd07b03f86ac800d46d3e SHA1 02b79bc1c43b88d0303d48fba1b47aa6426b76bd SHA256 44a67b68772838c0a52b601b6f0ceef7a32a6e45ebdbbc0cc74f91a38ee6cb2d
-MD5 1f6945ecb1bd37158cac8ce21fb31a02 ChangeLog 3557
-RMD160 bee0dcca26c08addddcbd07b03f86ac800d46d3e ChangeLog 3557
-SHA256 44a67b68772838c0a52b601b6f0ceef7a32a6e45ebdbbc0cc74f91a38ee6cb2d ChangeLog 3557
+EBUILD jamvm-1.4.4-r1.ebuild 1338 RMD160 022bd907d133dbec8b56a4cb7aa3dad91d7d594f SHA1 0f50290b970e875b2ebab813e737489a61fd7e5f SHA256 9cd3c7a0c7093a2546f2b83a6fa67eed66ab180134261b7214cf52330302a70f
+MD5 45c3d3a9fb8269ca2907fb6c0d6be84d jamvm-1.4.4-r1.ebuild 1338
+RMD160 022bd907d133dbec8b56a4cb7aa3dad91d7d594f jamvm-1.4.4-r1.ebuild 1338
+SHA256 9cd3c7a0c7093a2546f2b83a6fa67eed66ab180134261b7214cf52330302a70f jamvm-1.4.4-r1.ebuild 1338
+MISC ChangeLog 3676 RMD160 1a31b0b219b65cdaa8fa85d2b5a746eefbf98740 SHA1 86c4176d2e1aa4cbfe14e1e202eb4881b0719794 SHA256 dcfca93c58aebe8dc8cf35f12c4056de75af743d38dd9ed8a3fd4adceb4a1846
+MD5 c15acfb6b06d26676fe4290f55e3bb26 ChangeLog 3676
+RMD160 1a31b0b219b65cdaa8fa85d2b5a746eefbf98740 ChangeLog 3676
+SHA256 dcfca93c58aebe8dc8cf35f12c4056de75af743d38dd9ed8a3fd4adceb4a1846 ChangeLog 3676
 MISC metadata.xml 159 RMD160 8da0afd0f687b8985b7f0432fec737950271e354 SHA1 1d089c3afbfafd09e371d7806cc0c72a5c76e5a1 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6
 MD5 1a27d03fe84c50463e67139ac818e84c metadata.xml 159
 RMD160 8da0afd0f687b8985b7f0432fec737950271e354 metadata.xml 159
@@ -26,13 +26,13 @@ SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6 metadata
 MD5 f0beff726b9d5a90ba8471d7bfd8bae3 files/digest-jamvm-1.4.2 235
 RMD160 7aa1518c443b9c8f80aad011086bb83c5ca7d6a6 files/digest-jamvm-1.4.2 235
 SHA256 3c3ebbcad95c70d673a08f59a43089abae2064f804839aa0e8b2283df24c1665 files/digest-jamvm-1.4.2 235
-MD5 9b8d0cbc40957a070706578f061a967e files/digest-jamvm-1.4.4 235
-RMD160 9d76c33813a6266a682061b9a57a84d041fa9be2 files/digest-jamvm-1.4.4 235
-SHA256 c2d67b0e93b536be8d91c722284b8ffaa60ab33958dd628847c57aa3c2b4ec80 files/digest-jamvm-1.4.4 235
+MD5 9b8d0cbc40957a070706578f061a967e files/digest-jamvm-1.4.4-r1 235
+RMD160 9d76c33813a6266a682061b9a57a84d041fa9be2 files/digest-jamvm-1.4.4-r1 235
+SHA256 c2d67b0e93b536be8d91c722284b8ffaa60ab33958dd628847c57aa3c2b4ec80 files/digest-jamvm-1.4.4-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYNZvcxLzpIGCsLQRAnsYAJ4/jgAjswIB5mRxbXLlhrCGzTM6HgCeK99E
-DvPXy2vMJIyU14WFRSOaS+4=
-=YjDU
+iD8DBQFFcHa9cxLzpIGCsLQRAvRWAJ93GPP9i4K95NHbbGdMDYMqtV/KTgCfSQdp
+Jv+SQe2OJS2mbwEfP0Xx2Jo=
+=1Za9
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jamvm/files/digest-jamvm-1.4.4 b/dev-java/jamvm/files/digest-jamvm-1.4.4
deleted file mode 100644
index 7aaa1c45ad5e..000000000000
--- a/dev-java/jamvm/files/digest-jamvm-1.4.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1b7bc9928c534412e062685a4191651d jamvm-1.4.4.tar.gz 530157
-RMD160 765149cf26314ab6355fcbec37b833b4e4e5fc88 jamvm-1.4.4.tar.gz 530157
-SHA256 991a6f4e452e8d05750f33d5bac96b842e9093072c5152255bc75cfcf0b173e5 jamvm-1.4.4.tar.gz 530157
diff --git a/dev-java/jamvm/jamvm-1.4.4.ebuild b/dev-java/jamvm/jamvm-1.4.4.ebuild
deleted file mode 100644
index 2995ce7bc7dc..000000000000
--- a/dev-java/jamvm/jamvm-1.4.4.ebuild
+++ /dev/null
@@ -1,46 +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/jamvm/jamvm-1.4.4.ebuild,v 1.3 2006/11/19 22:10:50 betelgeuse Exp $
-
-inherit eutils flag-o-matic multilib java-vm-2
-
-DESCRIPTION="An extremely small and specification-compliant virtual machine."
-HOMEPAGE="http://jamvm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-RDEPEND="=dev-java/gnu-classpath-0.92*
-	dev-libs/libffi"
-DEPEND="${DEPEND}"
-PDEPEND="=dev-java/eclipse-ecj-3.2* dev-java/gjdoc"
-
-src_compile() {
-	filter-flags "-fomit-frame-pointer"
-
-	# configure adds "/share/classpath" itself
-	# includedir puts jni.h in a package dependent folder
-	local myc="--with-classpath-install-dir=/opt/gnu-classpath-0.92
-	           --includedir=/usr/include/${PN}"
-	use debug && myc="${myc} --enable-trace"
-
-	econf ${myc} || die "configure failed."
-	emake || die "make failed."
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "installation failed."
-
-	dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README \
-		|| die "dodoc failed"
-
-	set_java_env
-
-	dodir /opt/${P}/bin
-	dosym /usr/bin/jamvm /opt/${P}/bin/java
-	dosym /usr/bin/ecj-3.2 /opt/${P}/bin/javac
-	dosym /usr/bin/gjdoc /opt/${P}/bin/javadoc
-}