Relying on new python-exec Fix bug #504352

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 116 insertions, 16 deletions

diff --git a/games-board/pysolfc/ChangeLog b/games-board/pysolfc/ChangeLog
index cb8e0ec72149..0fba4878e6d3 100644
--- a/games-board/pysolfc/ChangeLog
+++ b/games-board/pysolfc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/pysolfc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pysolfc/ChangeLog,v 1.17 2013/12/24 12:52:55 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/pysolfc/ChangeLog,v 1.18 2014/04/07 20:11:18 tupone Exp $
+
+*pysolfc-2.0-r3 (07 Apr 2014)
+
+  07 Apr 2014; Tupone Alfredo <tupone@gentoo.org> +pysolfc-2.0-r3.ebuild,
+  +files/pysolfc-2.0-gentoo.patch:
+  Relying on new python-exec Fix bug #504352 by mgorny
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> pysolfc-2.0-r2.ebuild:
   Stable for x86, wrt bug #490610
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 0c5232a23f9e..b358c3f625e1 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pysolfc-2.0-gentoo.patch 312 SHA256 826c8f448f77a4fb8a18d83775914f439c66d382c2cd2e61fe8ec18bac161feb SHA512 55cd38419a2828c92b47deac61bbd3bd44f729f73496bb35ccbb55afad1956167de92f4588871d6303a8f39a8c2270bb5ae06272dea49978583c931e7650a545 WHIRLPOOL e157b2d9f7fe9d8abf06a98d8deefdd1a20d71ab25bf51e299cdf9f858dfea2945fdf35c1f1034a4f241475b3442c66e7f6379cbe3cf9446db319008234eccd6
 AUX pysolfc-PIL-imports.patch 1693 SHA256 5a65b6f830fa486ea1c2f70f60a45e088ad84584f669d53b2d2afb466474032f SHA512 663d20457c044cd0376885081a741efd0c8ecc9f91bb7b07625c95ab6261ae4119d58d1c9ae407e25048acc46564ad13531f8c1d84720be82ee1e25a90695c3d WHIRLPOOL 52f012d7204cdc5f780aa1b5c5e745724073393c9833291ca37626cad024f8de19236ff150d3fd56dd07b3a161d7a8d7ae6724730a3000552cd797ccb9ba80de
 DIST PySolFC-2.0.tar.bz2 4208776 SHA256 dbcb8e7e6d0479c230745a2be91c0c9b9e8524407cd2075f2dae144e5d441b6c SHA512 ec5a11565bd43e097cf1854fe246b8f92acd74077c0b3b158c999f9dc45966e8f805c60a2cfbd815137d970e0e6409d0ae437b9807bac9c39353657cf596b6fc WHIRLPOOL 468d595ee1ae0a3a0129f9e822f9985cd0c7c9a00766dc711a5b8d202742bdd26393a676bc7515e39e1ddad71a3ef65d3d27ada0ec339212662126a42a07ad8c
 DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 SHA256 c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8 WHIRLPOOL ae779f1838d321e727c0661980c7f40ff368aa958a3fd1043448229d5b2a56ce94799f343b8527666081b043a469760f7f3b0a3e2d58263d69c16cb3456d7df5
 EBUILD pysolfc-2.0-r1.ebuild 1772 SHA256 b2ec7731c611577808b93a819c6343a4784bbe5d0a5dc57b80c3224c2ac3398f SHA512 49d1d392f13e9958c35b9722ea98c46b458f21892c9ecb113cd692913458238e8ecd090bf454f4276b521a05fc00e65a1a12302bf0a9be50425f3df349367454 WHIRLPOOL 442bd0b068f39a546f934e0f3c699dd8df0630e919360795be88bd859a7499663989fd80be80a0dbd8d35a6c8be9d61b97e6aac59eb33963203e142c0e6d4f26
 EBUILD pysolfc-2.0-r2.ebuild 2017 SHA256 65296b7433e990309b8f2a8d815597335a4b83b2c0de4a085606b0086e278972 SHA512 b4c9a3082bde7c44895e8f1f49ed4254acd6c6eef9953f0093cebb0032c84b4b4f21a5e2ef379c240ba26db062dfd52710f6093577f1bcbf172d33c51ca025f5 WHIRLPOOL a3d5bb042c5ae13b0c18f8e21432eb80ddc4d5b46b62c05b99752d9b2f312fe5e7f711469cf70d535c596b8ab7c1b1c7d9ca416421e51fbf220b430a9d2954e3
