summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2018-11-28 14:02:54 +0100
committerGilles Dartiguelongue <eva@gentoo.org>2018-11-28 14:08:05 +0100
commit8e378e2ee36fffd0adbfd6d42382584930554273 (patch)
treef9d3cc608f9a2dd1c9ff9cdeb5541b14fdb32c2d
parentgnome-extra/gnome-color-manager: sync with ::gentoo (diff)
downloadgnome-8e378e2ee36fffd0adbfd6d42382584930554273.tar.gz
gnome-8e378e2ee36fffd0adbfd6d42382584930554273.tar.bz2
gnome-8e378e2ee36fffd0adbfd6d42382584930554273.zip
games-board/aisleriot: 3.22.5 → 3.22.7
Switch to guile-2.2. Drop unneeded USE-flag dependencies. Add missing glib-utils and libxml2 to DEPEND. Closes: https://bugs.gentoo.org/644068 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Manifest-Sign-Key: 0x5A56C8CD0C13248A Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
-rw-r--r--games-board/aisleriot/aisleriot-3.22.7.ebuild11
-rw-r--r--games-board/aisleriot/aisleriot-9999.ebuild11
2 files changed, 12 insertions, 10 deletions
diff --git a/games-board/aisleriot/aisleriot-3.22.7.ebuild b/games-board/aisleriot/aisleriot-3.22.7.ebuild
index 5f9a65ab..d103a6a9 100644
--- a/games-board/aisleriot/aisleriot-3.22.7.ebuild
+++ b/games-board/aisleriot/aisleriot-3.22.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,11 +15,10 @@ KEYWORDS="~amd64 ~x86"
IUSE="debug gnome qt5"
# FIXME: quartz support?
-# Does not build with guile-2.0.0 or 2.0.1
+# Lookup guile modules grep "use-modules" *.scm
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
- >=dev-scheme/guile-2.0.5:12[deprecated,regex]
- <dev-scheme/guile-2.1
+ >=dev-scheme/guile-2.2:12
>=gnome-base/librsvg-2.32:2
>=media-libs/libcanberra-0.26[gtk3]
>=x11-libs/cairo-1.10
@@ -30,6 +29,8 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
app-arch/gzip
app-text/yelp-tools
+ dev-libs/libxml2:2
+ dev-util/glib-utils
>=dev-util/intltool-0.40.4
gnome-base/gnome-common
sys-apps/lsb-release
@@ -72,7 +73,7 @@ src_configure() {
gnome2_src_configure \
--with-gtk=3.0 \
- --with-guile=2.0 \
+ --with-guile=2.2 \
$(usex debug --enable-debug=yes --enable-debug=minimum) \
--enable-sound \
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild
index 16094c91..3ace1d8e 100644
--- a/games-board/aisleriot/aisleriot-9999.ebuild
+++ b/games-board/aisleriot/aisleriot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,11 +22,10 @@ fi
IUSE="debug gnome qt5"
# FIXME: quartz support?
-# Does not build with guile-2.0.0 or 2.0.1
+# Lookup guile modules grep "use-modules" *.scm
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
- >=dev-scheme/guile-2.0.5:12[deprecated,regex]
- <dev-scheme/guile-2.1
+ >=dev-scheme/guile-2.2:12
>=gnome-base/librsvg-2.32:2
>=media-libs/libcanberra-0.26[gtk3]
>=x11-libs/cairo-1.10
@@ -37,6 +36,8 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
app-arch/gzip
app-text/yelp-tools
+ dev-libs/libxml2:2
+ dev-util/glib-utils
>=dev-util/intltool-0.40.4
gnome-base/gnome-common
sys-apps/lsb-release
@@ -79,7 +80,7 @@ src_configure() {
gnome2_src_configure \
--with-gtk=3.0 \
- --with-guile=2.0 \
+ --with-guile=2.2 \
$(usex debug --enable-debug=yes --enable-debug=minimum) \
--enable-sound \
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \