Bump to JDK 1.6. Bug #232310

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.6 x86_64

4 files changed, 168 insertions, 3 deletions

diff --git a/dev-java/diablo-jdk/ChangeLog b/dev-java/diablo-jdk/ChangeLog
index 2ae10e8a82c5..adbbfd1c07df 100644
--- a/dev-java/diablo-jdk/ChangeLog
+++ b/dev-java/diablo-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/diablo-jdk
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.7 2007/07/22 09:45:06 graaff Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.8 2008/10/15 13:31:56 aballier Exp $
+
+*diablo-jdk-1.6.0.07.02 (15 Oct 2008)
+
+  15 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/diablo-jdk-1.6.env, +diablo-jdk-1.6.0.07.02.ebuild:
+  Bump to JDK 1.6. Bug #232310
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org>
   diablo-jdk-1.5.0.07.01.ebuild:
diff --git a/dev-java/diablo-jdk/Manifest b/dev-java/diablo-jdk/Manifest
index 45e17352e5c8..25b8dd789865 100644
--- a/dev-java/diablo-jdk/Manifest
+++ b/dev-java/diablo-jdk/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX diablo-jdk-1.5.env 931 RMD160 cdd7b0c36df2afb06aa08e47467d683afb10d3e7 SHA1 1029b4c440cab51c4fb3f02004a4e6918942f959 SHA256 7259d151c8ec3158e968338a1651f4c3e42a0af3b5b36d831fcf46ebb9a33cec
+AUX diablo-jdk-1.6.env 936 RMD160 f629a52590863932c59d5f77618c41da4af69cbb SHA1 8344c550f1d704aed539e3a9b0862185d09cdc39 SHA256 fc220b5ee5ed61dc3eefb9c734987fec7ca4f5a41f46699f3a873f6b795d2aef
 DIST diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2 54347274 RMD160 b49c88ebd63b23a0e322f7a5809a303d0aa487fc SHA1 1a5bf35b745880a0326b9dca370d72fd95fae5a6 SHA256 b7e010658271bebadaa9ea1f410d7af27fcbc0f864a69feea5cd60c6683aa4c9
+DIST diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2 64093245 RMD160 6a4b354ba556fe00aa260da7e6f269de6d894010 SHA1 8046dc67cff191a0779b8d9a297bf30b902a89c8 SHA256 971a537f8e852166fa94a9666b14e2f0a8ee51dcf7a470ab7bcb5be0dba05409
 EBUILD diablo-jdk-1.5.0.07.01.ebuild 3936 RMD160 8988ef95a175117133d3d60e1f89a7fa418b7032 SHA1 77ab63ec266be5fa2ebbb255fee86d07ca52a12d SHA256 96059237bc34f1afed27aa6a49285921d56d23573df70900051e749444504eef
-MISC ChangeLog 1301 RMD160 6ebf4a4658266c439f5a69c44560dcee499f6c52 SHA1 9c13342537f672bae88a5e3a246732e08bcdf008 SHA256 68fdffa7c862d1ec919dec0c4bb704e1d72202d81e5003501056b917a3e1a5a9
+EBUILD diablo-jdk-1.6.0.07.02.ebuild 3905 RMD160 4d803a4feec12154535ba6a771770795a51fd45c SHA1 d1c6b92e482fe82f0905fdeb76674d6529ac37a7 SHA256 820de4731e7359820da825b4a1504178bd155c49618855f0a4cd6451c4f77355
+MISC ChangeLog 1487 RMD160 0d6e1c810caed2b93f143d7b56cb5e46b04c9557 SHA1 2fe4e79fa400b3677f67259b6045e76ddb97dbf1 SHA256 4cced2447ffc72c9ce27304f553af149cf908208bc0d96978e08990e9139749c
 MISC metadata.xml 291 RMD160 c570e537e8b928defbd6d022001303ce2ef84a7a SHA1 08a03decf6a506afc76730be9b41a6fbb5a989b6 SHA256 e70edd2620f9a7e711b53d0cbe677a7b78268f2e859d9d2567c9c11c13008ceb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkj18NMACgkQvFcC4BYPU0r6SQCgkDi5slxwU/rFiIeyG7yPt74P
+UuQAn2taO4WLjpztT2ME3Gy3P5x7y6f3
+=QTs6
+-----END PGP SIGNATURE-----
diff --git a/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild b/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild
new file mode 100644
index 000000000000..43ecbf9882b4
--- /dev/null
+++ b/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2008 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.6.0.07.02.ebuild,v 1.1 2008/10/15 13:31:56 aballier 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-freebsd7-i386-$(replace_version_separator 4 '-b' ${MY_PV}).tar.bz2"
+
+SRC_URI="$javafile"
+
+LICENSE="sun-bcla-java-vm"
+SLOT="1.6"
+KEYWORDS="-* ~x86-fbsd"
+RESTRICT="fetch"
+IUSE="X examples nsplugin jce"
+
+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"
+
+DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.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
+			)
+		=sys-freebsd/freebsd-lib-7*
+		${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() {
+	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.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+		dosym /opt/sun-jce-bin-1.6.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.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}/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="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."
+
+	echo
+	elog "Be careful: ${P}'s Java compiler uses"
+	elog "'-source 1.5' as default. Some keywords such as 'enum'"
+	elog "are not valid identifiers any more in that mode,"
+	elog "which can cause incompatibility with certain sources."
+}
diff --git a/dev-java/diablo-jdk/files/diablo-jdk-1.6.env b/dev-java/diablo-jdk/files/diablo-jdk-1.6.env
new file mode 100644
index 000000000000..f76632cf70d3
--- /dev/null
+++ b/dev-java/diablo-jdk/files/diablo-jdk-1.6.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.6.env,v 1.1 2008/10/15 13:31:56 aballier Exp $
+
+VERSION="Diablo 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.6"
+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"