Revbump to fix bug #126105 with jawt.h patch. Thanks to Ed Catmur <ed@catmur.co.uk> for the initial report and patch, and everyone else in the bug. Also removed old version.

(Portage version: 2.1.2_rc2-r1)

4 files changed, 313 insertions, 1 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index fb32f40f75bb..d52673a87ed0 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.96 2006/10/18 03:20:20 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.97 2006/11/22 13:31:57 caster Exp $
+
+*ibm-jdk-bin-1.5.0.3-r1 (22 Nov 2006)
+
+  22 Nov 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/ibm-jdk-bin-1.5.0.3-jawt-h.patch, -ibm-jdk-bin-1.5.0.2.ebuild,
+  +ibm-jdk-bin-1.5.0.3-r1.ebuild:
+  Revbump to fix bug #126105 with jawt.h patch. Thanks to Ed Catmur
+  <ed@catmur.co.uk> for the initial report and patch, and everyone else in the
+  bug. Also removed old version.
 
   18 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
   ibm-jdk-bin-1.5.0.3.ebuild:
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.3-r1 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.3-r1
new file mode 100644
index 000000000000..f50cb1dfd0df
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.3-r1
@@ -0,0 +1,24 @@
+MD5 7157bf3cc0884860000bd995fbadea5c ibm-java2-i386-javacomm-5.0-3.0.i386.rpm 125502
+RMD160 7f730b454c73f95f59589735713d748736c6e7a5 ibm-java2-i386-javacomm-5.0-3.0.i386.rpm 125502
+SHA256 5766c8d8656c7dff6defda953954dee8f22d18c6dfbadb889bc5b27534ebd730 ibm-java2-i386-javacomm-5.0-3.0.i386.rpm 125502
+MD5 450dd489ff72641b9d01939c8affd3de ibm-java2-i386-sdk-5.0-3.0.i386.rpm 63033967
+RMD160 dd32bc82e274923bb23e538942f727f1cbf36528 ibm-java2-i386-sdk-5.0-3.0.i386.rpm 63033967
+SHA256 6455de039dac7c5ee6642d04940b2704fdf611f6275914821fdc548ee685ecd8 ibm-java2-i386-sdk-5.0-3.0.i386.rpm 63033967
+MD5 a2f565793a04d8705ff37aa19d43792f ibm-java2-ppc-javacomm-5.0-3.0.ppc.rpm 133427
+RMD160 082e914b846803bbb5b777dad28dc93cc605ecc8 ibm-java2-ppc-javacomm-5.0-3.0.ppc.rpm 133427
+SHA256 c1179604922b978d720fc15b1eca24c411d0bd61cb3e006e147c19cf8376cafa ibm-java2-ppc-javacomm-5.0-3.0.ppc.rpm 133427
+MD5 f49d17f854699b92155c69ed4b292bac ibm-java2-ppc-sdk-5.0-3.0.ppc.rpm 70722009
+RMD160 c354d619b720f36bacd8592ac32cb6d4b7034b99 ibm-java2-ppc-sdk-5.0-3.0.ppc.rpm 70722009
+SHA256 cd947dc317c8d0ae91ecdce44ee4165aa6cba0c018ee5f706125ec12f37ab141 ibm-java2-ppc-sdk-5.0-3.0.ppc.rpm 70722009
+MD5 d4bbed3c0b449b7e11236c478462b962 ibm-java2-ppc64-javacomm-5.0-3.0.ppc64.rpm 135853
+RMD160 a7853bfc8c33eda88092abb49b245d73fe1eb733 ibm-java2-ppc64-javacomm-5.0-3.0.ppc64.rpm 135853
+SHA256 b2ea5661b97a6a5bce130ad7137ff94a60f15f56774be9fad2e35f587ece7c71 ibm-java2-ppc64-javacomm-5.0-3.0.ppc64.rpm 135853
+MD5 a35a2f110ad2af1238e0705496af69d3 ibm-java2-ppc64-sdk-5.0-3.0.ppc64.rpm 68640918
+RMD160 9ba5e027ea38aaf2164e5eeb88eface227d7c8d0 ibm-java2-ppc64-sdk-5.0-3.0.ppc64.rpm 68640918
+SHA256 74771d4d40f044f54a93d0711937976afc840e4f117b4f0d46609d361e421727 ibm-java2-ppc64-sdk-5.0-3.0.ppc64.rpm 68640918
+MD5 06eb61046f8bb9fb0b4e8e6fdfbef26a ibm-java2-x86_64-javacomm-5.0-3.0.x86_64.rpm 127812
+RMD160 e574bebd9ab5ddc82b68a585e927c574de4f19f7 ibm-java2-x86_64-javacomm-5.0-3.0.x86_64.rpm 127812
+SHA256 fc1c7ce4a63ac61c76c99125218e504598849398645be711f6c44d47c6a4e54c ibm-java2-x86_64-javacomm-5.0-3.0.x86_64.rpm 127812
+MD5 9571673c3eac80ba2e1f20b69df56002 ibm-java2-x86_64-sdk-5.0-3.0.x86_64.rpm 64564753
+RMD160 1d6c9441b1b7ce62b6e7967509ad3cb0732543ec ibm-java2-x86_64-sdk-5.0-3.0.x86_64.rpm 64564753
+SHA256 75fe72f73c226084c21e7f63bd5267006c48daa7121f47c9034aad00c48e29a4 ibm-java2-x86_64-sdk-5.0-3.0.x86_64.rpm 64564753
diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.0.3-jawt-h.patch b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.0.3-jawt-h.patch
new file mode 100644
index 000000000000..c3fa40cfa3c7
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.0.3-jawt-h.patch
@@ -0,0 +1,12 @@
+--- include/jawt.h	2006/07/20 23:02:04	1.1
++++ include/jawt.h	2006/07/20 23:03:13
+@@ -298,7 +298,9 @@ typedef struct jawt {
+  * Get the AWT native structure.  This function returns JNI_FALSE if
+  * an error occurs.
+  */
++#ifdef _JNI_IMPORT_OR_EXPORT_
+ _JNI_IMPORT_OR_EXPORT_
++#endif
+ jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt);
+ 
+ #define JAWT_VERSION_1_3 0x00010003
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild
new file mode 100644
index 000000000000..4d2ce33cc92a
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild
@@ -0,0 +1,267 @@
+# 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.5.0.3-r1.ebuild,v 1.1 2006/11/22 13:31:57 caster Exp $
+
+inherit java-vm-2 versionator eutils rpm
+
+JDK_RELEASE=$(get_version_component_range 2-3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+X86_JDK_DIST="ibm-java2-i386-sdk-${RPM_PV}.i386.rpm"
+X86_JAVACOMM_DIST="ibm-java2-i386-javacomm-${RPM_PV}.i386.rpm"
+
+AMD64_JDK_DIST="ibm-java2-x86_64-sdk-${RPM_PV}.x86_64.rpm"
+AMD64_JAVACOMM_DIST="ibm-java2-x86_64-javacomm-${RPM_PV}.x86_64.rpm"
+
+PPC_JDK_DIST="ibm-java2-ppc-sdk-${RPM_PV}.ppc.rpm"
+PPC_JAVACOMM_DIST="ibm-java2-ppc-javacomm-${RPM_PV}.ppc.rpm"
+
+PPC64_JDK_DIST="ibm-java2-ppc64-sdk-${RPM_PV}.ppc64.rpm"
+PPC64_JAVACOMM_DIST="ibm-java2-ppc64-javacomm-${RPM_PV}.ppc64.rpm"
+
+if use x86; then
+	JDK_DIST=${X86_JDK_DIST}
+	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
+	S="${WORKDIR}/opt/ibm/java2-i386-50"
+elif use amd64; then
+	JDK_DIST=${AMD64_JDK_DIST}
+	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
+	S="${WORKDIR}/opt/ibm/java2-x86_64-50"
+elif use ppc; then
+	JDK_DIST=${PPC_JDK_DIST}
+	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
+	S="${WORKDIR}/opt/ibm/java2-ppc-50"
+elif use ppc64; then
+	JDK_DIST=${PPC64_JDK_DIST}
+	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
+	S="${WORKDIR}/opt/ibm/java2-ppc64-50"
+fi
+
+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"
+
+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 )
+		nsplugin? (
+			x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
+			ppc? ( =x11-libs/gtk+-1* )
+		)"
+DEPEND=""
+
+IUSE="X alsa javacomm nsplugin"
+
+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}:"
+	einfo "${JDK_DIST}"
+	if use javacomm ; then
+		einfo "${JAVACOMM_DIST}"
+	fi
+	einfo "Place the file(s) in: ${DISTDIR}"
+	einfo "Then run emerge =${VMHANDLE}*"
+
+	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
+	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}"
+	einfo "If it's not even there, you can also try rewriting the link of the"
+	einfo "newer SR# into SR${SERVICE_RELEASE}, while cursing IBM."
+}
+
+src_unpack() {
+	rpm_src_unpack
+	cd "${S}"
+
+	# bug #126105
+	epatch "${FILESDIR}/${P}-jawt-h.patch"
+}
+
+src_compile() { :; }
+
+src_install() {
+	# 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
+
+
+	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
+}