Fix deps, tweak style.

Package-Manager: portage-2.1.2.4

3 files changed, 29 insertions, 36 deletions

diff --git a/dev-java/velocity/ChangeLog b/dev-java/velocity/ChangeLog
index c9dfd1d9a03f..79bcea6ff5e2 100644
--- a/dev-java/velocity/ChangeLog
+++ b/dev-java/velocity/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/velocity
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.28 2007/04/02 21:11:49 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.29 2007/04/26 22:06:56 caster Exp $
+
+  26 Apr 2007; Vlastimil Babka <caster@gentoo.org> velocity-1.4-r4.ebuild:
+  Fix deps, tweak style.
 
   02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> velocity-1.4-r4.ebuild:
   velocity home page has moved to http://velocity.apache.org
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 94b6029cb939..82c0507dc807 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX velocity-1.4-versioned_jar.patch 2237 RMD160 2d79615b45f51d94b19967de0ae263b0fe65dd10 SHA1 c982f779d73d33bfb89c997dd908ff8327813ea5 SHA256 18fd6dad922d571a63e2a5fe2f036455ab4aea3a0c7224eba84ac8c6576baa09
 MD5 1b739fb0994afdb5b18dc46f157211f7 files/velocity-1.4-versioned_jar.patch 2237
 RMD160 2d79615b45f51d94b19967de0ae263b0fe65dd10 files/velocity-1.4-versioned_jar.patch 2237
 SHA256 18fd6dad922d571a63e2a5fe2f036455ab4aea3a0c7224eba84ac8c6576baa09 files/velocity-1.4-versioned_jar.patch 2237
 DIST velocity-1.4.tar.gz 4566056 RMD160 43c1adddd4c0040a27153fc92324fd99b66c82b5 SHA1 1104387b733c71d3e22ecbf4032b65baa1761c37 SHA256 d4e049dd8bfef23e31e266106fe26ee0c4ec657e802badf83dcf15b3ee2b873e
-EBUILD velocity-1.4-r4.ebuild 2056 RMD160 5180abdfd04d2028e59a7daaeef21b55727b9e19 SHA1 bb3ac440f02dba50ae6c426cf820b021eabeaabb SHA256 a7bc3cf29baf9c6cd8da585b1866c34b629ab7023e7e9a22717c7e0d0463b096
-MD5 d31d36ccacf7b113b486d7b472dbdcdb velocity-1.4-r4.ebuild 2056
-RMD160 5180abdfd04d2028e59a7daaeef21b55727b9e19 velocity-1.4-r4.ebuild 2056
-SHA256 a7bc3cf29baf9c6cd8da585b1866c34b629ab7023e7e9a22717c7e0d0463b096 velocity-1.4-r4.ebuild 2056
-MISC ChangeLog 3950 RMD160 da87c8d01bd0e580bcb06cd8cb08d7b7474e167d SHA1 0ef26be397e7927ddbbe35466d94d2718a1c09b3 SHA256 240660e648f854421764f4d940b90f5e44d287cf989691bb732721381d250f31
-MD5 fc49e475dc184cc19738bdd40714c7bc ChangeLog 3950
-RMD160 da87c8d01bd0e580bcb06cd8cb08d7b7474e167d ChangeLog 3950
-SHA256 240660e648f854421764f4d940b90f5e44d287cf989691bb732721381d250f31 ChangeLog 3950
+EBUILD velocity-1.4-r4.ebuild 2025 RMD160 51ce23c4cbd52942966d04118660231afa97ee30 SHA1 7862283fb94e8c445b809e2c968d76101c3b4020 SHA256 d1e560680dd05045798f58330219beadde042a1780352bfb55bc238903b6157a
+MD5 6d254ecfb13e5b8025207d36f1fc4776 velocity-1.4-r4.ebuild 2025
+RMD160 51ce23c4cbd52942966d04118660231afa97ee30 velocity-1.4-r4.ebuild 2025
+SHA256 d1e560680dd05045798f58330219beadde042a1780352bfb55bc238903b6157a velocity-1.4-r4.ebuild 2025
+MISC ChangeLog 4047 RMD160 75d71e79db558f34e351540e1651d7487c4226c6 SHA1 4216e571f781204a32561090142042222a86aa2e SHA256 580ce8c0511e5d4d68804ccf0e6706bb467ebaee4d95b87e004b8d5723efca9c
+MD5 b3105dc3c913fe7ce0f3fad8824d914c ChangeLog 4047
+RMD160 75d71e79db558f34e351540e1651d7487c4226c6 ChangeLog 4047
+SHA256 580ce8c0511e5d4d68804ccf0e6706bb467ebaee4d95b87e004b8d5723efca9c ChangeLog 4047
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -21,10 +18,3 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 8531375b46a6fc1896ea299e60dfc3af files/digest-velocity-1.4-r4 241
 RMD160 69c59e2b6dff10826de974e060c5d316e4da364d files/digest-velocity-1.4-r4 241
 SHA256 d074e9671801ea8929d63eeee4ee60ccdc009948cadfcb944a88568d01a3958a files/digest-velocity-1.4-r4 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGEXGXcxLzpIGCsLQRAhLPAKCVTjt0kFapoZLlRMAHS7LJUQD9fwCcDSM2
