Revbump to use correct javacomm distfile, bug #240384.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1-perfctr x86_64

3 files changed, 257 insertions, 2 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index e38246460ad6..c359e9479d5b 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.178 2008/10/11 14:56:48 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.179 2008/10/11 17:49:08 caster Exp $
+
+*ibm-jdk-bin-1.6.0.2-r1 (11 Oct 2008)
+
+  11 Oct 2008; Vlastimil Babka <caster@gentoo.org>
+  +ibm-jdk-bin-1.6.0.2-r1.ebuild:
+  Revbump to use correct javacomm distfile, bug #240384.
 
 *ibm-jdk-bin-1.4.2.12 (11 Oct 2008)
 
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 65f9e6d69944..d6bddd5131af 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -19,6 +19,10 @@ DIST IBMJava2-SDK-1.4.2-12.0.ppc64.tgz 65272395 RMD160 72a362fa0010ea3aa07a5dbaf
 DIST IBMJava2-SDK-1.4.2-12.0.tgz 59064312 RMD160 7897673086ed892bf63038a7c629db00b611c82c SHA1 254c465ee2aa2857b02f2f905c30a162468ad8dd SHA256 c93c7c6cc970c69bab738dd9cf99ab0e6c01d9f541903dc1120a52c756491cdf
 DIST IBMJava2-SDK-AMD64-1.4.2-11.0.x86_64.tgz 57416342 RMD160 e165dfdf035f760ee1d17a8f6cceb7a07128f4bd SHA1 2576c84b89ae03067cdc772c11db969f935ccc86 SHA256 89e4fae5238a8e2aff3504347e05b84dc6c09168d275f043ea3a7a7061aa52e8
 DIST IBMJava2-SDK-AMD64-1.4.2-12.0.x86_64.tgz 57332160 RMD160 61e9cc53187c58f3422605034d2fcb513980f764 SHA1 53744754799837e460f79456fe58cea63f12f7e0 SHA256 ae54c5099b2d6eeef8951bfef19cd6d8c7897d62c5bdf489f17b5bfe0da3d496
+DIST ibm-java-javacomm-3.0-0.0-linux-i386.tgz 336158 RMD160 e839687ab51ba8e1d43d0e358c14b7a003cef698 SHA1 cc6aef4cd719deae1f00e287222d115373d4df29 SHA256 3dc8a83b06381c2a6c027f281c5ee65f910d6fd8f1ee50008505bc44737c5ac4
+DIST ibm-java-javacomm-3.0-0.0-linux-ppc.tgz 345149 RMD160 3ea047bb5942a60e76de3723b768da444b0c4eb3 SHA1 bd624fe7777765d835122d35a562ebeca191155f SHA256 591911aeec57f0fe514af08c769675385a4295e8d6093d93f93b5055e839d018
+DIST ibm-java-javacomm-3.0-0.0-linux-ppc64.tgz 348100 RMD160 ebb54043751bf65b3dd8b7cc5d020d98ddf18bb9 SHA1 ded3719fc59c527c0d8985d2689e0a8279edc5e8 SHA256 ec766c7589f25bbb156557e7cc170af059129eb2d06c0ff3c259f914059d5536
+DIST ibm-java-javacomm-3.0-0.0-linux-x86_64.tgz 338454 RMD160 3de85f6659ec9c01afa4d0be516101b025704464 SHA1 d436836b496350e2b65834166a4d6414cb6ac2fa SHA256 b50be0aabf3c2150b1890455880dcc1ff7483eaa7cf84b883cd9efebd14c4215
 DIST ibm-java-sdk-6.0-0.0-linux-i386.tgz 86573879 RMD160 6489716e491907193c0d27050d08b3a1e1ab0a44 SHA1 0d7186d76eb1d79b245ff84342905af972e74b34 SHA256 c72e43e1f52e5910f84634ce87f186a4832dc73f93adc6a727a2069b62cd4a1d
 DIST ibm-java-sdk-6.0-0.0-linux-ppc.tgz 88854304 RMD160 626bec6e1f97e3fb214915c4e51421b5e206bd5d SHA1 d17570549080fd434c973298b68ee6e11eb273dd SHA256 b299eca3276a35b794f9543768e51e707051dda74d819d67f0d6660352be36f7
 DIST ibm-java-sdk-6.0-0.0-linux-ppc64.tgz 90297044 RMD160 23e96a95c714bfe8e0384d806e056c6228386d89 SHA1 a5a515b312c42fd526e6ccbbe21f0d736f32a6b7 SHA256 0aa829dc7498bcb8031de2f759622bc754981a7417a89e434d1b87b4f59e41a2
