Fix docs installation (#454658)

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

3 files changed, 35 insertions, 18 deletions

diff --git a/dev-cpp/gnome-vfsmm/ChangeLog b/dev-cpp/gnome-vfsmm/ChangeLog
index 6389b9ee77f1..20d83b5ad0c1 100644
--- a/dev-cpp/gnome-vfsmm/ChangeLog
+++ b/dev-cpp/gnome-vfsmm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-cpp/gnome-vfsmm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gnome-vfsmm/ChangeLog,v 1.73 2012/05/04 03:44:56 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gnome-vfsmm/ChangeLog,v 1.74 2013/09/29 11:12:48 pacho Exp $
+
+  29 Sep 2013; Pacho Ramos <pacho@gentoo.org> gnome-vfsmm-2.26.0.ebuild:
+  Fix docs installation (#454658)
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> gnome-vfsmm-2.26.0.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -262,4 +265,3 @@
 
   25 Jan 2004; Markus Nigbur <pyrania@gentoo.org> gnome-vfsmm-1.3.5.ebuild:
   Initial import.
-
diff --git a/dev-cpp/gnome-vfsmm/Manifest b/dev-cpp/gnome-vfsmm/Manifest
index 181678aedb44..ecfa757c87a1 100644
--- a/dev-cpp/gnome-vfsmm/Manifest
+++ b/dev-cpp/gnome-vfsmm/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST gnome-vfsmm-2.26.0.tar.bz2 628670 SHA256 d6a89fc82238bbfd6d3f7e44bcaee73dc197be98635be482a2d2df38ec0446d3 SHA512 82e538c06615af83e9e455b0db601e37ee5396cac9b44884879383f3671876cca62bf534f4338177d1a62ab59e834d197302533dcc77f3c09b5433da9c660af8 WHIRLPOOL 896eb76e426d5635e70f15df63851c5fc4127f9e549f42697fd82c8cde37c2b4a32cc5c7cf3439a08497421f824f0087ca438c8e366e908f43dee683f13289cf
-EBUILD gnome-vfsmm-2.26.0.ebuild 1299 SHA256 1d6fd1befc3ea59525b5a20ce5e5141511e70391b2820f73d9564ba3fa36b48e SHA512 82fab87931b51925664384514a6efa5eaf626f1dff2d1c3de97b5e781a65025fb3efa4359d25600d7a3973befc0669835f8d8513dafd76b1c1cf1b64407bfe68 WHIRLPOOL 551e27a6cd1e4128f0f7675dbeba961891308f1a39ffd2ea1bf491791ffd16359f4b45c4b72a6bcf6618ae59f5cfdf4c772b23a0430e9e18917d795fe69f8de6
-MISC ChangeLog 8627 SHA256 d24ac78159c637f05bf70e36f940b67834c71524406854fa95a6b21a25dd65cb SHA512 8765b71a1dd75ea6e3f08f47d2c0a72c940fa79d58d87ae7f5cd7815c25b099283d8f33edaea833ae62dcd8922b001e56fda39ed1742689577dc58d39cbe934b WHIRLPOOL 2cce087cd93d995be8935c1e669ece5c72a91bf6498e8e78ad2f87e480a6cf632b63b9c5fd0319a3b5472ef874ecb2b251a207d36c136dbe7ba91eb788c03d74
+EBUILD gnome-vfsmm-2.26.0.ebuild 1297 SHA256 827caa0c3f595e43ca75bf59f2d1d97166ef3b17f06a7a071729caa6098733d4 SHA512 5d642d866d4e9d274f3d10005d90516565139560a7dc18d1c062e96101c45c05a65a412bf988e5256864cd1138f03dea2a2b664841cae8127c450d422fec4835 WHIRLPOOL a72d22799991a3c2e3b4ac832fe93e1bc6b25d9abddaa61a1214876aa488294f9b6ebd53701490a5b8deaf83e2d363837d1eb0043b7cde5d202fb4ca53ffd890
+MISC ChangeLog 8733 SHA256 e95cecde5a9ebe241846f60d077cf32628402d391a4ab04e929092bfa023e468 SHA512 f62fdc8a4a5ff4dfcb77182eebaf93c1f59239b29d57d1fbf2983607f92f24abef3308f08cfe15baa0d684c3920237b0f118d0ca3b05f746b34b52cb6d2df132 WHIRLPOOL 81ae095fb039104e6baafd5862d5a38dcc9bed70e7146bf05514347eb83d64ba1fa2f9627ab42768cc365a9c7ec81d678c6549af82fe9ca313aec9729ca31a11
 MISC metadata.xml 162 SHA256 7d0ce82d5ca3b20cb1c4641c7b7aae7082fd6be059b85fab9699095fd965f2e9 SHA512 baf4e2f4c64ab0ecc4985c069e360293c4394ea6a87c1baed2e9e91df8dca76e2371eb4be2df5ba009beb3de9a0e02561dd01accf2645e1dc5d0a23edbd8f8b6 WHIRLPOOL 35e7795de1da836c4969acee5aac0cfef4c461b1e5dc124d7f751e46efd1c3816b70824aad884fe77258b16cf3476b92b983593089aa7c152e701d0181a0e6be
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlJICzEACgkQCaWpQKGI+9SFKQCfU0/PHSXwivT2+eqohbVh22wn
+XbQAnAsyh6/PxNq6EEC0LHs3pXik4qjj
+=lWpZ
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0.ebuild b/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0.ebuild
index f90a22b6abdb..9635b3e79ac2 100644
--- a/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0.ebuild
+++ b/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0.ebuild
@@ -1,6 +1,10 @@
-# 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/gnome-vfsmm/gnome-vfsmm-2.26.0.ebuild,v 1.8 2012/05/04 03:44:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0.ebuild,v 1.9 2013/09/29 11:12:48 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2
 
@@ -13,17 +17,16 @@ KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="doc examples"
 
 # glibmm dep is because build fails with older versions...
-RDEPEND=">=gnome-base/gnome-vfs-2.8.1
-	>=dev-cpp/glibmm-2.12"
-DEPEND="virtual/pkgconfig
+RDEPEND="
+	>=gnome-base/gnome-vfs-2.8.1
+	>=dev-cpp/glibmm-2.12
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog NEWS README INSTALL"
-
-src_unpack() {
-	gnome2_src_unpack
+"
 
+src_prepare() {
 	if ! use doc; then
 		# documentation requires Doxygen and takes time
 		sed -i 's/^\(SUBDIRS =.*\)docs\(.*\)$/\1\2/' Makefile.in || \
@@ -35,17 +38,19 @@ src_unpack() {
 		sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
 			die "sed Makefile.in failed"
 	fi
+
+	gnome2_src_prepare
 }
 
 src_install() {
 	gnome2_src_install
 
 	if use doc ; then
-		dohtml -r docs/reference/html/* docs/images/*
+		dohtml -r docs/reference/html/*
 	fi
 
 	if use examples; then
 		find examples -type d -name '.deps' -exec rm -fr {} \; 2>/dev/null
-		cp -R examples "${D}"/usr/share/doc/${PF}
+		cp -R examples "${ED}"/usr/share/doc/${PF}
 	fi
 }