Version bump, bug #166789.

(Portage version: 2.1.4_rc9)

4 files changed, 278 insertions, 1 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index eb238b9f8fd2..1e98aa56448a 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.140 2007/12/12 15:10:07 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.141 2007/12/16 11:09:01 caster Exp $
+
+*ibm-jdk-bin-1.6.0.0 (16 Dec 2007)
+
+  16 Dec 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/ibm-jdk-bin-1.6.env, +ibm-jdk-bin-1.6.0.0.ebuild:
+  Version bump, bug #166789.
 
 *ibm-jdk-bin-1.5.0.6-r1 (12 Dec 2007)
 
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.6.0.0 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.6.0.0
new file mode 100644
index 000000000000..592509e777ce
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.6.0.0
@@ -0,0 +1,24 @@
+MD5 917573614ecfa3aaa76429576575740e ibm-java-sdk-6.0-0.0-linux-i386.tgz 86573879
+RMD160 6489716e491907193c0d27050d08b3a1e1ab0a44 ibm-java-sdk-6.0-0.0-linux-i386.tgz 86573879
+SHA256 c72e43e1f52e5910f84634ce87f186a4832dc73f93adc6a727a2069b62cd4a1d ibm-java-sdk-6.0-0.0-linux-i386.tgz 86573879
+MD5 ed2798cdd18511eaad128c386bdd10fb ibm-java-sdk-6.0-0.0-linux-ppc.tgz 88854304
+RMD160 626bec6e1f97e3fb214915c4e51421b5e206bd5d ibm-java-sdk-6.0-0.0-linux-ppc.tgz 88854304
+SHA256 b299eca3276a35b794f9543768e51e707051dda74d819d67f0d6660352be36f7 ibm-java-sdk-6.0-0.0-linux-ppc.tgz 88854304
+MD5 1fc77b1599e670d02f81eb1c547d207d ibm-java-sdk-6.0-0.0-linux-ppc64.tgz 90297044
+RMD160 23e96a95c714bfe8e0384d806e056c6228386d89 ibm-java-sdk-6.0-0.0-linux-ppc64.tgz 90297044
+SHA256 0aa829dc7498bcb8031de2f759622bc754981a7417a89e434d1b87b4f59e41a2 ibm-java-sdk-6.0-0.0-linux-ppc64.tgz 90297044
+MD5 9da4bc19faf2ebebcd41c99edb7f9c02 ibm-java-sdk-6.0-0.0-linux-x86_64.tgz 84220678
+RMD160 be7dbbc05c6ff5d0108d49be3610ee3d1aa4b379 ibm-java-sdk-6.0-0.0-linux-x86_64.tgz 84220678
+SHA256 d43a7bf89e1457bfc68464fc84d9533d6d49f4cebb354ee0a12ce6dff9f6a191 ibm-java-sdk-6.0-0.0-linux-x86_64.tgz 84220678
+MD5 11a54bdbf11d6981c6f0886c24816959 ibm-javacomm-3.0-0.0-linux-i386.tgz 398689
+RMD160 ef72d2210532f8534184b9c578705edd41ed7741 ibm-javacomm-3.0-0.0-linux-i386.tgz 398689
+SHA256 6f438ec0a13e00645ba6e68ee0b16cc85df9f0295cab3479b107765b17a8c836 ibm-javacomm-3.0-0.0-linux-i386.tgz 398689
+MD5 897827eb8d6d67e3fbe656c7d2f13342 ibm-javacomm-3.0-0.0-linux-ppc.tgz 403218
+RMD160 b791c0b5a2f8dd8165bda31443b689201137ded3 ibm-javacomm-3.0-0.0-linux-ppc.tgz 403218
+SHA256 1dfc49f3b93ca01b25f3dc4a315232754910da8c7b50d26413ef9352414e388d ibm-javacomm-3.0-0.0-linux-ppc.tgz 403218
+MD5 115303e596f0c39a87a2409e70085dc5 ibm-javacomm-3.0-0.0-linux-ppc64.tgz 407966
+RMD160 d7c1185660e680b4f8d2a3591616cb29be6cee83 ibm-javacomm-3.0-0.0-linux-ppc64.tgz 407966
+SHA256 ef135dc9b13484b6b5bc81c11d186de1d65ca4db2dde765c4a8b41a4970f1fe8 ibm-javacomm-3.0-0.0-linux-ppc64.tgz 407966
+MD5 5522b820417ed8f53a315682521ffcc9 ibm-javacomm-3.0-0.0-linux-x86_64.tgz 401081
+RMD160 ac9e7fe4dfc47e7b54bd01e9b806644bcfcf1a8c ibm-javacomm-3.0-0.0-linux-x86_64.tgz 401081
+SHA256 181cc8d90a3404345a40dc11b4f83230d919cdce025256418483314d11f91dfd ibm-javacomm-3.0-0.0-linux-x86_64.tgz 401081
diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env
new file mode 100644
index 000000000000..0b2a434dc690
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env
@@ -0,0 +1,16 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env,v 1.1 2007/12/16 11:09:02 caster Exp $
+
+VERSION="IBM JDK @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+LDPATH="/opt/@P@/jre/lib/i386:/usr/lib"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.6"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/vm.jar:${JAVA_HOME}/jre/lib/facilitators.jar:${JAVA_HOME}/jre/lib/annotation.jar:${JAVA_HOME}/jre/lib/beans.jar:${JAVA_HOME}/jre/lib/java.util.jar:${JAVA_HOME}/jre/lib/jndi.jar:${JAVA_HOME}/jre/lib/logging.jar:${JAVA_HOME}/jre/lib/security.jar:${JAVA_HOME}/jre/lib/sql.jar:${JAVA_HOME}/jre/lib/ibmorb.jar:${JAVA_HOME}/jre/lib/ibmorbapi.jar:${JAVA_HOME}/jre/lib/ibmcfw.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/ibmpkcs.jar:${JAVA_HOME}/jre/lib/ibmcertpathfw.jar:${JAVA_HOME}/jre/lib/ibmjgssfw.jar:${JAVA_HOME}/jre/lib/ibmjssefw.jar:${JAVA_HOME}/jre/lib/ibmsaslfw.jar:${JAVA_HOME}/jre/lib/ibmjcefw.jar:${JAVA_HOME}/jre/lib/ibmjgssprovider.jar:${JAVA_HOME}/jre/lib/ibmjsseprovider2.jar:${JAVA_HOME}/jre/lib/ibmcertpathprovider.jar:${JAVA_HOME}/jre/lib/ibmxmlcrypto.jar:${JAVA_HOME}/jre/lib/management-agent.jar:${JAVA_HOME}/jre/lib/xml.jar:${JAVA_HOME}/jre/lib/jlm.jar:${JAVA_HOME}/jre/lib/javascript.jar:${JAVA_HOME}/jre/lib/RACF.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH"
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild
new file mode 100644
index 000000000000..6cf0ced0f378
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild
@@ -0,0 +1,231 @@
+# 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.6.0.0.ebuild,v 1.1 2007/12/16 11:09:01 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"
+
+JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
+JAVACOMM_DIST_PREFIX="ibm-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}&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 ~x86"
+RESTRICT="fetch"
+IUSE="X alsa doc examples javacomm nsplugin"
+
+RDEPEND="x86? ( net-libs/libnet )
+		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* )"
+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_TEXTRELS_amd64="opt/${P}/jre/lib/amd64/libjclscar_24.so
+opt/${P}/jre/lib/amd64/libj9jit24.so"
+
+QA_EXECSTACK_amd64="opt/${P}/jre/bin/classic/libjvm.so
+opt/${P}/jre/lib/amd64/j9vm/libjvm.so
+opt/${P}/jre/lib/amd64/libj9jvmti24.so
+opt/${P}/jre/lib/amd64/libj9hookable24.so
+opt/${P}/jre/lib/amd64/libj9vm24.so
+opt/${P}/jre/lib/amd64/libjclscar_24.so
+opt/${P}/jre/lib/amd64/libj9thr24.so
+opt/${P}/jre/lib/amd64/libj9dmp24.so
+opt/${P}/jre/lib/amd64/libj9prt24.so
+opt/${P}/jre/lib/amd64/libj9jit24.so
+opt/${P}/jre/lib/amd64/libiverel24.so
+opt/${P}/jre/lib/amd64/libj9trc24.so
+opt/${P}/jre/lib/amd64/libj9dbg24.so
+opt/${P}/jre/lib/amd64/libj9shr24.so
+opt/${P}/jre/lib/amd64/libj9gc24.so
+opt/${P}/jre/lib/amd64/libj9bcv24.so
+opt/${P}/jre/lib/amd64/classic/libjvm.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 GA for your arch:" #SR${SERVICE_RELEASE}
+	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 GA 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
+
+	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
+}
+
+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
+}