Version bump to resolve bug #114334. Added alsa and X use flags to get proper dependencies and removed the installation of the LICENSE file.

(Portage version: 2.0.53)

5 files changed, 279 insertions, 2 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 09a64c9946da..eb7fe8be8125 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.128 2005/11/29 09:40:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.129 2005/12/07 22:59:33 betelgeuse Exp $
+
+*sun-jdk-1.5.0.06 (07 Dec 2005)
+
+  07 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
+  +files/sun-jdk-1.5.0.06, +sun-jdk-1.5.0.06.ebuild:
+  Version bump to resolve bug #114334. Added alsa and X use flags to get
+  proper dependencies and removed the installation of the LICENSE file.
 
   29 Nov 2005; Thomas Matthijs <axxo@gentoo.org> sun-jdk-1.4.2.10.ebuild:
   Keyword x86
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index aab33dab765c..3f70b9935aaa 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,18 +1,21 @@
-MD5 eeed71dccd0c1fed03a8dbcd41150345 ChangeLog 26376
+MD5 b691374f677fa163c6c41a88af958c0d ChangeLog 26661
 MD5 92fc551c12c9a260dd9ced69d15cf0f3 files/digest-sun-jdk-1.2.2.017 78
 MD5 7339eea38c2cfdfdc4cd777a02c4cbc1 files/digest-sun-jdk-1.3.1.16 76
 MD5 ce8f1c0c94a74aadae5d58b68c254161 files/digest-sun-jdk-1.4.2.09 140
 MD5 26916b6de74c3d0ffd1eb22f64073ead files/digest-sun-jdk-1.4.2.10 140
 MD5 40541411b01ed36dc30322d7a5ab2ee9 files/digest-sun-jdk-1.5.0.05 212
+MD5 7aea6ff8bf86dffb57bf2427771e6ad7 files/digest-sun-jdk-1.5.0.06 212
 MD5 64ade01a917993ba9712b2c0d2f4a580 files/javaws-waitid.c 833
 MD5 ac1c6e8860b4cb03e284664cacf7a977 files/sun-jdk-1.2.2.017 328
 MD5 0b7cc36964f2fa50ad778e865f0cc851 files/sun-jdk-1.3.1.16 471
 MD5 ca5181076e4ba09c94548af2da8690dd files/sun-jdk-1.4.2.09 646
 MD5 6149010c1ed7dcc5a315c6d9674c970b files/sun-jdk-1.4.2.10 640
 MD5 50d600429785f626eef0bb4048cbc009 files/sun-jdk-1.5.0.05 613
+MD5 50d600429785f626eef0bb4048cbc009 files/sun-jdk-1.5.0.06 613
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 MD5 6e6334f4e89e27aca419bc2dea752336 sun-jdk-1.2.2.017.ebuild 2898
 MD5 89ea449d6a1117e1995a2d7bf53a3d0d sun-jdk-1.3.1.16.ebuild 4149
 MD5 668a0b7c052c6d32ec1183e8beef1d09 sun-jdk-1.4.2.09.ebuild 6866
 MD5 e9955abd573ac0dd3c65b7cda17647dd sun-jdk-1.4.2.10.ebuild 6865
 MD5 881e1d3c90a77528a35f1953302c7450 sun-jdk-1.5.0.05.ebuild 7350
