Revisions bump to make sure these aren\'t available to java-config-1. java-config-1 is only used for generation-1 system vm, which must be a JDK.

Package-Manager: portage-2.1.1_pre5-r3

6 files changed, 369 insertions, 6 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 0aca94393053..3dadf9cc8301 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.53 2006/08/17 20:43:47 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.54 2006/08/25 16:37:02 nichoj Exp $
+
+*sun-jre-bin-1.5.0.08-r1 (25 Aug 2006)
+*sun-jre-bin-1.4.2.12-r1 (25 Aug 2006)
+
+  25 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+  +sun-jre-bin-1.4.2.12-r1.ebuild, +sun-jre-bin-1.5.0.08-r1.ebuild:
+  Revisions bump to make sure these aren't available to java-config-1.
+  java-config-1 is only used for generation-1 system vm, which must be a JDK.
 
   17 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
   sun-jre-bin-1.5.0.08.ebuild:
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 8d2ef8febc42..964a343057df 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -19,7 +19,7 @@ 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
 DIST j2re-1_4_2_10-linux-i586.bin 14417572 RMD160 fab835b3469e4a38adfd24312ebc0a6995639921 SHA1 abfa629993ede920a5db87a583b98cf64c229daf SHA256 832e50175e797c18602ae30ef4499fcf3e9002d9f317d8718b1d26512e6c51ac
-DIST j2re-1_4_2_12-linux-i586.bin 14339018 RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f
+DIST j2re-1_4_2_12-linux-i586.bin 14339018 RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 SHA1 18631914aeff51fcd89d226dbe3396ea91d21408 SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f
 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 jre-1_5_0_06-linux-amd64.bin 16403250 RMD160 4309c9805c9595587e385bcfe951c693609b8560 SHA1 19b55fb7a0133ef8347741bcd6eb83d88ae266dd SHA256 3caff8426bb55fa6f3e40738a537b9351ef5f38c5a50b1f5ac6756b16f4bcfee
@@ -34,6 +34,10 @@ EBUILD sun-jre-bin-1.4.2.10.ebuild 5238 RMD160 c792f8baa8602b7d86679df163f6e69d5
 MD5 5db1f52645c8f51a7a7852fb3002c12d sun-jre-bin-1.4.2.10.ebuild 5238
 RMD160 c792f8baa8602b7d86679df163f6e69d50d727eb sun-jre-bin-1.4.2.10.ebuild 5238
 SHA256 6e08907d4ce855d2bdd6e1e230ba51dcba2b52fc529202201283affb39845251 sun-jre-bin-1.4.2.10.ebuild 5238
+EBUILD sun-jre-bin-1.4.2.12-r1.ebuild 4933 RMD160 96f849e71cee4930946751838435c1d01a9bec50 SHA1 06fd7378c5e8345e3b190ac397cedf0469710686 SHA256 b0bd1b5d6c1ec758840c14f2881bccbd387bc12f993a81bba1100aa9e546a971
+MD5 b9a374b237f14701baa831803955b51a sun-jre-bin-1.4.2.12-r1.ebuild 4933
+RMD160 96f849e71cee4930946751838435c1d01a9bec50 sun-jre-bin-1.4.2.12-r1.ebuild 4933
+SHA256 b0bd1b5d6c1ec758840c14f2881bccbd387bc12f993a81bba1100aa9e546a971 sun-jre-bin-1.4.2.12-r1.ebuild 4933
 EBUILD sun-jre-bin-1.4.2.12.ebuild 4799 RMD160 eda0fcf60bf2ec07b5f0de383bfe7a9081792948 SHA1 56032178b1ae9eca899b4d8aa65ec4faacdeea25 SHA256 e468b677748574db0439a4dc02ec4dce720e37cb4dcdcf47852c944aaf6647ff
 MD5 8e52996f18e5a7eac3399d9692ff9c2e sun-jre-bin-1.4.2.12.ebuild 4799
 RMD160 eda0fcf60bf2ec07b5f0de383bfe7a9081792948 sun-jre-bin-1.4.2.12.ebuild 4799
