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

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

4 files changed, 47 insertions, 6 deletions

diff --git a/net-libs/farsight2/ChangeLog b/net-libs/farsight2/ChangeLog
index ce269a00e918..825a2668febf 100644
--- a/net-libs/farsight2/ChangeLog
+++ b/net-libs/farsight2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/farsight2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/ChangeLog,v 1.36 2010/09/04 14:47:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/ChangeLog,v 1.37 2010/10/12 08:15:38 ssuominen Exp $
+
+  12 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+  farsight2-0.0.20.ebuild, +files/farsight2-0.0.20-make-382.patch:
+  Fix building with make >= 3.82 wrt #339534 by Diego E. Pettenò.
 
   04 Sep 2010; Raúl Porcel <armin76@gentoo.org> farsight2-0.0.17.ebuild:
   alpha/ia64/sparc stable wrt #320205
diff --git a/net-libs/farsight2/Manifest b/net-libs/farsight2/Manifest
index bf12fca951ae..d3ef13fe73af 100644
--- a/net-libs/farsight2/Manifest
+++ b/net-libs/farsight2/Manifest
@@ -1,3 +1,4 @@
+AUX farsight2-0.0.20-make-382.patch 1179 RMD160 f034db5c132bdcd98f1d0372910f11addae919b1 SHA1 058cb25d43cb02e5d66f8951148b4bb7a0eae481 SHA256 a22e539ec7d534b0f4cae1d495aa87fba4fa2c2b1cbdf3e2934f49f936c5227d
 DIST farsight2-0.0.14.tar.gz 1054752 RMD160 5f8816831fb6790c3185479cca43713fd552d4cd SHA1 2f8b382747efb467cdb9acd833bb88fe9bf02dc8 SHA256 88337ceb368ffb2afa46bd8166352ee594573d7580a936010a01be542d8d4a84
 DIST farsight2-0.0.15.tar.gz 1055749 RMD160 07669ad971096d31f6b192338982bc6888de2b10 SHA1 7edecfce0d3849ffceb6324a6ca63929338b4ccb SHA256 efc4aa28e0720f1c08f6179d40d436968a0a281a85b585bbb1694e5bd24f8ba3
 DIST farsight2-0.0.17.tar.gz 1025565 RMD160 bd6238a3376d0448e32fd0c50b80ccb3220132e2 SHA1 6e4b3376b9f33ab659b231bbbb2155d4e1b202cc SHA256 11e5ccaa3e9b4612bb14c0e451e36d20a7db3aac551959924bd034acb62fc06b
@@ -5,6 +6,6 @@ DIST farsight2-0.0.20.tar.gz 1072964 RMD160 e52e24c48bef8c3ddeddbd277dedc618d9db
 EBUILD farsight2-0.0.14.ebuild 1306 RMD160 dd2dcdfbd3400a3fbff416cedd5cd5f292db5b95 SHA1 35e137247003a78746b9d5119109dcaacd6ad7ea SHA256 0d6e5e4d7f8d1d14803f0141a9b7580099a9917218500269bc275cf0c175dc6b
 EBUILD farsight2-0.0.15.ebuild 1845 RMD160 c27de8ef2b5f7f7cf5114e86f6e6c6a089d6c8df SHA1 f0d668a7d83529e30a6efd748d328d83342ed7ca SHA256 e2dfd9e925102899ce2988fd2a5416fb5a9340ab8da371368118888933e5ddb1
 EBUILD farsight2-0.0.17.ebuild 1914 RMD160 6c7032c373fea5b0ff5635df50e90ddecf1f9a0e SHA1 943f0d61320c60473ad77be2d18ff56a5ff5f6fe SHA256 fcd18fc7146bf5ad1684c3f661c34ccdf65a649a35c4f24345e24fc0f096f567
