Fix building with make >= 3.82 wrt #338866 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc87/cvs/Linux x86_64

4 files changed, 39 insertions, 5 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 4785b8f2802e..6236e7394909 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.273 2010/09/11 09:50:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.274 2010/09/28 07:57:01 ssuominen Exp $
+
+  28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gstreamer-0.10.30.ebuild, +files/gstreamer-0.10.30-make-382.patch:
+  Fix building with make >= 3.82 wrt #338866 by Diego E. Pettenò.
 
   11 Sep 2010; <nixnut@gentoo.org> gstreamer-0.10.29.ebuild:
   ppc stable #329703
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index da8e010252ed..12199324262e 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,3 +1,4 @@
+AUX gstreamer-0.10.30-make-382.patch 809 RMD160 f0aa973077d97ef17a7250392398e0aeee11fe33 SHA1 b949b2d466e560b44502b5bc9d44974d336cf3fa SHA256 fffa3cbf4935310681160b0c2c9d5b938b229484ac4fd8b3f56e5b03a865f4cd
 DIST gstreamer-0.10.24.tar.bz2 2982027 RMD160 f77e4d1585567c0e4dd61c1301ba2032b2a04177 SHA1 bb93174f1c19560e119092a16e8acc3a905b6bb4 SHA256 ee8e22ff368333e668904133b40622702a1c687872e8ee5e06df9a5aad71963c
 DIST gstreamer-0.10.25.tar.bz2 3045572 RMD160 79f0d117f46d4138acb35fac6594a7aeba4c4a7e SHA1 e3cda2dcac9dbbfc2e61ba79fcd3bff1313dc7f4 SHA256 39b2ba7b3bfa8df6d998a9461e7091c27757e36a53e93969d7d9982a56526578
 DIST gstreamer-0.10.28.tar.bz2 3165971 RMD160 511ef38706447740803912de47c534fd291915cf SHA1 a1123d60c35c9be1f6f6357176056361f42e896b SHA256 61613ec7574d22230e8cc893f91b66faec6b21288a22d2f21c9d9eeb7667eb2c
@@ -7,6 +8,6 @@ EBUILD gstreamer-0.10.24.ebuild 1532 RMD160 09c959861d6b2770a2327f6871981d6ff2c4
 EBUILD gstreamer-0.10.25.ebuild 1553 RMD160 e085a9aae64cd15e701f5f03e49cb862a4fe6c46 SHA1 c629c6bf201c498760333109ba962f6a54a500af SHA256 5eb73e883f4ac15180545719a0fcebe89ad41ee7f1785e9066910e5ce361967b
 EBUILD gstreamer-0.10.28.ebuild 1716 RMD160 5dc4642c5f117cc3d524ed582e035fec69ee7030 SHA1 52e40828cc60d30db66bd50693cfb3c1036e0f82 SHA256 422549cb20335fc240121518a5a8b6ce0ff39ae00a6d1a5acbef9b08856611c4
 EBUILD gstreamer-0.10.29.ebuild 1714 RMD160 87a50fb96e5448eb0011342cab5ebe3b7214e389 SHA1 e6b7f2c65ae7ca9af5dd93131d3a7a664de5ff30 SHA256 92e84be3eebac3b777f2c89cca4f4ea0376a5028bca7046c45135423c460a4b8
-EBUILD gstreamer-0.10.30.ebuild 1806 RMD160 4c69f01b99b2558bfe4bb599029252ba6b06fb89 SHA1 1d0f2411b38d23b1516c09ff45240659997628f6 SHA256 5365861408de4bbc0ca353b536592cdc0a2114f5d6e87b10516c8741c8ca8a3e
-MISC ChangeLog 35443 RMD160 4fc62c3002ae09f7e7ae38c00321e9d976f34569 SHA1 0202ac0a646e55ff002a927f9fde4037a9c32edc SHA256 7a312bf8a4d10f7cb98c8916aa4bdf35b2253e64b7db2e2d5975a11aa26a247b
+EBUILD gstreamer-0.10.30.ebuild 1908 RMD160 b0863a7594f6f838c062c71106fe76110e367455 SHA1 425b13ebff55cf162a4556ba3206eebf8075ef7d SHA256 52c6e18782dcc9dee9a15b95f98c26e297a2ba40c2046f3b4a13df2f2e46edd0
+MISC ChangeLog 35637 RMD160 3507feb61c9c46f77e14fdb66635e050eeb42ac6 SHA1 99484c4cb56f2aa903a24632458516ac495fd6e6 SHA256 5c08e6220f581f38cb78fe2c99062a30c41aa4528f977f2c7bde3b78613a1cfe
 MISC metadata.xml 301 RMD160 3a6bff79b232385c5de9f2317c561ffb253cbbcf SHA1 b7214da3ec8fb7aa24a47ddbef806b4748f22ca9 SHA256 62420b67ee4d5dd547eddb2544a21b0ee85535f3717c76102c6d879fa8336b13
diff --git a/media-libs/gstreamer/files/gstreamer-0.10.30-make-382.patch b/media-libs/gstreamer/files/gstreamer-0.10.30-make-382.patch
new file mode 100644
index 000000000000..bf8da141059d
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-0.10.30-make-382.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/338866
+
+--- common/gtk-doc.mak
++++ common/gtk-doc.mak
+@@ -232,6 +232,6 @@
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ 
+ .PHONY : dist-hook-local docs
+--- common/gtk-doc-plugins.mak
++++ common/gtk-doc-plugins.mak
+@@ -332,7 +332,7 @@
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ 
+ .PHONY : dist-hook-local docs
+ 
diff --git a/media-libs/gstreamer/gstreamer-0.10.30.ebuild b/media-libs/gstreamer/gstreamer-0.10.30.ebuild
index 3d8c1b70dc90..2f62b1f44c7e 100644
--- a/media-libs/gstreamer/gstreamer-0.10.30.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.10.30.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.30.ebuild,v 1.1 2010/07/21 17:59:43 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.30.ebuild,v 1.2 2010/09/28 07:57:01 ssuominen Exp $
 
 EAPI=2
 
-inherit eutils multilib versionator
+inherit autotools eutils multilib versionator
 
 # Create a major/minor combo for our SLOT and executables suffix
 PV_MAJ_MIN=$(get_version_component_range '1-2')
@@ -25,8 +25,14 @@ RDEPEND=">=dev-libs/glib-2.20:2
 	# ^^ queue2 move, mustn't have both libgstcoreleements.so and libgstqueue2.so at runtime providing the element at once
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
+	dev-util/gtk-doc-am
 	nls? ( sys-devel/gettext )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make-382.patch
+	eautoreconf
+}
+
 src_configure() {
 	# Disable static archives, dependency tracking and examples
 	# to speed up build time