Fix QA violations and clean up

6 files changed, 117 insertions, 108 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index c86630aebe7c..94b8ef678944 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.32 2004/06/03 16:58:21 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.33 2004/06/07 02:40:27 agriffis Exp $
+
+  06 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1.ebuild,
+  blackdown-jre-1.4.2_rc1.ebuild:
+  Fix QA violations and clean up
 
   03 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org 
   blackdown-jdk-1.3.1-r9.ebuild, blackdown-jdk-1.4.1.ebuild,
diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index cc76a627209a..4650e882fead 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -1,11 +1,11 @@
-MD5 a0281ff4cdcf2b30b9241312faf39e5f ChangeLog 5246
-MD5 81a085dead67f473af809bbecc30de02 blackdown-jre-1.3.1-r9.ebuild 2384
-MD5 f95b776053160d51a33ba6542bbb53b5 blackdown-jre-1.4.1.ebuild 3085
+MD5 eeb856a826863fe162af12e5b8bd6869 blackdown-jre-1.4.2_rc1.ebuild 3718
+MD5 c2020190504fc2a1ee373b36c4996ecf blackdown-jre-1.4.1.ebuild 2481
+MD5 98ca5f619deb793b19ee2a92949db742 blackdown-jre-1.3.1-r9.ebuild 2150
+MD5 03d398466be9524233db2eb5b281e884 ChangeLog 5245
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 f833c8a4e29216c818501ab461ee6048 blackdown-jre-1.4.2_rc1.ebuild 4002
-MD5 6ddc272e064db7e213d01ed94aa028de files/blackdown-jre-1.3.1 438
-MD5 df57acb57106810b157d0efdd1f3aa5e files/blackdown-jre-1.4.1 438
-MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r9 79
-MD5 99eadcd54ca327f0dacc2d0d33db3175 files/digest-blackdown-jre-1.4.1 248
 MD5 50c8ae40dcce26fa3b50df75904f3ff2 files/blackdown-jre-1.4.2_rc1 442
+MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r9 79
 MD5 8cf05da3360f161e42c019159bccda1d files/digest-blackdown-jre-1.4.2_rc1 160
+MD5 de04c980ab46e3c7de37f9f61878b899 files/digest-blackdown-jre-1.4.1 248
+MD5 6ddc272e064db7e213d01ed94aa028de files/blackdown-jre-1.3.1 438
+MD5 df57acb57106810b157d0efdd1f3aa5e files/blackdown-jre-1.4.1 438
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
index e4b9cb730e56..e711606c1b10 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.12 2004/06/03 18:27:18 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.13 2004/06/07 02:40:27 agriffis Exp $
 
 inherit java nsplugins gcc
 
@@ -15,28 +15,44 @@ KEYWORDS="ppc"
 IUSE=""
 
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5"
+	>=dev-java/java-config-0.2.5
+	>=sys-apps/sed-4
+	>=sys-devel/gcc-3.2"
 PROVIDE="virtual/jre-1.3.1
 	virtual/java-scheme-2"
 
 src_unpack () {
-	if (use ppc) || (use sparc) || (use sparc64) ; then
-	# this is built on gcc 3.2 so only update if gcc 3.x is present
-	if [ "`gcc-major-version`" != "3" ] ; then
-		die "This is for gcc 3.x only"
-	fi
+	typeset a want_gcc_ver
 
-		tail -n +422 ${DISTDIR}/${A} | tar xjf -
+	if [[ $(gcc-major-version) -eq 3 && $(gcc-minor-version) -ge 2 ]]; then
+		want_gcc_ver=3.2
 	else
-		unpack ${A}
+		want_gcc_ver=2.95
 	fi
-	if (use sparc) || (use sparc64) ; then
+
+	for a in ${A}; do
+		if [[ ${a} == *gcc*.bin ]]; then
+			if [[ ${a} == *-gcc${want_gcc_ver}.bin ]]; then
+				echo ">>> Unpacking ${a}..."
+				tail -n +422 ${DISTDIR}/${a} | tar xjf - || die
+			fi
+		else
+			# Handle files (none right now) that don't have a gcc
+			# version dependency
+			unpack ${a}
+		fi
+	done
+
+	# On sparc the files are owned by 1000:100 for some reason
+	if use sparc || use sparc64 ; then
 		# The files are owned by 1000.100, for some reason.
 		chown -R root:root
 	fi
 }
 
 src_install () {
+	typeset platform
+
 	dodir /opt/${P}
 
 	cp -dpR ${S}/{bin,lib,man,plugin} ${D}/opt/${P}/
@@ -46,20 +62,14 @@ src_install () {
 	dohtml README.html
 
 	# Install mozilla plugin
-	if [ "${ARCH}" == "x86" ] ; then
-		PLATFORM="i386"
-	elif [ "${ARCH}" == "ppc" ] ; then
-		PLATFORM="ppc"
-	elif [ "${ARCH}" == "sparc" ] || [ "${ARCH}" == "sparc64" ] ; then
-		PLATFORM="sparc"
-	fi
-	inst_plugin /opt/${P}/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
+	case ${ARCH} in
+		amd64|x86) platform="i386" ;;
+		ppc) platform="ppc" ;;
+		sparc*) platform="sparc" ;;
+	esac
+	inst_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so
 
