Version bump.

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

3 files changed, 130 insertions, 6 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index c10d6704eb04..826fbfd6f768 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.56 2008/07/09 20:08:28 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.57 2008/07/09 20:35:04 betelgeuse Exp $
+
+*emul-linux-x86-java-1.4.2.18 (09 Jul 2008)
+
+  09 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +emul-linux-x86-java-1.4.2.18.ebuild:
+  Version bump.
 
 *emul-linux-x86-java-1.6.0.07 (09 Jul 2008)
 *emul-linux-x86-java-1.5.0.16 (09 Jul 2008)
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 67d3e8af6e6a..dad2557429c8 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -7,24 +7,26 @@ AUX emul-linux-x86-java-1.4.env 857 RMD160 65dc6da72579122d52475e5fe2c965f7aaea9
 AUX emul-linux-x86-java-1.5.env 855 RMD160 e9ce4d40ee6a8bd9b0720e00838c399d5f3fdca0 SHA1 d989ddc315757eb44aff787ea2c70a6dc848130d SHA256 d36f364c0855d13d7ec2eb4ea3cdbaa483318f1f57b7720edfa5eb0050a12cdb
 AUX emul-linux-x86-java-1.6.env 894 RMD160 86bb5a85c4a7b51a52016376438052673da53636 SHA1 8d62dde36f42a769246235662d6f9b25490cd4c8 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900cacbeabcf3e69b5bbc85ce39dc4df
 DIST j2re-1_4_2_17-linux-i586.bin 14376647 RMD160 62de02a90f67d8965cebc563636d688f6745b7ca SHA1 a4282ea13048c76274222476abfb0954d42c35b8 SHA256 18aa1f5a4b223d3858d1d75913bb036963be4a9bb9b9bdc38ae2b714e1408654
-DIST jdk-5.0u15-dlj-linux-i586.bin 620540 RMD160 b79e8c61a232d27ac67cebdbe7a5cab9f69018de SHA1 58ba76de5a5ca7237d6b6c3e690e617e1462597d SHA256 d3a9d8feed49ea96c7b85463c6cff4d32e3416249eb6b3744eaf3c9e7805ca71
+DIST j2re-1_4_2_18-linux-i586.bin 14379606 RMD160 725d9aeac47ee775cf904676c27a12b598847b74 SHA1 7558ba72c1002b6a0dd362041693bd3baa28cbc6 SHA256 75750575b54d15b47b5b7d50e03cc111e958edc1c6b18cc55cc582853d612206
+DIST jdk-5.0u15-dlj-linux-i586.bin 49670009 RMD160 b7fcb7e92c91cf4ef428a434c35c400832d08f8d SHA1 e52af3bc81f268d73a94772428d612769473834b SHA256 b4b340f86e3c8f3bb2f9fa1762f1c3f428cee1efc658c4fb8793f5cf299b2ad5
 DIST jdk-5.0u16-dlj-linux-i586.bin 49676902 RMD160 e358a1c3e554eb06cd4362ad175a95004661f38e SHA1 56e29e2d96fca31f6b0e34c208c13c82c523098d SHA256 0df21a7e636740c9812e3e1cd4002e914150acf3c806930d5128d05b37c28a08
 DIST jdk-6u5-dlj-linux-i586.bin 70537386 RMD160 bd1bd2a6601b7e972c9c5f3e1cce4ce7d408b055 SHA1 ba7f5e5c0567db73cf8a9f3b41bcff32e2aed542 SHA256 b0f78f2e6baf88c1d7dc9334c6b86e621b2c9d629f5617f3f57a3bd7cbad0c99
 DIST jdk-6u6-dlj-linux-i586.bin 70547201 RMD160 a24417210333fd7f16ee844c010f27d1460b1064 SHA1 a14c3003425b99ca2b89ebf7a82a8a33b0139894 SHA256 35ad958d88ed2af892c3879c815988bfae7775dd484e920186d1f8ad02a2c076
 DIST jdk-6u7-dlj-linux-i586.bin 78515200 RMD160 1c626fa6a16be412f082bdadcb4c3018bd0e188d SHA1 1a697ed721260331918fa34913203c78562d1d63 SHA256 b57a1f49ca3c9d3dd45b3fc2ab569d84d159a076124e842a9c8d82abce92ff8b
 EBUILD emul-linux-x86-java-1.4.2.17.ebuild 3620 RMD160 a1819db8cb1d8c2b94a010cac7b5157a88680478 SHA1 650ff8bc26cbd04edfca159c30f74e686110c3b5 SHA256 438925b2dc98e6cf3fc740b2edf791ae33d2fe891ea96a0140ab7ed9c4192dcd
