Version bumps for bug #194699.

(Portage version: 2.1.3.9)

5 files changed, 267 insertions, 1 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 435bf52b9e6a..bfb1b6076053 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.106 2007/07/22 21:08:29 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.107 2007/10/04 13:19:43 betelgeuse Exp $
+
+*sun-jre-bin-1.6.0.03 (04 Oct 2007)
+*sun-jre-bin-1.5.0.13 (04 Oct 2007)
+
+  04 Oct 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +sun-jre-bin-1.5.0.13.ebuild, +sun-jre-bin-1.6.0.03.ebuild:
+  Version bumps for bug #194699.
 
   22 Jul 2007; Vlastimil Babka <caster@gentoo.org>
   -sun-jre-bin-1.4.2.14.ebuild, -sun-jre-bin-1.5.0.11.ebuild,
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.13 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.13
new file mode 100644
index 000000000000..aea5af5c23e1
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.13
@@ -0,0 +1,6 @@
+MD5 b0136480ee46f61be98f6b82a57a6346 jdk-1_5_0_13-dlj-linux-amd64.bin 43857474
+RMD160 704650919656ea6d4e3578966cb4252fccdd5ae7 jdk-1_5_0_13-dlj-linux-amd64.bin 43857474
+SHA256 c74786b2420f498505ec5858e6e64727f401846e58fff249f3ded42ac0845114 jdk-1_5_0_13-dlj-linux-amd64.bin 43857474
+MD5 3775996d369c6e157576a06c4957ca51 jdk-1_5_0_13-dlj-linux-i586.bin 49672592
+RMD160 cf0ff373451612348ac54c9e78a0a57d7f5efbed jdk-1_5_0_13-dlj-linux-i586.bin 49672592
+SHA256 6836f531f5dedb94f680d8dd59d349f5f50aa42ca887ae7f4bc664437ac2a9b0 jdk-1_5_0_13-dlj-linux-i586.bin 49672592
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.03 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.03
new file mode 100644
index 000000000000..d0da37660f9a
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.03
@@ -0,0 +1,6 @@
+MD5 f0bf3837b2ba7965ad932e06321a172e jdk-6u3-dlj-linux-amd64.bin 62180680
+RMD160 7d305e714446a4a4345f1c638895542431d402fe jdk-6u3-dlj-linux-amd64.bin 62180680
+SHA256 8bc80ea1bf739674c1cacdfba9987a4d15adb54f4b1462a0b48b79815f56b311 jdk-6u3-dlj-linux-amd64.bin 62180680
+MD5 e39a322d8e3c89d3e679047cdeab50f7 jdk-6u3-dlj-linux-i586.bin 68613151
+RMD160 ba3ea6eb67f72f76f33f091633f8ac049d18b24c jdk-6u3-dlj-linux-i586.bin 68613151
+SHA256 5c44208fbd5f90b3e6a0692ed9e1e98f5feb0c88aa0cfae5186dddb1f05f731b jdk-6u3-dlj-linux-i586.bin 68613151
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
new file mode 100644
index 000000000000..8df1817737c8
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2007 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.13.ebuild,v 1.1 2007/10/04 13:19:43 betelgeuse Exp $
+
+inherit pax-utils eutils java-vm-2
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+#S="${WORKDIR}/jdk${MY_PVL}"
+
+X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
+AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
+
+DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
+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"
+
+RDEPEND="
+	sys-libs/glibc
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXt
+		x11-libs/libXtst
+	)"
+
+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() {
+	if [ ! -r ${DISTDIR}/${A} ]; then
+		die "cannot read ${A}. Please check the permission and try again."
+	fi
+
+	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_install() {
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	pax-mark m $(list-paxables ${S}/bin/*)
+
+	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
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if ! use X; then
+		local xwarn="X11 libraries and/or"
+	fi
+
+	echo
+	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
+	ewarn "Be careful which Java libraries you attempt to use."
+
+	echo
+	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"
+}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
new file mode 100644
index 000000000000..13e1265ca47e
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2007 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.03.ebuild,v 1.1 2007/10/04 13:19:43 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 Development Kit, version ${PV}"
+HOMEPAGE="http://java.sun.com/javase/6/"
+# This release is probably under a different url because tmarble is on holiday
+#SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
+#		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
+URL_BASE="http://dlc.sun.com/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"
+
+RDEPEND="
+	sys-libs/glibc
+	x86? ( =virtual/libstdc++-3.3 )
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+	)"
+
+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() {
+	if [ ! -r ${DISTDIR}/${A} ]; then
+		die "cannot read ${A}. Please check the permission and try again."
+	fi
+
+	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_install() {
+	local dirs="bin lib man"
+
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	pax-mark m $(list-paxables ${S}/bin/*)
+
+	# 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
+		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
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if ! use X; then
+		local xwarn="X11 libraries and/or"
+	fi
+
+	echo
+	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
+	ewarn "Be careful which Java libraries you attempt to use."
+
+	echo
+	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"
+}