cleanup

6 files changed, 23 insertions, 27 deletions

diff --git a/dev-java/ant/ant-1.4.1-r2.ebuild b/dev-java/ant/ant-1.4.1-r2.ebuild
index 684ce9127a27..eb2ebab68d88 100644
--- a/dev-java/ant/ant-1.4.1-r2.ebuild
+++ b/dev-java/ant/ant-1.4.1-r2.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.1-r2.ebuild,v 1.1 2002/04/10 12:10:43 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.1-r2.ebuild,v 1.2 2002/04/28 04:12:40 seemant Exp $
 
-A="jakarta-ant-${PV}-src.tar.gz"
 S=${WORKDIR}/jakarta-ant-${PV}
 DESCRIPTION="Build system for Java"
 SRC_URI="http://jakarta.apache.org/builds/jakarta-ant/release/v${PV}/src/jakarta-ant-${PV}-src.tar.gz"
 HOMEPAGE="http://jakarta.apache.org"
 
 DEPEND="virtual/glibc
-        >=virtual/jdk-1.3"
+	>=virtual/jdk-1.3"
 
 src_compile() {
 	export JAVA_HOME=${JDK_HOME}
@@ -29,6 +28,3 @@ src_install() {
 	dodoc LICENSE README WHATSNEW KEYS
 	dohtml -r docs/*
 }
-
-
-
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r5.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r5.ebuild
index 0c8cfcea77c2..45355899f423 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r5.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r5.ebuild,v 1.2 2002/04/27 12:18:39 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r5.ebuild,v 1.3 2002/04/28 04:12:40 seemant Exp $
 
 SYSTEM_ARCH=`echo $ARCH |\
   sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
@@ -13,7 +13,7 @@ fi
 
 PLATFORM="i386"
 FCS="FCS"
-A="j2sdk-1.3.1-FCS-linux-i386.tar.bz2"
+MY_P="j2sdk-1.3.1-FCS-linux-i386"
 
 case $SYSTEM_ARCH in
 	ppc)
@@ -38,7 +38,7 @@ esac
 
 S=${WORKDIR}/j2sdk1.3.1
 DESCRIPTION="Blackdown Java Development Kit 1.3.1"
-SRC_URI="ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/${PLATFORM}/${FCS}/${A}"
+SRC_URI="ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/${PLATFORM}/${FCS}/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.blackdown.org"
 
 DEPEND="virtual/glibc
@@ -51,7 +51,7 @@ PROVIDE="virtual/jdk-1.3
 
 src_unpack () {
 	if [ $PLATFORM = "ppc" ]; then
-		tail +400 ${DISTDIR}/${A} > j2sdk-1.3.1-ppc.tar.bz2
+		tail +400 ${DISTDIR}/${MY_P}.tar.bz2 > j2sdk-1.3.1-ppc.tar.bz2
 		tar -xjf j2sdk-1.3.1-ppc.tar.bz2
 	else
 	unpack ${A}
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r6.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r6.ebuild
index d3d6d76e80e8..75b9089fcbcd 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r6.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r6.ebuild,v 1.1 2002/04/09 21:58:31 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r6.ebuild,v 1.2 2002/04/28 04:12:40 seemant Exp $
 
-A=j2re-1.3.1-FCS-linux-i386.tar.bz2
+MY_P=j2re-1.3.1-FCS-linux-i386
 S=${WORKDIR}/j2re1.3.1
 DESCRIPTION="Blackdown Java Runtime Environment 1.3.1"
-SRC_URI="ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/i386/FCS/${A}"
+SRC_URI="ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/i386/FCS/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.blackdown.org"
 
 DEPEND="virtual/glibc
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
index 469d20259438..8b60c35a2380 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild,v 1.1 2002/04/27 12:22:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild,v 1.2 2002/04/28 04:12:40 seemant Exp $
 
 SYSTEM_ARCH=`echo $ARCH |\
   sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
@@ -14,7 +14,7 @@ fi
 #Change FCS if you want to use a beta version
 PLATFORM="i386"
 FCS="FCS"
-A="j2re-1.3.1-FCS-linux-i386.tar.bz2"
+MY_P="j2re-1.3.1-FCS-linux-i386"
 
 #Adapt for multi-arch:
 
@@ -42,7 +42,7 @@ esac
 
 S=${WORKDIR}/j2re1.3.1
 DESCRIPTION="Blackdown Java Runtime Environment 1.3.1"
-SRC_URI="ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/${PLATFORM}/${FCS}/${A}"
+SRC_URI="ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/${PLATFORM}/${FCS}/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.blackdown.org"
 
 DEPEND="virtual/glibc
@@ -54,7 +54,7 @@ PROVIDE="virtual/jre-1.3
 
 src_unpack () {
 	if [ $PLATFORM = "ppc" ]; then
-		tail +422 ${DISTDIR}/${A} > j2re-1.3.1-ppc.tar.bz2
+		tail +422 ${DISTDIR}/${MY_P}.tar.bz2 > j2re-1.3.1-ppc.tar.bz2
 		tar -xjf j2re-1.3.1-ppc.tar.bz2
 	else
 	unpack ${A}
diff --git a/dev-java/jikes/jikes-1.15.ebuild b/dev-java/jikes/jikes-1.15.ebuild
index 44abe73cb207..265d2ffbe8e3 100644
--- a/dev-java/jikes/jikes-1.15.ebuild
+++ b/dev-java/jikes/jikes-1.15.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Naresh Donti <ndonti@hotmail.com>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/jikes-1.15.ebuild,v 1.2 2002/04/07 11:17:15 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/jikes-1.15.ebuild,v 1.3 2002/04/28 04:12:40 seemant Exp $
 
-A=jikes-1.15.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Jikes - IBM's open source, high performance java compiler"
-SRC_URI="ftp://www-126.ibm.com/pub/jikes/${A}"
+SRC_URI="ftp://www-126.ibm.com/pub/jikes/${P}.tar.gz"
 HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/jikes/"
 
 DEPEND="virtual/glibc"
diff --git a/dev-java/log4j/log4j-1.1.3.ebuild b/dev-java/log4j/log4j-1.1.3.ebuild
index 6587ab83b970..41372c563552 100644
--- a/dev-java/log4j/log4j-1.1.3.ebuild
+++ b/dev-java/log4j/log4j-1.1.3.ebuild
@@ -1,11 +1,12 @@
 # Copyright (c) Jordan Armstrong, 2002
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Jordan Armstrong <jordan@papercrane.net>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.1.3.ebuild,v 1.2 2002/04/28 04:12:40 seemant Exp $
 
-A="jakarta-log4j-${PV}.tar.gz"
-S=${WORKDIR}/jakarta-log4j-${PV}
+MY_P="jakarta-${P}"
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="A low-overhead robust logging package for Java"
-SRC_URI="http://jakarta.apache.org/log4j/jakarta-log4j-${PV}.tar.gz"
+SRC_URI="http://jakarta.apache.org/log4j/${MY_P}.tar.gz"
 HOMEPAGE="http://jakarta.apache.org"
 
 DEPEND=">=virtual/jdk-1.3"