Correct LICENSE to Apache-2.0 and cleanup ebuild.

Package-Manager: portage-2.1.2.3

3 files changed, 30 insertions, 26 deletions

diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index d9d52056b034..aae97c33ce4e 100644
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-dbcp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.27 2007/02/09 21:35:35 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.28 2007/04/02 15:11:15 betelgeuse Exp $
+
+  02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-dbcp-1.2.1-r1.ebuild:
+  Correct LICENSE to Apache-2.0 and cleanup ebuild.
 
   09 Feb 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   commons-dbcp-1.2.1.ebuild, commons-dbcp-1.2.1-r1.ebuild:
diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest
index a597701ae0f0..41eba97ea960 100644
--- a/dev-java/commons-dbcp/Manifest
+++ b/dev-java/commons-dbcp/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 DIST commons-dbcp-1.2.1-src.tar.gz 578573 RMD160 397b1da0c870b6dc460a652c1cd695708f648719 SHA1 82db8bc09ab13b139c3ca3efffb223c8bc9c4a09 SHA256 31a2806955c667460222d2ebf3ec11f88181ccef7d4e10eb683cff55626a0061
-EBUILD commons-dbcp-1.2.1-r1.ebuild 1374 RMD160 5ba07e29b0ed7a33444ed47d048f0a5fbe730059 SHA1 d0d87eb92fb3c26a4dca9dd9962ee5f504d0057f SHA256 9fad33c8459451cc594c7522e22e51660d529ef730c750b0f27f27fe23cb16b5
-MD5 7cd7f2019a73de67641eefb7f0cbbf9e commons-dbcp-1.2.1-r1.ebuild 1374
-RMD160 5ba07e29b0ed7a33444ed47d048f0a5fbe730059 commons-dbcp-1.2.1-r1.ebuild 1374
-SHA256 9fad33c8459451cc594c7522e22e51660d529ef730c750b0f27f27fe23cb16b5 commons-dbcp-1.2.1-r1.ebuild 1374
+EBUILD commons-dbcp-1.2.1-r1.ebuild 1267 RMD160 187042fac7624499b3ba944f850c44b461ace380 SHA1 f973594f69cae96c502e547799b2eb64f308b22b SHA256 94fb480fcb7698c7c386395179ad20f1a41375c309dd4e574469b7c1c8ebd6fa
+MD5 374618ec1302ab4f155042b45d8a9907 commons-dbcp-1.2.1-r1.ebuild 1267
+RMD160 187042fac7624499b3ba944f850c44b461ace380 commons-dbcp-1.2.1-r1.ebuild 1267
+SHA256 94fb480fcb7698c7c386395179ad20f1a41375c309dd4e574469b7c1c8ebd6fa commons-dbcp-1.2.1-r1.ebuild 1267
 EBUILD commons-dbcp-1.2.1.ebuild 1325 RMD160 0ecc3aaed7b0b5c3fbe38bc9b7a3aedb9727b59f SHA1 027d550a7e000264a274a43b20c1119ea0a0959b SHA256 244c34c917327c6ad459fdefe8ec1e82fb85a4be6d42688111323407864d0bd0
 MD5 62ebc18dcfa08f8a8fc349bdffc08a2b commons-dbcp-1.2.1.ebuild 1325
 RMD160 0ecc3aaed7b0b5c3fbe38bc9b7a3aedb9727b59f commons-dbcp-1.2.1.ebuild 1325
 SHA256 244c34c917327c6ad459fdefe8ec1e82fb85a4be6d42688111323407864d0bd0 commons-dbcp-1.2.1.ebuild 1325
-MISC ChangeLog 4059 RMD160 bed85e0fa713c41b38855ab69cf11da55c49c99e SHA1 9e9c7428a83ab9d999030b5ad6515e571106de9d SHA256 e974e9c4189eb0ac74a0091dbe2e987cd2ac52c1671602ea5d9ea3ea6ac28178
-MD5 7112a4fdb58d13de6c9aba63088e0381 ChangeLog 4059
-RMD160 bed85e0fa713c41b38855ab69cf11da55c49c99e ChangeLog 4059
-SHA256 e974e9c4189eb0ac74a0091dbe2e987cd2ac52c1671602ea5d9ea3ea6ac28178 ChangeLog 4059
+MISC ChangeLog 4199 RMD160 4b633e9134359a8efb8f7b6864cc056248e3c96f SHA1 eee0eb64d18e70b51fa18d672ea512146914f1c9 SHA256 a76f54c7c75e7cfef54629b714d03eff3a99298c8b70db0e92069daa67f5ea87
+MD5 6825312dc62ca0fddd36ed12593f214a ChangeLog 4199
+RMD160 4b633e9134359a8efb8f7b6864cc056248e3c96f ChangeLog 4199
+SHA256 a76f54c7c75e7cfef54629b714d03eff3a99298c8b70db0e92069daa67f5ea87 ChangeLog 4199
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -25,9 +25,9 @@ MD5 c653e6286799c9f71c443a22e902cb52 files/digest-commons-dbcp-1.2.1-r1 268
 RMD160 5b91486f3cf464ac76ec38502338122cc5b0061d files/digest-commons-dbcp-1.2.1-r1 268
 SHA256 1093fb58c9691f9fe7aa64e8005f5c104d3982d15df875e73d222ae74f37c960 files/digest-commons-dbcp-1.2.1-r1 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFzOmcgo/w9rxVVVERAo5CAJ9Jt+eAqAnsPdw1KSzmgNauVvXc5wCguUy4
-wdDILtNl57KIPkB0giyJfjk=
-=YB/+
+iD8DBQFGER0XcxLzpIGCsLQRAnLBAJ40NApU6CPn8rzt7+S4yAp6vkCoKQCglJ7w
+5UJyLCM4XZNZchHyX5Vafow=
+=nQSF
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild
index 75f217831d5e..6807d594770c 100644
--- a/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild,v 1.5 2007/02/09 21:35:35 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild,v 1.6 2007/04/02 15:11:15 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -17,26 +19,24 @@ DEPEND="|| (
 			=virtual/jdk-1.4*
 			=virtual/jdk-1.5*
 		)
-		>=dev-java/ant-core-1.4
-		${COMMON_DEP}
-		source? ( app-arch/zip )"
-LICENSE="Apache-1.1"
+		${COMMON_DEP}"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
 
-src_compile() {
-	local antflags="build-jar"
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
 	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" > build.properties
 	echo "commons-pool.jar=$(java-pkg_getjars commons-pool)" >> build.properties
-	use doc && antflags="${antflags} javadoc"
-	eant ${antflags} || die "Compilation failed"
+	rm *.jar -v || die
 }
 
+EANT_BUILD_TARGET="build-jar"
+
 src_install() {
 	java-pkg_dojar dist/${PN}*.jar || die "Unable to install"
-	dodoc README.txt
-	dohtml PROPOSAL.html STATUS.html
-	use doc && java-pkg_dohtml -r dist/docs/*
+	dodoc README.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/*
 }