Version bump.

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

3 files changed, 152 insertions, 2 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 4195ee8abc2f..1cdaf4a325db 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.148 2009/05/29 20:32:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.149 2009/05/31 11:24:55 caster Exp $
+
+*sun-jre-bin-1.6.0.14 (31 May 2009)
+
+  31 May 2009; Vlastimil Babka <caster@gentoo.org>
+  +sun-jre-bin-1.6.0.14.ebuild:
+  Version bump.
 
   29 May 2009; Vlastimil Babka <caster@gentoo.org>
   sun-jre-bin-1.4.2.19.ebuild, -sun-jre-bin-1.5.0.17.ebuild,
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 7514e83688d0..30c7aa595551 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -9,8 +9,11 @@ DIST jdk-5.0u18-dlj-linux-amd64.bin 44094223 RMD160 538225ac69fd4541c2d08fab70c9
 DIST jdk-5.0u18-dlj-linux-i586.bin 49702576 RMD160 be719b111ce24d5a14b0ed8ad26a9335283866f7 SHA1 2be236e00cf95a7ba1d2a48156eecd6bd367445d SHA256 460dd267a532d9965e65aec8be8288870ff4aadc0cabe331dd4a1d4c058c53be
 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
+DIST jdk-6u14-dlj-linux-amd64.bin 81881391 RMD160 40986758e23369d870c766e9f7b65860b421390d SHA1 3ffc80f7a194bc29792dbdfc9b7c395bf82cf346 SHA256 a2593daa7bee2789085d62389b6a37e988281c901c84af0916ef1bc5e5220f8e
+DIST jdk-6u14-dlj-linux-i586.bin 81803297 RMD160 db35274bd08422f97f454dbcadb79abdc9e4ab13 SHA1 ce7fcdeb9275820b98a54ecf7a44ed30557b8233 SHA256 08ff9c6a89da117f7e6eabcc21da36900fab56a4fb9b4e8ff5cb3c267b4ec0a0
 EBUILD sun-jre-bin-1.4.2.19.ebuild 3507 RMD160 2fbc8df370d52841137d3edeffa58863b080c397 SHA1 7385ca5aac58390e017bae93732d2dfb1dc70b29 SHA256 9455abfbc0229db1ecb029676a3e34507096fd05694fa3a64a3ca24e29da9f7a
 EBUILD sun-jre-bin-1.5.0.18.ebuild 3082 RMD160 8dd529348df3cfac7de8653a752a36d0138af70f SHA1 2515e04a1ca652b9f2e88a39275abc4b4c24b171 SHA256 d330c552b4548c43ef8587043a168988e2af0ca02cef155a93485100e2bfc257
 EBUILD sun-jre-bin-1.6.0.13.ebuild 4192 RMD160 3f06233c2681ee346452f1051172714fd22f668d SHA1 f55d43c1b4ff60a6a7a0be73219fa23c9300db48 SHA256 563f40f4619eeb1ac0329654987140e4b0db81e8f857632d2c793bb8de424982
-MISC ChangeLog 26914 RMD160 8b784b4072e0903ff94a26785d2d2eabbe3666fe SHA1 077692c968c452c3d324596dd035c90622f0c440 SHA256 c166b0de0fb23e52a5694d23bb321182456cb680c72e625f6636b0ee3cc90cc9
+EBUILD sun-jre-bin-1.6.0.14.ebuild 4194 RMD160 00c2f9f0b86a94a633b9b9595f2daf34de7ab4bf SHA1 03181e4e962fc47d69db1b28747c71a95f06e9c4 SHA256 fa0db92fc52b7b940d0189bc3b99d986f04c5a8f53ead31bdfa00406b81355b6
+MISC ChangeLog 27051 RMD160 f11951511a2a88cf768d5a1a10e3b505aeb6ac0c SHA1 922eabf2677257dbcd491288a399d140185d5c0a SHA256 21c8c16535390b35791c5eff6e2deb70a8697bb3efc15b4435745be5180d1082
 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.14.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.14.ebuild
new file mode 100644
index 000000000000..47e45a690c68
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.14.ebuild
@@ -0,0 +1,141 @@
+# 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.14.ebuild,v 1.1 2009/05/31 11:24:55 caster Exp $
+
+inherit versionator pax-utils eutils java-vm-2
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+
+SUFFIX=".bin"
+X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}"
+
+DESCRIPTION="Sun's Java SE Runtime Environment"
+HOMEPAGE="http://java.sun.com/javase/6/"
+URL_BASE="http://download.java.net/dlj/binaries"
+SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
+		amd64? ( ${URL_BASE}/${AMD64_AT} )"
+SLOT="1.6"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+IUSE="X alsa nsplugin odbc"
+
+RDEPEND="sys-libs/glibc
+	x86? ( =virtual/libstdc++-3.3 )
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		amd64? ( x11-libs/libXt )
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
+DEPEND=""
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/libdeploy.so
+	opt/${P}/lib/i386/server/libjvm.so"
+
+src_unpack() {
+	mkdir bundled-jdk
+	cd bundled-jdk
+	sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
+
+	cd ..
+	bash "${FILESDIR}/construct-1.6.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
+		"${S}"/bin/java -server -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 README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html || die
+	dodir /opt/${P}/share/
+
+	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
+			install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so plugin2
+		else
+			install_mozilla_plugin /opt/${P}/lib/amd64/libnpjp2.so
+		fi
+	fi
+
+	# install control panel for Gnome/KDE
+	if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then
+		sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
+			-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
+			-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
+			"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
+			"${T}/sun_jre-${SLOT}.desktop" || die
+		domenu "${T}/sun_jre-${SLOT}.desktop" || die
+	fi
+
+	# bug #56444
+	insinto /opt/${P}/lib/
+	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
+
+	set_java_env
+	java-vm_revdep-mask
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use x86 && use nsplugin; then
+		elog
+		elog "Two variants of the nsplugin are available via eselect java-nsplugin:"
+		elog "${VMHANDLE} and ${VMHANDLE}-plugin2 (the Next-Generation Plug-In) "
+		ewarn "Note that the ${VMHANDLE}-plugin2 works only in Firefox 3!"
+		elog "For more info see https://jdk6.dev.java.net/plugin2/"
+		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."
+	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
+}