remove version from src_uri, version bump, closes 55296

6 files changed, 186 insertions, 9 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 890e9a113225..ba41d09020ae 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.78 2004/07/14 19:40:05 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.79 2004/07/14 20:25:47 axxo Exp $
+
+*sun-jdk-1.3.1.12 (14 Jul 2004)
+
+  14 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +files/sun-jdk-1.3.1.12,
+  sun-jdk-1.3.1.10.ebuild, +sun-jdk-1.3.1.12.ebuild:
+  remove version from src_uri
+  version bump, closes 55296
 
 *sun-jdk-1.4.2.05 (14 Jul 2004)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 3f6caae857ec..40242517a8d5 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -2,19 +2,21 @@ MD5 eb1a4d102d6222d06c92f2f951d35e54 sun-jdk-1.4.2.04-r1.ebuild 7164
 MD5 e05d67e73e52b42ef8e2884a08abd741 sun-jdk-1.3.1.09.ebuild 4468
 MD5 26dabe5196081e3ef46ef80d1b7e9ca5 sun-jdk-1.4.2.04.ebuild 5980
 MD5 e7c53343a73adba1109200374e655213 sun-jdk-1.5.0_beta2-r1.ebuild 8103
-MD5 c5af6a62cd72933e29393e71785c0265 sun-jdk-1.3.1.10.ebuild 4498
+MD5 1906442891ab5eab96c1e7e04ec1964f sun-jdk-1.3.1.10.ebuild 4675
 MD5 1a713b65cd35161e5c54bd3a4f877283 sun-jdk-1.5.0_beta1-r1.ebuild 6676
+MD5 f34698cf57de50779cbf2f5cd7055023 sun-jdk-1.3.1.12.ebuild 4675
 MD5 04dd51ce8dfe00cd681076b0e0e9000c sun-jdk-1.4.2.03.ebuild 5992
 MD5 65c2bc21da2262ddeb940d657dcc9ff0 sun-jdk-1.4.1.06.ebuild 3316
 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 843e3b89572a52e3de16773053e44e74 ChangeLog 17077
 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
 MD5 a46e6de4e40dfdca9cb4e20c0e81faf8 files/sun-jdk-1.5.0_beta2 480
 MD5 4a5fc5c0684f6b528b3ae31a97f84f2b files/sun-jdk-1.3.1.09 452
 MD5 511ddb04ecb42c5574987c882c7f34a2 files/sun-jdk-1.3.1.10 452
+MD5 03c3650c15d7652c3531201d9e823eee files/sun-jdk-1.3.1.12 448
 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
@@ -26,6 +28,7 @@ MD5 e88f84fa4a8c251de5ca40b04b094f06 files/digest-sun-jdk-1.4.2.04-r1 140
 MD5 e88f84fa4a8c251de5ca40b04b094f06 files/digest-sun-jdk-1.4.2.04-r2 140
 MD5 951b3321a6c971e8af7c5b12816f3db0 files/digest-sun-jdk-1.3.1.09 76
 MD5 7b0d2e578d7bc3c00ab9b67590b7b3ca files/digest-sun-jdk-1.3.1.10 76
+MD5 7e43d52edafc22eb69110fbdd1b93104 files/digest-sun-jdk-1.3.1.12 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
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.12 b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.12
new file mode 100644
index 000000000000..6776b53d7fb5
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.12
@@ -0,0 +1 @@
+MD5 551999da29041191481d89fa38e4ee9b j2sdk-1_3_1_12-linux-i586.bin 26645804
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.3.1.12 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.12
new file mode 100644
index 000000000000..67eb4761ff77
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.3.1.12
@@ -0,0 +1,11 @@
+# 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.3.1.12,v 1.1 2004/07/14 20:25:47 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"
+ADDLDPATH="/opt/@P@/jre/lib"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.10.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.10.ebuild
index a2f38ec1a738..c68493191598 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.10.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.10.ebuild
@@ -1,16 +1,20 @@
 # 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.3.1.10.ebuild,v 1.6 2004/07/14 13:20:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.10.ebuild,v 1.7 2004/07/14 20:25:47 axxo Exp $
 
 IUSE="doc mozilla"
 
 inherit java nsplugins
 
