Fix for systems with python3 as main interpreter, drop old testing versions that will never hit stable.

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

6 files changed, 30 insertions, 571 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 20d8f3988ae6..5aa66ecb1c88 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.318 2012/05/20 08:24:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.319 2012/07/07 12:15:48 pacho Exp $
+
+  07 Jul 2012; Pacho Ramos <pacho@gentoo.org> -gnome-games-2.30.2-r1.ebuild,
+  -gnome-games-2.30.2-r2.ebuild, -gnome-games-3.2.1.ebuild,
+  gnome-games-2.28.2.ebuild:
+  Fix for systems with python3 as main interpreter, drop old testing versions
+  that will never hit stable.
 
 *gnome-games-3.4.2 (20 May 2012)
 
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index d28f900b1bf7..42f4126e5e03 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -1,33 +1,25 @@
 -----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
-AUX gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch 633 RMD160 4ac7bc6c039c0cd8193230c8c73a8552a888f457 SHA1 9e54584aba6f313a590bb9664c9676097141749b SHA256 902c85ff3f0898b89b75cb077d5b132ad55045fbd18e8c618fae3daee6352e6b
-AUX gnome-games-3.2.1-pygobject-3.0.3.patch 1293 RMD160 520a0d8fcfafc7b33197fde43f64f7c74c321a06 SHA1 3e7bd87c115ac367651e0443ae54a4a2b278dde5 SHA256 0d1a7dd240b9e59ebd3d5bf98dcfb628b2a70a0ae10d007eb4fe908a524e4bbe
-AUX gnome-games-3.2.1-sudoku-borders.patch 1059 RMD160 043faaf6eb3fbbf7ddea67347e0807f6d0fc0891 SHA1 1abef0455aebf796a89f40e6c0c9f300b16c0718 SHA256 afa6a36eb002ca5ebff9c752a23e865a60df23f0d64c25b883ed77879ae85073
-AUX gnome-games-fix-staging-games.patch 1245 RMD160 8a7f63d6b6c11194f7f46946390d346713890aa8 SHA1 535ee43c9b48fbd2ff946a561470846112e2c311 SHA256 525b90b1bdd69ca9a474daab4a7a79e7494f7dc0e148fd50e9195e64483e0817
-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
-DIST gnome-games-3.2.1.tar.xz 22816376 RMD160 aac7a262bb0e115743213d7d03d0267dfaa45df9 SHA1 42670da7bfbdecc2014076263dfb30276446c826 SHA256 b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b
-DIST gnome-games-3.4.2.tar.xz 18578676 RMD160 0126bc920cbecaf5acd396aeef0c8ab2950cdbd8 SHA1 67824a59fd23548da27c9c34ed3572ef4c2f882a SHA256 25676285fad33a39da7fc26b5b1dc751c7981ae778b8fe82e8b7c0a367e5117c
-EBUILD gnome-games-2.28.2.ebuild 4822 RMD160 429c2db639f786d8a03ef8e707a94d0f1dcaad39 SHA1 cade752d50a7a56c104f03c3b9b6f2901f9acda0 SHA256 6e5fef890b92eef1f825cfe0f8c5a6847cb1920af401aaed99118e05d85ce07e
-EBUILD gnome-games-2.30.2-r1.ebuild 4500 RMD160 01ecf442cf0f33d087c09a2fecf6c08d6069e36b SHA1 379551e130c4b8ea57314a09e5ce183162cb0898 SHA256 cb44d2d04e11a71d26826c41ba3b83e20c2a6b8145dd827d4059eae719529441
-EBUILD gnome-games-2.30.2-r2.ebuild 4553 RMD160 e984f6b7704868b4e0a6e301f53c497e6349427d SHA1 e80bf095fb2f68838f1c5afb8ae61f215331d3c9 SHA256 5b72de8673e54d1dbd228b361465a7d303d7ca6ca5d26d3719b7008bbc6d8efd
-EBUILD gnome-games-3.2.1-r1.ebuild 5224 RMD160 71f25ee493ca1664a22b984a8ff3641bab6d335f SHA1 1b1c3f4573dfa32c5d650b646b535bfa1ea73a23 SHA256 2ae766afeeacdb949f451b559b33c8b15f26ee2fd7c048c4698ef2d870171bc4
-EBUILD gnome-games-3.2.1.ebuild 4978 RMD160 70b52ad99735c61b085a5f59acb62dd0b1d1739e SHA1 45ffa02e88f51919c96a798b0cf9f0f408e269e5 SHA256 97cc6389b288f1b367d81e664556e26625ced1f51f41ca5feed4bfd023f277dc
-EBUILD gnome-games-3.4.2.ebuild 3914 RMD160 0e6e10d23084e85f876013ff52abdeb44b3fc8c8 SHA1 e04f34d2282c995f5a132affe6549bdc8e4a1a96 SHA256 fecc784f447531457535814f2c8cc6ec0efc19de3d52584136de68a88dcb809f
-MISC ChangeLog 44545 RMD160 0a9c35601a225292b6c79d2c6cd572e9320e177a SHA1 7a3d6056a6e616902d4cfb26971f3aa8ab949162 SHA256 8d26a6902ca1b9d49dbac54de3f7efc172fe33613e4174ec4726adddb29c0a8c
-MISC metadata.xml 836 RMD160 6d78f876600f8e11989df8f818de2adeb377bf6c SHA1 2ef9bad41e6d98b60a44d851c062c5fe06ecac23 SHA256 b233cfdcd3311a14130163329fa9047c65a852526db63dd6c5002b0bcc6d490d
+AUX gnome-games-2.26.3-gtali-invalid-pointer.patch 1145 SHA256 b75190460f701c1830a8eae85c46de23a3735329f840d21383a60ca4445adac0 SHA512 1f29bd41691a01f5822d3bee6eb1058eb0319e36b36f262daf02e997a1f3b58c87d6de79150f7639b3a0a4926a258b60a37c9f8aef7a3084895892c2f3776b44 WHIRLPOOL 631d301fa48bf3784d981533e9cc22f7c87f955bab2bfffe1a34b28943c281ccb808a44cc4f39d627c31a2522d7136080a9cdde1d540ffadc19bdc08ce5d6099
+AUX gnome-games-2.26.3-implicit-declaration.patch 319 SHA256 7a113e54b4fe50a0d49c5b7b842a03b7f8c494e9f4ee42e9f0ae883dd1bfddcb SHA512 a26e75b67056d36bff391f421e9bafe2034a251ac8a8270eea82ec42c0426894479e4e650ea1a68efd5992ebe60a1e48dc2ddce1325b88343fd422c564a0feb6 WHIRLPOOL 8e1118f7daae63cbc5846de9200e5c194f810cd2499b620ae9934e2020293cc4ec5e0f39975b3a164894e413dd81392583579745fe1bb8666055afa23e74888f
+AUX gnome-games-2.28.1-conflicting-types-libgames-support.patch 1038 SHA256 074718266310ccdc0ed29affee2dcd28c6e51e557b4db84a320c2e6223f55b8e SHA512 f50d26ed581024c4059acb14c2e546d2da6b40f4928ec63b1b8258ca28a70e89d87bca60d1b5af936cbc5b7273a25e0998428c3483be23bff97a331580c6b10d WHIRLPOOL e96d0bc9a74dd9c756843f89879d7cf23be1461304fc95025c0263102c56802ccd55693249e6922515c21cd1f044074e552ef1441252c91fa0622fff82b827f0
+AUX gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch 633 SHA256 902c85ff3f0898b89b75cb077d5b132ad55045fbd18e8c618fae3daee6352e6b SHA512 81c356bf700afcee3fbf3ad8d699b9ad5ae0e8738b72736934e070c117a59efe8bf6597f13630b5310ba3006beb31a5c39fb220206618f1a7f6679a5876727dc WHIRLPOOL 23ed9e56d9b6e3ef463cbf0a2a20bdf442a904551115f31c3bd88838652ed1a30ea2b89d694d10154c3aca81a738fddc986e0d5b423f79462dbccdaba0e819be
+AUX gnome-games-3.2.1-pygobject-3.0.3.patch 1293 SHA256 0d1a7dd240b9e59ebd3d5bf98dcfb628b2a70a0ae10d007eb4fe908a524e4bbe SHA512 2f430f517d4a684db66b9ab680560e0781a660f670099e0c2dfa37dcb8de61ad9e6a5e109ef1ad70e835014270142e454f4c5a814382b1cffd58025d2c63eff3 WHIRLPOOL 93442da1b9ba82d682375f4eacdab93aab618a26a773668bcbbcd71fc94002e0f4b52147f1be52b019ba8f56161365aae88c7099700252861c4e2ff941ce87a3
+AUX gnome-games-3.2.1-sudoku-borders.patch 1059 SHA256 afa6a36eb002ca5ebff9c752a23e865a60df23f0d64c25b883ed77879ae85073 SHA512 6ff84ae8db0f4c5d41e314ed5e0b78e2b2eecbc9cb553cbc3a2c8e5578c512bbdea3560620e2eb96dc57e6d2dc6050726ac20f98ce82ac06ad85f8becaee4c18 WHIRLPOOL 37f5dd4bf91b60e88c3b2d88ed10574146ef7d9d37dde783b79441b050e76fc7ce96fe73939039366744def9e25932b00bc7a15fa376cace626f74d3c12860ea
+AUX gnome-games-fix-staging-games.patch 1245 SHA256 525b90b1bdd69ca9a474daab4a7a79e7494f7dc0e148fd50e9195e64483e0817 SHA512 c764da423486d61821a6bcb66a74039b96f1b3f2f191af6be7c7609a0dc19b26697cc56f52226ba1142f760172f757f38732ce7646c5e6b0ba2e8051d03433cf WHIRLPOOL 6771aac1ab5b27019e40d22d20f3bfe3a4fc3610c9b52f0ef8b02603603344cf1de39b152be7cc7458dece1f2f5486fa2234a17718f8604935a42a335891bd8a
+DIST gnome-games-2.28.2.tar.bz2 25498433 SHA256 7afca16831eff95cf3e9ea4f1344d26ed30b274b89b06403adf0757221b36899 SHA512 41d25c54d5d44d4a37ff87ca78fc236a7e33ef58c0eaadc0878eae3ff3bcabacfa986e8fc75230655b3a2bde70fdd81889213b97cbbc29c6b6768b47fb84d4bb WHIRLPOOL e4e958ae49d4b48278531b869bbaf3c085267b5fb6927a34681e7be6a350ce0f899f80c960e137d63aaee8ead1b70c1eb0d6814efacfaea5ff81332d44cb5cdc
+DIST gnome-games-3.2.1.tar.xz 22816376 SHA256 b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b
+DIST gnome-games-3.4.2.tar.xz 18578676 SHA256 25676285fad33a39da7fc26b5b1dc751c7981ae778b8fe82e8b7c0a367e5117c
+EBUILD gnome-games-2.28.2.ebuild 4867 SHA256 1d5ef22da78a4ef321747a7a7032f52dfec2fea1009138986cb5ef05be51bf65 SHA512 7f206fb13400eef30f1b5a603e8a9e9cfd5497027b14bb6c01a41f62a329072ba9cccbb9f77b061a54901ea6aaa9316c570f20568ea67c04adf69b01bb0a3a35 WHIRLPOOL ad0e1ed038e60a479427ad92d9c8fb4d944a25d1efae0db1e3cb184508df379e528c9559205d85107577781cb2ee6c62013427139f8d860757cbce367808ab69
+EBUILD gnome-games-3.2.1-r1.ebuild 5224 SHA256 2ae766afeeacdb949f451b559b33c8b15f26ee2fd7c048c4698ef2d870171bc4 SHA512 f805910cae553812da7fc8430b41b02376a2d7dfce6715e139ed98371add33854fd3c50fb52194f4a62e5325a28d77771be2ea7e0b10e8148f166fd7d0e6a1d9 WHIRLPOOL 93a39677672b8bdd09436e7ad4a7afdb7973fe5d82890a9c50d244b64223226b8b9082b85c9f59a505c5f4a50079f422d8725ef427b60988d052b09c1a542e05
+EBUILD gnome-games-3.4.2.ebuild 3914 SHA256 fecc784f447531457535814f2c8cc6ec0efc19de3d52584136de68a88dcb809f SHA512 b96f6f8ccca109ff838702518a48263efb71427b4196c861ba281fa6d69755015262115de677eb4a9033c0c89abcdcaa568c0ebf24e7965d8dc87512c5484464 WHIRLPOOL 396089220a5ba15b756723282b530d2651628d7a1a5aa4a39503611b4f70a7dbd28dc6090f6b8879ad9d76f4580f16f75f340c07df4e276cf4793ff6585a9ec5
+MISC ChangeLog 44816 SHA256 ceb32af9093804516e603aa87843a9a05d42fce2beed79fda01f610bb7e92385 SHA512 20b110877c55ad0714e7a007f0ff7fd2512776c813d1df0e41bfcb090f43f9793c78de51066d25bb190545d7828489cb93a4a76a2e703a6eb96d0f739164e035 WHIRLPOOL ad66a1ee632b54eb7b13ccce24e3c7fd2880401ac43a988717f8a5d3edf7d618fab1f55e356184ecd442eff91a6154c161e11056dd5ae481ac807e000f159175
+MISC metadata.xml 836 SHA256 b233cfdcd3311a14130163329fa9047c65a852526db63dd6c5002b0bcc6d490d SHA512 adb94f78b231d373cd109175a7d2c4ae3c598c5f8b9631ad07ae099eb52023e983a2a6b4dcdb49907720dc3c1e1906d8d900f5e77889cf773af717131fe610a1 WHIRLPOOL 5ef8b3a86e024ed1197be8f1490f22e5adabb3d45486830b581a6c5d78e9c6d32379a7ec9eed9a3fe74f6311fc293b7f4c1981e7b27fce49851b9f1a22402e84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPuKpPAAoJEJ0WA1zPCt1hRj0IAJW0Gk2vBhKr4RNVzdrHQ4Hn
-athvmN5NYsUsm4k2Lkugkl4jzzGu878dZnWPvSf6M5HB6ZVvU/v1n7UDfBDo9vxw
-D/JbzmVLZmDyzkI4inAkfaknlWX9BVF4mtVZOP0ZIJtjO8z+RcBHmf7K+yPEjJK8
-w2mtepyLg6/mFuBI3Dkp4NZeRa8YWSs60s2+zLj+Q7gFJjD4S4e8JoTjdThQujVW
-LsTpxZrewVtCaqudYEbotjxwjlfrVkwPWBcElar79OKLmPkIf58x/we/eJUfetxZ
-FIrsKnPpGw1UD/q6OW5QkGQAxk5TcrO088Z6M2nLFWCKHrfInlSo20CpCGFPAXQ=
-=5YEg
+iEYEARECAAYFAk/4KHoACgkQCaWpQKGI+9TytQCgiHhUtaINbBVoSuZr2eytueiI
+LbwAnj1xfdHsHGHzS6By8WSUsWTxu/V7
+=YAIN
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild b/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild
index d5272f279760..61f2d8786974 100644
--- a/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 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.28.2.ebuild,v 1.13 2012/05/05 06:25:20 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild,v 1.14 2012/07/07 12:15:48 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 WANT_AUTOMAKE="1.11"
 PYTHON_DEPEND="2"
 