@@ -50,14 +54,18 @@ EBUILD sun-jre-bin-1.5.0.07.ebuild 5591 RMD160 f7103d57786fd1b9459cd851e1f544270
 MD5 b1245b9cb2f99ac50c1e8f21d9f140c6 sun-jre-bin-1.5.0.07.ebuild 5591
 RMD160 f7103d57786fd1b9459cd851e1f5442705d4fdf8 sun-jre-bin-1.5.0.07.ebuild 5591
 SHA256 9ccc02375aab8983f6898ae1e56c1bc051fee1d251b6fc82edc1cd204b9a1549 sun-jre-bin-1.5.0.07.ebuild 5591
+EBUILD sun-jre-bin-1.5.0.08-r1.ebuild 4697 RMD160 b55ec282be6ca047af6f54212a3d699d7d06d436 SHA1 e868fe3111089696332a40b04e81cd55d62fdddf SHA256 fd5f2dfedbf6684c95b0878f62f4490e73211f97564035c82f470a76b98aea30
+MD5 0deff3570f0c467b57a6eabda50a5dcd sun-jre-bin-1.5.0.08-r1.ebuild 4697
+RMD160 b55ec282be6ca047af6f54212a3d699d7d06d436 sun-jre-bin-1.5.0.08-r1.ebuild 4697
+SHA256 fd5f2dfedbf6684c95b0878f62f4490e73211f97564035c82f470a76b98aea30 sun-jre-bin-1.5.0.08-r1.ebuild 4697
 EBUILD sun-jre-bin-1.5.0.08.ebuild 4561 RMD160 f76c0005b56646f76a846449ccea6ff281fc9fcb SHA1 864806b2714c0e84d42049be984dc959fdbe50e7 SHA256 ecc79e419129d65122fc203e9c2744c0a9846fa9c90c1ab82f7c19a91718a031
 MD5 a5e31bfa288f7d3e78b5680b3989a52a sun-jre-bin-1.5.0.08.ebuild 4561
 RMD160 f76c0005b56646f76a846449ccea6ff281fc9fcb sun-jre-bin-1.5.0.08.ebuild 4561
 SHA256 ecc79e419129d65122fc203e9c2744c0a9846fa9c90c1ab82f7c19a91718a031 sun-jre-bin-1.5.0.08.ebuild 4561
-MISC ChangeLog 10149 RMD160 148f06cc9a80d7b1d30058813b0d20e67a884d18 SHA1 7802e844271031a493c85b534ea81eedccc0ec06 SHA256 8318553877657cf907308e925cdb439d2c4a1e831f4d633120c98e96614d90fd
-MD5 8cbb5195a5ece303b9f79a7ba30ec301 ChangeLog 10149
-RMD160 148f06cc9a80d7b1d30058813b0d20e67a884d18 ChangeLog 10149
-SHA256 8318553877657cf907308e925cdb439d2c4a1e831f4d633120c98e96614d90fd ChangeLog 10149
+MISC ChangeLog 10496 RMD160 0e420911f024553842fe4cc824301ed090ee79d9 SHA1 f0ce23567032f58f1ae2a01439739334841081f8 SHA256 2cb1a48427affc2746643e0c27409118f885bdc2b2fc20019ed1a608b7d8f741
+MD5 f83e90f080b6be5613b57cc0b8d57790 ChangeLog 10496
+RMD160 0e420911f024553842fe4cc824301ed090ee79d9 ChangeLog 10496
+SHA256 2cb1a48427affc2746643e0c27409118f885bdc2b2fc20019ed1a608b7d8f741 ChangeLog 10496
 MISC metadata.xml 242 RMD160 b334d6a9cb5f410f7b422482586264e8ca3d7d0f SHA1 f203abfda28c6fbc87ba71a4a53af5459ff83236 SHA256 8a5ff51f49458f906fc5b494530b268982044b68bbbd85ff646757b88c9e350d
 MD5 ca35f917561afc166491d77810b71095 metadata.xml 242
 RMD160 b334d6a9cb5f410f7b422482586264e8ca3d7d0f metadata.xml 242
