Version bump, see bug #150421.

Package-Manager: portage-2.1.2_pre3-r5

4 files changed, 192 insertions, 5 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 5f7802694f9a..58952694eb99 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.165 2006/11/21 21:53:45 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.166 2006/11/21 21:59:30 nichoj Exp $
+
+*sun-jdk-1.5.0.09 (21 Nov 2006)
+
+  21 Nov 2006; Joshua Nichols <nichoj@gentoo.org> +sun-jdk-1.5.0.09.ebuild:
+  Version bump, see bug #150421.
 
   21 Nov 2006; Joshua Nichols <nichoj@gentoo.org>
   sun-jdk-1.4.2.12-r2.ebuild:
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 1e79ff92ceac..df4fddc81226 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -10,6 +10,8 @@ DIST j2sdk-1_4_2_12-linux-i586.bin 36337163 RMD160 6b1499cf3bd46158293506b8a0d70
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
 DIST jdk-1_5_0_08-dlj-linux-amd64.bin 43854617 RMD160 c6669cba980b9097c6921041ee3af8753587ea37 SHA1 f43776629e50834be1f25060bcbe7f8ee0483173 SHA256 a4a4baa5488c7be8b109ed6c1f460a8b30861ae546c050c319de41e987bc857f
 DIST jdk-1_5_0_08-dlj-linux-i586.bin 49498712 RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 SHA1 e7bc2da45219c54f9ac0dcbe6b3b8bf7ead3cc4e SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8
+DIST jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 RMD160 c7f4310ff6714d5dd33c10398c6615689f5523ff SHA1 b3cd93b445ce68b8d4b88c4afa9a177473adf3f7 SHA256 3f7f21671ebcb9c849b02d668d85cf6f161870c45f5bf82f5e3fed2a026f7f35
+DIST jdk-1_5_0_09-dlj-linux-i586.bin 49504315 RMD160 8e4bc83d553bd0e92607bd2e03451ec879d5928e SHA1 36a065b72af226804ff0b64b9c40859c7a879b6f SHA256 3318644bdcd1a1de4ea122b03a4607de16f30603e7f6c291c33575cbbc254f85
 EBUILD sun-jdk-1.4.2.12-r2.ebuild 6295 RMD160 169f60bb6d88164d5f4c867766a9651a93bb7457 SHA1 5a386fadb3a76080fbfd81f847ef3f4dce84fe73 SHA256 d2ca54862998c72351c6fa09f2c87c71b705c42df41468a2cb8e51cf394be058
 MD5 47e6303ad612a0b25879b412e5f7bc32 sun-jdk-1.4.2.12-r2.ebuild 6295
 RMD160 169f60bb6d88164d5f4c867766a9651a93bb7457 sun-jdk-1.4.2.12-r2.ebuild 6295
@@ -18,10 +20,14 @@ EBUILD sun-jdk-1.5.0.08.ebuild 5585 RMD160 9a17e1ef27724f417ab53fc6bf3983784575e
 MD5 ac5ac2cd6724e7ba0c1f887ff3e57c77 sun-jdk-1.5.0.08.ebuild 5585
 RMD160 9a17e1ef27724f417ab53fc6bf3983784575ef93 sun-jdk-1.5.0.08.ebuild 5585
 SHA256 ca37bfd50f6fd2f2abb62b59735f4a7c743f9f5b0de8627f593b2871260f95bf sun-jdk-1.5.0.08.ebuild 5585
