Use games_pkg_setup, prepgamesdirs, and those games install locations which are possible for a gnome application; bug #432838, thanks to Julian Ospald (hasufell). Drop old.

(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)

3 files changed, 124 insertions, 7 deletions

diff --git a/games-board/aisleriot/ChangeLog b/games-board/aisleriot/ChangeLog
index 8a669a3a68f6..2419db5a0ad0 100644
--- a/games-board/aisleriot/ChangeLog
+++ b/games-board/aisleriot/ChangeLog
@@ -1,6 +1,16 @@
 # 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.6 2012/07/14 13:29:05 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/ChangeLog,v 1.7 2012/08/26 15:43:23 tetromino Exp $
+
+*aisleriot-3.4.1-r1 (26 Aug 2012)
+*aisleriot-3.2.3.2-r1 (26 Aug 2012)
+
+  26 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -aisleriot-3.2.3.1.ebuild, +aisleriot-3.2.3.2-r1.ebuild,
+  +aisleriot-3.4.1-r1.ebuild:
+  Use games_pkg_setup, prepgamesdirs, and those games install locations which
+  are possible for a gnome application; bug #432838, thanks to Julian Ospald
+  (hasufell). Drop old.
 
   14 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
   aisleriot-3.2.3.2.ebuild, aisleriot-3.4.1.ebuild:
diff --git a/games-board/aisleriot/aisleriot-3.2.3.1.ebuild b/games-board/aisleriot/aisleriot-3.2.3.2-r1.ebuild
index c83f264f1681..12b1abc4ba64 100644
--- a/games-board/aisleriot/aisleriot-3.2.3.1.ebuild
+++ b/games-board/aisleriot/aisleriot-3.2.3.2-r1.ebuild
@@ -1,21 +1,20 @@
 # 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.1.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-r1.ebuild,v 1.1 2012/08/26 15:43:23 tetromino Exp $
 
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
 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
+inherit eutils games gnome2 multilib
 
 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"
+KEYWORDS="~amd64 ~mips ~x86"
 IUSE="gnome"
 
 # FIXME: quartz support?
@@ -60,11 +59,29 @@ pkg_setup() {
 		--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-pysol-card-theme-path=${GAMES_DATADIR}/pysolfc
+		--exec-prefix=${GAMES_PREFIX}
+		--localstatedir=${GAMES_STATEDIR}
+		--with-valgrind-dir="${EPREFIX}"/usr/$(get_libdir)/valgrind"
+
+	export MAKEOPTS="${MAKEOPTS} pkgdatadir=${GAMES_DATADIR}/aisleriot"
+
+	games_pkg_setup
+}
+
+src_install() {
+	gnome2_src_install
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	games_pkg_preinst
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
+	games_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-r1.ebuild b/games-board/aisleriot/aisleriot-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..c3cf47b27985
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.4.1-r1.ebuild
@@ -0,0 +1,90 @@
+# 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-r1.ebuild,v 1.1 2012/08/26 15:43:23 tetromino Exp $
+
+EAPI="4"
+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 multilib
+
+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 ~mips ~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=${GAMES_DATADIR}/pysolfc
+		--exec-prefix=${GAMES_PREFIX}
+		--localstatedir=${GAMES_STATEDIR}
+		--with-valgrind-dir="${EPREFIX}"/usr/$(get_libdir)/valgrind"
+
+	export MAKEOPTS="${MAKEOPTS} pkgdatadir=${GAMES_DATADIR}/aisleriot"
+
+	games_pkg_setup
+}
+
+src_install() {
+	gnome2_src_install
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	games_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	games_pkg_postinst
+
+	elog "Aisleriot can use additional card themes from games-board/pysolfc"
+	elog "and kde-base/libkdegames."
+}