@@ -71,6 +79,9 @@ SHA256 441d20feed468696d5129d21bfedd9b408e0584b9d235fb2b145a76c825a001b files/di
 MD5 7d9a0bb012c6f7004240891b62a9d03e files/digest-sun-jre-bin-1.4.2.12 542
 RMD160 f6ff299e938d169ac154e1722ab09806a5a16d39 files/digest-sun-jre-bin-1.4.2.12 542
 SHA256 125ca5696a4be1c54b2581f68499accc3a360117fdfc177d33544f42d7cab8b0 files/digest-sun-jre-bin-1.4.2.12 542
+MD5 7d9a0bb012c6f7004240891b62a9d03e files/digest-sun-jre-bin-1.4.2.12-r1 542
+RMD160 f6ff299e938d169ac154e1722ab09806a5a16d39 files/digest-sun-jre-bin-1.4.2.12-r1 542
+SHA256 125ca5696a4be1c54b2581f68499accc3a360117fdfc177d33544f42d7cab8b0 files/digest-sun-jre-bin-1.4.2.12-r1 542
 MD5 575297db348a3e09371ab435ebddbea0 files/digest-sun-jre-bin-1.5.0.06 539
 RMD160 805a47eeb2ff25e53606c13cdd774db8a8b3b601 files/digest-sun-jre-bin-1.5.0.06 539
 SHA256 631931544e94f62bfa7526e9ac1a7c24ac3724f94f650989138b15867b780e8f files/digest-sun-jre-bin-1.5.0.06 539
@@ -83,3 +94,6 @@ SHA256 2658a92eae032064944213718691190cdfeb0418c48f258c9827bdd4e1185b3f files/di
 MD5 20fa891f2c9e4953c1da7d1c318d3216 files/digest-sun-jre-bin-1.5.0.08 563
 RMD160 59f63ab1ef5f3a40c10ccd954d1cfa2ca47f4e15 files/digest-sun-jre-bin-1.5.0.08 563
 SHA256 36ee47fae9d203d6e249bd407da3fd700d2d4f672a258285010f1a44f38ea0b8 files/digest-sun-jre-bin-1.5.0.08 563
