x86 ppc sparc moved to stable; housekeeping on older ebuilds.

5 files changed, 16 insertions, 58 deletions

diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index e6d628c6d586..52bb94b6191d 100644
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-dbcp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.4 2003/02/12 05:50:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.5 2003/04/06 07:58:02 absinthe Exp $
+
+*commons-dbcp-1.0-r2 (06 Apr 2003)
+
+  06 Apr 2003; Dylan Carlson <absinthe@gentoo.org> commons-dbcp-1.0-r1.ebuild,
+  commons-dbcp-1.0-r1.ebuild, commons-dbcp-1.0-r2.ebuild,
+  commons-dbcp-1.0.ebuild, commons-dbcp-1.0.ebuild:
+  x86 ppc sparc moved to stable.  removed older versions.
 
 *commons-dbcp-1.0-r1 (24 Nov 2002)
 
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.0-r1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild
index 2bcda847d1a2..fba91d927484 100644
--- a/dev-java/commons-dbcp/commons-dbcp-1.0-r1.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 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-r1.ebuild,v 1.2 2003/02/13 10:07:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.0-r2.ebuild,v 1.1 2003/04/06 07:58:02 absinthe Exp $
+
+inherit jakarta-commons
 
 S=${WORKDIR}/${PN}-${PV}-src
 DESCRIPTION="Jakarta component providing database connection pooling API"
@@ -14,25 +16,13 @@ RDEPEND=">=virtual/jre-1.3
 		>=dev-java/commons-pool-1.0.1"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86"
-IUSE="jikes"
+KEYWORDS="x86 ppc sparc"
+IUSE="doc jikes"
 
 src_compile() {
-	local myc
-
 	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"
-}
-
-src_install () {
-	dojar dist/${PN}*.jar || die "Unable to install"
-	dohtml PROPOSAL.html STATUS.html
-	dohtml -r dist/docs/*
+	jakarta-commons_src_compile myconf make
+	use doc && jakarta-commons_src_compile makedoc
 }
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.0.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.0.ebuild
deleted file mode 100644
index db1554f43dc5..000000000000
--- a/dev-java/commons-dbcp/commons-dbcp-1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.4 2003/02/13 10:07:52 vapier Exp $
-
-S=${WORKDIR}/${PN}-${PV}-src
-DESCRIPTION="Jakarta component providing database connection pooling API"
-HOMEPAGE="http://jakarta.apache.org/commons/dbcp.html"
-SRC_URI="http://jakarta.apache.org/builds/jakarta-commons/release/${PN}/v${PV}/${PN}-${PV}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-1.4
-		>=dev-java/commons-collections-2.0
-		>=dev-java/commons-pool-1.0.1"
-RDEPEND=">=virtual/jre-1.3
-		>=dev-java/commons-pool-1.0.1"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="jikes"
-
-src_compile() {
-	local myc
-
-	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"
-}
-
-src_install () {
-	mv dist/${PN}*.jar dist/${PN}-${PV}.jar
-	dojar dist/${PN}-${PV}.jar || die "Unable to install"
-	dohtml PROPOSAL.html STATUS.html
-	dohtml -r dist/docs/*
-}
diff --git a/dev-java/commons-dbcp/files/digest-commons-dbcp-1.0-r1 b/dev-java/commons-dbcp/files/digest-commons-dbcp-1.0-r1
deleted file mode 100644
index b276281aedfa..000000000000
--- a/dev-java/commons-dbcp/files/digest-commons-dbcp-1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 85305821547f060fb6090f022c33e5f9 commons-dbcp-1.0-src.tar.gz 88939
diff --git a/dev-java/commons-dbcp/files/digest-commons-dbcp-1.0 b/dev-java/commons-dbcp/files/digest-commons-dbcp-1.0-r2
index b276281aedfa..45cacb204248 100644
--- a/dev-java/commons-dbcp/files/digest-commons-dbcp-1.0
+++ b/dev-java/commons-dbcp/files/digest-commons-dbcp-1.0-r2
@@ -1 +1,2 @@
+MD5 0a30cdd61ad8e68296081446ed2c61c6 /commons-dbcp-1.0-r2.ebuild 1091
 MD5 85305821547f060fb6090f022c33e5f9 commons-dbcp-1.0-src.tar.gz 88939