Version bumps for security bug #250012.

Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r2 i686

5 files changed, 389 insertions, 5 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 6c59f24f03a7..6464d758c4c6 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.140 2008/12/06 13:35:06 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.141 2008/12/06 13:39:46 betelgeuse Exp $
+
+*sun-jre-bin-1.6.0.11 (06 Dec 2008)
+*sun-jre-bin-1.5.0.17 (06 Dec 2008)
+*sun-jre-bin-1.4.2.19 (06 Dec 2008)
+
+  06 Dec 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +sun-jre-bin-1.4.2.19.ebuild, +sun-jre-bin-1.5.0.17.ebuild,
+  +sun-jre-bin-1.6.0.11.ebuild:
+  Version bumps for security bug #250012.
 
   06 Dec 2008; Petteri Räty <betelgeuse@gentoo.org>
   -sun-jre-bin-1.4.2.17.ebuild, -sun-jre-bin-1.5.0.15.ebuild,
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index fd817e0d9da7..8bc6ece78383 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -8,22 +8,30 @@ AUX sun-jre-bin-1.4.env 854 RMD160 c473374bfcd3f9fc31b8946f9bccbc9c843ae258 SHA1
 AUX sun-jre-bin-1.5.env 794 RMD160 8354353bc23c7148c5bd73d0c7bf958123378e46 SHA1 09301d835309d81f20270ebe90b6a02efd2f3aea SHA256 a7007ac6473f00040646f34caa870195056acd994ef86a2b627f9658c1986a22
 AUX sun-jre-bin-1.6.env 891 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 SHA1 1e431f6a7990c4c0684e95a73da32e132183331b SHA256 6fd0124892813113266857364834fb8fa9f08db9f72045e639ec0b5acdfc4c09
 DIST j2re-1_4_2_18-linux-i586.bin 14379606 RMD160 725d9aeac47ee775cf904676c27a12b598847b74 SHA1 7558ba72c1002b6a0dd362041693bd3baa28cbc6 SHA256 75750575b54d15b47b5b7d50e03cc111e958edc1c6b18cc55cc582853d612206
+DIST j2re-1_4_2_19-linux-i586.bin 14384815 RMD160 54b15f0ea03c7cb7e35b91fe8a6269e21a0d39b2 SHA1 7b230633bf6eaf3581f69d668542431c5833184a SHA256 d1d2f7cd9f0cddee9f65a0d093a0718faceb4b013b0658a92457512f84c8e973
 DIST jdk-5.0u16-dlj-linux-amd64.bin 44052125 RMD160 d977cb6659b37653b1fc4159921f8a7d48cc2b80 SHA1 4e4f574a85c73c9f518e5ebf5cfd3135fa7fafaa SHA256 5c6c4b44b218c75de8e713a377b3662f791e77ebdf9a00bc76d63274d2e2d261
 DIST jdk-5.0u16-dlj-linux-i586.bin 49676902 RMD160 e358a1c3e554eb06cd4362ad175a95004661f38e SHA1 56e29e2d96fca31f6b0e34c208c13c82c523098d SHA256 0df21a7e636740c9812e3e1cd4002e914150acf3c806930d5128d05b37c28a08
+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-6u10-dlj-linux-amd64.bin 72785631 RMD160 fa38bbcf970e75d0522e85d893635ccbaf23a218 SHA1 dd47b6afb2eed8253ab39d7b5a31fcff811cbca5 SHA256 c91bfe6759a9fe403a15b1fdc940ba7b04fd637a4f4ebb22a9d45f03159564e1
 DIST jdk-6u10-dlj-linux-i586.bin 80041857 RMD160 a280938fb2ff5208294b76afa9e8c8f459f64841 SHA1 f4dc9d497042c5196afb7ae75257de8614673ea6 SHA256 dae79e8c56090ac3fb4ac3fe0df9faf6a0c9694a89ef978dce0ab970557ad264
