Fix documentation install breakage with glibmm-2.27.97

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

3 files changed, 23 insertions, 17 deletions

diff --git a/dev-cpp/gstreamermm/ChangeLog b/dev-cpp/gstreamermm/ChangeLog
index 548ddfc24aa2..7e4760e5ad9a 100644
--- a/dev-cpp/gstreamermm/ChangeLog
+++ b/dev-cpp/gstreamermm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/gstreamermm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/ChangeLog,v 1.13 2011/01/23 19:28:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/ChangeLog,v 1.14 2011/03/21 01:35:33 nirbheek Exp $
+
+  21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gstreamermm-0.10.8.ebuild:
+  Fix documentation install breakage with glibmm-2.27.97
 
 *gstreamermm-0.10.8 (23 Jan 2011)
 
diff --git a/dev-cpp/gstreamermm/Manifest b/dev-cpp/gstreamermm/Manifest
index 2216a1c2f0c2..cfd31ea3d3fe 100644
--- a/dev-cpp/gstreamermm/Manifest
+++ b/dev-cpp/gstreamermm/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gstreamermm-0.10.7-gcc45.patch 7280 RMD160 e7df9c82328a3e809545f530405de9ff0ea585bd SHA1 f28423bd101238ccae7d3a06116596a4aec5a2ee SHA256 50611c392a4e9865643aff787e14c5321673a3ab7b33708e229a0f5d84c7a0cb
 AUX gstreamermm-0.10.7.3+gcc-4.5.patch 1147 RMD160 098ec247a29461b2a990700ae39a04e8f92aca84 SHA1 7d48efe66797815a3412e5617e6cba7f74c76511 SHA256 1d183daa5eea95f5b5449b312b83b5749c1db505961cbfb8d6b564c4ef8bec5e
 DIST gstreamermm-0.10.7.3.tar.bz2 5429261 RMD160 2764afdf477b45a081e2e55a5430ec48a8183fe3 SHA1 d2924cf0440cced2c947fce4fcdc97776cc7ea4a SHA256 c185e8a3a2e0d5584ec96333c1d10b1dea975194825d3f09489f21b22dbf2417
 DIST gstreamermm-0.10.8.tar.bz2 5101880 RMD160 823e47caede00a38200c297c6ebe8320efe4b2a8 SHA1 48c7c62dacfce6ed603df86088e3803b38c8ff16 SHA256 4db9f6448136e04cea1ebb1e0b190237d3c8c6e82203e638c332f972f2dc1817
 EBUILD gstreamermm-0.10.7.3.ebuild 1308 RMD160 a2686e2cbf180807378ab7269d4828face952b15 SHA1 b903bd0ce069521c38fa645ecf6d4243e568403e SHA256 0346d5319af9aa6b8dc6a5e2d52f625d221063cd30c3efd476e40e291d751f29
-EBUILD gstreamermm-0.10.8.ebuild 1199 RMD160 39846354b5b08f5d5da3827bed8bb80b6a2566fe SHA1 63096e68fae66c4a5207138e3f047bd3d2b501e5 SHA256 0cbcef00a9c8818f8d0c267edd658e39e015bf846c98a89c7e39eaa78b416123
-MISC ChangeLog 2306 RMD160 1f812882a06d00ba11725e0bf15102e471a7d6a1 SHA1 39839a17c4c8704e87a2efa4bda9aee08d830f61 SHA256 e02e5a8c7c380c384cb3e503fa5cfe38fd8223bd52ca7a7a78bbb17f10664c4c
+EBUILD gstreamermm-0.10.8.ebuild 1547 RMD160 1f4aac573a318c919b78e084d0ad887797d386c5 SHA1 9501c4a5df99b2353fc6c55c9cb09a1bf2f63bab SHA256 04e3da147e19389c64dcaefc053c2859da714e927192b4b306c5a484b3aef1fa
+MISC ChangeLog 2452 RMD160 577cf85642c723057424259aad1afc97a49a8d89 SHA1 889d6dc1db3b40589496afe0a25db00653216ad4 SHA256 56582a872936c09e06111ec37ef5c0967b525ae82d3b3b64eabd0435978a5532
 MISC metadata.xml 336 RMD160 96ef7e8b63752abbb94b4a6b2cc708f62ed4383f SHA1 b8a5fc488b314dbf996b3784e05d273585364782 SHA256 564e0692ab45e0c1e814a421e2a8cb9d73ef724bc82b484900a08f50d90424ea
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk08gVwACgkQ1fmVwcYIWAaFOwCfUl4aZ01C5i62fgCH72kXd90O
-HzkAn2LLAwkqLnVeY4cVPtBAeNU86EbH
-=cfdV
------END PGP SIGNATURE-----
diff --git a/dev-cpp/gstreamermm/gstreamermm-0.10.8.ebuild b/dev-cpp/gstreamermm/gstreamermm-0.10.8.ebuild
index 5d9c5c54a43b..0fee430f6052 100644
--- a/dev-cpp/gstreamermm/gstreamermm-0.10.8.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-0.10.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.8.ebuild,v 1.1 2011/01/23 19:28:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.8.ebuild,v 1.2 2011/03/21 01:35:33 nirbheek Exp $
 
 EAPI="3"
 
-inherit gnome2 eutils
+inherit autotools gnome2 eutils
 
 DESCRIPTION="C++ interface for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
@@ -15,20 +15,32 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND="
-	>=media-libs/gstreamer-0.10.30
-	>=media-libs/gst-plugins-base-0.10.30
+	>=media-libs/gstreamer-0.10.30:0.10
+	>=media-libs/gst-plugins-base-0.10.30:0.10
 	>=dev-cpp/glibmm-2.21.1:2
 	>=dev-cpp/libxmlpp-2.14:2.6
 	>=dev-libs/libsigc++-2:2
 "
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
+	>=dev-cpp/mm-common-0.9.3
 	test? (
 		media-libs/gst-plugins-good:0.10
 		media-plugins/gst-plugins-vorbis:0.10
 		media-plugins/gst-plugins-x:0.10 )
 "
 
+src_prepare() {
+	# 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 has_version '>=dev-cpp/glibmm-2.27.97'; then
+		mm-common-prepare --copy --force
+		eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
 src_test() {
 	# explicitly allow parallel make of tests: they are not built in
 	# src_compile() and indeed we'd slow down tremendously to run this