Version bump slot 1.5. Ebuild now uses pax-utils.eclass and depends on emul-linux-x86- packages instead of the normal ones.

Package-Manager: portage-2.1.2.9

4 files changed, 132 insertions, 8 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 52bda432f0d0..843e2d06d308 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.29 2007/06/02 16:59:30 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.30 2007/06/11 18:15:28 betelgeuse Exp $
+
+*emul-linux-x86-java-1.5.0.12 (11 Jun 2007)
+
+  11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +emul-linux-x86-java-1.5.0.12.ebuild:
+  Version bump slot 1.5. Ebuild now uses pax-utils.eclass and depends on
+  emul-linux-x86- packages instead of the normal ones.
 
 *emul-linux-x86-java-1.6.0.01 (02 Jun 2007)
 
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index da0e2a00b603..221350c2bc41 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -27,6 +27,7 @@ RMD160 e87fe605d34fd6060f58f511deea5a935697be9f files/javasettings_Linux_x86.xml
 SHA256 832b7aa00beb330c655e1503061785e2069fcc1a2ec36830948613f02c4d7585 files/javasettings_Linux_x86.xml 1601
 DIST j2re-1.4.2-03-linux-i586.bin 13541431 RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 SHA1 30b37bc8dcb5617971d2ae95e2f7227359d39991 SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef
 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-i586.bin 49646174 RMD160 0865c93170fcf443c61a83660228cbc4a91523b9 SHA1 ff909ca469587ae132816868c5f201757e533ed0 SHA256 2a9b782300930a239c88e93c9c4e0c34715fb6dddb88cb82ba214dba3f4c9eb0
 DIST jdk-6-dlj-linux-i586.bin 62718862 RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac SHA1 bc7a56952b362e472a0ec179e0852ca7bf0c0507 SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467
 DIST jdk-6u1-dlj-linux-i586.sh 62818812 RMD160 2858ae3036db3315c6bbd2bd43cd05cf0af6e43e SHA1 1f35c785e810d3c0ff012c79c7ffa509eb01dae5 SHA256 1a49eaadcaf480c9eec4aa558ab7392e93b7c88b8f79f53be9a8fc03a6714ddc
 EBUILD emul-linux-x86-java-1.4.2.03-r2.ebuild 3149 RMD160 b5e0cd50d9cf33184e19e8b784dffef97263ce3b SHA1 e2dd29f4e49f2ed8fb92d453e675bb0b358c51b4 SHA256 aca891a5d3a66dde9012574993ba4ecfded64de5932eb803b3f2f9b37a116a58
@@ -37,6 +38,10 @@ EBUILD emul-linux-x86-java-1.5.0.11.ebuild 4007 RMD160 634a2b536b5cb4592601a45d8
 MD5 7505fe880ce36d0e37c03d38c3bf1dfc emul-linux-x86-java-1.5.0.11.ebuild 4007
 RMD160 634a2b536b5cb4592601a45d880f598db3e366cd emul-linux-x86-java-1.5.0.11.ebuild 4007
 SHA256 7403a882d750102fb34bb93938d6d81742affc3427de8601361a10840cd3db2f emul-linux-x86-java-1.5.0.11.ebuild 4007
+EBUILD emul-linux-x86-java-1.5.0.12.ebuild 3138 RMD160 47e5131fb99b399889df5cf47529859036ae6c06 SHA1 97a89dd22b0a9c4eb7af8d52000eb3e2ceead020 SHA256 20fb11a0b09428f72d3ea35b42122924ff5399433a440ad623126980991a034a
+MD5 af9db621c8501baabc1e44f442e80b12 emul-linux-x86-java-1.5.0.12.ebuild 3138
+RMD160 47e5131fb99b399889df5cf47529859036ae6c06 emul-linux-x86-java-1.5.0.12.ebuild 3138
+SHA256 20fb11a0b09428f72d3ea35b42122924ff5399433a440ad623126980991a034a emul-linux-x86-java-1.5.0.12.ebuild 3138
 EBUILD emul-linux-x86-java-1.6.0-r1.ebuild 2860 RMD160 88c2159ece2fdd328ca0b7ae2f2c64427a4a46e5 SHA1 5d66da3f3e4cc7906553fd2f3293863e51dfbae9 SHA256 82681168a1460fa1e9c977418ef8dd10960897b48e89cd232047515d77f6561c
 MD5 47b14108a1d3cc32ba4c4508dd115252 emul-linux-x86-java-1.6.0-r1.ebuild 2860
 RMD160 88c2159ece2fdd328ca0b7ae2f2c64427a4a46e5 emul-linux-x86-java-1.6.0-r1.ebuild 2860
@@ -49,10 +54,10 @@ EBUILD emul-linux-x86-java-1.6.0.ebuild 3714 RMD160 28c3092cc930ab5101d07f18ed57
 MD5 6a7c2c1b0bf52d52a3f5146f27c11aaa emul-linux-x86-java-1.6.0.ebuild 3714
 RMD160 28c3092cc930ab5101d07f18ed579b069728c33a emul-linux-x86-java-1.6.0.ebuild 3714
 SHA256 e9cd04ef4df8d93c3ac85d3705668c15c53589ecc9041646739db628cc4b6a72 emul-linux-x86-java-1.6.0.ebuild 3714
