summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-07-15 11:43:07 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-07-15 11:43:07 +0000
commita768e428e7e04def7d39e3071ac300b7233aa39f (patch)
treeb21b23001183bb2a22811876636fb621e604ee91 /dev-java/velocity
parentVersion bump. (diff)
downloadgentoo-2-a768e428e7e04def7d39e3071ac300b7233aa39f.tar.gz
gentoo-2-a768e428e7e04def7d39e3071ac300b7233aa39f.tar.bz2
gentoo-2-a768e428e7e04def7d39e3071ac300b7233aa39f.zip
Dep/Style fixes
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-java/velocity')
-rw-r--r--dev-java/velocity/velocity-1.4-r1.ebuild14
-rw-r--r--dev-java/velocity/velocity-1.4-r2.ebuild13
2 files changed, 14 insertions, 13 deletions
diff --git a/dev-java/velocity/velocity-1.4-r1.ebuild b/dev-java/velocity/velocity-1.4-r1.ebuild
index 03111f348537..442dd3401438 100644
--- a/dev-java/velocity/velocity-1.4-r1.ebuild
+++ b/dev-java/velocity/velocity-1.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4-r1.ebuild,v 1.3 2005/07/09 16:12:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4-r1.ebuild,v 1.4 2005/07/15 11:43:07 axxo Exp $
inherit java-pkg
@@ -13,13 +13,14 @@ SLOT="0"
KEYWORDS="x86"
IUSE="doc j2ee jikes junit"
-DEPEND=">=virtual/jdk-1.3.1"
-RDEPEND=">=virtual/jdk-1.3.1
- >=dev-java/ant-1.5.1
+RDEPEND=">=virtual/jre-1.3.1
>=dev-java/avalon-logkit-bin-1.2
=dev-java/jakarta-oro-2.0*
j2ee? ( =dev-java/sun-j2ee-1.3.1* )
jikes? ( >=dev-java/jikes-1.17 )"
+DEPEND=">=virtual/jdk-1.3.1
+ ${RDEPEND}
+ >=dev-java/ant-1.5.1"
src_compile () {
cd ${S}/build
@@ -36,13 +37,12 @@ src_compile () {
}
-src_install () {
- cd ${S}
+src_install() {
if use j2ee ; then
java-pkg_dojar bin/${PN}-J2EE-${PV}.jar
else
java-pkg_dojar bin/${P}.jar
fi
- dodoc LICENSE NOTICE README.txt
+ dodoc NOTICE README.txt
use doc && java-pkg_dohtml -r docs/*
}
diff --git a/dev-java/velocity/velocity-1.4-r2.ebuild b/dev-java/velocity/velocity-1.4-r2.ebuild
index eeafbf232290..779e044cb1d6 100644
--- a/dev-java/velocity/velocity-1.4-r2.ebuild
+++ b/dev-java/velocity/velocity-1.4-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4-r2.ebuild,v 1.2 2005/07/09 16:12:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.4-r2.ebuild,v 1.3 2005/07/15 11:43:07 axxo Exp $
inherit java-pkg
@@ -13,13 +13,14 @@ SLOT="0"
KEYWORDS="~x86"
IUSE="doc j2ee jikes junit"
-DEPEND=">=virtual/jdk-1.3.1"
-RDEPEND=">=virtual/jdk-1.3.1
- >=dev-java/ant-1.5.1
+RDEPEND=">=virtual/jre-1.3.1
>=dev-java/avalon-logkit-bin-1.2
=dev-java/jakarta-oro-2.0*
j2ee? ( =dev-java/sun-j2ee-1.3.1* )
jikes? ( >=dev-java/jikes-1.17 )"
+DEPEND=">=virtual/jdk-1.3.1
+ ${RDEPEND}
+ >=dev-java/ant-1.5.1"
src_compile () {
cd ${S}/build
@@ -36,13 +37,13 @@ src_compile () {
}
-src_install () {
+src_install() {
cd ${S}
if use j2ee ; then
java-pkg_newjar bin/${PN}-J2EE-${PV}.jar ${PN}-J2EE.jar
else
java-pkg_newjar bin/${P}.jar ${PN}.jar
fi
- dodoc LICENSE NOTICE README.txt
+ dodoc NOTICE README.txt
use doc && java-pkg_dohtml -r docs/*
}