Revision bump to use DLJ distfiles (bug #133590).

Package-Manager: portage-2.1.1_pre2-r4

4 files changed, 208 insertions, 18 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index bfeb6d283fc0..84da7b31e5a6 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.151 2006/07/06 10:46:51 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.152 2006/07/23 16:40:48 nichoj Exp $
+
+*sun-jdk-1.5.0.07-r1 (23 Jul 2006)
+
+  23 Jul 2006; Joshua Nichols <jnichols@gentoo.org>
+  +sun-jdk-1.5.0.07-r1.ebuild:
+  Revision bump to use DLJ distfiles (bug #133590).
 
   06 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   sun-jdk-1.2.2.017.ebuild, sun-jdk-1.3.1.17.ebuild,
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index f10ecf277067..f361b0e698ef 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX sun-jdk-1.2.2.017 328 RMD160 04f2f2980bb5ac087db70b799a543e6c74ac626c SHA1 920a422724ee82ff5b9471758f45a8f54cf63136 SHA256 3ac05aa50383cafd10dfa7dce4d2a6a287f5bc6afbe8a1f1b03a4d56f5610686
 MD5 ac1c6e8860b4cb03e284664cacf7a977 files/sun-jdk-1.2.2.017 328
 RMD160 04f2f2980bb5ac087db70b799a543e6c74ac626c files/sun-jdk-1.2.2.017 328
@@ -29,10 +26,12 @@ DIST j2sdk-1_3_1_17-linux-i586.bin 26660449 RMD160 6bdcc5d60ef9c06125de965dae34b
 DIST j2sdk-1_4_2_10-linux-i586.bin 36446523 RMD160 c7e65c19747d549a06530af9baba2ef0b52cb152 SHA1 bbbd7a44f8642adf56b77fe2755b1c7caad94c91 SHA256 193051a8b365325c3736838e580eafa036e82100f04ae12ffbe70f3cbf2173bc
 DIST j2sdk-1_4_2_12-linux-i586.bin 36337163 RMD160 6b1499cf3bd46158293506b8a0d701ec52b78ef3 SHA1 74f88c386985ba01b7c574e441f3f479b4a3b549 SHA256 ab7f5285993d71dc692625bed4d11557048ef3a4be6c51941c507cef26025531
 DIST jce_policy-1_4_2.zip 12195 RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 SHA1 ea17b649ebcaaf4246e9dd28dbc77926176c64ee SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
-DIST jce_policy-1_5_0.zip 8826 RMD160 eb12d0333c3ddbbba57a0e825a6891a75ec485c0 SHA1 f0e887b91b4499142285633e65c5710c3a133a16 SHA256 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
+DIST jce_policy-1_5_0.zip 8826 RMD160 eb12d0333c3ddbbba57a0e825a6891a75ec485c0 SHA256 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
 DIST jdk-1_2_2_017-linux-i586.tar.gz 21192620
-DIST jdk-1_5_0_07-linux-amd64.bin 43785859 RMD160 ca521c4f8eb23ac3a5636d1d317d5ad746c6dac6 SHA1 697a04c373d9d6076d70d694f8ab1797b2707d59 SHA256 4854617e017d92256c0f3270da5e1f59998b3a37c8d852ec68ec57b498d425b5
-DIST jdk-1_5_0_07-linux-i586.bin 49075062 RMD160 3922e171cf080d643066faf4ee05c9bde1fb306c SHA1 4230d81744dadc8769163df67d9aa6fc88f4d574 SHA256 3f4c327aeb11b2c923a501b8315ce4261cec13dc0a9991264d3ba2e6edf86ce2
+DIST jdk-1_5_0_07-distro-linux-amd64.bin 43811573 RMD160 1b6e4d557d4e171b402e6a955364ee32f6c20b43 SHA1 220f259749ad7738d30ae64b8338bb20dab6c7c0 SHA256 bf798c43fc077d893adff1337fc03e0e0017e46f1b03dab884d2aa66690e4330
+DIST jdk-1_5_0_07-distro-linux-i586.bin 49100762 RMD160 2ea192d0e1db5c617b5b4773f5fe169f038a72a1 SHA1 c0758e95b3150cd4e7de4f04a6e2c791aa437fa2 SHA256 68c5fe5c44e5f3a0d83c34ddcd73d8e9ceede1ccb79da46019b45825be443e5a
+DIST jdk-1_5_0_07-linux-amd64.bin 43785859 RMD160 ca521c4f8eb23ac3a5636d1d317d5ad746c6dac6 SHA256 4854617e017d92256c0f3270da5e1f59998b3a37c8d852ec68ec57b498d425b5
+DIST jdk-1_5_0_07-linux-i586.bin 49075062 RMD160 3922e171cf080d643066faf4ee05c9bde1fb306c SHA256 3f4c327aeb11b2c923a501b8315ce4261cec13dc0a9991264d3ba2e6edf86ce2
 EBUILD sun-jdk-1.2.2.017.ebuild 2835 RMD160 73d7f35c406fbdec4e6c239fc92f110d2628313c SHA1 7360b846a27140f7e3f9f133a4ccf8eefceca18c SHA256 5be327926910e2644f9f6b401b89d5d40922191fafb07bd30130a8956ff312d0
 MD5 e083c0431fc9a62245d3b7bd193047b7 sun-jdk-1.2.2.017.ebuild 2835
 RMD160 73d7f35c406fbdec4e6c239fc92f110d2628313c sun-jdk-1.2.2.017.ebuild 2835
@@ -53,14 +52,18 @@ EBUILD sun-jdk-1.4.2.12.ebuild 5995 RMD160 e552d4686bb83f280593a262010ca4b9f206a
 MD5 cc77f041776bd8ceafb63e3ff6d4ce1f sun-jdk-1.4.2.12.ebuild 5995
 RMD160 e552d4686bb83f280593a262010ca4b9f206a630 sun-jdk-1.4.2.12.ebuild 5995
 SHA256 cf4521f76d4759e1e30d62273a162963e14a61049c7ac1dd443f7b17b12fc77a sun-jdk-1.4.2.12.ebuild 5995
+EBUILD sun-jdk-1.5.0.07-r1.ebuild 5581 RMD160 37dbcc8a296a072f9316d4531b174c294c586eef SHA1 40ce840d988e7a43c20fb09fba25b3ac93bcf8da SHA256 aeab0c08a40f9bce4cc1e4bc4d621d9031722695f0a44726c6d4007c6a732152
+MD5 278443f7a3273f215174cc34fe1ba864 sun-jdk-1.5.0.07-r1.ebuild 5581
+RMD160 37dbcc8a296a072f9316d4531b174c294c586eef sun-jdk-1.5.0.07-r1.ebuild 5581
+SHA256 aeab0c08a40f9bce4cc1e4bc4d621d9031722695f0a44726c6d4007c6a732152 sun-jdk-1.5.0.07-r1.ebuild 5581
 EBUILD sun-jdk-1.5.0.07.ebuild 6674 RMD160 11bcbf3285afcb38b7acf6a6a4815f2a868ca28a SHA1 5671895af8ad758060a14c44b281de65035ff142 SHA256 54d1383dd3a24d99f8756688cc1467aef9c06eae15e3f1a9597e0341646b4e38
 MD5 c3dd534d52b9b4f3f81cf3e2eeffc243 sun-jdk-1.5.0.07.ebuild 6674
 RMD160 11bcbf3285afcb38b7acf6a6a4815f2a868ca28a sun-jdk-1.5.0.07.ebuild 6674
 SHA256 54d1383dd3a24d99f8756688cc1467aef9c06eae15e3f1a9597e0341646b4e38 sun-jdk-1.5.0.07.ebuild 6674
-MISC ChangeLog 30460 RMD160 9de62f3b412579fd5a6e738d16943ef598c33b5f SHA1 2e7ce875be0febc2355bea91f32c6543fa926280 SHA256 149c5c9cef46caf3a4938361b0d6d0285fca8a9c68008968ebfd82289fc044b3
-MD5 805f94327ed53bd34144eeb93a0bbbc2 ChangeLog 30460
-RMD160 9de62f3b412579fd5a6e738d16943ef598c33b5f ChangeLog 30460
-SHA256 149c5c9cef46caf3a4938361b0d6d0285fca8a9c68008968ebfd82289fc044b3 ChangeLog 30460
+MISC ChangeLog 30630 RMD160 a65b93d76a718574a3a9bb3f15a51be91f724bab SHA1 111fbdb3e3d43a69224b985e55d1014efe82377a SHA256 fca2fcc2ba8b04553a66245cf538a96cfd4ae7d0beffcfe3af3cc6ecbaf76644
+MD5 da54c99a4a225d34ecbbad9c2184f087 ChangeLog 30630
+RMD160 a65b93d76a718574a3a9bb3f15a51be91f724bab ChangeLog 30630
+SHA256 fca2fcc2ba8b04553a66245cf538a96cfd4ae7d0beffcfe3af3cc6ecbaf76644 ChangeLog 30630
 MISC metadata.xml 239 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 SHA1 6d20154bac8f6c9bdde74156e48932cd8cc52f06 SHA256 b21519a40c89110e6d2ce7d214e849e2e808ebbb3a338e833b622b9f150f97a3
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 RMD160 98d688f78b8fae2a2d23e610af86e822832a8402 metadata.xml 239
@@ -83,10 +86,6 @@ SHA256 80412544ff068c961ad5d3022215e34877cfa22118e1f68768e8d768ebe8687b files/di
 MD5 e74c00b114ffbe059dbc008b4e17b01c files/digest-sun-jdk-1.5.0.07 774
 RMD160 d51faa46e147504d0b04d8e02509beaba35e880a files/digest-sun-jdk-1.5.0.07 774
 SHA256 7cdfd5f068eebeef9d8b687e8d3597c8a2479426a63cf2d585a057fa57809be9 files/digest-sun-jdk-1.5.0.07 774
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFErOo+go/w9rxVVVERAvSdAKCbDEfbfS7slI8OsBKDqV4M801NTACfVSex
-OyXJwvwRZHqyYa96339S8Fo=
-=X/iR
------END PGP SIGNATURE-----
+MD5 5ddd958e9f549077d707ebbab2268da6 files/digest-sun-jdk-1.5.0.07-r1 581
+RMD160 d85849e87af7f72df84427919c5da091946a0c85 files/digest-sun-jdk-1.5.0.07-r1 581
+SHA256 00752eb3e6008c65c12fe95bf32aa70c16d85715b2cd7f3b9d5a1b7c8edaab46 files/digest-sun-jdk-1.5.0.07-r1 581
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r1
new file mode 100644
index 000000000000..0e7884507e8e
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.07-r1
@@ -0,0 +1,6 @@
+MD5 cbf4fee8c737ed6b1d5288dc0f6dbe3c jdk-1_5_0_07-distro-linux-amd64.bin 43811573
+RMD160 1b6e4d557d4e171b402e6a955364ee32f6c20b43 jdk-1_5_0_07-distro-linux-amd64.bin 43811573
+SHA256 bf798c43fc077d893adff1337fc03e0e0017e46f1b03dab884d2aa66690e4330 jdk-1_5_0_07-distro-linux-amd64.bin 43811573
+MD5 d7bf7e986ab185c830d11f93f18b3930 jdk-1_5_0_07-distro-linux-i586.bin 49100762
+RMD160 2ea192d0e1db5c617b5b4773f5fe169f038a72a1 jdk-1_5_0_07-distro-linux-i586.bin 49100762
+SHA256 68c5fe5c44e5f3a0d83c34ddcd73d8e9ceede1ccb79da46019b45825be443e5a jdk-1_5_0_07-distro-linux-i586.bin 49100762
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild
new file mode 100644
index 000000000000..7d6c8da97bac
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild
@@ -0,0 +1,179 @@
+# 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.5.0.07-r1.ebuild,v 1.1 2006/07/23 16:40:48 nichoj Exp $
+
+inherit java-vm-2 eutils
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+S="${WORKDIR}/jdk${MY_PVL}"
+
+if use x86; then
+	At=jdk-${MY_PVA}-distro-linux-i586.bin
+elif use amd64; then
+	At=jdk-${MY_PVA}-distro-linux-amd64.bin
+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/jdk-${MY_PVA}-distro-linux-i586.bin )
+		amd64? ( http://download.java.net/dlj/binaries/jdk-${MY_PVA}-distro-linux-amd64.bin )"
+SLOT="1.5"
+LICENSE="dlj-1.1"
+KEYWORDS="~x86 ~amd64 -*"
+RESTRICT="nostrip"
+IUSE="X alsa doc examples nsplugin"
+
+JAVA_VM_NO_GENERATION1=true
+
+#
+DEPEND=">=dev-java/java-config-1.2
+	sys-apps/sed
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	doc? ( =dev-java/java-sdk-docs-1.5.0* )
+	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/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar"
+
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemsv"
+
+#FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+#FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+
+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}/${jcefile} ]; then
+#			die "cannot read ${jcefile}. Please check the permission and try again."
+#		fi
+#	fi
+
+	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
+
+	${S}/bin/java -client -Xshare:dump
+}
+
+src_install() {
+	local dirs="bin include jre lib man"
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
+	done
+	dodoc COPYRIGHT README.html
+	dohtml README.html
+	dodir /opt/${P}/share/
+
+	cp -pPR src.zip ${D}/opt/${P}/share/
+
+	if use examples; then
+		cp -pPR demo ${D}/opt/${P}/share/
+		if ( use x86 || use amd64 ); then
+			cp -pPR sample ${D}/opt/${P}/share/
+		fi
+	fi
+
+#	if use jce ; then
+#		cd ${D}/opt/${P}/jre/lib/security
+#		unzip ${DISTDIR}/${jcefile} || die "failed to unzip jce"
+#		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="ns7-gcc29"
+		if has_version '>=sys-devel/gcc-3' ; then
+			plugin_dir="ns7"
+		fi
+
+		if use x86 ; then
+			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+		else
+			eerror "No plugin available for amd64 arch"
+		fi
+	fi
+
+	# 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
+
+	# install control panel for Gnome/KDE
+	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
+		-e "s/\(Name=Java\)/\1 Control Panel/" \
+		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+		${T}/sun_java.desktop
+
+	domenu ${T}/sun_java.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/$VM/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
+		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."
+}