Version bump, bug #174481. Adds examples USE flag that controls installing of demos. The src.jar file moved to expected location per bug #2241, previously used location contains symlink that will be removed in next version bump.

(Portage version: 2.1.2.4)

3 files changed, 240 insertions, 1 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index ee71929c72a8..83e89757651b 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.110 2007/04/13 16:56:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.111 2007/04/19 22:43:26 caster Exp $
+
+*ibm-jdk-bin-1.4.2.8 (19 Apr 2007)
+
+  19 Apr 2007; Vlastimil Babka <caster@gentoo.org>
+  +ibm-jdk-bin-1.4.2.8.ebuild:
+  Version bump, bug #174481. Adds examples USE flag that controls installing
+  of demos. The src.jar file moved to expected location per bug #2241,
+  previously used location contains symlink that will be removed in next
+  version bump.
 
   13 Apr 2007; Vlastimil Babka <caster@gentoo.org>
   -ibm-jdk-bin-1.4.2.6-r4.ebuild, ibm-jdk-bin-1.4.2.7.ebuild:
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.8 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.8
new file mode 100644
index 000000000000..fe288218246c
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.8
@@ -0,0 +1,24 @@
+MD5 fc3a959a8c09b4c606593dfa6a633933 IBMJava2-JAVACOMM-1.4.2-8.0.ppc.tgz 124661
+RMD160 9bf42ed20ec6a55f936a16b9f9bebe6c28c04b18 IBMJava2-JAVACOMM-1.4.2-8.0.ppc.tgz 124661
+SHA256 a51d630a24343216a1df5a77fdb2cf0e1055b342b6f370ad9526f23c835e3456 IBMJava2-JAVACOMM-1.4.2-8.0.ppc.tgz 124661
+MD5 6f8825f699fc7d2e5c143ecdac4ecb5e IBMJava2-JAVACOMM-1.4.2-8.0.ppc64.tgz 127731
+RMD160 9d24e8acd2e5adda1a4b931d5295f71835943e80 IBMJava2-JAVACOMM-1.4.2-8.0.ppc64.tgz 127731
+SHA256 467ea13cf606eafcd8362e7996bee60c38eef20c0280beddf2f2881efdf37a94 IBMJava2-JAVACOMM-1.4.2-8.0.ppc64.tgz 127731
+MD5 0b2444077ef5afbc45cbccac80612737 IBMJava2-JAVACOMM-1.4.2-8.0.tgz 118351
+RMD160 04d030551eb0e4abf349ff6185c862ed6ee097b9 IBMJava2-JAVACOMM-1.4.2-8.0.tgz 118351
+SHA256 b1cab8c17752a7700e32511a6135aab291a6cf15eca123d3352d2609fc104090 IBMJava2-JAVACOMM-1.4.2-8.0.tgz 118351
+MD5 ab249cc262bc15e0d911f7898c66de8d IBMJava2-JAVACOMM-AMD64-1.4.2-8.0.x86_64.tgz 120223
+RMD160 cb5c905befefe8c465ffd25418cb1b2f7077ec02 IBMJava2-JAVACOMM-AMD64-1.4.2-8.0.x86_64.tgz 120223
+SHA256 4b1b7c5ef7cb1c63edbb3d4eeb6c0d294989713de2b7e6b51946f4d055b9e8f1 IBMJava2-JAVACOMM-AMD64-1.4.2-8.0.x86_64.tgz 120223
+MD5 6545eafe92e7001a79edc033c90b634c IBMJava2-SDK-1.4.2-8.0.ppc.tgz 66354541
+RMD160 e2bf580276a6b238b38d3bd279ba571fc38bd98c IBMJava2-SDK-1.4.2-8.0.ppc.tgz 66354541
+SHA256 4370724188f2e2ac549765d8d2e4bf0ef9e3a50d66657e0e7935dc9b4ecd1a97 IBMJava2-SDK-1.4.2-8.0.ppc.tgz 66354541
+MD5 4b054cb416db3784b84ef047ec89e89b IBMJava2-SDK-1.4.2-8.0.ppc64.tgz 64601721
+RMD160 d2a984e38cb6af844de7d9c5dbbbd09a38965636 IBMJava2-SDK-1.4.2-8.0.ppc64.tgz 64601721
+SHA256 aae5abd91f3bf1ed387e6affdd98323949d37e2709272b9139d9ff96627afa26 IBMJava2-SDK-1.4.2-8.0.ppc64.tgz 64601721
+MD5 d44d65a91667e4ad2cfe7d5b071817d0 IBMJava2-SDK-1.4.2-8.0.tgz 58613812
+RMD160 d20623a495b1a57f2457f0db3966210685b339fb IBMJava2-SDK-1.4.2-8.0.tgz 58613812
+SHA256 da63b0bd41baef600572ecd0514bfcc767757ba94839933909168bda2f62a8c3 IBMJava2-SDK-1.4.2-8.0.tgz 58613812
+MD5 389dc3881a2a3a3741785de66327457e IBMJava2-SDK-AMD64-1.4.2-8.0.x86_64.tgz 52926719
+RMD160 70028cc3089819ee9f7c532f48aebf1fd07c4756 IBMJava2-SDK-AMD64-1.4.2-8.0.x86_64.tgz 52926719
+SHA256 ce51e0634234674346b259bb8f47895769f8562575c9299507817fad045b5759 IBMJava2-SDK-AMD64-1.4.2-8.0.x86_64.tgz 52926719
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.8.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.8.ebuild
new file mode 100644
index 000000000000..aec027f9a8fb
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.8.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2007 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.8.ebuild,v 1.1 2007/04/19 22:43:26 caster Exp $
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit java-vm-2 eutils versionator
+
+JDK_RELEASE=$(get_version_component_range 1-3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+JDK_DIST_PREFIX="IBMJava2-SDK-${RPM_PV}"
+JAVACOMM_DIST_PREFIX="IBMJava2-JAVACOMM-${RPM_PV}"
+
+X86_JDK_DIST="${JDK_DIST_PREFIX}.tgz"
+X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.tgz"
+
+# wonder why amd64 has this extra special AMD64 in its filename...
+AMD64_JDK_DIST="IBMJava2-SDK-AMD64-${RPM_PV}.x86_64.tgz"
+AMD64_JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.tgz"
+
+PPC_JDK_DIST="${JDK_DIST_PREFIX}.ppc.tgz"
+PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.ppc.tgz"
+
+PPC64_JDK_DIST="${JDK_DIST_PREFIX}.ppc64.tgz"
+PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.ppc64.tgz"
+
+if use x86; then
+	JDK_DIST=${X86_JDK_DIST}
+	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
+	S="${WORKDIR}/IBMJava2-142"
+	LINK_ARCH="ia32"
+elif use amd64; then
+	JDK_DIST=${AMD64_JDK_DIST}
+	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
+	S="${WORKDIR}/IBMJava2-amd64-142"
+	LINK_ARCH="amd64"
+elif use ppc; then
+	JDK_DIST=${PPC_JDK_DIST}
+	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
+	S="${WORKDIR}/IBMJava2-ppc-142"
+	LINK_ARCH="ip32"
+elif use ppc64; then
+	JDK_DIST=${PPC64_JDK_DIST}
+	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
+	S="${WORKDIR}/IBMJava2-ppc64-142"
+	LINK_ARCH="ip64"
+fi
+
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
+
+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? ( ${X86_JDK_DIST} )
+	amd64? ( ${AMD64_JDK_DIST} )
+	ppc? ( ${PPC_JDK_DIST} )
+	ppc64? ( ${PPC64_JDK_DIST} )
+	javacomm? (
+		x86? ( ${X86_JAVACOMM_DIST} )
+		amd64? ( ${AMD64_JAVACOMM_DIST} )
+		ppc? ( ${PPC_JAVACOMM_DIST} )
+		ppc64? ( ${PPC64_JAVACOMM_DIST} )
+		)"
+
+LICENSE="IBM-J1.4"
+SLOT="1.4"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X alsa doc examples javacomm nsplugin"
+
+RDEPEND="
+		=virtual/libstdc++-3.3
+		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
+		)
+		x86? ( nsplugin? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) )
+		doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
+
+RESTRICT="fetch"
+
+QA_TEXTRELS_amd64="opt/${P}/jre/bin/libj9jit22.so
+	opt/${P}/jre/bin/libjclscar_22.so"
+QA_TEXTRELS_ppc64="opt/${P}/jre/bin/classic/libjvm.so"
+QA_TEXTRELS_ppc="opt/${P}/jre/bin/libjitc.so
+	opt/${P}/jre/bin/libjaas.so"
+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 "You can also use direct link to your arch download page:"
+	einfo "${DIRECT_DOWNLOAD}"
+	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}. Lately that page"
+	einfo "isn't updated, but the files should still available through the"
+	einfo "direct link to arch download page. If it doesn't work, file a bug."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# bug #126105
+	epatch "${FILESDIR}/${PN}-jawt.h.patch"
+}
+
+src_compile() { true; }
+
+src_install() {
+	# javaws is on x86 only
+	if use x86; then
+		# The javaws execution script is 777 why?
+		chmod 0755 ${S}/jre/javaws/javaws
+
+		# bug #147259
+		dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
+		dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
+	fi
+
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pR ${S}/{bin,jre,lib,include} ${D}opt/${P}/
+
+	dodir /opt/${P}/share
+	if use examples; then
+		cp -pPR ${S}/demo ${D}opt/${P}/share/
+	fi
+
+	cp -pPR ${S}/src.jar "${D}/opt/${P}/"
+	dosym "../src.jar" /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
+	elog ""
+	elog "Starting with 1.4.2.8 the demos are installed only with USE=examples enabled"
+	elog ""
+	elog "Starting with 1.4.2.8 the src.jar is installed to the standard"
+	elog "location. It is still symlinked to the old location (/opt/${P}/share)"
+	elog "but it will be removed if there will ever be a version bump."
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
+	elog "for more details."
+}