Switched to using RPMs for distfiles.

(Portage version: 2.1.1_pre1)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 143 deletions

diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index f338c2c41049..883d60b25708 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -14,21 +14,21 @@ AUX ibm-jre-bin-1.4.env 976 RMD160 64fea85f255b474072a5633b34e087e00ab0ea2d SHA1
 MD5 f439934534b2526e2e541a8dad2834f3 files/ibm-jre-bin-1.4.env 976
 RMD160 64fea85f255b474072a5633b34e087e00ab0ea2d files/ibm-jre-bin-1.4.env 976
 SHA256 4d11de0d1018ab18f7f9e2e09748feab5f49e27f303d6c4d755cb6df0375ede2 files/ibm-jre-bin-1.4.env 976
+DIST IBMJava2-142-ia32-JRE-1.4.2-5.0.i386.rpm 39794008 RMD160 d07227dc2247d72ec6207aadc9e163dc668f5bc0 SHA1 fd89f7adfb50179645dea1ffa34f03796100f347 SHA256 cbd4742063cffdddad8489f199a107807301f17100c986308ace6498aea5019a
+DIST IBMJava2-142-ppc32-JRE-1.4.2-5.0.ppc.rpm 47855121 RMD160 1787aae2a9533bc79aebb5d4f4b4c8fd8bb08ca4 SHA1 6ef121d4d10b44f64e2f11da53253032cb16283e SHA256 fa42929106fb98ed1681d6f0bcb977801278a67ea7f0b0be774936a52924c788
+DIST IBMJava2-142-ppc64-JRE-1.4.2-5.0.ppc64.rpm 46118362 RMD160 98d76e261778b10ba91f3235232705dc22f3d78e SHA1 ce764471ff838f890c06e203442a72313d531a94 SHA256 80355f7eb1f423c397165a9b0427136df2ab9ecb25f1da12a1d18cb3584e0fc6
+DIST IBMJava2-AMD64-142-JRE-1.4.2-5.0.x86_64.rpm 34468578 RMD160 41907a48c67666c9861a5a4a4126a7170a4cd206 SHA1 57ffed4d18edbec3e1585b0022505b2d2c0f092d SHA256 98503e22f4f7cb63f28d740841430b634b0300513fdcb23b7084cbb3cc41a7d7
 DIST IBMJava2-JRE-142-SR3.tgz 38733463 RMD160 c6904d05bc612af3db8adc92e299b8cd95f6a47e SHA256 6c012a40f5495461677ac98fea86c453c7efa3bb4969624fb98cc4d1122d20df
 DIST IBMJava2-JRE-142-SR4.tgz 40287339 RMD160 8f1a3d23c22c5169dd15db06d63a2d2403279e31 SHA1 62c0088079675864f285096406a2f87f2aa49ff9 SHA256 9d5ceaddbd73c2ccc39df1566cf95ba20b78495fb29f9856c205908b5746c57d
-DIST IBMJava2-JRE-142-SR5.tgz 39793292 RMD160 e23d1c0c3b56719537420342b05a4553b1d8d38d SHA1 1ad3b2552d843aa16135efc188a2dba09d219c5c SHA256 942440678caf5b77df6d959d91840a58d780c54faceec25da677266651c9af1a
 DIST IBMJava2-JRE-142.ppc-SR3.tgz 41878932 RMD160 7eb9078cb44fb4a3d76b819aa8c9743f7706817e SHA1 cba5d54ed9d8571c82e35deffa6f6b7146893977 SHA256 8e3a98ac186457ff60ec9838c4e4072db1f6577fd7216cc04419844b6f6e1d72
 DIST IBMJava2-JRE-142.ppc-SR4.tgz 43427667 RMD160 ca98a2e5a45daad7313344307e05198f3916dc29 SHA1 c1d27ee01f73ea7ce72d4dc41e3c6255078203c3 SHA256 28464184f482ac72ff7fbee700e116f44a916e7bde1775970e7274265238c508
-DIST IBMJava2-JRE-142.ppc-SR5.tgz 47953143 RMD160 aa6153e71f20568fdbcbb831531199ec7359607c SHA256 64d5a838e584d9a2ead6eba94cec7cac3020f52db13dc13b4b7ff2f631252761
 DIST IBMJava2-JRE-142.ppc.tgz 41568524
 DIST IBMJava2-JRE-142.ppc64-SR3.tgz 39136112 RMD160 d372a4bcef0c375bbbcd11a2657cbf184b21f044 SHA256 912b98eee21d641068b8b6055352b306502ce8d4e56643b51dc9d16cc8411ffd
 DIST IBMJava2-JRE-142.ppc64-SR4.tgz 40683882 RMD160 8095f1851401deaeb3f26f9dc5092627feb069fa SHA1 e7dff9e8a7330afc834935c1b914f71b0dade1cf SHA256 dc122e7346d89b1072fc69364ecc3531f6f5e8e9fa633b6830ae109ca819507c
