Version bump, bug #205772. Also fix BOOTCLASSPATH for 1.5 - bug #206069.

Package-Manager: portage-2.1.4

7 files changed, 269 insertions, 12 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index bf39b860a977..6cb31338378a 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.116 2007/12/16 21:08:51 caster Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.117 2008/01/18 15:05:13 caster Exp $
+
+*sun-jre-bin-1.6.0.04 (18 Jan 2008)
+*sun-jre-bin-1.5.0.14 (18 Jan 2008)
+
+  18 Jan 2008; Vlastimil Babka <caster@gentoo.org>
+  files/sun-jre-bin-1.5.env, +sun-jre-bin-1.5.0.14.ebuild,
+  +sun-jre-bin-1.6.0.04.ebuild:
+  Version bump, bug #205772. Also fix BOOTCLASSPATH for 1.5 - bug #206069.
 
   16 Dec 2007; Vlastimil Babka <caster@gentoo.org>
   sun-jre-bin-1.4.2.16.ebuild, sun-jre-bin-1.5.0.13.ebuild,
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 81926019a67d..e0a08006198b 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -14,10 +14,10 @@ AUX sun-jre-bin-1.4.env 854 RMD160 c473374bfcd3f9fc31b8946f9bccbc9c843ae258 SHA1
 MD5 479876d6b33c37a08244f6b43a084104 files/sun-jre-bin-1.4.env 854
 RMD160 c473374bfcd3f9fc31b8946f9bccbc9c843ae258 files/sun-jre-bin-1.4.env 854
 SHA256 8f504d30eeb00f2bd3a1fe35a56448c1784143b51e9875c9e2692117a7fafcae files/sun-jre-bin-1.4.env 854
-AUX sun-jre-bin-1.5.env 852 RMD160 7ef7c7692279324de8e22c4b68f729e27134590a SHA1 648b753ada568f501a6b1905206bbbae6b046323 SHA256 c8557635c09c381cf1eb3e23619c5bfd01c06f062364ac49cdbef36d567bb34e
-MD5 30d56311fb1996c78266a43da718a4e9 files/sun-jre-bin-1.5.env 852
-RMD160 7ef7c7692279324de8e22c4b68f729e27134590a files/sun-jre-bin-1.5.env 852
-SHA256 c8557635c09c381cf1eb3e23619c5bfd01c06f062364ac49cdbef36d567bb34e files/sun-jre-bin-1.5.env 852
+AUX sun-jre-bin-1.5.env 794 RMD160 8354353bc23c7148c5bd73d0c7bf958123378e46 SHA1 09301d835309d81f20270ebe90b6a02efd2f3aea SHA256 a7007ac6473f00040646f34caa870195056acd994ef86a2b627f9658c1986a22
+MD5 6e503972c560f3d88df54a281403c144 files/sun-jre-bin-1.5.env 794
+RMD160 8354353bc23c7148c5bd73d0c7bf958123378e46 files/sun-jre-bin-1.5.env 794
+SHA256 a7007ac6473f00040646f34caa870195056acd994ef86a2b627f9658c1986a22 files/sun-jre-bin-1.5.env 794
 AUX sun-jre-bin-1.6.env 891 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 SHA1 1e431f6a7990c4c0684e95a73da32e132183331b SHA256 6fd0124892813113266857364834fb8fa9f08db9f72045e639ec0b5acdfc4c09
 MD5 27f75fd381ee6bd36aa37f540323185b files/sun-jre-bin-1.6.env 891
 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 files/sun-jre-bin-1.6.env 891