-hGeJKFffEzBYFpxqkQd/ATE=
-=oCZv
------END PGP SIGNATURE-----
diff --git a/dev-java/velocity/velocity-1.4-r4.ebuild b/dev-java/velocity/velocity-1.4-r4.ebuild
index aa017afce004..0a374bc436a2 100644
--- a/dev-java/velocity/velocity-1.4-r4.ebuild
+++ b/dev-java/velocity/velocity-1.4-r4.ebuild
@@ -1,7 +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/velocity/velocity-1.4-r4.ebuild,v 1.5 2007/04/02 21:11:49 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4-r4.ebuild,v 1.6 2007/04/26 22:06:56 caster Exp $
 
+JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2 eutils
 
 DESCRIPTION="A Java-based template engine that allows easy creation/rendering of documents that format and present data."
@@ -11,16 +12,9 @@ SRC_URI="mirror://apache/jakarta/${PN}/binaries/${P}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="doc source"
+IUSE=""
 
-DEPEND="
-	!doc? ( >=virtual/jdk-1.4 )
-	doc? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )
-	dev-java/ant-core
-	dev-java/antlr
-	dev-java/junit
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.4
+CDEPEND="=dev-java/junit-3*
 	dev-java/bcel
 	dev-java/commons-collections
 	=dev-java/jdom-1.0_beta9*
@@ -28,7 +22,14 @@ RDEPEND=">=virtual/jdk-1.4
 	=dev-java/avalon-logkit-1.2*
 	=dev-java/jakarta-oro-2.0*
 	=dev-java/servletapi-2.2*
-	dev-java/werken-xpath"
+	dev-java/werken-xpath
+	dev-java/ant-core"
+DEPEND="!doc? ( >=virtual/jdk-1.4 )
+	doc? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
+	dev-java/ant-core
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
 
 pkg_setup() {
 	if ! built_with_use dev-java/log4j javamail; then
@@ -44,11 +45,11 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-versioned_jar.patch
+	epatch "${FILESDIR}/${P}-versioned_jar.patch"
 
+	rm -v *.jar
 	cd "${S}/build/lib"
-	rm *.jar
-	java-pkg_jar-from antlr
+	rm -v *.jar
 	java-pkg_jar-from bcel
 	java-pkg_jar-from commons-collections
 	java-pkg_jar-from jakarta-oro-2.0
@@ -63,8 +64,7 @@ src_unpack() {
 
 src_compile () {
 	cd "${S}/build"
-	local antflags="jar jar-core jar-util jar-servlet"
-	eant ${antflags} $(use_doc javadocs) || die "Ant failed"
+	eant jar jar-core jar-util jar-servlet $(use_doc javadocs)
 }
 
 
@@ -72,7 +72,7 @@ src_install () {
 	java-pkg_dojar bin/*.jar
 
 	dodoc NOTICE README.txt || die
-	#has other stuff besides api too
+	# has other stuff besides api too
 	use doc && java-pkg_dohtml -r docs/*
 	use source && java-pkg_dosrc src/java/*
 }