Bump to 2.26.2-r1. Make sound output selectable, bug #269780. Fix installation of setgid binaries, bug #267041.

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

4 files changed, 530 insertions, 2 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index e43c28a8ceed..fbd70df6f369 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.272 2009/05/24 15:44:31 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.273 2009/05/31 12:40:33 eva Exp $
+
+*gnome-games-2.26.2-r1 (31 May 2009)
+
+  31 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-games-2.26.2-r1.ebuild,
+  +files/gnome-games-2.26.2-parallel-make.patch:
+  Bump to 2.26.2-r1. Make sound output selectable, bug #269780. Fix
+  installation of setgid binaries, bug #267041.
 
 *gnome-games-2.26.2 (23 May 2009)
 
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index f9d9498b3c50..089fbe805214 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-games-2.14.0-no_lazy_bindings.patch 524 RMD160 1829b3f68998e195e4ff865982ff1818063ee604 SHA1 d63f49e339ce3d146920f7ac081c927145267eb0 SHA256 1d77a19b5d940ff23ee3110feb1ccc37a920e722c2cc0304abaf7a745cfab99d
+AUX gnome-games-2.26.2-parallel-make.patch 12693 RMD160 6a856fbf555ff9a9c5d998762f9d6a171ba2fc88 SHA1 e3dc134eb42b52a839f05d6705d370890c68e83e SHA256 6791aa96a17ca8869832fd89aa79f8d4e2d17d4e08f2cc0f93bfc43f7fa3e884
 DIST gnome-games-2.24.3.tar.bz2 19195003 RMD160 705f075e37c46e652e42e222aea82fa657a2b948 SHA1 f5de0d20bd51f188a9ac1e5f1ceaaa82d8f85882 SHA256 6ad3c849ea10f47c76cbf9c34a5e413b2549c919c5c388be0c42c59bcf3a388d
 DIST gnome-games-2.26.1.tar.bz2 23273583 RMD160 57883cd4bdb4681f6e99d276e4300e165c58de9e SHA1 5e461d85f163c905af107a57ba9449ecf929ae11 SHA256 4721330b126e60788165dce91308cd7ce72554ecfa4cb714b929e16afbf67aba
 DIST gnome-games-2.26.2.tar.bz2 23124681 RMD160 9d2bea14db0dcf63dee42677584e20a37be778c5 SHA1 c7de7b61431a10fbe287431b08d23c9e67c069fb SHA256 b7fb95a945453795aeccd91525a40d0c517220cc392f093113407e707d019429
 EBUILD gnome-games-2.24.3.ebuild 3861 RMD160 6c457c066a26b8b89903b9cbec11a395a1fe96fb SHA1 c6f93a7fc6d14e56527c4945f0a2830b49ccda59 SHA256 e18a52ef00b3f2c69e5287f367df4253f5694efa88a6cfbe13aa0e65c714b497
 EBUILD gnome-games-2.26.1.ebuild 3970 RMD160 c8280c04b5c243b517d7c995181903300ae9e07c SHA1 f8250e74a3db681f6e29e358a67d1fe7cba5756c SHA256 402779159d4035700e4a094c8e8b1e86008b9f6152cc4cf24597c7d22db45aad
+EBUILD gnome-games-2.26.2-r1.ebuild 4476 RMD160 e7b4ac49b07952c12ff2eee83f8d83b100788738 SHA1 5995da89f4258de96b5539890b5dd906860e0a02 SHA256 3bb69c6994865ccc7aa0557e54ef3d33dcec1b36152605baf608bc61ce310758
 EBUILD gnome-games-2.26.2.ebuild 3979 RMD160 9b5d94ccb1d7a8d639dc2f8d8bf0f0e0284bc3cc SHA1 f15f0a9fb48d1e1bb7dead17f7f7c1bb1fdc3441 SHA256 08383b776effa17e65294d39bbf14f850b18f01930eaa725ee1991947cc8ab72