@@ -25,8 +25,12 @@ SHA256 6fd0124892813113266857364834fb8fa9f08db9f72045e639ec0b5acdfc4c09 files/su
 DIST j2re-1_4_2_16-linux-i586.bin 14388621 RMD160 46885501b413a73a08f50695c335e11291389376 SHA1 7abc5f9354bc00109766f8f6302e39c4da938bcb SHA256 9293d00a35b31e7f78f6338ead3a811d2732290b90a3711814ee64cea5842045
 DIST jdk-1_5_0_13-dlj-linux-amd64.bin 43857474 RMD160 704650919656ea6d4e3578966cb4252fccdd5ae7 SHA1 ec371ec74c8d0c822979b25d49765999d0fae320 SHA256 c74786b2420f498505ec5858e6e64727f401846e58fff249f3ded42ac0845114
 DIST jdk-1_5_0_13-dlj-linux-i586.bin 49672592 RMD160 cf0ff373451612348ac54c9e78a0a57d7f5efbed SHA1 a025d81df269ed6ce663a34f52e5f0ea2a462bf2 SHA256 6836f531f5dedb94f680d8dd59d349f5f50aa42ca887ae7f4bc664437ac2a9b0
+DIST jdk-5.0u14-dlj-linux-amd64.bin 44056532 RMD160 a72c69e76978a3ddb1f790c229a50d49c38d97b1 SHA1 a3b834cbdfb4085563c62e0916905f9810c9f695 SHA256 3828f14faec58ebdb5210f41c301133fe029eb9563e47d0ee3dc2cefd94adedb
+DIST jdk-5.0u14-dlj-linux-i586.bin 49671645 RMD160 4f231302093d6f455a2e020a3e2114c7c8a3bc93 SHA1 1f4cb6428170f6fe3d202377cc3913485fc01b92 SHA256 d07373644f766602a7f0b7979ffdc4e9d704066c3be5562a360275d93b7fc7e5
 DIST jdk-6u3-dlj-linux-amd64.bin 62180680 RMD160 7d305e714446a4a4345f1c638895542431d402fe SHA1 aca236ed64fc6735d303c57e13cc9f67a6ac11be SHA256 8bc80ea1bf739674c1cacdfba9987a4d15adb54f4b1462a0b48b79815f56b311
 DIST jdk-6u3-dlj-linux-i586.bin 68613151 RMD160 ba3ea6eb67f72f76f33f091633f8ac049d18b24c SHA1 86ba73cdcc2c22782a04b8191f157a5ac7caa490 SHA256 5c44208fbd5f90b3e6a0692ed9e1e98f5feb0c88aa0cfae5186dddb1f05f731b
+DIST jdk-6u4-dlj-linux-amd64.bin 63716237 RMD160 63178b299d4c6721c8d3c447764e5a5cd6d9d865 SHA1 00afdbbc6b0b60de6b03d2f37710bb86f8e6760c SHA256 be0e21402a79c5b6cd6c96d34451bcc365619cd063930f3ca1c1abe2ee5dbf43
+DIST jdk-6u4-dlj-linux-i586.bin 70455896 RMD160 3300edb3fb5e3ac4e32781ee7bc8cc6273b7c76d SHA1 24601838ae7216cbc5d75170b6aebf5e4012dec1 SHA256 955186f497a50106cd1788fcaf032eedc560985826c8a6c3cb7ab43220cad23c
 EBUILD sun-jre-bin-1.4.2.16.ebuild 3516 RMD160 090e825f7c79253d03b98987fc67651b74e5728b SHA1 fcf5b0997f1d0fe459876c6114c3fcee624bff75 SHA256 1e21f96e6ad294d23ae928dc240c6d23190b65a0a30b9b76782bf3f2762448ea
 MD5 8172205ee2ebe8da09054301d146c984 sun-jre-bin-1.4.2.16.ebuild 3516
 RMD160 090e825f7c79253d03b98987fc67651b74e5728b sun-jre-bin-1.4.2.16.ebuild 3516
@@ -35,14 +39,22 @@ EBUILD sun-jre-bin-1.5.0.13.ebuild 2927 RMD160 3f0f02a42472000ff42730390cab62cbc
 MD5 baa531bb0d5b2825eed9223cddbf7e2d sun-jre-bin-1.5.0.13.ebuild 2927
 RMD160 3f0f02a42472000ff42730390cab62cbc45baf20 sun-jre-bin-1.5.0.13.ebuild 2927
 SHA256 a48f94092841517f1864e4b708f8237e8ecd67214ea9ee2c3ba0cede9bfafeec sun-jre-bin-1.5.0.13.ebuild 2927