@@ -119,8 +120,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# disable pyc compiling
-	echo > py-compile
+	python_clean_py-compile_files
+	python_convert_shebangs -r 2 .
 
 	# Fix implicit declaration of yylex.
 	epatch "${FILESDIR}/${PN}-2.26.3-implicit-declaration.patch"
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
deleted file mode 100644
index 0c10c8aeaee9..000000000000
--- a/gnome-extra/gnome-games/gnome-games-2.30.2-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2012 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.16 2012/05/05 06:25:20 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.11"
-PYTHON_DEPEND="2"
-
-# 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"
-
-# 2.30.x versions are not ready to go to stable, please confirm before changing KEYWORDS
-KEYWORDS="alpha ~amd64 ~arm ia64 ppc ppc64 sh sparc ~x86 ~x86-fbsd"
-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,
-# we'll have to enable it unconditionally because we have no sane way of
-# representing inter-use-flag dependencies
-COMMON_DEPEND="
-	>=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:2
-	>=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:2
-	>=gnome-base/librsvg-2.14:2
-	media-libs/libcanberra[gtk]
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-2.16:2
-	x11-libs/libSM
-
-	artworkextra? ( gnome-extra/gnome-games-extra-data )
-	clutter? (
-		>=dev-libs/gobject-introspection-0.6.3
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.10.2:0.10 )
-	guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
-	opengl? (
-		dev-python/pygtkglext
-		>=dev-python/pyopengl-3 )
-	!games-board/glchess"
-RDEPEND="${COMMON_DEPEND}
-	clutter? (
-		dev-libs/seed
-		x11-libs/gtk+:2[introspection]
-		>=media-libs/clutter-1.0.0:1.0[introspection]
-		>=media-libs/clutter-gtk-0.10.2:0.10[introspection] )"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/autoconf-2.53
-	virtual/pkgconfig
-	>=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() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	# create the games user / group
-	games_pkg_setup
-
-	G2CONF="${G2CONF}
-		$(use_enable clutter introspection)
-		--disable-aisleriot-clutter
-		--disable-card-themes-installer
-		--enable-sound
-		--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
-
-	if ! use clutter; then
-		ewarn "USE=-clutter means no quadrapassel, lightsoff, swell-foop, gnibbles"
-		_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
-	echo > 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 gnome_sudoku
-	if use opengl; then
-		python_mod_optimize glchess
-	fi
-}
-
-pkg_postrm() {
-	games-ggz_update_modules
-	gnome2_pkg_postrm
-	python_mod_cleanup gnome_sudoku
-	if use opengl; then
-		python_mod_cleanup glchess
-	fi
-}
diff --git a/gnome-extra/gnome-games/gnome-games-2.30.2-r2.ebuild b/gnome-extra/gnome-games/gnome-games-2.30.2-r2.ebuild
deleted file mode 100644
index 38852e73d74a..000000000000
--- a/gnome-extra/gnome-games/gnome-games-2.30.2-r2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2012 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-r2.ebuild,v 1.3 2012/05/05 06:25:20 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.11"
-PYTHON_DEPEND="2"
-
-# 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"
-
-# 2.30.x versions are not ready to go to stable, please confirm before changing KEYWORDS
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-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,
-# we'll have to enable it unconditionally because we have no sane way of
-# representing inter-use-flag dependencies
-COMMON_DEPEND="
-	>=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:2
-	>=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:2
-	>=gnome-base/librsvg-2.14:2
-	media-libs/libcanberra[gtk]
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-2.16:2
-	x11-libs/libSM
-
-	artworkextra? ( gnome-extra/gnome-games-extra-data )
-	clutter? (
-		>=dev-libs/gobject-introspection-0.6.3
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.10.2:0.10 )
-	guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
-	opengl? (
-		dev-python/pygtkglext
-		>=dev-python/pyopengl-3 )
-	!games-board/glchess"
-RDEPEND="${COMMON_DEPEND}
-	clutter? (
-		dev-libs/seed
-		x11-libs/gtk+:2[introspection]
-		>=media-libs/clutter-1.0.0:1.0[introspection]
-		>=media-libs/clutter-gtk-0.10.2:0.10[introspection] )"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/autoconf-2.53
-	virtual/pkgconfig
-	>=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() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	# create the games user / group
-	games_pkg_setup
-
-	G2CONF="${G2CONF}
-		$(use_enable clutter introspection)
-		--disable-aisleriot-clutter
-		--disable-card-themes-installer
-		--enable-sound
-		--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
-
-	if ! use clutter; then
-		ewarn "USE=-clutter means no quadrapassel, lightsoff, swell-foop, gnibbles"
-		_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
-
-	python_convert_shebangs -r 2 gnome-sudoku/src
-
-	# disable pyc compiling
-	echo > 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 gnome_sudoku
-	if use opengl; then
-		python_mod_optimize glchess
-	fi
-}
-
-pkg_postrm() {
-	games-ggz_update_modules
-	gnome2_pkg_postrm
-	python_mod_cleanup gnome_sudoku
-	if use opengl; then
-		python_mod_cleanup glchess
-	fi
-}
diff --git a/gnome-extra/gnome-games/gnome-games-3.2.1.ebuild b/gnome-extra/gnome-games/gnome-games-3.2.1.ebuild
deleted file mode 100644
index 62c14350e6b4..000000000000
--- a/gnome-extra/gnome-games/gnome-games-3.2.1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-3.2.1.ebuild,v 1.5 2012/05/05 06:25:20 jdhore Exp $
-
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-WANT_AUTOMAKE="1.11"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-
-# make sure games is inherited first so that the gnome2
-# functions will be called if they are not overridden
-inherit autotools games eutils gnome2 python virtualx
-
-DESCRIPTION="Collection of games for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/GnomeGames/"
-
-LICENSE="GPL-2 GPL-3 FDL-1.1"
-SLOT="0"
-# TODO: file KEYWORDREQ bug once it's determined that seed is usable
-KEYWORDS="~amd64 ~x86"
-IUSE="artworkextra +aisleriot +clutter +introspection glchess seed +sudoku test"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.75
-	>=dev-libs/glib-2.25.7
-	>=dev-libs/libxml2-2.4.0
-	>=gnome-base/gconf-2.31.1
-	>=gnome-base/librsvg-2.32
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-
-	media-libs/libcanberra[gtk3]
-	x11-libs/libSM
-
-	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3.0.0 )
-	clutter? (
-		>=dev-libs/gobject-introspection-0.6.3
-		>=x11-libs/gtk+-2.90:3[introspection]
-		>=gnome-base/gconf-2.31.1[introspection]
-		>=media-libs/clutter-gtk-0.91.6:1.0[introspection]
-		seed? ( >=dev-libs/seed-2.91.90 ) )
-	introspection? (
-		>=dev-libs/gobject-introspection-0.6.3
-		media-libs/clutter:1.0[introspection] )
-	glchess? (
-		dev-db/sqlite:3
-		>=gnome-base/librsvg-2.32
-		virtual/opengl
-		x11-libs/libX11 )"
-RDEPEND="${COMMON_DEPEND}
-	sudoku? (
-		|| (
-			dev-python/pygobject:3[cairo]
-			>=dev-python/pygobject-2.28.3:2[cairo,introspection] )
-		dev-python/pycairo
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/pango[introspection]
-		>=x11-libs/gtk+-3.0.0:3[introspection] )
-
-	!<gnome-extra/gnome-games-extra-data-3.0.0"
-DEPEND="${COMMON_DEPEND}
-	glchess? ( >=dev-lang/vala-0.13.0:0.14 )
-	virtual/pkgconfig
-	>=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 )"
-
-# For compatibility with older versions of the gnome-games package
-PDEPEND="aisleriot? ( games-board/aisleriot )"
-
-# Others are installed below; multiples in this package.
-DOCS="AUTHORS HACKING MAINTAINERS TODO"
-
-_omitgame() {
-	G2CONF="${G2CONF},${1}"
-}
-
-pkg_setup() {
-	# create the games user / group
-	games_pkg_setup
-
-	python_set_active_version 2
-	python_pkg_setup
-
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--enable-sound
-		$(use_enable introspection)"
-
-	# Should be after $(use_enable introspection), but before --enable-omitgames
-	use clutter && G2CONF="${G2CONF} --enable-introspection"
-
-	use glchess && G2CONF="${G2CONF} VALAC=$(type -p valac-0.14)"
-
-	# Staging games are needed for swell-foop and lightsoff
-	G2CONF="${G2CONF}
-		--enable-staging
-		--with-scores-group=${GAMES_GROUP}
-		--with-platform=gnome
-		--with-smclient
-		--with-gtk=3.0
-		--enable-omitgames=none" # This line should be last for _omitgame
-
-	# FIXME: Use REQUIRED_USE once games.eclass is ported to EAPI 4
-	if ! use clutter; then
-		ewarn "USE='-clutter' => quadrapassel, swell-foop, lightsoff, gnibbles won't be installed"
-		_omitgame quadrapassel
-		_omitgame gnibbles
-		_omitgame swell-foop
-		_omitgame lightsoff
-		use seed && ewarn "USE='seed' has no effect with USE='-clutter'"
-	elif ! use seed; then
-		ewarn "USE='-seed' => swell-foop, lightsoff won't be installed"
-		_omitgame swell-foop
-		_omitgame lightsoff
-	fi
-
-	if ! use glchess; then
-		_omitgame glchess
-	fi
-
-	if ! use sudoku; then
-		_omitgame gnome-sudoku
-	fi
-}
-
-src_prepare() {
-	use sudoku && python_convert_shebangs -r 2 gnome-sudoku/src
-
-	# TODO: File upstream bug for this
-	epatch "${FILESDIR}/${PN}-2.91.90-fix-conditional-ac-prog-cxx.patch"
-
-	# Without this, --enable-staging enables all those games unconditionally
-	epatch "${FILESDIR}/${PN}-fix-staging-games.patch"
-
-	eautoreconf
-
-	# disable pyc compiling
-	echo > py-compile
-
-	gnome2_src_prepare
-}
-
-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 "${ED}"/var/lib/games/*.scores; do
-		basefile=$(basename $scorefile)
-		if [ -s "${EROOT}/var/lib/games/${basefile}" ]; then
-			cp "${EROOT}/var/lib/games/${basefile}" \
-			"${ED}/var/lib/games/${basefile}"
-		fi
-	done
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_pkg_postinst
-	python_need_rebuild
-	use sudoku && python_mod_optimize gnome_sudoku
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup gnome_sudoku
-}