Version bump, security bug #287490.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 10 insertions, 224 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index e96cf6d3b1b7..ee3968995c74 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.209 2009/10/15 15:08:47 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.210 2009/10/18 19:52:15 caster Exp $
+
+*ibm-jdk-bin-1.6.0.6 (18 Oct 2009)
+
+  18 Oct 2009; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jdk-bin-1.6.0.0.ebuild, -ibm-jdk-bin-1.6.0.4.ebuild,
+  +ibm-jdk-bin-1.6.0.6.ebuild:
+  Version bump, security bug #287490.
 
   15 Oct 2009; Mounir Lamouri <volkmar@gentoo.org>
   ibm-jdk-bin-1.5.0.10.ebuild:
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
deleted file mode 100644
index 96d7ded3572f..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.0.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2009 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.7 2009/05/29 20:37:25 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 SE 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.6"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin odbc"
-
-RDEPEND="
-	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_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
-	java-vm_revdep-mask
-}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.6.ebuild
index ec40af9b4d8c..bab9a4cb0c08 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.4.ebuild,v 1.4 2009/05/29 20:37:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.6.ebuild,v 1.1 2009/10/18 19:52:15 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -81,7 +81,7 @@ SRC_URI="
 		ppc64? ( ${PPC64_JAVACOMM_DIST} )
 	)"
 LICENSE="IBM-J1.6"
-KEYWORDS="-* ~amd64 ppc ppc64 ~x86"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
 RESTRICT="fetch"
 IUSE="X alsa doc examples javacomm nsplugin odbc"