-	mv ${D}/opt/${P}/lib/font.properties ${D}/opt/${P}/lib/font.properties.orig
-	sed "s/standard symbols l/symbol/g" \
-		< ${D}/opt/${P}/lib/font.properties.orig \
-		> ${D}/opt/${P}/lib/font.properties
-	rm ${D}/opt/${P}/lib/font.properties.orig
+	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
 
 	set_java_env ${FILESDIR}/${VMHANDLE}
 }
@@ -75,8 +85,8 @@ pkg_postinst () {
 }
 
 pkg_prerm() {
-	if [ ! -z "$(java-config -J | grep ${P})" ] ; then
+	if java-config -J | grep -q ${P} ; then
 		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!"
+		ewarn "Please run java-config -L then java-config -S to set a new system VM!"
 	fi
-}
\ No newline at end of file
+}
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
index 8a705febc974..24986da9f700 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
@@ -1,30 +1,32 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.10 2004/06/03 18:27:18 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.11 2004/06/07 02:40:27 agriffis Exp $
 
 inherit java nsplugins gcc
 
 S=${WORKDIR}/j2re1.4.1
 DESCRIPTION="Blackdown Java Runtime Environment 1.4.1"
 
-if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -ge "2" ]
-then
-	SRC_URI="x86? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
-	amd64? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
-	sparc? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/sparc/01/j2re-1.4.1-01-linux-sparc-gcc3.2.bin"
-else
-	SRC_URI="x86? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc2.95.bin
-	amd64? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
-	sparc? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/sparc/01/j2re-1.4.1-01-linux-sparc-gcc3.2.bin"
-	use sparc && RDEPEND=">=sys-devel/gcc-3.2"
-	use amd64 && RDEPEND=">=sys-devel/gcc-3.2"
-fi
+SRC_URI="
+	x86? (
+		http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
+		http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc2.95.bin
+	)
+	amd64? (
+		http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
+	)
+	sparc? (
+		http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/sparc/01/j2re-1.4.1-01-linux-sparc-gcc3.2.bin
+	)"
 
 HOMEPAGE="http://www.blackdown.org"
 DEPEND="virtual/glibc
 	amd64? ( >=app-emulation/emul-linux-x86-baselibs-1 )
-	>=dev-java/java-config-0.2.5"
-RDEPEND="$RDEPEND $DEPEND"
+	>=dev-java/java-config-0.2.5
+	>=sys-apps/sed-4"
+RDEPEND="${DEPEND}
+	sparc? ( >=sys-devel/gcc-3.2 )
+	amd64? ( >=sys-devel/gcc-3.2 )"
 PROVIDE="virtual/jre-1.4.1
 	virtual/java-scheme-2"
 SLOT="0"
@@ -32,10 +34,31 @@ LICENSE="sun-bcla-java-vm"
 KEYWORDS="x86 sparc amd64"
 
 src_unpack () {
-	tail -n +461 ${DISTDIR}/${A} | tar xjf -
+	typeset a want_gcc_ver
+
+	if [[ $(gcc-major-version) -eq 3 && $(gcc-minor-version) -ge 2 ]]; then
+		want_gcc_ver=3.2
+	else
+		want_gcc_ver=2.95
+	fi
+
+	for a in ${A}; do
+		if [[ ${a} == *gcc*.bin ]]; then
+			if [[ ${a} == *-gcc${want_gcc_ver}.bin ]]; then
+				echo ">>> Unpacking ${a}..."
+				tail -n +461 ${DISTDIR}/${a} | tar xjf - || die
+			fi
+		else
+			# Handle files (none right now) that don't have a gcc
+			# version dependency
+			unpack ${a}
+		fi
+	done
 }
 
 src_install () {
+	typeset platform
+
 	dodir /opt/${P}
 
 	cp -a ${S}/{bin,lib,man,plugin} ${D}/opt/${P}/
@@ -45,22 +68,14 @@ src_install () {
 	dohtml README.html
 
 	# Install mozilla plugin
-	if [ "${ARCH}" == "x86" ] ; then
-		PLATFORM="i386"
-	elif [ "${ARCH}" == "amd64" ] ; then
-		PLATFORM="i386"
-	elif [ "${ARCH}" == "ppc" ] ; then
-		PLATFORM="ppc"
-	elif [ "${ARCH}" == "sparc" ] ; then
-		PLATFORM="sparc"
-	fi
-	inst_plugin /opt/${P}/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
+	case ${ARCH} in
+		amd64|x86) platform="i386" ;;
+		ppc) platform="ppc" ;;
+		sparc*) platform="sparc" ;;
+	esac
+	inst_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so
 
