1 |
commit: 9ef757b929d52fb50f01a18b3b6d42065c06dbc2 |
2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 22 14:51:53 2011 +0000 |
4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 22 14:52:45 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9ef757b9 |
7 |
|
8 |
gnome-extra/gnome-games: 2.91.5 -> 2.91.90 |
9 |
|
10 |
* Change use-flag names to specify the feature being enabled/disabled |
11 |
* Remove USE=sound, make it compulsory |
12 |
|
13 |
--- |
14 |
...ames-2.91.90-fix-conditional-ac-prog-cxx.patch} | 5 +- |
15 |
...es-2.91.5.ebuild => gnome-games-2.91.90.ebuild} | 50 +++++++++++--------- |
16 |
2 files changed, 30 insertions(+), 25 deletions(-) |
17 |
|
18 |
diff --git 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-ac-prog-cxx.patch |
19 |
similarity index 93% |
20 |
rename from gnome-extra/gnome-games/files/gnome-games-2.32.1-fix-conditional-ac-prog-cxx.patch |
21 |
rename to gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch |
22 |
index 1c4c76f..8f35064 100644 |
23 |
--- a/gnome-extra/gnome-games/files/gnome-games-2.32.1-fix-conditional-ac-prog-cxx.patch |
24 |
+++ b/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch |
25 |
@@ -9,10 +9,9 @@ Usually this means the macro was only invoked conditionally. |
26 |
|
27 |
When need_cxx=no because quadrapassel isn't being built. |
28 |
|
29 |
---- |
30 |
--- configure.in |
31 |
+++ configure.in |
32 |
-@@ -201,13 +201,12 @@ |
33 |
+@@ -227,6 +227,7 @@ |
34 |
PKG_PROG_PKG_CONFIG([0.15]) |
35 |
|
36 |
AC_PROG_CC |
37 |
@@ -20,6 +19,8 @@ When need_cxx=no because quadrapassel isn't being built. |
38 |
AC_PROG_CPP |
39 |
AC_PROG_LN_S |
40 |
AC_PROG_SED |
41 |
+@@ -236,8 +237,6 @@ |
42 |
+ fi |
43 |
|
44 |
if test "$need_cxx" = "yes"; then |
45 |
- AC_PROG_CXX |
46 |
|
47 |
diff --git a/gnome-extra/gnome-games/gnome-games-2.91.5.ebuild b/gnome-extra/gnome-games/gnome-games-2.91.90.ebuild |
48 |
similarity index 85% |
49 |
rename from gnome-extra/gnome-games/gnome-games-2.91.5.ebuild |
50 |
rename to gnome-extra/gnome-games/gnome-games-2.91.90.ebuild |
51 |
index 60017d9..a4a7b2e 100644 |
52 |
--- a/gnome-extra/gnome-games/gnome-games-2.91.5.ebuild |
53 |
+++ b/gnome-extra/gnome-games/gnome-games-2.91.90.ebuild |
54 |
@@ -17,24 +17,23 @@ HOMEPAGE="http://live.gnome.org/GnomeGames/" |
55 |
LICENSE="GPL-2 GPL-3 FDL-1.1" |
56 |
SLOT="0" |
57 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
58 |
-IUSE="artworkextra +clutter guile +introspection opengl seed +sound test" |
59 |
+IUSE="+aisleriot artworkextra +clutter +introspection glchess seed +sudoku test" |
60 |
|
61 |
-RDEPEND=" |
62 |
+COMMON_DEPEND=" |
63 |
>=dev-games/libggz-0.0.14 |
64 |
>=dev-games/ggz-client-libs-0.0.14 |
65 |
>=dev-libs/dbus-glib-0.75 |
66 |
>=dev-libs/glib-2.25.7 |
67 |
>=dev-libs/libxml2-2.4.0 |
68 |
- >=dev-python/gconf-python-2.17.3 |
69 |
- >=dev-python/pygobject-2 |
70 |
- >=dev-python/pygtk-2.14 |
71 |
- >=dev-python/pycairo-1 |
72 |
>=gnome-base/gconf-2.31.1 |
73 |
>=gnome-base/librsvg-2.32 |
74 |
>=x11-libs/cairo-1 |
75 |
- >=x11-libs/gtk+-2.90:3[introspection?] |
76 |
+ >=x11-libs/gtk+-2.91.7:3[introspection?] |
77 |
+ |
78 |
+ media-libs/libcanberra[gtk3] |
79 |
x11-libs/libSM |
80 |
|
81 |
+ aisleriot? ( >=dev-scheme/guile-1.6.5[deprecated,regex] ) |
82 |
artworkextra? ( gnome-extra/gnome-games-extra-data ) |
83 |
clutter? ( |
84 |
>=dev-libs/gobject-introspection-0.6.3 |
85 |
@@ -42,17 +41,22 @@ RDEPEND=" |
86 |
>=gnome-base/gconf-2.31.1[introspection] |
87 |
>=media-libs/clutter-gtk-0.91.6:1.0[introspection] |
88 |
seed? ( dev-libs/seed ) ) |
89 |
- guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] ) |
90 |
introspection? ( |
91 |
>=dev-libs/gobject-introspection-0.6.3 |
92 |
media-libs/clutter:1.0[introspection] ) |
93 |
- opengl? ( |
94 |
- dev-python/pygtkglext |
95 |
- >=dev-python/pyopengl-3 ) |
96 |
- sound? ( media-libs/libcanberra[gtk3] ) |
97 |
- !games-board/glchess" |
98 |
- |
99 |
-DEPEND="${RDEPEND} |
100 |
+ glchess? ( |
101 |
+ dev-db/sqlite:3 |
102 |
+ >=dev-lang/vala-0.11.6:0.12 |
103 |
+ >=gnome-base/librsvg-2.32 |
104 |
+ virtual/opengl |
105 |
+ x11-libs/libX11 )" |
106 |
+RDEPEND="${COMMON_DEPEND} |
107 |
+ sudoku? ( |
108 |
+ >=dev-python/gconf-python-2.17.3 |
109 |
+ >=dev-python/pygobject-2 |
110 |
+ >=dev-python/pygtk-2.14 |
111 |
+ >=dev-python/pycairo-1 )" |
112 |
+DEPEND="${COMMON_DEPEND} |
113 |
sys-apps/lsb-release |
114 |
>=dev-util/pkgconfig-0.15 |
115 |
>=dev-util/intltool-0.40.4 |
116 |
@@ -80,7 +84,7 @@ pkg_setup() { |
117 |
G2CONF="${G2CONF} |
118 |
--disable-maintainer-mode |
119 |
--disable-schemas-compile |
120 |
- $(use_enable sound) |
121 |
+ --enable-sound |
122 |
$(use_enable introspection)" |
123 |
|
124 |
# Should be after $(use_enable introspection), but before --enable-omitgames |
125 |
@@ -96,8 +100,6 @@ pkg_setup() { |
126 |
--with-gtk=3.0 |
127 |
--enable-omitgames=none" # This line should be last for _omitgame |
128 |
|
129 |
- # Needs seed, always disable till we can have that |
130 |
- |
131 |
if ! use clutter; then |
132 |
ewarn "USE='-clutter' => quadrapassel, swell-foop, lightsoff, gnibbles won't be installed" |
133 |
_omitgame quadrapassel |
134 |
@@ -111,22 +113,24 @@ pkg_setup() { |
135 |
_omitgame lightsoff |
136 |
fi |
137 |
|
138 |
- if ! use guile; then |
139 |
- ewarn "USE='-guile' => aisleriot won't be installed" |
140 |
+ if ! use aisleriot; then |
141 |
_omitgame aisleriot |
142 |
fi |
143 |
|
144 |
- if ! use opengl; then |
145 |
- ewarn "USE='-opengl' => glchess won't be installed" |
146 |
+ if ! use glchess; then |
147 |
_omitgame glchess |
148 |
fi |
149 |
+ |
150 |
+ if ! use sudoku; then |
151 |
+ _omitgame sudoku |
152 |
+ fi |
153 |
} |
154 |
|
155 |
src_prepare() { |
156 |
gnome2_src_prepare |
157 |
|
158 |
# TODO: File upstream bug for this |
159 |
- epatch "${FILESDIR}/${PN}-2.32.1-fix-conditional-ac-prog-cxx.patch" |
160 |
+ epatch "${FILESDIR}/${PN}-2.91.90-fix-conditional-ac-prog-cxx.patch" |
161 |
|
162 |
# Without this, --enable-staging enables all those games unconditionally |
163 |
epatch "${FILESDIR}/${PN}-fix-staging-games.patch" |