+EBUILD sun-jre-bin-1.5.0.14.ebuild 2961 RMD160 e1eb04a45e3f5e0a528b5d877ad2e146f2d54fa0 SHA1 f3e3664bc2c70187bc9d070e3538a07f62ca81c5 SHA256 ec341e1300ba12c367509ab1bb55f3085f3bb25097af379216ee6456b6d2dbad
+MD5 1f2b1938f7f68e768906626ebc8a5f52 sun-jre-bin-1.5.0.14.ebuild 2961
+RMD160 e1eb04a45e3f5e0a528b5d877ad2e146f2d54fa0 sun-jre-bin-1.5.0.14.ebuild 2961
+SHA256 ec341e1300ba12c367509ab1bb55f3085f3bb25097af379216ee6456b6d2dbad sun-jre-bin-1.5.0.14.ebuild 2961
 EBUILD sun-jre-bin-1.6.0.03.ebuild 3395 RMD160 fb96a01f1c397487f09192ca3469c8cd5bed3382 SHA1 ae43e170e53882de2afe0399df929426cf08150b SHA256 6db5395e05fec09039326d644a3109c89316b5947e2e25c021f9216fc8140fc4
 MD5 c50e90f9a508e63f62da5449b5052971 sun-jre-bin-1.6.0.03.ebuild 3395
 RMD160 fb96a01f1c397487f09192ca3469c8cd5bed3382 sun-jre-bin-1.6.0.03.ebuild 3395
 SHA256 6db5395e05fec09039326d644a3109c89316b5947e2e25c021f9216fc8140fc4 sun-jre-bin-1.6.0.03.ebuild 3395
-MISC ChangeLog 20891 RMD160 b254a2977cd63374b66d8467c2fc4510c1baaf13 SHA1 858a1bf78fa757e6992d1e0ed5224352994114d7 SHA256 d666656905aadbb22f8ab3f81ad2b359408e04b2ae937794bee822afb1154be0
-MD5 dd08d2ec02572e2e9c15628c40f047be ChangeLog 20891
-RMD160 b254a2977cd63374b66d8467c2fc4510c1baaf13 ChangeLog 20891
-SHA256 d666656905aadbb22f8ab3f81ad2b359408e04b2ae937794bee822afb1154be0 ChangeLog 20891
+EBUILD sun-jre-bin-1.6.0.04.ebuild 3168 RMD160 83960240c751686cb1b56d865e4cb355464126dd SHA1 d61da1cd3249b507e048243f70259070181b9645 SHA256 d87193729f1d2757e8e7fd40ad3ea752cd715048163d61ac9f0b51ffdbd4b763
+MD5 b53784dd01149780c072c2cf9edb7395 sun-jre-bin-1.6.0.04.ebuild 3168
+RMD160 83960240c751686cb1b56d865e4cb355464126dd sun-jre-bin-1.6.0.04.ebuild 3168
+SHA256 d87193729f1d2757e8e7fd40ad3ea752cd715048163d61ac9f0b51ffdbd4b763 sun-jre-bin-1.6.0.04.ebuild 3168
+MISC ChangeLog 21182 RMD160 da6a3a091fe3c805c66e84df4e0c1f7d17de17ed SHA1 f9cb223bcc724c33d0c93343f77dc81db0130877 SHA256 78daf8c5b17fc2e762137e65f5a9f7d60f8e04913e3e1f04487b472d1673d207
+MD5 c407c189d67aff7d6d9094d06116ea1f ChangeLog 21182
+RMD160 da6a3a091fe3c805c66e84df4e0c1f7d17de17ed ChangeLog 21182
+SHA256 78daf8c5b17fc2e762137e65f5a9f7d60f8e04913e3e1f04487b472d1673d207 ChangeLog 21182
 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f
 MD5 c7683734eb61c03c450e551efa7b4d5a metadata.xml 240
 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 metadata.xml 240
