From cdc207717a56c67958cc791c1403b4b2a1bca70c Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 20 May 2012 07:37:15 +0000
Subject: Version bump both for gnome-3.2 (tranlation update) and 3.4 (various
 bug fixes, requires guile-2.0.5 from the lisp overlay). Drop old.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
---
 games-board/aisleriot/ChangeLog                | 11 +++-
 games-board/aisleriot/aisleriot-3.2.1.ebuild   | 70 ------------------------
 games-board/aisleriot/aisleriot-3.2.2.ebuild   | 71 -------------------------
 games-board/aisleriot/aisleriot-3.2.3.2.ebuild | 71 +++++++++++++++++++++++++
 games-board/aisleriot/aisleriot-3.4.1.ebuild   | 73 ++++++++++++++++++++++++++
 5 files changed, 154 insertions(+), 142 deletions(-)
 delete mode 100644 games-board/aisleriot/aisleriot-3.2.1.ebuild
 delete mode 100644 games-board/aisleriot/aisleriot-3.2.2.ebuild
 create mode 100644 games-board/aisleriot/aisleriot-3.2.3.2.ebuild
 create mode 100644 games-board/aisleriot/aisleriot-3.4.1.ebuild

(limited to 'games-board/aisleriot')

diff --git a/games-board/aisleriot/ChangeLog b/games-board/aisleriot/ChangeLog
index 7195410ef52a..393300979b95 100644
--- a/games-board/aisleriot/ChangeLog
+++ b/games-board/aisleriot/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-board/aisleriot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/ChangeLog,v 1.4 2012/05/04 04:30:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/ChangeLog,v 1.5 2012/05/20 07:37:15 tetromino Exp $
+
+*aisleriot-3.4.1 (20 May 2012)
+*aisleriot-3.2.3.2 (20 May 2012)
+
+  20 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -aisleriot-3.2.1.ebuild, -aisleriot-3.2.2.ebuild, +aisleriot-3.2.3.2.ebuild,
+  +aisleriot-3.4.1.ebuild:
+  Version bump both for gnome-3.2 (tranlation update) and 3.4 (various bug
+  fixes, requires guile-2.0.5 from the lisp overlay). Drop old.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> aisleriot-3.2.1.ebuild,
   aisleriot-3.2.2.ebuild, aisleriot-3.2.3.1.ebuild:
diff --git a/games-board/aisleriot/aisleriot-3.2.1.ebuild b/games-board/aisleriot/aisleriot-3.2.1.ebuild
deleted file mode 100644
index a01db7b1d6b2..000000000000
--- a/games-board/aisleriot/aisleriot-3.2.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/aisleriot-3.2.1.ebuild,v 1.2 2012/05/04 04:30:09 jdhore Exp $
-
-EAPI="3"
-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
-
-DESCRIPTION="A collection of solitaire card games for GNOME"
-HOMEPAGE="http://live.gnome.org/Aisleriot"
-
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome sound"
-
-# FIXME: quartz support?
-COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
-	>=dev-scheme/guile-1.8.0:12[deprecated,regex]
-	>=gnome-base/librsvg-2.32.0
-	>=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? ( >=gnome-base/gconf-2.0:2 )
-	sound? ( >=media-libs/libcanberra-0.26[gtk3] )"
-# aisleriot was split off from gnome-games
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-games-3.1.1[aisleriot]
-	!<gnome-extra/gnome-games-3"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.4
-	virtual/pkgconfig
-	sys-apps/lsb-release
-	>=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"
-
-	if use gnome; then
-		G2CONF="${G2CONF} --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)"
-	fi
-
-	G2CONF="${G2CONF}
-		--with-gtk=3.0
-		--with-smclient
-		--with-guile=1.8
-		$(use_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"
-}
-
-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.2.2.ebuild b/games-board/aisleriot/aisleriot-3.2.2.ebuild
deleted file mode 100644
index 4d65073c3e75..000000000000
--- a/games-board/aisleriot/aisleriot-3.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/aisleriot-3.2.2.ebuild,v 1.2 2012/05/04 04:30:09 jdhore Exp $
-
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
-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
-
-DESCRIPTION="A collection of solitaire card games for GNOME"
-HOMEPAGE="http://live.gnome.org/Aisleriot"
-
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-# FIXME: quartz support?
-COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
-	>=dev-scheme/guile-1.8.0:12[deprecated,regex]
-	>=gnome-base/librsvg-2.32.0
-	>=x11-libs/cairo-1.10.0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.0:3
-	x11-libs/libICE
-	x11-libs/libSM
-	>=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"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.4
-	virtual/pkgconfig
-	sys-apps/lsb-release
-	>=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"
-
-	if use gnome; then
-		G2CONF="${G2CONF} --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)"
-	fi
-
-	G2CONF="${G2CONF}
-		--with-gtk=3.0
-		--with-smclient
-		--with-guile=1.8
-		--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"
-}
-
-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.2.3.2.ebuild b/games-board/aisleriot/aisleriot-3.2.3.2.ebuild
new file mode 100644
index 000000000000..dc893107c19a
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.2.3.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/aisleriot-3.2.3.2.ebuild,v 1.1 2012/05/20 07:37:15 tetromino Exp $
+
+EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
+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
+
+DESCRIPTION="A collection of solitaire card games for GNOME"
+HOMEPAGE="http://live.gnome.org/Aisleriot"
+
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome"
+
+# FIXME: quartz support?
+COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
+	>=dev-scheme/guile-1.8.0:12[deprecated,regex]
+	>=gnome-base/librsvg-2.32.0
+	>=x11-libs/cairo-1.10.0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.0.0:3
+	x11-libs/libICE
+	x11-libs/libSM
+	>=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"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.4
+	virtual/pkgconfig
+	sys-apps/lsb-release
+	>=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"
+
+	if use gnome; then
+		G2CONF="${G2CONF} --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)"
+	fi
+
+	G2CONF="${G2CONF}
+		--with-gtk=3.0
+		--with-smclient
+		--with-guile=1.8
+		--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"
+}
+
+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.4.1.ebuild b/games-board/aisleriot/aisleriot-3.4.1.ebuild
new file mode 100644
index 000000000000..ea27fd2dae14
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.4.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/aisleriot-3.4.1.ebuild,v 1.1 2012/05/20 07:37:15 tetromino Exp $
+
+EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
+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
+
+DESCRIPTION="A collection of solitaire card games for GNOME"
+HOMEPAGE="http://live.gnome.org/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.31.13: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
+	>=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"
+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 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog TODO"
+
+	if use gnome; then
+		G2CONF="${G2CONF} --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)"
+	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"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "Aisleriot can use additional card themes from games-board/pysolfc"
+	elog "and kde-base/libkdegames."
+}
-- 
cgit v1.2.3-65-gdbad