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.

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

4 files changed, 136 insertions, 15 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/Manifest b/games-board/aisleriot/Manifest
index fae7eba69a9b..27e6e52228f9 100644
--- a/games-board/aisleriot/Manifest
+++ b/games-board/aisleriot/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST aisleriot-3.2.3.1.tar.xz 4201044 RMD160 b422399fe25f93b4d6ce9edd504f67b3fa50b03b SHA1 70d2c3d092c11bc8b4a6ce602d247cdf7431b06e SHA256 75f6bb96bef4ef7c85577a792f0c086054252caafd994685d5ee2c947dbb9721
-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 SHA256 686e76abaae3fa477b08d49893e2a5f93ae435e2170c541e504a18c6632a7b40 SHA512 81f46c9802144354ae38cb2c7ace3e144ca31c01c829f84b295048b3afadbdad084b86d4a5436dcec41174b1612d3a909412189dedd6984355579cb8e866af63 WHIRLPOOL 1fed9e322d42744e306fff6d0b181a0781645301840757d1540b1ad1143de44471237d68cec5899c691321291237c14fe143f7a2ed9fc0e212748b955468ea5e
+DIST aisleriot-3.2.3.2.tar.xz 4202212 SHA256 06eeeef49e7a0f8a98142085a64bc7830d0dd02e480fbfa1309545fccc977a36 SHA512 28525fbe6d89c859d2379145e5931f1e79af79cf8f22328c92e7a4fcc87d7691743ebe20d61dd04ebe51ff2d7b53f0add43969915e94c5f9fac0b27ee3ae0451 WHIRLPOOL 155abc9a8641f23164a2edcf597344cc11106d00f9a36bf50b14f1c280fd5b5f7e8293ebedaaff031bd83993f0bfb77c870ea5dfdcdc7d0cb47d09d3841279b8
+DIST aisleriot-3.4.1.tar.xz 4164560 SHA256 f62629fdaf9af23dd3f6a780258b15c927f50a4c43b72d29e9fed4d625e2451b SHA512 2abdb02846cdc8dd74b0c22c5c7f19420d27a8f4dab3b459066744f13274b480e22e4a0ae0bd20d4239d38cd01dbcdc521a96a5e86a7ed0f799302201563b9d2 WHIRLPOOL f6adf09504b377f18fcd7112824b25f339d4a01da09f255a601aa89e723a93183304af4a8557ce6370292596adb212262471b921ff913362f53ba62514d7bda5
+EBUILD aisleriot-3.2.3.2-r1.ebuild 2304 SHA256 512be474fe5ac9a07bbab5b8bf8a63278abb4423f30c65227e469d2464e5b7a9 SHA512 fb3506db3edcccc521b5338243b4db3876cebfdc4c3730a79759b19d780ead965d5da989df62525efa3f350b4a44d51df17123539e08c82d7be6451f7fb3f5b6 WHIRLPOOL edd24f2eb8137cc82273a42d1cc67c482255ba308c62f4eaccd087f08f180d48698fca4232f5e28d11adecff779bdb6cb51e5a6d2d170df54b11c6a039332b9a
 EBUILD aisleriot-3.2.3.2.ebuild 1979 SHA256 18ac1f266a690248331279c1be4d2a5e222c0f0ff7c6deb08bb567b58279c76d SHA512 1b27eab4b4f57b1a2b1beb7994db521b3739c8b978f7dab7f4275e3c9b56016fd8b506b167295061bf680d46c5daeb4c449655d43c29e776f42e44b6d65b6675 WHIRLPOOL 274ae5c025bcf7e0c08a20f04ab8d215f8640e818a920c2f9d58aef2b5f81b7a3a7517a50b99f25ddc81e56c76473ec9e448a7d7954e94b9e2af6e6131789b7d
+EBUILD aisleriot-3.4.1-r1.ebuild 2362 SHA256 fd99fce028114d4f41043dd7af77a621fe3052b7a6edaa1d7117dcc20d97d312 SHA512 3cd0d8657291975e97fc1350cea8b6ac47389bbf675093e1105e7ab339f19e801cb864f2a1bab6998cb7a3dec08bab5c6c86c187b07fa9b47669297dcbbfde93 WHIRLPOOL 626d165742aad30b0089aa2a66a56dcdf9574b2367ea80eed938dc2598815c52f232c3164ac442e9f1f0a407151760e6a539d541111d02e06d138167071d202a
 EBUILD aisleriot-3.4.1.ebuild 2037 SHA256 daea29da9538b3bb2eec475697adf613ff1dd952f7eea15b803dd59881b75008 SHA512 ea636ff5846fcd3c782947510ef164e305ddd261a57b9a5d4d10180d371dfb60fd27b1f5ab1c6969fd22cf305f9e77ea0d1e2c69a128e02c8b33715968516236 WHIRLPOOL b295232aa3dba87f1e76469b8bc4cf3a9191832e2492677475fcaafd7e2b17a12e8327a61789bdc05d81c6700b6d15b92d30d8e5ffd17b45fa786e51bd4fb6fe
-MISC ChangeLog 1526 SHA256 cb235bf781ffe5a9d2aa2d586d322ae09580342cebb37301dc4165b150e61d44 SHA512 d8dbed2d804b6dfc63763d2304c8c4708187f05c4ee0979157dfff8ec18b66ab7ed759016d4c9b3484c617dac08cbfefc33389b8952db8e107cc60e92e4c9d74 WHIRLPOOL ee9fc1a187298c85b0ec1417ebc9384e2bd21f5918136404cf5881629b9237368357b28935f6ea27e5f6dfadf7d0600671e037bffa4ee301b5e2fba6c70d719b
+MISC ChangeLog 1926 SHA256 07010eee133280d08e7982036e682436adf8c2080e293aacb72408a82b22b236 SHA512 0dca2b73fa061e5860e8b1dfc6f8b04c6ebc64eb5ddf4444198f4379e58393087485007ed51a2a9e47b465f3e81947379840c5c5147d3ab3319a550b7621ca1e WHIRLPOOL d65b9be5ec1befe599654818a4e5261fd68cf5aebf7c4ad4e37e439946bca81cab9df643b2808a509fd887f7c9982e665cadb9a1448b3539a4a458b207b3160c
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlABdCwACgkQl5yvQNBFVTXBLACeNoWwAjQffIledDPFaGlDEbJB
-mmIAnR6jHWlZ7gxCJFm3r7d3lnF/wolt
-=F/Kv
+iQEcBAEBCAAGBQJQOkQhAAoJEJ0WA1zPCt1hzkkIALaig1sC9bgJFto0Q0ez7gBQ
+O+xT70UF0nkCspJTSHUrdIBDqH4YoeBXsU8UATsxagKqtz9jAMmEV4zMEKgWXm7I
+dtQNfM3na3kazsuF+4ZiH/8LgfI1bov7tWxXonKwke0SROr4CoQM6kltbsol1Ubh
+YlaqgN3SDbNckgOw4uxZdY/XFhkDolsCqf97EZSo/CZ63amuyTaD4jkJZISwynmX
+zSeR7C2Jv1O5X6+BhkRrS87hdQx1zcdEelbc6w+CHkcpmcPJENkIv8WfatBYn7xg
+99i10/IrZrzsS+GTh8/10s19Gep69+McW23crn002LeQu20ihKg4iagYOONO6hw=
+=Uv2x
 -----END PGP SIGNATURE-----
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."
+}