-MISC ChangeLog 2432 SHA256 0adbaeb203d0a2a41fb16ad38ae0df1e0e3e900be95c470e231c5737bd7365c1 SHA512 4149f92a3c3ff6cc055b69658a45402512eb76c46e51d89e4c75c799b73b1a863e51a862414fe39ec6623dd436edd01ebfd1405d363109d584745c1105493874 WHIRLPOOL 1ad653f21b796ee7f0335904d547e1f4d1d9bb587f14ca6a206c41c962c79968a1984b250459f800c0ddb7f6daa817a5c03faedd36b382ff4d322b6c0ce7041e
+EBUILD pysolfc-2.0-r3.ebuild 2007 SHA256 56955052f0d48385ebeb57dde747a62818bda24b4b1bbc06c5875c869bb255e8 SHA512 815626871cdc4426fd1d16bad05bc0175054fe0680c56e948fd433232768a54814c1cc78221fdac9ce66376cd5587f8e56c701b16fb4e31a2a99c47c32cdbe9f WHIRLPOOL a40b1a09cbd2674ecc71ec04b952fdb21a9b52b8a3368050635402ecd855b5ee83ba39faf20ebdf4760e97d814a77e5e10ca57f85594a5e641ed44c3bc821547
+MISC ChangeLog 2631 SHA256 6f5300523d37daba4fcd81fb7f6cc7984913008dd69c7b2a939199d05282b1ec SHA512 2a5ae99d4545bf67e55aea2825f01bc6f0366caa6f4cb059e6b3c1394f86a007774406c262c89e3545c975502492473dc67cfe4fc8896d19c0034a96bffe4e24 WHIRLPOOL c8b1cc96798ca074c53d70e17d4af2aecc0c110c7c5182eb259a94345c0911368b328d7b83c01bdb69fbb359f5df56073907046a170460b21c8aae888c800195
 MISC metadata.xml 322 SHA256 5b8f03faf13d94e9bf017c1efa855dda0e0518b2d81b08df1027fb73142ad2d2 SHA512 032916f3e85f249445c0f5e9f005c0dc6e9b7263f1914cd3feb441536ec123435ae482bc7805827cc9c67c830a2e0fd239b0d014a365137bfe08049de7823270 WHIRLPOOL 444bbd40c624955a7014df915987824afe214949dae9ed85af2fbc39e66fb3739b52e3f15bc64c5b9d2dc1ed2b26a6abd3797fd9603727585e383fbe0e608c9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuYOpAAoJELp701BxlEWfGxAP/0FcsYOUSOprXltOkbWtrLTV
-pvJlDiJF+yDgHKLY/ivH7/unn8kllNP8JiW+1vhwAOh1ALFsnGdCv5SAELjoXEU1
-+2I1OtRAKs6OYDUqrUlWr7yiNXwswa78wKHc2zOg137OrGtb7iKpnyQxnY7UGIjw
-3A0FL2bd8NwjfzkfSP1bwyFMsiVp7BRvlA/qRzejUktirGgxkT9XBZcWL3eApcRY
-eb1xb6VdyWAu5Jbz5E4zOwJ71Vh4uX9c4K3/AhgNLwAqCspY8JqQJIMg5YKwmtLj
-BEsA5d26qtsIIMRkNpDB+Zz3pah5bYo7VUzRtn4jDKkCAp6SnuoS/v1VGNI4dwzs
-wocftd9XVeVIKWk/41zJXrQkBoCqwRmAbc79+l/7Df+pqqIHYg9FNVEmA9RwayQl
-gE/0zFY1HxWrcW+V9TzIcJHXeK8JvJ1UDNK8TsMDFCFW/qaKZJPqZzsJUcZxXuZY
-xBA+4QM2EP+4qu0kzm0cBnfdTgWVcyzf0plqLcgfNfNpKsTeZsrHiQ9VGuLRHJ46
-uoe73v7y4fXURO+7Ii/DMWLGx9U2yR5+nmL364R0APjCduHew8VDjRLisZOUdeYD
-Qowz9n74eCKpRxv0b0qUT7LJL6Fyk43PZUD9vAvqXzvpwLj3lbqiDNxlpAUKpM0e
-jk47d4aMrou8vam+t9uW
-=ZTQ5
+iEYEAREIAAYFAlNDBmoACgkQIY77eQFFFC2XFwCgn7emnq3TtRQd2bfPQFat4+KB
+swIAni27m0AhcB/MUi/t0nhpJwWNEdPK
+=xCgx
 -----END PGP SIGNATURE-----
