Tweaked concept of JDK/JRE duality, removed outdated ebuilds

5 files changed, 2 insertions, 119 deletions

diff --git a/dev-java/ant/ant-1.3.ebuild b/dev-java/ant/ant-1.3.ebuild
deleted file mode 100644
index 0f9c8ad6812d..000000000000
--- a/dev-java/ant/ant-1.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.3.ebuild,v 1.4 2001/08/06 20:57:20 achim Exp $
-
-A="jakarta-ant-1.3-src.tar.gz"
-S=${WORKDIR}/jakarta-ant-1.3
-DESCRIPTION="Build system for java"
-SRC_URI="http://jakarta.apache.org/builds/jakarta-ant/release/v1.3/src/jakarta-ant-1.3-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org"
-
-DEPEND="virtual/glibc
-	>=dev-lang/jdk-1.3
-    >=dev-java/jaxp-1.0.1"
-
-src_unpack() {
-    unpack ${A}
-    cd ${S}/src/script
-    cp antRun antRun.orig
-    tr -d '\r' < antRun.orig > antRun
-}
-src_compile() {
-
-  CLASSPATH=/opt/java/src.jar:/opt/java/lib/tools.jar
-
-  export CLASSPATH
-  export JAVA_HOME=/opt/java
-
-  echo "Building ant..."
-  ./bootstrap.sh
-  mv bootstrap/bin .
-
-}
-
-src_install() {
-    exeinto /usr/bin
-    doexe bin/ant bin/antRun bin/runant.pl
-    insinto /usr/lib/java
-    doins build/lib/*.jar
-
-    dodoc LICENSE README TODO WHATSNEW
-    docinto html
-    cd docs
-    dodoc ant_in_anger.html
-    docinto html/ant2
-    dodoc ant2/*.html
-    docinto txt
-    dodoc ant2/*.txt
-    cp -a manual ${D}/usr/share/doc/${PF}/html
-    prepalldocs
-}
-
-
-
diff --git a/dev-java/ant/ant-1.4.1-r1.ebuild b/dev-java/ant/ant-1.4.1-r1.ebuild
index 4bfb1f833fba..ace59292b664 100644
--- a/dev-java/ant/ant-1.4.1-r1.ebuild
+++ b/dev-java/ant/ant-1.4.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 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-r1.ebuild,v 1.3 2002/01/23 20:06:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.1-r1.ebuild,v 1.4 2002/01/28 23:00:28 karltk Exp $
 
 A="jakarta-ant-${PV}-src.tar.gz"
 S=${WORKDIR}/jakarta-ant-${PV}
@@ -13,6 +13,7 @@ DEPEND="virtual/glibc
         >=virtual/jdk-1.3"
 
 src_compile() {
+	export JAVA_HOME=${JDK_HOME}
 	./build.sh -Ddist.dir=${D}/usr/share/ant || die
 }
 
diff --git a/dev-java/ant/ant-1.4.ebuild b/dev-java/ant/ant-1.4.ebuild
deleted file mode 100644
index 9621d006451c..000000000000
--- a/dev-java/ant/ant-1.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.ebuild,v 1.1 2001/10/07 16:05:20 achim Exp $
-
-A="jakarta-ant-${PV}-src.tar.gz ant-optional-gentoo-${PV}.tgz"
-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
-	>=dev-lang/jdk-1.3"
-
-src_unpack() {
-    unpack jakarta-ant-${PV}-src.tar.gz
-    cd ${S}/src/script
-    cp antRun antRun.orig
-    tr -d '\r' < antRun.orig > antRun
-    cd ../..
-    mkdir lib/opt
-    cd lib/opt
-    unpack ant-optional-gentoo-${PV}.tgz
-}
-src_compile() {
-
-  CLASSPATH="/opt/java/lib/tools.jar"
-  for i in ${S}/lib/opt 
-  do
-    CLASSPATH=$CLASSPATH:$i
-  done
-  export CLASSPATH
-  export JAVA_HOME=/opt/java
-
-  echo "Building ant..."
-  ./bootstrap.sh
-  mv bootstrap/bin .
-
-}
-
-src_install() {
-    exeinto /usr/bin
-    doexe bin/ant bin/antRun bin/runant.pl
-    insinto /usr/lib/java
-    doins build/lib/*.jar lib/*.jar
-    insinto /usr/lib/java/ant
-    doins lib/opt/*.jar
-
-    dodoc LICENSE README WHATSNEW
-    docinto html
-    cd docs
-    dodoc ant_in_anger.html
-    docinto html/ant2
-    dodoc ant2/*.html
-    docinto txt
-    dodoc ant2/*.txt
-    cp -a manual ${D}/usr/share/doc/${PF}/html
-    prepalldocs
-}
-
-
-
diff --git a/dev-java/ant/files/digest-ant-1.3 b/dev-java/ant/files/digest-ant-1.3
deleted file mode 100644
index 0826ac662004..000000000000
--- a/dev-java/ant/files/digest-ant-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f2b85000ad4b65c04e735b08bc4ef06 jakarta-ant-1.3-src.tar.gz 1019904
diff --git a/dev-java/ant/files/digest-ant-1.4 b/dev-java/ant/files/digest-ant-1.4
deleted file mode 100644
index 0e98330c1862..000000000000
--- a/dev-java/ant/files/digest-ant-1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2d549dcaee6167c9e9937df8ed781e8 jakarta-ant-1.4-src.tar.gz 1314816