[gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, dev-util/gnome-devel-docs/

[Gilles Dartiguelongue]

commit:     581d45ea65532745bf2ab0fccb07b955ad4288c9
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 19 15:54:19 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 16:00:16 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=581d45ea

dev-util/gnome-devel-docs: moved to gentoo repository

Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>

 .../gnome-devel-docs-3.26.0.ebuild                 | 31 --------
 dev-util/gnome-devel-docs/metadata.xml             |  8 --
 games-board/aisleriot/aisleriot-3.22.7.ebuild      | 87 ++++++++++++++++++++++
 3 files changed, 87 insertions(+), 39 deletions(-)

diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.26.0.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.26.0.ebuild
deleted file mode 100644
index 27e5133e..00000000
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.26.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Documentation for developing for the GNOME desktop environment"
-HOMEPAGE="https://developer.gnome.org/"
-
-LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.2
-	app-text/yelp-tools
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
-	# Wants to build demo samples
-	gnome2_src_configure ac_cv_path_CC=""
-}

diff --git a/dev-util/gnome-devel-docs/metadata.xml b/dev-util/gnome-devel-docs/metadata.xml
deleted file mode 100644
index 39980802..00000000
--- a/dev-util/gnome-devel-docs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@g.o</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>

diff --git a/games-board/aisleriot/aisleriot-3.22.7.ebuild b/games-board/aisleriot/aisleriot-3.22.7.ebuild
new file mode 100644
index 00000000..5f9a65ab
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.22.7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit 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.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome qt5"
+
+# 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:12[deprecated,regex]
+	<dev-scheme/guile-2.1
+	>=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 )
+	qt5? ( >=dev-qt/qtsvg-5:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/gzip
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40.4
+	gnome-base/gnome-common
+	sys-apps/lsb-release
+	sys-devel/autoconf-archive
+	>=sys-devel/gettext-0.12
+	virtual/pkgconfig
+	gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+
+PATCHES=(
+	# Fix SVG detection and usage
+	"${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
+	# Fix build with Qt5, bug #617256
+	"${FILESDIR}"/${PN}-3.22.2-qt5-requires-cxx11.patch
+)
+
+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 qt5 ; 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 \
+		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		--enable-sound \
+		--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+		${myconf[@]}
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "Aisleriot can use additional card themes from games-board/pysolfc"
+	elog "and kde-base/libkdegames."
+}