+MD5 20fa891f2c9e4953c1da7d1c318d3216 files/digest-sun-jre-bin-1.5.0.08-r1 563
+RMD160 59f63ab1ef5f3a40c10ccd954d1cfa2ca47f4e15 files/digest-sun-jre-bin-1.5.0.08-r1 563
+SHA256 36ee47fae9d203d6e249bd407da3fd700d2d4f672a258285010f1a44f38ea0b8 files/digest-sun-jre-bin-1.5.0.08-r1 563
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.12-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.12-r1
new file mode 100644
index 000000000000..69f486c72f02
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.12-r1
@@ -0,0 +1,6 @@
+MD5 1df6655d341c736d8e3845d920612420 j2re-1_4_2_12-linux-i586.bin 14339018
+RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 j2re-1_4_2_12-linux-i586.bin 14339018
+SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f j2re-1_4_2_12-linux-i586.bin 14339018
+MD5 1df6655d341c736d8e3845d920612420 j2re-1_4_2_12-linux-i586.bin 14339018
+RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 j2re-1_4_2_12-linux-i586.bin 14339018
+SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f j2re-1_4_2_12-linux-i586.bin 14339018
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.08-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.08-r1
new file mode 100644
index 000000000000..89b29a996b47
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.08-r1
@@ -0,0 +1,6 @@
+MD5 e6388e30448ffd7ccaaca3cfc0708e44 jdk-1_5_0_08-dlj-linux-amd64.bin 43854617
+RMD160 c6669cba980b9097c6921041ee3af8753587ea37 jdk-1_5_0_08-dlj-linux-amd64.bin 43854617
+SHA256 a4a4baa5488c7be8b109ed6c1f460a8b30861ae546c050c319de41e987bc857f jdk-1_5_0_08-dlj-linux-amd64.bin 43854617
+MD5 3e2935cca24ceb54dd2181892a3d5456 jdk-1_5_0_08-dlj-linux-i586.bin 49498712
+RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 jdk-1_5_0_08-dlj-linux-i586.bin 49498712
+SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8 jdk-1_5_0_08-dlj-linux-i586.bin 49498712
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild
new file mode 100644
index 000000000000..ff61be71b48d
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.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-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild,v 1.1 2006/08/25 16:37:02 nichoj Exp $
+
+inherit java-vm-2 eutils
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_PV2=${PV//./_}
+At="j2re-${MY_PV2}-linux-i586.bin"
+S="${WORKDIR}/j2re${MY_PV}"
+DESCRIPTION="Sun's J2SE Platform"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
+SRC_URI=${At}
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm-1.4.2"
+KEYWORDS="-* ~x86"
+RESTRICT="fetch stricter"
+IUSE="X alsa nsplugin"
+
+DEPEND="sys-apps/sed"
+
+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
+			)
+
+			virtual/x11
+		)
+	)"
+
+
+PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar
+lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
+
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemsv"
+
+DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+# Don't install env files for generation-1, because generation-1 system vm
+# always needs to be a JDK
+JAVA_VM_NO_GENERATION1="true"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${DOWNLOAD_URL}
+	einfo "(select the \"Linux self-extracting file\" package format of the JRE"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		eerror "cannot read ${At}. Please check the permission and try again."
+		die
+	fi
+	#Search for the ELF Header
+	testExp=`echo -e "\177\105\114\106\001\001\001"`
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
+	chmod +x install.sfx
+	./install.sfx || die
+	rm install.sfx
+
+	if [ -f ${S}/lib/unpack ]; then
+		UNPACK_CMD=${S}/lib/unpack
+		chmod +x $UNPACK_CMD
+		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
+		for i in $PACKED_JARS; do
+			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
+			if [ -f ${PACK_FILE} ]; then
+				echo "	unpacking: $i"
+				$UNPACK_CMD ${PACK_FILE} ${S}/$i
+				rm -f ${PACK_FILE}
+			fi
+		done
+	fi
+}
+
+src_install() {
+	local dirs="bin lib man javaws plugin"
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -pPR $i ${D}/opt/${P}/
+	done
+
+	dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
+	dohtml Welcome.html ControlPanel.html
+
+	if use nsplugin; then
+		local plugin_dir="ns610"
+		if has_version '>=sys-devel/gcc-3.2' ; then
+			plugin_dir="ns610-gcc32"
+		fi
+		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+	fi
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+
+	# install control panel for Gnome/KDE
+	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
+		-e "s/\(Name=Java\)/\1 Control Panel/" \
+		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
+		${T}/sun_java-jre.desktop
+	domenu ${T}/sun_java-jre.desktop
+
+	set_java_env ${FILESDIR}/${VMHANDLE}
+
+	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
+	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
+	#      is a directory and will not be gzipped ;)
+}
+
+pkg_postinst () {
+	# Create files used as storage for system preferences.
+	touch /opt/${P}/.systemPrefs/.system.lock
+	chmod 644 /opt/${P}/.systemPrefs/.system.lock
+	touch /opt/${P}/.systemPrefs/.systemRootModFile
+	chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile
+
+	java-vm-2_pkg_postinst
+
+	# Show info about netscape
+	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
+		echo
+		einfo "If you want to install the plugin for Netscape 4.x, type"
+		einfo
+		einfo "   cd /usr/lib/nsbrowser/plugins/"
+		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
+	fi
+
+	# 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 "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+		done
+
+		# /opt/sun-jdk-1.4.2.03/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/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
+		echo
+		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
+		ewarn "Be careful which Java libraries you attempt to use."
+	fi
+}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild
new file mode 100644
index 000000000000..ea2faece19d9
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2006 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.08-r1.ebuild,v 1.1 2006/08/25 16:37:02 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 stricter because of textrels
+RESTRICT="nostrip stricter"
+IUSE="X alsa nsplugin"
+
+JAVA_VM_NO_GENERATION1=true
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	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/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
+
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemsv"
+
+# Don't install env files for generation-1, because generation-1 system vm
+# always needs to be a JDK
+JAVA_VM_NO_GENERATION1="true"
+
+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() {
+	local dirs="bin lib man"
+	# only X86 has the plugin and javaws
+	use x86 && dirs="${dirs} javaws plugin"
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
+	done
+	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt
+	dohtml Welcome.html
+	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
+
+	# 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 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 java"
+
+		for paxkills in "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+		done
+
+		# /opt/$VM/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/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."
+}