[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, games-board/aisleriot/files/

[Gilles Dartiguelongue]

commit:     2bd5ae6c73645e1da9961bdbbd5002ac287b7229
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 11:37:21 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 10:28:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2bd5ae6c

games-board/aisleriot: 3.20.2 → 3.22.0

Package-Manager: portage-2.3.2
Manifest-Sign-Key: C6085806

 ...sleriot-9999.ebuild => aisleriot-3.22.0.ebuild} | 32 ++++++-----------
 games-board/aisleriot/aisleriot-9999.ebuild        | 23 ++++++-------
 .../files/aisleriot-3.22.0-detect-svg.patch        | 40 ++++++++++++++++++++++
 3 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-3.22.0.ebuild
similarity index 75%
copy from games-board/aisleriot/aisleriot-9999.ebuild
copy to games-board/aisleriot/aisleriot-3.22.0.ebuild
index 535d6b4..9e0f323 100644
--- a/games-board/aisleriot/aisleriot-9999.ebuild
+++ b/games-board/aisleriot/aisleriot-3.22.0.ebuild
@@ -1,26 +1,18 @@
-# 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
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit autotools gnome2
 
 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"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="gnome qt4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome qt5"
 
 # FIXME: quartz support?
 # Does not build with guile-2.0.0 or 2.0.1
@@ -32,24 +24,22 @@ COMMON_DEPEND="
 	>=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 )
+	qt5? ( >=dev-qt/qtsvg-5:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	app-arch/gzip
-	dev-libs/libxml2
+	app-text/yelp-tools
 	>=dev-util/intltool-0.40.4
-	dev-util/itstool
+	gnome-base/gnome-common
 	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
+	eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
 
 	eautoreconf
 	gnome2_src_prepare
@@ -70,7 +60,7 @@ src_configure() {
 		)
 	fi
 
-	if use qt4 ; then
+	if use qt5 ; then
 		myconf+=(
 			--with-card-theme-formats=all
 			--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
@@ -82,9 +72,9 @@ 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) \
 		${myconf[@]}
 }
 

diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild
index 535d6b4..77df6e2 100644
--- a/games-board/aisleriot/aisleriot-9999.ebuild
+++ b/games-board/aisleriot/aisleriot-9999.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
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -20,7 +19,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="gnome qt4"
+IUSE="debug gnome qt5"
 
 # FIXME: quartz support?
 # Does not build with guile-2.0.0 or 2.0.1
@@ -32,24 +31,22 @@ COMMON_DEPEND="
 	>=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 )
+	qt5? ( >=dev-qt/qtsvg-5:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	app-arch/gzip
-	dev-libs/libxml2
+	app-text/yelp-tools
 	>=dev-util/intltool-0.40.4
-	dev-util/itstool
+	gnome-base/gnome-common
 	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
+	eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
 
 	eautoreconf
 	gnome2_src_prepare
@@ -70,7 +67,7 @@ src_configure() {
 		)
 	fi
 
-	if use qt4 ; then
+	if use qt5 ; then
 		myconf+=(
 			--with-card-theme-formats=all
 			--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
@@ -82,9 +79,9 @@ 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) \
 		${myconf[@]}
 }
 

diff --git a/games-board/aisleriot/files/aisleriot-3.22.0-detect-svg.patch b/games-board/aisleriot/files/aisleriot-3.22.0-detect-svg.patch
new file mode 100644
index 0000000..827abcf
--- /dev/null
+++ b/games-board/aisleriot/files/aisleriot-3.22.0-detect-svg.patch
@@ -0,0 +1,40 @@
+From f8dfa11c318c33847670cd06a43dd5b19f1d5231 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@g.o>
+Date: Mon, 31 Oct 2016 11:23:30 +0100
+Subject: [PATCH] Do not require a particular SVG library unless actually found
+
+---
+ configure.ac | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c4a38e..06e174f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -325,7 +325,9 @@ if test "$need_rsvg" = "yes"; then
+ 
+   PKG_CHECK_EXISTS([librsvg-2.0 >= $RSVG_REQUIRED],[have_rsvg=yes],[have_rsvg=no])
+ 
+-  PKGS="$PKGS librsvg-2.0 >= $RSVG_REQUIRED cairo >= $CAIRO_REQUIRED"
++  if test "$have_rsvg" = "yes" ; then
++    PKGS="$PKGS librsvg-2.0 >= $RSVG_REQUIRED cairo >= $CAIRO_REQUIRED"
++  fi
+ 
+   AC_DEFINE([HAVE_RSVG],[1],[Refine if librsvg is available])
+ fi
+@@ -340,8 +342,10 @@ if test "$need_qtsvg" = "yes"; then
+ 
+   PKG_CHECK_EXISTS([Qt5Svg >= $QT_SVG_REQUIRED],[have_qtsvg=yes],[have_qtsvg=no])
+ 
+-  PKGS="$PKGS Qt5Svg >= $QT_SVG_REQUIRED"
+-  EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
++  if test "$have_qtsvg" = "yes" ; then
++    PKGS="$PKGS Qt5Svg >= $QT_SVG_REQUIRED"
++    EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
++  fi
+ 
+   AC_DEFINE([HAVE_QTSVG],[1],[Refine if QtSvg is available])
+ fi
+-- 
+2.10.1
+