Version bump from upstream

Package-Manager: portage-2.1_pre4-r1

4 files changed, 143 insertions, 4 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 683f75630e05..2a22f34ebccf 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.26 2006/02/08 08:40:33 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.27 2006/02/08 08:54:29 compnerd Exp $
+
+*ibm-jre-bin-1.4.2.04 (08 Feb 2006)
+
+  08 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +ibm-jre-bin-1.4.2.04.ebuild:
+  Version bump from upstream
 
   08 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   ibm-jre-bin-1.4.2.03.ebuild:
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index 53bb382a1fd5..e754349e3056 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,12 +1,15 @@
-MD5 c735acc971c95e66a1c4c2579c2dac0d ChangeLog 3824
-RMD160 b967937832eb69ff12aac41fbc0cf82fc5e79175 ChangeLog 3824
-SHA256 eef3fb342847cd8324223a64c9410255a35e8b828b7c7d5f1be496855cc43130 ChangeLog 3824
+MD5 a8e1db8767171048742951976b54e477 ChangeLog 3979
+RMD160 3392fab50774bac252e215e2c0eeb5b4615b8eb6 ChangeLog 3979
+SHA256 b48344dd9ea1110277ae67ac6f0c519190630c3874ba22e7aa2b2530c4b5c0c9 ChangeLog 3979
 MD5 2e39286179863d6cfd0686f84e4907f6 files/digest-ibm-jre-bin-1.4.2 211
 RMD160 fa4e9aa4a2fca49896a14b9b58e350248ba982c2 files/digest-ibm-jre-bin-1.4.2 211
 SHA256 42ec24d0c42d41b382808683d88a767625bb197156600a2b8238db04a620bb6c files/digest-ibm-jre-bin-1.4.2 211
 MD5 0245416679d79331d7c033f5f9a0e8bf files/digest-ibm-jre-bin-1.4.2.03 1105
 RMD160 7321bb6d84092f86138a59259c1eefba00b0cd10 files/digest-ibm-jre-bin-1.4.2.03 1105
 SHA256 ca03d2127d72ba5f72151dea33836a82d8a2cab72ef71c7ee20b9d6925d136b8 files/digest-ibm-jre-bin-1.4.2.03 1105
+MD5 cc91e38f6d6b545e3378887272a33fc9 files/digest-ibm-jre-bin-1.4.2.04 1105
+RMD160 dfa901d80e8cd797c7f3db403ea86625569be6dc files/digest-ibm-jre-bin-1.4.2.04 1105
+SHA256 929096223edf1c5294b7c407a261e8ad36011db2e36efa8f202919798eb09c31 files/digest-ibm-jre-bin-1.4.2.04 1105
 MD5 dbb65981559a5881a93e19de3dde0b7c files/ibm-jre-bin-1.4.2 681
 RMD160 72ca274266c37013cc8ce7b79d3cfda9322520e3 files/ibm-jre-bin-1.4.2 681
 SHA256 fefe0873cce6685684998299add6ccee8ec2dc8e04465115f804a15e62d106a0 files/ibm-jre-bin-1.4.2 681
@@ -16,6 +19,9 @@ SHA256 461205a91a985669cea68c9f70831efa7d4a374643b9eea6faf2c3280663167b files/ib
 MD5 6f8a5150144c4306390ff4d4b1c59fca ibm-jre-bin-1.4.2.03.ebuild 3145
 RMD160 b36c2b05df4c828238af21aff566575c2b07f154 ibm-jre-bin-1.4.2.03.ebuild 3145
 SHA256 86947dc3c166ae89e27e8e5a2a82aacb5bcd06f9124f590e0ef57d6149d34ac6 ibm-jre-bin-1.4.2.03.ebuild 3145
