Revision bump to add javaws symlinks wrt bug #147259. Also added QA_TEXTRELS and removed virtual/x11 from RDEPEND.

Package-Manager: portage-2.1.2_pre1

4 files changed, 225 insertions, 5 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 468bdcd69b36..88388869a226 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.159 2006/09/03 01:29:56 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.160 2006/09/19 07:33:11 caster Exp $
+
+*sun-jdk-1.4.2.12-r2 (19 Sep 2006)
+
+  19 Sep 2006; Vlastimil Babka <caster@gentoo.org>
+  +sun-jdk-1.4.2.12-r2.ebuild:
+  Revision bump to add javaws symlinks wrt bug #147259. Also added QA_TEXTRELS
+  and removed virtual/x11 from RDEPEND.
 
   03 Sep 2006; Joshua Nichols <nichoj@gentoo.org> -sun-jdk-1.2.2.017.ebuild,
   -sun-jdk-1.3.1.17.ebuild, -sun-jdk-1.3.1.17-r10.ebuild:
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 0fdca7c56d90..3f7e1d8466b0 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -35,6 +35,10 @@ EBUILD sun-jdk-1.4.2.12-r1.ebuild 6063 RMD160 3317533598c571bed2cfc5d696b49a6445
 MD5 6ade014b556b239f6e63e3dce9a52d41 sun-jdk-1.4.2.12-r1.ebuild 6063
 RMD160 3317533598c571bed2cfc5d696b49a6445edec02 sun-jdk-1.4.2.12-r1.ebuild 6063
 SHA256 380f965b23cd8efc55a6a1c2fe5155f8961eaff9910261cbe49df127eb056618 sun-jdk-1.4.2.12-r1.ebuild 6063
+EBUILD sun-jdk-1.4.2.12-r2.ebuild 6305 RMD160 4ee231db6a4c8874ed962ad8b92c452c96f976c5 SHA1 e3acba05e0929cc04868b23a869bfb735fbf56ec SHA256 55205b61712b6b10e38cdb7771663dd0cee8f6af91a7d61f4e50b1d3810c8e22
+MD5 2428b34be75e3dd2c4567a615688dd24 sun-jdk-1.4.2.12-r2.ebuild 6305
+RMD160 4ee231db6a4c8874ed962ad8b92c452c96f976c5 sun-jdk-1.4.2.12-r2.ebuild 6305
+SHA256 55205b61712b6b10e38cdb7771663dd0cee8f6af91a7d61f4e50b1d3810c8e22 sun-jdk-1.4.2.12-r2.ebuild 6305
 EBUILD sun-jdk-1.4.2.12.ebuild 6021 RMD160 1ac8d6fd6be913e68590db5f37adefaea72aac5b SHA1 0eed773827a60e225a88f415f253652daa77bfe6 SHA256 24e94e850cb35836165e6ce515dc60380fe973613a01a94ebddd62ce54e9e862
 MD5 1c0f641f0470142a19efd2126090744f sun-jdk-1.4.2.12.ebuild 6021
 RMD160 1ac8d6fd6be913e68590db5f37adefaea72aac5b sun-jdk-1.4.2.12.ebuild 6021
@@ -43,10 +47,10 @@ EBUILD sun-jdk-1.5.0.08.ebuild 5627 RMD160 1097272e20f6d7b35f7026e353db05707a792
 MD5 11f06f343ed6843e5d44a529f145ad93 sun-jdk-1.5.0.08.ebuild 5627
 RMD160 1097272e20f6d7b35f7026e353db05707a7920fb sun-jdk-1.5.0.08.ebuild 5627
 SHA256 7ce8112fdc5e5979d1041be2a8e607fe1865f583db7cfc6554d27933fd073f89 sun-jdk-1.5.0.08.ebuild 5627
-MISC ChangeLog 32312 RMD160 8fc9f7da3252c99f2ea1092e42c02c3590ce1a2b SHA1 f6f7230072e4049ca3a7fc4c3c9bfabd5f955ed2 SHA256 0e009414f6084e8f1efef2c47bfcb2634044e1781c1278731c7ca21771f67de2
-MD5 3a213abb1f97b892ac929065cf118cc3 ChangeLog 32312
-RMD160 8fc9f7da3252c99f2ea1092e42c02c3590ce1a2b ChangeLog 32312
-SHA256 0e009414f6084e8f1efef2c47bfcb2634044e1781c1278731c7ca21771f67de2 ChangeLog 32312
+MISC ChangeLog 32550 RMD160 6e0ff08becdc7237b8b7b642203e9cb03e753a14 SHA1 8b5b58aaaed9ecaf62bf03bcff5050380b5fbfad SHA256 04a40b9c8087beaf07a61ec6597b63d39fc6ef8b095c93fcb0e1615ee6d70565
+MD5 f1e1bde4a59634a4e99e8eb9000dd7c6 ChangeLog 32550
+RMD160 6e0ff08becdc7237b8b7b642203e9cb03e753a14 ChangeLog 32550
+SHA256 04a40b9c8087beaf07a61ec6597b63d39fc6ef8b095c93fcb0e1615ee6d70565 ChangeLog 32550
 MISC metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 SHA1 6d20154bac8f6c9bdde74156e48932cd8cc52f06 SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 metadata.xml 239