@@ -53,6 +65,12 @@ SHA256 119eda052e74aff940a1efb9244a593dae5419e9b464105c05a4a10267e35ba5 files/di
 MD5 7ba1bd262fc370c80586daff290ce586 files/digest-sun-jre-bin-1.5.0.13 563
 RMD160 2786cfd600f206dd83b3942d53bc66103f3a467a files/digest-sun-jre-bin-1.5.0.13 563
 SHA256 49b80b8f1ffe8c970dac5037bf1aabf40a252c02a57ad32307a0826e5893347f files/digest-sun-jre-bin-1.5.0.13 563
+MD5 8173834080f0dbb744e4c91918d6e6f4 files/digest-sun-jre-bin-1.5.0.14 551
+RMD160 b4a223f03282f7fda9f45db55cb606dd80e424be files/digest-sun-jre-bin-1.5.0.14 551
+SHA256 0e8cf00670b95f6df3da18594859aa6795a244a18962f5078f193338d9777c01 files/digest-sun-jre-bin-1.5.0.14 551
 MD5 e32d749add185cabff21e77fb7371ace files/digest-sun-jre-bin-1.6.0.03 533
 RMD160 a0008d28e74f3da4d8c9ad983451338a503dc3d1 files/digest-sun-jre-bin-1.6.0.03 533
 SHA256 0f4601a072ae2e18ee4dbf3c8ff895e0f85129928a6eb81bc18ad9e5e5a39dcd files/digest-sun-jre-bin-1.6.0.03 533
+MD5 1b6e344073e410e524ec0819b62aefbb files/digest-sun-jre-bin-1.6.0.04 533
+RMD160 a2c1533b95fde302e3df4426f05d6b43b279394d files/digest-sun-jre-bin-1.6.0.04 533
+SHA256 14634c9e60bd849578c3f433f8d3694fdeb37e134912d7b678f122faa0769c71 files/digest-sun-jre-bin-1.6.0.04 533
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.14 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.14
new file mode 100644
index 000000000000..79b2e1016262
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.14
@@ -0,0 +1,6 @@
+MD5 d0e84c3df21915362f1c506c75a52ee5 jdk-5.0u14-dlj-linux-amd64.bin 44056532
+RMD160 a72c69e76978a3ddb1f790c229a50d49c38d97b1 jdk-5.0u14-dlj-linux-amd64.bin 44056532
+SHA256 3828f14faec58ebdb5210f41c301133fe029eb9563e47d0ee3dc2cefd94adedb jdk-5.0u14-dlj-linux-amd64.bin 44056532
+MD5 74c136f5c02d669beca2f66922145b5d jdk-5.0u14-dlj-linux-i586.bin 49671645
+RMD160 4f231302093d6f455a2e020a3e2114c7c8a3bc93 jdk-5.0u14-dlj-linux-i586.bin 49671645
+SHA256 d07373644f766602a7f0b7979ffdc4e9d704066c3be5562a360275d93b7fc7e5 jdk-5.0u14-dlj-linux-i586.bin 49671645
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.04 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.04
new file mode 100644
index 000000000000..87433ffe7f39
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0.04
@@ -0,0 +1,6 @@
+MD5 f64a636c6e516992fd1840c5b2419b53 jdk-6u4-dlj-linux-amd64.bin 63716237
+RMD160 63178b299d4c6721c8d3c447764e5a5cd6d9d865 jdk-6u4-dlj-linux-amd64.bin 63716237
+SHA256 be0e21402a79c5b6cd6c96d34451bcc365619cd063930f3ca1c1abe2ee5dbf43 jdk-6u4-dlj-linux-amd64.bin 63716237
+MD5 d5bba61ea1e0b76090b855ff49ec1d6a jdk-6u4-dlj-linux-i586.bin 70455896
+RMD160 3300edb3fb5e3ac4e32781ee7bc8cc6273b7c76d jdk-6u4-dlj-linux-i586.bin 70455896
+SHA256 955186f497a50106cd1788fcaf032eedc560985826c8a6c3cb7ab43220cad23c jdk-6u4-dlj-linux-i586.bin 70455896
diff --git a/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.env b/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.env
index b9bd34d16efb..d4582f460222 100644
--- a/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.env
+++ b/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.env
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.env,v 1.1 2006/06/25 20:01:38 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/files/sun-jre-bin-1.5.env,v 1.2 2008/01/18 15:05:14 caster Exp $
 
 VERSION="Sun JRE @PV@"
 JAVA_HOME=/opt/@P@
