Version bump, closes 55817

6 files changed, 225 insertions, 7 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 7b7ed40df8d6..3d72acc0b2f3 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jre
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.3 2004/06/24 22:44:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.4 2004/07/14 13:39:39 axxo Exp $
+
+*sun-jre-bin-1.4.2.05 (14 Jul 2004)
+
+  14 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +files/sun-jre-bin-1.4.2.05,
+  sun-jre-bin-1.4.2.04.ebuild, +sun-jre-bin-1.4.2.05.ebuild:
+  Version bump, closes 55817
 
   06 Jun 2004; Aron Griffis <agriffis@gentoo.org> sun-jre-bin-1.4.2.04.ebuild:
   Fix use invocation
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 4b553afac9a6..0b236320af65 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -1,5 +1,10 @@
-MD5 b725d44e100bdc49793ddf22d54cfa03 sun-jre-bin-1.4.2.04.ebuild 6046
-MD5 fed8575144d6e58faa54a08527e28be9 ChangeLog 1112
+MD5 60e64b27b46e3612ce006233701b5eff sun-jre-bin-1.4.2.05.ebuild 6164
+MD5 399edb537708b9c73776938aa4029d69 .#Manifest.1.4 530
+MD5 b998b7b303e24d4d669a76d96406091b sun-jre-bin-1.4.2.04.ebuild 6160
+MD5 478c2530b2c68cb9fb6aaf12a92746b6 .#sun-jre-bin-1.4.2.04.ebuild.1.3 6164
+MD5 d49f3ada44ef155e0b92c648e587b399 ChangeLog 1318
 MD5 ca35f917561afc166491d77810b71095 metadata.xml 242
 MD5 e07441b78702c3da499536d55efb16ab files/digest-sun-jre-bin-1.4.2.04 75
+MD5 ea64994bb63f18d8c29ce57e4f5d80ea files/digest-sun-jre-bin-1.4.2.05 75
 MD5 0efb0dd6aadf7772acc640caebb5f5d9 files/sun-jre-bin-1.4.2.04 474
+MD5 0efb0dd6aadf7772acc640caebb5f5d9 files/sun-jre-bin-1.4.2.05 474
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.05 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.05
new file mode 100644
index 000000000000..d113e0cf7148
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.05
@@ -0,0 +1 @@
+MD5 cea966425860e698e087d63d2e5f7c89 j2re-1_4_2_05-linux-i586.bin 14381383
diff --git a/dev-java/sun-jre-bin/files/sun-jre-bin-1.4.2.05 b/dev-java/sun-jre-bin/files/sun-jre-bin-1.4.2.05
new file mode 100644
index 000000000000..62dc521f802a
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/sun-jre-bin-1.4.2.05
@@ -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-jre-bin/files/sun-jre-bin-1.4.2.05,v 1.1 2004/07/14 13:39:39 axxo Exp $
+
+VERSION="Sun JRE @PV@"
+JAVA_HOME=/opt/@P@
+JRE_HOME=/opt/@P@
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
+ADDLDPATH="/opt/@P@/lib"
+MANPATH="/opt/@P@/man"
+ENV_VARS="JAVA_HOME JRE_HOME ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.04.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.04.ebuild
index 09ce5e383614..eb75a1ac20fe 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.04.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.04.ebuild,v 1.4 2004/07/14 13:23:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.04.ebuild,v 1.5 2004/07/14 13:39:39 axxo Exp $
 
 IUSE="gnome kde mozilla"
 
@@ -8,8 +8,8 @@ inherit java nsplugins
 
 At="j2re-1_4_2_04-linux-i586.bin"
 S="${WORKDIR}/j2re1.4.2_04"
-DESCRIPTION="Sun's J2SE Platform, version 1.4.2_04"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/download.html"
+DESCRIPTION="Sun's J2SE Platform"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
 SRC_URI=${At}
 SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
@@ -30,9 +30,11 @@ lib/ext/localedata.jar lib/plugin.jar 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=j2re-1.4.2_04-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
 pkg_nofetch() {
 	einfo "Please download ${At} from:"
-	einfo ${HOMEPAGE}
+	einfo ${DOWNLOAD_URL}
 	einfo "(select the \"Linux self-extracting file\" package format of the JRE"
 	einfo "and move it to ${DISTDIR}"
 }
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05.ebuild
new file mode 100644
index 000000000000..1e3e98eb4a0c
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05.ebuild,v 1.1 2004/07/14 13:39:39 axxo Exp $
+
+IUSE="doc gnome kde mozilla"
+
+inherit java nsplugins
+
+At="j2re-1_4_2_05-linux-i586.bin"
+S="${WORKDIR}/j2re1.4.2_05"
+DESCRIPTION="Sun's J2SE Platform"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
+SRC_URI=${At}
+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"
+
+RDEPEND="sys-libs/lib-compat"
+
+PROVIDE="virtual/jre-1.4.2
+	virtual/java-scheme-2"
+
+PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar
+lib/ext/localedata.jar lib/plugin.jar 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=j2re-1.4.2_05-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${DOWNLOAD_URL}
+	einfo "(select the \"Linux self-extracting file\" package format of the JRE"
+	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 || 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 lib man javaws plugin"
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -a $i ${D}/opt/${P}/
+	done
+
+	dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
+	dohtml Welcome.html ControlPanel.html
+
+	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}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+	fi
+	inst_plugin /opt/${P}/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}/" \
+		-e "s/\(Name=Java\)/\1 Control Panel/" \
+		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
+		${T}/sun_java.desktop
+
+	if use gnome ; then
+		#TODO check this on Gnome
+		dodir /usr/share/gnome/apps/Internet
+		insinto /usr/share/gnome/apps/Internet
+		doins ${T}/sun_java.desktop
+	fi
+	if use kde ; then
+		dodir $KDEDIR/share/applnk/Internet
+		insinto $KDEDIR/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
+
+	#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 "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
+		done
+
+		# /opt/sun-jdk-1.4.2.03/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/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-jre 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
+
+	# Set as default VM if none exists
+	if [ ! -f "${JAVAC}" ] ; then
+		java_pkg_postinst
+
+		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 "******************************************************"
+	fi
+
+	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
+
+}
+
+pkg_prerm() {
+	if [ ! -z "$(java-config -J | grep ${P})" ] ; then
+		java-config -J
+		ewarn "It appears you are removing your default system VM!"
+		ewarn "Please run java-config -L then java-config-S to set a new system VM!"
+	fi
+}