Marking stable on x86. Header fix. Clean up.

3 files changed, 21 insertions, 29 deletions

diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index c704e32a7661..9acfc5464761 100644
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/commons-dbcp
 # Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.8 2004/01/21 05:37:09 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.9 2004/04/05 05:45:02 zx Exp $
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> commons-dbcp-1.1.ebuild:
+  Marking stable on x86. Major ebuild clean up.
 
 *commons-dbcp-1.1 (21 Jan 2004)
 
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild
index e35e39b5a8fe..46e93cb9ec6f 100644
--- a/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-dbcp/commons-dbcp-1.0-r2.ebuild,v 1.4 2003/08/05 16:08:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild,v 1.5 2004/04/05 05:45:02 zx Exp $
 
 inherit jakarta-commons eutils
 
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.1.ebuild
index cc56d4e167eb..efdabe983c83 100644
--- a/dev-java/commons-dbcp/commons-dbcp-1.1.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-1.1.ebuild
@@ -1,47 +1,36 @@
 # 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-dbcp/commons-dbcp-1.1.ebuild,v 1.1 2004/01/21 05:37:09 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.1.ebuild,v 1.2 2004/04/05 05:45:02 zx Exp $
 
 inherit java-pkg
 
-S=${WORKDIR}/${PN}-${PV}
 DESCRIPTION="Jakarta component providing database connection pooling API"
-HOMEPAGE="http://jakarta.apache.org/commons/dbcp.html"
-SRC_URI="mirror://apache/jakarta/commons/dbcp/source/${PN}-${PV}-src.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/commons/dbcp/"
+SRC_URI="mirror://apache/jakarta/commons/dbcp/source/${P}-src.tar.gz"
 DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
-	>=dev-java/commons-collections-2.0
-	>=dev-java/commons-pool-1.1"
+		>=dev-java/ant-1.4
+		>=dev-java/commons-collections-2.0
+		>=dev-java/commons-pool-1.1"
 RDEPEND=">=virtual/jre-1.3
-	>=dev-java/commons-collections-2.0
-	>=dev-java/commons-pool-1.1"
+		>=dev-java/commons-collections-2.0
+		>=dev-java/commons-pool-1.1"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc amd64"
+KEYWORDS="x86 ~ppc ~sparc amd64"
 IUSE="jikes doc"
 
 src_compile() {
-	local myc
-
-	cd ${S}
-
+	local antflags="build-jar"
 	echo "commons-collections.jar=`java-config --classpath=commons-collections`" > build.properties
 	echo "commons-pool.jar=`java-config --classpath=commons-pool`" >> build.properties
-
-	if [ -n "`use jikes`" ] ; then
-		myc="${myc} -Dbuild.compiler=jikes"
-	fi
-
-	cp LICENSE.txt LICENSE
-	ANT_OPTS=${myc} ant dist || die "Compilation failed"
+	use doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "Compilation failed"
 }
 
 src_install () {
 	java-pkg_dojar dist/${PN}*.jar || die "Unable to install"
-	dodoc LICENSE README.txt
+	dodoc README.txt
 	dohtml PROPOSAL.html STATUS.html
-
-	if [ -n "`use doc`" ] ; then
-		dohtml -r dist/docs/*
-	fi
+	use doc && dohtml -r dist/docs/*
 }