Revbump to install javaws symlinks wrt bug #147259

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

3 files changed, 11 insertions, 186 deletions

diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index dd4a180e1aa4..512964976cfa 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -63,10 +63,10 @@ EBUILD ibm-jdk-bin-1.4.2.6-r1.ebuild 4845 RMD160 c258b6eaebda22dabe88a5ac449e812
 MD5 886411b0d84fa070af3da8d19c271065 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
 RMD160 c258b6eaebda22dabe88a5ac449e812c6b535870 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
 SHA256 e70b5deff274b12016420fd84f6f57f8096bfd83138625d1d7bcfb767b686844 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
-EBUILD ibm-jdk-bin-1.4.2.6-r3.ebuild 4588 RMD160 74ec1e708cecf3398257f484870d797c6f7482ff SHA1 019044c67a8ef573b5838e52fed6cf2b311f8ad1 SHA256 02dd723672f9ac0ce6710531920eaf92a61cd3cca4e2cd4acaf929d7cad53ac4
-MD5 15e65c92a799daf4d124895896e4735f ibm-jdk-bin-1.4.2.6-r3.ebuild 4588
-RMD160 74ec1e708cecf3398257f484870d797c6f7482ff ibm-jdk-bin-1.4.2.6-r3.ebuild 4588
-SHA256 02dd723672f9ac0ce6710531920eaf92a61cd3cca4e2cd4acaf929d7cad53ac4 ibm-jdk-bin-1.4.2.6-r3.ebuild 4588
+EBUILD ibm-jdk-bin-1.4.2.6-r4.ebuild 4634 RMD160 b37eb228464b82823ffac9bec3390ec8c61e8b67 SHA1 b548b0273be804a5a876e203916757b6c0b6765a SHA256 9c6ce207a7767d4f8a1e773ad92461b8bcf6640f340aac7a1a372c559032e684
+MD5 e06d6972ea86b54429e16a6eaa9c8383 ibm-jdk-bin-1.4.2.6-r4.ebuild 4634
+RMD160 b37eb228464b82823ffac9bec3390ec8c61e8b67 ibm-jdk-bin-1.4.2.6-r4.ebuild 4634
+SHA256 9c6ce207a7767d4f8a1e773ad92461b8bcf6640f340aac7a1a372c559032e684 ibm-jdk-bin-1.4.2.6-r4.ebuild 4634
 EBUILD ibm-jdk-bin-1.5.0.2.ebuild 4488 RMD160 cb81ec19d039c8c712724f59c835511232f99951 SHA1 482bf0a5e0a5424f596be287275853899aeb5e9f SHA256 64f4833e4f02a6ebd347d4775cd6b523fda8595651ec9e5d56b8fac107bf8c31
 MD5 015ec351a20fcd15b8ad557860a7ceb9 ibm-jdk-bin-1.5.0.2.ebuild 4488
 RMD160 cb81ec19d039c8c712724f59c835511232f99951 ibm-jdk-bin-1.5.0.2.ebuild 4488
@@ -75,10 +75,10 @@ EBUILD ibm-jdk-bin-1.5.0.ebuild 2956 RMD160 086616bb4e6575e2c68814bb5153b511b803
 MD5 b100e3010595d20ad0feb9e46aa49160 ibm-jdk-bin-1.5.0.ebuild 2956
 RMD160 086616bb4e6575e2c68814bb5153b511b8033498 ibm-jdk-bin-1.5.0.ebuild 2956
 SHA256 0310652770e7b791852d4c65ddd68f16602abe0fe50fd5f48cd5e3c534dc24b4 ibm-jdk-bin-1.5.0.ebuild 2956
-MISC ChangeLog 12941 RMD160 4a425bec684b808e9c8da256b2bba110137ad006 SHA1 10438f13fdb8433f21664e03637ee1227988fac5 SHA256 950c695640b213df4a429c7f4e975acd52a53bbfab66a54706faabb230e47adb
-MD5 23ead966943f2caf23b428c3ec6a2a64 ChangeLog 12941
-RMD160 4a425bec684b808e9c8da256b2bba110137ad006 ChangeLog 12941
-SHA256 950c695640b213df4a429c7f4e975acd52a53bbfab66a54706faabb230e47adb ChangeLog 12941
+MISC ChangeLog 13151 RMD160 899a7e1c8e1772e316942a0d3010185b47e76f29 SHA1 62679be9cc0812c93be9b1be4be7e81edb64aeea SHA256 4d95f984902df995893fbf8ce30264ceb2271168b6356f17f33f84ba42c1034e
+MD5 e9f3b2a379c801102fd8fefac73d0723 ChangeLog 13151
+RMD160 899a7e1c8e1772e316942a0d3010185b47e76f29 ChangeLog 13151
+SHA256 4d95f984902df995893fbf8ce30264ceb2271168b6356f17f33f84ba42c1034e ChangeLog 13151
 MISC metadata.xml 219 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e SHA1 7f610c6c183a353d1969b4d9ac48e01629830026 SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428
 MD5 4a3cb4232103a0de9bd143a145086a7b metadata.xml 219
 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e metadata.xml 219
