some fixups

2 files changed, 58 insertions, 27 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 9888e5a50716..562a592ab68a 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,13 +1,19 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.29 2003/02/18 10:05:00 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.30 2003/02/19 21:52:43 azarah Exp $
 
 *blackdown-jdk-1.4.1 (18 Feb 2003)
-  18 Feb 2003; Stefan Jones <cretin@gentoo.org> : blackdown-jdk-1.4.1.ebuild
+
+  19 Feb 2003; Martin Schlemmer <azarah@gentoo.org> blackdown-jdk-1.4.1.ebuild :
+  Do a few form fixes.  Make it easier to bump revision with JREV, etc
+  variables.  Add get_offset() to calc tarball offset in .bin.
+
+  18 Feb 2003; Stefan Jones <cretin@gentoo.org> : blackdown-jdk-1.4.1.ebuild :
   New stable version, now java plugin works without a java recompile!
   Recomended upgrade!
 
 *blackdown-jdk-1.3.1-r9 (27 Jan 2003)
+
   27 Jan 2003; Mark Guertin <gerk@gentoo.org> : blackdown-jdk-1.3.1-r9.ebuild,
   files/digest-blackdown-jdk-1.3.1-r9 :
   new version, set only as ~ppc for now (there are no other arches supported yet
@@ -19,7 +25,7 @@
  
 *blackdown-jdk-1.4.1_beta-1 (21 Nov 2002)
 
-  15 Dec 2002; Adrian Almenar <strider@gentoo.org> blackdown-jdk-1.4.1_beta-r1.ebuild:
+  15 Dec 2002; Adrian Almenar <strider@gentoo.org> blackdown-jdk-1.4.1_beta-r1.ebuild :
   Fixes bug #12082.
 
   21 Nov 2002; phoen][x <phoenix@gentoo.org> blackdown-jdk-1.4.1_beta-r1.ebuild,
@@ -34,7 +40,7 @@
 
 *blackdown-jdk-1.4.1_beta (18 Oct 2002)
 
-  15 Dec 2002; Adrian Almenar <strider@gentoo.org> blackdown-jdk-1.4.1_beta.ebuild:
+  15 Dec 2002; Adrian Almenar <strider@gentoo.org> blackdown-jdk-1.4.1_beta.ebuild :
   Fixes bug #12082.	
 	
   24 Oct 2002; Martin Schlemmer <azarah@gentoo.org> blackdown-jdk-1.4.1_beta.ebuild :
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
index 391835975036..88485e7ba7bf 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
@@ -1,41 +1,69 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v 1.1 2003/02/18 10:05:00 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v 1.2 2003/02/19 21:52:43 azarah Exp $
 
-inherit java nsplugins gcc
+IUSE="doc"
+
+inherit gcc java nsplugins
 
-S="${WORKDIR}/j2sdk1.4.1"
-DESCRIPTION="Blackdown Java Development Kit 1.4.1"
+JREV="01"
 
-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/j2sdk-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/j2sdk-1.4.1-01-linux-sparc-gcc3.2.bin"
+S="${WORKDIR}/j2sdk${PV}"
+DESCRIPTION="Blackdown Java Development Kit ${PV}"
+J_URI="ftp://ftp.gwdg.de/pub/languages/java/linux/JDK-${PV}"
+if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -ge "2" ] ; then
+	SRC_URI="x86? ( ${J_URI}/i386/${JREV}/j2sdk-${PV}-${JREV}-linux-i586-gcc3.2.bin )"
 else
-	SRC_URI="x86? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/i386/01/j2sdk-1.4.1-01-linux-i586-gcc2.95.bin
-	sparc? http://www.mirror.ac.uk/sites/ftp.blackdown.org/java-linux/JDK-1.4.1/sparc/01/j2sdk-1.4.1-01-linux-sparc-gcc3.2.bin"
-	use sparc && RDEPEND=">=sys-devel/gcc-3.2"
+	SRC_URI="x86? ( ${J_URI}/i386/${JREV}/j2sdk-${PV}-${JREV}-linux-i586-gcc2.95.bin )"
 fi
+SRC_URI="${SRC_URI} sparc? ( ${J_URI}/sparc/${JREV}/j2sdk-${PV}-${JREV}-linux-sparc-gcc3.2.bin )"
 
 HOMEPAGE="http://www.blackdown.org"
+
+SLOT="1.4.1"
+LICENSE="sun-bcla"
+KEYWORDS="~x86 -ppc ~sparc"
+
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.6
 	doc? ( =dev-java/java-sdk-docs-1.4.1* )"
-RDEPEND="$RDEPEND $DEPEND"
+
 PROVIDE="virtual/jdk-1.4.1
 	virtual/jre-1.4.1
 	virtual/java-scheme-2"
-SLOT="1.4.1"
-LICENSE="sun-bcla"
-KEYWORDS="~x86 -ppc ~sparc"
-IUSE="doc"
+
+# Extract the 'skip' value (offset of tarball) we should pass to tail
+get_offset() {
+	[ ! -f "$1" ] && return
+        
+	local offset="`gawk '
+		/^[[:space:]]*skip[[:space:]]*=/ {
+
+			sub(/^[[:space:]]*skip[[:space:]]*=/, "")
+			SKIP = $0
+		}
+                
+		END { print SKIP }
+	' $1`"
+
+	eval echo $offset
+}
 
 src_unpack () {
-	tail +522 ${DISTDIR}/${A} | tar --no-same-owner -jxp || die "Corrupted file ${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 ${A}..."
+	tail +${offset} ${DISTDIR}/${A} | tar --no-same-owner -jxp
 }
 
 
 src_install () {
+	local PLATFORM=
 
 	dodir /opt/${P}
 
@@ -48,7 +76,7 @@ src_install () {
 	dohtml README.html
 
 	# Install mozilla plugin
-	if [ "${ARCH}" == "x86" ] ; then
+	if [ "${ARCH}" = "x86" ] ; then
 		PLATFORM="i386"
 	fi
 
@@ -56,11 +84,8 @@ src_install () {
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
-	mv ${D}/opt/${P}/jre/lib/font.properties ${D}/opt/${P}/jre/lib/font.properties.orig
-	sed "s/standard symbols l/symbol/g" \
-		< ${D}/opt/${P}/jre/lib/font.properties.orig \
-		> ${D}/opt/${P}/jre/lib/font.properties
-	rm ${D}/opt/${P}/jre/lib/font.properties.orig
+	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