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.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 46 insertions, 20 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/Manifest b/games-board/aisleriot/Manifest
index d640c36bb495..053a94b42f80 100644
--- a/games-board/aisleriot/Manifest
+++ b/games-board/aisleriot/Manifest
@@ -1,8 +1,22 @@
-DIST aisleriot-3.2.1.tar.xz 4319892 RMD160 35c52eb49e36cbd819080860d533e3dce62efe7e SHA1 aad4146b605fbc05122d221a5ebb69c06dd60ec3 SHA256 86bbc131daf97d14f1587216d3e4c73db35126dddf393bfef4f7a67822f96529
-DIST aisleriot-3.2.2.tar.xz 4324292 RMD160 49a0a23ababa4fe5efbc0d4fa87f736a58238c81 SHA1 cd99a7aebd917046a54f297883f93c4ae2a2f72f SHA256 818e16767f30238a98332fe07e8b905376a71de05feb3de19815652a48fdfcca
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST aisleriot-3.2.3.1.tar.xz 4201044 RMD160 b422399fe25f93b4d6ce9edd504f67b3fa50b03b SHA1 70d2c3d092c11bc8b4a6ce602d247cdf7431b06e SHA256 75f6bb96bef4ef7c85577a792f0c086054252caafd994685d5ee2c947dbb9721
-EBUILD aisleriot-3.2.1.ebuild 1969 RMD160 f2ce1f191ffd188fdb492ebe45a6089e6ef7db3c SHA1 e0dd72064697652e95165b730ec81485391e1946 SHA256 3706af7f9e5b99810ac5532de9c0bb6e22dcc99f52f8afed908fb0a8c72f9ce9
-EBUILD aisleriot-3.2.2.ebuild 1969 RMD160 1643da04531586e2bf8a3c816afa73e7254d6c9b SHA1 f65d4f036b0c74dac3295567cb51c4e8a407f9e4 SHA256 c87df9bf3f460ad3ecd96c5ddab2f4c9edc3bcbf495ec31b128d6b71cbc1ed0f
+DIST aisleriot-3.2.3.2.tar.xz 4202212 RMD160 019a65f1cd6c38abb4511fc8501911cd14b568fa SHA1 716409ac618bc4e0ef0221dc0c931f6eadc861e1 SHA256 06eeeef49e7a0f8a98142085a64bc7830d0dd02e480fbfa1309545fccc977a36
+DIST aisleriot-3.4.1.tar.xz 4164560 RMD160 74280e2cfc09cae10be627e9a760fe59eb89d720 SHA1 77d0ff48a8d8e4d0368a482b5526c97a05a23f70 SHA256 f62629fdaf9af23dd3f6a780258b15c927f50a4c43b72d29e9fed4d625e2451b
 EBUILD aisleriot-3.2.3.1.ebuild 1971 RMD160 dd2da822f879cb73ca2e278c4cb87e4407364fc0 SHA1 87e1187480ac307dcf029479c4ba5f210b0ccec8 SHA256 686e76abaae3fa477b08d49893e2a5f93ae435e2170c541e504a18c6632a7b40
-MISC ChangeLog 1030 RMD160 bf29108bf5c2b4feaf6f4ff499c5e964ce16f002 SHA1 6a4cf89cf4fed2b20dd5ac6f4c138512ab699fc5 SHA256 c585d6693fc5f12774c850c1038346d0b4f4d5092be0b53210481cae0ee9f62f
+EBUILD aisleriot-3.2.3.2.ebuild 1974 RMD160 aa2546c7312358094af803792e2de32685c4a65a SHA1 17e6626e339962bafad720a90fb6ab291e3c53d4 SHA256 bb48c08173ef49f423feb351d7bf66f5a913d27dbcc0a1ab243502711565583d
+EBUILD aisleriot-3.4.1.ebuild 2032 RMD160 f5568c39c855fd99736a0f1fdc2ed13daa244ae4 SHA1 0f6da690fbd3288e7a111a2fd7e3267456a862a4 SHA256 fd5545cb4933b17488512ad802e1bcc4548ef1b18d10a0ec59fffc449c990f78
+MISC ChangeLog 1403 RMD160 0e8e525c333024794c660d98db9ec5b36fa54ff1 SHA1 a8a6a86f8c13db1121569ebbda35e688f677b2f6 SHA256 9379a01713043dbc1f9e45a5eb469b0442b211a9fd487880b62c9027f72e4e87
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPuJ8xAAoJEJ0WA1zPCt1hoOsIALbHpOpPXTULqWtCtbMEvB8x
+dgze3tUzbqPqeAIuNdWIQFyraxvn34KySd0ufFYcxA8LawNCmOa2XMtfFD1Rqqgr
+8HTRnyveQQ4kdAZNu4gr9WEnOI7PEY/o8dLOxz5qNmxwNxhKI+I3KiO6unj5VFRu
+1k4uGOlEDTA5/0ESk1RwH9iHCNdNpx3JveISTarzkb8nf17Y4+/b3aSY1JpiYYSO
+8Kmr9EVkBH1rHiNe/07+YpcSJGWW5ceUFEkSTKQfIunfeJMsAttJmXYCaHoCiGXs
+O0bJXWAcI0+WySFurMOJCMJSd5rve0ASPBdJQrXQlmoESasq8qdOtDYDQzLclyY=
+=6e6r
+-----END PGP SIGNATURE-----
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() {