Ebuild cleanup. Use dojavadoc.

Package-Manager: portage-2.1.2-r4

diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog
index 8584d2f3e33474b12e637df24a8615bdaea4c4f0..d4f66dd27ce80dd207f884a919e42215454684cf 100644 (file)
--- a/dev-java/commons-beanutils/ChangeLog
+++ b/dev-java/commons-beanutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-beanutils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.31 2007/01/11 13:18:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.32 2007/01/26 18:24:57 betelgeuse Exp $
+
+  26 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-beanutils-1.6.1-r3.ebuild, commons-beanutils-1.7.0-r2.ebuild:
+  Ebuild cleanup. Use dojavadoc.
 
   11 Jan 2007; Markus Rothe <corsair@gentoo.org>
   commons-beanutils-1.6.1-r3.ebuild, commons-beanutils-1.7.0-r2.ebuild:

diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index ac287e2c4ab6665b777e178a62dcd0b4339f88c8..d27a4c66537153b3e639d22798cc3791bf51549b 100644 (file)
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,25 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST commons-beanutils-1.6.1-src.tar.gz 148249 RMD160 ef18dd9abc81cdbe790318bfdaac6026d9a2570d SHA1 0545881bee6ee60248a3bbd2e2fdb87b88674751 SHA256 e35572613bd7141bcb64725e9f7c3f527ba5f11d4d12d5daff808f886e472bdd
 DIST commons-beanutils-1.7.0-src.tar.gz 258835 RMD160 1a9058a79cf6dfc8e5d384af2a5cdec3dcf3184b SHA1 3c1eceae87320fe7e0eec8573fd19b8ff283d1c5 SHA256 ffe3ff9208c3eb8a9c393ee244445fc1e70bb42213bee97dc86e71704fa40076
 EBUILD commons-beanutils-1.6.1-r2.ebuild 1432 RMD160 9f6bee442e5a836f94f992b8a1651a31f3d5b836 SHA1 ab367491866ed44a199f4b429add129a1761d72d SHA256 d7346934511507106fa5a7e7fc948cf3fc7663f92ab25a5f7bded272721299e2
 MD5 098455b86e297937db132971a4d4b397 commons-beanutils-1.6.1-r2.ebuild 1432
 RMD160 9f6bee442e5a836f94f992b8a1651a31f3d5b836 commons-beanutils-1.6.1-r2.ebuild 1432
 SHA256 d7346934511507106fa5a7e7fc948cf3fc7663f92ab25a5f7bded272721299e2 commons-beanutils-1.6.1-r2.ebuild 1432
-EBUILD commons-beanutils-1.6.1-r3.ebuild 1315 RMD160 dcd8ea18e1cd949e85f281c0ad72bfa5bd101443 SHA1 6e4f2ac301d1700349cb899a27fb55ef4652c6d1 SHA256 e2adc4906c972607c504e1ea569ecac794d70ea3ea8b6cbc8e041bf0db6f91eb
-MD5 ad8c2b80b7c762fdafec53109639aacd commons-beanutils-1.6.1-r3.ebuild 1315
-RMD160 dcd8ea18e1cd949e85f281c0ad72bfa5bd101443 commons-beanutils-1.6.1-r3.ebuild 1315
-SHA256 e2adc4906c972607c504e1ea569ecac794d70ea3ea8b6cbc8e041bf0db6f91eb commons-beanutils-1.6.1-r3.ebuild 1315
+EBUILD commons-beanutils-1.6.1-r3.ebuild 1283 RMD160 d7928b0e671a5d1a15926d440a206316a9b79fda SHA1 297711dae37662fd503113ce7e4f4c1d80f86601 SHA256 2564aefa3f6c631ecaf168b2cdf793fd02d2d2b674ec739a627a189e47f6bf6a
+MD5 d91f32488b5c916d2461b8f39f749234 commons-beanutils-1.6.1-r3.ebuild 1283
+RMD160 d7928b0e671a5d1a15926d440a206316a9b79fda commons-beanutils-1.6.1-r3.ebuild 1283
+SHA256 2564aefa3f6c631ecaf168b2cdf793fd02d2d2b674ec739a627a189e47f6bf6a commons-beanutils-1.6.1-r3.ebuild 1283
 EBUILD commons-beanutils-1.7.0-r1.ebuild 1429 RMD160 b4d41d92c8808b46e55a74d929f8008d584a694f SHA1 5124556433d7405024bf7aebf87939886972af66 SHA256 8ba7c0f18c7c48e7229bc353b35000fe62cf8de1e1ca821f81a38d642ee22664
 MD5 b75f92e7f5d8e4e76c96437fcfc495cb commons-beanutils-1.7.0-r1.ebuild 1429
 RMD160 b4d41d92c8808b46e55a74d929f8008d584a694f commons-beanutils-1.7.0-r1.ebuild 1429
 SHA256 8ba7c0f18c7c48e7229bc353b35000fe62cf8de1e1ca821f81a38d642ee22664 commons-beanutils-1.7.0-r1.ebuild 1429