-MISC ChangeLog 33431 RMD160 42f92f3dd010ef223f2332e2939391763b300892 SHA1 1c8bd6c0d613d8d776f5238178704e0f22fbd3e5 SHA256 1f0414e73add96cf1a4f3687e908a260bb4bd785d0b0a716c3d6c1446407eb0e
-MD5 41d9383999c8db06e599ea626aae83f5 ChangeLog 33431
-RMD160 42f92f3dd010ef223f2332e2939391763b300892 ChangeLog 33431
-SHA256 1f0414e73add96cf1a4f3687e908a260bb4bd785d0b0a716c3d6c1446407eb0e ChangeLog 33431
+EBUILD sun-jdk-1.5.0.09.ebuild 5116 RMD160 ff9350a4624070304b5e09190c53280b0c3f322b SHA1 1954add1041f97e47024339b26f1f75f81e24bd0 SHA256 9d36d435e63f93cf5f5a28e633359409f6d06567ed875e9ebca3ff49c00d6f42
+MD5 9b72c60b6d428ee54ecdd02140bb90d9 sun-jdk-1.5.0.09.ebuild 5116
+RMD160 ff9350a4624070304b5e09190c53280b0c3f322b sun-jdk-1.5.0.09.ebuild 5116
+SHA256 9d36d435e63f93cf5f5a28e633359409f6d06567ed875e9ebca3ff49c00d6f42 sun-jdk-1.5.0.09.ebuild 5116
+MISC ChangeLog 33574 RMD160 08a6a0535b5500d46d74fd4ff72e26041a7d0a16 SHA1 61e6516228eacaf4ebacf5e90005a345793a7a7f SHA256 b42b5900c4bd9302d47044f63f33188b4b2fcfb1dddbb1d0a6e8d5d86ed8147a
+MD5 cfc72be5b831ad1293ac050eb826543e ChangeLog 33574
+RMD160 08a6a0535b5500d46d74fd4ff72e26041a7d0a16 ChangeLog 33574
+SHA256 b42b5900c4bd9302d47044f63f33188b4b2fcfb1dddbb1d0a6e8d5d86ed8147a ChangeLog 33574
 MISC metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 SHA1 6d20154bac8f6c9bdde74156e48932cd8cc52f06 SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 metadata.xml 239
@@ -32,3 +38,6 @@ SHA256 80412544ff068c961ad5d3022215e34877cfa22118e1f68768e8d768ebe8687b files/di
 MD5 20fa891f2c9e4953c1da7d1c318d3216 files/digest-sun-jdk-1.5.0.08 563
 RMD160 59f63ab1ef5f3a40c10ccd954d1cfa2ca47f4e15 files/digest-sun-jdk-1.5.0.08 563
 SHA256 36ee47fae9d203d6e249bd407da3fd700d2d4f672a258285010f1a44f38ea0b8 files/digest-sun-jdk-1.5.0.08 563
+MD5 8409e421272b316b007ee383c1d8508b files/digest-sun-jdk-1.5.0.09 563
+RMD160 93a25e28b116cacea4f5295169e9bb091b46575b files/digest-sun-jdk-1.5.0.09 563
+SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c files/digest-sun-jdk-1.5.0.09 563
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.09 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.09
new file mode 100644
index 000000000000..fb32756cb7a5
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.09
@@ -0,0 +1,6 @@
+MD5 a210623300238ebb230d47c774c25779 jdk-1_5_0_09-dlj-linux-amd64.bin 43863154
+RMD160 c7f4310ff6714d5dd33c10398c6615689f5523ff jdk-1_5_0_09-dlj-linux-amd64.bin 43863154
+SHA256 3f7f21671ebcb9c849b02d668d85cf6f161870c45f5bf82f5e3fed2a026f7f35 jdk-1_5_0_09-dlj-linux-amd64.bin 43863154
+MD5 b937aef01669744686e84ac5f0cc3d97 jdk-1_5_0_09-dlj-linux-i586.bin 49504315
+RMD160 8e4bc83d553bd0e92607bd2e03451ec879d5928e jdk-1_5_0_09-dlj-linux-i586.bin 49504315
+SHA256 3318644bdcd1a1de4ea122b03a4607de16f30603e7f6c291c33575cbbc254f85 jdk-1_5_0_09-dlj-linux-i586.bin 49504315
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.09.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.09.ebuild
new file mode 100644
index 000000000000..fcdbbb873fe0
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.09.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2006 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.09.ebuild,v 1.1 2006/11/21 21:59:30 nichoj Exp $
+
+inherit java-vm-2 eutils
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+S="${WORKDIR}/jdk${MY_PVL}"
+
+X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
+AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
+if use x86; then
+	At=${X86_AT}
+elif use amd64; then
+	At=${AMD64_AT}
+fi
+DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
+SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
+		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
+SLOT="1.5"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="nostrip"
+IUSE="X alsa doc examples jce nsplugin"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so"
+
+DEPEND="
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )
+	jce? ( =dev-java/sun-jce-bin-1.5.0* )"
+
+RDEPEND="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
+			)
+		)"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+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"
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		die "cannot read ${At}. Please check the permission and try again."
+	fi
+
+	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
+}
+
+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 copy"
+	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
+		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
+		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}/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 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
+
+	if ! use X; then
+		local xwarn="virtual/x11 and/or"
+	fi
+
+	echo
+	ewarn "Some parts of Sun's JDK 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."
+}