@@ -11,6 +11,6 @@ LDPATH="${JAVA_HOME}/lib/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/native_threads/
 MANPATH="/opt/@P@/man"
 PROVIDES_TYPE="JRE"
 PROVIDES_VERSION="1.5"
-BOOTCLASSPATH="${JAVA_HOME}/lib/rt.jar:${JAVA_HOME}/lib/i18n.jar:${JAVA_HOME}/lib/sunrsasign.jar:${JAVA_HOME}/lib/jsse.jar:${JAVA_HOME}/lib/jce.jar:${JAVA_HOME}/lib/charsets.jar"
+BOOTCLASSPATH="${JAVA_HOME}/lib/rt.jar:${JAVA_HOME}/lib/jsse.jar:${JAVA_HOME}/lib/jce.jar:${JAVA_HOME}/lib/charsets.jar"
 GENERATION="2"
 ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.14.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.14.ebuild
new file mode 100644
index 000000000000..5f0d31d52867
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.14.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2008 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.14.ebuild,v 1.1 2008/01/18 15:05:13 caster Exp $
+
+inherit pax-utils versionator eutils java-vm-2
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2-3)u${UPDATE}"
+
+X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin"
+
+DESCRIPTION="Sun's J2SE Runtime Environment, version ${SLOT}"
+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="strip"
+IUSE="X alsa nsplugin odbc"
+
+RDEPEND="sys-libs/glibc
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		x11-libs/libXt
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
+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() {
+	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
+
+	# 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
+	java-vm_revdep-mask
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	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"
+}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.04.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.04.ebuild
new file mode 100644
index 000000000000..b8bb670c9b2e
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.04.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2008 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.6.0.04.ebuild,v 1.1 2008/01/18 15:05:13 caster Exp $
+
+inherit versionator pax-utils eutils java-vm-2
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+
+SUFFIX=".bin"
+X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}"
+AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}"
+
+DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
+HOMEPAGE="http://java.sun.com/javase/6/"
+URL_BASE="http://download.java.net/dlj/binaries"
+SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
+		amd64? ( ${URL_BASE}/${AMD64_AT} )"
+SLOT="1.6"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+IUSE="X alsa nsplugin odbc"
+
+RDEPEND="sys-libs/glibc
+	x86? ( =virtual/libstdc++-3.3 )
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		amd64? ( x11-libs/libXt )
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
+DEPEND=""
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/libdeploy.so
+	opt/${P}/lib/i386/server/libjvm.so"
+
+src_unpack() {
+	mkdir bundled-jdk
+	cd bundled-jdk
+	sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack"
+
+	cd ..
+	bash "${FILESDIR}/construct-1.6.sh"  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+}
+
+src_install() {
+	local dirs="bin 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}"/bin/*)
+
+	# 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 README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html || die
+	dodir /opt/${P}/share/
+
+	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
+
+	# install control panel for Gnome/KDE
+	if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then
+		sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
+			-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
+			-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
+			"${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
+			"${T}/sun_jre-${SLOT}.desktop" || die
+		domenu "${T}/sun_jre-${SLOT}.desktop" || die
+	fi
+
+	# bug #56444
+	insinto /opt/${P}/lib/
+	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
+
+	set_java_env
+	java-vm_revdep-mask
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	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"
+}