-EBUILD commons-beanutils-1.7.0-r2.ebuild 1313 RMD160 967f3202679177603c7dd0ab937d356478df48f2 SHA1 340f0b979544d6dec4d3a1ba5f402d8acb1d6ca5 SHA256 b8e623900373508b1347b3eedee16b04f7c1c4287155e14b4a06f4c916677aa1
-MD5 61554b3e4622f2a5c5443948ba3f6ead commons-beanutils-1.7.0-r2.ebuild 1313
-RMD160 967f3202679177603c7dd0ab937d356478df48f2 commons-beanutils-1.7.0-r2.ebuild 1313
-SHA256 b8e623900373508b1347b3eedee16b04f7c1c4287155e14b4a06f4c916677aa1 commons-beanutils-1.7.0-r2.ebuild 1313
-MISC ChangeLog 4901 RMD160 9b072e312aefe0cb13fdee9cd5167f26d2677e15 SHA1 f7fb130ccd122f92eb07c5b935691405cca094b9 SHA256 22cd63a7d5da68e725a15adb8b78d0c395e35a42b9740fd041f0b30784eb62da
-MD5 4145e95b553cf584d64dca69f1a57331 ChangeLog 4901
-RMD160 9b072e312aefe0cb13fdee9cd5167f26d2677e15 ChangeLog 4901
-SHA256 22cd63a7d5da68e725a15adb8b78d0c395e35a42b9740fd041f0b30784eb62da ChangeLog 4901
+EBUILD commons-beanutils-1.7.0-r2.ebuild 1285 RMD160 0ea931c0c537c1fed40c9c9d6efd886a9f9686d8 SHA1 c69b3aac3cbe5f47575250df2c1efcb147dc3845 SHA256 b42eec9f2410e6c8cf42a7b95ec3b88482c7c425e708ad118e6563fc05c5785e
+MD5 4e21b8036efde97ee49e883412031c67 commons-beanutils-1.7.0-r2.ebuild 1285
+RMD160 0ea931c0c537c1fed40c9c9d6efd886a9f9686d8 commons-beanutils-1.7.0-r2.ebuild 1285
+SHA256 b42eec9f2410e6c8cf42a7b95ec3b88482c7c425e708ad118e6563fc05c5785e commons-beanutils-1.7.0-r2.ebuild 1285
+MISC ChangeLog 5063 RMD160 103df6a8422b7c5d22fdffc1099e2af0ccc5f10f SHA1 549d9ece0f4cfd3ecc1b62562981978bb89bcac0 SHA256 6e31b44c3231b15ec4db62591e1f68cc3db91b4f658a598d82c4953bc5ab6310
+MD5 9e4552dfedc62e0dd2e8e7b7a6b4b9af ChangeLog 5063
+RMD160 103df6a8422b7c5d22fdffc1099e2af0ccc5f10f ChangeLog 5063
+SHA256 6e31b44c3231b15ec4db62591e1f68cc3db91b4f658a598d82c4953bc5ab6310 ChangeLog 5063
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -36,3 +39,10 @@ SHA256 0dde4b4160450df0de3c3fe1f07a7fe1407dc7ef9a4a820564e223f380c5f743 files/di
 MD5 ed5c6ffa606a1a356f05ac30cdbae14f files/digest-commons-beanutils-1.7.0-r2 283
 RMD160 4b8d6880facc296ef1918717cbdf97d24610dd9b files/digest-commons-beanutils-1.7.0-r2 283
 SHA256 0dde4b4160450df0de3c3fe1f07a7fe1407dc7ef9a4a820564e223f380c5f743 files/digest-commons-beanutils-1.7.0-r2 283
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFukeFcxLzpIGCsLQRAvxoAJ91t321110uScaQudYWtaVF9hY5swCfQVq7
+MMzl0Q89Bv7PCsrhfrEy1m0=
+=PoU/
+-----END PGP SIGNATURE-----

diff --git a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild
index 77acb3dd6881036ae751c9f8380d6d01f793380d..bc0b33b7f6041421f78a831c7a147a928159530e 100644 (file)
--- a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild,v 1.6 2007/01/11 13:18:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r3.ebuild,v 1.7 2007/01/26 18:24:57 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -27,22 +27,18 @@ S="${WORKDIR}/${P}-src"
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
 
        echo "commons-collections.jar=$(java-pkg_getjars commons-collections)"  > build.properties
        echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
 }
 
-src_compile() {
-       eant $(use_doc) jar
-}
-
 src_install() {
        java-pkg_dojar dist/${PN}*.jar
 
-       dodoc RELEASE-NOTES.txt
-       java-pkg_dohtml STATUS.html PROPOSAL.html
+       dodoc RELEASE-NOTES.txt ||
+       dohtml STATUS.html PROPOSAL.html || die
 
-       use doc && java-pkg_dohtml -r dist/docs/*
+       use doc && java-pkg_dojavadoc dist/docs/api
        use source && java-pkg_dosrc src/java/org
 }

diff --git a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild
index 37286ea3beae5427199df7d57f3ec38950e161de..f248ed6f5cda23cc032da6787eafefb6a14452ca 100644 (file)
--- a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild,v 1.6 2007/01/11 13:18:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0-r2.ebuild,v 1.7 2007/01/26 18:24:57 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -27,22 +27,18 @@ S="${WORKDIR}/${P}-src"
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
 
        echo "commons-collections.jar=$(java-pkg_getjars commons-collections)"  > build.properties
        echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
 }
 
-src_compile() {
-       eant $(use_doc) jar
-}
-
 src_install() {
        java-pkg_dojar dist/${PN}*.jar
 
-       dodoc RELEASE-NOTES.txt
-       java-pkg_dohtml STATUS.html PROPOSAL.html
+       dodoc RELEASE-NOTES.txt || die
+       dohtml STATUS.html PROPOSAL.html || die
 
-       use doc && java-pkg_dohtml -r dist/docs/*
+       use doc && java-pkg_dojavadoc dist/docs/api
        use source && java-pkg_dosrc src/java/*
 }