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

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     b3277001ace571abba8a04bc07e4f5c5616b2cae
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 22:26:47 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 22:26:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b3277001

games-board/aisleriot: 9999 → 3.16.2

Try to package aisleriot again for bug #475324.

Currently fails due to undefined references due to card theme handling.

 games-board/aisleriot/aisleriot-3.16.2.ebuild      | 75 ++++++++++++++++++++++
 games-board/aisleriot/aisleriot-9999.ebuild        | 72 +++++++++++----------
 .../files/aisleriot-3.16.2-detect-svg.patch        | 28 ++++++++
 3 files changed, 140 insertions(+), 35 deletions(-)

diff --git a/games-board/aisleriot/aisleriot-3.16.2.ebuild b/games-board/aisleriot/aisleriot-3.16.2.ebuild
new file mode 100644
index 0000000..f4a5f8a
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.16.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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"
+
+# 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 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/gzip
+	dev-libs/libxml2
+	>=dev-util/intltool-0.40.4
+	sys-apps/lsb-release
+	>=sys-devel/gettext-0.12
+	virtual/pkgconfig
+	gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+# >=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
+
+	gnome2_src_configure \
+		--with-gtk=3.0 \
+		--with-guile=2.0 \
+		--enable-sound \
+		--with-card-theme-formats=all \
+		--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks \
+		--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+		GUILE=$(type -P guile-2.0) \
+		ITSTOOL=$(type -P true) \
+		XMLLINT=$(type -P true) \
+		${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-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild
index fc4de84..0cf9ad6 100644
--- a/games-board/aisleriot/aisleriot-9999.ebuild
+++ b/games-board/aisleriot/aisleriot-9999.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="5"
 GCONF_DEBUG="yes"
 
-# make sure games is inherited first so that the gnome2
-# functions will be called if they are not overridden
-inherit eutils games gnome2
+inherit autotools eutils gnome-games
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
 DESCRIPTION="A collection of solitaire card games for GNOME"
-HOMEPAGE="http://live.gnome.org/Aisleriot"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot"
 
 LICENSE="GPL-3 LGPL-3 FDL-1.1"
 SLOT="0"
@@ -27,20 +24,15 @@ IUSE="gnome"
 
 # FIXME: quartz support?
 # Does not build with guile-2.0.0 or 2.0.1
-COMMON_DEPEND=">=dev-libs/glib-2.31.13:2
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
 	>=dev-scheme/guile-2.0.5:2[deprecated,regex]
-	>=gnome-base/librsvg-2.32.0:2
-	>=x11-libs/cairo-1.10.0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.0:3
-	x11-libs/libICE
-	x11-libs/libSM
+	>=gnome-base/librsvg-2.32:2
 	>=media-libs/libcanberra-0.26[gtk3]
-	gnome? ( >=gnome-base/gconf-2.0:2 )"
-# aisleriot was split off from gnome-games
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-games-3.1.1[aisleriot]
-	!<gnome-extra/gnome-games-3"
+	>=x11-libs/cairo-1.10
+	>=x11-libs/gtk+-3.4:3
+	gnome? ( >=gnome-base/gconf-2.0:2 )
+"
 DEPEND="${COMMON_DEPEND}
 	app-arch/gzip
 	dev-libs/libxml2
@@ -48,28 +40,38 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/lsb-release
 	>=sys-devel/gettext-0.12
 	virtual/pkgconfig
-	gnome? (
-		app-text/docbook-xml-dtd:4.3
-		>=app-text/yelp-tools-3.1.1 )"
+	gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+# >=app-text/yelp-tools-3.1.1
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog TODO"
+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
-		G2CONF="${G2CONF} --with-platform=gnome --with-help-method=ghelp"
+		myconf="--with-platform=gnome --with-help-method=ghelp"
 	else
-		G2CONF="${G2CONF} --with-platform=gtk-only --with-help-method=library
-			ITSTOOL=$(type -P true) XMLLINT=$(type -P true)"
+		myconf="--with-platform=gtk-only --with-help-method=library"
 	fi
 
-	G2CONF="${G2CONF}
-		--with-gtk=3.0
-		--with-guile=2.0
-		--enable-sound
-		--disable-schemas-compile
-		--with-card-theme-formats=all
-		--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
-		--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc"
+	gnome2_src_configure \
+		--with-gtk=3.0 \
+		--with-guile=2.0 \
+		--enable-sound \
+		--with-card-theme-formats=all \
+		--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks \
+		--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+		GUILE=$(type -P guile-2.0) \
+		ITSTOOL=$(type -P true) \
+		XMLLINT=$(type -P true) \
+		${myconf}
 }
 
 pkg_postinst() {

diff --git a/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch b/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch
new file mode 100644
index 0000000..2dd9001
--- /dev/null
+++ b/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch
@@ -0,0 +1,28 @@
+Do not require a particular SVG library unless actually found.
+
+--- a/configure.ac	2015-05-11 00:13:51.180002639 +0200
++++ b/configure.ac	2015-05-11 00:13:40.365069049 +0200
+@@ -319,7 +319,9 @@
+ 
+   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
+@@ -334,8 +336,10 @@
+ 
+   PKG_CHECK_EXISTS([QtSvg >= $QT_SVG_REQUIRED],[have_qtsvg=yes],[have_qtsvg=no])
+ 
+-  PKGS="$PKGS QtSvg >= $QT_SVG_REQUIRED"
+-  EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
++  if test "$have_qtsvg" = "yes" ; then
++    PKGS="$PKGS QtSvg >= $QT_SVG_REQUIRED"
++    EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
++  fi
+ 
+   AC_DEFINE([HAVE_QTSVG],[1],[Refine if QtSvg is available])
+ fi