Get rid of MY_A which serves no purpose

3 files changed, 25 insertions, 51 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 23eaed170fc9..b520b3bfee2b 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.50 2004/06/02 22:37:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.51 2004/06/07 21:56:42 agriffis Exp $
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  blackdown-jdk-1.4.2_rc1.ebuild:
+  Get rid of MY_A which serves no purpose
 
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org>
   blackdown-jdk-1.3.1-r10.ebuild, blackdown-jdk-1.3.1-r7.ebuild,
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index e7a40a9db076..067d573a2754 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -1,9 +1,9 @@
 MD5 409d950b3d06a9a5db56e34d8e98a56e blackdown-jdk-1.3.1-r9.ebuild 2115
-MD5 621257c4a0a4744767a93f7bec1570bc blackdown-jdk-1.4.2_rc1.ebuild 4592
+MD5 a17f32ea2b13280ec29471f82421a763 blackdown-jdk-1.4.2_rc1.ebuild 4140
 MD5 776ed3b0e1d20fe7eccb3c83a27b9f23 blackdown-jdk-1.3.1-r8.ebuild 2120
 MD5 e06be0b920a82ede4677102d69631afc blackdown-jdk-1.3.1-r10.ebuild 2214
 MD5 24b2211bccb46bc6310df6ca7fcbbde4 blackdown-jdk-1.4.1.ebuild 3707
-MD5 48f3891d3ea9c2e2fe8a6c39e57a6d96 ChangeLog 9133
+MD5 5d3c462fe1515174e2817f1b2e6ae060 ChangeLog 9260
 MD5 d811dbb6e965b0a271aa4d8af18b7549 blackdown-jdk-1.3.1-r7.ebuild 2287
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 c2a9578c5cd914ca2a82dd9243ff0120 files/blackdown-jdk-1.3.1 603
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild
index 3116d0a75937..7e55bda96a60 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild
@@ -1,15 +1,13 @@
 # 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-jdk/blackdown-jdk-1.4.2_rc1.ebuild,v 1.9 2004/06/01 23:06:17 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild,v 1.10 2004/06/07 21:56:42 agriffis Exp $
 
 IUSE="doc"
 
 inherit java nsplugins
 
-JREV="rc1"
-
-JV="${PV}"
-JV="${JV/_rc1/}"
+JREV=${PV#*_}
+JV=${PV%_*}
 
 S="${WORKDIR}/j2sdk${JV}"
 DESCRIPTION="Blackdown Java Development Kit ${PV}"
@@ -18,21 +16,6 @@ SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2sdk-${JV}-${JREV}-linux-amd64.bin )
 	x86? ( ${J_URI}/i386/${JREV}/j2sdk-${JV}-${JREV}-linux-i586-gcc3.2.bin )"
 #	sparc? ( ${J_URI}/sparc/${JREV}/j2sdk-${JV}-${JREV}-linux-sparc.bin )"
 
-
-if [ "${ARCH}" = "amd64" ]
-then
-	MY_A="j2sdk-${JV}-${JREV}-linux-amd64.bin"
-elif [ "${ARCH}" = "x86" ]
-then
-	MY_A="j2sdk-${JV}-${JREV}-linux-i586-gcc3.2.bin"
-elif [ "${ARCH}" = "sparc" ]
-then
-	MY_A="j2sdk-${JV}-${JREV}-linux-sparc.bin"
-elif [ "${ARCH}" = "ppc" ]
-then
-	MY_A="j2sdk-${JV}-${JREV}-linux-ppc.bin"
-fi
-
 HOMEPAGE="http://www.blackdown.org"
 
 SLOT="1.4.2"
@@ -51,33 +34,28 @@ PROVIDE="virtual/jdk-1.4.2
 get_offset() {
 	[ ! -f "$1" ] && return
 
-	local offset="`gawk '
+	local offset=$(gawk '
 		/^[[:space:]]*skip[[:space:]]*=/ {
-
 			sub(/^[[:space:]]*skip[[:space:]]*=/, "")
 			SKIP = $0
 		}
+		END { print SKIP }' $1)
 
-		END { print SKIP }
-	' $1`"
-
-	eval echo $offset
+	echo $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 -jxpf - || die
+	echo ">>> Unpacking ${A}..."
+	tail -n +${offset} ${DISTDIR}/${A} | tar --no-same-owner -jxpf - || die
 }
 
-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}"
@@ -104,7 +82,7 @@ unpack_jars()
 }
 
 src_install () {
-	local PLATFORM=
+	typeset platform
 
 	dodir /opt/${P}
 
@@ -117,24 +95,16 @@ src_install () {
 	dohtml README.html
 
 	# Install mozilla plugin
-	if [ "${ARCH}" = "x86" ] ; then
-		PLATFORM="i386"
-	fi
-
-	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
+	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
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
-	dosed "s/standard symbols l/symbol/g" \
-		/opt/${P}/jre/lib/font.properties
+	sed -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