Revbump to fix bug #147259.

Package-Manager: portage-2.1.2_pre1

3 files changed, 11 insertions, 147 deletions

diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index 874c1b5e77d3..76abfb0ada33 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ibm-jre-bin-1.4.2.03 688 RMD160 9ee073f46381672c4f8800226d01a0cd4a0ab116 SHA1 28df833640d74c04b645496bd64d7c4f26e0565a SHA256 461205a91a985669cea68c9f70831efa7d4a374643b9eea6faf2c3280663167b
 MD5 3936320d759d943aa19ad46d6e46b30c files/ibm-jre-bin-1.4.2.03 688
 RMD160 9ee073f46381672c4f8800226d01a0cd4a0ab116 files/ibm-jre-bin-1.4.2.03 688
@@ -25,14 +22,14 @@ EBUILD ibm-jre-bin-1.4.2.6-r1.ebuild 3401 RMD160 f5dd6044ec9a601d04cda6a71e135bb
 MD5 9ab0d661e9d2de8e9678adb20de09a89 ibm-jre-bin-1.4.2.6-r1.ebuild 3401
 RMD160 f5dd6044ec9a601d04cda6a71e135bbfa73cb2b6 ibm-jre-bin-1.4.2.6-r1.ebuild 3401
 SHA256 7ee7304572b7083cf19b1b44d0543a4b0f81b763714e1a0a1c41998050ecbea7 ibm-jre-bin-1.4.2.6-r1.ebuild 3401
-EBUILD ibm-jre-bin-1.4.2.6-r3.ebuild 3214 RMD160 97ec885d71011f5461263afbe2448473c493f40b SHA1 4443525b6b189877ee892dfb60c481f7f7cdd268 SHA256 53df92467c25f7cefe97ed991eb852d5fff814e08e28c37e475a16ecb956c918
-MD5 bd1761393f985c83ff761aac2dfabfb1 ibm-jre-bin-1.4.2.6-r3.ebuild 3214
-RMD160 97ec885d71011f5461263afbe2448473c493f40b ibm-jre-bin-1.4.2.6-r3.ebuild 3214
-SHA256 53df92467c25f7cefe97ed991eb852d5fff814e08e28c37e475a16ecb956c918 ibm-jre-bin-1.4.2.6-r3.ebuild 3214
-MISC ChangeLog 6956 RMD160 3f76a278c3794c0c45c78030c20d522852df9f4d SHA1 53681bf2bc83f11b5f18d4d88c69ff4c33bd3256 SHA256 1938d02741ba0516313dcb1174c304714e8096f1edde43a7cde8db60510fe8d0
-MD5 36e9bda05ffebef1c5cddd0fabb9aa46 ChangeLog 6956
-RMD160 3f76a278c3794c0c45c78030c20d522852df9f4d ChangeLog 6956
-SHA256 1938d02741ba0516313dcb1174c304714e8096f1edde43a7cde8db60510fe8d0 ChangeLog 6956
+EBUILD ibm-jre-bin-1.4.2.6-r4.ebuild 3326 RMD160 e612e5dfc46ecc61bd1b95aaebf87c8c6f64f602 SHA1 74e3241ceb8268d3a550e8f718351ebf72d7e201 SHA256 482e8c3d1eec1b16da45291c9bf19e86c774316f9959aa21430a26719049fb14
+MD5 0f64edb4067492ffb56715e1ace1b52e ibm-jre-bin-1.4.2.6-r4.ebuild 3326
+RMD160 e612e5dfc46ecc61bd1b95aaebf87c8c6f64f602 ibm-jre-bin-1.4.2.6-r4.ebuild 3326
+SHA256 482e8c3d1eec1b16da45291c9bf19e86c774316f9959aa21430a26719049fb14 ibm-jre-bin-1.4.2.6-r4.ebuild 3326
+MISC ChangeLog 7139 RMD160 a6015121e8f33c41eb3159afc28db2be83cf0a99 SHA1 b15c342a7bb5ef104cfda2b746f2eca318fdc80e SHA256 1828e030336221c94bc583c9012a6cf3cf300325a1d40e7e45ee52a3b69e54b1
+MD5 4b165f0e8e0c5c23362362960b981dc0 ChangeLog 7139
+RMD160 a6015121e8f33c41eb3159afc28db2be83cf0a99 ChangeLog 7139
+SHA256 1828e030336221c94bc583c9012a6cf3cf300325a1d40e7e45ee52a3b69e54b1 ChangeLog 7139
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -40,13 +37,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 43b47e83c0ca5cb84bd78aa981f4589c files/digest-ibm-jre-bin-1.4.2.6-r1 1243
 RMD160 d80a42d6a04c74ba4d3c63c5811c1c5f5e2b1840 files/digest-ibm-jre-bin-1.4.2.6-r1 1243
 SHA256 0c19ee8e3ce149f371667caa7a552f7d7d9247a43225550025911397a44ceedd files/digest-ibm-jre-bin-1.4.2.6-r1 1243
