Fix docs installation (bug #373465 by Agostino Sarubbo) and drop 'examples' handling as they are no longer provided.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

3 files changed, 15 insertions, 40 deletions

diff --git a/dev-cpp/gconfmm/ChangeLog b/dev-cpp/gconfmm/ChangeLog
index f1c8273a6d71..f87c75e134b8 100644
--- a/dev-cpp/gconfmm/ChangeLog
+++ b/dev-cpp/gconfmm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/gconfmm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gconfmm/ChangeLog,v 1.83 2011/03/29 06:09:12 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gconfmm/ChangeLog,v 1.84 2011/06/29 17:09:24 pacho Exp $
+
+  29 Jun 2011; Pacho Ramos <pacho@gentoo.org> gconfmm-2.28.2-r1.ebuild:
+  Fix docs installation (bug #373465 by Agostino Sarubbo) and drop 'examples'
+  handling as they are no longer provided.
 
   29 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gconfmm-2.28.2.ebuild:
   Fix slot-dep on gnome-mm libs
diff --git a/dev-cpp/gconfmm/Manifest b/dev-cpp/gconfmm/Manifest
index c9ddfb149f22..9e728456430d 100644
--- a/dev-cpp/gconfmm/Manifest
+++ b/dev-cpp/gconfmm/Manifest
@@ -2,24 +2,14 @@
 Hash: SHA1
 
 DIST gconfmm-2.28.2.tar.bz2 459319 RMD160 2b4a37791ceddc299df8a0c33a900d2daff915a3 SHA1 5d3ab360bb182197226355bf4120553161df04b7 SHA256 3e9575208ed1f43f0d0f42e62169a4e14d367a69829b3a531b943655f9db2ab9
-EBUILD gconfmm-2.28.2-r1.ebuild 1612 RMD160 9b430d2cd02a1ff1b38d8b32c8c5e3339e03d0f7 SHA1 eedf9da14ea9940c7b88dc339869f250c424f81f SHA256 f0dfe6f7738678268309f237ed5869997e9095c4cb707b8efdfa6763494c6972
+EBUILD gconfmm-2.28.2-r1.ebuild 1200 RMD160 491936330ee8e610d012303ecd242d088572b4d3 SHA1 2957a21134aea156507270c625ed4ed68e9008c6 SHA256 bf190e04a2c822c74ec662a597bc684fc54f92d59ec72688cbbf592a6a8b9fde
 EBUILD gconfmm-2.28.2.ebuild 1191 RMD160 24cd58fa4ff6ac6a4a5a3086b77be7641b024a0c SHA1 c3dabc6c0024b831c5465ca5f0863817dbec6de9 SHA256 bedc69723534f8abde64cebf2f083c2d44ddf885cd842bd37c59d5b12b3bb653
-MISC ChangeLog 10538 RMD160 6590336f024f72cb417ee5f3618389735a98debd SHA1 ba116e5db876635ee494da331a1e3fa72bea156c SHA256 7f87e06b5d280b771e76e4f99bff7b28f29659cba55d77042cf4bb66c1c7b228
+MISC ChangeLog 10729 RMD160 e7374f11773294b2e27150f943385fc7ebc6c94d SHA1 628b63e456d6dfb040891f8104abdc040f5d8df4 SHA256 299fb2fe679bcdc100fbfffcc89a65250c4cc82ee5cf468ed7af15902e608efd
 MISC metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a SHA1 b034f3d668b50c57826ead5cfd17fcd2b68d19d6 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNkXePAAoJEO/kOhxWD91k0wQP/3WPzyrBfICLRdZl2b8nEysh
-LDWsG+VRhox0r1oq6nS041GiJlDEBtw4GdXflfgnw9f6wCldua41oHdTGOrJVSEm
-bHlCSoy2QpNO64Fi4VZHGWUxy8GZuA9kw95zNcwkzUb7+00GYdlObx+qKwh4hHT6
-NyNaPBXyTGOodnK8mleqyhGWTJYeQwjtAYyCgnPjaCPRT9PL8JgyAfZR+s0yl4AH
-u+EhC8TgHnLQYenC+Zf6nm5BWpXWZPAh7ua8aqQJ3YnVGc5iTr/Jcmk8YQLTyAkY
-4r1ToyKSsIRyNqFF+TNWVn8h9cldPlEKGDrjgFjLAhYNWGS6Bjasyno7/AVZ1pZB
-4xfkPYSOizJNaF7gKmWd3CnDSXDDula1DIVvkYXYOrlkIyHxL7ezFSbtqX1m6rIq
-7fT2rN54+tNamrY1B4otSzJDQvDp5klmE9ARImljNyfCbPWloNkMenH8Y2RRDkbS
-HiPyKjux+ThtZbWu43hg6H5ePG0iPpSVmUdRWvprw7lPWI8Ou5FoDvBKt45yV4Qd
-3xHVh+R0+brBgbMxKXTHmGNtjhOSx0Ahlkk/SRhN3GTWzBn7NYbm/lnRQksfVXUh
-yjfttZgl83tCh1Z4eK/Kk8BFfxxWDgBo40DGvYiI4iE/AlDPgnSHVx4YykS1R/dh
-k+cZQar9bVo2iyOB7C+H
-=ptFf
+iEYEARECAAYFAk4LXEoACgkQCaWpQKGI+9TyXgCfQePmZ1kHGV5mvErNol8HJvG3
+86wAn23CDwhunu2RpOTdMNF7Rkh1UOQZ
+=kMdP
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gconfmm/gconfmm-2.28.2-r1.ebuild b/dev-cpp/gconfmm/gconfmm-2.28.2-r1.ebuild
index e8fbf8b9c2f3..fee8415c5372 100644
--- a/dev-cpp/gconfmm/gconfmm-2.28.2-r1.ebuild
+++ b/dev-cpp/gconfmm/gconfmm-2.28.2-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gconfmm/gconfmm-2.28.2-r1.ebuild,v 1.2 2011/03/22 21:46:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gconfmm/gconfmm-2.28.2-r1.ebuild,v 1.3 2011/06/29 17:09:24 pacho Exp $
 
-EAPI="3"
+EAPI="4"
+GNOME_TARBALL_SUFFIX="bz2"
 GCONF_DEBUG="no"
 
 inherit autotools gnome2 eutils
@@ -13,7 +14,7 @@ HOMEPAGE="http://www.gtkmm.org"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc examples"
+IUSE="doc"
 
 RDEPEND=">=gnome-base/gconf-2.4:2
 	>=dev-cpp/glibmm-2.12:2[doc?]
@@ -32,12 +33,6 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	if ! use examples; then
-		# don't waste time building the examples
-		sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
-			die "sed Makefile.in failed"
-	fi
-
 	# doc-install.pl was removed from glibmm, and is provided by mm-common now
 	# This should not be needed if the tarball is generated with mm-common-0.9.3
 	if use doc && has_version '>=dev-cpp/glibmm-2.27.97'; then
@@ -46,24 +41,10 @@ src_prepare() {
 	fi
 }
 
-src_compile() {
-	gnome2_src_compile
-
-	if use doc; then
-		cd "${S}/docs/reference"
-		emake all
-	fi
-}
-
 src_install() {
 	gnome2_src_install
 
 	if use doc ; then
-		dohtml -r docs/reference/html/* docs/images/*
-	fi
-
-	if use examples; then
-		find examples -type d -name '.deps' -exec rm -fr {} \; 2>/dev/null
-		cp -R examples "${ED}/usr/share/doc/${PF}"
+		dohtml -r docs/reference/html/*
 	fi
 }