Add missing dev-java/servletapi to RDEPEND and use java-pkg_dojavadoc.

Package-Manager: portage-2.1.2.5

4 files changed, 45 insertions, 24 deletions

diff --git a/dev-java/jamon/ChangeLog b/dev-java/jamon/ChangeLog
index 6ab1b14730d1..e432240628cf 100644
--- a/dev-java/jamon/ChangeLog
+++ b/dev-java/jamon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jamon
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamon/ChangeLog,v 1.1 2006/10/13 03:53:58 nichoj Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamon/ChangeLog,v 1.2 2007/04/28 19:15:02 betelgeuse Exp $
+
+  28 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> jamon-1.01-r1.ebuild:
+  Add missing dev-java/servletapi to RDEPEND and use java-pkg_dojavadoc.
 
 *jamon-1.01-r1 (13 Oct 2006)
 
diff --git a/dev-java/jamon/Manifest b/dev-java/jamon/Manifest
index 76fe825128ec..0746dbc09c81 100644
--- a/dev-java/jamon/Manifest
+++ b/dev-java/jamon/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build-1.0.xml 1546 RMD160 ebd507967b0bb2fabe2aac044ef60e3785189654 SHA1 68699e0269a51d6f4eba82e5b15bd485974d8084 SHA256 db486d24f063b5ec263d6da56b52dd2a7cae686cb9c347fb9702cc0d3dda7868
 MD5 c089b7d34f96c556a34bb8c402794023 files/build-1.0.xml 1546
 RMD160 ebd507967b0bb2fabe2aac044ef60e3785189654 files/build-1.0.xml 1546
@@ -7,14 +10,14 @@ MD5 22467dc95e6eb2c2c2d739393131967e files/jamon-1.01-java1.5.patch 1688
 RMD160 7c5b4d78e8f3fac9ec11730983d75e14ef2d8de9 files/jamon-1.01-java1.5.patch 1688
 SHA256 dc48d61d3de0be89940282d9face0d250a0a507149d6539a4e79afd610c84d70 files/jamon-1.01-java1.5.patch 1688
 DIST JAMonAll_103005.zip 143825 RMD160 9e59e83f28cc998053808789d7c6095176755a11 SHA1 6f651c3c26927807044cd1e3f6787110761998a2 SHA256 23eceb23264c4643846372c6454f9406d2435aeaf840a183033d9fa50176c9ab
-EBUILD jamon-1.01-r1.ebuild 1250 RMD160 0d6dcfd017b29e512a43c51d9514f17b89107076 SHA1 d089e98a43f69d15cf119717e746f3325ef87123 SHA256 32bd4e23ec2f81a7c9252e53a60fc73438f03fea85bf299a1a8ae1be272a6195
-MD5 80493df7a1a79639f1c5f03a6efc0321 jamon-1.01-r1.ebuild 1250
-RMD160 0d6dcfd017b29e512a43c51d9514f17b89107076 jamon-1.01-r1.ebuild 1250
-SHA256 32bd4e23ec2f81a7c9252e53a60fc73438f03fea85bf299a1a8ae1be272a6195 jamon-1.01-r1.ebuild 1250
-MISC ChangeLog 407 RMD160 f2c46c7656551bcb21498f98cc6e95e7fe886d9c SHA1 8904b4ec07fd21b64e25a03fd837254b31e1d098 SHA256 e6163f9bb38e068140114abf3bbf1fcf75f381e8789cfa4da4143a102f463809
-MD5 8f3bfb36e13427b0b480b62adc7849af ChangeLog 407
-RMD160 f2c46c7656551bcb21498f98cc6e95e7fe886d9c ChangeLog 407
-SHA256 e6163f9bb38e068140114abf3bbf1fcf75f381e8789cfa4da4143a102f463809 ChangeLog 407
+EBUILD jamon-1.01-r1.ebuild 1248 RMD160 62f7640489fd948f4481edcff86a92f17b93283f SHA1 14dde34d99ffb227b57fe39ffc2a991e291b4495 SHA256 def370613e3804f07fb633386d5996304de6f0a0af69359acb6bae3ec14d3670
+MD5 e4896eda276854e3270498dd907bf089 jamon-1.01-r1.ebuild 1248
+RMD160 62f7640489fd948f4481edcff86a92f17b93283f jamon-1.01-r1.ebuild 1248
+SHA256 def370613e3804f07fb633386d5996304de6f0a0af69359acb6bae3ec14d3670 jamon-1.01-r1.ebuild 1248
+MISC ChangeLog 560 RMD160 995a8e7b7e63aa239808fbf653fceab70829b9ea SHA1 771f85a5bc9d9f54d55c77a1349091ea1fd0bee0 SHA256 ec4d0fb0f9c0b743f6adc6780fc741fc6c4ff110cf3c161de5a2d776b14c00e6
+MD5 d57c06ea7765b8dea8955c0b9c6481f6 ChangeLog 560
+RMD160 995a8e7b7e63aa239808fbf653fceab70829b9ea ChangeLog 560
+SHA256 ec4d0fb0f9c0b743f6adc6780fc741fc6c4ff110cf3c161de5a2d776b14c00e6 ChangeLog 560
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -22,3 +25,10 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 4a2e772bbafa5b8d0361f50e2ecd3e7b files/digest-jamon-1.01-r1 238
 RMD160 e876016015276838a7a5719e0b936542d009f828 files/digest-jamon-1.01-r1 238
 SHA256 694d3b262483304f06579a2b9776c595838962f2d68cb55cc1e87efeae49f363 files/digest-jamon-1.01-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGM504cxLzpIGCsLQRAp1QAJ9887F/h5bpZwQ66pOciVIuDFil4QCdGgIC
+K5UrQDz2rXP21MywcZoTD58=
+=Y53h
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jamon/jamon-1.01-r1.ebuild b/dev-java/jamon/jamon-1.01-r1.ebuild
index 3fcf4e1b10ed..f998a910628f 100644
--- a/dev-java/jamon/jamon-1.01-r1.ebuild
+++ b/dev-java/jamon/jamon-1.01-r1.ebuild
@@ -1,8 +1,9 @@
-# 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/jamon/jamon-1.01-r1.ebuild,v 1.1 2006/10/13 03:53:58 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamon/jamon-1.01-r1.ebuild,v 1.2 2007/04/28 19:15:02 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
+
 MY_PN="JAMon"
 MY_PV="103005"
 DESCRIPTION="A free, simple, high performance, thread safe, Java API that allows
@@ -15,11 +16,11 @@ SLOT="1"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.4
 	~dev-java/servletapi-2.3"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${RDEPEND}"
 
 src_unpack() {
 	# The structure of the archive is really messy, so we have to clean it up a
@@ -46,5 +47,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
 
-	use doc && java-pkg_dohtml -r dist/doc/api
+	use doc && java-pkg_dojavadoc dist/doc/api
 }
diff --git a/dev-java/mg4j/Manifest b/dev-java/mg4j/Manifest
index 4902cfe30c99..a0e600e61089 100644
--- a/dev-java/mg4j/Manifest
+++ b/dev-java/mg4j/Manifest
@@ -6,14 +6,18 @@ MD5 326925c121a02bba5ed19a5d223ae55d files/mg4j-build.patch 1420
 RMD160 12ff9269ec0527e03783b73545a57167fad9f82a files/mg4j-build.patch 1420
 SHA256 b2ff3375bd0bb4c2dedc08c637a4edc054bd091f8fc6982110c1f5b027a97873 files/mg4j-build.patch 1420
 DIST mg4j-0.9.1-src.tar.gz 169529 RMD160 f3b63073b263942fb5af286843d248770629182a SHA1 7caf2ad9460709cfee57e70f49529100b7af45da SHA256 8ca5c99facd9be71af57f0e71f746e83af98018774afe37d2a7a83aa356dc828
+EBUILD mg4j-0.9.1-r1.ebuild 1146 RMD160 c473ccbe670c54b8b58151cb18f80c7dc72a6a18 SHA1 80470ab71f70a6645d6c2c94fb4efa26ad4b4fda SHA256 7739013bf2e4c1ef08e06ddc8c6839b10d3f9b6f1a59864ffcf078ec5699913e
+MD5 094f4b5be80b5c6870332d87cc84b1bb mg4j-0.9.1-r1.ebuild 1146
+RMD160 c473ccbe670c54b8b58151cb18f80c7dc72a6a18 mg4j-0.9.1-r1.ebuild 1146
+SHA256 7739013bf2e4c1ef08e06ddc8c6839b10d3f9b6f1a59864ffcf078ec5699913e mg4j-0.9.1-r1.ebuild 1146
 EBUILD mg4j-0.9.1.ebuild 1333 RMD160 f7d62060fc6651ef179336fa593f7d032ad5684a SHA1 e1c77719dd9721f9fdf5ffe920969149bc1df997 SHA256 bfcfc506c6dedb6eba722f8aabd1e8ff409140cf35fab353f8a06111dba74a3a
 MD5 a7b0cc2fb72cbb9f3f7588c56220b44a mg4j-0.9.1.ebuild 1333
 RMD160 f7d62060fc6651ef179336fa593f7d032ad5684a mg4j-0.9.1.ebuild 1333
 SHA256 bfcfc506c6dedb6eba722f8aabd1e8ff409140cf35fab353f8a06111dba74a3a mg4j-0.9.1.ebuild 1333
-MISC ChangeLog 1123 RMD160 e58062dae17d04ae1cb8d98b2e6ccba00321fa26 SHA1 9de4b110f185ea8bff0122f8b87d01f071ae2caf SHA256 c1598e50efe440fdad0423bd84381e00e30abcfeec94c5cf32f45109345e4f77
-MD5 095aac9991af9cda0da91fa8f84f777d ChangeLog 1123
-RMD160 e58062dae17d04ae1cb8d98b2e6ccba00321fa26 ChangeLog 1123
-SHA256 c1598e50efe440fdad0423bd84381e00e30abcfeec94c5cf32f45109345e4f77 ChangeLog 1123
+MISC ChangeLog 1256 RMD160 06eac4db1f280b50290de1fd8c8bfcf4e1b8ebd7 SHA1 c12ccb12cdbe777ccc3b6554a0dd2d9c3873e624 SHA256 f10f1d46de916bf556c271387313c0f4ab5c207e6e610fb023653388b5db3eea
+MD5 cbd9f289ba98ed17201bed1873d35efc ChangeLog 1256
+RMD160 06eac4db1f280b50290de1fd8c8bfcf4e1b8ebd7 ChangeLog 1256
+SHA256 f10f1d46de916bf556c271387313c0f4ab5c207e6e610fb023653388b5db3eea ChangeLog 1256
 MISC metadata.xml 598 RMD160 a553bd949e208a1412ef56af6c30d284de275818 SHA1 1eae035e51febf3016b10dce69eb48fdc86cc49c SHA256 912a4da39dbd10e68f7d25d4aec1d378d21c2f27f082d4f2303e6219d7388e19
 MD5 93d4165289bf584b0a5ee0fc922f1eba metadata.xml 598
 RMD160 a553bd949e208a1412ef56af6c30d284de275818 metadata.xml 598
@@ -21,10 +25,13 @@ SHA256 912a4da39dbd10e68f7d25d4aec1d378d21c2f27f082d4f2303e6219d7388e19 metadata
 MD5 18f12b1cc6b0a85aba685c101820746f files/digest-mg4j-0.9.1 244
 RMD160 2b28533fc3c1884b095a8a4edf8c06d9e536ee3e files/digest-mg4j-0.9.1 244
 SHA256 86fefdd40a8d958dc4d9cdebf610a51f4da00a774d1dd51331ee1245a47ab2a5 files/digest-mg4j-0.9.1 244
+MD5 18f12b1cc6b0a85aba685c101820746f files/digest-mg4j-0.9.1-r1 244
+RMD160 2b28533fc3c1884b095a8a4edf8c06d9e536ee3e files/digest-mg4j-0.9.1-r1 244
+SHA256 86fefdd40a8d958dc4d9cdebf610a51f4da00a774d1dd51331ee1245a47ab2a5 files/digest-mg4j-0.9.1-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFxMDbcxLzpIGCsLQRAl/EAKCKg7McmYMLuLzkV3a5OyloqS/ISwCffTTu
-7ZrFhfjKZgLUOGNvZ049090=
-=HXmm
+iD8DBQFGM55rgo/w9rxVVVERAp6MAKC9C6BXFMV9vPkJbztW6VXb9NtO/ACcD6J6
+Ac3tYRn2TR/6HoK5m4/Dy2I=
+=bpwp
 -----END PGP SIGNATURE-----