Fix docs installation patch, #443950 by Chris Mayo

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 24 insertions, 17 deletions

diff --git a/dev-cpp/cairomm/ChangeLog b/dev-cpp/cairomm/ChangeLog
index e6eae02f6dba..2a23cd4a68a0 100644
--- a/dev-cpp/cairomm/ChangeLog
+++ b/dev-cpp/cairomm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-cpp/cairomm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/ChangeLog,v 1.62 2013/03/05 23:07:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/ChangeLog,v 1.63 2013/09/29 11:05:31 pacho Exp $
+
+  29 Sep 2013; Pacho Ramos <pacho@gentoo.org> cairomm-1.10.0.ebuild:
+  Fix docs installation patch, #443950 by Chris Mayo
 
   05 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -cairomm-1.8.6.ebuild,
   -cairomm-1.9.8.ebuild:
@@ -216,4 +219,3 @@
   11 Sep 2006; John N. Laliberte <allanonjl@gentoo.org> +metadata.xml,
   +cairomm-1.2.2.ebuild:
   new package, thanks to dberkholz for the base ebuild.
-
diff --git a/dev-cpp/cairomm/cairomm-1.10.0.ebuild b/dev-cpp/cairomm/cairomm-1.10.0.ebuild
index 627b13742d9c..7db9ef924522 100644
--- a/dev-cpp/cairomm/cairomm-1.10.0.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.10.0.ebuild
@@ -1,10 +1,11 @@
-# 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/dev-cpp/cairomm/cairomm-1.10.0.ebuild,v 1.8 2012/05/04 03:44:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/cairomm-1.10.0.ebuild,v 1.9 2013/09/29 11:05:31 pacho Exp $
 
-EAPI="4"
+EAPI=5
+GCONF_DEBUG="no"
 
-inherit eutils
+inherit eutils gnome2
 
 DESCRIPTION="C++ bindings for the Cairo vector graphics library"
 HOMEPAGE="http://cairographics.org/cairomm"
@@ -16,31 +17,35 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linu
 IUSE="doc +svg"
 
 # FIXME: svg support is automagic
-RDEPEND=">=x11-libs/cairo-1.10[svg?]
-	dev-libs/libsigc++:2"
+RDEPEND="
+	>=x11-libs/cairo-1.10[svg?]
+	dev-libs/libsigc++:2
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
 		dev-libs/libxslt
-		media-gfx/graphviz )"
+		media-gfx/graphviz )
+"
 
 src_prepare() {
 	# don't waste time building examples because they are marked as "noinst"
-	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || die "sed failed"
+	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || die
 
 	# don't waste time building tests
 	# they require the boost Unit Testing framework, that's not in base boost
-	sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die "sed failed"
+	sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die
+
+	# Fix docs installation, bug #443950
+	sed -i 's:libdocdir = \$(datarootdir)/doc/\$(book_name):libdocdir = \$(docdir):' docs/Makefile.in || die
+
+	gnome2_src_prepare
 }
 
 src_configure() {
-	econf \
+	gnome2_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--disable-tests \
 		$(use_enable doc documentation)
 }
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}