Version bump, remove stricter restrict, use QA_TEXTREL instead.

(Portage version: 2.1.2_rc2-r3)

4 files changed, 140 insertions, 1 deletions

diff --git a/dev-java/diablo-jre-bin/ChangeLog b/dev-java/diablo-jre-bin/ChangeLog
index 79f91f9c3947..4a589bb4dbcd 100644
--- a/dev-java/diablo-jre-bin/ChangeLog
+++ b/dev-java/diablo-jre-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/diablo-jre-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog,v 1.2 2006/09/12 22:35:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog,v 1.3 2006/12/03 16:58:38 flameeyes Exp $
+
+*diablo-jre-bin-1.5.0.07.01 (03 Dec 2006)
+
+  03 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/diablo-jre-bin-1.5.env, -files/diablo-jre-bin.env,
+  -diablo-jre-bin-1.5.0.07.00.ebuild, +diablo-jre-bin-1.5.0.07.01.ebuild:
+  Version bump, remove stricter restrict, use QA_TEXTREL instead.
 
   12 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   diablo-jre-bin-1.5.0.07.00.ebuild:
diff --git a/dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.01.ebuild b/dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.01.ebuild
new file mode 100644
index 000000000000..8d01a1d7dd15
--- /dev/null
+++ b/dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.01.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2006 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.5.0.07.01.ebuild,v 1.1 2006/12/03 16:58:38 flameeyes 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-freebsd6-i386-${MY_PVA}.tar.bz2"
+
+LICENSE="sun-bcla-java-vm"
+SLOT="1.5"
+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
+				)
+				virtual/x11
+			)
+		)
+		=sys-freebsd/freebsd-lib-6*
+		=virtual/libstdc++-3.3*"
+
+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() {
+	cd "${S}"
+	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.3 to libz.so.1
+	scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${P}/ | \
+		while read i; do
+		if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]]; then
+			export SANITY_CHECK_LIBZ_FAILED=1
+			break
+		fi
+		sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
+	done
+	[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 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="virtual/x11 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.5.env b/dev-java/diablo-jre-bin/files/diablo-jre-bin-1.5.env
new file mode 100644
index 000000000000..08f74f22b6b7
--- /dev/null
+++ b/dev-java/diablo-jre-bin/files/diablo-jre-bin-1.5.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.5.env,v 1.1 2006/12/03 16:58:38 flameeyes Exp $
+
+VERSION="Sun 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.5"
+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"
diff --git a/dev-java/diablo-jre-bin/files/digest-diablo-jre-bin-1.5.0.07.01 b/dev-java/diablo-jre-bin/files/digest-diablo-jre-bin-1.5.0.07.01
new file mode 100644
index 000000000000..dafe7327df10
--- /dev/null
+++ b/dev-java/diablo-jre-bin/files/digest-diablo-jre-bin-1.5.0.07.01
@@ -0,0 +1,3 @@
+MD5 4ab052253faf251129737e999916de1b diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2 23104037
+RMD160 fa5bc67cfda969fb0dc4d735310cc4f44698000a diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2 23104037
+SHA256 4585f35124416de052c8be10f0f48536053ab5c33dc3b7d728bf6e84d9b42c14 diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2 23104037