-DIST IBMJava2-JRE-142.ppc64-SR5.tgz 46294846 RMD160 9360b41c3ee30a30abd5c7be56b16c52e4312194 SHA256 d78557b179aa8412ddc398b827556b48b8168b2bf6b82e312ee10eed26999b0d
 DIST IBMJava2-JRE-142.ppc64.tgz 38818627
 DIST IBMJava2-JRE-142.tgz 38388691
 DIST IBMJava2-JRE-AMD64-142.x86_64-SR3.tgz 33666833 RMD160 f13b3b937ed7724959f7347d108da5aeee5b359f SHA256 63e7a4555b9445f1accb8a435b8a2937eb6d76b739cc7508570a555479c1515d
 DIST IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-DIST IBMJava2-JRE-AMD64-142.x86_64-SR5.tgz 34481202 RMD160 a8122df2eaeab177bc038f560aefa88533d483b5 SHA256 56c006940e619836da0b012c3e4ad1907af3334c3047ee93a5a08995115e79a3
 EBUILD ibm-jre-bin-1.4.2.03.ebuild 3136 RMD160 9e2d77af23084fd76600246afb04f0b97310ad3d SHA1 1be21d7ff7eba800d709c3cb2c07b0a0281122df SHA256 afd7cae1dc56d48ef90f0ba6a8ab70b656efa439bec704453f0d33d2e73458a6
 MD5 c6e2f7db9155cac4dd10518135fa13c1 ibm-jre-bin-1.4.2.03.ebuild 3136
 RMD160 9e2d77af23084fd76600246afb04f0b97310ad3d ibm-jre-bin-1.4.2.03.ebuild 3136
@@ -37,18 +37,18 @@ EBUILD ibm-jre-bin-1.4.2.04.ebuild 2936 RMD160 4286561e97f04b8834f01164ebf5a9d5d
 MD5 8c5ddb5d9df25bf3334447b6c7581a50 ibm-jre-bin-1.4.2.04.ebuild 2936
 RMD160 4286561e97f04b8834f01164ebf5a9d5dbcadaee ibm-jre-bin-1.4.2.04.ebuild 2936
 SHA256 148ab17436b03b1ad923441cbcdade3dc17f9c97fb9a5e098cfc792f1a84444c ibm-jre-bin-1.4.2.04.ebuild 2936
-EBUILD ibm-jre-bin-1.4.2.05.ebuild 2925 RMD160 a223e77b2303dad312c7dfdf9518930c938469af SHA1 db5dde77e235572959351bbf79bb4bcbd129258c SHA256 21bffd0d450970c0d5b7c6141686f5a61cc1ecb60ee1449e94f302493e590c1a
-MD5 ab2a7fda8fdeb0b0883a4fb54944033d ibm-jre-bin-1.4.2.05.ebuild 2925
-RMD160 a223e77b2303dad312c7dfdf9518930c938469af ibm-jre-bin-1.4.2.05.ebuild 2925
-SHA256 21bffd0d450970c0d5b7c6141686f5a61cc1ecb60ee1449e94f302493e590c1a ibm-jre-bin-1.4.2.05.ebuild 2925
+EBUILD ibm-jre-bin-1.4.2.5.ebuild 3198 RMD160 e077778331fda2d4d166add7e8e151b504b90089 SHA1 221bf31cfbc5c81c23dd7a951b0e130162057cb9 SHA256 977aefbbbffb653ac3f3c8b4db04585234640e7672632648be3759e3b5c95339
+MD5 bfb88877e3cd079247a4cd7798b6dae4 ibm-jre-bin-1.4.2.5.ebuild 3198
+RMD160 e077778331fda2d4d166add7e8e151b504b90089 ibm-jre-bin-1.4.2.5.ebuild 3198
+SHA256 977aefbbbffb653ac3f3c8b4db04585234640e7672632648be3759e3b5c95339 ibm-jre-bin-1.4.2.5.ebuild 3198
 EBUILD ibm-jre-bin-1.4.2.ebuild 2177 RMD160 f0b690a5383d6cf20f6041380f59cbc7db26edc7 SHA1 6f1d5ef4d48ce18b0112c0ddc5b688d8b6ea8446 SHA256 30ab1217eb8ea9de8be4fca96b332231b85511431f07c6328d310a1f05523fd6
 MD5 cb942fcb638c92d375eb91869a8454b9 ibm-jre-bin-1.4.2.ebuild 2177
 RMD160 f0b690a5383d6cf20f6041380f59cbc7db26edc7 ibm-jre-bin-1.4.2.ebuild 2177
 SHA256 30ab1217eb8ea9de8be4fca96b332231b85511431f07c6328d310a1f05523fd6 ibm-jre-bin-1.4.2.ebuild 2177
