Fixed Some bOrkage reported by nall

3 files changed, 3 insertions, 55 deletions

diff --git a/dev-java/commons-beanutils/commons-beanutils-1.5-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.5-r1.ebuild
index cfff10dc724b..079e6a2b0c52 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.5-r1.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.5-r1.ebuild,v 1.2 2002/12/08 04:29:52 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.5-r1.ebuild,v 1.3 2002/12/15 16:19:49 strider Exp $
 
 S=${WORKDIR}/${PN}-${PV}-src
 DESCRIPTION="The Jakarta BeanUtils component provides easy-to-use wrappers around Reflection and Introspection APIs"
@@ -10,8 +10,8 @@ DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.4
 	>=dev-java/commons-collections-2.1
 	>=dev-java/commons-logging-1.0.2
-	junit? ( >=junit-3.7 )"
-RDEPEND=">=virtual/jre-1.4
+	junit? ( >=dev-java/junit-3.7 )"
+RDEPEND=">=virtual/jdk-1.3
 	>=dev-java/commons-collections-2.1
 	>=dev-java/commons-logging-1.0.2"
 LICENSE="Apache-1.1"
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.5.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.5.ebuild
deleted file mode 100644
index 4f75301c9ea8..000000000000
--- a/dev-java/commons-beanutils/commons-beanutils-1.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.5.ebuild,v 1.3 2002/11/08 01:16:16 blizzy Exp $
-
-S=${WORKDIR}/${PN}-${PV}-src
-DESCRIPTION="The Jakarta BeanUtils component provides easy-to-use wrappers around Reflection and Introspection APIs"
-HOMEPAGE="http://jakarta.apache.org/commons/beanutils.html"
-SRC_URI="http://jakarta.apache.org/builds/jakarta-commons/release/${PN}/v${PV}/${PN}-${PV}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-1.4
-	>=dev-java/commons-collections-2.1
-	>=dev-java/commons-logging-1.0.2
-	junit? ( >=junit-3.7 )"
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/commons-collections-2.1
-	>=dev-java/commons-logging-1.0.2"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="jikes junit"
-
-src_compile() {
-	local myc
-
-	cp beanutils/LICENSE.txt LICENSE
-
-	cd beanutils
-	echo "commons-collections.jar=`java-config --classpath=commons-collections`" > build.properties
-	echo "commons-logging.jar=`java-config --classpath=commons-logging`" | sed s/\=.*:/\=/ >> build.properties
-
-	if [ -n "`use jikes`" ] ; then
-		myc="${myc} -Dbuild.compiler=jikes"
-	fi
-
-	if [ -n "`use junit`" ] ; then
-		echo "junit.jar=`java-config --classpath=junit`" | sed  s/:.*// >> build.properties
-		ANT_OPTS=${myc} ant test || die "Testing Classes Failed"
-	fi
-
-	ANT_OPTS=${myc} ant jar || die "Compilation Failed"
-	ANT_OPTS=${myc} ant javadoc || die "Unable to create documents"
-}
-
-src_install () {
-	cd beanutils
-	mv dist/${PN}*.jar dist/${PN}-${PV}.jar
-	dojar dist/${PN}-${PV}.jar || die "Unable to install"
-	dodoc RELEASE-NOTES.txt
-	dohtml STATUS.html PROPOSAL.html
-	dohtml -r dist/docs/*
-}
diff --git a/dev-java/commons-beanutils/files/digest-commons-beanutils-1.5 b/dev-java/commons-beanutils/files/digest-commons-beanutils-1.5
deleted file mode 100644
index 8243b7d47c16..000000000000
--- a/dev-java/commons-beanutils/files/digest-commons-beanutils-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8841051dc2070b56140a3285f4085cbf commons-beanutils-1.5-src.tar.gz 127638