+MD5 2a154f51edd8de710067325023a2dbdc sun-jdk-1.5.0.06.ebuild 7622
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.06 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.06
new file mode 100644
index 000000000000..f7265bbfa7d7
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.06
@@ -0,0 +1,3 @@
+MD5 169441bba1ca95e84e030e116f258d79 jce_policy-1_5_0.zip 8826
+MD5 27adf9c276e1ec824a3946ef9fe022a4 jdk-1_5_0_06-linux-amd64.bin 43681923
+MD5 3cdad4a383b93680f02f6f06198c2227 jdk-1_5_0_06-linux-i586.bin 48974825
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.5.0.06 b/dev-java/sun-jdk/files/sun-jdk-1.5.0.06
new file mode 100644
index 000000000000..d449252503b0
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.5.0.06
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.5.0.06,v 1.1 2005/12/07 22:59:33 betelgeuse Exp $
+
+VERSION="Sun JDK @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="${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"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild
new file mode 100644
index 000000000000..c31399521a0e
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.06.ebuild,v 1.1 2005/12/07 22:59:33 betelgeuse Exp $
+
+inherit java eutils
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+
+amd64file="jdk-${MY_PVA}-linux-amd64.bin"
+x86file="jdk-${MY_PVA}-linux-i586.bin"
+
+jcefile="jce_policy-${MY_PVA%_*}.zip"
+
+if use x86; then
+	At=${x86file}
+elif use amd64; then
+	At=${amd64file}
+fi
+
+S="${WORKDIR}/jdk${MY_PVL}"
+DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
+SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )
+		jce? ( $jcefile )"
+SLOT="1.5"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="~x86 ~amd64 -*"
+RESTRICT="fetch nostrip"
+IUSE="X alsa doc browserplugin nsplugin jce mozilla examples"
+
+#
+DEPEND=">=dev-java/java-config-1.2
+	sys-apps/sed
+	jce? ( app-arch/unzip )
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
+
+RDEPEND="x86? ( sys-libs/lib-compat )
+	alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )
+	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
+			)
+		)"
+
+PROVIDE="virtual/jre
+	virtual/jdk"
+
+PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
+
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemsv"
+
+FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+
+pkg_nofetch() {
+	local archtext=""
+
+	if use x86; then
+		archtext="Linux"
+	elif use amd64; then
+		archtext="Linux AMD64"
+	fi
+
+	einfo "Please download ${At} from:"
+	einfo "${FETCH_SDK}"
+	einfo "Select the ${archtext} self-extracting file"
+	einfo "and move it to ${DISTDIR}"
+
+	if use jce; then
+		echo
+		einfo "Also download ${jcefile} from:"
+		einfo ${FETCH_JCE}
+		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
+		einfo "and move it to ${DISTDIR}"
+	fi
+
+}
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		die "cannot read ${At}. Please check the permission and try again."
+	fi
+	if use jce; then
+		if [ ! -r ${DISTDIR}/${jcefile} ]; then
+			die "cannot read ${jcefile}. Please check the permission and try again."
+		fi
+	fi
+
+	#Search for the ELF Header
+	testExp=`echo -e "\105\114\106"`
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
+	chmod +x install.sfx
+	./install.sfx || die
+	rm install.sfx
+
+	if [ -f ${S}/bin/unpack200 ]; then
+		UNPACK_CMD=${S}/bin/unpack200
+		chmod +x $UNPACK_CMD
+		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
+		for i in $PACKED_JARS; do
+			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
+			if [ -f ${PACK_FILE} ]; then
+				echo "	unpacking: $i"
+				$UNPACK_CMD ${PACK_FILE} ${S}/$i
+				rm -f ${PACK_FILE}
+			fi
+		done
+		rm -f ${UNPACK_CMD}
+	else
+		die "unpack not found"
+	fi
+	${S}/bin/java -client -Xshare:dump
+}
+
+src_install() {
+	dodir /opt/${P}
+
+	for i in bin include jre lib man; do
+		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy ${i}"
+	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/
+		if ( use x86 || use amd64 ); then
+			cp -pPR sample ${D}/opt/${P}/share/
+		fi
+	fi
+
+	if use jce ; then
+		cd ${D}/opt/${P}/jre/lib/security
+		unzip ${DISTDIR}/${jcefile} || die "failed to unzip jce"
+		mv jce unlimited-jce
+		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/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
+	fi
+
+	if use nsplugin ||       # global useflag for netscape-compat plugins
+	   use browserplugin ||  # deprecated but honor for now
+	   use mozilla; then     # wrong but used to honor it
+		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}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+		else
+			eerror "No plugin available for amd64 arch"
+		fi
+	fi
+
+	# 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}\/jre/" \
+		-e "s/\(Name=Java\)/\1 Control Panel/" \
+		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+		${T}/sun_java.desktop
+
+	domenu ${T}/sun_java.desktop
+
+	set_java_env ${FILESDIR}/${VMHANDLE}
+}
+
+pkg_postinst() {
+	# Create files used as storage for system preferences.
+	PREFS_LOCATION=/opt/${P}/jre
+	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_pkg_postinst
+
+	#Show info about netscape
+	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
+		echo
+		einfo "If you want to install the plugin for Netscape 4.x, type"
+		einfo
+		einfo "   cd /usr/lib/nsbrowser/plugins/"
+		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
+	fi
+
+	# if chpax is on the target system, set the appropriate PaX flags
+	# this will not hurt the binary, it modifies only unused ELF bits
+	# but may confuse things like AV scanners and automatic tripwire
+	if has_version sys-apps/chpax
+	then
+		echo
+		einfo "setting up conservative PaX flags for jar, javac and java"
+
+		for paxkills in "jar" "javac" "java" "javah" "javadoc"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+		done
+
+		# /opt/$VM/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm
+
+		einfo "you should have seen lots of chpax output above now"
+		ewarn "make sure the grsec ACL contains those entries also"
+		ewarn "because enabling it will override the chpax setting"
+		ewarn "on the physical files - help for PaX and grsecurity"
+		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
+	fi
+
+	echo
+	eerror "Some parts of Sun's JDK require virtual/x11 and/or virtual/lpr to be installed."
+	eerror "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."
+
+	if ! use nsplugin && ( use browserplugin || use mozilla ); then
+		echo
+		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
+		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
+		ewarn "update your USE to include 'nsplugin'."
+	fi
+}