Fix docs installation patch, #443950 by Chris Mayo

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 30 insertions, 23 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/Manifest b/dev-cpp/cairomm/Manifest
index 2dc5e4043312..3bc4ce98262d 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST cairomm-1.10.0.tar.gz 1089577 SHA256 068d96c43eae7b0a3d98648cbfc6fbd16acc385858e9ba6d37b5a47e4dba398f SHA512 974b1c078c8d7b82f8d026e384811c016fa95cb62942fc12717edd993cb1660bc004bee5f8ce31c0540ef8d4105a2d86cd461ed3f5e996fd3faf65dfb37ac9e2 WHIRLPOOL 4fdea4df681b340729b64241baa84bc2171e6d98e2d277f13c8e51cee121bf7d3adef85e3d189d6e549213694a08ee72dafb2744c63377599491addcf609b447
-EBUILD cairomm-1.10.0.ebuild 1306 SHA256 5817509281be574c242cfd7df89f50f0dfe39846c2f091fc61dfb82bb0e0fe1e SHA512 647895e5ebec8e2ba698ef55c4abdd9f65d91cca334ce27acbe04da49ab2d84a7d34fb3853d9148c193dad008a919abfadbe2bdc4d70a080d702cfdc27de889e WHIRLPOOL 0294897616f0777f70bf8dad3fd975d49bcea51988f1ad8702cbfde5050958be7d8791649c4c01739a34eee424f1741b722deb794928a5a0fa47f9a8778c836c
-MISC ChangeLog 7541 SHA256 2700f2dcef1348f3f4ce97f748dfbc670fba66e424a7bfc9433270c50e897c6c SHA512 540de21156c1d0278c30fe7ec10c8c12a2e3f3db449abebaa41400a8da645dcd0491404037518703946b4cdd8c35a3f7016b4bf11ea226d15517724158384441 WHIRLPOOL b61bdd5a596d59143a816389c4fdf0fc76201b6a8ac7be83a0fe3454a96152c8ec4c6e5d50d8121ce6e6f12e3b2a6f64d6018192d19d57c9cebcc40f16ead1eb
+EBUILD cairomm-1.10.0.ebuild 1460 SHA256 9970b325c5df550fe252267f4f24be679ffdaab7d8419211e7ddb2935122d2ef SHA512 9f22b77294480066c9cf08a45ae23875e38cfd9c80bd626bddf535f953814ecb6bde1f28b27750fa6c63b7c940f12eb703447068486a3246aa02eca59623b721 WHIRLPOOL 654040529e8b2c57af766cb813ae610ecd1bb1885d1f9f79128175cf5e7edebaac7f8332e86416a3d9587338be3282c6a5ed509b33f4cd614ad3234ac64e0bfe
+MISC ChangeLog 7665 SHA256 e46af179f0f84f18a474053486c495767375c910e876f9012d4518f403f022c8 SHA512 2258748327375a7d002c0546af4eb72c7ac485918e0d3fb8bce40223c7b64b13984c160829f0705adba76c04207e61c51eb8c02c982b11751bd9c322fdafbf5d WHIRLPOOL 645c261f89d4aedf840f3b70a35f2b8254ae53d53fc886bcd7abfda99653093245d88b4ebb8aad5e0a17bc274c61624aea1dce27f6f36f4edb5737a13a2ac306
 MISC metadata.xml 208 SHA256 69ef7f5652bec39fc0f3997de5517448b92d43ba6236e14492c70abcd67b5d9b SHA512 cca475a9a363519c600709ab205b1271283cb62d014af55c6dadcd3a87eb85b68f727edc7d247aa7cb37b8fd9cfb299046b2dfad24e8d71af72460175276375f WHIRLPOOL cf3598e745b02aaaf29c320be010ec3445eb12d02412be8ccfc124cb17c8b2f6c0faaf1cbdbd816d5be8a3bc40c5d7b471531e8e3bddf3b7f1fd01a177580f9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlE2eq0ACgkQ1fmVwcYIWAbuYACgudwlYqzlRyKjIRvxmLtrGf1X
-cxwAn3wbPWT1mO+GpbbCxYW5kMpX5fDI
-=mRWI
+iEYEAREIAAYFAlJICXwACgkQCaWpQKGI+9RdjgCeN3iBhDvknYzfCou0c7Yp8uV0
+mMcAnix6fT4CGOySTW5rqsuNclk31dhu
+=ObML
 -----END PGP SIGNATURE-----
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 {} +
-}