@@ -49,6 +53,7 @@ EBUILD ibm-jdk-bin-1.5.0.8a.ebuild 7299 RMD160 02be9460d864fa50dbf565faf4da36865
 EBUILD ibm-jdk-bin-1.6.0.0.ebuild 6974 RMD160 84625cb36b4b366ed22169396229c8750141644a SHA1 2a77f60a72c8996d4b3e03756ea2f604b6dc2138 SHA256 c29aba6cce9d0f997006df201f366550e87f382f513bab8bb9ffffd93a3d18ba
 EBUILD ibm-jdk-bin-1.6.0.1-r1.ebuild 8091 RMD160 b6eccfd87a5f9e77b1b1a40b81072a64cf9b0442 SHA1 f2618753b620a1f639c34212a8dc21e39aae0b0f SHA256 2379925101178482be6f458d465ace71f4c28e9c07ac9d2f88863784b5d3a6a9
 EBUILD ibm-jdk-bin-1.6.0.1.ebuild 7983 RMD160 66570cb5eea4f080c3ab74f03f603faeb5b09d2c SHA1 0c862324712723b9fe2d414e3be61f86a1efc688 SHA256 4953294e7ff1dc382049f68f3d84f31da0b077337a893aeedf0224a71c82b4bb
+EBUILD ibm-jdk-bin-1.6.0.2-r1.ebuild 8259 RMD160 8c1ac51a57fd394acf42e523ae0b8a1fd7debb05 SHA1 39ad15ac8ca356813d6e5c3cd6cbd3a05f881ebd SHA256 61f0f2fbc8633956e4e1f37a078bb79054a8a558ceb4871703eb336b0a0550c5
 EBUILD ibm-jdk-bin-1.6.0.2.ebuild 8250 RMD160 2db209782de91c72b62fb9af2edc46dce5f77068 SHA1 9d74ba138a0b8a88ea7407043d9a28ad251765d8 SHA256 cd110b721c8071f06e5181173b05038eceb22b47ef70c5966b0ff0ccdd947ff0