-MISC ChangeLog 35955 RMD160 dae924babc996c065f86df761d1ccafea4dea6c1 SHA1 6ad624cffb0599d04b56aa79e682b24d0c034a2a SHA256 73e8aab11aa5a30d157c30ce14db25f191c3956d950746831cd2b09007116aa1
+MISC ChangeLog 36237 RMD160 4d304f04634b739a714c8f4442c968b98e9d6d7e SHA1 460e261e4fda4d0aed7a12f3af489a59b95b14bf SHA256 51a824f39e8ea5a1ab0c3f235f27dc8a42ca780fa04131b2852a1dfc7be90d5e
 MISC metadata.xml 246 RMD160 f99719fd9820b6c6943b2d0072f01177246a027b SHA1 68e2e7a60349b9a89beaa2d3bcb8d82bf1da4a8d SHA256 a21e910d2b0b2cfed695a77d8c5ccff533decd21ae4b46e8c57d0d3368f8e140
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoietIACgkQ1fmVwcYIWAaU5ACeNL3LumzCt0Fwsqp7q1D5i5Iz
+ujsAoJeiSDp2acoMmh3m2APqOhGa7/AR
+=mhmx
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.26.2-parallel-make.patch b/gnome-extra/gnome-games/files/gnome-games-2.26.2-parallel-make.patch
new file mode 100644
index 000000000000..e929fbb75b50
--- /dev/null
+++ b/gnome-extra/gnome-games/files/gnome-games-2.26.2-parallel-make.patch
@@ -0,0 +1,336 @@
+From 576a63f9c11eb0357e10fc851aab309bc6053e0e Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 31 May 2009 12:47:09 +0200
+Subject: [PATCH] Fix parallel make install setgid race condition.
+
+Use install-data-exec-hook for data kind of files and install-exec-hook
+for binary files.
+---
+ glines/Makefile.am     |   13 +++++++++----
+ gnibbles/Makefile.am   |   10 +++++++---
+ gnobots2/Makefile.am   |    8 ++++++--
+ gnometris/Makefile.am  |    8 ++++++--
+ gnomine/Makefile.am    |    8 ++++++--
+ gnotravex/Makefile.am  |   12 ++++++++----
+ gnotski/Makefile.am    |   12 ++++++++----
+ gtali/Makefile.am      |   10 +++++++---
+ mahjongg/Makefile.am   |   12 ++++++++----
+ same-gnome/Makefile.am |   12 ++++++++----
+ 10 files changed, 73 insertions(+), 32 deletions(-)
+
+diff --git a/glines/Makefile.am b/glines/Makefile.am
+index 6fb9542..b75d20e 100644
+--- a/glines/Makefile.am
++++ b/glines/Makefile.am
+@@ -68,7 +68,7 @@ SCOREFILES = \
+ 	Large	\
+ 	$(NULL)
+ 
+-install-schemas-local: $(schema_DATA)
++install-schemas-hook: $(schema_DATA)
+ if GCONF_SCHEMAS_INSTALL
+ 	if test -z "$(DESTDIR)" ; then \
+ 		for p in $^ ; do \
+@@ -77,7 +77,7 @@ if GCONF_SCHEMAS_INSTALL
+ 	fi
+ endif
+ 
+-install-scorefiles-local:
++install-scorefiles-hook:
+ 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
+ 	## Migrate to the new scoring system (with a link for dual-version
+ 	## installs).
+@@ -90,6 +90,11 @@ install-scorefiles-local:
+ 	  chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/glines.$$i.scores; \
+ 	  chmod 664 $(DESTDIR)$(scoredir)/glines.$$i.scores; \
+ 	done
+-	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/glines && chmod 2555 $(DESTDIR)$(bindir)/glines ; fi
+ 
+-install-data-local: install-schemas-local install-scorefiles-local
++install-data-hook: install-schemas-hook install-scorefiles-hook
++
++install-exec-hook:
++	-if test "x$(setgid)" = "xtrue"; then \
++	  chgrp $(scores_group) $(DESTDIR)$(bindir)/glines && chmod 2555 $(DESTDIR)$(bindir)/glines ;\
++	fi
++
+diff --git a/gnibbles/Makefile.am b/gnibbles/Makefile.am
+index c75def3..71ddc0d 100644
+--- a/gnibbles/Makefile.am
++++ b/gnibbles/Makefile.am
+@@ -168,7 +168,7 @@ DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
+ 
+ SCOREFILES = 4.0 3.0 2.0 1.0 4.1 3.1 2.1 1.1
+ 
+-install-data-local: $(ggzclient_dsc_in_files:.dsc.in=.dsc)
++install-data-hook: $(ggzclient_dsc_in_files:.dsc.in=.dsc)
+ if GCONF_SCHEMAS_INSTALL
+ 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnibbles/$(schema_DATA)
+ endif
+@@ -181,9 +181,13 @@ endif
+ 	   chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnibbles.$$i.scores; \
+ 	   chmod 664 $(DESTDIR)$(scoredir)/gnibbles.$$i.scores; \
+ 	 done
+-	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnibbles && chmod 2555 $(DESTDIR)$(bindir)/gnibbles ; fi
+ 
+-uninstall-local:
++install-exec-hook:
++	-if test "x$(setgid)" = "xtrue"; then \
++	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnibbles && chmod 2555 $(DESTDIR)$(bindir)/gnibbles ;\
++	fi
++
++uninstall-hook:
+ if GGZ_CLIENT
+ 	-$(GGZ_CONFIG) -D --remove --modfile=gnibbles-client.dsc
+ endif
+diff --git a/gnobots2/Makefile.am b/gnobots2/Makefile.am
+index 377ad20..c60eb48 100644
+--- a/gnobots2/Makefile.am
++++ b/gnobots2/Makefile.am
+@@ -86,7 +86,7 @@ EXTRA_DIST = AUTHORS \
+              $(config_DATA) \
+              $(schema_in_files)
+ 
+-install-data-local:
++install-data-hook:
+ if GCONF_SCHEMAS_INSTALL
+ 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnobots2/$(schema_DATA)
+ endif
+@@ -100,6 +100,10 @@ endif
+ 	    touch $$fname2; chmod 664 $$fname2; chown $(scores_user):$(scores_group) $$fname2; \
+ 	    touch $$fname3; chmod 664 $$fname3; chown $(scores_user):$(scores_group) $$fname3; \
+ 	    done
+-	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnobots2 && chmod 2555 $(DESTDIR)$(bindir)/gnobots2 ; fi
++
++install-exec-hook:
++	-if test "x$(setgid)" = "xtrue"; then \
++	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnobots2 && chmod 2555 $(DESTDIR)$(bindir)/gnobots2 ;\
++	fi
+ 
+ DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
+diff --git a/gnometris/Makefile.am b/gnometris/Makefile.am
+index 14c72b0..e819e34 100644
+--- a/gnometris/Makefile.am
++++ b/gnometris/Makefile.am
+@@ -108,7 +108,7 @@ EXTRA_DIST = AUTHORS \
+ 	$(pixmap_DATA) \
+ 	$(schema_in_files)
+ 
+-install-data-local:
++install-data-hook:
+ if GCONF_SCHEMAS_INSTALL
+ 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnometris/$(schema_DATA)
+ endif
+@@ -116,6 +116,10 @@ endif
+ 	-touch $(DESTDIR)$(scoredir)/gnometris.scores
+ 	-chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnometris.scores
+ 	-chmod 664 $(DESTDIR)$(scoredir)/gnometris.scores
+-	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnometris && chmod 2555 $(DESTDIR)$(bindir)/gnometris ; fi
++
++install-exec-hook:
++	-if test "x$(setgid)" = "xtrue"; then \
++	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnometris && chmod 2555 $(DESTDIR)$(bindir)/gnometris ;\
++	fi
+ 
+ DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
+diff --git a/gnomine/Makefile.am b/gnomine/Makefile.am
+index d11ce97..acb4077 100644
+--- a/gnomine/Makefile.am
++++ b/gnomine/Makefile.am
+@@ -54,7 +54,7 @@ Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
+ 
+ SCOREFILES = Small Medium Large Custom
+ 
+-install-data-local:
++install-data-hook:
+ if GCONF_SCHEMAS_INSTALL
+ 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnomine/$(schema_DATA)
+ endif
+@@ -68,6 +68,10 @@ endif
+ 	   chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnomine.$$i.scores; \
+ 	   chmod 664 $(DESTDIR)$(scoredir)/gnomine.$$i.scores; \
+ 	 done
+-	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnomine && chmod 2555 $(DESTDIR)$(bindir)/gnomine ; fi
++
++install-exec-hook:
++	-if test "x$(setgid)" = "xtrue"; then \
++	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnomine && chmod 2555 $(DESTDIR)$(bindir)/gnomine ;\
++	fi
+ 
+ DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
+diff --git a/gnotravex/Makefile.am b/gnotravex/Makefile.am
+index 865f11c..f75a91e 100644
+--- a/gnotravex/Makefile.am
++++ b/gnotravex/Makefile.am
+@@ -55,7 +55,7 @@ EXTRA_DIST = \
+ CLEANFILES = $(desktop_DATA) $(schema_DATA)
+ DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
+ 
+-install-schemas-local: $(schema_DATA)
++install-schemas-hook: $(schema_DATA)
+ if GCONF_SCHEMAS_INSTALL
+ 	if test -z "$(DESTDIR)" ; then \
+ 		for p in $^ ; do \
+@@ -66,13 +66,17 @@ endif
+ 
+ SCOREFILES = 2 3 4 5 6
+ 
+-install-scorefiles-local:
++install-scorefiles-hook:
+ 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
+ 	-for i in ${SCOREFILES} ; do \
+ 	   touch $(DESTDIR)$(scoredir)/gnotravex."$$i"x"$$i".scores; \
+ 	   chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnotravex."$$i"x"$$i".scores; \
+ 	   chmod 664 $(DESTDIR)$(scoredir)/gnotravex."$$i"x"$$i".scores; \
+ 	 done
+-	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotravex && chmod 2555 $(DESTDIR)$(bindir)/gnotravex ; fi
+ 
+-install-data-local: install-schemas-local install-scorefiles-local
++install-exec-hook:
++	-if test "x$(setgid)" = "xtrue"; then \
++	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotravex && chmod 2555 $(DESTDIR)$(bindir)/gnotravex ;\
++	fi
++
++install-data-hook: install-schemas-hook install-scorefiles-hook
+diff --git a/gnotski/Makefile.am b/gnotski/Makefile.am
+index 08efd17..3863937 100644
+--- a/gnotski/Makefile.am
++++ b/gnotski/Makefile.am
+@@ -62,7 +62,7 @@ EXTRA_DIST = \
+ CLEANFILES = $(desktop_DATA) $(schema_DATA)
+ DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
+ 
+-install-schemas-local: $(schema_DATA)
++install-schemas-hook: $(schema_DATA)
+ if GCONF_SCHEMAS_INSTALL
+ 	if test -z "$(DESTDIR)" ; then \
+ 		for p in $^ ; do \
+@@ -71,16 +71,20 @@ if GCONF_SCHEMAS_INSTALL
+ 	fi
+ endif
+ 
+-install-scorefiles-local:
++install-scorefiles-hook:
+ 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
+-	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotski && chmod 2555 $(DESTDIR)$(bindir)/gnotski ; fi
+ 	-for i in ${SCOREFILES} ; do \
+ 	  touch             $(DESTDIR)$(scoredir)/gnotski.$$i.scores; \
+ 	  chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gnotski.$$i.scores; \
+ 	  chmod 664         $(DESTDIR)$(scoredir)/gnotski.$$i.scores; \
+ 	done
+ 
+-install-data-local: install-schemas-local install-scorefiles-local
++install-data-hook: install-schemas-hook install-scorefiles-hook
++
++install-exec-hook:
++	-if test "x$(setgid)" = "xtrue"; then \
++	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotski && chmod 2555 $(DESTDIR)$(bindir)/gnotski ;\
++	fi
+ 
+ @INTLTOOL_SCHEMAS_RULE@
+ @INTLTOOL_DESKTOP_RULE@
+diff --git a/gtali/Makefile.am b/gtali/Makefile.am
+index ca0ae91..ee6b0d5 100644
+--- a/gtali/Makefile.am
++++ b/gtali/Makefile.am
+@@ -53,7 +53,7 @@ Games_in_files = gtali.desktop.in.in
+ Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-install-data-local:
++install-data-hook:
+ if GCONF_SCHEMAS_INSTALL
+ 	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gtali/$(schema_DATA)
+ endif
+@@ -64,7 +64,11 @@ endif
+ 	-chmod 664 $(DESTDIR)$(scoredir)/gtali.Regular.scores	
+ 	-touch $(DESTDIR)$(scoredir)/gtali.Colors.scores
+ 	-chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gtali.Colors.scores
+-	-chmod 664 $(DESTDIR)$(scoredir)/gtali.Colors.scores	
+-	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gtali && chmod 2555 $(DESTDIR)$(bindir)/gtali ; fi
++	-chmod 664 $(DESTDIR)$(scoredir)/gtali.Colors.scores
++
++install-exec-hook:
++	-if test "x$(setgid)" = "xtrue"; then \
++	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gtali && chmod 2555 $(DESTDIR)$(bindir)/gtali ;\
++	fi
+ 
+ DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
+diff --git a/mahjongg/Makefile.am b/mahjongg/Makefile.am
+index 8da5b46..d378de7 100644
+--- a/mahjongg/Makefile.am
++++ b/mahjongg/Makefile.am
+@@ -73,7 +73,7 @@ EXTRA_DIST = \
+ CLEANFILES = $(desktop_DATA) $(schema_DATA)
+ DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
+ 
+-install-schemas-local: $(schema_DATA)
++install-schemas-hook: $(schema_DATA)
+ if GCONF_SCHEMAS_INSTALL
+ 	if test -z "$(DESTDIR)" ; then \
+ 		for p in $^ ; do \
+@@ -82,16 +82,20 @@ if GCONF_SCHEMAS_INSTALL
+ 	fi
+ endif
+ 
+-install-scorefiles-local:
++install-scorefiles-hook:
+ 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
+ 	-for i in easy difficult confounding pyramid tictactoe cloud dragon bridges ziggurat; do \
+ 		touch $(DESTDIR)$(scoredir)/mahjongg.$$i.scores; \
+ 		chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/mahjongg.$$i.scores; \
+ 		chmod 664 $(DESTDIR)$(scoredir)/mahjongg.$$i.scores; \
+ 	done
+-	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/mahjongg && chmod 2555 $(DESTDIR)$(bindir)/mahjongg ; fi
+ 
+-install-data-local: install-schemas-local install-scorefiles-local
++install-exec-hook:
++	-if test "x$(setgid)" = "xtrue"; then \
++	  chgrp $(scores_group) $(DESTDIR)$(bindir)/mahjongg && chmod 2555 $(DESTDIR)$(bindir)/mahjongg ;\
++	fi
++
++install-data-hook: install-schemas-hook install-scorefiles-hook
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ @INTLTOOL_SCHEMAS_RULE@
+diff --git a/same-gnome/Makefile.am b/same-gnome/Makefile.am
+index e147957..406a3de 100644
+--- a/same-gnome/Makefile.am
++++ b/same-gnome/Makefile.am
+@@ -69,7 +69,7 @@ DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
+ 
+ SCOREFILES = Small Medium Large
+ 
+-install-schemas-local: $(schema_DATA)
++install-schemas-hook: $(schema_DATA)
+ if GCONF_SCHEMAS_INSTALL
+ 	if test -z "$(DESTDIR)" ; then \
+ 		for p in $^ ; do \
+@@ -78,7 +78,7 @@ if GCONF_SCHEMAS_INSTALL
+ 	fi
+ endif
+ 
+-install-scorefiles-local:
++install-scorefiles-hook:
+ 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
+ 	## Migrate to the new scoring system (with a link for dual-version
+ 	## installs).
+@@ -91,9 +91,13 @@ install-scorefiles-local:
+ 	  chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/same-gnome.$$i.scores; \
+ 	  chmod 664 $(DESTDIR)$(scoredir)/same-gnome.$$i.scores; \
+ 	done
+-	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/same-gnome && chmod 2555 $(DESTDIR)$(bindir)/same-gnome ; fi
+ 
+-install-data-local: install-schemas-local install-scorefiles-local
++install-exec-hook:
++	-if test "x$(setgid)" = "xtrue"; then \
++	  chgrp $(scores_group) $(DESTDIR)$(bindir)/same-gnome && chmod 2555 $(DESTDIR)$(bindir)/same-gnome ;\
++	fi
++
++install-data-hook: install-schemas-hook install-scorefiles-hook
+ 
+ @INTLTOOL_SCHEMAS_RULE@
+ @INTLTOOL_DESKTOP_RULE@
+-- 
+1.6.3.1
+
diff --git a/gnome-extra/gnome-games/gnome-games-2.26.2-r1.ebuild b/gnome-extra/gnome-games/gnome-games-2.26.2-r1.ebuild
new file mode 100644
index 000000000000..d4f524f48ffe
--- /dev/null
+++ b/gnome-extra/gnome-games/gnome-games-2.26.2-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.26.2-r1.ebuild,v 1.1 2009/05/31 12:40:33 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+WANT_AUTOMAKE="1.10"
+
+# make sure games is inherited first so that the gnome2
+# functions will be called if they are not overridden
+inherit games games-ggz eutils gnome2 python virtualx autotools
+
+DESCRIPTION="Collection of games for the GNOME desktop"
+HOMEPAGE="http://live.gnome.org/GnomeGames/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="artworkextra guile opengl test +gstreamer"
+
+RDEPEND=">=dev-python/pygtk-2.10
+	dev-python/pygobject
+	>=x11-libs/gtk+-2.14
+	>=dev-libs/dbus-glib-0.75
+
+	>=dev-python/gconf-python-2.17.3
+	!sh? ( >=dev-python/bug-buddy-python-2.17.3 )
+	>=dev-python/libgnomeprint-python-2.17.3
+
+	>=x11-libs/cairo-1
+	>=dev-python/pycairo-1
+	>=gnome-base/gconf-2
+	>=dev-libs/libxml2-2.4.0
+	>=gnome-base/librsvg-2.14
+	gstreamer? ( >=media-libs/gstreamer-0.10.11 )
+	!gstreamer? (
+		media-libs/libsdl
+		media-libs/sdl-mixer[vorbis] )
+	>=gnome-base/libglade-2
+	>=dev-libs/glib-2.6.3
+	>=dev-games/libggz-0.0.14
+	>=dev-games/ggz-client-libs-0.0.14
+
+	guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
+	artworkextra? ( gnome-extra/gnome-games-extra-data )
+	opengl? (
+		dev-python/pygtkglext
+		>=dev-python/pyopengl-3 )
+	!games-board/glchess
+	x11-libs/libSM"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.53
+	>=dev-util/pkgconfig-0.15
+	>=dev-util/intltool-0.40.4
+	>=sys-devel/gettext-0.10.40
+	>=gnome-base/gnome-common-2.12.0
+	>=app-text/scrollkeeper-0.3.8
+	>=app-text/gnome-doc-utils-0.10
+	test? ( >=dev-libs/check-0.9.4 )"
+
+# Others are installed below; multiples in this package.
+DOCS="AUTHORS HACKING MAINTAINERS TODO"
+
+# dang make-check fails on docs with -j > 1.  Restrict them for the moment until
+# it can be chased down.
+RESTRICT="test"
+
+_omitgame() {
+	G2CONF="${G2CONF},${1}"
+}
+
+pkg_setup() {
+	# create the games user / group
+	games_pkg_setup
+
+	# Decide the sound backend to use - GStreamer gets preference over SDL
+	if use gstreamer; then
+		G2CONF="${G2CONF} --with-sound=gstreamer"
+	else
+		G2CONF="${G2CONF} --with-sound=sdl_mixer"
+	fi
+
+	# Needs "seed", which needs gobject-introspection, libffi, etc.
+	#$(use_enable clutter)
+	#$(use_enable clutter staging)
+	G2CONF="${G2CONF}
+		--disable-card-themes-installer
+		--with-scores-group=${GAMES_GROUP}
+		--enable-noregistry=\"${GGZ_MODDIR}\"
+		--with-platform=gnome
+		--with-card-theme-formats=all
+		--with-smclient
+		--enable-omitgames=none" # This line should be last for _omitgame
+
+	# Needs clutter, always disable till we can have that
+	#if ! use clutter; then
+		_omitgame lightsoff
+	#fi
+
+	if ! use guile; then
+		ewarn "USE='-guile' implies that Aisleriot won't be installed"
+		_omitgame aisleriot
+	fi
+
+	if ! use opengl; then
+		ewarn "USE=-opengl implies that glchess won't be installed"
+		_omitgame glchess
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	# Fix parallel make install issue for setgid, bug #267041
+	epatch "${FILESDIR}/${PN}-2.26.2-parallel-make.patch"
+
+	# If calling eautoreconf, this ebuild uses libtool-2
+	eautomake
+}
+
+src_test() {
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Documentation install for each of the games
+	for game in \
+	$(find . -maxdepth 1 -type d ! -name po ! -name libgames-support); do
+		docinto ${game}
+		for doc in AUTHORS ChangeLog NEWS README TODO; do
+			[ -s ${game}/${doc} ] && dodoc ${game}/${doc}
+		done
+	done
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	# Avoid overwriting previous .scores files
+	local basefile
+	for scorefile in "${D}"/var/lib/games/*.scores; do
+		basefile=$(basename $scorefile)
+		if [ -s "${ROOT}/var/lib/games/${basefile}" ]; then
+			cp "${ROOT}/var/lib/games/${basefile}" \
+			"${D}/var/lib/games/${basefile}"
+		fi
+	done
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	games-ggz_update_modules
+	gnome2_pkg_postinst
+	python_need_rebuild
+	python_mod_optimize $(python_get_sitedir)/gnome_sudoku
+	if use opengl; then
+		python_mod_optimize $(python_get_sitedir)/glchess
+	fi
+}
+
+pkg_postrm() {
+	games-ggz_update_modules
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/{gnome_sudoku,glchess}
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/glchess
+}