Fix javadoc installation.

Package-Manager: portage-2.1.2.2

diff --git a/dev-java/jdepend/ChangeLog b/dev-java/jdepend/ChangeLog
index 9208d68d6d4eb97a1efa067fd19f29c3ce98de0d..2d278e825c0529de90dff8d71431f32ac86a3e34 100644 (file)
--- a/dev-java/jdepend/ChangeLog
+++ b/dev-java/jdepend/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdepend
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/ChangeLog,v 1.36 2007/02/18 19:11:19 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/ChangeLog,v 1.37 2007/03/14 21:43:50 betelgeuse Exp $
+
+*jdepend-2.9-r3 (14 Mar 2007)
+
+  14 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> -jdepend-2.9-r2.ebuild,
+  +jdepend-2.9-r3.ebuild:
+  Fix javadoc installation.
 
   18 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> -jdepend-2.8-r1.ebuild,
   -jdepend-2.9.ebuild:

diff --git a/dev-java/jdepend/Manifest b/dev-java/jdepend/Manifest
index 6ce4b47ab7c7ca0fa6deee40408c63038d845988..3a081a7d0a50f82255e16a97d882a0dd208ee6e9 100644 (file)
--- a/dev-java/jdepend/Manifest
+++ b/dev-java/jdepend/Manifest
@@ -12,14 +12,14 @@ EBUILD jdepend-2.8.1.ebuild 1363 RMD160 c7383bb5fd19227d5744d7127e1998610d7dbc65
 MD5 fccdb066ccf812f813aacc9ac075961d jdepend-2.8.1.ebuild 1363
 RMD160 c7383bb5fd19227d5744d7127e1998610d7dbc65 jdepend-2.8.1.ebuild 1363
 SHA256 4a98e032287c259b6093a7c76c49878c1080e8347d75ad19dd5070f050a871b8 jdepend-2.8.1.ebuild 1363
-EBUILD jdepend-2.9-r2.ebuild 1095 RMD160 d3dedc9da85dfde05065b0a48c872a3394d1bef0 SHA1 8f39d6a6968e8276ac5ef52d1d978292d4a47a2d SHA256 c77522e5282337c5df74e11d1fd9e87af2c9d058f7134d1c2491a2376d7f24de
-MD5 ee4a6b2049d554d195a2dbd28652ad3e jdepend-2.9-r2.ebuild 1095
-RMD160 d3dedc9da85dfde05065b0a48c872a3394d1bef0 jdepend-2.9-r2.ebuild 1095
-SHA256 c77522e5282337c5df74e11d1fd9e87af2c9d058f7134d1c2491a2376d7f24de jdepend-2.9-r2.ebuild 1095
-MISC ChangeLog 4031 RMD160 5eee1cd48fd09ee7f01948f5c6586ee6eb030215 SHA1 880061dc7e6000123d579eb58a44daf5e3f4592b SHA256 f659a7923b1385f4eaed9160f614d92909cca4dbff79be303855f3e5d5de26de
-MD5 950337dbb5c423554960fd27272af505 ChangeLog 4031
-RMD160 5eee1cd48fd09ee7f01948f5c6586ee6eb030215 ChangeLog 4031
-SHA256 f659a7923b1385f4eaed9160f614d92909cca4dbff79be303855f3e5d5de26de ChangeLog 4031
+EBUILD jdepend-2.9-r3.ebuild 1022 RMD160 da912c9f077aeacddaf8e3d72e6d90cd6ec5e1ef SHA1 5f408d6b8814ed0c02c7173c93b10ed8b29eab30 SHA256 14eca1854d594269b882b5777127f77eb9777a683300ab9dd63ef366a031079f
+MD5 2534ae42538c08ae21567ba60b3b5cd9 jdepend-2.9-r3.ebuild 1022
+RMD160 da912c9f077aeacddaf8e3d72e6d90cd6ec5e1ef jdepend-2.9-r3.ebuild 1022
+SHA256 14eca1854d594269b882b5777127f77eb9777a683300ab9dd63ef366a031079f jdepend-2.9-r3.ebuild 1022
+MISC ChangeLog 4194 RMD160 3a34584e1f18348dd532c64751ded63408728e63 SHA1 c5d44b03695ef4725d2c187fd592eaba5f8b0c27 SHA256 d69cb17ea2963cfb7ad12a9c5e3452db2881e7329554bdd11f9b6b1173e12ea8
+MD5 1fd458a7f735d8854b13bcd2da2fc8aa ChangeLog 4194
+RMD160 3a34584e1f18348dd532c64751ded63408728e63 ChangeLog 4194
+SHA256 d69cb17ea2963cfb7ad12a9c5e3452db2881e7329554bdd11f9b6b1173e12ea8 ChangeLog 4194
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -30,13 +30,13 @@ SHA256 355f3a6ca1cb57a7d4a83156b584f420537ba83012f119ffd78b8f590dbf5a43 files/di
 MD5 85022d96fabf096dd7902cae316edd53 files/digest-jdepend-2.8.1 232
 RMD160 2011d7d1832eda52c8e8c1cc50fe93488a5ee946 files/digest-jdepend-2.8.1 232
 SHA256 0b99fe6e65a7d34f445b19c3b6253735b7a2e4e095517a2bea47422d72d99755 files/digest-jdepend-2.8.1 232
