[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-games/, gnome-extra/gnome-games/files/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     1e49c15e08ea84bf7577c0675ede71fbae4c4ecb
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 17:12:35 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 17:17:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1e49c15e

gnome-extra/gnome-games: 2.91.90 → 2.91.91

---
 ...gnome-games-2.91.90-fix-header-collisions.patch |   71 --------------------
 ...s-2.91.90.ebuild => gnome-games-2.91.91.ebuild} |    3 -
 2 files changed, 0 insertions(+), 74 deletions(-)

diff --git a/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-header-collisions.patch b/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-header-collisions.patch
deleted file mode 100644
index eb22628..0000000
--- a/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-header-collisions.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 705397f479f758a6eae767aad84e13b10ca25f46 Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date: Wed, 23 Feb 2011 15:49:00 +0000
-Subject: Fix header collisions between clutter-gtk-0.10 and clutter-gtk-1.0
-
-Always add CLUTTER_GTK_CFLAGS before CLUTTER_CFLAGS to maintain the path order.
-Use the same LIBS order for consistency.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=643080
----
-diff --git a/aisleriot/Makefile.am b/aisleriot/Makefile.am
-index 9bd5995..030927f 100644
---- a/aisleriot/Makefile.am
-+++ b/aisleriot/Makefile.am
-@@ -167,9 +167,9 @@ sol_clutter_SOURCES += \
- endif
- 
- sol_clutter_CPPFLAGS = $(sol_CPPFLAGS) -DHAVE_CLUTTER
--sol_clutter_CFLAGS = $(sol_CFLAGS) $(CLUTTER_CFLAGS) $(CLUTTER_GTK_CFLAGS)
-+sol_clutter_CFLAGS = $(sol_CFLAGS) $(CLUTTER_GTK_CFLAGS) $(CLUTTER_CFLAGS)
- sol_clutter_LDFLAGS = $(sol_LDFLAGS)
--sol_clutter_LDADD = $(sol_LDADD) $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS)
-+sol_clutter_LDADD = $(sol_LDADD) $(CLUTTER_GTK_LIBS) $(CLUTTER_LIBS)
- 
- 
- endif # ENABLE_AISLERIOT_CLUTTER
-diff --git a/gnibbles/Makefile.am b/gnibbles/Makefile.am
-index c332c5d..cf0e4ff 100644
---- a/gnibbles/Makefile.am
-+++ b/gnibbles/Makefile.am
-@@ -39,15 +39,15 @@ gnibbles_CPPFLAGS = \
- 
- gnibbles_CFLAGS = \
- 	$(GTK_CFLAGS) \
--	$(CLUTTER_CFLAGS) \
- 	$(CLUTTER_GTK_CFLAGS) \
-+	$(CLUTTER_CFLAGS) \
- 	$(AM_CFLAGS)
- 
- gnibbles_LDADD = \
- 	$(top_builddir)/libgames-support/libgames-support.la \
- 	$(GTK_LIBS) \
--	$(CLUTTER_LIBS) \
- 	$(CLUTTER_GTK_LIBS) \
-+	$(CLUTTER_LIBS) \
- 	$(INTLLIBS)
- 
- if HAVE_GNOME
-diff --git a/quadrapassel/Makefile.am b/quadrapassel/Makefile.am
-index dedd075..087d34b 100644
---- a/quadrapassel/Makefile.am
-+++ b/quadrapassel/Makefile.am
-@@ -31,14 +31,14 @@ quadrapassel_CPPFLAGS = \
- 
- quadrapassel_CXXFLAGS = \
- 	$(GTK_CFLAGS) \
--	$(CLUTTER_CFLAGS) \
- 	$(CLUTTER_GTK_CFLAGS) \
-+	$(CLUTTER_CFLAGS) \
- 	$(AM_CXXFLAGS)
- 
- quadrapassel_LDADD = \
- 	$(top_builddir)/libgames-support/libgames-support.la \
--	$(CLUTTER_LIBS) \
- 	$(CLUTTER_GTK_LIBS) \
-+	$(CLUTTER_LIBS) \
- 	$(GTK_LIBS) \
- 	$(INTLLIBS)
- 
---
-cgit v0.8.3.4

diff --git a/gnome-extra/gnome-games/gnome-games-2.91.90.ebuild b/gnome-extra/gnome-games/gnome-games-2.91.91.ebuild
similarity index 98%
rename from gnome-extra/gnome-games/gnome-games-2.91.90.ebuild
rename to gnome-extra/gnome-games/gnome-games-2.91.91.ebuild
index 86caea5..a4a7b2e 100644
--- a/gnome-extra/gnome-games/gnome-games-2.91.90.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.91.91.ebuild
@@ -135,9 +135,6 @@ src_prepare() {
 	# Without this, --enable-staging enables all those games unconditionally
 	epatch "${FILESDIR}/${PN}-fix-staging-games.patch"
 
-	# Fixed upstream, remove in next release
-	epatch "${FILESDIR}/${P}-fix-header-collisions.patch"
-
 	eautoreconf
 
 	# disable pyc compiling