-EBUILD farsight2-0.0.20.ebuild 1867 RMD160 e47638e27ad11c3027f41eb9414a9c6ab9e5c226 SHA1 1158c50e32b1044bbfb62a6287c018ad8fcb6c8d SHA256 2eb729fb9d0bd4d42d912f516f0f70b5a2e105a16eb87c17ceeba527d92a31bc
-MISC ChangeLog 4672 RMD160 7347182cbb6e811a0c0b382024fa4c08d0f80a3b SHA1 b6ea852b75b78a64605d001c6a3b7c6b47127586 SHA256 fa315ac57a1cbd40c21780041a51e1c7ba2a1e4dce2749f63d55e80a948b9166
+EBUILD farsight2-0.0.20.ebuild 1908 RMD160 00da3ea39e3d8ac476a852e0fce41ad4b6414cec SHA1 6fcac10b03c6554ad3bddf5e312ca5e382cc9e73 SHA256 e437f39a4a3de345a3ba30e5af47993fb72dd89437940fa09194ef1154f1729b
+MISC ChangeLog 4863 RMD160 6b8e51d0bb990822384a50393f5c4377dc9375cf SHA1 3cd742cc674d85146590b253eaffc5f696ab2167 SHA256 cd9feb716ae8abffea549163a4cec71f78b1eecc290668b31d64a96c64fdf569
 MISC metadata.xml 225 RMD160 667788ebb28d22666cec0316201d905fad1db218 SHA1 49e9509849b9d051583dfe6cfd6eb83fbccc0427 SHA256 3790140d26ca699fb4278866921bf08397476d590333db36d46115fcf2e8eea0
diff --git a/net-libs/farsight2/farsight2-0.0.20.ebuild b/net-libs/farsight2/farsight2-0.0.20.ebuild
index 7aca17cb7a70..509f5c34cebb 100644
--- a/net-libs/farsight2/farsight2-0.0.20.ebuild
+++ b/net-libs/farsight2/farsight2-0.0.20.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/farsight2-0.0.20.ebuild,v 1.2 2010/06/29 05:16:03 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/farsight2-0.0.20.ebuild,v 1.3 2010/10/12 08:15:38 ssuominen Exp $
 
 EAPI="2"
+inherit autotools eutils
 
 DESCRIPTION="Farsight2 is an audio/video conferencing framework specifically designed for Instant Messengers."
 HOMEPAGE="http://farsight.freedesktop.org/"
@@ -21,8 +22,7 @@ COMMONDEPEND=">=media-libs/gstreamer-0.10.26
 	>=dev-libs/glib-2.16
 	>=net-libs/libnice-0.0.9[gstreamer]
 	python? (
-		|| ( >=dev-python/pygobject-2.16 >=dev-python/pygtk-2.12 )
-		>=dev-python/pygobject-2.12
+		>=dev-python/pygobject-2.16
 		>=dev-python/gst-python-0.10.10 )
 	upnp? ( net-libs/gupnp-igd )"
 
@@ -36,6 +36,11 @@ DEPEND="${COMMONDEPEND}
 		media-plugins/gst-plugins-speex )
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make-382.patch
+	eautoreconf
+}
+
 src_configure() {
 	plugins="fsrtpconference,funnel,rtcpfilter,videoanyrate"
 	use msn && plugins="${plugins},fsmsnconference"
diff --git a/net-libs/farsight2/files/farsight2-0.0.20-make-382.patch b/net-libs/farsight2/files/farsight2-0.0.20-make-382.patch
new file mode 100644
index 000000000000..a5291c6c08c1
--- /dev/null
+++ b/net-libs/farsight2/files/farsight2-0.0.20-make-382.patch
@@ -0,0 +1,31 @@
+http://bugs.gentoo.org/339534
+
+--- farsight2-0.0.20/common/gtk-doc.mak
++++ farsight2-0.0.20/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
+--- farsight2-0.0.20/common/gtk-doc-plugins.mak
++++ farsight2-0.0.20/common/gtk-doc-plugins.mak
+@@ -352,7 +352,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
+ 
+--- farsight2-0.0.20/python/Makefile.am
++++ farsight2-0.0.20/python/Makefile.am
+@@ -1,5 +1,4 @@
+ PYDEFS=`pkg-config --variable=defsdir pygobject-2.0`
+-[ -z "$PYDEFS" && PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`]
+ GSTPYDEFS=`pkg-config --variable=defsdir gst-python-0.10`
+ 
+ AM_CPPFLAGS =						\