Fix build with USE=introspection, bug #350061. Clean up old revisions.

(Portage version: 2.2.0_alpha12/cvs/Linux x86_64)

5 files changed, 60 insertions, 65 deletions

diff --git a/media-libs/clutter-gtk/ChangeLog b/media-libs/clutter-gtk/ChangeLog
index 21b77c1de92f..e19c3c5e6a58 100644
--- a/media-libs/clutter-gtk/ChangeLog
+++ b/media-libs/clutter-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/clutter-gtk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.7 2010/12/24 13:33:59 nirbheek Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.8 2011/01/03 23:28:41 eva Exp $
+
+  04 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -clutter-gtk-0.10.4.ebuild, -clutter-gtk-0.10.6.ebuild,
+  clutter-gtk-0.10.8.ebuild,
+  +files/clutter-gtk-0.10.8-fix-introspection-build.patch:
+  Fix build with USE=introspection, bug #350061. Clean up old revisions.
 
   24 Dec 2010; <nirbheek@gentoo.org> clutter-gtk-0.10.4.ebuild,
   clutter-gtk-0.10.6.ebuild, clutter-gtk-0.10.8.ebuild:
diff --git a/media-libs/clutter-gtk/clutter-gtk-0.10.4.ebuild b/media-libs/clutter-gtk/clutter-gtk-0.10.4.ebuild
deleted file mode 100644
index 621600298fef..000000000000
--- a/media-libs/clutter-gtk/clutter-gtk-0.10.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-0.10.4.ebuild,v 1.3 2010/12/24 13:33:59 nirbheek Exp $
-
-EAPI="2"
-
-# inherit clutter after gnome2 so that defaults aren't overriden
-inherit gnome2 clutter
-
-DESCRIPTION="Clutter-GTK - GTK+ Integration library for Clutter"
-
-SLOT="0.10"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc debug examples +introspection"
-
-# XXX: Needs gtk with X support (!directfb)
-RDEPEND="
-	>=x11-libs/gtk+-2.19.5[introspection?]
-	>=media-libs/clutter-1.2:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-EXAMPLES="examples/{*.c,redhand.png}"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-flavour=x11
-		--enable-maintainer-flags=no
-		$(use_enable introspection)"
-}
diff --git a/media-libs/clutter-gtk/clutter-gtk-0.10.6.ebuild b/media-libs/clutter-gtk/clutter-gtk-0.10.6.ebuild
deleted file mode 100644
index 8d6f4d31c615..000000000000
--- a/media-libs/clutter-gtk/clutter-gtk-0.10.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-0.10.6.ebuild,v 1.2 2010/12/24 13:33:59 nirbheek Exp $
-
-EAPI="2"
-
-# inherit clutter after gnome2 so that defaults aren't overriden
-inherit gnome2 clutter
-
-DESCRIPTION="Clutter-GTK - GTK+ Integration library for Clutter"
-
-SLOT="0.10"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc debug examples +introspection"
-
-# XXX: Needs gtk with X support (!directfb)
-RDEPEND="
-	>=x11-libs/gtk+-2.19.5[introspection?]
-	>=media-libs/clutter-1.2:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-EXAMPLES="examples/{*.c,redhand.png}"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-flavour=x11
-		--enable-maintainer-flags=no
-		$(use_enable introspection)"
-}
diff --git a/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild b/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild
index 6ab1e7eae92d..528da0a32efc 100644
--- a/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild,v 1.2 2010/12/24 13:33:59 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild,v 1.3 2011/01/03 23:28:41 eva Exp $
 
 EAPI="2"
 
 # inherit clutter after gnome2 so that defaults aren't overriden
-inherit gnome2 clutter
+inherit autotools eutils gnome2 clutter
 
 DESCRIPTION="Clutter-GTK - GTK+ Integration library for Clutter"
 
@@ -19,6 +19,7 @@ RDEPEND="
 	>=media-libs/clutter-1.2:1.0[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )"
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
 	doc? ( >=dev-util/gtk-doc-1.14 )"
 EXAMPLES="examples/{*.c,redhand.png}"
 
@@ -28,3 +29,12 @@ pkg_setup() {
 		--enable-maintainer-flags=no
 		$(use_enable introspection)"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix build with USE=introspection, bug #350061
+	epatch "${FILESDIR}/${PN}-0.10.8-fix-introspection-build.patch"
+
+	eautoreconf
+}
diff --git a/media-libs/clutter-gtk/files/clutter-gtk-0.10.8-fix-introspection-build.patch b/media-libs/clutter-gtk/files/clutter-gtk-0.10.8-fix-introspection-build.patch
new file mode 100644
index 000000000000..81b56f3a1f40
--- /dev/null
+++ b/media-libs/clutter-gtk/files/clutter-gtk-0.10.8-fix-introspection-build.patch
@@ -0,0 +1,39 @@
+From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@linux.intel.com>
+Date: Tue, 28 Sep 2010 13:52:25 +0000
+Subject: build: Add common CFLAGS to the introspection scanner
+
+---
+diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
+index 6e267b4..cec5cce 100644
+--- a/clutter-gtk/Makefile.am
++++ b/clutter-gtk/Makefile.am
+@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
+ 	-DCLUTTER_DISABLE_DEPRECATED		\
+ 	$(CLUTTER_GTK_DEBUG_CFLAGS)
+ 
++common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
++
+ # please, keep these lists sorted alphabetically
+ sources_c = \
+ 	$(srcdir)/gtk-clutter-embed.c 		\
+@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
+ libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
+ libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
+ libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
+-libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS) 
++libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
+ 
+ cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
+ cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
+@@ -48,7 +50,7 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
+ 	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
+ 		--namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
+ 		--strip-prefix=GtkClutter \
+-		$(INCLUDES) $(AM_CPPFLAGS) \
++		$(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
+ 		--add-include-path=$(srcdir) --add-include=path=. \
+ 		--include=Clutter-1.0 \
+ 		--include=GdkPixbuf-2.0 \
+--
+cgit v0.8.3.1-30-gff3a