Bump to JRE 1.6, bug #232310

(Portage version: 2.2_rc12/cvs/Linux 2.6.26.6 x86_64)

3 files changed, 131 insertions, 2 deletions

diff --git a/dev-java/diablo-jre-bin/ChangeLog b/dev-java/diablo-jre-bin/ChangeLog
index 94adaf515c2f..224fd5158d85 100644
--- a/dev-java/diablo-jre-bin/ChangeLog
+++ b/dev-java/diablo-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/diablo-jre-bin
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog,v 1.4 2007/07/22 09:41:58 graaff Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog,v 1.5 2008/10/15 13:34:05 aballier Exp $
+
+*diablo-jre-bin-1.6.0.07.02 (15 Oct 2008)
+
+  15 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/diablo-jre-bin-1.6.env, +diablo-jre-bin-1.6.0.07.02.ebuild:
+  Bump to JRE 1.6, bug #232310
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org>
   diablo-jre-bin-1.5.0.07.01.ebuild:
diff --git a/dev-java/diablo-jre-bin/diablo-jre-bin-1.6.0.07.02.ebuild b/dev-java/diablo-jre-bin/diablo-jre-bin-1.6.0.07.02.ebuild
new file mode 100644
index 000000000000..c9b391b5a549
--- /dev/null
+++ b/dev-java/diablo-jre-bin/diablo-jre-bin-1.6.0.07.02.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/diablo-jre-bin-1.6.0.07.02.ebuild,v 1.1 2008/10/15 13:34:05 aballier Exp $
+
+inherit java-vm-2 eutils versionator
+
+DESCRIPTION="Java Runtime Environment"
+HOMEPAGE="http://www.FreeBSDFoundation.org/downloads/java.shtml"
+MY_PV=$(replace_version_separator 3 '_')
+MY_PVA=$(replace_version_separator 4 '-b' ${MY_PV})
+
+SRC_URI="diablo-latte-freebsd7-i386-${MY_PVA}.tar.bz2"
+
+LICENSE="sun-bcla-java-vm"
+SLOT="1.6"
+KEYWORDS="-* ~x86-fbsd"
+RESTRICT="fetch"
+IUSE="X nsplugin"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/server/libjvm.so opt/${P}/jre/lib/i386/client/libjvm.so"
+
+JAVA_VM_NO_GENERATION1=true
+
+DEPEND=""
+RDEPEND="X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXp
+			x11-libs/libXt
+			x11-libs/libXtst
+		)
+		=sys-freebsd/freebsd-lib-7*"
+
+S="${WORKDIR}/diablo-jre$(get_version_component_range 1-4 ${MY_PV})"
+
+pkg_nofetch() {
+	einfo "Please download ${SRC_URI} from:"
+	einfo "${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_install() {
+	local dirs="bin lib man plugin javaws"
+
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -pPR $i "${D}"/opt/${P}/ || die "failed to build"
+	done
+
+	dodoc COPYRIGHT README
+	dohtml Welcome.html
+
+	if use nsplugin; then
+		install_mozilla_plugin /opt/${P}/plugin/i386/ns7/libjavaplugin_oji.so
+	fi
+
+	# Change libz.so.4 to libz.so.1
+	scanelf -qR -N libz.so.4 -F "#N" "${D}"/opt/${P}/ | \
+		while read i; do
+		if [[ $(strings "$i" | fgrep -c libz.so.4) -ne 1 ]]; then
+			export SANITY_CHECK_LIBZ_FAILED=1
+			break
+		fi
+		sed -i -e 's/libz\.so\.4/libz.so.1/g' "$i"
+	done
+	[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.4 to libz.so.1"
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+
+	# 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
+}
+
+pkg_postinst() {
+	# Create files used as storage for system preferences.
+	PREFS_LOCATION=/opt/${P}/
+	mkdir -p "${PREFS_LOCATION}"/.systemPrefs
+	if [ ! -f "${PREFS_LOCATION}"/.systemPrefs/.system.lock ] ; then
+		touch "${PREFS_LOCATION}"/.systemPrefs/.system.lock
+		chmod 644 "${PREFS_LOCATION}"/.systemPrefs/.system.lock
+	fi
+	if [ ! -f "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile ] ; then
+		touch "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile
+		chmod 644 "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile
+	fi
+
+	# 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 JRE require ${xwarn} virtual/lpr to be installed."
+	ewarn "Be careful which Java libraries you attempt to use."
+}
diff --git a/dev-java/diablo-jre-bin/files/diablo-jre-bin-1.6.env b/dev-java/diablo-jre-bin/files/diablo-jre-bin-1.6.env
new file mode 100644
index 000000000000..c41751c87ad0
--- /dev/null
+++ b/dev-java/diablo-jre-bin/files/diablo-jre-bin-1.6.env
@@ -0,0 +1,16 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/files/diablo-jre-bin-1.6.env,v 1.1 2008/10/15 13:34:05 aballier Exp $
+
+VERSION="Diablo JRE @PV@"
+JAVA_HOME=/opt/@P@
+JRE_HOME=/opt/@P@
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
+LDPATH="${JAVA_HOME}/lib/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/lib/@PLATFORM@/xawt/:${JAVA_HOME}/lib/@PLATFORM@/server/"
+MANPATH="/opt/@P@/man"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.6"
+BOOTCLASSPATH="${JAVA_HOME}/lib/rt.jar:${JAVA_HOME}/lib/i18n.jar:${JAVA_HOME}/lib/sunrsasign.jar:${JAVA_HOME}/lib/jsse.jar:${JAVA_HOME}/lib/jce.jar:${JAVA_HOME}/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH"