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

Package-Manager: portage-2.2.0_alpha12/cvs/Linux x86_64

6 files changed, 73 insertions, 71 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/Manifest b/media-libs/clutter-gtk/Manifest
index 30da666633a4..aef02ef70763 100644
--- a/media-libs/clutter-gtk/Manifest
+++ b/media-libs/clutter-gtk/Manifest
@@ -1,10 +1,17 @@
-DIST clutter-gtk-0.10.4.tar.bz2 307429 RMD160 48aa5ee423b5f2df3a129fa66a6f321603ec89be SHA1 fc98d50bfc7500f546676baf04d1afe480b3a8f8 SHA256 0134a8de202c518e231f340f5f2f3e988350105de9fadd0e849f08d95ac1b912
-DIST clutter-gtk-0.10.6.tar.bz2 309639 RMD160 2a2d39bad99cf97d940c26a99245c24726e360f1 SHA1 bbbaf43c6aaa89b05ce8949087bc92c9ac9dfc40 SHA256 c65ec1e6b2932ed23b3db145357a96ae5ec7cb0666139468eba781d6c56a5371
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX clutter-gtk-0.10.8-fix-introspection-build.patch 1723 RMD160 a50392ebf6a5069c44debaef0f9e96fb74c36cf9 SHA1 24eef1764e690c00c2532f4c0f8233cbd9955799 SHA256 a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66
 DIST clutter-gtk-0.10.8.tar.bz2 321316 RMD160 50050df319824b4966b145a368f5af2657460350 SHA1 783b7fa0e826a18ed22d4c2723ba83c740c3a8fa SHA256 7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814
 DIST clutter-gtk-0.91.6.tar.bz2 387247 RMD160 234cb029b3c1efafb1dc6ff5e4a70e34ac0efebb SHA1 b2b3e479e2412ba1820793df30f4424cebcdef04 SHA256 4660831bd99acd53d221f2653139514dafa8c0e9d46f109ca974b7dceb2ffa42
-EBUILD clutter-gtk-0.10.4.ebuild 893 RMD160 a4f0bfc2b0fa6de32acb6d0b288e722cac50dbcf SHA1 18860869b14d8604081d697a37de829672da0eb4 SHA256 fb5e440993976d0c1dcd8e4f42697b100cbab0749568f0d700e57c2cd4b43b19
-EBUILD clutter-gtk-0.10.6.ebuild 893 RMD160 ff909ae503c9a7ccafd091aa3161eddde5865aad SHA1 c5b6bd674bc3e5b1a0f3e9725ed1d81d51cf410d SHA256 437b34f150111a58b54ba7998f2b225f453b18b440d75c637e567a00a804bd63
-EBUILD clutter-gtk-0.10.8.ebuild 893 RMD160 73e58d44fd1c62965e05f2174880a2cce394546f SHA1 6eea861dfda59c1b9d136fe94ae21167ff28295d SHA256 e8012c9f311e0928d5d5c102d5493e0244cd56e9f3d994b5a67faff130f6f778
+EBUILD clutter-gtk-0.10.8.ebuild 1101 RMD160 82ee725a6cee03dbbd0cd740dca4d45b3af8f0d7 SHA1 bf85712609596a54d62f6c1287bf5948c77e2a59 SHA256 016fa0d96603a0c01e4239f6ddcf226f6449fca3778894493f900a7ab5373415
 EBUILD clutter-gtk-0.91.6.ebuild 941 RMD160 05554a4be04303ee086435df34bda4a6a1ccd028 SHA1 0d32887ae6e9c6a3b2029cc1066914bea81450b3 SHA256 c116c28162e0c8b081e0485c34e44ca323876dc20468cd802ca7fce0434339da
-MISC ChangeLog 1386 RMD160 f6eeec8de8ef28495dd586cdf012325310680c72 SHA1 7a99669a4745e919dd4698e34cc37e0a56998a6a SHA256 0e54b2b6705b73ce742995e6a442073dfac004c90c445f6d602551d109b8b048
+MISC ChangeLog 1655 RMD160 97d6571c4d7145cdcfb278157764f65baec703f0 SHA1 b0a7ccbd493b676ac1612bc5d6298cda179284cf SHA256 dbcd67f94ef48c427a40b89d1190d7a9fa455453e311460a2d16ee2ae05efff5
 MISC metadata.xml 272 RMD160 94ca2c5330dafece28a4cd39f8c53c0926c72b58 SHA1 0594029445efc117f85d07402cacb33f063a8198 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0iab4ACgkQ1fmVwcYIWAZ10gCgs70bgvLW6olTtyOsf1ZxSN6B
+aZoAn3F0XF9Hk1gE3Ni0qctta4gG92bK
+=zLFA
+-----END PGP SIGNATURE-----
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