Version bump for Gnome 3.6. Switch to EAPI=5 and python-r1.eclass.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 199 insertions, 12 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 02e77c1e0330..a86b0cdd637e 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.325 2012/12/10 02:06:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.326 2012/12/25 21:23:16 eva Exp $
+
+*gnome-games-3.6.1-r1 (25 Dec 2012)
+
+  25 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-games-3.6.1-r1.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Switch to EAPI=5 and python-r1.eclass.
 
   10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -gnome-games-3.2.1-r1.ebuild, -files/gnome-games-3.2.1-pygobject-3.0.3.patch,
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index f95b66e2a2ca..c7c998e58540 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -10,18 +10,16 @@ AUX gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch 633 SHA256 902c85ff3f0
 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.4.2.tar.xz 18578676 SHA256 25676285fad33a39da7fc26b5b1dc751c7981ae778b8fe82e8b7c0a367e5117c SHA512 56b8ec7d309a051f33fedb79b75e94a8ca7a67aade149c0e6987503a1dfb0936778286d8b7aed715078751a5a6b162c6685d0d7a710c3a34aebb8497d2a35f28 WHIRLPOOL 57e0c1ce6f3c964eda085dd9789da8dd6141c0f4aa74de5a66ef41aa202b1b1a09945f53bae2291b9449fc575b9e16931f9b988ea8a6d0711af47f4f284aafb3
+DIST gnome-games-3.6.1.tar.xz 19404796 SHA256 f016068350ca2a4deceeac0374d5372610b1da07e2c4b356470f3401e6e2a43d SHA512 d49cca60c6141bd1a1a5b097973d02d343c14dc6d518225611d23a16ccfb871d8f06ec0cc33598fd61ee3feeecc333a7d7d67fd3feefef42e13f28377ff9d968 WHIRLPOOL 8358242c736a7fbe209331efff00aa91c5b568aa385b41516e1a6b3db0e9c1993f7792ded0c94c4d089d2605d537c5447c71dcd4f9318a59226c545dd3dc1120
 EBUILD gnome-games-2.28.2.ebuild 5051 SHA256 8ec1051fa1cf2a53b1a47922edff7134df812246b15e552febbbccda44587688 SHA512 e78c5df8d263124f8f9f4dd0168c42d5c536f06127ff9aafe3b597f06a6cf9b42fd88e92e0eff477fae03aa60b3f8c71df46641f5c23b6b7eb10f435f07e4264 WHIRLPOOL c9d2e9417bc458e72fe396379ed5fa8e1ef843cb12f9262205190554d9cef779819a902dd1f50aa2ecae3766877b903779e3cd7f958ac23053b56dea91fbc2d3
 EBUILD gnome-games-3.4.2.ebuild 3959 SHA256 41b0999d517d7b3a0487f34f8815df02719881e1444082a2a23823b02bcbe0ce SHA512 f63fb316c844d73f307399acb14a2ed60d607bb91e7d688c7080c863382fa5c9c49d2dff63f81e33692e4cb9b1efc4c7f789397d41bd749252bbb61655f15476 WHIRLPOOL aed70ce5a447c8e57036162c96c58a1f5552f13d533cd512db879df1b5dfabf2e76abacbf8dc3339db1f372ff842a6da69630eb95bd54235c7fdc06c39fb62ed
