remove version numbers from src_uri, version bump closes 55866

6 files changed, 267 insertions, 12 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 6911d5b3f91f..890e9a113225 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.77 2004/07/02 04:23:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.78 2004/07/14 19:40:05 axxo Exp $
+
+*sun-jdk-1.4.2.05 (14 Jul 2004)
+
+  14 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +files/sun-jdk-1.4.2.05,
+  sun-jdk-1.4.2.04-r2.ebuild, +sun-jdk-1.4.2.05.ebuild:
+  src_uri clean up
+  version bump closed 55866
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   sun-jdk-1.3.1.09.ebuild, sun-jdk-1.3.1.10.ebuild:
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 9e8e48cf97b9..3f6caae857ec 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -6,8 +6,9 @@ MD5 c5af6a62cd72933e29393e71785c0265 sun-jdk-1.3.1.10.ebuild 4498
 MD5 1a713b65cd35161e5c54bd3a4f877283 sun-jdk-1.5.0_beta1-r1.ebuild 6676
 MD5 04dd51ce8dfe00cd681076b0e0e9000c sun-jdk-1.4.2.03.ebuild 5992
 MD5 65c2bc21da2262ddeb940d657dcc9ff0 sun-jdk-1.4.1.06.ebuild 3316
-MD5 065a9bcd5e203a332b7c3a603187ec14 sun-jdk-1.4.2.04-r2.ebuild 7164
-MD5 036d2eb0dffe1c896fbc611f5d8606d9 ChangeLog 16652
+MD5 234d28ba53964b7c9d717ee01d6f1a7b sun-jdk-1.4.2.04-r2.ebuild 7487
+MD5 bd34082377e7296929904c1f9490df14 sun-jdk-1.4.2.05.ebuild 7485
+MD5 56d38ac0dcebe50eb23eee2032748aab ChangeLog 16857
 MD5 10a5a03b93dabf7b6229ce803b27a0ba sun-jdk-1.5.0_beta2.ebuild 8100
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 MD5 23dc72c0593598205f5a04485fa26c43 files/sun-jdk-1.5.0_beta1 510
@@ -17,6 +18,7 @@ MD5 511ddb04ecb42c5574987c882c7f34a2 files/sun-jdk-1.3.1.10 452
 MD5 cb0de5062b15a7a2932f93d3fc06a75c files/sun-jdk-1.4.1.06 453
 MD5 1e16ba898d1d2c316071a9cedbc8cb86 files/sun-jdk-1.4.2.03 507
 MD5 95de036c7345d0fd444408a855b47925 files/sun-jdk-1.4.2.04 501
+MD5 23b60f3127f8ba04b0945493a0c3eba4 files/sun-jdk-1.4.2.05 503
 MD5 e089ba4610fef6873f7babe744e4e2d6 files/digest-sun-jdk-1.5.0_beta1-r1 157
 MD5 3fa9afb39fe6c07d974d1e22061000df files/digest-sun-jdk-1.5.0_beta2-r1 224
 MD5 094dd610ffa5d7f03b8174b76a5db6ae files/digest-sun-jdk-1.5.0_beta2 155
@@ -27,4 +29,5 @@ MD5 7b0d2e578d7bc3c00ab9b67590b7b3ca files/digest-sun-jdk-1.3.1.10 76
 MD5 758406756bec272a9edfb8f09979c1f9 files/digest-sun-jdk-1.4.1.06 76
 MD5 cecdd73e91e2ceba74fa83949b359c02 files/digest-sun-jdk-1.4.2.03 76
 MD5 e11eda1d48aafd7605f595a9884230e3 files/digest-sun-jdk-1.4.2.04 76
+MD5 dbb142ea361e1f8ac87d899f62f66c89 files/digest-sun-jdk-1.4.2.05 140
 MD5 ced122a769da8f4bfd205c28cb599356 files/sun-jdk-1.5.0_beta2-r1 487
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.05 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.05
new file mode 100644
index 000000000000..5828f8b163d0
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.05
@@ -0,0 +1,2 @@
+MD5 825ff134f3e370f6e677638d32962082 j2sdk-1_4_2_05-linux-i586.bin 36384457
+MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.2.05 b/dev-java/sun-jdk/files/sun-jdk-1.4.2.05
new file mode 100644
index 000000000000..9c80eb9b70c3
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.2.05
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.2.05,v 1.1 2004/07/14 19:40:05 axxo Exp $
+
+VERSION="Sun JDK @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
+ADDLDPATH="/opt/@P@/jre/lib"
+MANPATH="/opt/@P@/man"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.04-r2.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.04-r2.ebuild
index a35fcf6d94e9..05a5a9f1334d 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.04-r2.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.04-r2.ebuild
@@ -1,17 +1,21 @@
 # Copyright 1999-2004 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.04-r2.ebuild,v 1.2 2004/06/24 22:44:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.04-r2.ebuild,v 1.3 2004/07/14 19:40:05 axxo Exp $
 
 IUSE="doc gnome kde mozilla jce"
 
 inherit java nsplugins
 
