1 |
commit: 5f91463ce08bba389425a9b806b914e267bfa8d9 |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 5 21:42:46 2016 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 5 21:55:20 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5f91463c |
7 |
|
8 |
games-board/aisleriot: 3.18.2 → 3.20.2 |
9 |
|
10 |
games-board/aisleriot/aisleriot-3.18.2.ebuild | 89 ---------------------- |
11 |
...eriot-3.16.2.ebuild => aisleriot-3.20.2.ebuild} | 14 ++-- |
12 |
games-board/aisleriot/aisleriot-9999.ebuild | 2 +- |
13 |
3 files changed, 8 insertions(+), 97 deletions(-) |
14 |
|
15 |
diff --git a/games-board/aisleriot/aisleriot-3.18.2.ebuild b/games-board/aisleriot/aisleriot-3.18.2.ebuild |
16 |
deleted file mode 100644 |
17 |
index e7535d4..0000000 |
18 |
--- a/games-board/aisleriot/aisleriot-3.18.2.ebuild |
19 |
+++ /dev/null |
20 |
@@ -1,89 +0,0 @@ |
21 |
-# Copyright 1999-2015 Gentoo Foundation |
22 |
-# Distributed under the terms of the GNU General Public License v2 |
23 |
-# $Id$ |
24 |
- |
25 |
-EAPI="5" |
26 |
-GCONF_DEBUG="yes" |
27 |
- |
28 |
-inherit autotools eutils gnome-games |
29 |
- |
30 |
-DESCRIPTION="A collection of solitaire card games for GNOME" |
31 |
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot" |
32 |
- |
33 |
-LICENSE="GPL-3 LGPL-3 FDL-1.1" |
34 |
-SLOT="0" |
35 |
-KEYWORDS="~amd64 ~x86" |
36 |
-IUSE="gnome qt4" |
37 |
- |
38 |
-# FIXME: quartz support? |
39 |
-# Does not build with guile-2.0.0 or 2.0.1 |
40 |
-COMMON_DEPEND=" |
41 |
- >=dev-libs/glib-2.32:2 |
42 |
- >=dev-scheme/guile-2.0.5:2[deprecated,regex] |
43 |
- >=gnome-base/librsvg-2.32:2 |
44 |
- >=media-libs/libcanberra-0.26[gtk3] |
45 |
- >=x11-libs/cairo-1.10 |
46 |
- >=x11-libs/gtk+-3.4:3 |
47 |
- gnome? ( >=gnome-base/gconf-2.0:2 ) |
48 |
- qt4? ( >=dev-qt/qtsvg-4.4:4 ) |
49 |
-" |
50 |
-DEPEND="${COMMON_DEPEND} |
51 |
- app-arch/gzip |
52 |
- dev-libs/libxml2 |
53 |
- >=dev-util/intltool-0.40.4 |
54 |
- dev-util/itstool |
55 |
- sys-apps/lsb-release |
56 |
- >=sys-devel/gettext-0.12 |
57 |
- virtual/pkgconfig |
58 |
- gnome? ( app-text/docbook-xml-dtd:4.3 ) |
59 |
-" |
60 |
-# dev-util/itstool really needed for help file generation |
61 |
-# >=app-text/yelp-tools-3.1.1 |
62 |
- |
63 |
-src_prepare() { |
64 |
- # Fix SVG detection and usage |
65 |
- epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch |
66 |
- |
67 |
- eautoreconf |
68 |
- gnome2_src_prepare |
69 |
-} |
70 |
- |
71 |
-src_configure() { |
72 |
- local myconf=() |
73 |
- |
74 |
- if use gnome; then |
75 |
- myconf+=( |
76 |
- --with-platform=gnome |
77 |
- --with-help-method=ghelp |
78 |
- ) |
79 |
- else |
80 |
- myconf+=( |
81 |
- --with-platform=gtk-only |
82 |
- --with-help-method=library |
83 |
- ) |
84 |
- fi |
85 |
- |
86 |
- if use qt4 ; then |
87 |
- myconf+=( |
88 |
- --with-card-theme-formats=all |
89 |
- --with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks |
90 |
- ) |
91 |
- else |
92 |
- myconf+=( --with-card-theme-formats=svg,fixed,pysol ) |
93 |
- fi |
94 |
- |
95 |
- gnome2_src_configure \ |
96 |
- --with-gtk=3.0 \ |
97 |
- --with-guile=2.0 \ |
98 |
- --enable-sound \ |
99 |
- --with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \ |
100 |
- GUILE=$(type -P guile-2.0) \ |
101 |
- ${myconf[@]} |
102 |
-} |
103 |
- |
104 |
-pkg_postinst() { |
105 |
- gnome2_pkg_postinst |
106 |
- |
107 |
- elog "Aisleriot can use additional card themes from games-board/pysolfc" |
108 |
- elog "and kde-base/libkdegames." |
109 |
-} |
110 |
|
111 |
diff --git a/games-board/aisleriot/aisleriot-3.16.2.ebuild b/games-board/aisleriot/aisleriot-3.20.2.ebuild |
112 |
similarity index 87% |
113 |
rename from games-board/aisleriot/aisleriot-3.16.2.ebuild |
114 |
rename to games-board/aisleriot/aisleriot-3.20.2.ebuild |
115 |
index e7535d4..dc2b6e1 100644 |
116 |
--- a/games-board/aisleriot/aisleriot-3.16.2.ebuild |
117 |
+++ b/games-board/aisleriot/aisleriot-3.20.2.ebuild |
118 |
@@ -1,11 +1,10 @@ |
119 |
-# Copyright 1999-2015 Gentoo Foundation |
120 |
+# Copyright 1999-2016 Gentoo Foundation |
121 |
# Distributed under the terms of the GNU General Public License v2 |
122 |
# $Id$ |
123 |
|
124 |
-EAPI="5" |
125 |
-GCONF_DEBUG="yes" |
126 |
+EAPI=6 |
127 |
|
128 |
-inherit autotools eutils gnome-games |
129 |
+inherit autotools gnome2 |
130 |
|
131 |
DESCRIPTION="A collection of solitaire card games for GNOME" |
132 |
HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot" |
133 |
@@ -13,13 +12,13 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot" |
134 |
LICENSE="GPL-3 LGPL-3 FDL-1.1" |
135 |
SLOT="0" |
136 |
KEYWORDS="~amd64 ~x86" |
137 |
-IUSE="gnome qt4" |
138 |
+IUSE="debug gnome qt4" |
139 |
|
140 |
# FIXME: quartz support? |
141 |
# Does not build with guile-2.0.0 or 2.0.1 |
142 |
COMMON_DEPEND=" |
143 |
>=dev-libs/glib-2.32:2 |
144 |
- >=dev-scheme/guile-2.0.5:2[deprecated,regex] |
145 |
+ >=dev-scheme/guile-2.0.5:12[deprecated,regex] |
146 |
>=gnome-base/librsvg-2.32:2 |
147 |
>=media-libs/libcanberra-0.26[gtk3] |
148 |
>=x11-libs/cairo-1.10 |
149 |
@@ -42,7 +41,7 @@ DEPEND="${COMMON_DEPEND} |
150 |
|
151 |
src_prepare() { |
152 |
# Fix SVG detection and usage |
153 |
- epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch |
154 |
+ eapply "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch |
155 |
|
156 |
eautoreconf |
157 |
gnome2_src_prepare |
158 |
@@ -75,6 +74,7 @@ src_configure() { |
159 |
gnome2_src_configure \ |
160 |
--with-gtk=3.0 \ |
161 |
--with-guile=2.0 \ |
162 |
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \ |
163 |
--enable-sound \ |
164 |
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \ |
165 |
GUILE=$(type -P guile-2.0) \ |
166 |
|
167 |
diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild |
168 |
index a60876e..535d6b4 100644 |
169 |
--- a/games-board/aisleriot/aisleriot-9999.ebuild |
170 |
+++ b/games-board/aisleriot/aisleriot-9999.ebuild |
171 |
@@ -26,7 +26,7 @@ IUSE="gnome qt4" |
172 |
# Does not build with guile-2.0.0 or 2.0.1 |
173 |
COMMON_DEPEND=" |
174 |
>=dev-libs/glib-2.32:2 |
175 |
- >=dev-scheme/guile-2.0.5:2[deprecated,regex] |
176 |
+ >=dev-scheme/guile-2.0.5:12[deprecated,regex] |
177 |
>=gnome-base/librsvg-2.32:2 |
178 |
>=media-libs/libcanberra-0.26[gtk3] |
179 |
>=x11-libs/cairo-1.10 |