dep/style fixes

Package-Manager: portage-2.0.51.22-r1

4 files changed, 26 insertions, 20 deletions

diff --git a/app-benchmarks/jmeter/Manifest b/app-benchmarks/jmeter/Manifest
index abdf9baabc81..4332952d7cfd 100644
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 efb434234486600b9a1e9cd0b7028393 jmeter-2.0.1-r1.ebuild 1929
-MD5 b28b5e7e5c30ff76bfa99a7a5b6f576f jmeter-2.0.1.ebuild 1152
-MD5 bf614b6aea82afc1afe629ed213ea2d0 jmeter-1.9.1.ebuild 1065
+MD5 6326bd42aaed64a71cc6ced587f33b99 jmeter-2.0.1-r1.ebuild 1939
+MD5 529249381f7ae2c03ebb7b0e375f0d93 jmeter-2.0.1.ebuild 1165
+MD5 c78d91516071b671b44a5038d9aa774a jmeter-1.9.1.ebuild 1058
 MD5 a54d0c0dbc1865e88908258808e4c7b3 ChangeLog 3389
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 a62f7266e5fa7c30d2b82af95a3fea55 files/digest-jmeter-1.9.1 74
@@ -12,7 +12,7 @@ MD5 93ea369264f1330ccbcbe9b6b2da7424 files/digest-jmeter-2.0.1-r1 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCUVcy/rLF9B432nYRAu30AJ0Uf5dIEV5Opo01gcK2wFcHVBUwUwCfROG3
-d2s4lwIlmYEz08Tlu3pj3FM=
-=s2p0
+iD8DBQFC2j2h/rLF9B432nYRAmVTAKDKv8r0hNy6fUtLKWUEYiRqkGtfZACffMeK
+hm7e3iTsFp+5imlRKLvZ3Wg=
+=k4Is
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild b/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
index 43e47c868fcb..57d514079ed6 100644
--- a/app-benchmarks/jmeter/jmeter-1.9.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-1.9.1.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/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.7 2005/01/01 12:04:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-1.9.1.ebuild,v 1.8 2005/07/17 11:14:12 axxo Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}.src.tgz"
 DEPEND=">=virtual/jdk-1.3
 	dev-java/ant
 	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86"
@@ -25,7 +25,7 @@ src_compile () {
 	ant ${antflags} || die "build failed"
 }
 
-src_install () {
+src_install() {
 	# Can't think of a better way to deal with this for now...
 	DIROPTIONS="--mode=0775"
 	dodir /opt/${PN}
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild
index d1bdba554c01..adfee71fada6 100644
--- a/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild,v 1.8 2005/04/04 15:02:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1-r1.ebuild,v 1.9 2005/07/17 11:14:12 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Load test and measure performance on HTTP/FTP services and databases."
 HOMEPAGE="http://jakarta.apache.org/jmeter"
 SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant
+RDEPEND=">=virtual/jre-1.3
 	dev-java/commons-logging
 	=dev-java/commons-httpclient-2*
 	dev-java/commons-collections
@@ -22,7 +21,9 @@ DEPEND=">=virtual/jdk-1.3
 	dev-java/soap
 	dev-java/jtidy
 	doc? ( >=dev-java/velocity-1.4 )"
-RDEPEND=">=virtual/jdk-1.3"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	dev-java/ant"
 LICENSE="Apache-2.0"
 SLOT="0"
 #bug 63309
@@ -48,7 +49,7 @@ src_unpack() {
 	java-pkg_jar-from jtidy
 	rm -f jorphan.jar
 }
-src_compile () {
+src_compile() {
 	local antflags="package"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} docs-all"
@@ -56,7 +57,7 @@ src_compile () {
 	ant ${antflags} || die "compile problem"
 }
 
-src_install () {
+src_install() {
 	DIROPTIONS="--mode=0775"
 	dodir /opt/${PN}
 	cp -ar bin/ lib/ printable_docs/ ${D}/opt/${PN}/
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
index 9d0508f3d9ca..4dfb6abdb53a 100644
--- a/app-benchmarks/jmeter/jmeter-2.0.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-2.0.1.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/app-benchmarks/jmeter/jmeter-2.0.1.ebuild,v 1.5 2005/01/01 12:04:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-2.0.1.ebuild,v 1.6 2005/07/17 11:14:12 axxo Exp $
 
 inherit java-pkg
 
@@ -11,7 +11,7 @@ DEPEND=">=virtual/jdk-1.3
 	dev-java/ant
 	doc? ( >=dev-java/velocity-1.4 )"
 	# jikes ( dev-java/jikes"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86"
@@ -19,16 +19,21 @@ IUSE="doc" # jikes"
 
 S=${WORKDIR}/jakarta-${P}
 
-src_compile () {
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+	use doc && java-pkg_jarfrom velocity
+}
+
+src_compile() {
 	local antflags="package"
 	#Does not compile with jikes, patches welcome at bugs.gentoo.org
 	#use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} docs-all"
-	use doc && cp /usr/share/velocity/lib/velocity-*.jar $S/lib
 	ant ${antflags} || die "compile problem"
 }
 
-src_install () {
+src_install() {
 	DIROPTIONS="--mode=0775"
 	dodir /opt/${PN}
 	cp -ar bin/ lib/ printable_docs/ ${D}/opt/${PN}/