-MISC ChangeLog 5633 RMD160 3031285f85e51d8a9a37401dbbc7bcf363c43fb3 SHA1 dfe52d59676d5c73abb5f9011c9758fca648f48a SHA256 0a116b7b4080b5027181b8480ddd63e56e3b9d9b4905dbf0a10986ee4c1a4a36
-MD5 928a53aa283229d329be3d6813fd47bb ChangeLog 5633
-RMD160 3031285f85e51d8a9a37401dbbc7bcf363c43fb3 ChangeLog 5633
-SHA256 0a116b7b4080b5027181b8480ddd63e56e3b9d9b4905dbf0a10986ee4c1a4a36 ChangeLog 5633
+MISC ChangeLog 5900 RMD160 75f761847a1bcf98d5a1f91744790390bdec4589 SHA1 55712f400a7be76fed4dd46ef951468c9bac03f7 SHA256 1f60caadf21a2669f6e5c42675a6628a9e318e23b674942d83efbe523157865c
+MD5 375dbca084eec6e4e66d14e8bc1f6e6c ChangeLog 5900
+RMD160 75f761847a1bcf98d5a1f91744790390bdec4589 ChangeLog 5900
+SHA256 1f60caadf21a2669f6e5c42675a6628a9e318e23b674942d83efbe523157865c ChangeLog 5900
 MISC metadata.xml 242 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 SHA1 fd426af5f6d4efa0adf65aded927fd242e6fdf26 SHA256 df247383374651f561e9833633c2d533fe78ede8430186e2017e6f54452afaa4
 MD5 6d8e6f3e73af8b455f7cc0ecbdfc7015 metadata.xml 242
 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 metadata.xml 242
@@ -63,6 +68,9 @@ SHA256 6789ba158a0706630e8bc169dc0242f9639582c9b73cf01ae4840c862f6140b1 files/di
 MD5 ab159652e4126c0070640bec7ba9e05f files/digest-emul-linux-x86-java-1.5.0.11 280
 RMD160 2c4fc8a7626a73fc519c7a15952fcdb4ba615b96 files/digest-emul-linux-x86-java-1.5.0.11 280
 SHA256 d45f41801f33a45e20fcd5d142301f5ab50e31d8964f7aafa1af837c3bde052f files/digest-emul-linux-x86-java-1.5.0.11 280
+MD5 0d96221fc33f680529da21231473fd01 files/digest-emul-linux-x86-java-1.5.0.12 280
+RMD160 ae7dbe5d2a37e6717924e67b5a46d3dd94245983 files/digest-emul-linux-x86-java-1.5.0.12 280
+SHA256 c1f2ae4e1b177f5c22ac2816f61303fd5da311b0aca7ff9b8165b78cd2046e1c files/digest-emul-linux-x86-java-1.5.0.12 280
 MD5 35eac157f9b69bbbd07333c5a6a3f922 files/digest-emul-linux-x86-java-1.6.0 259
 RMD160 1451526c43309c014d81ea9645251f568208a9b5 files/digest-emul-linux-x86-java-1.6.0 259
 SHA256 7bfbfcb961d132341e65eaf06b2fbf36ed8d1387b0fbaa35f160ffc2fb217abe files/digest-emul-linux-x86-java-1.6.0 259
@@ -75,7 +83,7 @@ SHA256 fe1e16a4b9463816e66b784e86c765b5d82f820be11867939e78daf7fc49a1b9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGYaH7cxLzpIGCsLQRAvGVAKCLtHJ8UyMjLm6tnpsEbFckRtmzFQCgmaQH
-LwKZlIO+ZRo/XtP+kx0BSN8=
-=W4Qh
+iD4DBQFGbZFFcxLzpIGCsLQRApxqAJjRfQVPrSdTALZ/Jxio3mzb/tmvAJ9ysFsp
+f3hg3vwjC3FFA5P1smzd3A==
+=lBa+
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.12.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.12.ebuild
new file mode 100644
index 000000000000..ee1159128b94
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.12.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.12.ebuild,v 1.1 2007/06/11 18:15:28 betelgeuse Exp $
+
+inherit pax-utils eutils java-vm-2
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+
+At="jdk-${MY_PVA}-dlj-linux-i586.bin"
+DESCRIPTION="32bit version Sun's J2SE Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
+SRC_URI="http://download.java.net/dlj/binaries/${At}"
+
+SLOT="1.5"
+LICENSE="dlj-1.1"
+KEYWORDS="-* ~amd64"
+RESTRICT="nostrip"
+IUSE="X alsa nsplugin"
+
+JAVA_VM_NO_GENERATION1=true
+
+RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
+	X? ( app-emulation/emul-linux-x86-xlibs )"
+
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/libdeploy.so"
+
+src_unpack() {
+	if [[ ! -r ${DISTDIR}/${At} ]]; then
+		die "cannot read ${At}. Please check the permission and try again."
+	fi
+
+	mkdir bundled-jdk
+	cd bundled-jdk
+	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
+
+	cd ..
+	bash ${FILESDIR}/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+
+	${S}/bin/java -client -Xshare:dump
+}
+
+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/*)
+
+	dodir /opt/${P}
+	cp -pPR bin lib man javaws plugin "${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
+
+		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+	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
+
+	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"
+}
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.12 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.12
new file mode 100644
index 000000000000..363619dea9fb
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.5.0.12
@@ -0,0 +1,3 @@
+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