Version bump, security bug #287490.

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

4 files changed, 22 insertions, 28 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 978e1ef36b61..86f6b0e3c6c1 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.140 2009/12/23 17:41:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.141 2009/12/24 17:56:52 caster Exp $
+
+*ibm-jre-bin-1.6.0.7 (24 Dec 2009)
+*ibm-jre-bin-1.5.0.11 (24 Dec 2009)
+
+  24 Dec 2009; Vlastimil Babka <caster@gentoo.org>
+  -files/ibm-jre-bin-1.4.env, -ibm-jre-bin-1.5.0.9-r1.ebuild,
+  +ibm-jre-bin-1.5.0.11.ebuild, -ibm-jre-bin-1.6.0.5.ebuild,
+  +ibm-jre-bin-1.6.0.7.ebuild:
+  Version bump, security bug #287490.
 
   23 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -ibm-jre-bin-1.4.2.13.ebuild:
diff --git a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.4.env b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.4.env
deleted file mode 100644
index 2f07a5fc11b3..000000000000
--- a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.4.env
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.4.env,v 1.1 2006/06/25 18:57:05 nichoj Exp $
-
-VERSION="IBM JRE @PV@"
-JAVA_HOME=/opt/@P@
-JRE_HOME=/opt/@P@
-PATH="${JAVA_HOME}/bin"
-ROOTPATH="${JAVA_HOME}/bin"
-LDPATH="/opt/@P@/bin/:/opt/@P@/bin/classic"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="1.4"
-BOOTCLASSPATH="${JAVA_HOME}/lib/core.jar:${JAVA_HOME}/lib/graphics.jar:${JAVA_HOME}/lib/security.jar:${JAVA_HOME}/lib/server.jar:${JAVA_HOME}/lib/xml.jar:${JAVA_HOME}/lib/charsets.jar:${JAVA_HOME}/lib/ibmjgssprovider.jar:${JAVA_HOME}/lib/ibmjaaslm.jar:${JAVA_HOME}/lib/ibmorbapi.jar:${JAVA_HOME}/lib/ibmorb.jar:${JAVA_HOME}/lib/ibmjcefw.jar:${JAVA_HOME}/lib/ibmjssefips.jar:${JAVA_HOME}/lib/ibmjsseprovider.jar:${JAVA_HOME}/lib/ibmpkcs.jar:${JAVA_HOME}/lib/ibmcertpathprovider.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH"
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.9-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.11.ebuild
index b90a0712aec7..0fa4ad6d69f2 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.9-r1.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.11.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-jre-bin/ibm-jre-bin-1.5.0.9-r1.ebuild,v 1.4 2009/05/29 20:39:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.11.ebuild,v 1.1 2009/12/24 17:56:52 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -34,8 +34,7 @@ elif use ppc64; then
 	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_LINK}&S_TACT=105AGX05&S_CMP=JDK"
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}-ssu&S_TACT=105AGX05&S_CMP=JDK"
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}&S_TACT=105AGX05&S_CMP=JDK"
 
 SLOT="1.5"
 DESCRIPTION="IBM Java SE Runtime Environment"
@@ -49,7 +48,7 @@ SRC_URI="x86? ( ${X86_JRE_DIST} )
 	ppc? ( ${PPC_JRE_DIST} )
 	ppc64? ( ${PPC64_JRE_DIST} )"
 LICENSE="IBM-J1.5"
-KEYWORDS="-* amd64 ppc ppc64 x86"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
 RESTRICT="fetch"
 IUSE="X alsa nsplugin odbc"
 
@@ -89,6 +88,7 @@ QA_EXECSTACK_amd64="opt/${P}/bin/libjclscar_23.so
 	opt/${P}/bin/libj9dmp23.so
 	opt/${P}/bin/libj9dbg23.so
 	opt/${P}/bin/libj9bcv23.so
+	opt/${P}/bin/libj9ute23.so
 	opt/${P}/bin/libiverel23.so
 	opt/${P}/bin/classic/libjvm.so
 	opt/${P}/bin/j9vm/libjvm.so"
@@ -169,8 +169,7 @@ 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 "Under J2SE 5.0, download SR${SERVICE_RELEASE}-SSU for your arch:"
+	einfo "Under J2SE 5.0, download SR${SERVICE_RELEASE} for your arch:"
 	einfo "${JRE_DIST}"
 
 	einfo "You can use direct link to your arch download page:"
@@ -178,8 +177,7 @@ pkg_nofetch() {
 	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 "Note: if SR${SERVICE_RELEASE}-SSU is not available at ${DOWNLOADPAGE}"
+	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."
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.5.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.7.ebuild
index f0f36e97a1f3..046c67267794 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.5.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.7.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-jre-bin/ibm-jre-bin-1.6.0.5.ebuild,v 1.4 2009/09/06 20:06:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.7.ebuild,v 1.1 2009/12/24 17:56:52 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -48,7 +48,7 @@ SRC_URI="x86? ( ${X86_JRE_DIST} )
 	ppc? ( ${PPC_JRE_DIST} )
 	ppc64? ( ${PPC64_JRE_DIST} )"
 LICENSE="IBM-J1.6"
-KEYWORDS="-* ~amd64 ppc ppc64 ~x86"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
 RESTRICT="fetch"
 IUSE="X alsa nsplugin odbc"
 
@@ -60,7 +60,7 @@ RDEPEND="
 			x11-libs/libXp
 			x11-libs/libXtst
 			x11-libs/libX11
-			amd64? ( x11-libs/libXt )
+			x11-libs/libXt
 		)
 		alsa? ( media-libs/alsa-lib )
 		odbc? ( dev-db/unixODBC )"
@@ -109,6 +109,7 @@ opt/${P}/lib/amd64/default/libj9dbg24.so
 opt/${P}/lib/amd64/default/libj9shr24.so
 opt/${P}/lib/amd64/default/libj9gc24.so
 opt/${P}/lib/amd64/default/libj9bcv24.so
+opt/${P}/lib/amd64/default/libj9ute24.so
 opt/${P}/lib/amd64/compressedrefs/libjvm.so
 opt/${P}/lib/amd64/compressedrefs/libj9jvmti24.so
 opt/${P}/lib/amd64/compressedrefs/libj9hookable24.so
@@ -124,7 +125,8 @@ opt/${P}/lib/amd64/compressedrefs/libj9trc24.so
 opt/${P}/lib/amd64/compressedrefs/libj9dbg24.so
 opt/${P}/lib/amd64/compressedrefs/libj9shr24.so
 opt/${P}/lib/amd64/compressedrefs/libj9gc24.so
-opt/${P}/lib/amd64/compressedrefs/libj9bcv24.so"
+opt/${P}/lib/amd64/compressedrefs/libj9bcv24.so
+opt/${P}/lib/amd64/compressedrefs/libj9ute24.so"
 
 pkg_nofetch() {
 	elog "Due to license restrictions, we cannot redistribute or fetch the distfiles"