-MD5 43b47e83c0ca5cb84bd78aa981f4589c files/digest-ibm-jre-bin-1.4.2.6-r3 1243
-RMD160 d80a42d6a04c74ba4d3c63c5811c1c5f5e2b1840 files/digest-ibm-jre-bin-1.4.2.6-r3 1243
-SHA256 0c19ee8e3ce149f371667caa7a552f7d7d9247a43225550025911397a44ceedd files/digest-ibm-jre-bin-1.4.2.6-r3 1243
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFDTCEcxLzpIGCsLQRAhP2AKCXYN7Sf0n3at9BI0NjvYVez77rIgCfUdBH
-xyk6WhvdmYTX0FLkulYlpKM=
-=vpxv
------END PGP SIGNATURE-----
+MD5 43b47e83c0ca5cb84bd78aa981f4589c files/digest-ibm-jre-bin-1.4.2.6-r4 1243
+RMD160 d80a42d6a04c74ba4d3c63c5811c1c5f5e2b1840 files/digest-ibm-jre-bin-1.4.2.6-r4 1243
+SHA256 0c19ee8e3ce149f371667caa7a552f7d7d9247a43225550025911397a44ceedd files/digest-ibm-jre-bin-1.4.2.6-r4 1243
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.6-r3 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.6-r3
deleted file mode 100644
index 68999c66f02c..000000000000
--- a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.6-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 3916a809439943c4e579cb6db98f69d6 IBMJava2-142-ia32-JRE-1.4.2-6.0.i386.rpm 39863762
-RMD160 578184c83e1a5218ac660747e5d8f068dd786fbd IBMJava2-142-ia32-JRE-1.4.2-6.0.i386.rpm 39863762
-SHA256 524313f234f962c28c320da65309b4bdc234c021b09ba825140aa33fa434d5eb IBMJava2-142-ia32-JRE-1.4.2-6.0.i386.rpm 39863762
-MD5 94d3411fd9a9fe62bb7d0cc04c7325fd IBMJava2-142-ppc32-JRE-1.4.2-6.0.ppc.rpm 43065108
-RMD160 1f062e1b2037aaf1faf09b8aa541ec969b9cd371 IBMJava2-142-ppc32-JRE-1.4.2-6.0.ppc.rpm 43065108
-SHA256 b5836f3a011b9935750d8a03b5176d65b0e2819d0ed55611764b2d3ce0438322 IBMJava2-142-ppc32-JRE-1.4.2-6.0.ppc.rpm 43065108
-MD5 87d03b888918c1311ace20abdbf56f52 IBMJava2-142-ppc64-JRE-1.4.2-6.0.ppc64.rpm 40218069
-RMD160 45adc2239fb81c89e1871d25aaa79c8e670559cb IBMJava2-142-ppc64-JRE-1.4.2-6.0.ppc64.rpm 40218069
-SHA256 a6ff07257ce9729409b49add9fd164412acb08fbcf8833826610f8e1578046bf IBMJava2-142-ppc64-JRE-1.4.2-6.0.ppc64.rpm 40218069
-MD5 7c05bc506f9f7c33059922af729c39d0 IBMJava2-AMD64-142-JRE-1.4.2-6.0.x86_64.rpm 34624859
-RMD160 cacd2c9e0ee7d05e682f0a79973f018be2784289 IBMJava2-AMD64-142-JRE-1.4.2-6.0.x86_64.rpm 34624859
-SHA256 e0854e6fc44931bef3a6b9e8860d67c8538c604667dd01e43a0baab4530226f3 IBMJava2-AMD64-142-JRE-1.4.2-6.0.x86_64.rpm 34624859
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r3.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r3.ebuild
deleted file mode 100644
index dd527733404a..000000000000
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r3.ebuild
+++ /dev/null
@@ -1,114 +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.6-r3.ebuild,v 1.1 2006/09/14 06:51:06 caster Exp $
-
-inherit java-vm-2 eutils versionator rpm
-
-JDK_RELEASE=$(get_version_component_range 1-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-if use x86 ; then
-	JRE_DIST="IBMJava2-142-ia32-JRE-${RPM_PV}.i386.rpm"
-	S="${WORKDIR}/opt/IBMJava2-142"
-elif use amd64 ; then
-	JRE_DIST="IBMJava2-AMD64-142-JRE-${RPM_PV}.x86_64.rpm"
-	S="${WORKDIR}/opt/IBMJava2-amd64-142"
-elif use ppc ; then
-	JRE_DIST="IBMJava2-142-ppc32-JRE-${RPM_PV}.ppc.rpm"
-	S="${WORKDIR}/opt/IBMJava2-ppc-142"
-elif use ppc64 ; then
-	JRE_DIST="IBMJava2-142-ppc64-JRE-${RPM_PV}.ppc64.rpm"
-	S="${WORKDIR}/opt/IBMJava2-ppc64-142"
-fi
-
-DESCRIPTION="IBM Java Development Kit"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="x86? ( IBMJava2-142-ia32-JRE-${RPM_PV}.i386.rpm )
-		 amd64? ( IBMJava2-AMD64-142-JRE-${RPM_PV}.x86_64.rpm )
-		 ppc? ( IBMJava2-142-ppc32-JRE-${RPM_PV}.ppc.rpm )
-		 ppc64? ( IBMJava2-142-ppc64-JRE-${RPM_PV}.ppc64.rpm )"
-
-LICENSE="IBM-J1.4"
-SLOT="1.4"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X nsplugin"
-
-RDEPEND="!ppc64? ( !amd64? ( sys-libs/lib-compat ) )
-	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
-	)"
-DEPEND=""
-
-RESTRICT="fetch"
-
-QA_TEXTRELS_x86="opt/${P}/bin/lib*.so
-	opt/${P}/bin/javaplugin.so
-	opt/${P}/bin/classic/libjvm.so
-	opt/${P}/bin/classic/libcore.so"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under Java 1.4.2, download SR${SERVICE_RELEASE} for your arch:"
-	einfo "${JRE_DIST}"
-	einfo "Place the file in: ${DISTDIR}"
-	einfo "Then restart emerge: 'emerge --resume'"
-
-	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
-	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}"
-}
-
-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
-}