Version bump wrt security bug #263810. Remove old.

Package-Manager: portage-2.2_rc26/cvs/Linux x86_64

4 files changed, 146 insertions, 12 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/Manifest b/dev-java/sun-jre-bin/Manifest
index c5dd0127b976..452527cfdab2 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -10,20 +10,23 @@ AUX sun-jre-bin-1.6.env 891 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 SHA1
 DIST j2re-1_4_2_19-linux-i586.bin 14384815 RMD160 54b15f0ea03c7cb7e35b91fe8a6269e21a0d39b2 SHA1 7b230633bf6eaf3581f69d668542431c5833184a SHA256 d1d2f7cd9f0cddee9f65a0d093a0718faceb4b013b0658a92457512f84c8e973
 DIST jdk-5.0u17-dlj-linux-amd64.bin 44078142 RMD160 0d6735ee108386435a9d53256c2a77e0f4208902 SHA1 a45edcd64ea98f0ad5a5239512337b5db74d5faf SHA256 68d5a7dbde765b8f2f80cee7057df6ef76ad8af5cf5f8456cf3d1f3603c97fb8
 DIST jdk-5.0u17-dlj-linux-i586.bin 49690762 RMD160 a9baa1a26acf284b31b7b81278bd32a7dada7c38 SHA1 d9f72fbb0aed5c27d7d40671a318597906771fd9 SHA256 427a6abd1435c23bf3bc953cca13a0d3b22f3be5e1c1bb14d21ac88e898c021a
-DIST jdk-6u11-dlj-linux-amd64.bin 72807418 RMD160 268d69287de89dd75ed11095b8bcd809967f375c SHA1 665ab8cab1342030e94e19a24eb76470a3677f6f SHA256 945c814f6aed133a36a4a4fcb0f27ec3a9de3901bc4b9bd46ee87468782c5026
-DIST jdk-6u11-dlj-linux-i586.bin 80060361 RMD160 ad6a4f82d103fb7e101351b7347ca8a9992a72db SHA1 6c1bb54d383e1fff69c5e33bfe9e3fcc05c653ab SHA256 c41faea381c3abae0e973a19b88f6e17f83c66fc6bc602a05ccd9a1c3d8a9303
+DIST jdk-5.0u18-dlj-linux-amd64.bin 44094223 RMD160 538225ac69fd4541c2d08fab70c99e8ad3867ef4 SHA1 756be76937bd70c6d0ce520566844aa428d3149e SHA256 40a8f7b5f8e5f515a0a736645635376479eb89351eee594ded341e80a64ee701
+DIST jdk-5.0u18-dlj-linux-i586.bin 49702576 RMD160 be719b111ce24d5a14b0ed8ad26a9335283866f7 SHA1 2be236e00cf95a7ba1d2a48156eecd6bd367445d SHA256 460dd267a532d9965e65aec8be8288870ff4aadc0cabe331dd4a1d4c058c53be
 DIST jdk-6u12-dlj-linux-amd64.bin 80271136 RMD160 3c7cf469c36a0c0c21845ab86d96ca9be05c8e7a SHA1 94fa867edbdb17391d8df4861af60d12a06d6429 SHA256 782ccbed6c0292bdec7b942d6b6d4b29d8b795a5959bb3a43ec81d24134f56c7
 DIST jdk-6u12-dlj-linux-i586.bin 80137544 RMD160 ecf3c45703950e946874b9347d9f0d2145da1d26 SHA1 bbbb8cd68fa206e85e78221f3600b41ceb306896 SHA256 97348da8b3c1d92421fffd24766127e0eba2770ab10b014855e867b4eedb680c
+DIST jdk-6u13-dlj-linux-amd64.bin 80287589 RMD160 8e2994657a732e8e45b166dcaf0b16422ae4fb25 SHA1 70b412a12037e3a9033503a566585d08418f029c SHA256 799ae9ce5ed2cede1e75aa1861e0e835c06135a54767546e5b12d6be4d2814d5
+DIST jdk-6u13-dlj-linux-i586.bin 80161911 RMD160 8167ed89d38722577547d4f46f5fa06cf07fedf3 SHA1 ef9177f519ad03669921876fd711c1c02f306abf SHA256 a07d48549bb48becf7a1185b2ce908797a9dcfcc834ff111e8b6d9ad19ce60d7
 EBUILD sun-jre-bin-1.4.2.19.ebuild 3493 RMD160 0b6387a6154273ec5cd6f8cedc68720a780cf082 SHA1 79dc5cd09c3e70d12ef7468432dcd4cfe32d634d SHA256 6507fab709c5e59c5e7deae10a889a7b7ed14f24013acf4b57d9e2e4c50cfca6
 EBUILD sun-jre-bin-1.5.0.17.ebuild 3096 RMD160 e736d6170acdf0a3844064b69b6d7fee57dbffc2 SHA1 3d3a957aefaae0bc1c803117e0a6130deb7971f0 SHA256 0f4270e3a7a7b6c1e14f68938b5adaac705e55f7897228d3598ba85609a0379a
-EBUILD sun-jre-bin-1.6.0.11.ebuild 3820 RMD160 ea73278a8f0246dac2efddfc232f2f885eb7fc2d SHA1 a943e9e975f5545ee07e841fe8b0c77f56f39508 SHA256 01567ad0ee5ced246f956b13e8035ebb6f4d507157dd36113fafe5e4e2e00686
+EBUILD sun-jre-bin-1.5.0.18.ebuild 3098 RMD160 484db3e2007271c84c92d1c9e62bf4e36019ed4c SHA1 552062317d744b676f8610b47407cab8564f932f SHA256 6ed9cb04936df3b939a3781378728b2f5aaeb703f101778805766397f1a8d73a
 EBUILD sun-jre-bin-1.6.0.12.ebuild 4204 RMD160 297aeca6d3d04f27bfc68179afbd234f62c5e0f4 SHA1 7325ea302f3a5a1c9316c21769b595b70974c0bf SHA256 45dd8bc5e48ceaf302dfbb499da2a5be334a1ae1007573229fa68abcb1104b64
-MISC ChangeLog 26232 RMD160 fc1624ac696c81308e7392c1b0f200d3da568edd SHA1 691c672be574e26300712f38f26220b30d566090 SHA256 ab766d246be9024d440af3cdd787dda02509d2c1d897e0ed804ebb028cd2d592
+EBUILD sun-jre-bin-1.6.0.13.ebuild 4206 RMD160 2e9b5c4d74ed844525d72524f1dd14a4e13f4355 SHA1 3d0e6f3e3074a0ed90dbe1ace9784548a6240559 SHA256 9aed768ef2c4d5d7e2ca619fc17be708672d87d3b24423cc97a9cae0315ab71f
+MISC ChangeLog 26498 RMD160 034a01437ca5b6e7929ffe4057c44d968bddfea6 SHA1 8dc918b0f1f740d4906167893d80b0e5e2d08f96 SHA256 36a9b41ab38cfbc5b01c38185bb79092f39e290a9fa04f9677d0f99525a27b43
 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkm4P/cACgkQkKaRLQcq0GI3UQCfQEKV5JEJ7rnzODm6ZrZLJwoO
-ItYAnjuSgQ0S6hMmow5wkrupM4er9JIb
-=+FnI
+iEYEARECAAYFAknLCoIACgkQRh6X64ivZaKZXACfTeRyQ/TqzBovqsjZ7MdSfQdn
+5FkAnRZ4jdTrOiTxONEgHQ5wwJKGisZp
+=dIMA
 -----END PGP SIGNATURE-----
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."