Dep/Style fixes

Package-Manager: portage-2.0.51.22-r1

3 files changed, 24 insertions, 13 deletions

diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 13557a9b8a94..2e4ba991959a 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 5a3f2fb72b2d9e485817bb1fbeae03f1 velocity-1.4-r2.ebuild 1408
 MD5 63f4771f7a97fe6d62557744cc622c66 velocity-1.4-r1.ebuild 1371
 MD5 ce29cb44c25a7dafa441a5f3bf79bb3a ChangeLog 2450
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 ebc2b845ee1e201a404b4eceb168952a files/digest-velocity-1.4-r1 65
 MD5 ebc2b845ee1e201a404b4eceb168952a files/digest-velocity-1.4-r2 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC16Fg/rLF9B432nYRAkd6AKC2k5aJ3+Ognxu78Gm2mygg99ta0ACfVEPp
+7mkOD1mDaxs7Cwh5VEmEqJ0=
+=lfuM
+-----END PGP SIGNATURE-----
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/*
 }