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)

3 files changed, 27 insertions, 15 deletions

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.2.ebuild b/games-board/aisleriot/aisleriot-3.2.3.2.ebuild
index 4d65073c3e75..dc893107c19a 100644
--- a/games-board/aisleriot/aisleriot-3.2.2.ebuild
+++ b/games-board/aisleriot/aisleriot-3.2.3.2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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"
diff --git a/games-board/aisleriot/aisleriot-3.2.1.ebuild b/games-board/aisleriot/aisleriot-3.4.1.ebuild
index a01db7b1d6b2..ea27fd2dae14 100644
--- a/games-board/aisleriot/aisleriot-3.2.1.ebuild
+++ b/games-board/aisleriot/aisleriot-3.4.1.ebuild
@@ -1,9 +1,10 @@
 # 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 $
+# $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
@@ -15,28 +16,31 @@ HOMEPAGE="http://live.gnome.org/Aisleriot"
 LICENSE="GPL-3 LGPL-3 FDL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome sound"
+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
+# 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
-	gnome? ( >=gnome-base/gconf-2.0:2 )
-	sound? ( >=media-libs/libcanberra-0.26[gtk3] )"
+	>=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
-	virtual/pkgconfig
 	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 )"
@@ -53,13 +57,12 @@ pkg_setup() {
 
 	G2CONF="${G2CONF}
 		--with-gtk=3.0
-		--with-smclient
-		--with-guile=1.8
-		$(use_enable sound)
+		--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"
+		--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
+		--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc"
 }
 
 pkg_postinst() {