Make javadocs install to standard location.

Package-Manager: portage-2.1.2-r9

3 files changed, 22 insertions, 16 deletions

diff --git a/dev-db/octopus/ChangeLog b/dev-db/octopus/ChangeLog
index 2087a8f4d3a8..f39db1d32666 100644
--- a/dev-db/octopus/ChangeLog
+++ b/dev-db/octopus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/octopus
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.5 2006/12/27 23:16:19 betelgeuse Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.6 2007/02/10 23:37:23 betelgeuse Exp $
+
+  10 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  octopus-3.0.1-r1.ebuild:
+  Make javadocs install to standard location.
 
   27 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> metadata.xml,
   octopus-3.0.1.ebuild, octopus-3.0.1-r1.ebuild:
diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
index 879ae0b0b1f5..f4c5d0e6b4fa 100644
--- a/dev-db/octopus/Manifest
+++ b/dev-db/octopus/Manifest
@@ -7,18 +7,18 @@ RMD160 f41c4f0f35c6ba82a7bffbabc3bc92ea287bbfd2 files/octopus-3.0.1-gentoo-build
 SHA256 9e4ee3eee4b814e041dd2ded687c3d4aa556357ccf66047c3f66b1627ea10a4b files/octopus-3.0.1-gentoo-build.xml 15173
 DIST octopus-3.0-1.src.tar.gz 25968343 RMD160 cb55e7fb574f522c4396bc83905dca9d8e94b983 SHA1 403f96abcab23429ddb6f4d8709326f73521e263 SHA256 9f37514f0540c64aba2163b4c4faa5d5327db6c7f1946fcbe7dc0a36a2097cac
 DIST octopus-xmls-3.0.1.tar.bz2 22492 RMD160 c99466a70cf1d7ab17a69c606fad49fc3bdf8279 SHA1 1e829160ed7f0137f8d59d007a98ec2816d80cb7 SHA256 e92e32cfca1955e7de2cd6a02bdd9bf279b2cf9471bd0ba93a4e13532e4f4095
-EBUILD octopus-3.0.1-r1.ebuild 1694 RMD160 77a9e59f084a2a61927ab7ce6ff91e0e45e91c51 SHA1 02e42a677f035304f49e61c9b9e2e6f74c582a61 SHA256 1427f0672455f4e9262f949a4a65aab6ab83911d7ebd9b5887bd442a554a24c9
-MD5 00bb38857beea47a6eb7b9f49b1fb9bd octopus-3.0.1-r1.ebuild 1694
-RMD160 77a9e59f084a2a61927ab7ce6ff91e0e45e91c51 octopus-3.0.1-r1.ebuild 1694
-SHA256 1427f0672455f4e9262f949a4a65aab6ab83911d7ebd9b5887bd442a554a24c9 octopus-3.0.1-r1.ebuild 1694
+EBUILD octopus-3.0.1-r1.ebuild 1751 RMD160 33a2bcb8cdba35c2fc94aff6cf3e4e2bd5956959 SHA1 bb66b5c33bf471b89018a32359aac88b2d60e8f1 SHA256 067d6042fcd8ca3d0d8f79a4fad817b2869c5ced517f7993250a613bd9dddf1a
+MD5 fe8f207edddc93129d0fdd63ab1db602 octopus-3.0.1-r1.ebuild 1751
+RMD160 33a2bcb8cdba35c2fc94aff6cf3e4e2bd5956959 octopus-3.0.1-r1.ebuild 1751
+SHA256 067d6042fcd8ca3d0d8f79a4fad817b2869c5ced517f7993250a613bd9dddf1a octopus-3.0.1-r1.ebuild 1751
 EBUILD octopus-3.0.1.ebuild 1576 RMD160 c5d5cb21a28dd73a17d81e3c1e8a9e78cc8f2178 SHA1 6034ff591cbab260691736d893159b4aa48f620f SHA256 0c70476363d9e998aac9b7914f8b4cb9bd3fdbf3101a29379da1fee044e9122f
 MD5 7237f323681ca2620fb50a54a1fc75ef octopus-3.0.1.ebuild 1576
 RMD160 c5d5cb21a28dd73a17d81e3c1e8a9e78cc8f2178 octopus-3.0.1.ebuild 1576
 SHA256 0c70476363d9e998aac9b7914f8b4cb9bd3fdbf3101a29379da1fee044e9122f octopus-3.0.1.ebuild 1576
