No longer installs libjsoundalsa.so with USE=-alsa, to fix bug #115734.

Package-Manager: portage-2.1_pre3-r1

6 files changed, 400 insertions, 5 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 3201c27d003b..0ec4a9973c76 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.45 2006/01/14 23:16:35 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.46 2006/01/16 18:45:56 nichoj Exp $
+
+*sun-jre-bin-1.5.0.06-r1 (16 Jan 2006)
+*sun-jre-bin-1.4.2.10-r1 (16 Jan 2006)
+
+  16 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
+  +sun-jre-bin-1.4.2.10-r1.ebuild, +sun-jre-bin-1.5.0.06-r1.ebuild:
+  No longer installs libjsoundalsa.so with USE=-alsa, to fix bug #115734.
 
   14 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
   sun-jre-bin-1.4.2.10.ebuild, sun-jre-bin-1.5.0.06.ebuild:
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index b288b93c53e3..7c649cd5f6c2 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d5e5c70c4df75541507b84ed91369f62 ChangeLog 8474
+MD5 b7afed95ec9fcda39d39c880036b0c04 ChangeLog 8746
 MD5 e62fb7994ee4fc5c246eb5f053746d8b files/digest-sun-jre-bin-1.4.2.10 75
+MD5 e62fb7994ee4fc5c246eb5f053746d8b files/digest-sun-jre-bin-1.4.2.10-r1 75
 MD5 d6ba359d678ea416f72caca9d8d35913 files/digest-sun-jre-bin-1.5.0.06 149
+MD5 d6ba359d678ea416f72caca9d8d35913 files/digest-sun-jre-bin-1.5.0.06-r1 149
 MD5 8bca9ee7188cd9e4104e950ee936039e files/sun-jre-bin-1.4.2.10 571
 MD5 9cf7f9c6cae445c33f949a1679b19f72 files/sun-jre-bin-1.5.0.06 575
 MD5 ca35f917561afc166491d77810b71095 metadata.xml 242
+MD5 3e960fe8a3fb1ff7433be9af03074dfc sun-jre-bin-1.4.2.10-r1.ebuild 5295
 MD5 197d0be23fcb408ecbf22a51f797f1ef sun-jre-bin-1.4.2.10.ebuild 5235