-MD5 fe8ad7d440fb21998405adfc47732989 files/digest-jdepend-2.9-r2 226
-RMD160 f5c219f597c28c986d562ac7a11fc6279e32a7b0 files/digest-jdepend-2.9-r2 226
-SHA256 b996d8161109facff87f10d8dcf4d595251537c497eb8ca38ab828b78d507acf files/digest-jdepend-2.9-r2 226
+MD5 fe8ad7d440fb21998405adfc47732989 files/digest-jdepend-2.9-r3 226
+RMD160 f5c219f597c28c986d562ac7a11fc6279e32a7b0 files/digest-jdepend-2.9-r3 226
+SHA256 b996d8161109facff87f10d8dcf4d595251537c497eb8ca38ab828b78d507acf files/digest-jdepend-2.9-r3 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF2KQucxLzpIGCsLQRAm2UAJ9/YVWfqsSk0aGaJOR9KvVnug4VLgCffaa6
-mVxHmOsDY820mT8RC+MA2Yk=
-=5iD1
+iD8DBQFF+GyhcxLzpIGCsLQRAjfLAKCQAdI/ARIpXZeb/tgxs+FB71TxogCfQHcD
+zerHjJ0cF1VvZxWEi74vvmo=
+=Ghli
 -----END PGP SIGNATURE-----

diff --git a/dev-java/jdepend/files/digest-jdepend-2.9-r2 b/dev-java/jdepend/files/digest-jdepend-2.9-r3
similarity index 100%
rename from dev-java/jdepend/files/digest-jdepend-2.9-r2
rename to dev-java/jdepend/files/digest-jdepend-2.9-r3

diff --git a/dev-java/jdepend/jdepend-2.9-r2.ebuild b/dev-java/jdepend/jdepend-2.9-r3.ebuild
similarity index 61%
rename from dev-java/jdepend/jdepend-2.9-r2.ebuild
rename to dev-java/jdepend/jdepend-2.9-r3.ebuild
index 2ab7969b0a0c31547131d4f16945b5ba04dc7eb4..82e39b38181cadb4e05b245ded28e13c969d0f92 100644 (file)
--- a/dev-java/jdepend/jdepend-2.9-r2.ebuild
+++ b/dev-java/jdepend/jdepend-2.9-r3.ebuild
@@ -1,6 +1,8 @@
-# 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/jdepend/jdepend-2.9-r2.ebuild,v 1.5 2006/10/17 02:35:52 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/jdepend-2.9-r3.ebuild,v 1.1 2007/03/14 21:43:50 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,30 +13,24 @@ SRC_URI="http://www.clarkware.com/software/${P}.zip"
 LICENSE="jdepend"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
 
-DEPEND=">=virtual/jdk-1.3
-       >=app-arch/unzip-5.50-r1
-       >=dev-java/ant-core-1.4
-       source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3"
+DEPEND=">=virtual/jdk-1.4
+       >=app-arch/unzip-5.50-r1"
+RDEPEND=">=virtual/jre-1.4"
 
-src_compile() {
-       eant jar
+src_unpack() {
+       unpack ${A}
+       rm -v "${S}"/lib/*.jar || die
 }
 
 src_install() {
        java-pkg_newjar dist/jdepend-2.9.jar
-       dodoc README
+       dodoc README || die
+       dohtml -r docs/* || die
 
        dodir /usr/share/ant-core/lib
        dosym /usr/share/jdepend/lib/jdepend.jar /usr/share/ant-core/lib
 
-       if use doc; then
-               dohtml docs/JDepend.html
-               cp -r docs/api ${D}/usr/share/doc/${PF}/html
-               cp -r docs/images ${D}/usr/share/doc/${PF}/html
-       fi
-
+       use doc && java-pkg_dojavadoc build/docs/api
        use source && java-pkg_dosrc src/*
 }