Version bump.

Package-Manager: portage-2.1.2.9

4 files changed, 159 insertions, 9 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index df2a3e9660a5..e2ef411a8072 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.95 2007/06/05 05:12:52 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.96 2007/06/11 18:05:10 betelgeuse Exp $
+
+*sun-jre-bin-1.5.0.12 (11 Jun 2007)
+
+  11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +sun-jre-bin-1.5.0.12.ebuild:
+  Version bump.
 
   05 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
   sun-jre-bin-1.6.0.01-r1.ebuild:
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index c073279b3ec0..1365b6188602 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -28,6 +28,8 @@ SHA256 6fd0124892813113266857364834fb8fa9f08db9f72045e639ec0b5acdfc4c09 files/su
 DIST j2re-1_4_2_14-linux-i586.bin 14373288 RMD160 7054f23ae3a4fd304dfbb7e9c73da8462507c720 SHA1 28704686d1200cc1830a03c48452731f04603888 SHA256 1d211f9f2f34f108d9f3fde745838965b83695301d953775e60fcf8cc3c163d3
 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
@@ -40,6 +42,10 @@ EBUILD sun-jre-bin-1.5.0.11.ebuild 3743 RMD160 6e45d61f08f8c939804eff36aad635a72
 MD5 53bde28171313f1776b30f9eb67b61ee sun-jre-bin-1.5.0.11.ebuild 3743
 RMD160 6e45d61f08f8c939804eff36aad635a72e3ccfbe sun-jre-bin-1.5.0.11.ebuild 3743
 SHA256 1224cf2de33b2792738aa990f5d90b1d2f3074d75042ed84a8b2284abb358951 sun-jre-bin-1.5.0.11.ebuild 3743
+EBUILD sun-jre-bin-1.5.0.12.ebuild 3580 RMD160 d91edaea196515f1daacf2b69585453e7b09f954 SHA1 9d0459848cf35efebdc1697f93c278e52390ca8e SHA256 84c00c5da90d80d8783ea5d7675abe2fe2c208d611b39ab86762cc7c4e5811e6
+MD5 0f91420f0e6ab4476005e8ae4e2d8d3a sun-jre-bin-1.5.0.12.ebuild 3580
+RMD160 d91edaea196515f1daacf2b69585453e7b09f954 sun-jre-bin-1.5.0.12.ebuild 3580
+SHA256 84c00c5da90d80d8783ea5d7675abe2fe2c208d611b39ab86762cc7c4e5811e6 sun-jre-bin-1.5.0.12.ebuild 3580
 EBUILD sun-jre-bin-1.6.0-r1.ebuild 3789 RMD160 ba500d2819efe7a91314b7e100c5b9761093c90f SHA1 2a3862e00c68ab2bd58ecbbd13fe328290dc8438 SHA256 10822966b9f7985ff89aa3d0734e5f9b5740e8a26dffebb0423572e82c0ae0c9
 MD5 f72d4903de1492c4346aee8960dc4956 sun-jre-bin-1.6.0-r1.ebuild 3789
 RMD160 ba500d2819efe7a91314b7e100c5b9761093c90f sun-jre-bin-1.6.0-r1.ebuild 3789
@@ -52,10 +58,10 @@ EBUILD sun-jre-bin-1.6.0.01.ebuild 3737 RMD160 47ba0ab048657c491c9ce29db7d00257e
 MD5 dbdf807fda29a00dec6cb5cd03d81b39 sun-jre-bin-1.6.0.01.ebuild 3737
 RMD160 47ba0ab048657c491c9ce29db7d00257e62db755 sun-jre-bin-1.6.0.01.ebuild 3737
 SHA256 acaf313b5c8d67a3008d2acada8e75ef3b6e136f2ee9ff0846b4483826a6b760 sun-jre-bin-1.6.0.01.ebuild 3737
-MISC ChangeLog 17387 RMD160 6f5afe5a5c5f6d158880c8b890661a36ab51d380 SHA1 807538740a5999efa8c183403b199ab27c8d43c5 SHA256 5d34e65237f12c8e567d6b68658af5bb681dd1e9d4809114417607ceaa735486
-MD5 fcd181aeca366bd3ac6f23f0f44b5c63 ChangeLog 17387
-RMD160 6f5afe5a5c5f6d158880c8b890661a36ab51d380 ChangeLog 17387
-SHA256 5d34e65237f12c8e567d6b68658af5bb681dd1e9d4809114417607ceaa735486 ChangeLog 17387
+MISC ChangeLog 17531 RMD160 9ad1bb9c1c6ce41981e2fcb63b4d980b20192218 SHA1 22f2c7e53009d739deab82775dc8ec6ff6ee2851 SHA256 72026a6daa3ae10c4808308b38ed820110097ce773085ea40b9215289c03c653
+MD5 877d80fc553a54055497ea311e4a7cef ChangeLog 17531
+RMD160 9ad1bb9c1c6ce41981e2fcb63b4d980b20192218 ChangeLog 17531
+SHA256 72026a6daa3ae10c4808308b38ed820110097ce773085ea40b9215289c03c653 ChangeLog 17531
 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f
 MD5 c7683734eb61c03c450e551efa7b4d5a metadata.xml 240
 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 metadata.xml 240