-MISC ChangeLog 4502 RMD160 bb5875edb8f6b20cd400565918c8455311cf2762 SHA1 163b709338e6a79f889317c240e38364ef981978 SHA256 53685fe34b413afa54699252ea3d47badc6ec750f993a4f65d22c6bd52855078
-MD5 7dec26eeae1ad7b466d3b5eb91683afb ChangeLog 4502
-RMD160 bb5875edb8f6b20cd400565918c8455311cf2762 ChangeLog 4502
-SHA256 53685fe34b413afa54699252ea3d47badc6ec750f993a4f65d22c6bd52855078 ChangeLog 4502
+MISC ChangeLog 4654 RMD160 f31d1d9f32759d77cfe6303d743da97d88a81f41 SHA1 870d22fcc80d1774abfe8736654bf5dbad6777ce SHA256 0f95d6662036c5a890c12edc5db6e2820a6740caee7a54f2e7f4e755c2d15e33
+MD5 459267d79568c6c228d90c9f2b92262f ChangeLog 4654
+RMD160 f31d1d9f32759d77cfe6303d743da97d88a81f41 ChangeLog 4654
+SHA256 0f95d6662036c5a890c12edc5db6e2820a6740caee7a54f2e7f4e755c2d15e33 ChangeLog 4654
 MISC metadata.xml 284 RMD160 0ab71be4482c89456bfd0d9f472272a0e80c33ca SHA1 799f69e44f4b5f6e67be1a817bbcba3c5a7bd865 SHA256 c0538c7a4134f6bfc29f93ebf259d53d8123b5eccdacd8f09bef9e6b18ee4bcd
 MD5 fb2a9b7b6110f3fc99c228068cac96b8 metadata.xml 284
 RMD160 0ab71be4482c89456bfd0d9f472272a0e80c33ca metadata.xml 284
@@ -62,6 +62,6 @@ SHA256 e3235c851dc0bccebc5e5a611d803bf19d265975fca45ae48e62f105ceed88d8 files/di
 MD5 5654f307eeb7ce97b80e7b24e80964ad files/digest-ibm-jre-bin-1.4.2.04 1084
 RMD160 aeffd655e64949745a34e6eb9c1c907bbf8ef51f files/digest-ibm-jre-bin-1.4.2.04 1084
 SHA256 143b77da1be29eac95dc547337d4ed4ce5739218305f2149090c7d6969cf8e02 files/digest-ibm-jre-bin-1.4.2.04 1084