+EBUILD emul-linux-x86-java-1.4.2.18.ebuild 3530 RMD160 080328fc09ec9b0d4bebf9485bf6777431526e8c SHA1 af04327acbfa3d37606f81d0226f376ea77bb7de SHA256 26921e27c51bfbef0cf8a149f7174e021aac273146d157778ef31a0174e4b80e
 EBUILD emul-linux-x86-java-1.5.0.15.ebuild 2861 RMD160 697dcd62e683f284930c67644d725f467f9dcf31 SHA1 5cdaa43a2202c897a952d8c61c607b4d2fa9255f SHA256 75426942212fde9ea5d2e4fc7bb86938f7661c58db249fa893dbf9752eeefe32
 EBUILD emul-linux-x86-java-1.5.0.16.ebuild 2862 RMD160 82f935c6a51f0a70b717a96edeaf154aabf5343e SHA1 3585c37edb8a282f17a13a4013e672e3a93e842e SHA256 c3dcf195628110558bbd1346d659c319385b777a67a603faa1a697c1019585dd
 EBUILD emul-linux-x86-java-1.6.0.05-r1.ebuild 2844 RMD160 c378a4eb61dad6839aed544d4e6175a57f637a16 SHA1 44d9eab2dcfe91f6b5c57b1945b82afd1ed59731 SHA256 81000557dbd1c66ee8f24d0cb792f3fa85612371169345e6350e898997d6a41d
 EBUILD emul-linux-x86-java-1.6.0.05.ebuild 2687 RMD160 2f129224df5bbe74a8c36735aeed6ce7e5e48c03 SHA1 4d558cbb114619db0bce2aeb9044d52797d22228 SHA256 d49b5313e8865a04a8e150b47e6f50baac676f642d97905cc0751160619888a6
 EBUILD emul-linux-x86-java-1.6.0.06.ebuild 2861 RMD160 129bb470111ed2960dde75165dbc9c0fed4d81e6 SHA1 739b93ed1733a3082507dacd0824126316d147d9 SHA256 83c5e5ee0ca188bdc67023fe33104f84548f6b074a015dedfea07859a1d3c4e1
 EBUILD emul-linux-x86-java-1.6.0.07.ebuild 2862 RMD160 0227ae321caa1934e04efd43d30b71788e4178de SHA1 d0cdef7a724d62b6b4fc5f08d983ccea4a6cade1 SHA256 c219379cd6671f9b0b616d6835922610a04c1124598391c72f06674e8863ffa9
-MISC ChangeLog 11504 RMD160 437bbfffce3e2a0a5b86a9ca49e0af2eea7da7e1 SHA1 8cc826684d22539cdc9f0ee31e71ecc7b8272b28 SHA256 526d3025856f28ab265e239a0e67242491d1f570fd6a00cc02dc53f9db0f277c
+MISC ChangeLog 11663 RMD160 e8886a7d64b259f8e947c05b1f5a066583f94698 SHA1 feb3df1916b9137ad7aa7d3667b6eb29460e62cf SHA256 d29c90b344b94f3a0a965af715879511f67bceeae29c0ffd2ec9dd4d8680ba13
 MISC metadata.xml 179 RMD160 eb23cc92511920eee7575e49cb97e3cc57ec2ffe SHA1 5f572596a2c474e808cdb21b8c2bf80f7cc011b1 SHA256 28110c7811a1bdcba5e23efc7018238140b1e9460b78215f914b7253a8c09ca8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh1GscACgkQRh6X64ivZaJnfACfeJzqgjPl9Xh7P8DpvlBc217H
-+XoAn2KlWRAOksKQ0xTuuVL0sBJSgR59
-=+baW
+iEYEARECAAYFAkh1IQgACgkQcxLzpIGCsLRNoQCcCihG9rcSDQveTfLyKVKfvEaq
+N80AnRFVAEjpWu5iNQz4K6buQoSMjNXS
+=Jq10
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.18.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.18.ebuild
new file mode 100644
index 000000000000..04ae029c7d1f
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.18.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2008 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.4.2.18.ebuild,v 1.1 2008/07/09 20:35:04 betelgeuse Exp $
+
+inherit multilib eutils pax-utils java-vm-2
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_PV2=${PV//./_}
+MY_PN=j2re
+At="${MY_PN}-${MY_PV2}-linux-i586.bin"
+S="${WORKDIR}/j2re${MY_PV}"
+DESCRIPTION="Sun's JRE (32bit)"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
+SRC_URI=${At}
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm-1.4.2"
+KEYWORDS="-* ~amd64"
+# pre stripped
+RESTRICT="fetch strip"
+IUSE="X alsa nsplugin"
+
+DEPEND=""
+
+RDEPEND="alsa? ( app-emulation/emul-linux-x86-soundlibs )
+	X? ( app-emulation/emul-linux-x86-xlibs )"
+
+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"
+
+QA_TEXTRELS_amd64="opt/${P}/lib/i386/libawt.so
+	opt/${P}/plugin/i386/ns4/libjavaplugin.so
+	opt/${P}/plugin/i386/ns610/libjavaplugin_oji.so
+	opt/${P}/plugin/i386/ns610-gcc32/libjavaplugin_oji.so"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${DOWNLOAD_URL}
+	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 '\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/rt.jar lib/jsse.jar lib/charsets.jar \
+			lib/ext/localedata.jar lib/plugin.jar 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 lib man javaws plugin"
+	dodir /opt/${P}
+
+	cp -pPR ${dirs} "${D}/opt/${P}/"
+
+	pax-mark srpm $(list-paxables "${D}"/opt/${P}/bin/*)
+
+	dodoc CHANGES COPYRIGHT README THIRDPARTYLICENSEREADME.txt || die
+	dohtml Welcome.html ControlPanel.html || die
+
+	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
+
+	# bug #147259
+	dosym ../javaws/javaws /opt/${P}/bin/javaws
+
+	# create dir for system preferences
+	dodir /opt/${P}/.systemPrefs
+
+	# 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"
+
+	# 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}/" \
+#		-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
+	java-vm_revdep-mask
+}