Make libcanberra support not optional per herd policy.

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64
RepoMan-Options: --force

7 files changed, 24 insertions, 689 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index f83c515a6a50..f30f6c3bf437 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.304 2011/01/27 12:53:51 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.305 2011/02/15 08:17:13 eva Exp $
+
+  15 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-games-2.26.2-parallel-make.patch, -gnome-games-2.26.3-r1.ebuild,
+  -gnome-games-2.30.2.ebuild, gnome-games-2.30.2-r1.ebuild, metadata.xml:
+  Make libcanberra support not optional per herd policy.
 
   27 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
   gnome-games-2.28.2.ebuild:
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index 986bfe29236d..fa8f784c0325 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -1,13 +1,19 @@
-AUX gnome-games-2.26.2-parallel-make.patch 12693 RMD160 6a856fbf555ff9a9c5d998762f9d6a171ba2fc88 SHA1 e3dc134eb42b52a839f05d6705d370890c68e83e SHA256 6791aa96a17ca8869832fd89aa79f8d4e2d17d4e08f2cc0f93bfc43f7fa3e884
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-games-2.26.3-gtali-invalid-pointer.patch 1145 RMD160 905fa0574296c70a4653914b81cf391205a660d8 SHA1 7384fecdd16fc3b6bf7e10bdd950ab2f8df877ce SHA256 b75190460f701c1830a8eae85c46de23a3735329f840d21383a60ca4445adac0
 AUX gnome-games-2.26.3-implicit-declaration.patch 319 RMD160 c6d868784160c6e10c046d6e117ce6206e1dd49f SHA1 1fa72d174f676b594c61dabb232a9e3a3b98b726 SHA256 7a113e54b4fe50a0d49c5b7b842a03b7f8c494e9f4ee42e9f0ae883dd1bfddcb
 AUX gnome-games-2.28.1-conflicting-types-libgames-support.patch 1038 RMD160 e9c63e9881adbb43cf462a3387d9d0275e1f3598 SHA1 e3b3c30bd32e786bc767fbcee4006a99fea05095 SHA256 074718266310ccdc0ed29affee2dcd28c6e51e557b4db84a320c2e6223f55b8e
-DIST gnome-games-2.26.3.tar.bz2 24664606 RMD160 54ae263d943e2cf7dad2f1e160d7a2756e0ca573 SHA1 0b859be03e6f25a43ed4ad41d6022b9bc83635fc SHA256 f29849507bd2a29a747b73f412fcbc8c74f3a9b5bf38d4b763b4242ac84cf46f
 DIST gnome-games-2.28.2.tar.bz2 25498433 RMD160 03c9ca6e899bcc44436b232b126f22a0946dff43 SHA1 c2be79044175df51e610edf4c9fd6fba270c02bf SHA256 7afca16831eff95cf3e9ea4f1344d26ed30b274b89b06403adf0757221b36899
 DIST gnome-games-2.30.2.tar.bz2 27683256 RMD160 12c7e5ba3b4a9aca5d9918978e437e774ac0752b SHA1 3541ccc991af82603fc3067863bc27a731302b2c SHA256 57c3f3685cdd49016dfbf236f4a1d98c9d669d456fabe0aeb6f5a4128dba3586
-EBUILD gnome-games-2.26.3-r1.ebuild 4653 RMD160 2f7c65b912ae211c95ab28ed951e2a287a7c6be9 SHA1 33eb225cd2ac96ae013c398eccc98f20deb58a65 SHA256 e8322aecd563965624581eaffb0d32bfa2c3338972df4f85f4584ac288868290
 EBUILD gnome-games-2.28.2.ebuild 4919 RMD160 1528f5ea7a98bbecb49bb838b3fad66648f97fa4 SHA1 caa0684dcf1730223dfde145e7f6b98b97c8b51f SHA256 b25ecfdf37a3b6b9bb0496cb2990aed8703a8e2fb8ccf1bbb4410c51efeda166
