Version bump.

Package-Manager: portage-2.1.2.9

4 files changed, 184 insertions, 8 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 5eec39d88e95..0409c823b8ce 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.201 2007/06/02 17:14:06 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.202 2007/06/11 17:52:56 betelgeuse Exp $
+
+*sun-jdk-1.5.0.12 (11 Jun 2007)
+
+  11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +sun-jdk-1.5.0.12.ebuild:
+  Version bump.
 
 *sun-jdk-1.6.0.01 (02 Jun 2007)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index ef366ac86b90..2530eeaefd41 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -21,6 +21,8 @@ DIST j2sdk-1_4_2_14-linux-i586.bin 36368335 RMD160 8dfd1755625e50d0b2a3dc25ddcaf
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
 DIST jdk-1_5_0_11-dlj-linux-amd64.bin 43954177 RMD160 bd865019d3fb2268800696207dba158ea2986a7f SHA1 151315b9eb70f81ac88712e151da5c0a5aeaca23 SHA256 98df66902f42f764cb89b12a1502b976f2e5ddb2aa5000e14846b90cef74e0db
 DIST jdk-1_5_0_11-dlj-linux-i586.bin 49598681 RMD160 74c5bd78450397006ea145580c3554d77b64a31d SHA1 965e4983da769b6c5d6ec79c942337bc8bee5c8a SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705
+DIST jdk-1_5_0_12-dlj-linux-amd64.bin 43854594 RMD160 b9790d2cc33c7c7f749f6fd055da2b215c054dff SHA1 80566a30c2d065668a97db8b229f3515817e6c2d SHA256 7be91d7544ac682c28bfcad60fa7856303e70fbf8e9857a93d701553dc40c144
+DIST jdk-1_5_0_12-dlj-linux-i586.bin 49646174 RMD160 0865c93170fcf443c61a83660228cbc4a91523b9 SHA1 ff909ca469587ae132816868c5f201757e533ed0 SHA256 2a9b782300930a239c88e93c9c4e0c34715fb6dddb88cb82ba214dba3f4c9eb0
 DIST jdk-6-dlj-linux-amd64.bin 56347832 RMD160 b4d12bf55ea6baa465c227cff2d314d26de4876e SHA1 d51a60c80ac1a8173c53b9a389377b2774a50e92 SHA256 f1f35d331809487bb922bbd3ca46de4abc3e45c482f94127f4ac8f3c8b3321c3
 DIST jdk-6-dlj-linux-i586.bin 62718862 RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac SHA1 bc7a56952b362e472a0ec179e0852ca7bf0c0507 SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467
 DIST jdk-6u1-dlj-linux-amd64.sh 56395232 RMD160 90f03c9359808126c73abedabed765a1191e04f0 SHA1 e2656303a3b0eef237f2cd233a3bd28185c65f12 SHA256 13b40146ef514ff6756b35a7d26ed2e8e84cadcfbbd24d1cbb35d871d9b7e78b
@@ -37,6 +39,10 @@ EBUILD sun-jdk-1.5.0.11.ebuild 4652 RMD160 e0bc27a59f528e63a4b8bd983e77e12f17250
 MD5 3d881ef509df7c965fa7b1aa28025d49 sun-jdk-1.5.0.11.ebuild 4652
 RMD160 e0bc27a59f528e63a4b8bd983e77e12f17250a03 sun-jdk-1.5.0.11.ebuild 4652
 SHA256 352f8632dce237af85bfbfd8acca4ffc91e1ee9569f56d539940e43981ae5257 sun-jdk-1.5.0.11.ebuild 4652
