diff options
Diffstat (limited to 'games-board')
| -rw-r--r-- | games-board/pysolfc/ChangeLog | 8 | ||||
| -rw-r--r-- | games-board/pysolfc/Manifest | 14 | ||||
| -rw-r--r-- | games-board/pysolfc/files/pysolfc-PIL-imports.patch | 49 | ||||
| -rw-r--r-- | games-board/pysolfc/pysolfc-2.0-r2.ebuild | 84 |
4 files changed, 153 insertions, 2 deletions
diff --git a/games-board/pysolfc/ChangeLog b/games-board/pysolfc/ChangeLog index 9dd5b18a4171..bcd999dffadd 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.10 2013/06/10 18:25:18 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/pysolfc/ChangeLog,v 1.11 2013/06/23 21:44:48 floppym Exp $ + +*pysolfc-2.0-r2 (23 Jun 2013) + + 23 Jun 2013; Mike Gilbert <floppym@gentoo.org> + +files/pysolfc-PIL-imports.patch, +pysolfc-2.0-r2.ebuild: + Update PIL imports and depend on virtual/python-imaging, bug 471514. 10 Jun 2013; Michael Sterrett <mr_bones_@gentoo.org> -pysolfc-2.0.ebuild: old diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest index ddbfafaffe44..2edb4273d1bb 100644 --- a/games-board/pysolfc/Manifest +++ b/games-board/pysolfc/Manifest @@ -1,5 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +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 -MISC ChangeLog 1493 SHA256 78138c69a717c02a682d195a224e41a981e25b5ee83d4ed69f94f28c1e23e57a SHA512 042764152ba458b643113a246cda1902f0334eecebb81bc8b19552b5bcba32294ef7339614a2e7d08fbadf487e527f7f037b46e40439672a6b7d609ef90244cc WHIRLPOOL af626a3ff1d1406120aac53e25735e409aad11cabd8103d009414a297cbfc64a8ebc4c5f005bcea1a9ba86df1f96dde87af7cd53b807b2c83f3baa6ae74a2b9a +EBUILD pysolfc-2.0-r2.ebuild 1866 SHA256 b5ca11a4232a74c133b1fb4cb663b389cd05467b15afc8e477ec46bbd4faaffd SHA512 ffa944bc85572fca3fc02b304e684ca001edf40e5f215e111d0e69b46ca6bfc5a22c913d1c92bdb9d70c3bf2dfb5b727ee493c89ce9bfe4ac514452b99a9d9dd WHIRLPOOL d2fe69dee86b13d49a26b0475f70c2bdd0b64d639bc182954dc1355243f46e22bf87592823e0334cdda6aafd01a7bf9ab491ed0ea5da725b404a944255a8d1c1 +MISC ChangeLog 1703 SHA256 2c5643b321e483c4feca5ac33d30e0a3d7e0d5367b0933b2544fb3879d42da27 SHA512 fd808b3901a8b3fe4e6db44d1e1e918a68f327482f23fc24282909cac13537f8d2c1142bb099e435ae35c64b2a19541fb7e8d0e12728efa5224bf3b7e773d520 WHIRLPOOL b8936d4603cb186befaacfcea9d2af2e3c371bce26433cf2c15b629354f30d8ff7b37e9cf6541a03c20b9d59649e2a121d9ccf33185a1627fdbd942dd226f157 MISC metadata.xml 322 SHA256 5b8f03faf13d94e9bf017c1efa855dda0e0518b2d81b08df1027fb73142ad2d2 SHA512 032916f3e85f249445c0f5e9f005c0dc6e9b7263f1914cd3feb441536ec123435ae482bc7805827cc9c67c830a2e0fd239b0d014a365137bfe08049de7823270 WHIRLPOOL 444bbd40c624955a7014df915987824afe214949dae9ed85af2fbc39e66fb3739b52e3f15bc64c5b9d2dc1ed2b26a6abd3797fd9603727585e383fbe0e608c9d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.20 (GNU/Linux) + +iF4EAREIAAYFAlHHbFEACgkQC77qH+pIQ6S1JwEAgTZ/Sc1C2d5At/9Bn6go83oD +lJzpHQa+NokXcM3aNoEBAKRrAnADAsAPbabHDW5IYIXrmPtsVP3Q0/ij2WxAUoZG +=1jEq +-----END PGP SIGNATURE----- diff --git a/games-board/pysolfc/files/pysolfc-PIL-imports.patch b/games-board/pysolfc/files/pysolfc-PIL-imports.patch new file mode 100644 index 000000000000..ed174d8aefe7 --- /dev/null +++ b/games-board/pysolfc/files/pysolfc-PIL-imports.patch @@ -0,0 +1,49 @@ +https://sourceforge.net/p/pysolfc/patches/10/ +https://bugs.gentoo.org/show_bug.cgi?id=471514 + +Index: pysollib/mfxutil.py +=================================================================== +diff --git a/PySolFC/trunk/pysollib/mfxutil.py b/PySolFC/trunk/pysollib/mfxutil.py +--- a/PySolFC/trunk/pysollib/mfxutil.py (revision 279) ++++ b/PySolFC/trunk/pysollib/mfxutil.py (working copy) +@@ -41,18 +41,18 @@ + Image = ImageTk = ImageOps = None + if TOOLKIT == 'tk': + try: # PIL +- import Image +- import ImageTk +- import ImageOps ++ from PIL import Image ++ from PIL import ImageTk ++ from PIL import ImageOps + except ImportError: + Image = None + else: + # for py2exe +- import GifImagePlugin +- import PngImagePlugin +- import JpegImagePlugin +- import BmpImagePlugin +- import PpmImagePlugin ++ from PIL import GifImagePlugin ++ from PIL import PngImagePlugin ++ from PIL import JpegImagePlugin ++ from PIL import BmpImagePlugin ++ from PIL import PpmImagePlugin + Image._initialized = 2 + USE_PIL = False + if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7': +Index: scripts/cardset_viewer.py +=================================================================== +diff --git a/PySolFC/trunk/scripts/cardset_viewer.py b/PySolFC/trunk/scripts/cardset_viewer.py +--- a/PySolFC/trunk/scripts/cardset_viewer.py (revision 279) ++++ b/PySolFC/trunk/scripts/cardset_viewer.py (working copy) +@@ -7,7 +7,7 @@ + from math import sqrt, sin, cos, pi + from Tkinter import * + try: +- import Image, ImageTk ++ from PIL import Image, ImageTk + except ImportError: + Image = None + diff --git a/games-board/pysolfc/pysolfc-2.0-r2.ebuild b/games-board/pysolfc/pysolfc-2.0-r2.ebuild new file mode 100644 index 000000000000..fa9b23923ce5 --- /dev/null +++ b/games-board/pysolfc/pysolfc-2.0-r2.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-board/pysolfc/pysolfc-2.0-r2.ebuild,v 1.1 2013/06/23 21:44:48 floppym Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_6 python2_7 ) +PYTHON_REQ_USE="tk" + +inherit eutils python-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} + +RDEPEND="sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) + !minimal? ( virtual/python-imaging[tk,${PYTHON_USEDEP}] + dev-tcltk/tktable )" + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}/${PN}-PIL-imports.patch" #471514 + ) + distutils-r1_python_prepare_all + + sed -i \ + -e "/pysol.desktop/d" \ + -e "s:share/icons:share/pixmaps:" \ + -e "s:data_dir =.*:data_dir = \'share/games/${PN}\':" \ + setup.py || die + + # avoid installing pysol.py into /usr/bin + sed -i \ + -e '/scripts/d' \ + setup.py || die +} + +src_prepare() { + distutils-r1_src_prepare +} + +src_compile() { + distutils-r1_src_compile +} + +python_install_all() { + exeinto "${GAMES_DATADIR}"/${PN} + doexe pysol.py + python_replicate_script "${ED}${GAMES_DATADIR}"/${PN}/pysol.py + + games_make_wrapper ${PN} ./pysol.py "${GAMES_DATADIR}"/${PN} + + make_desktop_entry ${PN} "PySol Fan Club Edition" pysol01 + + if use extra-cardsets; then + insinto "${GAMES_DATADIR}"/${PN} + doins -r "${WORKDIR}"/${MY_PN}-Cardsets-${PV}/* + fi + + doman docs/*.6 + dohtml docs/*.html + + dodoc AUTHORS README + + docinto docs + dodoc docs/README* + + prepgamesdirs +} + +src_install() { + distutils-r1_src_install +} |