Version bump, bug #181306. No more symlink in old src.jar location.

(Portage version: 2.1.2.9)

3 files changed, 323 insertions, 1 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 4d08502b26ba..7baade67cfd8 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.115 2007/04/23 08:32:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.116 2007/06/08 20:07:20 caster Exp $
+
+*ibm-jdk-bin-1.5.0.5 (08 Jun 2007)
+
+  08 Jun 2007; Vlastimil Babka <caster@gentoo.org>
+  +ibm-jdk-bin-1.5.0.5.ebuild:
+  Version bump, bug #181306. No more symlink in old src.jar location.
 
   23 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
   ibm-jdk-bin-1.5.0.4.ebuild:
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.5 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.5
new file mode 100644
index 000000000000..bb35f0359cd9
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.5
@@ -0,0 +1,24 @@
+MD5 e196d2e9d7aeb2b1ce8d15bda13250b1 ibm-java2-javacomm-5.0-5.0-linux-i386.tgz 119399
+RMD160 a8fdc4c0bfb675f6f52236fc2ec739cca3a425b4 ibm-java2-javacomm-5.0-5.0-linux-i386.tgz 119399
+SHA256 a71f5bb4a7a0b2573c4e87e0b0ab354f66d330e08e049136f381198e7a826003 ibm-java2-javacomm-5.0-5.0-linux-i386.tgz 119399
+MD5 de48f7494798ec343e10061dd3662d3e ibm-java2-javacomm-5.0-5.0-linux-ppc.tgz 125889
+RMD160 b116c754b874ff5c1b85f4f074fb82420d9e1f68 ibm-java2-javacomm-5.0-5.0-linux-ppc.tgz 125889
+SHA256 33bde587ca70c61141cc1fb20f24ca53fca98a5bdb125b5987d483880b0765ac ibm-java2-javacomm-5.0-5.0-linux-ppc.tgz 125889
+MD5 c20c78a7be313777faa4b77c14261b5e ibm-java2-javacomm-5.0-5.0-linux-ppc64.tgz 128430
+RMD160 36128c1445ba5fd0a0d3612fa5b9a862a6ebd556 ibm-java2-javacomm-5.0-5.0-linux-ppc64.tgz 128430
+SHA256 4c55365aa4f30a78553b5973e5dd106d527e37fde12c94780fe5e42fea9c3cc5 ibm-java2-javacomm-5.0-5.0-linux-ppc64.tgz 128430
+MD5 64ea9f57e03f6687d61879fb850d8f3b ibm-java2-javacomm-5.0-5.0-linux-x86_64.tgz 121935
+RMD160 00885bc84d001a7a6e2ac3f7150df6aa33e98b6f ibm-java2-javacomm-5.0-5.0-linux-x86_64.tgz 121935
+SHA256 ad4287c2cf0ee3b09df876eb0d0b2d9b1b3636ae4fae4cfc2d283f1cefe1d629 ibm-java2-javacomm-5.0-5.0-linux-x86_64.tgz 121935
+MD5 4cba7d6a23a24f809dc8ac22b07a473e ibm-java2-sdk-5.0-5.0-linux-i386.tgz 63528969
+RMD160 b1bfd7ab8cf36dd9aaa42bdb1ecdaf63f8970a81 ibm-java2-sdk-5.0-5.0-linux-i386.tgz 63528969
+SHA256 86dee8cfca4f30f485d08862afae9ac7494d63496da59621e5f3adcf0d658a8d ibm-java2-sdk-5.0-5.0-linux-i386.tgz 63528969
+MD5 27467985193c065b8555e5f05dc04296 ibm-java2-sdk-5.0-5.0-linux-ppc.tgz 71224236
+RMD160 bc40d19fca25caf07683a12419dc058a5c29d370 ibm-java2-sdk-5.0-5.0-linux-ppc.tgz 71224236
+SHA256 66db21b19b9713630f1dbbe4a73b2f1964fda597322ca11faf14ddb18e8ea254 ibm-java2-sdk-5.0-5.0-linux-ppc.tgz 71224236
+MD5 9be367ab26fdae7a7d1440b4d6644074 ibm-java2-sdk-5.0-5.0-linux-ppc64.tgz 69279292
+RMD160 6a5564b930468e11c7edc8ced27d028b974e8d01 ibm-java2-sdk-5.0-5.0-linux-ppc64.tgz 69279292
+SHA256 b6ea9aaa30d120496039843ad236067f8c1c3b848ccadb4f2da6acb9e1178fc4 ibm-java2-sdk-5.0-5.0-linux-ppc64.tgz 69279292
+MD5 984230416cb093f59f952d19f99f9152 ibm-java2-sdk-5.0-5.0-linux-x86_64.tgz 65157909
+RMD160 a680c7c907323ebe9064e3ebf91f6cfa5d248413 ibm-java2-sdk-5.0-5.0-linux-x86_64.tgz 65157909
+SHA256 fcc14d8786dd36a58738d9e361c8beb72ee2c0431b9f6a26d5f947b84627ec88 ibm-java2-sdk-5.0-5.0-linux-x86_64.tgz 65157909
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5.ebuild
new file mode 100644
index 000000000000..1c6ef63b143c
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5.ebuild
@@ -0,0 +1,292 @@
+# 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.5.0.5.ebuild,v 1.1 2007/06/08 20:07:20 caster Exp $
+
+inherit java-vm-2 versionator eutils
+
+JDK_RELEASE=$(get_version_component_range 2-3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+JDK_DIST_PREFIX="ibm-java2-sdk-${RPM_PV}-linux"
+JAVACOMM_DIST_PREFIX="ibm-java2-javacomm-${RPM_PV}-linux"
+
+X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
+X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
+
+AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
+AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-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}/ibm-java2-i386-50"
+	LINK_ARCH="intel"
+elif use amd64; then
+	JDK_DIST=${AMD64_JDK_DIST}
+	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
+	S="${WORKDIR}/ibm-java2-x86_64-50"
+	LINK_ARCH="amd64"
+elif use ppc; then
+	JDK_DIST=${PPC_JDK_DIST}
+	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
+	S="${WORKDIR}/ibm-java2-ppc-50"
+	LINK_ARCH="ipseries32"
+elif use ppc64; then
+	JDK_DIST=${PPC64_JDK_DIST}
+	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
+	S="${WORKDIR}/ibm-java2-ppc64-50"
+	LINK_ARCH="ipseries64"
+fi
+
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK"
+
+SLOT="1.5"
+DESCRIPTION="IBM Java Development Kit ${SLOT}"
+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.5"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+RESTRICT="fetch"
+IUSE="X alsa doc examples javacomm nsplugin"
+
+RDEPEND="
+		=virtual/libstdc++-3.3
+		X? ( || (
+					(
+						x11-libs/libXt
+						x11-libs/libX11
+						x11-libs/libXtst
+						x11-libs/libXp
+						x11-libs/libXext
+						x11-libs/libXi
+						x11-libs/libXmu
+						x11-libs/libXft
+					)
+					virtual/x11
+				)
+			)
+		alsa? ( media-libs/alsa-lib )
+		doc? ( =dev-java/java-sdk-docs-1.5.0* )
+		nsplugin? (
+			x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
+			ppc? ( =x11-libs/gtk+-1* )
+		)"
+DEPEND=""
+
+QA_EXECSTACK_amd64="opt/${P}/jre/bin/libjclscar_23.so
+	opt/${P}/jre/bin/libj9vrb23.so
+	opt/${P}/jre/bin/libj9vm23.so
+	opt/${P}/jre/bin/libj9trc23.so
+	opt/${P}/jre/bin/libj9thr23.so
+	opt/${P}/jre/bin/libj9shr23.so
+	opt/${P}/jre/bin/libj9prt23.so
+	opt/${P}/jre/bin/libj9jvmti23.so
+	opt/${P}/jre/bin/libj9jpi23.so
+	opt/${P}/jre/bin/libj9jit23.so
+	opt/${P}/jre/bin/libj9jextract.so
+	opt/${P}/jre/bin/libj9hookable23.so
+	opt/${P}/jre/bin/libj9gc23.so
+	opt/${P}/jre/bin/libj9dyn23.so
+	opt/${P}/jre/bin/libj9dmp23.so
+	opt/${P}/jre/bin/libj9dbg23.so
+	opt/${P}/jre/bin/libj9bcv23.so
+	opt/${P}/jre/bin/libiverel23.so
+	opt/${P}/jre/bin/classic/libjvm.so
+	opt/${P}/jre/bin/j9vm/libjvm.so"
+
+QA_TEXTRELS_amd64="opt/${P}/jre/bin/libjclscar_23.so
+	opt/${P}/jre/bin/libj9jit23.so"
+
+QA_EXECSTACK_x86="opt/${P}/jre/bin/j9vm/libjvm.so
+	opt/${P}/jre/bin/libj9jvmti23.so
+	opt/${P}/jre/bin/libj9hookable23.so
+	opt/${P}/jre/bin/libj9vm23.so
+	opt/${P}/jre/bin/libj9dyn23.so
+	opt/${P}/jre/bin/libjclscar_23.so
+	opt/${P}/jre/bin/libj9jpi23.so
+	opt/${P}/jre/bin/libj9thr23.so
+	opt/${P}/jre/bin/libj9dmp23.so
+	opt/${P}/jre/bin/libj9prt23.so
+	opt/${P}/jre/bin/libj9jit23.so
+	opt/${P}/jre/bin/libiverel23.so
+	opt/${P}/jre/bin/libj9trc23.so
+	opt/${P}/jre/bin/libj9dbg23.so
+	opt/${P}/jre/bin/libj9jextract.so
+	opt/${P}/jre/bin/libj9shr23.so
+	opt/${P}/jre/bin/libj9gc23.so
+	opt/${P}/jre/bin/libj9vrb23.so
+	opt/${P}/jre/bin/libj9bcv23.so
+	opt/${P}/jre/bin/libj9aotrt23.so
+	opt/${P}/jre/bin/classic/libjvm.so"
+
+QA_TEXTRELS_ppc="opt/${P}/jre/bin/classic/libjvm.so
+	opt/${P}/jre/bin/j9vm/libjvm.so
+	opt/${P}/jre/bin/libj9aotrt23.so
+	opt/${P}/jre/bin/libj9dbg23.so
+	opt/${P}/jre/bin/libj9gc23.so
+	opt/${P}/jre/bin/libj9gcchk23.so
+	opt/${P}/jre/bin/libj9jextract.so
+	opt/${P}/jre/bin/libj9jit23.so
+	opt/${P}/jre/bin/libj9jitd23.so
+	opt/${P}/jre/bin/libj9jpi23.so
+	opt/${P}/jre/bin/libj9jvmti23.so
+	opt/${P}/jre/bin/libj9prt23.so
+	opt/${P}/jre/bin/libj9thr23.so
+	opt/${P}/jre/bin/libj9thr23.so
+	opt/${P}/jre/bin/libj9ute23.so
+	opt/${P}/jre/bin/libj9vm23.so
+	opt/${P}/jre/bin/libj9vm23.so
+	opt/${P}/jre/bin/libjaas.so
+	opt/${P}/jre/bin/libjclscar_23.so
+	opt/${P}/jre/bin/libjsig.so
+"
+
+QA_TEXTRELS_ppc64="opt/${P}/jre/bin/libj9jextract.so
+	opt/${P}/jre/bin/libjsig.so
+	opt/${P}/jre/bin/libj9jitd23.so
+	opt/${P}/jre/bin/libj9ute23.so
+	opt/${P}/jre/bin/classic/libjvm.so
+	opt/${P}/jre/bin/libj9prt23.so
+	opt/${P}/jre/bin/libjclscar_23.so
+	opt/${P}/jre/bin/j9vm/libjvm.so
+	opt/${P}/jre/bin/libj9gc23.so
+	opt/${P}/jre/bin/libj9dbg23.so
+	opt/${P}/jre/bin/libj9thr23.so
+	opt/${P}/jre/bin/libj9jpi23.so
+	opt/${P}/jre/bin/libj9gcchk23.so
+	opt/${P}/jre/bin/libj9vm23.so
+	opt/${P}/jre/bin/libj9jit23.so"
+
+
+QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
+	opt/${P}/jre/bin/j9vm/libjvm.so
+	opt/${P}/jre/bin/xawt/libmawt.so
+	opt/${P}/jre/bin/javaplugin.so
+	opt/${P}/jre/bin/motif21/libmawt.so
+	opt/${P}/jre/bin/headless/libmawt.so
+	opt/${P}/jre/bin/classic/libjvm.so
+	opt/${P}/jre/lib/i386/libdeploy.so"
+
+pkg_nofetch() {
+	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	einfo "Please visit: ${DOWNLOADPAGE}"
+
+	einfo "Under J2SE 5.0, download SR${SERVICE_RELEASE} for your arch:"
+	einfo "(note that we switched to tgz format because it's now versioned)"
+	einfo "${JDK_DIST}"
+	if use javacomm ; then
+		einfo "${JAVACOMM_DIST}"
+	fi
+
+	einfo "You can 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() { :; }
+
+src_install() {
+	# 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}/"
+
+	# 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
+
+
+	local x86plugin=libjavaplugin_ojigtk2.so
+	local ppcplugin=libjavaplugin_oji.so
+	local jrebindest="${D}/opt/${P}/jre/bin/"
+
+	local plugin
+	if use x86; then
+		plugin=${x86plugin}
+	elif use ppc; then
+		plugin=${ppcplugin}
+	#	rm "${jrebindest}/${x86plugin}" "${jrebindest}/libjavaplugin_nscpgtk2.so" || \
+	#		eerror "Failed to delete gtk2 javaplugin."
+	fi
+
+	plugin=/opt/${P}/jre/bin/${plugin}
+
+	if use x86 || use ppc; then
+		if use nsplugin; then
+			install_mozilla_plugin ${plugin}
+		else
+			rm "${jrebindest}/*javaplugin*.so" || \
+				eerror "Failed to delete javaplugin shared libraries"
+		fi
+	fi
+
+	use !alsa && rm "${jrebindest}/libjsoundalsa.so"
+
+	dohtml -a html,htm,HTML -r docs
+	dodoc ${S}/COPYRIGHT
+
+	set_java_env
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+	if ! use X; then
+		echo
+		ewarn "You're not using X so its possible that you dont have"
+		ewarn "a X server installed, please read the following warning: "
+		ewarn "Some parts of IBM JDK require XFree86 to be installed."
+		ewarn "Be careful which Java libraries you attempt to use."
+	fi
+
+	elog ""
+	elog "Starting with 1.5.0.4-r1 demos are installed only with USE=examples"
+	elog ""
+	elog "Starting with 1.5.0.5 the src.jar is installed to the standard"
+	elog "location only (/opt/${P}/) and not /opt/${P}/share/"
+	elog "as we used to. See https://bugs.gentoo.org/show_bug.cgi?id=2241"
+	elog "for more details."
+}