+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-6u7-dlj-linux-amd64.bin 71703415 RMD160 22c910c68c78ca68143b8c5444b6d4b24ef3edc1 SHA1 dd2769bda4be1387e22bfe7d04e2dcc9d593fe5c SHA256 b8adc4ea7ae90aed08e9b981ac3a9f1160fc94965a5034e2ea7e63b0ba77a725
 DIST jdk-6u7-dlj-linux-i586.bin 78515200 RMD160 1c626fa6a16be412f082bdadcb4c3018bd0e188d SHA1 1a697ed721260331918fa34913203c78562d1d63 SHA256 b57a1f49ca3c9d3dd45b3fc2ab569d84d159a076124e842a9c8d82abce92ff8b
 EBUILD sun-jre-bin-1.4.2.18.ebuild 3492 RMD160 61db67b0ae92ca5ea003c240502db70b43bbfc48 SHA1 d77df61a7916c85daf00d31bf37805fd7eb782a2 SHA256 987bc9289e1063266ed0d56f40612bc63b3a762e63fc9abd95392e6060c4e7a7
+EBUILD sun-jre-bin-1.4.2.19.ebuild 3498 RMD160 c57b055ddcdf01d2b559b59c1a050c5a99eec492 SHA1 d21ea23d07efce9b47573fee0d8f04749af50535 SHA256 ba77315b83f933c9ef0d122c58e37be23b40b58a99b8f0305bc447d6c72bafca
 EBUILD sun-jre-bin-1.5.0.16.ebuild 3156 RMD160 e9ae4708bc8fb7fd1caec247f603909306f9e6c6 SHA1 5d86d40ba2a94f7c4b31e9818220da97c47d9433 SHA256 3c4ea924e306758107dbc272510c9521e039286431fa578df33c7805b02aafb9
+EBUILD sun-jre-bin-1.5.0.17.ebuild 3102 RMD160 ca19785ec3b3dcae0e80603005b7c7d7ca76b686 SHA1 61ec05ba06e79450515c1195408ca9307fdcef9f SHA256 ee54f6d33f29e5437019e415859afeed6e76bf3fb5df45dfbd29a741ee9616b0
 EBUILD sun-jre-bin-1.6.0.07.ebuild 3416 RMD160 8c5ef5b901bcb10d11e97c7bb10b329d899a08ae SHA1 e68d51060f9e39223dfbba2bc6851287b05563aa SHA256 cfbf72e06fe6b073b19c2bc5df770f7732409133c727a37623af91b7a30aa824
 EBUILD sun-jre-bin-1.6.0.10.ebuild 3823 RMD160 0194a2959b71e95bcc81aead69ab9086e989ebcc SHA1 721597ef5a111672e041df36ecb9dec3a3534f9c SHA256 91b0c158643a7b71879be0862ec849f1fa81d5f60477fb2187ac849b6428134e
-MISC ChangeLog 25128 RMD160 18b52bf2be308c12ef3315dfff392c88aa05cce6 SHA1 51c80e642ba0b3de8a5b99af4fe433728ebd850e SHA256 c5d3cfa9b04901f4491d62f0a22b435e6df31bc5ffd3642a86f3be54e53d44ad
+EBUILD sun-jre-bin-1.6.0.11.ebuild 3826 RMD160 c38075c5aa288afa550bd7057fe642ffbc8d057c SHA1 4b9e01c055a0060d39e1df04f1769abc93b0f11f SHA256 f5aa2d79ff2567d940e2254300bacd543c93729fd5d9b634699d9fa5ec227b16
+MISC ChangeLog 25427 RMD160 a3e177e9d61430d6eb0f7e0b8d5e81efda3aa239 SHA1 7391f71eb811c4a562561d8272e62dd1ce15a7a7 SHA256 4f10e2369c36bbb8072259ec0b4263e3fd3013a2dfb09983f69eb87622ba2bda
 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk6f5UACgkQcxLzpIGCsLROyQCdHXR3cjHAd8rdt0EyGpZX/eS2
