Version bump.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686

3 files changed, 182 insertions, 6 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 647d30da16ec..ce92cd683c22 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.238 2008/07/09 20:06:27 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.239 2008/07/09 20:32:25 betelgeuse Exp $
+
+*sun-jdk-1.4.2.18 (09 Jul 2008)
+
+  09 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +sun-jdk-1.4.2.18.ebuild:
+  Version bump.
 
 *sun-jdk-1.6.0.07 (09 Jul 2008)
 *sun-jdk-1.5.0.16 (09 Jul 2008)
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index e4abf9de88a9..6705d30f3faa 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -6,9 +6,10 @@ AUX sun-jdk-1.4.env 976 RMD160 5fe4974ec91f5e2dd58844cb780d10539b6a49ed SHA1 8ce
 AUX sun-jdk-1.5.env 859 RMD160 657a54eebf4f8773204ca442e48845e163a67154 SHA1 59241ca2cf7f5b2c2f5dcc3d69accb43d8ffb419 SHA256 6e5998ae21e11ee3981f613f4ca6615aebeec024fd6b9926e6097fb1ba976585
 AUX sun-jdk-1.6.env 940 RMD160 2061347f8137915ed421c7592a6909b51bb2110d SHA1 3520843a513f53f8a04782d9a6b373736c24f624 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8
 DIST j2sdk-1_4_2_17-linux-i586.bin 36376686 RMD160 8b79b4e0f356c0f263a6345a40a9a52d6165961f SHA1 79311406936549dfe4906650d11862c8cc9a8574 SHA256 3b18a101f1bc819acc00fb2d496bb61faa1d9a257ee562a4c6e460be2a1336e8
+DIST j2sdk-1_4_2_18-linux-i586.bin 36380053 RMD160 424ec3f66def593d7f54868edae63c6bbca82b8a SHA1 9d970845c84959a8d9ad6242be0e9ae867d8ea27 SHA256 f592a0af6c6b0fd22256bee91d68b11cfafe802901b747a29434c2c18e184f04
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
 DIST jdk-5.0u15-dlj-linux-amd64.bin 44048720 RMD160 624e7cd75c82891b54f7a3183ded297c30db6e48 SHA1 1b337999c9771dad78fc1cb171ffc34e6afd3cef SHA256 2a8aacdafd1da1d0a7fb15d536629cd6f2547309f13438a413bd31cd86ddb2fa
-DIST jdk-5.0u15-dlj-linux-i586.bin 620540 RMD160 b79e8c61a232d27ac67cebdbe7a5cab9f69018de SHA1 58ba76de5a5ca7237d6b6c3e690e617e1462597d SHA256 d3a9d8feed49ea96c7b85463c6cff4d32e3416249eb6b3744eaf3c9e7805ca71
+DIST jdk-5.0u15-dlj-linux-i586.bin 49670009 RMD160 b7fcb7e92c91cf4ef428a434c35c400832d08f8d SHA1 e52af3bc81f268d73a94772428d612769473834b SHA256 b4b340f86e3c8f3bb2f9fa1762f1c3f428cee1efc658c4fb8793f5cf299b2ad5
 DIST jdk-5.0u16-dlj-linux-amd64.bin 44052125 RMD160 d977cb6659b37653b1fc4159921f8a7d48cc2b80 SHA1 4e4f574a85c73c9f518e5ebf5cfd3135fa7fafaa SHA256 5c6c4b44b218c75de8e713a377b3662f791e77ebdf9a00bc76d63274d2e2d261
 DIST jdk-5.0u16-dlj-linux-i586.bin 49676902 RMD160 e358a1c3e554eb06cd4362ad175a95004661f38e SHA1 56e29e2d96fca31f6b0e34c208c13c82c523098d SHA256 0df21a7e636740c9812e3e1cd4002e914150acf3c806930d5128d05b37c28a08
 DIST jdk-6u5-dlj-linux-amd64.bin 63756779 RMD160 ed4d9d72845fb15e7731582996b078b4449da1f6 SHA1 c0eac2aa33a0ad05fdeb960708cc270b2d330af5 SHA256 9a9b97ce5ac821f9a92541eb5e2353ddefd485eaa1b4f4de6b41fce8281831d4
@@ -18,6 +19,7 @@ DIST jdk-6u6-dlj-linux-i586.bin 70547201 RMD160 a24417210333fd7f16ee844c010f27d1
 DIST jdk-6u7-dlj-linux-amd64.bin 71703415 RMD160 22c910c68c78ca68143b8c5444b6d4b24ef3edc1 SHA1 dd2769bda4be1387e22bfe7d04e2dcc9d593fe5c SHA256 b8adc4ea7ae90aed08e9b981ac3a9f1160fc94965a5034e2ea7e63b0ba77a725
 DIST jdk-6u7-dlj-linux-i586.bin 78515200 RMD160 1c626fa6a16be412f082bdadcb4c3018bd0e188d SHA1 1a697ed721260331918fa34913203c78562d1d63 SHA256 b57a1f49ca3c9d3dd45b3fc2ab569d84d159a076124e842a9c8d82abce92ff8b
 EBUILD sun-jdk-1.4.2.17.ebuild 5335 RMD160 749c9b095a47b44f057d0f770845b166ecad760f SHA1 9582b88208a87e53729281af497e3436ee4cb61c SHA256 76214dd60a4ebf8b46368c032dee6dcd51e524c50ee2790279c0c796b2226b64
