Version bump, also enable sound unconditionally as, per policy, gnome packages don't RDEPEND on libcanberra optionally.

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

3 files changed, 86 insertions, 7 deletions

diff --git a/games-board/aisleriot/ChangeLog b/games-board/aisleriot/ChangeLog
index 1cbf1011df71..bc42bb31ef61 100644
--- a/games-board/aisleriot/ChangeLog
+++ b/games-board/aisleriot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/aisleriot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/ChangeLog,v 1.1 2011/11/07 04:02:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/ChangeLog,v 1.2 2011/11/20 15:02:38 pacho Exp $
+
+*aisleriot-3.2.2 (20 Nov 2011)
+
+  20 Nov 2011; Pacho Ramos <pacho@gentoo.org> +aisleriot-3.2.2.ebuild:
+  Version bump, also enable sound unconditionally as, per policy, gnome packages
+  don't RDEPEND on libcanberra optionally.
 
 *aisleriot-3.2.1 (07 Nov 2011)
 
diff --git a/games-board/aisleriot/Manifest b/games-board/aisleriot/Manifest
index 3d9fafc6885a..898768befb2e 100644
--- a/games-board/aisleriot/Manifest
+++ b/games-board/aisleriot/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
 EBUILD aisleriot-3.2.1.ebuild 1980 RMD160 12085166781796612d85aed827d37196c2158e9e SHA1 4e81476d076346aa5e8fa9a309b15c306b3a0fac SHA256 9f185959fdd6dd92ec9208d6e0a51e8d4cae32801fdc3b8ca79cf6e0ed55e34d
-MISC ChangeLog 503 RMD160 e582fc82bd5a45867abecf84bdbbbff2c4216e58 SHA1 40937e6551cdc7d7f7408b1b34d81bed76a24c3b SHA256 3e373ddddfe9f76ef146d68c0de8652e52c5ba00b542d615d1469111163a3f6c
+EBUILD aisleriot-3.2.2.ebuild 1976 RMD160 82e8049cda96092bedc1e11ca8e363cc7e772501 SHA1 dc3c1cec8f3c367e638c7ac729ab7d5149a17edf SHA256 d6e7c8b0043027612807532657544392e95234ba58c599b05034b4e589591132
+MISC ChangeLog 727 RMD160 a4720afbeaa81d3275a3e75f74807983a42eb817 SHA1 5f86d8150c01d06ad2a1380de0173ea05873a1c1 SHA256 3d84f228715da52947448e8d8697d20484f5457c2a6ef4d80c3c0fdd59e8c405
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk63WFsACgkQdjK8w9WeBnAmLQD+PeEpgO6cXnPPkC8fXj9VfEiC
-h5ZIEzt02c+RzHYY4RsA/iBorGWy3mvRMydvLRa+nt4Vd4BhIdZ4z6D0HCcWfRL3
-=kv19
+iEYEARECAAYFAk7JFpMACgkQCaWpQKGI+9QisQCfVAgINsENOZJwAUnZQyUORFaK
+zNoAnRdYv97NCwQ8Pw6luGTp6OyCApA9
+=AiEe
 -----END PGP SIGNATURE-----
diff --git a/games-board/aisleriot/aisleriot-3.2.2.ebuild b/games-board/aisleriot/aisleriot-3.2.2.ebuild
new file mode 100644
index 000000000000..3cc2bda18579
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.2.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 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.1 2011/11/20 15:02:38 pacho 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
+	>=dev-util/pkgconfig-0.15
+	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."
+}