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

[Alexandre Restovtsev]

commit:     38a2145805940e738d2b6886cbf26913985b5003
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Sep 29 06:31:35 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Sep 29 06:46:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=38a21458

games-board/aisleriot: 3.1.1 → 3.2.0

Bump. Now uses yelp-tools to build documentation. Drop the artworkextra
USE flag since it has no real effect (card themes were moved from
gnome-games-extra-data to aisleriot, and aisleriot always installs all
of them).

---
 ...sleriot-3.1.1.ebuild => aisleriot-3.2.0.ebuild} |   46 ++++++++-----------
 ...isleriot-3.1.1.ebuild => aisleriot-9999.ebuild} |   46 ++++++++-----------
 .../files/aisleriot-3.1.1-help-directory.patch     |   28 ------------
 3 files changed, 38 insertions(+), 82 deletions(-)

diff --git a/games-board/aisleriot/aisleriot-3.1.1.ebuild b/games-board/aisleriot/aisleriot-3.2.0.ebuild
similarity index 60%
copy from games-board/aisleriot/aisleriot-3.1.1.ebuild
copy to games-board/aisleriot/aisleriot-3.2.0.ebuild
index 476e6b1..f44a9f3 100644
--- a/games-board/aisleriot/aisleriot-3.1.1.ebuild
+++ b/games-board/aisleriot/aisleriot-3.2.0.ebuild
@@ -8,14 +8,21 @@ GNOME_TARBALL_SUFFIX="xz"
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
 inherit eutils games gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="A collection of solitaire card games for GNOME"
 HOMEPAGE="http://live.gnome.org/Aisleriot"
 
-LICENSE="GPL-3 FDL-1.1"
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="artworkextra gnome sound"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="gnome sound"
 
 # FIXME: quartz support?
 COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
@@ -30,14 +37,15 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	sound? ( >=media-libs/libcanberra-0.26[gtk3] )"
 # aisleriot was split off from gnome-games
 RDEPEND="${COMMON_DEPEND}
-	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3.0.0 )
 	!!<gnome-extra/gnome-games-3.1.1[aisleriot]"
 DEPEND="${COMMON_DEPEND}
-	>=app-text/gnome-doc-utils-0.10
 	>=dev-util/intltool-0.40.4
 	>=dev-util/pkgconfig-0.15
 	sys-apps/lsb-release
-	>=sys-devel/gettext-0.12"
+	>=sys-devel/gettext-0.12
+	gnome? (
+		app-text/docbook-xml-dtd:4.3
+		>=app-text/yelp-tools-3.1.1 )"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog TODO"
@@ -48,36 +56,20 @@ pkg_setup() {
 		G2CONF="${G2CONF} --with-platform=gtk-only --with-help-method=library"
 	fi
 
-	if use artworkextra; then
-		G2CONF="${G2CONF} --with-card-theme-formats=all
-			--with-kde-card-theme-path=${EPREFIX}usr/share/apps/carddecks
-			--with-pysol-card-theme-path=${EPREFIX}${GAMES_DATADIR}/pysolfc"
-	else
-		G2CONF="${G2CONF} --with-card-theme-formats=default"
-	fi
-
-	# Disable clutter per upstream recommendation in configure.ac
 	G2CONF="${G2CONF}
 		--with-gtk=3.0
-		--without-clutter
 		--with-smclient
 		--with-guile=1.8
 		$(use_enable sound)
 		--disable-schemas-compile
-		--disable-maintainer-mode"
+		--with-card-theme-formats=all
+		--with-kde-card-theme-path=${EPREFIX}usr/share/apps/carddecks
+		--with-pysol-card-theme-path=${EPREFIX}${GAMES_DATADIR}/pysolfc"
 }
 
-src_prepare() {
-	gnome2_src_prepare
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=656967
-	epatch "${FILESDIR}/${P}-help-directory.patch"
-}
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	if use artworkextra; then
-		elog "Aisleriot can use additional card themes from games-board/pysolfc"
-		elog "and kde-base/libkdegames."
-	fi
+	elog "Aisleriot can use additional card themes from games-board/pysolfc"
+	elog "and kde-base/libkdegames."
 }

