Fixed doc install, bug #450860

Package-Manager: portage-2.2.01.21476-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 14 insertions, 40 deletions

diff --git a/sci-libs/oc/ChangeLog b/sci-libs/oc/ChangeLog
index 6c76ddc8d24c..54aff8525f31 100644
--- a/sci-libs/oc/ChangeLog
+++ b/sci-libs/oc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/oc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/oc/ChangeLog,v 1.2 2012/08/04 20:08:03 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/oc/ChangeLog,v 1.3 2013/01/08 19:24:41 bicatali Exp $
+
+  08 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> -oc-1.0.ebuild,
+  oc-2.0.ebuild:
+  Fixed doc install, bug #450860
 
 *oc-2.0 (04 Aug 2012)
 
diff --git a/sci-libs/oc/Manifest b/sci-libs/oc/Manifest
index e74ba5e2f038..8f6e1729b272 100644
--- a/sci-libs/oc/Manifest
+++ b/sci-libs/oc/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST oc-1.0.tar.gz 1521136 SHA256 451ed027eea5a89059ac2c999e5eda90e49029aa221ac1a9fb4dd7899d1e972d
 DIST oc-2.0.tar.gz 1104073 SHA256 4ed67dc543a6125731ccfadac14fe8f40cc0e7a74139f4f0612a6a3b1a4a4bab SHA512 e583fbacc8929ef5b2ae0d0f675816b8f46056b11987f8285688a7321d3dfd244a748be00f009f1b2c2b7f95e5a6ecc8eb8e907f81415e849f10a5ff138e82a4 WHIRLPOOL 2dbb286e1e6a711f6ff85956e778ea0dd627e2e67588093ca41ebf3045f97098d9766265769175777066ba2bfd1b88024810ba2c8d883b3bfb86ec8029f1e94e
-EBUILD oc-1.0.ebuild 669 SHA256 56d80d93879b267555febaf40d228a491d77d242d74005ae178c6730b6248a13 SHA512 6ca2abd2ac593e1f848c509c1c3759c7417dabaac66dfd96ccc2e1f96c2f99ca96c678d98b851a3de57194729becb89fb4c69af4621e7396d80efeff1146db60 WHIRLPOOL ff60473652ec6a3a167fab36c1d74a20978e7a53d2dbb8f93f4fadc3ceaa52ea3880e2974ab30e6c61a07f894c134dc3d447e1410170e26b3c0c2bcbb547b8a1
-EBUILD oc-2.0.ebuild 647 SHA256 9482a2aada8454d71115ad65dbc7f8acea54afbde31bc4cded0d42ccaf685a49 SHA512 a671c04386f2307af0d622950aebddf0914c556343f22167861dcca2a314a89950cfe5bce606d2eb5049b36eadacf88b5a79edcb631345b95af0dfc5488733b9 WHIRLPOOL bb7e50c359e960e4922a6c1594772d2ec5e177e48aae05c4576f09b8dd46c96697caa102ee1f41672850c7347ecf3b6f5c0bfcfa3a0b3fb6bdf0b104635544f0
-MISC ChangeLog 435 SHA256 9a2f1cd8916be9e5b58af8f70d6d83202960ab6a29b0324fa4a49d328ac789ea SHA512 44ea61cde9f2a140abcdd24294dfe49551d0a821a4d10a18734cf5d908faf46bd7b12877a1e84271f01cbbcc68c9f13f35e00ee72e7047624cc9730bb4316bbd WHIRLPOOL 34f818602b34f70ec62eb9efd1522e87b8729413391a7d7b23264e03bda81b93ca93a5e6786365eb447a9c0d63ea341fa4e0e3208baac65945cc3560087ff74b
+EBUILD oc-2.0.ebuild 672 SHA256 6dac3304478f58905f93a68711e3e11c117f4a3336ed20877ecc2901bd17a040 SHA512 4e2f6d24a14c1db11a21e422a11c83404629bf13078049a1807328fcf1d92abfe0a0b98a63f182990497991b273c756939dc8a95af9cfa06021c0a7a963ce813 WHIRLPOOL 86ddb14870c7469c13ad01e3c6e80d2bdebb7eba54469eb3d755c6926678555cb36465258c834d46e9d10502c4001ad0d8fe822e122dfcbf11b69dc790606c61
+MISC ChangeLog 557 SHA256 034bd2593f073654bba0234f602eb2ae7059ef5c465f13b30617f83c2ffb22e3 SHA512 d5f5fd52d49e1bf8ad6ca7f769e4800ae27240625356b9937e20371030c1f79a0d9c9321c16a2bc4795fa1969aadc9aeda0a0a0901e9f7c60b3e620810502dc7 WHIRLPOOL a466e651bc1d96c4c329f1015240637d8f330f359ccc57dff3ed54b95ba30b6abf1a599dc57eca34c1d40f05d304dfcb757c29b9330795677e2bfe172d46a3fe
 MISC metadata.xml 389 SHA256 0df03f4a1bb9a482968a0021163ffcbc81a1689b18461f322db1a98b6b0ccbb7 SHA512 a54320b5da909b41453942605a84b0c51079705523595776747236d38f58eb0b8cbb195b1a1143c3299cbe86ac14236c2afd8e3e3bc80c96e4f3ffe647cb123e WHIRLPOOL 0d5c557555769a130d3a4a77d4121dfbd0ebed4bf68ff9c88b5c2a5f8208a60603ba1d0bdb032f4652519317d66bc173481a7da0644180d5861d4a0b21e7f01d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAdgbEACgkQ1ycZbhPLE2AZegCeN/UIIl0K+z/lEJ8cYHpSfp2Y
-GwcAoJmrP19+ow8vSPxLF1lIHFjA7HMf
-=TUeA
+iEYEAREIAAYFAlDscn0ACgkQ1ycZbhPLE2BhYgCfU4k5gEgCKQ1Vdg+ENfzEGz5A
+SgcAniFFXX82T++9jKMoPp7ofda88Q4B
+=dNue
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/oc/oc-1.0.ebuild b/sci-libs/oc/oc-1.0.ebuild
deleted file mode 100644
index 05c1be8ea931..000000000000
--- a/sci-libs/oc/oc-1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/oc/oc-1.0.ebuild,v 1.1 2009/12/12 18:12:31 bicatali Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Network Data Access Protocol client C library"
-HOMEPAGE="http://opendap.org/"
-SRC_URI="http://opendap.org/pub/OC/source/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README ChangeLog NEWS
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins *.html || die
-	fi
-}
diff --git a/sci-libs/oc/oc-2.0.ebuild b/sci-libs/oc/oc-2.0.ebuild
index 39009eeb49b1..6a242cf3ab1e 100644
--- a/sci-libs/oc/oc-2.0.ebuild
+++ b/sci-libs/oc/oc-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/oc/oc-2.0.ebuild,v 1.1 2012/08/04 20:08:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/oc/oc-2.0.ebuild,v 1.2 2013/01/08 19:24:41 bicatali Exp $
 
 EAPI=4
 inherit autotools-utils
@@ -23,5 +23,5 @@ DEPEND="${RDEPEND}"
 
 src_install() {
 	autotools-utils_src_install
-	use doc && dohtml *.html
+	use doc; dodoc docs/oc*html && dohtml docs/html/*
 }