@@ -89,9 +89,9 @@ SHA256 593cc240fc2b56435c24a5431547669f2808ad228e91e354918472f5c7d1a9a5 files/di
 MD5 35ce90be8c07b578b83a0813986813f2 files/digest-ibm-jdk-bin-1.4.2.6-r1 2149
 RMD160 0fca43d73aec0e76916059a2eb7ca441c5d8eddb files/digest-ibm-jdk-bin-1.4.2.6-r1 2149
 SHA256 b6fa2ae167cd41f796b7638c70ef9f8e1fb91e1fe212f2d77bb38d569b5573f2 files/digest-ibm-jdk-bin-1.4.2.6-r1 2149
-MD5 35ce90be8c07b578b83a0813986813f2 files/digest-ibm-jdk-bin-1.4.2.6-r3 2149
-RMD160 0fca43d73aec0e76916059a2eb7ca441c5d8eddb files/digest-ibm-jdk-bin-1.4.2.6-r3 2149
-SHA256 b6fa2ae167cd41f796b7638c70ef9f8e1fb91e1fe212f2d77bb38d569b5573f2 files/digest-ibm-jdk-bin-1.4.2.6-r3 2149
+MD5 35ce90be8c07b578b83a0813986813f2 files/digest-ibm-jdk-bin-1.4.2.6-r4 2149
+RMD160 0fca43d73aec0e76916059a2eb7ca441c5d8eddb files/digest-ibm-jdk-bin-1.4.2.6-r4 2149
+SHA256 b6fa2ae167cd41f796b7638c70ef9f8e1fb91e1fe212f2d77bb38d569b5573f2 files/digest-ibm-jdk-bin-1.4.2.6-r4 2149
 MD5 b691eeef45fae5cc1f2c25951d137ee9 files/digest-ibm-jdk-bin-1.5.0 2568
 RMD160 7a7e606fe67a85b05a2429ebef19481646dd4652 files/digest-ibm-jdk-bin-1.5.0 2568
 SHA256 1e4a90eb01b02f89c96f042546b5461b16c07868222bf643eb99af50a1a8d951 files/digest-ibm-jdk-bin-1.5.0 2568
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r3 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r3
deleted file mode 100644
index 31f38b27c80f..000000000000
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.6-r3
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 6767ba5540f2df4f75233c142f6eb1ed IBMJava2-142-ia32-SDK-1.4.2-6.0.i386.rpm 58525734
-RMD160 ee54add99e586bf8b968d57532264e553302f1b7 IBMJava2-142-ia32-SDK-1.4.2-6.0.i386.rpm 58525734
-SHA256 fdc9d0e841c85f7a11001bf95faef54d045e38f8628dd6538273838f3de096d6 IBMJava2-142-ia32-SDK-1.4.2-6.0.i386.rpm 58525734
-MD5 c3a0c5e24cf1307925ef65b5b3a2d1aa IBMJava2-142-ppc32-SDK-1.4.2-6.0.ppc.rpm 61302067
-RMD160 fe80bdad101c5fd5ecd5a618c1aaaf3a2a427c27 IBMJava2-142-ppc32-SDK-1.4.2-6.0.ppc.rpm 61302067
-SHA256 16052150d8c22bfc0906fcc81c2d11c8dbaf84a250d068e843f953e0a121cc17 IBMJava2-142-ppc32-SDK-1.4.2-6.0.ppc.rpm 61302067
-MD5 77f7981ad453b6907e78b0d9060f313e IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
-RMD160 155d132b25d990c876762474c10a0b57790a8cb9 IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
-SHA256 6393faa4becec892292192db0827c03f3984ad2e7ef09a209e801d88527366f9 IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316
-MD5 baed71adec50ad711d9b29b62347c86c IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
-RMD160 ce4f51f0b2d6ce6e0a4004d78c3596bca06d4f30 IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
-SHA256 42af9a1bb57c3036ce378cba87ba20e21bef8781787c3f6c6e9a9f4875eefadb IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659
-MD5 182d4c627ad26a0acc02e2abb07cfdcc IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
-RMD160 f2d1fe49a606c204dbc0b0bdd054b7ec8bb7ca63 IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
-SHA256 4bfd9461aec661fee1584920bb2d0a4274c8ac592eec612f724824cf2790d7f1 IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325
-MD5 30fb5f8a56e9bc6846dc64ec28d5dbe0 IBMJava2-JAVACOMM-1.4.2-6.0.i386.rpm 121766
-RMD160 e543dac45fac2773fd0f54f6b1b516eefc24763e IBMJava2-JAVACOMM-1.4.2-6.0.i386.rpm 121766
-SHA256 749c6400a7a78e7300ef5cc9e588c490b788661b0917586cca6d07639711cebd IBMJava2-JAVACOMM-1.4.2-6.0.i386.rpm 121766
-MD5 d37aad6cd2f63fd91493ddc7423d5b96 IBMJava2-JAVACOMM-AMD64-1.4.2-6.0.x86_64.rpm 123609
-RMD160 449904345b1377568264e348ba2c71811472a61d IBMJava2-JAVACOMM-AMD64-1.4.2-6.0.x86_64.rpm 123609
-SHA256 ff13b4cb1fcfb5ef658cbab8725ef896a64da496b95bcbd05981dba1a0499f30 IBMJava2-JAVACOMM-AMD64-1.4.2-6.0.x86_64.rpm 123609
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild
deleted file mode 100644
index 0da4d5f5ce1b..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild
+++ /dev/null
@@ -1,154 +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-jdk-bin/ibm-jdk-bin-1.4.2.6-r3.ebuild,v 1.3 2006/09/17 11:01:58 betelgeuse Exp $
-
-JAVA_SUPPORTS_GENERATION_1="true"
-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
-	JDK_DIST="IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm"
-	JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.i386.rpm"
-	S="${WORKDIR}/opt/IBMJava2-142"
-elif use amd64 ; then
-	JDK_DIST="IBMJava2-AMD64-142-SDK-${RPM_PV}.x86_64.rpm"
-	JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.rpm"
-	S="${WORKDIR}/opt/IBMJava2-amd64-142"
-elif use ppc ; then
-	JDK_DIST="IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm"
-	JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc.rpm"
-	S="${WORKDIR}/opt/IBMJava2-ppc-142"
-elif use ppc64 ; then
-	JDK_DIST="IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm"
-	JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc64.rpm"
-	S="${WORKDIR}/opt/IBMJava2-ppc64-142"
-elif use s390 ; then
-	JDK_DIST="IBMJava2-142-z31-SDK-${RPM_PV}.s390.rpm"
-	S="${WORKDIR}/opt/IBMJava2-s390-142"
-fi
-
-DESCRIPTION="IBM Java Development Kit"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-SRC_URI="x86? ( IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm )
-		amd64? ( IBMJava2-AMD64-142-SDK-${RPM_PV}.x86_64.rpm )
-		ppc? ( IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm )
-		ppc64? ( IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm )
-		s390? ( IBMJava2-142-z31-SDK-${RPM_PV}.s390.rpm )
-		javacomm? (
-					x86? ( IBMJava2-JAVACOMM-${RPM_PV}.i386.rpm )
-					amd64? ( IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.rpm )
-					ppc? ( IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm )
-					ppc64? ( IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm )
-				  )"
-
-LICENSE="IBM-J1.4"
-SLOT="1.4"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X alsa doc javacomm nsplugin"
-
-RDEPEND="
-		ppc? ( sys-libs/lib-compat )
-		alsa? ( media-libs/alsa-lib )
-		X? ( || (
-					(
-						x11-libs/libXt
-						x11-libs/libX11
-						x11-libs/libXtst
-						x11-libs/libXp
-						x11-libs/libXext
-						x11-libs/libXi
-						x11-libs/libXmu
-					)
-					virtual/x11
-				)
-			)
-		x86? ( nsplugin? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) )
-		doc? ( =dev-java/java-sdk-docs-1.4.2* )"
-
-
-RESTRICT="fetch"
-
-QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
-	opt/${P}/jre/bin/javaplugin.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/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 "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "${JAVACOMM_DIST}"
-	fi
-	einfo "Place the file(s) 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() { true; }
-
-src_install() {
-	# The javaws execution script is 777 why?
-	chmod 0755 ${S}/jre/javaws/javaws
-
-	# Copy all the files to the designated directory
-	mkdir -p ${D}opt/${P}
-	cp -pR ${S}/{bin,jre,lib,include} ${D}opt/${P}/
-
-	mkdir -p ${D}/opt/${P}/share
-	cp -pPR ${S}/{demo,src.jar} ${D}opt/${P}/share/
-
-	# setting the ppc stuff
-	if use ppc; then
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
-		insinto /etc
-		doins ${FILESDIR}/cpuinfo
-	fi
-
-	if use x86 && use nsplugin; then
-		local plugin="libjavaplugin_oji.so"
-
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin="libjavaplugin_ojigcc3.so"
-		fi
-
-		install_mozilla_plugin /opt/${P}/jre/bin/${plugin}
-	elif use x86; then
-		rm ${D}/opt/${P}/jre/bin/libjavaplugin*.so
-	fi
-
-	if ! use alsa; then
-		rm ${D}/opt/${P}/jre/bin/libjsoundalsa.so \
-			|| eerror "${D}/opt/${P}/jre/bin/libjsoundalsa.so not found"
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc ${S}/docs/COPYRIGHT
-
-	set_java_env
-}
-
-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 JDK require an X server to properly"
-		ewarn "function.  Be careful which Java libraries you attempt to"
-		ewarn "use with your installation."
-		ewarn
-	fi
-}