@@ -66,6 +72,9 @@ SHA256 6b13dcea204a1fef7f2ff53dd6e222d2d747ee0b2b9f5d56d5a5cfd3b86207f4 files/di
 MD5 03a3655dea58f8ecfdf9b222a82c13d1 files/digest-sun-jre-bin-1.5.0.11 563
 RMD160 baf28f80473123c2c382cda0d6e3908a455aec27 files/digest-sun-jre-bin-1.5.0.11 563
 SHA256 d05c274f69904c60645c3639147b1741b3edeba807959724e8310ec9b1ea8b4b files/digest-sun-jre-bin-1.5.0.11 563
+MD5 b3ed855f254e21db31908fe33e52e40c files/digest-sun-jre-bin-1.5.0.12 563
+RMD160 79e7250f7ad67e1a6710e7d94c89673fd4b468dc files/digest-sun-jre-bin-1.5.0.12 563
+SHA256 fe20684f392de1933a60985b262579874f0843a67ce16a1c9031ce8ece643c60 files/digest-sun-jre-bin-1.5.0.12 563
 MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jre-bin-1.6.0-r1 521
 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jre-bin-1.6.0-r1 521
 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jre-bin-1.6.0-r1 521
@@ -76,9 +85,9 @@ MD5 c351694f359d60ac17fdc34f10212d9e files/digest-sun-jre-bin-1.6.0.01-r1 527
 RMD160 252605024d150447c298546438d37cafc9fcef1f files/digest-sun-jre-bin-1.6.0.01-r1 527
 SHA256 a3bbd6c7a23eeeab99bb3b1a4f67b9347bb4c2531b1ec4c381fd5d9d8e2ee327 files/digest-sun-jre-bin-1.6.0.01-r1 527
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGZPDwNQqtfCuFneMRApvLAJ0Q/8wG4yPnErIL3Wyw8Fqta9yPUQCgibTq
-kI8f9IH97yHnvZ8/Al6QDKk=
-=EsN8
+iD8DBQFGbY7gcxLzpIGCsLQRAiz/AKCTyIawwwcbp+AX0PXGtX3YARkhbwCfc4m9
+frPlJ5XNTQtwceQR/S5CrwA=
+=YqUr
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.12 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.12
new file mode 100644
index 000000000000..cb5005dff8c2
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-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-jre-bin/sun-jre-bin-1.5.0.12.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.12.ebuild
new file mode 100644
index 000000000000..10b8e3388fbe
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.12.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.12.ebuild,v 1.1 2007/06/11 18:05:10 betelgeuse Exp $
+
+inherit pax-utils eutils java-vm-2
+
+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 nsplugin"
+
+RDEPEND="
+	sys-libs/glibc
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXt
+		x11-libs/libXtst
+	)"
+
+DEPEND=""
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/libdeploy.so"
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${A} ]; then
+		die "cannot read ${A}. Please check the permission and try again."
+	fi
+
+	mkdir bundled-jdk
+	cd bundled-jdk
+	sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
+
+	cd ..
+	bash ${FILESDIR}/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+}
+
+src_install() {
+	# 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}/bin/*)
+
+	local dirs="bin lib man"
+	# only X86 has the plugin and javaws
+	use x86 && dirs="${dirs} javaws plugin"
+	dodir /opt/${P}
+
+	cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy"
+
+	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html || die
+
+	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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+		else
+			eerror "No plugin available for amd64 arch"
+		fi
+	fi
+
+	# TODO Don't think we still needs these -nichoj
+	# 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
+
+	# FIXME figure out how to handle the control pannel conflict with
+	# sun-jdk-bin
+
+	# 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}/plugin/desktop/sun_java.desktop > \
+#		${T}/sun_java-${SLOT}.desktop
+
+#	domenu ${T}/sun_java-${SLOT}.desktop
+
+	# bug #56444
+	insinto /opt/${P}/lib/
+	newins "${FILESDIR}"/fontconfig.Gentoo.properties \
+		fontconfig.properties || die
+
+	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 "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"
+}