diff --git a/games-board/aisleriot/aisleriot-3.1.1.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild
similarity index 60%
rename from games-board/aisleriot/aisleriot-3.1.1.ebuild
rename to games-board/aisleriot/aisleriot-9999.ebuild
index 476e6b1..f44a9f3 100644
--- a/games-board/aisleriot/aisleriot-3.1.1.ebuild
+++ b/games-board/aisleriot/aisleriot-9999.ebuild
@@ -8,14 +8,21 @@ GNOME_TARBALL_SUFFIX="xz"
 # make sure games is inherited first so that the gnome2
 # functions will be called if they are not overridden
 inherit eutils games gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="A collection of solitaire card games for GNOME"
 HOMEPAGE="http://live.gnome.org/Aisleriot"
 
-LICENSE="GPL-3 FDL-1.1"
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="artworkextra gnome sound"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="gnome sound"
 
 # FIXME: quartz support?
 COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
@@ -30,14 +37,15 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	sound? ( >=media-libs/libcanberra-0.26[gtk3] )"
 # aisleriot was split off from gnome-games
 RDEPEND="${COMMON_DEPEND}
-	artworkextra? ( >=gnome-extra/gnome-games-extra-data-3.0.0 )
 	!!<gnome-extra/gnome-games-3.1.1[aisleriot]"
 DEPEND="${COMMON_DEPEND}
-	>=app-text/gnome-doc-utils-0.10
 	>=dev-util/intltool-0.40.4
 	>=dev-util/pkgconfig-0.15
 	sys-apps/lsb-release
-	>=sys-devel/gettext-0.12"
+	>=sys-devel/gettext-0.12
+	gnome? (
+		app-text/docbook-xml-dtd:4.3
+		>=app-text/yelp-tools-3.1.1 )"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog TODO"
@@ -48,36 +56,20 @@ pkg_setup() {
 		G2CONF="${G2CONF} --with-platform=gtk-only --with-help-method=library"
 	fi
 
-	if use artworkextra; then
-		G2CONF="${G2CONF} --with-card-theme-formats=all
-			--with-kde-card-theme-path=${EPREFIX}usr/share/apps/carddecks
-			--with-pysol-card-theme-path=${EPREFIX}${GAMES_DATADIR}/pysolfc"
-	else
-		G2CONF="${G2CONF} --with-card-theme-formats=default"
-	fi
-
-	# Disable clutter per upstream recommendation in configure.ac
 	G2CONF="${G2CONF}
 		--with-gtk=3.0
-		--without-clutter
 		--with-smclient
 		--with-guile=1.8
 		$(use_enable sound)
 		--disable-schemas-compile
-		--disable-maintainer-mode"
+		--with-card-theme-formats=all
+		--with-kde-card-theme-path=${EPREFIX}usr/share/apps/carddecks
+		--with-pysol-card-theme-path=${EPREFIX}${GAMES_DATADIR}/pysolfc"
 }
 
-src_prepare() {
-	gnome2_src_prepare
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=656967
-	epatch "${FILESDIR}/${P}-help-directory.patch"
-}
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	if use artworkextra; then
-		elog "Aisleriot can use additional card themes from games-board/pysolfc"
-		elog "and kde-base/libkdegames."
-	fi
+	elog "Aisleriot can use additional card themes from games-board/pysolfc"
+	elog "and kde-base/libkdegames."
 }

diff --git a/games-board/aisleriot/files/aisleriot-3.1.1-help-directory.patch b/games-board/aisleriot/files/aisleriot-3.1.1-help-directory.patch
deleted file mode 100644
index e77871b..0000000
--- a/games-board/aisleriot/files/aisleriot-3.1.1-help-directory.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8c5e36910e958444565cee177427059a0c37e3d3 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@×××××.com>
-Date: Sat, 20 Aug 2011 13:38:55 -0400
-Subject: [PATCH] s/AR_RUNTIME_GAME_HELP_DIRECTORY/AR_RUNTIME_HELP_DIRECTORY/
-
-Use the correct name for the help directory.
-
-Addresses https://bugzilla.gnome.org/show_bug.cgi?id=656967
----
- src/lib/ar-help.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/lib/ar-help.c b/src/lib/ar-help.c
-index 3be709e..deb53e1 100644
---- a/src/lib/ar-help.c
-+++ b/src/lib/ar-help.c
-@@ -72,7 +72,7 @@ ar_help_display_full (GtkWidget *window,
-   guint i;
- 
-   langs = g_get_language_names ();
--  help_dir = ar_runtime_get_directory (AR_RUNTIME_GAME_HELP_DIRECTORY);
-+  help_dir = ar_runtime_get_directory (AR_RUNTIME_HELP_DIRECTORY);
- 
-   help_uri = NULL;
-   for (i = 0; langs[i] != NULL; ++i) {
--- 
-1.7.6
-