-EBUILD gnome-games-2.30.2-r1.ebuild 4520 RMD160 723775647326862c3bf2722e06da39ac070afabd SHA1 aa247735ea7ecdb46c0507d881d58794c66b9aa8 SHA256 4e61321e060dc0814db7175c55a6411dc67fd8dd516b63a0c286ac94cde8fcdf
-EBUILD gnome-games-2.30.2.ebuild 4143 RMD160 6dd488c484e2042b4d80c3e27f7261fc62b273f4 SHA1 dd3f41d3fec73bd36828a9af2087bc8a7ef00998 SHA256 86cf83e2e4082647abd00cd4f7c66534639dd4d47a9454b14bd14069aa8d2d53
-MISC ChangeLog 41156 RMD160 3ce6c6ba8f9dce249516d3cda3f0f1b25aee5f12 SHA1 f0b2d6d02fb36ff563b2530bd15882e702354749 SHA256 f457322bcfbae68acd92227ba265fbe3e1fdefdc02d0c12c0b28a2a5919de00d
-MISC metadata.xml 469 RMD160 661b9e63299816bfb3f94164ea1c381d89af5081 SHA1 2c6eff1070b37f41776458bad6d5e304ce1b5b51 SHA256 81ec935c3dcf9ddb7ec07386657fb30d9e28b69d2011f318bd4b0f38645b9d79
+EBUILD gnome-games-2.30.2-r1.ebuild 4497 RMD160 c0fd7123706b236d8d3789e405b167023148fb66 SHA1 909573491e906344b82a6c6fe45cdf8a4a8df965 SHA256 3bf1b09fe9963863c8f6dd05b69420dc6dbd04ecf7a7967c66a26cd1660ddb54
+MISC ChangeLog 41415 RMD160 64180353f8ff81b422ede297e767b1e2e2e6097e SHA1 d110adc6adeec397ca83f7efb9bdbc9ef3ef98e5 SHA256 483bf85177ff8c4866e54aa58bb0b5ee89cc58ce5a242fe25745fe9e38e9746d
+MISC metadata.xml 389 RMD160 930ef5bd4a65295fc5e3092544b9714d126052fc SHA1 cb6dda0d9c528b2c9e0cb66ac32bfa793cf5627c SHA256 8176b49be607cac9efc2a3979dc59f84e1c9f83998dd8603cb465b3f79050dbf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1aNo4ACgkQ1fmVwcYIWAZ2cwCgh9R02vPBNZH5Q6AzA6M8oYnZ
+3qIAnRjCBzq/J/QAJfyYxBiR+jR0BSPr
+=kMsK
+-----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
deleted file mode 100644
index e929fbb75b50..000000000000
--- a/gnome-extra/gnome-games/files/gnome-games-2.26.2-parallel-make.patch
+++ /dev/null
@@ -1,336 +0,0 @@
-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.3-r1.ebuild b/gnome-extra/gnome-games/gnome-games-2.26.3-r1.ebuild
deleted file mode 100644
index 51f3e1f6fb05..000000000000
--- a/gnome-extra/gnome-games/gnome-games-2.26.3-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2010 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.3-r1.ebuild,v 1.10 2010/07/20 02:16:39 jer 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 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"
-
-# Workaround #289372. Fixed in 2.28.
-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}
-		$(use_enable test tests)
-		--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"
-
-	# Fix implicit declaration of yylex.
-	epatch "${FILESDIR}/${PN}-2.26.3-implicit-declaration.patch"
-
-	# Fix bug #281718 -- *** glibc detected *** gtali: free(): invalid pointer
-	epatch "${FILESDIR}/${P}-gtali-invalid-pointer.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
-}
diff --git a/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild b/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild
index c7f2c24b7fa7..ed2d04b638af 100644
--- a/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.30.2-r1.ebuild,v 1.10 2011/01/24 16:50:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild,v 1.11 2011/02/15 08:17:13 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ HOMEPAGE="http://live.gnome.org/GnomeGames/"
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~arm ia64 ppc ppc64 sh sparc ~x86 ~x86-fbsd"
-IUSE="artworkextra +clutter guile opengl +sound test"
+IUSE="artworkextra +clutter guile opengl test"
 
 # USE=clutter also enables introspection because gnome-games is the only known
 # consumer of introspection on libgames-support etc. If something else pops up,
@@ -34,6 +34,7 @@ COMMON_DEPEND="
 	>=dev-python/pycairo-1
 	>=gnome-base/gconf-2
 	>=gnome-base/librsvg-2.14
+	media-libs/libcanberra[gtk]
 	>=x11-libs/cairo-1
 	>=x11-libs/gtk+-2.16:2
 	x11-libs/libSM
@@ -47,7 +48,6 @@ COMMON_DEPEND="
 	opengl? (
 		dev-python/pygtkglext
 		>=dev-python/pyopengl-3 )
-	sound? ( media-libs/libcanberra[gtk] )
 	!games-board/glchess"
 RDEPEND="${COMMON_DEPEND}
 	clutter? (
@@ -82,9 +82,9 @@ pkg_setup() {
 
 	G2CONF="${G2CONF}
 		$(use_enable clutter introspection)
-		$(use_enable sound)
-		--disable-card-themes-installer
 		--disable-aisleriot-clutter
+		--disable-card-themes-installer
+		--enable-sound
 		--with-scores-group=${GAMES_GROUP}
 		--with-platform=gnome
 		--with-card-theme-formats=all
diff --git a/gnome-extra/gnome-games/gnome-games-2.30.2.ebuild b/gnome-extra/gnome-games/gnome-games-2.30.2.ebuild
deleted file mode 100644
index d94dabdf681c..000000000000
--- a/gnome-extra/gnome-games/gnome-games-2.30.2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2011 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.30.2.ebuild,v 1.5 2011/01/27 08:02:13 fauli Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.11"
-
-# make sure games is inherited first so that the gnome2
-# functions will be called if they are not overridden
-inherit games games-ggz gnome2 python virtualx
-
-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 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="artworkextra guile opengl +sound test" # introspection
-
-# Introspection support needs
-#	media-libs/clutter
-#	>=dev-libs/gobject-introspection 0.6.3
-# and generates GnomeGames...gir
-RDEPEND="
-	>=dev-games/libggz-0.0.14
-	>=dev-games/ggz-client-libs-0.0.14
-	>=dev-libs/dbus-glib-0.75
-	>=dev-libs/glib-2.6.3:2
-	>=dev-libs/libxml2-2.4.0
-	>=dev-python/gconf-python-2.17.3
-	>=dev-python/pygobject-2:2
-	>=dev-python/pygtk-2.14:2
-	>=dev-python/pycairo-1
-	>=gnome-base/gconf-2
-	>=gnome-base/librsvg-2.14
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-2.16:2
-	x11-libs/libSM
-
-	sound? ( media-libs/libcanberra[gtk] )
-	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"
-
-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
-
-	# Needs "seed", which needs gobject-introspection, libffi, etc.
-	#$(use_enable clutter)
-	#$(use_enable clutter staging)
-	#$(use_enable introspection)
-	G2CONF="${G2CONF}
-		$(use_enable sound)
-		--disable-introspection
-		--disable-card-themes-installer
-		--with-scores-group=${GAMES_GROUP}
-		--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 quadrapassel
-		_omitgame lightsoff
-		_omitgame swell-foop
-		_omitgame gnibbles
-	#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
-}
-
-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
-}
diff --git a/gnome-extra/gnome-games/metadata.xml b/gnome-extra/gnome-games/metadata.xml
index 86c4d9d9fffb..21dc87acaa4b 100644
--- a/gnome-extra/gnome-games/metadata.xml
+++ b/gnome-extra/gnome-games/metadata.xml
@@ -6,6 +6,5 @@
 	<flag name='artworkextra'>Installs extra artwork for various games</flag>
 	<flag name='clutter'>Build games that use <pkg>media-libs/clutter</pkg> and
 		are written in JavaScript using <pkg>dev-libs/seed</pkg></flag>
-	<flag name='sound'>Enable sound using <pkg>media-libs/libcanberra</pkg></flag>
 </use>
 </pkgmetadata>