+MD5 136ae9b741a367c7b37e1ebc99f38737 ibm-jre-bin-1.4.2.04.ebuild 2941
+RMD160 2091b3b24d66d4c88426427afade56e3376e37fe ibm-jre-bin-1.4.2.04.ebuild 2941
+SHA256 6a169982039e7857f9cf2e6eb9f6c660fa665e78102bce3e02ea9985f5ef39c1 ibm-jre-bin-1.4.2.04.ebuild 2941
 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
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.04 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.04
new file mode 100644
index 000000000000..b2f795b48c85
--- /dev/null
+++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.04
@@ -0,0 +1,12 @@
+MD5 ffb8f155d9bd2c3e0e91e8a5c629e1d4 IBMJava2-JRE-142-SR4.tgz 40287339
+RMD160 8f1a3d23c22c5169dd15db06d63a2d2403279e31 IBMJava2-JRE-142-SR4.tgz 40287339
+SHA256 9d5ceaddbd73c2ccc39df1566cf95ba20b78495fb29f9856c205908b5746c57d IBMJava2-JRE-142-SR4.tgz 40287339
+MD5 d065c6d9549c42bb89308020a6a95c4f IBMJava2-JRE-142.ppc-SR4.tgz 43427667
+RMD160 ca98a2e5a45daad7313344307e05198f3916dc29 IBMJava2-JRE-142.ppc-SR4.tgz 43427667
+SHA256 28464184f482ac72ff7fbee700e116f44a916e7bde1775970e7274265238c508 IBMJava2-JRE-142.ppc-SR4.tgz 43427667
+MD5 12675c48c2c3df9d14b877788cc83168 IBMJava2-JRE-142.ppc64-SR4.tgz 40683882
+RMD160 8095f1851401deaeb3f26f9dc5092627feb069fa IBMJava2-JRE-142.ppc64-SR4.tgz 40683882
+SHA256 dc122e7346d89b1072fc69364ecc3531f6f5e8e9fa633b6830ae109ca819507c IBMJava2-JRE-142.ppc64-SR4.tgz 40683882
+MD5 80b81da60b0445a0d52c4b7c42cd3ff3 IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz 33899987
+RMD160 3e90583ba07eecc32453b60ac9051cd10dc54e9f IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz 33899987
+SHA256 42d562302d2d0545526b1c6b6ce16058402dfc4efcedd6106cb71d2f58e1cc6e IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz 33899987
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.04.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.04.ebuild
new file mode 100644
index 000000000000..4c41b936459b
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.04.ebuild
@@ -0,0 +1,115 @@
+# 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.04.ebuild,v 1.1 2006/02/08 08:54:29 compnerd Exp $
+
+inherit java eutils
+
+if use x86 ; then
+	JRE_DIST="IBMJava2-JRE-142.tgz"
+	JRE_DIST_GENTOO="IBMJava2-JRE-142-SR4.tgz"
+elif use amd64 ; then
+	JRE_DIST="IBMJava2-JRE-AMD64-142.x86_64.tgz"
+	JRE_DIST_GENTOO="IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz"
+elif use ppc ; then
+	JRE_DIST="IBMJava2-JRE-142.ppc.tgz"
+	JRE_DIST_GENTOO="IBMJava2-JRE-142.ppc-SR4.tgz"
+elif use ppc64 ; then
+	JRE_DIST="IBMJava2-JRE-142.ppc64.tgz"
+	JRE_DIST_GENTOO="IBMJava2-JRE-142.ppc64-SR4.tgz"
+fi
+
+DESCRIPTION="IBM Java Development Kit"
+HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
+SRC_URI="x86? ( IBMJava2-JRE-142-SR4.tgz )
+		 amd64? ( IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz )
+		 ppc? ( IBMJava2-JRE-142.ppc-SR4.tgz )
+		 ppc64? ( IBMJava2-JRE-142.ppc64-SR4.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}"
+	einfo "Download: ${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}/jre/bin/${plugin}
+	fi
+
+	dohtml -a html,htm,HTML -r docs
+	dodoc ${S}/docs/COPYRIGHT
+
+	set_java_env ${FILESDIR}/${VMHANDLE}
+}
+
+pkg_postinst() {
+	java_pkg_postinst
+
+	if ! use X; then
+		eerror
+		eerror "You have not enabled the X useflag.  It is possible that"
+		eerror "you do not have an X server installed.  Please note that"
+		eerror "some parts of the IBM JRE require an X server to properly"
+		eerror "function.  Be careful which Java libraries you attempt to"
+		eerror "use with your installation."
+		eerror
+	fi
+}