commit: 5f91463ce08bba389425a9b806b914e267bfa8d9 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Mon Sep 5 21:42:46 2016 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Mon Sep 5 21:55:20 2016 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5f91463c
games-board/aisleriot: 3.18.2 → 3.20.2 games-board/aisleriot/aisleriot-3.18.2.ebuild | 89 ---------------------- ...eriot-3.16.2.ebuild => aisleriot-3.20.2.ebuild} | 14 ++-- games-board/aisleriot/aisleriot-9999.ebuild | 2 +- 3 files changed, 8 insertions(+), 97 deletions(-) diff --git a/games-board/aisleriot/aisleriot-3.18.2.ebuild b/games-board/aisleriot/aisleriot-3.18.2.ebuild deleted file mode 100644 index e7535d4..0000000 --- a/games-board/aisleriot/aisleriot-3.18.2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="yes" - -inherit autotools eutils gnome-games - -DESCRIPTION="A collection of solitaire card games for GNOME" -HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot"; - -LICENSE="GPL-3 LGPL-3 FDL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gnome qt4" - -# FIXME: quartz support? -# Does not build with guile-2.0.0 or 2.0.1 -COMMON_DEPEND=" - >=dev-libs/glib-2.32:2 - >=dev-scheme/guile-2.0.5:2[deprecated,regex] - >=gnome-base/librsvg-2.32:2 - >=media-libs/libcanberra-0.26[gtk3] - >=x11-libs/cairo-1.10 - >=x11-libs/gtk+-3.4:3 - gnome? ( >=gnome-base/gconf-2.0:2 ) - qt4? ( >=dev-qt/qtsvg-4.4:4 ) -" -DEPEND="${COMMON_DEPEND} - app-arch/gzip - dev-libs/libxml2 - >=dev-util/intltool-0.40.4 - dev-util/itstool - sys-apps/lsb-release - >=sys-devel/gettext-0.12 - virtual/pkgconfig - gnome? ( app-text/docbook-xml-dtd:4.3 ) -" -# dev-util/itstool really needed for help file generation -# >=app-text/yelp-tools-3.1.1 - -src_prepare() { - # Fix SVG detection and usage - epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - local myconf=() - - if use gnome; then - myconf+=( - --with-platform=gnome - --with-help-method=ghelp - ) - else - myconf+=( - --with-platform=gtk-only - --with-help-method=library - ) - fi - - if use qt4 ; then - myconf+=( - --with-card-theme-formats=all - --with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks - ) - else - myconf+=( --with-card-theme-formats=svg,fixed,pysol ) - fi - - gnome2_src_configure \ - --with-gtk=3.0 \ - --with-guile=2.0 \ - --enable-sound \ - --with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \ - GUILE=$(type -P guile-2.0) \ - ${myconf[@]} -} - -pkg_postinst() { - gnome2_pkg_postinst - - elog "Aisleriot can use additional card themes from games-board/pysolfc" - elog "and kde-base/libkdegames." -} diff --git a/games-board/aisleriot/aisleriot-3.16.2.ebuild b/games-board/aisleriot/aisleriot-3.20.2.ebuild similarity index 87% rename from games-board/aisleriot/aisleriot-3.16.2.ebuild rename to games-board/aisleriot/aisleriot-3.20.2.ebuild index e7535d4..dc2b6e1 100644 --- a/games-board/aisleriot/aisleriot-3.16.2.ebuild +++ b/games-board/aisleriot/aisleriot-3.20.2.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" -GCONF_DEBUG="yes" +EAPI=6 -inherit autotools eutils gnome-games +inherit autotools gnome2 DESCRIPTION="A collection of solitaire card games for GNOME" HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot"; @@ -13,13 +12,13 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot"; LICENSE="GPL-3 LGPL-3 FDL-1.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gnome qt4" +IUSE="debug gnome qt4" # FIXME: quartz support? # Does not build with guile-2.0.0 or 2.0.1 COMMON_DEPEND=" >=dev-libs/glib-2.32:2 - >=dev-scheme/guile-2.0.5:2[deprecated,regex] + >=dev-scheme/guile-2.0.5:12[deprecated,regex] >=gnome-base/librsvg-2.32:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/cairo-1.10 @@ -42,7 +41,7 @@ DEPEND="${COMMON_DEPEND} src_prepare() { # Fix SVG detection and usage - epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch + eapply "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch eautoreconf gnome2_src_prepare @@ -75,6 +74,7 @@ src_configure() { gnome2_src_configure \ --with-gtk=3.0 \ --with-guile=2.0 \ + $(usex debug --enable-debug=yes --enable-debug=minimum) \ --enable-sound \ --with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \ GUILE=$(type -P guile-2.0) \ diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild index a60876e..535d6b4 100644 --- a/games-board/aisleriot/aisleriot-9999.ebuild +++ b/games-board/aisleriot/aisleriot-9999.ebuild @@ -26,7 +26,7 @@ IUSE="gnome qt4" # Does not build with guile-2.0.0 or 2.0.1 COMMON_DEPEND=" >=dev-libs/glib-2.32:2 - >=dev-scheme/guile-2.0.5:2[deprecated,regex] + >=dev-scheme/guile-2.0.5:12[deprecated,regex] >=gnome-base/librsvg-2.32:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/cairo-1.10