+EBUILD sun-jdk-1.4.2.18.ebuild 5190 RMD160 a5045bdc51be692efe0863a08be7f8f7e8ba2ac1 SHA1 2c68b793ebab2ba6fcee81de3a674886726b79cf SHA256 52e7e9674b7721a4c4260398f289369c2ba0deafa069a5bdee379c3f6d288037
 EBUILD sun-jdk-1.5.0.15-r1.ebuild 4472 RMD160 f58a4d3f96aae04742e74885197a14ec92e66296 SHA1 9466c324c09f010dac38ee6dfeb48112defdd6c6 SHA256 c40ac22c7eb531d695a58d8583d4bfdb239c86947fd33848b7d9c2c46cab1bb3
 EBUILD sun-jdk-1.5.0.15.ebuild 4266 RMD160 18b3f5f3ba7bde42af3521489d567b0063ce3dd7 SHA1 416b0bd6f2cb5896c04a11a0ee304454fe115a3e SHA256 d5d9dd93d3c121ee71642542bb4ee84f16b01d08cdbd27d265b5eeea62649476
 EBUILD sun-jdk-1.5.0.16.ebuild 4468 RMD160 44de0de814bea81f089a816465b570d8181627ee SHA1 8e9d692047718703e2bdcab2f6d6f8ddb720e828 SHA256 99a3516e65158eaa92e83c190baf60a69b088118c08311376f2c1ea775003129
@@ -25,12 +27,12 @@ EBUILD sun-jdk-1.6.0.05-r1.ebuild 4822 RMD160 b92baf2e6d802a17344e8d4c62a701f290
 EBUILD sun-jdk-1.6.0.05.ebuild 4568 RMD160 ccab3316dc2dc2ab71d6db2836ecf5e6decea575 SHA1 db84a0fa9797237f676a58b1a8de811085ac2b65 SHA256 7793bee9d5fdadf262632a5142153141435d3402990aa7398e567c5c5e117956
 EBUILD sun-jdk-1.6.0.06.ebuild 4283 RMD160 b5f905d0b3e94de676fab7f1ba37d9fa7dc61cd3 SHA1 f711c4219d3709b5495e2c6b41ae7c2217e73ad4 SHA256 926f1eb1b66e620e8cbef68054b08a2a1dbc605434a4a83d06af1480424830e1
 EBUILD sun-jdk-1.6.0.07.ebuild 4285 RMD160 53fffda5d5e24aae5a710373237fa45fdc65b4c8 SHA1 db7d05337eff4076e930d1314e3f1607d52b5b0a SHA256 7511915b5a863bb1643d5984215671655ce0804b2a435419bd14d9592cc5a15a
-MISC ChangeLog 45370 RMD160 620e9b309c65bcc60c58e682455f70e7640d14f8 SHA1 1f1f7301d5be2b8b1e4151b5879d632cea907b6d SHA256 09f099852c4bc0550bdcdc08fb0bae7502c8be49fd35a1045653f63e81cc9ca7
+MISC ChangeLog 45505 RMD160 77de96bdca8da649660dff03fdf2bd04cb7bb3c0 SHA1 5f007b66d6bb91513f353db2f3f05acba7ce8937 SHA256 996c0fa61e4dc2a9bb71c4cda047a870ad3bb3a095cfe885059ebce92b7f8d3e
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh1GlwACgkQRh6X64ivZaI0vACfY/u8CLHw+e5uHAbf8+YkfaUD
-Lv4AmgJOuGt9KcM/fDDahlIiI+uxSM0Z
-=mL8q
+iEYEARECAAYFAkh1IG8ACgkQcxLzpIGCsLTEigCggMMckj6aANTz8QWFz1FJHWLY
+le0An1RlR5axGfMz6EtJwdffc92HRCd9
+=ZyOB
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.18.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.18.ebuild
new file mode 100644
index 000000000000..0481a1a84a4f
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.18.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2008 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.18.ebuild,v 1.1 2008/07/09 20:32:25 betelgeuse Exp $
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit pax-utils java-vm-2 eutils
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_PN=j2sdk
+MY_P=${MY_PN}${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="x86? ( ${At} )
+		jce? ( ${jce_policy} )"
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="~x86"
+# files are prestripped
+RESTRICT="fetch strip"
+IUSE="X alsa doc examples jce nsplugin odbc"
+
+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/libXext
+		x11-libs/libXi
+		x11-libs/libXp
+		x11-libs/libXtst
+		x11-libs/libXt
+		x11-libs/libX11
+	)
+	odbc? ( dev-db/unixODBC )"
+
+JAVA_PROVIDE="jdbc-stdext"
+
+DL_PREFIX="https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef="
+DOWNLOAD_URL="${DL_PREFIX}${MY_PN}-${MY_PV}-oth-JPR@CDS-CDS_Developer"
+DOWNLOAD_URL_JCE="${DL_PREFIX}7503-jce-1.4.2-oth-JPR@CDS-CDS_Developer"
+
+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 "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}. 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 '\0177\0105\0114\0106\0001\0001\0001')
+	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
+		local 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"
+		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}
+
+	cp -dPR ${dirs} "${D}/opt/${P}/"
+
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	pax-mark srpm $(list-paxables "${D}"/opt/${P}/{,/jre}/bin/*)
+
+	dodoc COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
+	dohtml README.html || die
+	if use examples; then
+		cp -pPR demo "${D}/opt/${P}/" || die
+	fi
+
+	cp -pPR src.zip "${D}/opt/${P}/" || die
+
+	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" || die
+		mv "${D}/opt/${P}/jre/lib/security/local_policy.jar" \
+			"${D}/opt/${P}/jre/lib/security/strong-jce" || die
+		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
+	java-vm_revdep-mask
+}