-MY_PV="j2sdk-${PV//./_}-linux-i586"
-At="${MY_PV}.bin"
-jce_policy="jce_policy-1_4_2.zip"
-S="${WORKDIR}/j2sdk1.4.2_04"
-DESCRIPTION="Sun's J2SE Development Kit, version 1.4.2_04"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/download.html"
+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"
@@ -36,14 +40,18 @@ 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="pemsv"
 
+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"
+
 pkg_nofetch() {
 	einfo "Please download ${At} from:"
-	einfo ${HOMEPAGE}
+	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 ${HOMEPAGE}
+		einfo ${DOWNLOAD_URL_JCE}
 		einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files"
 		einfo "and move it to ${DISTDIR}"
 	fi
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
new file mode 100644
index 000000000000..77af8e0cf162
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2004 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.05.ebuild,v 1.1 2004/07/14 19:40:05 axxo Exp $
+
+IUSE="doc gnome kde mozilla jce"
+
+inherit java nsplugins
+
+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 -ppc -sparc -alpha -mips -hppa"
+RESTRICT="fetch"
+
+DEPEND=">=dev-java/java-config-1.1.5
+	sys-apps/sed
+	app-arch/unzip
+	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
+RDEPEND="sys-libs/lib-compat"
+
+PROVIDE="virtual/jre-1.4.2
+	virtual/jdk-1.4.2
+	virtual/java-scheme-2"
+
+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="pemsv"
+
+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"
+
+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
+		eerror "cannot read ${MY_PV}.bin. Please check the permission and try again."
+		die
+	fi
+	if use jce; then
+		if [ ! -r ${DISTDIR}/${jce_policy} ]; then
+			eerror "cannot read ${jce_policy}. Please check the permission and try again."
+			die
+		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
+		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/
+	cp -a demo 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
+
+	local plugin_dir="ns610"
+	if has_version '>=gcc-3.2*' ; then
+		plugin_dir="ns610-gcc32"
+	fi
+	if use mozilla ; then
+		install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+	fi
+	inst_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+
+	# 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}\/jre/" \
+		-e "s/\(Name=Java\)/\1 Control Panel/" \
+		${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+		${T}/sun_java.desktop
+
+	if use gnome ; then
+		#TODO check this on Gnome
+		dodir /usr/share/applications
+		insinto /usr/share/applications
+		doins ${T}/sun_java.desktop
+	fi
+	if use kde ; then
+		dodir /usr/share/applnk/Internet
+		insinto /usr/share/applnk/Internet
+		doins ${T}/sun_java.desktop
+	fi
+
+	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
+
+	# Set as default VM if none exists
+	java_pkg_postinst
+
+	#Show info about netscape
+	if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then
+		einfo "********************************************************"
+		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"
+		einfo "********************************************************"
+		echo
+	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
+		einfo "setting up conservative PaX flags for jar, javac and java"
+
+		for paxkills in "jar" "javac" "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
+		done
+
+		# /opt/sun-jdk-1.4.2.03/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/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 + pappy@gentoo.org"
+	fi
+
+	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
+	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
+	einfo "*********************************************************"
+	eerror "Some parts of Sun's JDK require XFree86 to be installed."
+	eerror "Be careful which Java libraries you attempt to use."
+	einfo "*********************************************************"
+	echo
+
+	einfo "******************************************************"
+	einfo " After installing ${P} this"
+	einfo " was set as the default JVM to run."
+	einfo " When finished please run the following so your"
+	einfo " enviroment gets updated."
+	eerror "    /usr/sbin/env-update && source /etc/profile"
+	einfo " Or use java-config program to set your preferred VM"
+	einfo "******************************************************"
+
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	sleep 8
+
+}