Version bump wrt security bug #263810. Remove old.

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

3 files changed, 136 insertions, 5 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 67eb933da972..3d103ba012a0 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.145 2009/03/11 22:49:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.146 2009/03/26 04:54:16 serkan Exp $
+
+*sun-jre-bin-1.6.0.13 (26 Mar 2009)
+*sun-jre-bin-1.5.0.18 (26 Mar 2009)
+
+  26 Mar 2009; Serkan Kaba <serkan@gentoo.org> +sun-jre-bin-1.5.0.18.ebuild,
+  -sun-jre-bin-1.6.0.11.ebuild, +sun-jre-bin-1.6.0.13.ebuild:
+  Version bump wrt security bug #263810. Remove old.
 
   11 Mar 2009; Markus Meier <maekke@gentoo.org> sun-jre-bin-1.6.0.12.ebuild:
   amd64 stable, bug #261500
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.18.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.18.ebuild
new file mode 100644
index 000000000000..9ea479bf1569
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.18.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.18.ebuild,v 1.1 2009/03/26 04:54:16 serkan Exp $
+
+inherit pax-utils versionator eutils java-vm-2
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
+
+X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
+
+DESCRIPTION="Sun's J2SE Runtime Environment, version ${SLOT}"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
+SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
+		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
+SLOT="1.5"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+IUSE="X alsa nsplugin odbc"
+
+RDEPEND="sys-libs/glibc
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		x11-libs/libXt
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
+DEPEND=""
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/libdeploy.so"
+
+src_unpack() {
+	mkdir bundled-jdk
+	cd bundled-jdk
+	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
+
+	cd ..
+	bash "${FILESDIR}/construct.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+}
+
+src_compile() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler. This has to be done before CDS - #215225
+	pax-mark m $(list-paxables "${S}"/bin/*)
+
+	# see bug #207282
+	if use x86; then
+		einfo "Creating the Class Data Sharing archives"
+		"${S}"/bin/java -client -Xshare:dump || die
+	fi
+}
+
+src_install() {
+	local dirs="bin lib man"
+	# only X86 has the plugin and javaws
+	use x86 && dirs="${dirs} javaws plugin"
+	dodir /opt/${P}
+
+	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
+
+	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html || die
+
+	if use nsplugin; then
+		local plugin_dir="ns7-gcc29"
+		if has_version '>=sys-devel/gcc-3' ; then
+			plugin_dir="ns7"
+		fi
+
+		if use x86 ; then
+			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+		else
+			eerror "No plugin available for amd64 arch"
+		fi
+	fi
+
+	# FIXME figure out how to handle the control pannel conflict with
+	# sun-jdk-bin
+
+	# install control panel for Gnome/KDE
+#	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+#		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+#		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
+#		${T}/sun_java-${SLOT}.desktop
+
+#	domenu ${T}/sun_java-${SLOT}.desktop
+
+	# bug #56444
+	insinto /opt/${P}/lib/
+	newins "${FILESDIR}"/fontconfig.Gentoo.properties \
+		fontconfig.properties || die
+
+	set_java_env
+	java-vm_revdep-mask
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	elog "The epoll-based implementation of SelectorProvider is not selected by"
+	elog "default."
+	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
+}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.11.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.13.ebuild
index 50bcbd428261..eff6ce40e36b 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.11.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.11.ebuild,v 1.2 2008/12/10 22:01:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.13.ebuild,v 1.1 2009/03/26 04:54:16 serkan Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -19,7 +19,7 @@ SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
 		amd64? ( ${URL_BASE}/${AMD64_AT} )"
 SLOT="1.6"
 LICENSE="dlj-1.1"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip"
 IUSE="X alsa nsplugin odbc"
 
@@ -89,7 +89,7 @@ src_install() {
 			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
 			install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
 		else
-			eerror "No plugin available for amd64 arch"
+			install_mozilla_plugin /opt/${P}/lib/amd64/libnpjp2.so
 		fi
 	fi
 
@@ -124,6 +124,16 @@ pkg_postinst() {
 		elog
 	fi
 
+	if use amd64 && use nsplugin; then
+		elog
+		elog "This version finally brings a browser plugin for amd64"
+		elog "It is the so-called Next-Generation Plug-In (plugin2)"
+		elog "Use eselect java-nsplugin to select it (${VMHANDLE})."
+		ewarn "Note that it works only in Firefox 3 or newer browsers!"
+		elog "For more info see https://jdk6.dev.java.net/plugin2/"
+		elog
+	fi
+
 	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
 	elog "The epoll-based implementation of SelectorProvider is not selected by"
 	elog "default."