-MD5 7e558c102038b528ce127eaa84665f7d files/digest-ibm-jre-bin-1.4.2.05 1105
-RMD160 035623ba8a70f9840f80d2fc4fea33622019fc88 files/digest-ibm-jre-bin-1.4.2.05 1105
-SHA256 1bd8b4ec16ccec634df360315a36e13192811141577ff4934a6fb78954c130c5 files/digest-ibm-jre-bin-1.4.2.05 1105
+MD5 046ac0d96e56af9e5ef1379665e98bbb files/digest-ibm-jre-bin-1.4.2.5 1243
+RMD160 aaa976e9c6fb9bb177018aabdb80940e3dbb4e94 files/digest-ibm-jre-bin-1.4.2.5 1243
+SHA256 4f522fef59db333a3e843a2780fb511260b973eb46c28aa7545e915796e1c49e files/digest-ibm-jre-bin-1.4.2.5 1243
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.05 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.05
deleted file mode 100644
index f68d92c76b3b..000000000000
--- a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.05
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 0ee56a87dd0eacb96f2cbc63dbda007a IBMJava2-JRE-142-SR5.tgz 39793292
-RMD160 e23d1c0c3b56719537420342b05a4553b1d8d38d IBMJava2-JRE-142-SR5.tgz 39793292
-SHA256 942440678caf5b77df6d959d91840a58d780c54faceec25da677266651c9af1a IBMJava2-JRE-142-SR5.tgz 39793292
-MD5 76d02791cb0085192d92b49c5d8e65d8 IBMJava2-JRE-142.ppc-SR5.tgz 47953143
-RMD160 aa6153e71f20568fdbcbb831531199ec7359607c IBMJava2-JRE-142.ppc-SR5.tgz 47953143
-SHA256 64d5a838e584d9a2ead6eba94cec7cac3020f52db13dc13b4b7ff2f631252761 IBMJava2-JRE-142.ppc-SR5.tgz 47953143
-MD5 c5b278e00613538b03373a2896378b86 IBMJava2-JRE-142.ppc64-SR5.tgz 46294846
-RMD160 9360b41c3ee30a30abd5c7be56b16c52e4312194 IBMJava2-JRE-142.ppc64-SR5.tgz 46294846
-SHA256 d78557b179aa8412ddc398b827556b48b8168b2bf6b82e312ee10eed26999b0d IBMJava2-JRE-142.ppc64-SR5.tgz 46294846
-MD5 fbc679b5c548e62dff2f716a9ea3073c IBMJava2-JRE-AMD64-142.x86_64-SR5.tgz 34481202
-RMD160 a8122df2eaeab177bc038f560aefa88533d483b5 IBMJava2-JRE-AMD64-142.x86_64-SR5.tgz 34481202
-SHA256 56c006940e619836da0b012c3e4ad1907af3334c3047ee93a5a08995115e79a3 IBMJava2-JRE-AMD64-142.x86_64-SR5.tgz 34481202
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.05.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.05.ebuild
deleted file mode 100644
index 9dfb60968d5a..000000000000
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.05.ebuild
+++ /dev/null
@@ -1,116 +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/ibm-jre-bin/ibm-jre-bin-1.4.2.05.ebuild,v 1.1 2006/06/25 18:57:05 nichoj Exp $
-
-inherit java-vm-2 eutils
-
-UPSTREAM_SR="SR5"
-
-if use x86 ; then
-	JRE_DIST="IBMJava2-JRE-142"
-elif use amd64 ; then
-	JRE_DIST="IBMJava2-JRE-AMD64-142.x86_64"
-elif use ppc ; then
-	JRE_DIST="IBMJava2-JRE-142.ppc"
-elif use ppc64 ; then
-	JRE_DIST="IBMJava2-JRE-142.ppc64"
-fi
-
-JRE_DIST_GENTOO="${JRE_DIST}-${UPSTREAM_SR}.tgz"
-JRE_DIST+=".tgz"
-
-DESCRIPTION="IBM Java Development Kit"
-HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
-SRC_URI="x86? ( IBMJava2-JRE-142-${UPSTREAM_SR}.tgz )
-		 amd64? ( IBMJava2-JRE-AMD64-142.x86_64-${UPSTREAM_SR}.tgz )
-		 ppc? ( IBMJava2-JRE-142.ppc-${UPSTREAM_SR}.tgz )
-		 ppc64? ( IBMJava2-JRE-142.ppc64-${UPSTREAM_SR}.tgz )"
-
-LICENSE="IBM-J1.4"
-SLOT="1.4"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X nsplugin"
-
-DEPEND="virtual/libc
-		X? ( || (
-					(
-						x11-libs/libXt
-						x11-libs/libX11
-						x11-libs/libXtst
-						x11-libs/libXp
-						x11-libs/libXext
-						x11-libs/libSM
-						x11-libs/libICE
-						x11-libs/libXau
-						x11-libs/libXdmcp
-						x11-libs/libXi
-						x11-libs/libXmu
-					)
-					virtual/x11
-				)
-			)"
-RDEPEND="${DEPEND}
-		 !ppc64? ( !amd64? ( sys-libs/lib-compat ) )"
-
-PROVIDE="virtual/jre"
-
-RESTRICT="fetch"
-
-if use ppc; then
-	S="${WORKDIR}/IBMJava2-ppc-142"
-elif use ppc64; then
-	S="${WORKDIR}/IBMJava2-ppc64-142"
-elif use amd64; then
-	S="${WORKDIR}/IBMJava2-amd64-142"
-else
-	S="${WORKDIR}/IBMJava2-142"
-fi
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${HOMEPAGE}linux/download.html"
-	einfo "Under J2SE 1.4.2 for your platform, download ${UPSTREAM_SR}: ${JRE_DIST}"
-	einfo "Rename ${JRE_DIST} to ${JRE_DIST_GENTOO}"
-	einfo "Place the file(s) in: ${DISTDIR}"
-	einfo "Then run emerge ${PN}"
-}
-
-src_compile() { :; }
-
-src_install() {
-	# The javaws execution script is 777 why?
-	chmod 0755 ${S}/jre/javaws/javaws
-
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR ${S}/jre/* ${D}opt/${P}/
-
-	if use nsplugin && ! use ppc && ! use amd64 && ! use ppc64; then
-		local plugin="libjavaplugin_oji.so"
-
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin="libjavaplugin_ojigcc3.so"
-		fi
-
-		install_mozilla_plugin /opt/${P}/bin/${plugin}
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc ${S}/docs/COPYRIGHT
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		ewarn
-		ewarn "You have not enabled the X useflag.  It is possible that"
-		ewarn "you do not have an X server installed.  Please note that"
-		ewarn "some parts of the IBM JRE require an X server to properly"
-		ewarn "function.  Be careful which Java libraries you attempt to"
-		ewarn "use with your installation."
-		ewarn
-	fi
-}