diff --git a/games-board/pysolfc/files/pysolfc-2.0-gentoo.patch b/games-board/pysolfc/files/pysolfc-2.0-gentoo.patch
new file mode 100644
index 000000000000..3af96d9c0c2f
--- /dev/null
+++ b/games-board/pysolfc/files/pysolfc-2.0-gentoo.patch
@@ -0,0 +1,10 @@
+--- pysollib/settings.py.old	2014-04-07 20:05:02.335276008 +0200
++++ pysollib/settings.py	2014-04-07 20:05:33.099062670 +0200
+@@ -63,6 +63,7 @@
+         '/usr/local/share/PySolFC',
+         '/usr/games/PySolFC',
+         '/usr/local/games/PySolFC',
++	'@GAMES_DATADIR@',
+         ]
+ if os.name == 'nt':
+     pass
diff --git a/games-board/pysolfc/pysolfc-2.0-r3.ebuild b/games-board/pysolfc/pysolfc-2.0-r3.ebuild
new file mode 100644
index 000000000000..73158b0e7e18
--- /dev/null
+++ b/games-board/pysolfc/pysolfc-2.0-r3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/pysolfc/pysolfc-2.0-r3.ebuild,v 1.1 2014/04/07 20:11:18 tupone Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_REQ_USE="tk"
+DISTUTILS_SINGLE_IMPL="1"
+
+inherit eutils python-single-r1 distutils-r1 games
+
+MY_PN=PySolFC
+SOL_URI="mirror://sourceforge/${PN}"
+
+DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
+HOMEPAGE="http://pysolfc.sourceforge.net/"
+SRC_URI="${SOL_URI}/${MY_PN}-${PV}.tar.bz2
+	extra-cardsets? ( ${SOL_URI}/${MY_PN}-Cardsets-${PV}.tar.bz2 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extra-cardsets minimal +sound"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DEPEND=""
+RDEPEND="${RDEPEND}
+	sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+	!minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
+		dev-tcltk/tktable )"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-PIL-imports.patch" #471514
+		"${FILESDIR}"/${P}-gentoo.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_setup() {
+	games_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -i \
+		-e "/pysol.desktop/d" \
+		-e "s:share/icons:share/pixmaps:" \
+		-e "s:data_dir =.*:data_dir = \'${GAMES_DATADIR}/${PN}\':" \
+		setup.py || die
+
+	sed -i \
+		-e "s:@GAMES_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		pysollib/settings.py || die "fixing settings"
+
+	mv docs/README{,.txt}
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
+
+	if use extra-cardsets; then
+		insinto "${GAMES_DATADIR}"/${PN}
+		doins -r "${WORKDIR}"/${MY_PN}-Cardsets-${PV}/*
+	fi
+
+	doman docs/*.6
+
+	DOCS=( README AUTHORS docs/README.txt docs/README.SOURCE )
+	HTML_DOCS=( docs/*html )
+
+	distutils-r1_python_install_all
+
+	dodir "${GAMES_BINDIR}"
+
+	mv "${D}"/usr/bin/pysol.py "${D}""${GAMES_BINDIR}"/
+
+	prepgamesdirs
+}
+
+src_install() {
+	distutils-r1_src_install
+}