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 <gentoo-commits+bounces-318795-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Prtwl-0006YA-1y
for garchives@archives.gentoo.org; Tue, 22 Feb 2011 15:14:39 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0A617E05B1;
Tue, 22 Feb 2011 15:14:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id BAED9E05A5
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Feb 2011 15:14:30 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 14E921B4276
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Feb 2011 15:14:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 70EE78006A
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Feb 2011 15:14:29 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <9ef757b929d52fb50f01a18b3b6d42065c06dbc2.nirbheek@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-games/, gnome-extra/gnome-games/files/
X-VCS-Repository: proj/gnome
X-VCS-Files: gnome-extra/gnome-games/files/gnome-games-2.32.1-fix-conditional-ac-prog-cxx.patch gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch gnome-extra/gnome-games/gnome-games-2.91.5.ebuild gnome-extra/gnome-games/gnome-games-2.91.90.ebuild
X-VCS-Directories: gnome-extra/gnome-games/ gnome-extra/gnome-games/files/
X-VCS-Committer: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: 9ef757b929d52fb50f01a18b3b6d42065c06dbc2
Date: Tue, 22 Feb 2011 15:14:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 43f221a2bae32e737205dfa042563ab0
commit: 9ef757b929d52fb50f01a18b3b6d42065c06dbc2
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 14:51:53 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 14:52:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D=
commit;h=3D9ef757b9
gnome-extra/gnome-games: 2.91.5 -> 2.91.90
* Change use-flag names to specify the feature being enabled/disabled
* Remove USE=3Dsound, make it compulsory
---
...ames-2.91.90-fix-conditional-ac-prog-cxx.patch} | 5 +-
...es-2.91.5.ebuild =3D> gnome-games-2.91.90.ebuild} | 50 +++++++++++-=
--------
2 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.32.1-fix-conditi=
onal-ac-prog-cxx.patch b/gnome-extra/gnome-games/files/gnome-games-2.91.9=
0-fix-conditional-ac-prog-cxx.patch
similarity index 93%
rename from gnome-extra/gnome-games/files/gnome-games-2.32.1-fix-conditio=
nal-ac-prog-cxx.patch
rename to gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-condition=
al-ac-prog-cxx.patch
index 1c4c76f..8f35064 100644
--- a/gnome-extra/gnome-games/files/gnome-games-2.32.1-fix-conditional-ac=
-prog-cxx.patch
+++ b/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-a=
c-prog-cxx.patch
@@ -9,10 +9,9 @@ Usually this means the macro was only invoked conditiona=
lly.
=20
When need_cxx=3Dno because quadrapassel isn't being built.
=20
----
--- configure.in
+++ configure.in
-@@ -201,13 +201,12 @@
+@@ -227,6 +227,7 @@
PKG_PROG_PKG_CONFIG([0.15])
=20
AC_PROG_CC
@@ -20,6 +19,8 @@ When need_cxx=3Dno because quadrapassel isn't being bui=
lt.
AC_PROG_CPP
AC_PROG_LN_S
AC_PROG_SED
+@@ -236,8 +237,6 @@
+ fi
=20
if test "$need_cxx" =3D "yes"; then
- AC_PROG_CXX
diff --git a/gnome-extra/gnome-games/gnome-games-2.91.5.ebuild b/gnome-ex=
tra/gnome-games/gnome-games-2.91.90.ebuild
similarity index 85%
rename from gnome-extra/gnome-games/gnome-games-2.91.5.ebuild
rename to gnome-extra/gnome-games/gnome-games-2.91.90.ebuild
index 60017d9..a4a7b2e 100644
--- a/gnome-extra/gnome-games/gnome-games-2.91.5.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.91.90.ebuild
@@ -17,24 +17,23 @@ HOMEPAGE=3D"http://live.gnome.org/GnomeGames/"
LICENSE=3D"GPL-2 GPL-3 FDL-1.1"
SLOT=3D"0"
KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~=
x86-fbsd"
-IUSE=3D"artworkextra +clutter guile +introspection opengl seed +sound te=
st"
+IUSE=3D"+aisleriot artworkextra +clutter +introspection glchess seed +su=
doku test"
=20
-RDEPEND=3D"
+COMMON_DEPEND=3D"
>=3Ddev-games/libggz-0.0.14
>=3Ddev-games/ggz-client-libs-0.0.14
>=3Ddev-libs/dbus-glib-0.75
>=3Ddev-libs/glib-2.25.7
>=3Ddev-libs/libxml2-2.4.0
- >=3Ddev-python/gconf-python-2.17.3
- >=3Ddev-python/pygobject-2
- >=3Ddev-python/pygtk-2.14
- >=3Ddev-python/pycairo-1
>=3Dgnome-base/gconf-2.31.1
>=3Dgnome-base/librsvg-2.32
>=3Dx11-libs/cairo-1
- >=3Dx11-libs/gtk+-2.90:3[introspection?]
+ >=3Dx11-libs/gtk+-2.91.7:3[introspection?]
+
+ media-libs/libcanberra[gtk3]
x11-libs/libSM
=20
+ aisleriot? ( >=3Ddev-scheme/guile-1.6.5[deprecated,regex] )
artworkextra? ( gnome-extra/gnome-games-extra-data )
clutter? (
>=3Ddev-libs/gobject-introspection-0.6.3
@@ -42,17 +41,22 @@ RDEPEND=3D"
>=3Dgnome-base/gconf-2.31.1[introspection]
>=3Dmedia-libs/clutter-gtk-0.91.6:1.0[introspection]
seed? ( dev-libs/seed ) )
- guile? ( >=3Ddev-scheme/guile-1.6.5[deprecated,regex] )
introspection? (
>=3Ddev-libs/gobject-introspection-0.6.3
media-libs/clutter:1.0[introspection] )
- opengl? (
- dev-python/pygtkglext
- >=3Ddev-python/pyopengl-3 )
- sound? ( media-libs/libcanberra[gtk3] )
- !games-board/glchess"
-
-DEPEND=3D"${RDEPEND}
+ glchess? (
+ dev-db/sqlite:3
+ >=3Ddev-lang/vala-0.11.6:0.12
+ >=3Dgnome-base/librsvg-2.32
+ virtual/opengl
+ x11-libs/libX11 )"
+RDEPEND=3D"${COMMON_DEPEND}
+ sudoku? (
+ >=3Ddev-python/gconf-python-2.17.3
+ >=3Ddev-python/pygobject-2
+ >=3Ddev-python/pygtk-2.14
+ >=3Ddev-python/pycairo-1 )"
+DEPEND=3D"${COMMON_DEPEND}
sys-apps/lsb-release
>=3Ddev-util/pkgconfig-0.15
>=3Ddev-util/intltool-0.40.4
@@ -80,7 +84,7 @@ pkg_setup() {
G2CONF=3D"${G2CONF}
--disable-maintainer-mode
--disable-schemas-compile
- $(use_enable sound)
+ --enable-sound
$(use_enable introspection)"
=20
# Should be after $(use_enable introspection), but before --enable-omit=
games
@@ -96,8 +100,6 @@ pkg_setup() {
--with-gtk=3D3.0
--enable-omitgames=3Dnone" # This line should be last for _omitgame
=20
- # Needs seed, always disable till we can have that
-
if ! use clutter; then
ewarn "USE=3D'-clutter' =3D> quadrapassel, swell-foop, lightsoff, gnib=
bles won't be installed"
_omitgame quadrapassel
@@ -111,22 +113,24 @@ pkg_setup() {
_omitgame lightsoff
fi
=20
- if ! use guile; then
- ewarn "USE=3D'-guile' =3D> aisleriot won't be installed"
+ if ! use aisleriot; then
_omitgame aisleriot
fi
=20
- if ! use opengl; then
- ewarn "USE=3D'-opengl' =3D> glchess won't be installed"
+ if ! use glchess; then
_omitgame glchess
fi
+
+ if ! use sudoku; then
+ _omitgame sudoku
+ fi
}
=20
src_prepare() {
gnome2_src_prepare
=20
# TODO: File upstream bug for this
- epatch "${FILESDIR}/${PN}-2.32.1-fix-conditional-ac-prog-cxx.patch"
+ epatch "${FILESDIR}/${PN}-2.91.90-fix-conditional-ac-prog-cxx.patch"
=20
# Without this, --enable-staging enables all those games unconditionall=
y
epatch "${FILESDIR}/${PN}-fix-staging-games.patch"