-	mv ${D}/opt/${P}/lib/font.properties ${D}/opt/${P}/lib/font.properties.orig
-	sed "s/standard symbols l/symbol/g" \
-		< ${D}/opt/${P}/lib/font.properties.orig \
-		> ${D}/opt/${P}/lib/font.properties
-	rm ${D}/opt/${P}/lib/font.properties.orig
+	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
 
 	set_java_env ${FILESDIR}/${VMHANDLE}
 
@@ -83,8 +98,8 @@ pkg_postinst () {
 }
 
 pkg_postrm() {
-	if [ ! -z "$(java-config -J | grep ${P})" ] ; then
+	if java-config -J | grep -q ${P} ; then
 		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
-}
\ No newline at end of file
+}
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild
index 564094e2fe18..933fd8aaf47c 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild,v 1.5 2004/06/03 18:27:18 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild,v 1.6 2004/06/07 02:40:27 agriffis Exp $
 
 IUSE="doc"
 
@@ -17,21 +17,7 @@ J_URI="ftp://ftp.tux.org/pub/java/JDK-${JV}"
 SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2re-${JV}-${JREV}-linux-amd64.bin )
 	x86? ( ${J_URI}/i386/${JREV}/j2re-${JV}-${JREV}-linux-i586-gcc3.2.bin )"
 #	sparc? ( ${J_URI}/sparc/${JREV}/j2re-${JV}-${JREV}-linux-sparc.bin )"
-
-
-if [ "${ARCH}" = "amd64" ]
-then
-	MY_A="j2re-${JV}-${JREV}-linux-amd64.bin"
-elif [ "${ARCH}" = "x86" ]
-then
-	MY_A="j2re-${JV}-${JREV}-linux-i586-gcc3.2.bin"
-elif [ "${ARCH}" = "sparc" ]
-then
-	MY_A="j2re-${JV}-${JREV}-linux-sparc.bin"
-elif [ "${ARCH}" = "ppc" ]
-then
-	MY_A="j2re-${JV}-${JREV}-linux-ppc.bin"
-fi
+#	ppc? ( ${J_URI}/ppc/${JREV}j2re-${JV}-${JREV}-linux-ppc.bin )"
 
 HOMEPAGE="http://www.blackdown.org"
 
@@ -40,7 +26,9 @@ LICENSE="sun-bcla-java-vm"
 KEYWORDS="-* amd64"
 
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.6"
+	>=dev-java/java-config-0.2.6
+	>=sys-apps/sed-4
+	>=sys-devel/gcc-3.2"
 
 PROVIDE="virtual/jre-1.4.2
 	virtual/java-scheme-2"
@@ -63,19 +51,18 @@ get_offset() {
 }
 
 src_unpack () {
-	local offset="`get_offset ${DISTDIR}/${MY_A}`"
+	local offset="`get_offset ${DISTDIR}/${A}`"
 
 	if [ -z "${offset}" ] ; then
 		eerror "Failed to get offset of tarball!"
 		die "Failed to get offset of tarball!"
 	fi
 
-	echo ">>> Unpacking ${MY_A}..."
-	tail -n +${offset} ${DISTDIR}/${MY_A} | tar --no-same-owner -jxp
+	echo ">>> Unpacking ${A}..."
+	tail -n +${offset} ${A} | tar --no-same-owner -jxp
 }
 
-unpack_jars()
-{
+unpack_jars() {
 	# New to 1.4.2 
 	local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
 	local JAVAHOME="${D}/opt/${P}"
@@ -113,25 +100,17 @@ src_install () {
 	dohtml README.html
 
 	# Install mozilla plugin
-	if [ "${ARCH}" = "x86" ] ; then
-		PLATFORM="i386"
-	fi
+	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
 
-	if [ "${ARCH}" = "amd64" ] ; then
-		PLATFORM="amd64"
-	fi
-
-	if [ "${ARCH}" = "sparc" ] ; then
-		PLATFORM="sparc"
-	fi
-
-	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
+	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/jre/lib/font.properties
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
-	dosed "s/standard symbols l/symbol/g" \
-		/opt/${P}/jre/lib/font.properties
-
 	# install env into /etc/env.d
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 
@@ -155,8 +134,8 @@ pkg_postinst () {
 }
 
 pkg_prerm() {
-	if [ ! -z "$(java-config -J | grep ${P})" ] ; then
+	if java-config -J | grep -q ${P} ; then
 		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
-}
\ No newline at end of file
+}
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1
index 6df842aee3ad..adcbc3beeda7 100644
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1
@@ -1,3 +1,3 @@
 MD5 bea9c5869c084815bee026d466094995 j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
+MD5 79b565410dd30548271b9a2802b9f564 j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
 MD5 29f856a10aae9f296a09a3f9deaf01b7 j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279
-MD5 3857975cd3b7ebcbe544ba0a46308e0c j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579