-At="j2sdk-1_3_1_10-linux-i586.bin"
-S="${WORKDIR}/jdk1.3.1_10"
+MY_PV=${PV%.*}_${PV##*.}
+MY_P=jdk${MY_PV}
+MY_PVB=${PV%.*}
+
+At="j2sdk-${PV//./_}-linux-i586.bin"
+S="${WORKDIR}/${MY_P}"
 SRC_URI="${At}"
-DESCRIPTION="Sun Java Development Kit 1.3.1_10"
-HOMEPAGE="http://java.sun.com/j2se/1.3/download.html"
+DESCRIPTION="Sun Java Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.3/"
 DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.7
 	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
@@ -26,9 +30,11 @@ RESTRICT="fetch"
 # 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"
+
 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}"
 }
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild
new file mode 100644
index 000000000000..d6026a525021
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild
@@ -0,0 +1,149 @@
+# 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.3.1.12.ebuild,v 1.1 2004/07/14 20:25:47 axxo Exp $
+
+IUSE="doc mozilla"
+
+inherit java nsplugins
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_P=jdk${MY_PV}
+MY_PVB=${PV%.*}
+
+At="j2sdk-${PV//./_}-linux-i586.bin"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="${At}"
+DESCRIPTION="Sun Java Development Kit"
+HOMEPAGE="http://java.sun.com/j2se/1.3/"
+DEPEND="virtual/libc
+	>=dev-java/java-config-0.2.7
+	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
+RDEPEND="sys-libs/lib-compat"
+PROVIDE="virtual/jre-1.3.1
+	virtual/jdk-1.3.1
+	virtual/java-scheme-2"
+LICENSE="sun-bcla-java-vm"
+SLOT="1.3"
+KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa"
+RESTRICT="fetch"
+
+# 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"
+
+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}"
+}
+
+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 "\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
+	rm install.sfx
+}
+
+src_install () {
+	local dirs="bin include include-old jre lib"
+	dodir /opt/${P}
+
+	for i in ${dirs} ; do
+		if [ "${i}" == "bin" ] ; then
+			dodir /opt/${P}/${i}
+			cp -a ${i}/.java_wrapper ${D}/opt/${P}/bin/
+			cp -a ${i}/* ${D}/opt/${P}/bin/
+		elif [ "${i}" == "jre" ] ; then
+			dodir /opt/${P}/${i}
+			dodir /opt/${P}/${i}/bin
+			cp -a ${i}/bin/.java_wrapper ${D}/opt/${P}/${i}/bin/
+			cp -a ${i}/bin/* ${D}/opt/${P}/${i}/bin/
+			cp -a 	${i}/CHANGES \
+				${i}/COPYRIGHT \
+				${i}/ControlPanel.html \
+				${i}/LICENSE \
+				${i}/README \
+				${i}/Welcome.html \
+				${i}/lib \
+				${i}/plugin \
+				${D}/opt/${P}/${i}/
+		else
+			cp -a ${i} ${D}/opt/${P}/
+		fi
+	done
+
+	dodoc COPYRIGHT README LICENSE
+	dohtml README.html
+
+	doman man/man1/*.1
+
+	dodir /opt/${P}/share/
+	cp -a demo src.jar ${D}/opt/${P}/share/
+
+	if use mozilla ; then
+		dodir /usr/lib/mozilla/plugins
+		dosym /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
+	fi
+
+	set_java_env ${FILESDIR}/${VMHANDLE} || die
+}
+
+pkg_postinst () {
+	# Set as default VM if none exists
+	java_pkg_postinst
+	inst_plugin /opt/${P}/jre/plugin/i386/mozilla/libjavaplugin_oji.so
+
+	# 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.3.1.09/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
+}