+EBUILD sun-jdk-1.5.0.12.ebuild 4699 RMD160 551dc6d90dbd2b845d25cd059773894b5bdf70af SHA1 511cb8a32bdd84877461de4a42cc4016d97c0e26 SHA256 89d630a909766a101989292c5c12f18280be66b109d975ba4efe6ae189cddd44
+MD5 0521fe134c88cb9f60c0f849000d74a3 sun-jdk-1.5.0.12.ebuild 4699
+RMD160 551dc6d90dbd2b845d25cd059773894b5bdf70af sun-jdk-1.5.0.12.ebuild 4699
+SHA256 89d630a909766a101989292c5c12f18280be66b109d975ba4efe6ae189cddd44 sun-jdk-1.5.0.12.ebuild 4699
 EBUILD sun-jdk-1.6.0-r1.ebuild 4802 RMD160 51b3b35fdb07034968f5859c27cf672b937d4913 SHA1 cc74741d176816fa2151ce32a7c4eade29255879 SHA256 422b0f6b1b7b6e36bfaf59998e9bede433b17b7f0dfa19c25486d431b28ee753
 MD5 82a5b3f47a0051ce2a06f287c437befd sun-jdk-1.6.0-r1.ebuild 4802
 RMD160 51b3b35fdb07034968f5859c27cf672b937d4913 sun-jdk-1.6.0-r1.ebuild 4802
@@ -49,10 +55,10 @@ EBUILD sun-jdk-1.6.0.01.ebuild 5036 RMD160 d74f9aacb7df7035c8b70104f840b9ca777d6
 MD5 0c8955b6702aeee78d7f64605f50cd2f sun-jdk-1.6.0.01.ebuild 5036
 RMD160 d74f9aacb7df7035c8b70104f840b9ca777d6d4f sun-jdk-1.6.0.01.ebuild 5036
 SHA256 65573b02d537f18aa6ac7b089eea6db73ddc1133cdfec22c553db20726ed6cec sun-jdk-1.6.0.01.ebuild 5036
-MISC ChangeLog 39282 RMD160 a20d5ae95ee43fe58cf8f5b0e1c572d454a19b8f SHA1 5ef089e69bfcb05440c4be7f75b86535d9679571 SHA256 7bd740872e402ed8edd9d1aa2a352045b089ac26f25704391234daa17890a40b
-MD5 5b740fd13b641bbd9c18629132977413 ChangeLog 39282
-RMD160 a20d5ae95ee43fe58cf8f5b0e1c572d454a19b8f ChangeLog 39282
-SHA256 7bd740872e402ed8edd9d1aa2a352045b089ac26f25704391234daa17890a40b ChangeLog 39282
+MISC ChangeLog 39413 RMD160 2b77ee7767df5553f5d4ade4b8ec4f8c4691ef13 SHA1 0fb362d031f7e4e5a9844698248bd412874107fd SHA256 3ffc8ef47cbac6482bc43732d706d8b89d0f72c0493f3579f6263695e3b0652b
+MD5 b227fe5e1f26f23ec9e8bdcae83fb63e ChangeLog 39413
+RMD160 2b77ee7767df5553f5d4ade4b8ec4f8c4691ef13 ChangeLog 39413
+SHA256 3ffc8ef47cbac6482bc43732d706d8b89d0f72c0493f3579f6263695e3b0652b ChangeLog 39413
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
 MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237
@@ -66,6 +72,9 @@ SHA256 d05c274f69904c60645c3639147b1741b3edeba807959724e8310ec9b1ea8b4b files/di
 MD5 03a3655dea58f8ecfdf9b222a82c13d1 files/digest-sun-jdk-1.5.0.11-r1 563
 RMD160 baf28f80473123c2c382cda0d6e3908a455aec27 files/digest-sun-jdk-1.5.0.11-r1 563
 SHA256 d05c274f69904c60645c3639147b1741b3edeba807959724e8310ec9b1ea8b4b files/digest-sun-jdk-1.5.0.11-r1 563
+MD5 b3ed855f254e21db31908fe33e52e40c files/digest-sun-jdk-1.5.0.12 563
+RMD160 79e7250f7ad67e1a6710e7d94c89673fd4b468dc files/digest-sun-jdk-1.5.0.12 563
+SHA256 fe20684f392de1933a60985b262579874f0843a67ce16a1c9031ce8ece643c60 files/digest-sun-jdk-1.5.0.12 563
 MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0-r1 521
 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0-r1 521
 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0-r1 521
