Removed 1.6.1 cause it breaks the classpath, added 1.6.1-r1 with old style compiling (without the eclass) and now the problem its solved.

4 files changed, 40 insertions, 9 deletions

diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog
index a79348cd5f6b..f332bab530bf 100644
--- a/dev-java/commons-beanutils/ChangeLog
+++ b/dev-java/commons-beanutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-beanutils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.9 2004/01/19 05:05:12 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.10 2004/01/21 02:48:49 strider Exp $
+
+*commons-beanutils-1.6.1-r1 (20 Jan 2004)
+
+  20 Jan 2004; Adrian Almenar <strider@gentoo.org>
+  commons-beanutils-1.6.1-r1.ebuild:
+  Moved to old style compiling, not using eclass cause its a little buggy.
 
   19 Jan 2004; Adrian Almenar <strider@gentoo.org>
   commons-beanutils-1.6.1.ebuild:
diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index bd30715edef4..e71f0ea7eafa 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,4 +1,6 @@
 MD5 ccfb2b9a3133266cf97bd3c477f1ae89 commons-beanutils-1.6.1.ebuild 1229
+MD5 067dd0b51917125fd319d9275976fd85 commons-beanutils-1.6.1-r1.ebuild 1710
 MD5 5f7d9b65c637d8780fe748565216d7d5 ChangeLog 1653
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 a65fcfbd83466bf025820b316482b38a files/digest-commons-beanutils-1.6.1-r1 79
 MD5 bb6e28cac73d3d0b198cc813fcc57742 files/digest-commons-beanutils-1.6.1 153
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.6.1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild
index f8bcfacd7a0d..c87fadaff273 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.6.1.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.6.1.ebuild,v 1.4 2004/01/19 05:05:12 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild,v 1.1 2004/01/21 02:48:49 strider Exp $
 
-inherit jakarta-commons
+inherit java-pkg
 
 S=${WORKDIR}/${PN}-${PV}-src
 DESCRIPTION="The Jakarta BeanUtils component provides easy-to-use wrappers around Reflection and Introspection APIs"
@@ -19,12 +19,36 @@ RDEPEND=">=virtual/jdk-1.3
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
-IUSE="doc jikes junit"
+IUSE="jikes junit"
 
 src_compile() {
-	cp LICENSE.txt ../LICENSE
-	echo "commons-collections.jar=`java-config --classpath=commons-collections`" >> build.properties
+	local myc
+
+	cp ${S}/LICENSE.txt LICENSE
+	cd ${S}
+
+	echo "commons-collections.jar=`java-config --classpath=commons-collections`" > build.properties
 	echo "commons-logging.jar=`java-config --classpath=commons-logging`" | sed s/\=.*:/\=/ >> build.properties
-	jakarta-commons_src_compile myconf make
-	use doc && jakarta-commons_src_compile makedoc
+
+	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"
+
+	if [ -n "`use doc`" ] ; then
+		ANT_OPTS=${myc} ant javadoc || die "Unable to create documents"
+	fi
+}
+
+src_install () {
+	java-pkg_dojar dist/${PN}*.jar || die "Unable to install"
+	dodoc RELEASE-NOTES.txt LICENSE
+	dohtml STATUS.html PROPOSAL.html
+	dohtml -r dist/docs/*
 }
diff --git a/dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1 b/dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1-r1
index 3acd580ffd64..b51965d2eed6 100644
--- a/dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1
+++ b/dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1-r1
@@ -1,2 +1 @@
-MD5 3411a7a1dd118c8afa4760194a4ff490 /commons-beanutils-1.6.1.ebuild 1235
 MD5 7f0190fda2d6ec7083e46ed6519aafe5 commons-beanutils-1.6.1-src.tar.gz 148249