[patch] Several fixes

blackdown-jdk-1.4.2_rc1-r1.patch (text/plain), 1.84 KB, created by Andy Daniels on 2004-06-28 14:17:15 UTC

--- /usr/portage/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild	2004-06-24 17:36:53.000000000 -0500
+++ blackdown-jdk-1.4.2_rc1.ebuild	2004-06-28 15:16:49.463678744 -0500
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild,v 1.11 2004/06/24 22:18:36 agriffis Exp $
 
-IUSE="doc"
+IUSE="doc mozilla"
 
 inherit java nsplugins
 
@@ -94,24 +94,26 @@
 	dodoc COPYRIGHT LICENSE README INSTALL
 	dohtml README.html
 
-	# Install mozilla plugin
-	case ${ARCH} in
-		amd64|x86) platform="i386" ;;
-		ppc) platform="ppc" ;;
-		sparc*) platform="sparc" ;;
-	esac
-	inst_plugin /opt/${P}/jre/plugin/${platform}/mozilla/javaplugin_oji.so
+	# Install mozilla plugin if mozilla use flag is set
+	if use mozilla ; then
+		case ${ARCH} in
+			amd64) platform="amd64" ;;
+			ppc) platform="ppc" ;;
+			sparc*) platform="sparc" ;;
+			x86) platform="i386" ;;
+		esac
+		inst_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
+	fi
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
-	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/jre/lib/font.properties
+	dosed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/jre/lib/font.properties
 
 	# install env into /etc/env.d
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 
 	# Fix for bug 26629
-	if [ "${PROFILE_ARCH}" = "sparc64" ]
-	then
+	if [ "${PROFILE_ARCH}" = "sparc64" ]; then
 		dosym /opt/${P}/jre/lib/sparc /opt/${P}/jre/lib/sparc64
 	fi
 
@@ -134,7 +136,7 @@
 			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
 		done
 
-		# /opt/blackdown-jdk-1.4.1/jre/bin/java_vm
+		# /opt/blackdown-jdk-1.4.2_rc1/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"