summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-08-02 15:48:49 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-08-02 15:48:49 +0000
commita56e9bf13b8db9cfc1883e4b6e0722063be86ac6 (patch)
treed7ffab45ca0362f9a8aee5425369a115f465c7e3 /dev-java/velocity
parentVersion bump, closes #56645 (Manifest recommit) (diff)
downloadgentoo-2-a56e9bf13b8db9cfc1883e4b6e0722063be86ac6.tar.gz
gentoo-2-a56e9bf13b8db9cfc1883e4b6e0722063be86ac6.tar.bz2
gentoo-2-a56e9bf13b8db9cfc1883e4b6e0722063be86ac6.zip
fix 59156
Diffstat (limited to 'dev-java/velocity')
-rw-r--r--dev-java/velocity/ChangeLog5
-rw-r--r--dev-java/velocity/Manifest12
-rw-r--r--dev-java/velocity/velocity-1.4.ebuild10
3 files changed, 10 insertions, 17 deletions
diff --git a/dev-java/velocity/ChangeLog b/dev-java/velocity/ChangeLog
index 2192ae9453cd..a09213911d62 100644
--- a/dev-java/velocity/ChangeLog
+++ b/dev-java/velocity/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/velocity
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.10 2004/07/30 18:44:33 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.11 2004/08/02 15:48:49 axxo Exp $
+
+ 02 Aug 2004; Thomas Matthijs <axxo@gentoo.org> velocity-1.4.ebuild:
+ fix doc checking bug 59156
30 Jul 2004; Thomas Matthijs <axxo@gentoo.org> velocity-1.3.ebuild,
velocity-1.4.ebuild:
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 7e8d07a0cec9..61958ae14292 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d5b7a0b9ef3dbe6252b08e7d46e9c53b velocity-1.4.ebuild 1355
+MD5 44e0e548def22421acdac37e2d762e00 velocity-1.4.ebuild 1345
MD5 c9d7786f50ff0d024153776118bde76b velocity-1.3.ebuild 1326
MD5 13c05db460b2f9d7cf1b6bde67125e68 ChangeLog 1437
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
MD5 c7bdf6df038fc9fcc34a772e5c5b1838 files/digest-velocity-1.3 128
MD5 ebc2b845ee1e201a404b4eceb168952a files/digest-velocity-1.4 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBCpeA/rLF9B432nYRAv8XAKCLc48lUMXquocIyg6n2kK7HVzFQwCfSvCz
-OIyj6XFDIaNluD8Cmf93muY=
-=rAcD
------END PGP SIGNATURE-----
diff --git a/dev-java/velocity/velocity-1.4.ebuild b/dev-java/velocity/velocity-1.4.ebuild
index 5ed4abea045e..19ce74d7800f 100644
--- a/dev-java/velocity/velocity-1.4.ebuild
+++ b/dev-java/velocity/velocity-1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4.ebuild,v 1.2 2004/07/30 18:44:33 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4.ebuild,v 1.3 2004/08/02 15:48:49 axxo Exp $
DESCRIPTION="A Java-based template engine that allows easy creation/rendering of documents that format and present data."
HOMEPAGE="http://jakarta.apache.org/velocity/"
@@ -11,8 +11,8 @@ SLOT="0"
KEYWORDS="~x86"
IUSE="doc j2ee jikes junit"
-DEPEND=">=dev-java/sun-jdk-1.3.1"
-RDEPEND=">=dev-java/sun-jdk-1.3.1
+DEPEND=">=virtual/jdk-1.3.1"
+RDEPEND=">=virtual/jdk-1.3.1
>=dev-java/ant-1.5.1
>=dev-java/avalon-logkit-bin-1.2
>=dev-java/oro-2.0.6
@@ -24,16 +24,16 @@ src_compile () {
local antflags
use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
use junit && antflags="${antflags} test"
+ use doc && antflags="${antflags} javadoc"
if use j2ee ; then
cp /opt/sun-j2ee-1.3.1/lib/j2ee.jar ${S}/build/lib
ant ${antflags} jar-J2EE || die "Java compile failed."
else
ant ${antflags} jar || die "Java compile failed"
fi
-
- use doc && ant javadocs || die "Document compile failed"
}
+
src_install () {
cd ${S}
if use j2ee ; then