close 81874

Package-Manager: portage-2.0.51.19

5 files changed, 14 insertions, 237 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 226607a6bf92..ed11015af2d7 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-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.21 2005/03/28 01:14:30 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.22 2005/04/03 20:08:41 axxo Exp $
+
+  03 Apr 2005; Thomas Matthijs <axxo@gentoo.org>
+  sun-jre-bin-1.4.2.07-r1.ebuild, -sun-jre-bin-1.5.0.01-r1.ebuild,
+  sun-jre-bin-1.5.0.02.ebuild:
+  clean up kde/gnome use flags, tnx to Diego Pettenò
+  <dgp85@users.sourceforge.net> in 81874
 
 *sun-jre-bin-1.5.0.02 (28 Mar 2005)
 
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.01-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.01-r1
deleted file mode 100644
index 46868378dd86..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.01-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 24cdc55898afd18d9eb893813a07a560 jre-1_5_0_01-linux-i586.bin 16517969
-MD5 75a38825f4b2c18f08d4bc2da6e9b768 jre-1_5_0_01-linux-amd64.bin 16138383
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild
index c1728b3f050f..d84fa8954974 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.07-r1.ebuild,v 1.1 2005/03/25 22:38:15 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.07-r1.ebuild,v 1.2 2005/04/03 20:08:41 axxo Exp $
 
 inherit java eutils
 
@@ -15,7 +15,7 @@ SLOT="1.4"
 LICENSE="sun-bcla-java-vm-1.4.2"
 KEYWORDS="x86 -*"
 RESTRICT="fetch"
-IUSE="gnome kde mozilla"
+IUSE="mozilla"
 
 DEPEND=">=dev-java/java-config-1.1.5
 	sys-apps/sed"
@@ -95,18 +95,7 @@ src_install () {
 		-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 /usr/share/applnk/Internet
-		insinto /usr/share/applnk/Internet
-		doins ${T}/sun_java.desktop
-	fi
+	domenu ${T}/sun_java.desktop
 
 	set_java_env ${FILESDIR}/${VMHANDLE}
 
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.01-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.01-r1.ebuild
deleted file mode 100644
index 689682115910..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.01-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2005 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.01-r1.ebuild,v 1.1 2005/03/25 22:38:15 luckyduck 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="~x86 ~amd64"
-RESTRICT="fetch"
-IUSE="gnome kde mozilla"
-
-DEPEND=">=dev-java/java-config-1.2
-	sys-apps/sed
-	virtual/lpr"
-
-RDEPEND="x86? ( sys-libs/lib-compat )
-	virtual/lpr"
-
-PROVIDE="virtual/jre-1.5"
-
-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() {
-	einfo "Please download ${At} from:"
-	einfo ${FETCH_SDK}
-	einfo "(Select the Linux or Linux AMD64 Self-extracting (.bin), depending on your arch)"
-	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 -a $i ${D}/opt/${P}/ || die "failed to build"
-	done
-
-	dodoc COPYRIGHT LICENSE README
-	dohtml Welcome.html
-
-	if use mozilla; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=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.desktop
-
-	if use x86; then
-		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 /usr/share/applnk/Internet
-			insinto /usr/share/applnk/Internet
-			doins ${T}/sun_java.desktop
-		fi
-	else
-		eerror "Sorry no kde, gnome support for your arch now."
-	fi
-
-	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
-
-	#Show info about netscape
-	if has_version '>=netscape-navigator-4.79-r1' || has_version '>=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 + pappy@gentoo.org"
-	fi
-
-	echo
-	eerror "Some parts of Sun's JRE require XFree86 to be installed."
-	eerror "Be careful which Java libraries you attempt to use."
-
-	ebeep 5
-	epause 8
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild
index ea7a1d023d8c..0627798eb8b9 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.02.ebuild,v 1.1 2005/03/28 01:14:30 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.02.ebuild,v 1.2 2005/04/03 20:08:41 axxo Exp $
 
 inherit java eutils
 
@@ -24,7 +24,7 @@ SLOT="1.5"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 ~amd64"
 RESTRICT="fetch"
-IUSE="gnome kde mozilla"
+IUSE="mozilla"
 
 DEPEND=">=dev-java/java-config-1.2
 	sys-apps/sed
@@ -121,22 +121,7 @@ src_install() {
 		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
 		${T}/sun_java.desktop
 
-	if use x86; then
-		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 /usr/share/applnk/Internet
-			insinto /usr/share/applnk/Internet
-			doins ${T}/sun_java.desktop
-		fi
-	else
-		eerror "Sorry no kde, gnome support for your arch now."
-	fi
+	domenu ${T}/sun_java.desktop
 
 	set_java_env ${FILESDIR}/${VMHANDLE}
 }
@@ -190,9 +175,6 @@ pkg_postinst() {
 	fi
 
 	echo
-	eerror "Some parts of Sun's JRE require XFree86 to be installed."
+	eerror "Some parts of Sun's JRE require virtual/x11 to be installed."
 	eerror "Be careful which Java libraries you attempt to use."
-
-	ebeep 5
-	epause 8
 }