-5XsAn24wOwBVcw6ikt4XVkQmCyyWRrkQ
-=W0SB
+iEYEARECAAYFAkk6gLQACgkQcxLzpIGCsLTPRACfcOs5T9/ntHa4/+xWlOn376hF
+uVMAoJpzgASE0Ja4/QX6gvZr/zGEZsDe
+=jbkV
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild
new file mode 100644
index 000000000000..27964ca3e6ba
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.19.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2008 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.4.2.19.ebuild,v 1.1 2008/12/06 13:39:46 betelgeuse Exp $
+
+inherit eutils pax-utils java-vm-2
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_PV2=${PV//./_}
+MY_PN=j2re
+At="${MY_PN}-${MY_PV2}-linux-i586.bin"
+S="${WORKDIR}/j2re${MY_PV}"
+DESCRIPTION="Sun's J2SE Platform"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
+SRC_URI=${At}
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm-1.4.2"
+KEYWORDS="-* ~x86"
+# pre stripped
+RESTRICT="fetch strip"
+IUSE="X alsa nsplugin odbc"
+
+DEPEND=""
+
+RDEPEND="
+	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 )"
+
+DL_PREFIX="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef="
+DOWNLOAD_URL="${DL_PREFIX}${MY_PN}-${MY_PV}-oth-JPR@CDS-CDS_Developer"
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/libawt.so
+	opt/${P}/plugin/i386/ns4/libjavaplugin.so
+	opt/${P}/plugin/i386/ns610/libjavaplugin_oji.so
+	opt/${P}/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${DOWNLOAD_URL}
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	if [ ! -r "${DISTDIR}"/${At} ]; then
+		eerror "cannot read ${At}. Please check the permission and try again."
+		die
+	fi
+	#Search for the ELF Header
+	testExp=$(echo -e '\0177\0105\0114\0106\0001\0001\0001')
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+	tail -n +${startAt} "${DISTDIR}"/${At} > install.sfx
+	chmod +x install.sfx
+	./install.sfx || die
+	rm install.sfx
+
+	if [ -f "${S}"/lib/unpack ]; then
+		UNPACK_CMD="${S}"/lib/unpack
+		chmod +x $UNPACK_CMD
+		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
+		local PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar \
+			lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
+		for i in $PACKED_JARS; do
+			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
+			if [ -f ${PACK_FILE} ]; then
+				echo "	unpacking: $i"
+				$UNPACK_CMD ${PACK_FILE} "${S}"/$i
+				rm -f ${PACK_FILE}
+			fi
+		done
+	fi
+}
+
+src_install() {
+	local dirs="bin lib man javaws plugin"
+	dodir /opt/${P}
+
+	cp -pPR ${dirs} "${D}/opt/${P}/"
+
+	pax-mark srpm $(list-paxables "${D}"/opt/${P}/bin/*)
+
+	dodoc CHANGES COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html ControlPanel.html || die
+
+	if use nsplugin; then
+		local plugin_dir="ns610"
+		if has_version '>=sys-devel/gcc-3.2' ; then
+			plugin_dir="ns610-gcc32"
+		fi
+		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+	fi
+
+	# bug #147259
+	dosym ../javaws/javaws /opt/${P}/bin/javaws
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+	# Create files used as storage for system preferences.
+	touch "${D}/opt/${P}/.systemPrefs/.system.lock"
+	chmod 644 "${D}/opt/${P}/.systemPrefs/.system.lock"
+	touch "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
+	chmod 644 "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
+
+	# install control panel for Gnome/KDE
+	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
+		-e "s/\(Name=Java\)/\1 Control Panel/" \
+		"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
+		"${T}/sun_java-jre.desktop"
+	domenu "${T}/sun_java-jre.desktop"
+
+	set_java_env
+	java-vm_revdep-mask
+}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.17.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.17.ebuild
new file mode 100644
index 000000000000..eee6af6ab7d0
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.17.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2008 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.17.ebuild,v 1.1 2008/12/06 13:39:46 betelgeuse 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.11.ebuild
new file mode 100644
index 000000000000..464d53efab07
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.11.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2008 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.1 2008/12/06 13:39:46 betelgeuse 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 J2SE Runtime Environment, version ${PV}"
+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
+			eerror "No plugin available for amd64 arch"
+		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
+
+	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"
+}