Use java-pkg_dojavadoc.

Package-Manager: portage-2.1.2-r9

diff --git a/dev-java/picocontainer/ChangeLog b/dev-java/picocontainer/ChangeLog
index 05a11f25350abf2e09979d94a1e6a1c22866f6dc..a6dad215feb496f41a2696c752082388046a2c59 100644 (file)
--- a/dev-java/picocontainer/ChangeLog
+++ b/dev-java/picocontainer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/picocontainer
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.20 2007/02/13 20:46:27 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.21 2007/02/13 20:50:49 betelgeuse Exp $
+
+  13 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  picocontainer-1.1-r1.ebuild:
+  Use java-pkg_dojavadoc.
 
   13 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
   -files/build-1.0_beta4.xml, -picocontainer-1.0_beta4.ebuild:

diff --git a/dev-java/picocontainer/Manifest b/dev-java/picocontainer/Manifest
index c47f18814ca49851e6a5ae41e91bcecfdd228ef7..2a910ba0dadc9813debffd8f73caee4e6306ba1a 100644 (file)
--- a/dev-java/picocontainer/Manifest
+++ b/dev-java/picocontainer/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 DIST picocontainer-1.1-src.tar.gz 83564 RMD160 980b50a8d4bcce9561ef5705d294243764640c72 SHA1 e2417576fed8e7367ee9ebc111f7dc6ff06cccdf SHA256 c1463cbaceaa1eae718d271035653a61a19232f3a20e831bd5d016963ef6091e
-EBUILD picocontainer-1.1-r1.ebuild 1336 RMD160 e89d30fa560a4989b71e9a0ad7049d5f9b5fe5b1 SHA1 5419859212af87f5b1ebda1e07f3ec08f5ea85d8 SHA256 d90a03f74fcfe78d97a6a515ca7f11daa420d0ecc31c03618bd3637bfe9b89a4
-MD5 ad07f52d322ac6c8403d0b9d1f7cc079 picocontainer-1.1-r1.ebuild 1336
-RMD160 e89d30fa560a4989b71e9a0ad7049d5f9b5fe5b1 picocontainer-1.1-r1.ebuild 1336
-SHA256 d90a03f74fcfe78d97a6a515ca7f11daa420d0ecc31c03618bd3637bfe9b89a4 picocontainer-1.1-r1.ebuild 1336
+EBUILD picocontainer-1.1-r1.ebuild 1345 RMD160 1742395ae926c67c86452808531d774c4675451f SHA1 b9ad42bef56bdbe29927dfb7e69c92e9fe91beb3 SHA256 581835bb3f4e176d34e7c25c0300385a50bfa5cefe2f166deaaafc4a657adf95
+MD5 15dd99b2710cf26fe08995f4e0dcc36e picocontainer-1.1-r1.ebuild 1345
+RMD160 1742395ae926c67c86452808531d774c4675451f picocontainer-1.1-r1.ebuild 1345
+SHA256 581835bb3f4e176d34e7c25c0300385a50bfa5cefe2f166deaaafc4a657adf95 picocontainer-1.1-r1.ebuild 1345
 EBUILD picocontainer-1.1.ebuild 1121 RMD160 d6fdaa5e4f9933ae046352c06e4e817836866463 SHA1 cb0d76c6225c973e8bb8017f4f041d2a08468a48 SHA256 8afa56239d9616943e7dd7fb54ee1d2ea2d87db5f62ece855911362286456215
 MD5 e94eebee33c8ca5835a170df882c1961 picocontainer-1.1.ebuild 1121
 RMD160 d6fdaa5e4f9933ae046352c06e4e817836866463 picocontainer-1.1.ebuild 1121
 SHA256 8afa56239d9616943e7dd7fb54ee1d2ea2d87db5f62ece855911362286456215 picocontainer-1.1.ebuild 1121
-MISC ChangeLog 3177 RMD160 b615ef618df1e4186f6c00fc75130de6a3239f70 SHA1 545d669c1be86f48fdee887c48d96b8331bddfaf SHA256 75729c550caf3d2df8cfc81c5ec22bde30a8ba22c33e14a45146556460502ab4
-MD5 a92692865b7094fcc96ffe902527616d ChangeLog 3177
-RMD160 b615ef618df1e4186f6c00fc75130de6a3239f70 ChangeLog 3177
-SHA256 75729c550caf3d2df8cfc81c5ec22bde30a8ba22c33e14a45146556460502ab4 ChangeLog 3177
+MISC ChangeLog 3288 RMD160 f0900eb7a39014c4825ae552f6be17b730bdf88b SHA1 37d7066cfd7a7c415e40679133432c22e7feb4d4 SHA256 d70ec24d1a09cdf0ce7e0ed90a1a36344a467e662105723ad70461600c206373
+MD5 e99a2515c64e1bb4c679e4656b3bc0e3 ChangeLog 3288
+RMD160 f0900eb7a39014c4825ae552f6be17b730bdf88b ChangeLog 3288
+SHA256 d70ec24d1a09cdf0ce7e0ed90a1a36344a467e662105723ad70461600c206373 ChangeLog 3288
 MISC metadata.xml 553 RMD160 f0f191b3f4073125272d86340a586e4cc37b0ea8 SHA1 877d7e6e866e34ac1bebf2b840e9d09d176f05c1 SHA256 11842e69211e4ca21cfb7ec13510ce4daf8b17ad73487680773af302371d54d4
 MD5 bebc5edd0414aba81a45ce457cd9d4f3 metadata.xml 553
 RMD160 f0f191b3f4073125272d86340a586e4cc37b0ea8 metadata.xml 553
@@ -27,7 +27,7 @@ SHA256 2c517416abd348b663edeb3eb3c1230c9cec0590af0f3ea48d0e2609c1337ef2 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF0iPicxLzpIGCsLQRAibzAJ9Pb9sxnlAJ5zpashzYpvrgYBiJmQCfXcEB
-8O+JNyrFQn9Pp4IU9EkcsrA=
-=vETH
+iD8DBQFF0iSxcxLzpIGCsLQRAmyrAJoCai20YSdh60f53DMFYplUW2v49gCfV1nZ
+ZBSFfX5VLLnbVr9/dBfZYOM=
+=KcF3
 -----END PGP SIGNATURE-----

diff --git a/dev-java/picocontainer/picocontainer-1.1-r1.ebuild b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
index 51ac0864e4afec5983c88e39d72dc4500283b3f5..54ed99c0e76fdb2df510d04342ccc2574ad56f25 100644 (file)
--- a/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
+++ b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/picocontainer/picocontainer-1.1-r1.ebuild,v 1.2 2007/02/13 20:47:22 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.1-r1.ebuild,v 1.3 2007/02/13 20:50:49 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -22,9 +22,9 @@ DEPEND=">=virtual/jdk-1.4
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
        # Don't run tests automatically
-       sed -i -e 's/compile,test/compile/' build.xml
+       sed -i -e 's/compile,test/compile/' build.xml || die
 
 # doesn't pass internal test even when trying vanilla build.xml that fetches own libs
 #      if use test ; then
@@ -47,6 +47,6 @@ src_compile() {
 src_install() {
        java-pkg_dojar target/${PN}.jar
 
-       use doc && java-pkg_dohtml -r dist/docs/api
+       use doc && java-pkg_dojavadoc dist/docs/api
        use source && java-pkg_dosrc src/java/org
 }