-MISC ChangeLog 27766 RMD160 6ecd0b449e5b593297da774853d1ca4aed0655f6 SHA1 f877acc9dbb6747218f1b18abd5cc92fd26f3f6e SHA256 93e9654185b42231e80b875a79ccb91558ecb937b76ecf636736c1b64969e559
+MISC ChangeLog 27948 RMD160 da370e18bd66cd54ce3afe4d29ec7437013cd6c5 SHA1 6bc728a29260534531e4d5333491db335ee64332 SHA256 3469955ef563b655044e0a26f111f53b0237a3d28a3d045bf4264b9a34640b8c
 MISC metadata.xml 310 RMD160 ac3496cf91b69c0bab3ab8fb6656fbcbf8845f8d SHA1 c8bca85a871e8f7c11481456b490a0fd09175884 SHA256 ffd62e0957318b6c4f3308be446258eae8ce7b8436075f231a30e2ae4691fabf
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.2-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.2-r1.ebuild
new file mode 100644
index 000000000000..fe0e53e68021
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.2-r1.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2008 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.6.0.2-r1.ebuild,v 1.1 2008/10/11 17:49:08 caster Exp $
+
+inherit java-vm-2 versionator eutils
+
+JDK_RELEASE=$(get_version_component_range 2-3)
+JAVACOMM_RELEASE=$(get_version_component_range 3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
+TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
+# looks like they didn't bump javacomm
+JAVACOMM_PV="3.${JAVACOMM_RELEASE}-0.0"
+
+JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
+JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_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-java-i386-60"
+	LINK_ARCH="intel"
+elif use amd64; then
+	JDK_DIST=${AMD64_JDK_DIST}
+	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
+	S="${WORKDIR}/ibm-java-x86_64-60"
+	LINK_ARCH="amd64"
+elif use ppc; then
+	JDK_DIST=${PPC_JDK_DIST}
+	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
+	S="${WORKDIR}/ibm-java-ppc-60"
+	LINK_ARCH="ipseries32"
+elif use ppc64; then
+	JDK_DIST=${PPC64_JDK_DIST}
+	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
+	S="${WORKDIR}/ibm-java-ppc64-60"
+	LINK_ARCH="ipseries64"
+fi
+
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK"
+
+SLOT="1.6"
+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.6"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+RESTRICT="fetch"
+IUSE="X alsa doc examples javacomm nsplugin odbc"
+
+RDEPEND="
+	ppc? ( =virtual/libstdc++-3.3 )
+	ppc64? ( =virtual/libstdc++-3.3 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		x11-libs/libX11
+		amd64? ( x11-libs/libXt )
+	)
+	alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.6.0* )
+	odbc? ( dev-db/unixODBC )"
+
+DEPEND=""
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
+opt/${P}/jre/lib/i386/libj9vm24.so
+opt/${P}/jre/lib/i386/libjclscar_24.so
+opt/${P}/jre/lib/i386/motif21/libmawt.so
+opt/${P}/jre/lib/i386/libj9thr24.so
+opt/${P}/jre/lib/i386/libj9jit24.so
+opt/${P}/jre/lib/i386/libj9dbg24.so
+opt/${P}/jre/lib/i386/libj9gc24.so"
+
+QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so
+opt/${P}/jre/lib/i386/j9vm/libjvm.so
+opt/${P}/jre/lib/i386/libj9jvmti24.so
+opt/${P}/jre/lib/i386/libj9hookable24.so
+opt/${P}/jre/lib/i386/libj9vm24.so
+opt/${P}/jre/lib/i386/libjclscar_24.so
+opt/${P}/jre/lib/i386/libj9thr24.so
+opt/${P}/jre/lib/i386/libj9dmp24.so
+opt/${P}/jre/lib/i386/libj9prt24.so
+opt/${P}/jre/lib/i386/libj9jit24.so
+opt/${P}/jre/lib/i386/libiverel24.so
+opt/${P}/jre/lib/i386/libj9trc24.so
+opt/${P}/jre/lib/i386/libj9dbg24.so
+opt/${P}/jre/lib/i386/libj9shr24.so
+opt/${P}/jre/lib/i386/libj9gc24.so
+opt/${P}/jre/lib/i386/libj9bcv24.so
+opt/${P}/jre/lib/i386/classic/libjvm.so"
+
+QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so
+opt/${P}/jre/lib/amd64/default/libj9jvmti24.so
+opt/${P}/jre/lib/amd64/default/libj9hookable24.so
+opt/${P}/jre/lib/amd64/default/libj9vm24.so
+opt/${P}/jre/lib/amd64/default/libjclscar_24.so
+opt/${P}/jre/lib/amd64/default/libj9jpi24.so
+opt/${P}/jre/lib/amd64/default/libj9thr24.so
+opt/${P}/jre/lib/amd64/default/libj9dmp24.so
+opt/${P}/jre/lib/amd64/default/libj9prt24.so
+opt/${P}/jre/lib/amd64/default/libj9jit24.so
+opt/${P}/jre/lib/amd64/default/libiverel24.so
+opt/${P}/jre/lib/amd64/default/libj9trc24.so
+opt/${P}/jre/lib/amd64/default/libj9dbg24.so
+opt/${P}/jre/lib/amd64/default/libj9shr24.so
+opt/${P}/jre/lib/amd64/default/libj9gc24.so
+opt/${P}/jre/lib/amd64/default/libj9bcv24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so
+opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so"
+
+pkg_nofetch() {
+	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	einfo "Please visit: ${DOWNLOADPAGE}"
+
+	einfo "Under Java SE 6, download SR${SERVICE_RELEASE} for your arch:"
+	einfo "${JDK_DIST}"
+	if use javacomm ; then
+		einfo "${JAVACOMM_DIST}"
+	fi
+
+	einfo "You can also use a 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 ${JDK_DIST}
+	if use javacomm; then
+		mkdir "${WORKDIR}/javacomm/" || die
+		cd "${WORKDIR}/javacomm/"
+		unpack ${JAVACOMM_DIST}
+	fi
+	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,src.zip} "${D}/opt/${P}/" || die
+
+	if use examples; then
+		cp -pPR "${S}"/demo "${D}"/opt/${P}/ || die
+	fi
+	if use javacomm; then
+		chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar "${WORKDIR}"/javacomm/*/lib/*.properties || die
+		cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar "${D}"/opt/${P}/jre/lib/ext/ || die
+		cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${D}"/opt/${P}/jre/lib/ || die
+		cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${D}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
+		if use examples; then
+			cp -pPR "${WORKDIR}"/javacomm/*/examples "${D}"/opt/${P}/ || die
+		fi
+	fi
+
+	if use x86 || use ppc; then
+		if use nsplugin; then
+			local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
+			install_mozilla_plugin "${plugin}"
+		fi
+	fi
+
+	if use amd64; then
+		# a workaround to fix the BOOTCLASSPATH in our env file
+		# this is not optimal, using -Xcompressedrefs would probably make it
+		# expect the compressedrefs version...
+		dosym /opt/${P}/jre/lib/amd64/default/jclSC160/vm.jar /opt/${P}/jre/lib/
+	fi
+
+	local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop"
+	if [[ -f "${desktop_in}" ]]; then
+		local desktop_out="${T}/ibm_jdk-${SLOT}.desktop"
+		# install control panel for Gnome/KDE
+		# The jre also installs these so make sure that they do not have the same
+		# Name
+		sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+			"${desktop_in}" > \
+			"${desktop_out}" || die
+
+		domenu "${desktop_out}" || die
+	fi
+
+	dohtml -a html,htm,HTML -r docs || die
+	dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
+
+	set_java_env
+	java-vm_revdep-mask
+}