Remove java-pkg_getjars junit because junit is not needed.

Package-Manager: portage-2.1.2.4

3 files changed, 21 insertions, 22 deletions

diff --git a/dev-java/commons-el/ChangeLog b/dev-java/commons-el/ChangeLog
index 6048123b5765..6cfaa2586ee7 100644
--- a/dev-java/commons-el/ChangeLog
+++ b/dev-java/commons-el/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-el
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.20 2007/04/25 19:21:49 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.21 2007/04/25 19:24:48 betelgeuse Exp $
+
+  25 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-el-1.0-r1.ebuild:
+  Remove java-pkg_getjars junit because junit is not needed.
 
   25 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -commons-el-1.0.ebuild:
   Remove generation 1 ebuild.
diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
index e417e4554bd9..7c984c35173e 100644
--- a/dev-java/commons-el/Manifest
+++ b/dev-java/commons-el/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST commons-el-1.0-src.tar.gz 64009 RMD160 1f178aeb6aed1cd807573c3add6195a719a533e2 SHA1 bb39426efbd03a2b27105fa42faf90858cfc3d50 SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6
-EBUILD commons-el-1.0-r1.ebuild 1510 RMD160 25447f69c6da40280c4868a8436e2ffacf90339d SHA1 a4dd84a1882e6e33dab84a4bc690f7eb11a2a469 SHA256 7c36d80e5bec662f2ba9c07f96e07b90ee2b473a10bb31ef84f1322d2d03d27f
-MD5 b0e6e879155cd818607d55b597a90860 commons-el-1.0-r1.ebuild 1510
-RMD160 25447f69c6da40280c4868a8436e2ffacf90339d commons-el-1.0-r1.ebuild 1510
-SHA256 7c36d80e5bec662f2ba9c07f96e07b90ee2b473a10bb31ef84f1322d2d03d27f commons-el-1.0-r1.ebuild 1510
-MISC ChangeLog 2190 RMD160 62811be4a7bf2ff1dfb04a6bf437ae29dba03f0a SHA1 c3fcf5f8e6f447fbf2df1964e3b95f1974570a3b SHA256 5b3d28aefd0c9355bc049106dd96069e16ff77008a4cf91b35e5f335f390c896
-MD5 1e07e38769dfe1f7c2beff2f801d1198 ChangeLog 2190
-RMD160 62811be4a7bf2ff1dfb04a6bf437ae29dba03f0a ChangeLog 2190
-SHA256 5b3d28aefd0c9355bc049106dd96069e16ff77008a4cf91b35e5f335f390c896 ChangeLog 2190
+EBUILD commons-el-1.0-r1.ebuild 1417 RMD160 ecfd6ab9a1ead7b37d5165db6f8908809069500e SHA1 f5b987a96b8bd56e96d93d8fea71a1af8d2163eb SHA256 90844ea1ca72c3236e39cd4611d607dcfadbe5884cb4e3eb24c8670ea3274fb8
+MD5 c29f14c916b3edee5efd5810e69f6fb4 commons-el-1.0-r1.ebuild 1417
+RMD160 ecfd6ab9a1ead7b37d5165db6f8908809069500e commons-el-1.0-r1.ebuild 1417
+SHA256 90844ea1ca72c3236e39cd4611d607dcfadbe5884cb4e3eb24c8670ea3274fb8 commons-el-1.0-r1.ebuild 1417
+MISC ChangeLog 2333 RMD160 067ff8eb47c03dacb1cce5a9aa328977a38f4a9e SHA1 67bc33933eb9370a3ee2dddd84df3e27c3f5b0b9 SHA256 2da225e3a287d14b9b5bc13e11ffb2c05e1cdf4959d1759a1b62f0f1f70c3114
+MD5 2f5a057babf020c2478b0b50b8b0971e ChangeLog 2333
+RMD160 067ff8eb47c03dacb1cce5a9aa328977a38f4a9e ChangeLog 2333
+SHA256 2da225e3a287d14b9b5bc13e11ffb2c05e1cdf4959d1759a1b62f0f1f70c3114 ChangeLog 2333
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -20,7 +20,7 @@ SHA256 93d74c102c14220b7f4333544e66dea40458dbbe5b1af8ed1836fac1cd4e132d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGL6pNcxLzpIGCsLQRAuVoAJ9gBnFaf3wYvPfqmTEqz/+uZ7zThgCglIcZ
-7Q7SKjthmwusY+cUehGbLCc=
-=2Dnn
+iD8DBQFGL6sBcxLzpIGCsLQRAlwuAKCZI8uH6SLeDCCTetw+Uw7Cxq1PKgCfcMjt
+S4vsKs1503gYk8Qb5bx0S7Q=
+=OPwS
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-el/commons-el-1.0-r1.ebuild b/dev-java/commons-el/commons-el-1.0-r1.ebuild
index 330e754e19cd..e97c66a68a5f 100644
--- a/dev-java/commons-el/commons-el-1.0-r1.ebuild
+++ b/dev-java/commons-el/commons-el-1.0-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-el/commons-el-1.0-r1.ebuild,v 1.7 2007/02/03 13:09:38 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0-r1.ebuild,v 1.8 2007/04/25 19:24:48 betelgeuse Exp $
+
+JAVA_PKG_IUSE="source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -10,12 +12,10 @@ SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
-IUSE="source"
 COMMON_DEP="~dev-java/servletapi-2.4"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5
 	${COMMON_DEP}
 	source? ( app-arch/zip )"
 
@@ -28,7 +28,6 @@ src_unpack() {
 
 	echo "servlet-api.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" >> build.properties
 	echo "jsp-api.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)" >> build.properties
-	echo "junit.jar = $(java-pkg_getjars junit)" >> build.properties
 	echo "servletapi.build.notrequired = true" >> build.properties
 	echo "jspapi.build.notrequired = true" >> build.properties
 
@@ -36,14 +35,10 @@ src_unpack() {
 	sed -i "s:../LICENSE:./LICENSE.txt:" build.xml || die "sed failed"
 }
 
-src_compile() {
-	eant jar
-}
-
 src_install() {
 	java-pkg_dojar dist/${PN}.jar || die "Unable to install"
-	dodoc LICENSE.txt RELEASE-NOTES.txt
-	dohtml STATUS.html PROPOSAL.html
+	dodoc LICENSE.txt RELEASE-NOTES.txt || die
+	dohtml STATUS.html PROPOSAL.html || die
 
 	use source && java-pkg_dosrc src/java/org
 }