@@ -60,6 +64,9 @@ SHA256 80412544ff068c961ad5d3022215e34877cfa22118e1f68768e8d768ebe8687b files/di
 MD5 5bec2db22a35d2dab4b65c6c5ac4a5ad files/digest-sun-jdk-1.4.2.12-r1 512
 RMD160 84b4872443740be6f65e43bd92830b1a2f72eedd files/digest-sun-jdk-1.4.2.12-r1 512
 SHA256 80412544ff068c961ad5d3022215e34877cfa22118e1f68768e8d768ebe8687b files/digest-sun-jdk-1.4.2.12-r1 512
+MD5 5bec2db22a35d2dab4b65c6c5ac4a5ad files/digest-sun-jdk-1.4.2.12-r2 512
+RMD160 84b4872443740be6f65e43bd92830b1a2f72eedd files/digest-sun-jdk-1.4.2.12-r2 512
+SHA256 80412544ff068c961ad5d3022215e34877cfa22118e1f68768e8d768ebe8687b files/digest-sun-jdk-1.4.2.12-r2 512
 MD5 20fa891f2c9e4953c1da7d1c318d3216 files/digest-sun-jdk-1.5.0.08 563
 RMD160 59f63ab1ef5f3a40c10ccd954d1cfa2ca47f4e15 files/digest-sun-jdk-1.5.0.08 563
 SHA256 36ee47fae9d203d6e249bd407da3fd700d2d4f672a258285010f1a44f38ea0b8 files/digest-sun-jdk-1.5.0.08 563
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.12-r2 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.12-r2
new file mode 100644
index 000000000000..b31a40f251e8
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.12-r2
@@ -0,0 +1,6 @@
+MD5 587a9fba08f1c0cfd2207c27abcbca5f j2sdk-1_4_2_12-linux-i586.bin 36337163
+RMD160 6b1499cf3bd46158293506b8a0d701ec52b78ef3 j2sdk-1_4_2_12-linux-i586.bin 36337163
+SHA256 ab7f5285993d71dc692625bed4d11557048ef3a4be6c51941c507cef26025531 j2sdk-1_4_2_12-linux-i586.bin 36337163
+MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
+RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 jce_policy-1_4_2.zip 12195
+SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097 jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.12-r2.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.12-r2.ebuild
new file mode 100644
index 000000000000..aa7416cc32fb
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.12-r2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2006 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.4.2.12-r2.ebuild,v 1.1 2006/09/19 07:33:11 caster Exp $
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit java-vm-2 eutils
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_P=j2sdk${MY_PV}
+MY_PVB=${PV%.*}
+
+At="j2sdk-${PV//./_}-linux-i586.bin"
+jce_policy="jce_policy-${MY_PVB//./_}.zip"
+
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Sun's J2SE Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
+SRC_URI="${At}
+		jce? ( ${jce_policy} )"
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="-* ~x86"
+RESTRICT="fetch"
+IUSE="X alsa doc examples nsplugin jce"
+
+DEPEND="sys-apps/sed
+	app-arch/unzip"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.4.2* )
+	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
+	)"
+
+JAVA_PROVIDE="jdbc-stdext"
+
+PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar
+jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
+
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemrsv"
+
+DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libawt.so
+	opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so
+	opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
+	opt/${P}/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${DOWNLOAD_URL}
+	einfo "(SDK 32-bit/64-bit for Windows/Linux/Solaris SPARC 32-bit for Solaris x86, then select download Linux Self-extracting."
+	einfo "and move it to ${DISTDIR}"
+	if use jce; then
+		echo
+		einfo "Also download ${jce_policy} from:"
+		einfo ${DOWNLOAD_URL_JCE}
+		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
+		einfo "and move it to ${DISTDIR}"
+	fi
+}
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		die "cannot read ${At}.bin. Please check the permission and try again."
+	fi
+	if use jce; then
+		if [ ! -r ${DISTDIR}/${jce_policy} ]; then
+			die "cannot read ${jce_policy}. Please check the permission and try again."
+		fi
+	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 include jre lib man"
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -dPR $i ${D}/opt/${P}/
+	done
+
+	dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
+	dohtml README.html
+	dodir /opt/${P}/share/
+	if use examples; then
+		cp -pPR demo ${D}/opt/${P}/share/
+	fi
+	cp -pPR src.zip ${D}/opt/${P}/share/
+
+	if use jce ; then
+		# Using unlimited jce while still retaining the strong jce
+		# May have repercussions when you find you cannot symlink libraries
+		# in classpaths.
+		cd ${D}/opt/${P}/jre/lib/security
+		unzip ${DISTDIR}/${jce_policy}
+		mv jce unlimited-jce
+		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
+		mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce
+		dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
+		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
+	fi
+
+	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}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
+	fi
+
+	# bug #147259
+	dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
+	dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+	# Create files used as storage for system preferences.
+	touch ${D}/opt/${P}/.systemPrefs/.system.lock
+	chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock
+	touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile
+	chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile
+
+	# 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}/jre/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 jar, javac and java"
+
+		for paxkills in "jar" "javac" "java" "javah" "javadoc"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+		done
+
+		# /opt/sun-jdk-1.4.2.03/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/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
+}