From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SXU6l-0006P5-5q for garchives@archives.gentoo.org; Thu, 24 May 2012 09:13:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FD88E0A59; Thu, 24 May 2012 09:12:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D610EE0AFA for ; Thu, 24 May 2012 09:12:05 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05C331B4066 for ; Thu, 24 May 2012 09:12:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DFDDFE5438 for ; Thu, 24 May 2012 09:12:00 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1337850483.0bbd5345a25b6228cc72654476dc2201f917c715.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-games/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/gnome-games/gnome-games-3.4.0.ebuild gnome-extra/gnome-games/gnome-games-9999.ebuild X-VCS-Directories: gnome-extra/gnome-games/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 0bbd5345a25b6228cc72654476dc2201f917c715 X-VCS-Branch: master Date: Thu, 24 May 2012 09:12:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 0d5d3b0c-9e3a-4eba-9f4d-1049ab4ca641 X-Archives-Hash: 73202be4febc3ea7b5c04dfd3e04459b commit: 0bbd5345a25b6228cc72654476dc2201f917c715 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Thu May 24 09:08:03 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Thu May 24 09:08:03 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D0bbd5345 gnome-extra/gnome-games: moved to gx86; add live ebuild --- ...-games-3.4.0.ebuild =3D> gnome-games-9999.ebuild} | 47 +++++++++---= ------- 1 files changed, 22 insertions(+), 25 deletions(-) diff --git a/gnome-extra/gnome-games/gnome-games-3.4.0.ebuild b/gnome-ext= ra/gnome-games/gnome-games-9999.ebuild similarity index 77% rename from gnome-extra/gnome-games/gnome-games-3.4.0.ebuild rename to gnome-extra/gnome-games/gnome-games-9999.ebuild index 8063193..811328e 100644 --- a/gnome-extra/gnome-games/gnome-games-3.4.0.ebuild +++ b/gnome-extra/gnome-games/gnome-games-9999.ebuild @@ -1,6 +1,6 @@ # 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-r1.ebuild,v 1.3 2012/02/10 03:33:26 patrick Exp $ +# $Header: $ =20 EAPI=3D"3" GNOME_TARBALL_SUFFIX=3D"xz" @@ -12,7 +12,10 @@ PYTHON_USE_WITH=3D"xml" =20 # 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 +inherit games gnome2 python virtualx +if [[ ${PV} =3D 9999 ]]; then + inherit gnome2-live +fi =20 DESCRIPTION=3D"Collection of games for the GNOME desktop" HOMEPAGE=3D"http://live.gnome.org/GnomeGames/" @@ -20,7 +23,11 @@ HOMEPAGE=3D"http://live.gnome.org/GnomeGames/" LICENSE=3D"GPL-2 GPL-3 FDL-1.1" SLOT=3D"0" # TODO: file KEYWORDREQ bug once it's determined that seed is usable -KEYWORDS=3D"~amd64 ~x86" +if [[ ${PV} =3D 9999 ]]; then + KEYWORDS=3D"" +else + KEYWORDS=3D"~amd64 ~x86" +fi IUSE=3D"artworkextra +aisleriot +clutter +glchess +introspection +sudoku= test" =20 COMMON_DEPEND=3D" @@ -28,43 +35,39 @@ COMMON_DEPEND=3D" >=3Ddev-libs/glib-2.25.7 >=3Ddev-libs/libxml2-2.4.0 >=3Dgnome-base/librsvg-2.32 - >=3Dx11-libs/cairo-1.10.0 + >=3Dx11-libs/cairo-1.10 >=3Dx11-libs/gtk+-3.3.11:3[introspection?] =20 >=3Dmedia-libs/libcanberra-0.26[gtk3] =20 artworkextra? ( >=3Dgnome-extra/gnome-games-extra-data-3.0.0 ) clutter? ( - >=3Ddev-libs/gobject-introspection-0.6.3 - x11-libs/gtk+:3[introspection] - >=3Dmedia-libs/clutter-gtk-0.91.6:1.0[introspection] ) + media-libs/clutter:1.0 + >=3Dmedia-libs/clutter-gtk-0.91.6:1.0 ) introspection? ( - >=3Ddev-libs/gobject-introspection-0.6.3 + >=3Ddev-libs/gobject-introspection-0.9.10 media-libs/clutter:1.0[introspection] ) glchess? ( dev-db/sqlite:3 - >=3Dgnome-base/librsvg-2.32 virtual/opengl x11-libs/libX11 )" RDEPEND=3D"${COMMON_DEPEND} sudoku? ( - || ( - dev-python/pygobject:3[cairo] - >=3Ddev-python/pygobject-2.28.3:2[cairo,introspection] ) dev-python/pycairo + dev-python/pygobject:3[cairo] x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] >=3Dx11-libs/gtk+-3.0.0:3[introspection] ) =20 !=3Dapp-text/gnome-doc-utils-0.10 >=3Ddev-lang/vala-0.15.1:0.16 dev-libs/libxml2:2 - dev-util/itstool >=3Ddev-util/intltool-0.40.4 + dev-util/itstool >=3Dsys-devel/gettext-0.10.40 virtual/pkgconfig - >=3Dgnome-base/gnome-common-2.12.0 test? ( >=3Ddev-libs/check-0.9.4 )" =20 # For compatibility with older versions of the gnome-games package @@ -88,10 +91,7 @@ pkg_setup() { --disable-schemas-compile --disable-static $(use_enable introspection) - VALAC=3D$(type -p valac-0.16)" - - # Should be after $(use_enable introspection), but before --enable-omit= games - #use clutter && G2CONF=3D"${G2CONF} --enable-introspection" + VALAC=3D$(type -P valac-0.16)" =20 G2CONF=3D"${G2CONF} --with-scores-group=3D${GAMES_GROUP} @@ -117,13 +117,10 @@ pkg_setup() { } =20 src_prepare() { - use sudoku && python_convert_shebangs -r 2 gnome-sudoku/src - - # Without this, --enable-staging enables all those games unconditionall= y - #epatch "${FILESDIR}/${PN}-fix-staging-games.patch" - - # disable pyc compiling - echo > py-compile + if use sudoku; then + python_convert_shebangs -r 2 gnome-sudoku/src + python_clean_py-compile_files + fi =20 gnome2_src_prepare }