-MISC ChangeLog 1029 RMD160 011daebb3650197afd99c2cbd4dcdc9bcc0c151f SHA1 4d274f16888da0ed2df5be6fc2423cac1f88de76 SHA256 b32ca79a292bae6bae93d9158233c8ca22cc68dc15e169df95a61e7f5313c62c
-MD5 9a295843eaad633ac553611b4b7e2c2a ChangeLog 1029
-RMD160 011daebb3650197afd99c2cbd4dcdc9bcc0c151f ChangeLog 1029
-SHA256 b32ca79a292bae6bae93d9158233c8ca22cc68dc15e169df95a61e7f5313c62c ChangeLog 1029
+MISC ChangeLog 1156 RMD160 4bb64d401aefa91f9fd622631165ad4fbb36fa5d SHA1 2112bbe3b843757a0b4a0d277941a315f17694f3 SHA256 5cdc7be1dfb43dddde97484a895ec4853e80dc7c3cd119f17beec01dea25e6cb
+MD5 fba02093b68a2a3e77aa7e5899be1601 ChangeLog 1156
+RMD160 4bb64d401aefa91f9fd622631165ad4fbb36fa5d ChangeLog 1156
+SHA256 5cdc7be1dfb43dddde97484a895ec4853e80dc7c3cd119f17beec01dea25e6cb ChangeLog 1156
 MISC metadata.xml 360 RMD160 3866ff6e15925bf44afaf6495d232310977bcf10 SHA1 2d8d9bf19917f3177a76cf27ece6bb094f8a06e3 SHA256 276d2a4e636b8f732db4f61630d7d0737aa8ebcd2192ead0907cc8f3e664bd52
 MD5 f714935dbbb0098df2d7c92514e7703b metadata.xml 360
 RMD160 3866ff6e15925bf44afaf6495d232310977bcf10 metadata.xml 360
@@ -30,9 +30,9 @@ MD5 0e40c109914222d2fcda00f41eab2a7d files/digest-octopus-3.0.1-r1 515
 RMD160 6d193267ee00c5c8993163a4a24d68f1e611469e files/digest-octopus-3.0.1-r1 515
 SHA256 d5e311cd19d535c3b487e503b25e905c14813ad409270cdedcc61f1767356f02 files/digest-octopus-3.0.1-r1 515
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFkv7VcxLzpIGCsLQRAgtZAJ0eoYLX40c1BLCYyV4hGSwK7WIj3QCdH8Qo
-Jvffw/y7XRpoG5/ggWFY84s=
-=blwY
+iD8DBQFFzldDcxLzpIGCsLQRAsnGAJ9pGMU1FHdcuQMjSTa8yAmksYa/ywCfSXwD
+/I1ILMIa2PtFVSZN3tdYfKI=
+=HMEy
 -----END PGP SIGNATURE-----
diff --git a/dev-db/octopus/octopus-3.0.1-r1.ebuild b/dev-db/octopus/octopus-3.0.1-r1.ebuild
index 0b9a852ac1df..47f95b96d031 100644
--- a/dev-db/octopus/octopus-3.0.1-r1.ebuild
+++ b/dev-db/octopus/octopus-3.0.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-db/octopus/octopus-3.0.1-r1.ebuild,v 1.2 2006/12/27 23:16:19 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r1.ebuild,v 1.3 2007/02/10 23:37:23 betelgeuse Exp $
 
 inherit versionator java-pkg-2 java-ant-2
 
@@ -62,6 +62,8 @@ src_install() {
 		cp dist/*-src.zip ${D}usr/share/doc/${PF}/source
 	fi
 	if use doc; then
+		docinto html/api
+		# Has multiple javadoc subdirs here
 		java-pkg_dohtml -r docs/*
 	fi
 }