+MD5 983b34f14ff6911e416bb7e88d1d8a91 sun-jre-bin-1.5.0.06-r1.ebuild 5764
 MD5 48ed4c9fe144dd750ab534366635b761 sun-jre-bin-1.5.0.06.ebuild 5703
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDyYZkndWRXhKOboURAhHXAKCa5rd94QwAYcvcHtcVYlqrlR87xACg8Lnc
-jy07Bx+TulRZWeZ8wil947s=
-=SczZ
+iD8DBQFDy+n6ndWRXhKOboURAhTQAKDP29jBayWcszVau8T/kGWt3z6CIACeOeiF
+eR80aMWdi7mulKKOeF96zsU=
+=mkuT
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.10-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.10-r1
new file mode 100644
index 000000000000..63fb1d534950
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.10-r1
@@ -0,0 +1 @@
+MD5 e9a9cb196308783c72666f3707b84919 j2re-1_4_2_10-linux-i586.bin 14417572
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06-r1
new file mode 100644
index 000000000000..f49d291f02bb
--- /dev/null
+++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06-r1
@@ -0,0 +1,2 @@
+MD5 6a771c3c9e93021ab34a30bcf609c74b jre-1_5_0_06-linux-amd64.bin 16403250
+MD5 e0a88dbec9bfe3195794bb652bfc6516 jre-1_5_0_06-linux-i586.bin 16769166
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10-r1.ebuild
new file mode 100644
index 000000000000..ef66f15e79f1
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2006 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.10-r1.ebuild,v 1.1 2006/01/16 18:45:56 nichoj Exp $
+
+inherit java eutils
+
+MY_PV=${PV%.*}_${PV##*.}
+MY_PV2=${PV//./_}
+At="j2re-${MY_PV2}-linux-i586.bin"
+S="${WORKDIR}/j2re${MY_PV}"
+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-1.4.2"
+KEYWORDS="-* ~x86"
+RESTRICT="fetch stricter"
+IUSE="X alsa browserplugin nsplugin mozilla"
+
+DEPEND="sys-apps/sed"
+
+RDEPEND="sys-libs/glibc
+	alsa? ( media-libs/alsa-lib )
+	X? ( || (	(
+				x11-libs/libX11
+				x11-libs/libXext
+				x11-libs/libXi
+				x11-libs/libXp
+				x11-libs/libXt
+				x11-libs/libXtst
+			)
+
+			virtual/x11
+		)
+	)"
+
+PROVIDE="virtual/jre"
+
+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-${MY_PV}-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
+		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $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 -pPR $i ${D}/opt/${P}/
+	done
+
+	dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
+	dohtml Welcome.html ControlPanel.html
+
+	if use nsplugin ||       # global useflag for netscape-compat plugins
+	   use browserplugin ||  # deprecated but honor for now
+	   use mozilla; then     # wrong but used to honor it
+		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
+
+	# 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-jre.desktop
+	domenu ${T}/sun_java-jre.desktop
+
+	use !alsa && java_remove-libjsoundalsa /opt/${P}/jre/
+
+	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
+
+	java_pkg_postinst
+
+	if ! use nsplugin && ( use browserplugin || use mozilla ); then
+		echo
+		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
+		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
+		ewarn "update your USE to include 'nsplugin'."
+	fi
+
+	# Show info about netscape
+	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
+		echo
+		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"
+	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
+		echo
+		einfo "setting up conservative PaX flags for jar, javac and java"
+
+		for paxkills in "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+		done
+
+		# /opt/sun-jdk-1.4.2.03/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/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
+
+	echo
+	eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
+	eerror "Be careful which Java libraries you attempt to use."
+}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06-r1.ebuild
new file mode 100644
index 000000000000..0507fc4e5f4e
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06-r1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2006 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.5.0.06-r1.ebuild,v 1.1 2006/01/16 18:45:56 nichoj Exp $
+
+inherit java eutils
+
+MY_PVL=${PV%.*}_${PV##*.}
+MY_PVA=${PV//./_}
+
+amd64file="jre-${MY_PVA}-linux-amd64.bin"
+x86file="jre-${MY_PVA}-linux-i586.bin"
+
+if use x86; then
+	At=${x86file}
+elif use amd64; then
+	At=${amd64file}
+fi
+
+S="${WORKDIR}/jre${MY_PVL}"
+DESCRIPTION="Sun's J2SE Platform"
+HOMEPAGE="http://java.sun.com/j2se/"
+SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )"
+SLOT="1.5"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="fetch stricter"
+IUSE="X alsa browserplugin nsplugin mozilla"
+
+DEPEND="sys-apps/sed"
+
+RDEPEND="sys-libs/glibc
+		alsa? ( media-libs/alsa-lib )
+		X? ( || ( (
+					x11-libs/libX11
+					x11-libs/libXext
+					x11-libs/libXi
+					x11-libs/libXp
+					x11-libs/libXt
+					x11-libs/libXtst
+				)
+				virtual/x11
+			)
+		)"
+
+PROVIDE="virtual/jre"
+
+PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar 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:80/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jre-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
+
+
+pkg_nofetch() {
+	local archtext=""
+
+	if use x86; then
+		archtext="Linux"
+	elif use amd64; then
+		archtext="Linux AMD64"
+	fi
+
+	einfo "Please download ${At} from:"
+	einfo ${FETCH_SDK}
+	einfo "Select the ${archtext} self-extracting file"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		die "cannot read ${At}. Please check the permission and try again."
+	fi
+
+	#Search for the ELF Header
+	testExp=`echo -e "\105\114\106"`
+	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}/bin/unpack200 ]; then
+		UNPACK_CMD=${S}/bin/unpack200
+		chmod +x $UNPACK_CMD
+		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $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
+		rm -f ${UNPACK_CMD}
+	else
+		die "unpack not found"
+	fi
+}
+
+src_install() {
+
+	if use amd64; then
+		local dirs="bin lib man"
+	else
+		local dirs="bin lib man plugin javaws"
+	fi
+
+
+	dodir /opt/${P}
+
+	for i in $dirs ; do
+		cp -pPR $i ${D}/opt/${P}/ || die "failed to build"
+	done
+
+	dodoc COPYRIGHT README
+	dohtml Welcome.html
+
+	if use nsplugin ||       # global useflag for netscape-compat plugins
+	   use browserplugin ||  # deprecated but honor for now
+	   use mozilla; then     # wrong but used to honor it
+		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}/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}/.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-jre.desktop
+
+	domenu ${T}/sun_java-jre.desktop
+
+	use !alsa && java_remove-libjsoundalsa /opt/${P}/jre/
+
+	set_java_env ${FILESDIR}/${VMHANDLE}
+}
+
+pkg_postinst() {
+	# Create files used as storage for system preferences.
+	PREFS_LOCATION=/opt/${P}/
+	mkdir -p ${PREFS_LOCATION}/.systemPrefs
+	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
+		touch $PREFS_LOCATION/.systemPrefs/.system.lock
+		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
+	fi
+	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
+		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
+		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
+	fi
+
+	# Set as default VM if none exists
+	java_pkg_postinst
+
+	if ! use nsplugin && ( use browserplugin || use mozilla ); then
+		echo
+		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
+		ewarn "future jdk/jre ebuilds for plugin installation. Please"
+		ewarn "update your USE to include 'nsplugin'."
+	fi
+
+	# Show info about netscape
+	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
+		echo
+		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}/plugin/i386/ns4/libjavaplugin.so"
+	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
+		echo
+		einfo "setting up conservative PaX flags for jar, javac and java"
+
+		for paxkills in "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+		done
+
+		# /opt/$VM/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/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
+
+	echo
+	eerror "Some parts of Sun's JRE require virtual/x11 and virtual/lpr to be installed."
+	eerror "Be careful which Java libraries you attempt to use."
+}