-MISC ChangeLog 45904 SHA256 99c7d23e8c9661867e4e34181f3e733c0220ce731132ec842dfeee492668911d SHA512 1a3f22802d7bc74e92a9ebc6e4bad8100af9bb7d305e3082607ce46e88e6825dbede7facd385b2a3a2d75dc5feb97e9c772d376b6bd3c7128d2f5cd2923caf65 WHIRLPOOL c314117c18f543cb0805611383c4f97e47f9fd4ca45a53dab3db6cf9701b5b44da782eb73be2302c10fcbad6511c9fee33cce8feea1c85aaa9877021088ecb02
-MISC metadata.xml 711 SHA256 7709d6e0801152495f56e4c1cf724fecdd200c64a9f1ba1100c89bab553bdd61 SHA512 628dd898a4ea7f61216e830d97c282064ce7bd766dd5f852c5875f0d38813429ab75189a2ad8dd3d83811ce95c5d65f652263feaf470da56b29e6c9f3d6dff03 WHIRLPOOL eb0991954d849f92e26ee2fb1a4db7511ed3451635865622404e46b7782fd24684591805d61139e7336aadebad2ee0eaf3a4471333c61e644b4df72b307e2b82
+EBUILD gnome-games-3.6.1-r1.ebuild 4287 SHA256 a810f2049eb068bd2b0965a42b149cb8dbd9ff7a0d51bdf5d38ecbeb04345834 SHA512 529dbe6c982e86cd379037c2fca06edb4bd432025c429863bf1d2effe2f9b3becbd6449a22388be4f8a47c6a2ef77a08e53acdc8fed3a6ec5dca8074a8f767cd WHIRLPOOL 229bd0d424061fb4c26f7adbbc3a3366663066734cc706d1262214c9e43ac690878a06e64e5abc2387c17b5073d9fc91fa89ada4e6b7f30ac647d7a1624a2024
+MISC ChangeLog 46105 SHA256 3e306f8c14178c5a073b292d0320309562582671da3cd3447d57f18a2d3449e3 SHA512 0de1f13bbbaebe05902802d27dde68f09373ae4f15f10aae725226300c5a894586fd1e8e1992e5bdf141cb0c79be8e86b5db0066730702dd80821eab7055bf17 WHIRLPOOL 5823efdc081f4850b1c5e5fd7434e36ac225342f8f7b53904ac25b630c97af433774fc66746784569110297ec1b27d9fdd88aafc8f93d6392518d1cf76cacf64
+MISC metadata.xml 610 SHA256 adf8df228420107011c2c9df4e2aa0d627730741eb2b6b6423aecde533d5cac9 SHA512 e22ca996faf3442eeb0f44b10990b4a22ba0f466470481ca67229bd7b2b766a7e6fb6e555dd4362d1ce1860ef322b43e401b0eb4989fe8eb3c90a5fa7a8c08dc WHIRLPOOL cccd4fbbccaa60dd6cbf15b6d4199d3155816d2b20d279f40a5162997f4966d4e5c6f74392bd93d52f8f4184421863cbad9fe85cf8c29c8ef769fa2f8272c404
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQxUOmAAoJEJ0WA1zPCt1hcZIH/2t/JgZ5XMOTxEkphrLKjXxq
-vHxiDCnD0olAN+abFucwUEmJVZPwlTP1/oziKj6/ahxJYK787YCDd0qY+PSMhJBM
-YiAfZY7xu6jIjD3pXzJ77A4gwUwzK683JieTSqirHULCuGDvenbo92TqBgn5sLIm
-GXJqsfv3DztZZSc1wFrVnEkmeV293B6K2n2LgXR0vZuBj+pZ6lmwRdVjg/JIieEu
-eG3Dvou4XzIC5DhWXJOV7kIgLcAGqvcqOIRVtUJYfDZaJXnPi0JBicTmxwNwAOO5
-x61ksE0Ut4jhZpr/u+Tvhdr88t6leWPWJB4RlgDpE8+CuBqjZxHo8ZWAtDEzVVE=
-=gRhM
+iEYEAREIAAYFAlDaGUUACgkQ1fmVwcYIWAZsrgCeP/H1+/naus6fVOqctKljGpdd
+SaAAniXhu6cUDTPX6cq+y4L2BuIW4l5h
+=yj/H
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-games/gnome-games-3.6.1-r1.ebuild b/gnome-extra/gnome-games/gnome-games-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..dfd575a0fe11
--- /dev/null
+++ b/gnome-extra/gnome-games/gnome-games-3.6.1-r1.ebuild
@@ -0,0 +1,185 @@
+# 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.6.1-r1.ebuild,v 1.1 2012/12/25 21:23:16 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="xml"
+
+# Make sure games is inherited first so that the gnome2
+# functions will be called if they are not overridden
+inherit games gnome2 python-r1 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 ~mips ~x86"
+
+# FIXME: we should decide whether to have USE flag for games or features
+# IUSE="artworkextra clutter opengl python test"
+# vs
+# IUSE="artworkextra aisleriot glchess quadrapassel swell-foop lightsoff gnibbles sudoku"
+IUSE="artworkextra +aisleriot +clutter +glchess +sudoku test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.25.7
+	>=gnome-base/librsvg-2.32
+	>=x11-libs/cairo-1.10
+	>=x11-libs/gtk+-3.3.11:3[introspection]
+
+	>=media-libs/libcanberra-0.26[gtk3]
+
+	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3 )
+	clutter? (
+		media-libs/clutter:1.0[introspection]
+		>=media-libs/clutter-gtk-0.91.6:1.0 )
+	glchess? (
+		dev-db/sqlite:3
+		virtual/glu
+		virtual/opengl
+		x11-libs/libX11 )
+	sudoku? ( dev-libs/gobject-introspection )
+"
+RDEPEND="${COMMON_DEPEND}
+	sudoku? (
+		${PYTHON_DEPS}
+		dev-python/pycairo
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/pango[introspection]
+		>=x11-libs/gtk+-3:3[introspection] )
+
+	!<gnome-extra/gnome-games-extra-data-3
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.4
+	dev-util/itstool
+	>=sys-devel/gettext-0.10.40
+	virtual/pkgconfig
+"
+
+# 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_pkg_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	if use sudoku ; then
+		python_copy_sources
+	fi
+}
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--disable-static
+		ITSTOOL=$(type -P true)
+		VALAC=$(type -P true)
+		--with-platform=gnome
+		--with-scores-group=${GAMES_GROUP}
+		--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
+	fi
+
+	if ! use glchess; then
+		_omitgame glchess
+	fi
+
+	if ! use sudoku; then
+		_omitgame gnome-sudoku
+	fi
+
+	if use sudoku ; then
+		python_foreach_impl run_in_build_dir gnome2_src_configure
+	else
+		gnome2_src_configure
+	fi
+}
+
+src_compile() {
+	if use sudoku ; then
+		python_foreach_impl run_in_build_dir gnome2_src_compile
+	else
+		gnome2_src_compile
+	fi
+}
+
+src_test() {
+	if use sudoku ; then
+		python_foreach_impl run_in_build_dir Xemake check
+	else
+		Xemake check || die "tests failed"
+	fi
+}
+
+src_install() {
+	if use sudoku ; then
+		install_python() {
+				gnome2_src_install
+				python_doscript gnome-sudoku/src/gnome-sudoku
+		}
+		python_foreach_impl run_in_build_dir install_python
+	else
+		gnome2_src_install
+	fi
+
+	# 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
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
diff --git a/gnome-extra/gnome-games/metadata.xml b/gnome-extra/gnome-games/metadata.xml
index 91a26b1bb134..2b1240e9bb87 100644
--- a/gnome-extra/gnome-games/metadata.xml
+++ b/gnome-extra/gnome-games/metadata.xml
@@ -8,8 +8,6 @@
 	<flag name="clutter">Install games that use <pkg>media-libs/clutter</pkg></flag>
 	<flag name="glchess">Install Chess written in <pkg>dev-lang/vala</pkg> and
 		OpenGL</flag>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		for introspection</flag>
 	<flag name="sudoku">Install the game Sudoku which uses
 		<pkg>dev-python/pygobject</pkg> and introspection</flag>
 </use>