Fix the plugin installation to install the version for >=gcc-3. Fixes bug #180750.

(Portage version: 2.1.2.7)

3 files changed, 146 insertions, 1 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index d4d4da3416d1..33ed595f55e3 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.92 2007/06/02 16:59:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.93 2007/06/03 19:52:38 betelgeuse Exp $
+
+*sun-jre-bin-1.6.0.01-r1 (03 Jun 2007)
+
+  03 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +sun-jre-bin-1.6.0.01-r1.ebuild:
+  Fix the plugin installation to install the version for >=gcc-3. Fixes bug
+  #180750.
 
 *sun-jre-bin-1.6.0.01 (02 Jun 2007)
 
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.01-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.01-r1
new file mode 100644
index 000000000000..7f5d8d6c8fb8
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.01-r1
@@ -0,0 +1,6 @@
+MD5 177f241f071396f5f3d3c42ed82c2ecc jdk-6u1-dlj-linux-amd64.sh 56395232
+RMD160 90f03c9359808126c73abedabed765a1191e04f0 jdk-6u1-dlj-linux-amd64.sh 56395232
+SHA256 13b40146ef514ff6756b35a7d26ed2e8e84cadcfbbd24d1cbb35d871d9b7e78b jdk-6u1-dlj-linux-amd64.sh 56395232
+MD5 644a588f1ea9417fbf23b3e5505bbf8c jdk-6u1-dlj-linux-i586.sh 62818812
+RMD160 2858ae3036db3315c6bbd2bd43cd05cf0af6e43e jdk-6u1-dlj-linux-i586.sh 62818812
+SHA256 1a49eaadcaf480c9eec4aa558ab7392e93b7c88b8f79f53be9a8fc03a6714ddc jdk-6u1-dlj-linux-i586.sh 62818812
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild
new file mode 100644
index 000000000000..13a5e5ae0f5f
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.01-r1.ebuild
@@ -0,0 +1,132 @@
+# 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.01-r1.ebuild,v 1.1 2007/06/03 19:52:38 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}"
+
+X86_AT="jdk-${MY_PV}-dlj-linux-i586.sh"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.sh"
+
+DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
+HOMEPAGE="http://java.sun.com/javase/6/"
+SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
+		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
+SLOT="1.6"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="nostrip"
+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/libXt
+		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
+
+	# TODO Don't think we still needs these -nichoj
+	# create dir for system preferences
+	#dodir /opt/${P}/jre/.systemPrefs
+	# Create files used as storage for system preferences.
+	#touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock
+	#chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock
+	#touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
+	#chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
+
+	# 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="virtual/x11 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"
+}