Updated to new release and removed obsolete env file

Package-Manager: portage-2.1.2_pre2-r2

4 files changed, 161 insertions, 1 deletions

diff --git a/dev-java/diablo-jdk/ChangeLog b/dev-java/diablo-jdk/ChangeLog
index 88a998ebe8de..ddfa3855a54b 100644
--- a/dev-java/diablo-jdk/ChangeLog
+++ b/dev-java/diablo-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/diablo-jdk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.2 2006/09/12 22:34:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.3 2006/10/10 21:55:55 drizzt Exp $
+
+*diablo-jdk-1.5.0.07.01 (10 Oct 2006)
+
+  10 Oct 2006; Timothy Redaelli <drizzt@gentoo.org>
+  +files/diablo-jdk-1.5.env, -files/diablo-jdk.env,
+  +diablo-jdk-1.5.0.07.01.ebuild:
+  Updated to new release and removed obsolete env file
 
   12 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   diablo-jdk-1.5.0.07.00.ebuild:
diff --git a/dev-java/diablo-jdk/diablo-jdk-1.5.0.07.01.ebuild b/dev-java/diablo-jdk/diablo-jdk-1.5.0.07.01.ebuild
new file mode 100644
index 000000000000..5a514e815b55
--- /dev/null
+++ b/dev-java/diablo-jdk/diablo-jdk-1.5.0.07.01.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.5.0.07.01.ebuild,v 1.1 2006/10/10 21:55:55 drizzt Exp $
+
+inherit java-vm-2 eutils versionator
+
+DESCRIPTION="Java Development Kit"
+HOMEPAGE="http://www.FreeBSDFoundation.org/downloads/java.shtml"
+MY_PV=$(replace_version_separator 3 '_')
+MY_PVL=$(get_version_component_range 1-3)
+
+javafile="diablo-caffe-freebsd6-i386-$(replace_version_separator 4 '-b' ${MY_PV}).tar.bz2"
+
+SRC_URI="$javafile"
+
+LICENSE="sun-bcla-java-vm"
+SLOT="1.5"
+KEYWORDS="-* ~x86-fbsd"
+RESTRICT="fetch nofetch"
+IUSE="X examples nsplugin jce"
+
+DEPEND="jce? ( =dev-java/sun-jce-bin-1.5.0* )"
+RDEPEND="X? ( || ( (		x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libX11
+				x11-libs/libXau
+				x11-libs/libXdmcp
+				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*
+		${DEPEND}"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+S="${WORKDIR}/diablo-jdk$(get_version_component_range 1-4 ${MY_PV})"
+
+pkg_nofetch() {
+	einfo "Please download ${javafile} from:"
+	einfo "${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_install() {
+	cd "${S}"
+	local dirs="bin include jre lib man"
+
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -pPR $i "${D}"/opt/${P}/ || die "failed to build"
+	done
+
+	dodoc COPYRIGHT README.html
+	dohtml README.html
+
+	dodir /opt/${P}/share/
+
+	cp -pPR src.zip "${D}"/opt/${P}/share/
+
+	if use examples; then
+		cp -pPR demo "${D}"/opt/${P}/share/
+		cp -pRR sample "${D}"/opt/${P}/share/
+	fi
+
+	if use jce ; then
+		cd "${D}"/opt/${P}/jre/lib/security
+		dodir /opt/${P}/jre/lib/security/strong-jce
+		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar "${D}"/opt/${P}/jre/lib/security/strong-jce
+		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar "${D}"/opt/${P}/jre/lib/security/strong-jce
+		dosym /opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+		dosym /opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin /opt/${P}/jre/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}/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
+	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
+		"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+		${T}/sun_java-${SLOT}.desktop
+
+	domenu ${T}/sun_java-${SLOT}.desktop
+
+	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 JRE require ${xwarn} virtual/lpr to be installed."
+	ewarn "Be careful which Java libraries you attempt to use."
+
+	echo
+	einfo " Be careful: ${P}'s Java compiler uses"
+	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
+	einfo " are not valid identifiers any more in that mode,"
+	einfo " which can cause incompatibility with certain sources."
+}
diff --git a/dev-java/diablo-jdk/files/diablo-jdk-1.5.env b/dev-java/diablo-jdk/files/diablo-jdk-1.5.env
new file mode 100644
index 000000000000..36f8ef1056e3
--- /dev/null
+++ b/dev-java/diablo-jdk/files/diablo-jdk-1.5.env
@@ -0,0 +1,17 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/files/diablo-jdk-1.5.env,v 1.1 2006/10/10 21:55:55 drizzt Exp $
+
+VERSION="Sun JDK @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="/opt/@P@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.5"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/diablo-jdk/files/digest-diablo-jdk-1.5.0.07.01 b/dev-java/diablo-jdk/files/digest-diablo-jdk-1.5.0.07.01
new file mode 100644
index 000000000000..573279fee496
--- /dev/null
+++ b/dev-java/diablo-jdk/files/digest-diablo-jdk-1.5.0.07.01
@@ -0,0 +1,3 @@
+MD5 611e29db0b841d8c1cd170582946a666 diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2 54347274
+RMD160 b49c88ebd63b23a0e322f7a5809a303d0aa487fc diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2 54347274
+SHA256 b7e010658271bebadaa9ea1f410d7af27fcbc0f864a69feea5cd60c6683aa4c9 diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2 54347274