Add a workaround for bug #158720 and cleanup ebuild.

Package-Manager: portage-2.1.2-r7

3 files changed, 36 insertions, 21 deletions

diff --git a/dev-java/velocity/ChangeLog b/dev-java/velocity/ChangeLog
index 07b0f2de43ee..04db66092c4f 100644
--- a/dev-java/velocity/ChangeLog
+++ b/dev-java/velocity/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/velocity
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.23 2006/08/14 19:28:37 nelchael Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.24 2007/02/07 09:27:47 betelgeuse Exp $
+
+  07 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> velocity-1.4-r4.ebuild:
+  Add a workaround for bug #158720 and cleanup ebuild.
 
 *velocity-1.4-r4 (14 Aug 2006)
 
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 2b4e0e7d4282..891fac3d2972 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -7,14 +10,14 @@ EBUILD velocity-1.4-r3.ebuild 1986 RMD160 4a247e907ce02c0b131096e689f3e16842c699
 MD5 26b47de033bb18d9cc9f2c06333febb4 velocity-1.4-r3.ebuild 1986
 RMD160 4a247e907ce02c0b131096e689f3e16842c69959 velocity-1.4-r3.ebuild 1986
 SHA256 b3885ceff79672824dc901c8c14adcf964c032f7a63c779d67fd9b486e80fbf5 velocity-1.4-r3.ebuild 1986
-EBUILD velocity-1.4-r4.ebuild 1960 RMD160 4d98f2b27f5bcb3b0f319bedbc32b3c03ccd20e1 SHA1 8291ca94d8694becde06ccbc182aab830be658de SHA256 e8cbc86d2219916c9cd5f4fa5fd3fb373cf81836ee731ed5f288df896100aa02
-MD5 ec823fefddfdccc89b19efd002a58fef velocity-1.4-r4.ebuild 1960
-RMD160 4d98f2b27f5bcb3b0f319bedbc32b3c03ccd20e1 velocity-1.4-r4.ebuild 1960
-SHA256 e8cbc86d2219916c9cd5f4fa5fd3fb373cf81836ee731ed5f288df896100aa02 velocity-1.4-r4.ebuild 1960
-MISC ChangeLog 3350 RMD160 c9e65de96bf67ba88c8ebb9a6cbfd750e8c52e25 SHA1 bf4aea835e488b613783c85af2575cff725c8636 SHA256 5026133d17faf6db1eaa00b51115caaf4b332a9a52aca2d4afd85098f7aa134c
-MD5 1ae351bf83f6762ed93a77b97da108ec ChangeLog 3350
-RMD160 c9e65de96bf67ba88c8ebb9a6cbfd750e8c52e25 ChangeLog 3350
-SHA256 5026133d17faf6db1eaa00b51115caaf4b332a9a52aca2d4afd85098f7aa134c ChangeLog 3350
+EBUILD velocity-1.4-r4.ebuild 2067 RMD160 20f801827c1cde382f1720cd04f95ffcfec51a69 SHA1 15ffa4ceca5353b2dc21132effb00b893d9ff933 SHA256 97aedb9ae3de45718c1d276150e7353989403221bb2bf24db41bb816c254e8e2
+MD5 ba731c38a88b863c5f186759eec3ae55 velocity-1.4-r4.ebuild 2067
+RMD160 20f801827c1cde382f1720cd04f95ffcfec51a69 velocity-1.4-r4.ebuild 2067
+SHA256 97aedb9ae3de45718c1d276150e7353989403221bb2bf24db41bb816c254e8e2 velocity-1.4-r4.ebuild 2067
+MISC ChangeLog 3485 RMD160 98d4a971f75ad839f96cb7fee21ebad561b5089c SHA1 f6b97affb2891bfd10af0a79c9113ba68c814912 SHA256 37c49fc63d0d32ea6f4320106e8c358d323cf3deca0ba90939f0ec97d1aee4e0
+MD5 6d7db1458c2271b51294f85e385b088c ChangeLog 3485
+RMD160 98d4a971f75ad839f96cb7fee21ebad561b5089c ChangeLog 3485
+SHA256 37c49fc63d0d32ea6f4320106e8c358d323cf3deca0ba90939f0ec97d1aee4e0 ChangeLog 3485
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -25,3 +28,10 @@ SHA256 d074e9671801ea8929d63eeee4ee60ccdc009948cadfcb944a88568d01a3958a files/di
 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.1 (GNU/Linux)
+
+iD8DBQFFyZuecxLzpIGCsLQRApx2AJwKuAoFhbnAsW8fDqaTS01adav2eACfcM+g
+R1VOmtRH+K4pgECpYhTnajc=
+=aD/D
+-----END PGP SIGNATURE-----
diff --git a/dev-java/velocity/velocity-1.4-r4.ebuild b/dev-java/velocity/velocity-1.4-r4.ebuild
index ce568a435f6b..5a6722d16d90 100644
--- a/dev-java/velocity/velocity-1.4-r4.ebuild
+++ b/dev-java/velocity/velocity-1.4-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.1 2006/08/14 19:28:37 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4-r4.ebuild,v 1.2 2007/02/07 09:27:47 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -13,12 +13,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc source"
 
-DEPEND=">=virtual/jdk-1.3.1
+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.3.1
+RDEPEND=">=virtual/jdk-1.4
 	dev-java/bcel
 	dev-java/commons-collections
 	=dev-java/jdom-1.0_beta9*
@@ -35,15 +37,16 @@ pkg_setup() {
 		eerror "flag turned on."
 		die "log4j not built with the javamail use flag"
 	fi
+	java-pkg-2_pkg_setup
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch ${FILESDIR}/${P}-versioned_jar.patch
 
-	cd ${S}/build/lib
+	cd "${S}/build/lib"
 	rm *.jar
 	java-pkg_jar-from antlr
 	java-pkg_jar-from bcel
@@ -59,18 +62,17 @@ src_unpack() {
 }
 
 src_compile () {
-	cd ${S}/build
+	cd "${S}/build"
 	local antflags="jar jar-core jar-util jar-servlet"
-	use doc && antflags="${antflags} javadocs"
-
-	eant ${antflags} || die "Ant failed"
+	eant ${antflags} $(use_doc javadocs) || die "Ant failed"
 }
 
 
 src_install () {
 	java-pkg_dojar bin/*.jar
 
-	dodoc NOTICE README.txt
+	dodoc NOTICE README.txt || die
+	#has other stuff besides api too
 	use doc && java-pkg_dohtml -r docs/*
 	use source && java-pkg_dosrc src/java/*
 }