@@ -78,7 +87,7 @@ SHA256 a3bbd6c7a23eeeab99bb3b1a4f67b9347bb4c2531b1ec4c381fd5d9d8e2ee327 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGYaVzcxLzpIGCsLQRAsjTAJ9Yh7voQHQ4R3LtXYFGfO0ZyqL70QCgmi5n
-gK3qVwGj7XZAmP23tP+x09I=
-=Caui
+iD8DBQFGbYwCcxLzpIGCsLQRAhGlAJ9Yw4SIuI4wjdavyObQKdDvIoXzHgCfQFLe
+a/kS9p4eXktLRoKQ684yl4A=
+=G0xX
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.12 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.12
new file mode 100644
index 000000000000..cb5005dff8c2
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.12
@@ -0,0 +1,6 @@
+MD5 948295f3e252670eb9328cbbc422e3a6 jdk-1_5_0_12-dlj-linux-amd64.bin 43854594
+RMD160 b9790d2cc33c7c7f749f6fd055da2b215c054dff jdk-1_5_0_12-dlj-linux-amd64.bin 43854594
+SHA256 7be91d7544ac682c28bfcad60fa7856303e70fbf8e9857a93d701553dc40c144 jdk-1_5_0_12-dlj-linux-amd64.bin 43854594
+MD5 9b0d717810953e78d5c40969e382e1ae jdk-1_5_0_12-dlj-linux-i586.bin 49646174
+RMD160 0865c93170fcf443c61a83660228cbc4a91523b9 jdk-1_5_0_12-dlj-linux-i586.bin 49646174
+SHA256 2a9b782300930a239c88e93c9c4e0c34715fb6dddb88cb82ba214dba3f4c9eb0 jdk-1_5_0_12-dlj-linux-i586.bin 49646174
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.12.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.12.ebuild
new file mode 100644
index 000000000000..1c9720a55009
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.12.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2007 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.12.ebuild,v 1.1 2007/06/11 17:52:56 betelgeuse Exp $
+
+inherit java-vm-2 eutils pax-utils
+
+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"
+
+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="
+	sys-libs/glibc
+	alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )
+	X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXp
+			x11-libs/libXt
+			x11-libs/libXtst
+		)"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+src_unpack() {
+	if [ ! -r "${DISTDIR}/${A}" ]; then
+		die "cannot read ${A}. Please check the permission and try again."
+	fi
+
+	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
+}
+
+src_install() {
+	local dirs="bin include jre lib man"
+
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	pax-mark m $(list-paxables ${S}{,/jre}/bin/*)
+
+	dodir /opt/${P}
+
+	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
+	dodoc COPYRIGHT README.html || die
+	dohtml README.html || die
+
+	cp -pP src.zip "${D}/opt/${P}/" || die
+
+	if use examples; then
+		cp -pPR demo "${D}/opt/${P}/" || die
+		cp -pPR sample "${D}/opt/${P}/" || die
+	fi
+
+	if use jce; then
+		cd ${D}/opt/${P}/jre/lib/security || die
+		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 || die
+		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar \
+			${D}/opt/${P}/jre/lib/security/strong-jce || die
+		local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/"
+		dosym ${jcedir}/US_export_policy.jar \
+			/opt/${P}/jre/lib/security/ || die
+		dosym ${jcedir}/local_policy.jar \
+			/opt/${P}/jre/lib/security/ || die
+	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
+	if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
+		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 \
+			|| die "Failed to sed .desktop file"
+
+		domenu ${T}/sun_java-${SLOT}.desktop
+	fi
+
+	# bug #56444
+	insinto /opt/${P}/jre/lib/
+	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
+
+	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 JDK 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."
+
+	echo
+	elog "Beginning with 1.5.0.10 the hotspot vm can use epoll"
+	elog "The epoll-based implementation of SelectorProvider is not selected by"
+	elog "default."
+	elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider"
+	elog ""
+	elog "Starting with 1.5.0.12 the src.zip and demos are installed to the standard"
+	elog "locations."
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
+	elog "http://java.sun.com/j2se/1.5.0/docs/tooldocs/linux/jdkfiles.html"
+	elog "for more details."
+}