summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2013-01-08 19:24:41 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2013-01-08 19:24:41 +0000
commita98892040240ca465864030f75d4d411af505589 (patch)
tree1a55a627244fb5ed104eadac0a80a6c13420465a
parentremoved fetch restriction as license allows redistribution (diff)
downloadgentoo-2-a98892040240ca465864030f75d4d411af505589.tar.gz
gentoo-2-a98892040240ca465864030f75d4d411af505589.tar.bz2
gentoo-2-a98892040240ca465864030f75d4d411af505589.zip
Fixed doc install, bug #450860
(Portage version: 2.2.01.21476-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
-rw-r--r--sci-libs/oc/ChangeLog8
-rw-r--r--sci-libs/oc/oc-1.0.ebuild28
-rw-r--r--sci-libs/oc/oc-2.0.ebuild6
3 files changed, 9 insertions, 33 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/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/*
}