From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- games-board/pysolfc/Manifest | 9 +++ .../pysolfc/files/pysolfc-PIL-imports.patch | 49 +++++++++++++++ games-board/pysolfc/files/pysolfc-gentoo.patch | 10 ++++ games-board/pysolfc/files/pysolfc-locales.patch | 11 ++++ games-board/pysolfc/metadata.xml | 15 +++++ games-board/pysolfc/pysolfc-2.0-r5.ebuild | 64 ++++++++++++++++++++ games-board/pysolfc/pysolfc-2.2.0.ebuild | 69 ++++++++++++++++++++++ 7 files changed, 227 insertions(+) create mode 100644 games-board/pysolfc/Manifest create mode 100644 games-board/pysolfc/files/pysolfc-PIL-imports.patch create mode 100644 games-board/pysolfc/files/pysolfc-gentoo.patch create mode 100644 games-board/pysolfc/files/pysolfc-locales.patch create mode 100644 games-board/pysolfc/metadata.xml create mode 100644 games-board/pysolfc/pysolfc-2.0-r5.ebuild create mode 100644 games-board/pysolfc/pysolfc-2.2.0.ebuild (limited to 'games-board/pysolfc') diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest new file mode 100644 index 000000000000..38ddd5ed0bf9 --- /dev/null +++ b/games-board/pysolfc/Manifest @@ -0,0 +1,9 @@ +AUX pysolfc-PIL-imports.patch 1581 BLAKE2B 82e608f9f84c0af4b695378af7f6ffe90602195f8bac980eb702cd4cc31be5051732e1abedd843970ec1ddf0a4b11bdb5e3455a0de1ff9d62f29dfb35a14987c SHA512 d00fb7b579e4010210131f9fe82ed90cb7ad5d39a391529d8d5c29c5f19b813afc429b1d5b8ae8af0eaf3a8082cf4a48723ce21b42522d9b9c8163a46a033aa9 +AUX pysolfc-gentoo.patch 322 BLAKE2B c2fccd5b11942d4cdce148199c6e8b8544502ba7bd95c2bdf230ebf96abc0b9d4e6225e7b1dde92f5eea8820149c10eb4c53e8f95fe82fcec15a480c0efa061a SHA512 963daef445d492a693380466fcfdc7f464947269d8a2b687039f31179c1f4fe5119efd71f83708073373c3ac5174a754075367937f99253d6b443e74e60e93d3 +AUX pysolfc-locales.patch 655 BLAKE2B ce8068858b91eead34f3ff374959d362aef3c1b2e6448016f54a4f69a04ff3c629660460a04af51d09e7451870db0727aa46bb190cd4671f0b81cb57c783c689 SHA512 53f95675c032f6d47957e883c9c5da4807b185fe4daaab663f36fb7044f12eb191cd934b6375534f5fcbc3f45dcd1b003639cf1d5f9d65b90fa5cc0afaae718e +DIST PySolFC-2.0.tar.bz2 4208776 BLAKE2B 0675de0923c6ee381f58f8abbaef5e27bd6fc85bbee9dcd182026ba7259c25c38282623e0cd35b582e8999754d21b092d6a824499bc890a2c0c89c53679182fd SHA512 ec5a11565bd43e097cf1854fe246b8f92acd74077c0b3b158c999f9dc45966e8f805c60a2cfbd815137d970e0e6409d0ae437b9807bac9c39353657cf596b6fc +DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8 +DIST pysolfc-2.2.0.tar.gz 4504375 BLAKE2B ea48910d36b704667654292cd4fc2e62bcf259d9a3677369371ab7aadd387505d5ae658496ad8982e08ca0405b44971bc1e2375e91cd90f84c569f8f26249ff3 SHA512 c6d09803eab8fe7fc2c4203537d75b8db3216dfcbd5cc60be5b89f23544c871a37f7b16d20df7be4b70c6f014d47b8c361e1557ab04cb1008451f41b456d0ad2 +EBUILD pysolfc-2.0-r5.ebuild 1447 BLAKE2B 52dbd8f9be1d8946d5b8722ffef214a3f8ba6d15cb4f078be36164f120de1c47f883db8fc55c13526576e8aaafa22b1ab43b1aa1e0c2c1a3d53092be66bad6e4 SHA512 05f48c1db7ea2a2ab19bf30a9cac66289d95af96586d75d481e369391a83f809bd3d008aa9729c1800bbb51a829599b5d6de6d7be543b2c1ed1305a7d7cfd6b5 +EBUILD pysolfc-2.2.0.ebuild 1815 BLAKE2B 77f72a385ad1b7afed250236ede43d92c28af7556b9d7800c0de09accc3ee265df4557bf7202b01571e25dacd58a6be49a8afc0f8b9df7a88aaa41adb49fee8c SHA512 518766c0fcc0cccf849046c8d312cbfcf795d2ae2945838e23c00d553bf8d0c10c4d824c8d7354e35cb3b88859a6e0dc78af55514de92f60d43a617493db1479 +MISC metadata.xml 505 BLAKE2B 2ece0bd1f9e531449fc33b4515e89959270d74d6bbf9354a9405ea08cc6c163080a4406c92dd7d158faff445e6d0efd08c48ac52959c3fcc68055560bcf62fc3 SHA512 e7bb917b63c06fd17dd5e863e354ae147bd5aa7ef3f360ec848b3ea20087a092d8b7450cfd7ce1a615a6414d6d618f32b60f299cb5a50f0e852205c3fcf4d136 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..64d9980a881b --- /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/pysollib/mfxutil.py b/pysollib/mfxutil.py +--- a/pysollib/mfxutil.py (revision 279) ++++ b/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/scripts/cardset_viewer.py b/scripts/cardset_viewer.py +--- a/scripts/cardset_viewer.py (revision 279) ++++ b/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/files/pysolfc-gentoo.patch b/games-board/pysolfc/files/pysolfc-gentoo.patch new file mode 100644 index 000000000000..07a7b662f320 --- /dev/null +++ b/games-board/pysolfc/files/pysolfc-gentoo.patch @@ -0,0 +1,10 @@ +--- a/pysollib/settings.py 2014-04-07 20:05:02.335276008 +0200 ++++ b/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', ++ '/usr/share/pysolfc', + ] + if os.name == 'nt': + pass diff --git a/games-board/pysolfc/files/pysolfc-locales.patch b/games-board/pysolfc/files/pysolfc-locales.patch new file mode 100644 index 000000000000..defac9bfba87 --- /dev/null +++ b/games-board/pysolfc/files/pysolfc-locales.patch @@ -0,0 +1,11 @@ +diff -r -U2 PySolFC-pysolfc-2.2.0.orig/setup.py PySolFC-pysolfc-2.2.0/setup.py +--- PySolFC-pysolfc-2.2.0.orig/setup.py 2018-04-16 15:05:24.000000000 +0200 ++++ PySolFC-pysolfc-2.2.0/setup.py 2018-05-19 17:52:08.434768430 +0200 +@@ -45,7 +45,4 @@ + ['data/images/misc/pysol01.png', + 'data/images/misc/pysol02.png', ])) +- for l in ('ru', 'ru_RU'): +- data_files.append(('share/locale/%s/LC_MESSAGES' % l, +- ['locale/%s/LC_MESSAGES/pysol.mo' % l])) + data_files.append((data_dir, ['data/pysolfc.glade'])) + data_files.append(('share/applications', ['data/pysol.desktop'])) diff --git a/games-board/pysolfc/metadata.xml b/games-board/pysolfc/metadata.xml new file mode 100644 index 000000000000..7cc738da552f --- /dev/null +++ b/games-board/pysolfc/metadata.xml @@ -0,0 +1,15 @@ + + + + + games@gentoo.org + Gentoo Games Project + + + Install extra cardsets + Enable sound support using dev-python/pygame + + + pysolfc + + diff --git a/games-board/pysolfc/pysolfc-2.0-r5.ebuild b/games-board/pysolfc/pysolfc-2.0-r5.ebuild new file mode 100644 index 000000000000..b98ccfee931b --- /dev/null +++ b/games-board/pysolfc/pysolfc-2.0-r5.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="tk" +DISTUTILS_SINGLE_IMPL="1" + +inherit eutils distutils-r1 + +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} + !minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}] + dev-tcltk/tktable ) + sound? ( dev-python/pygame[${PYTHON_USEDEP}] )" + +PATCHES=( + "${FILESDIR}/${PN}-PIL-imports.patch" #471514 + "${FILESDIR}/${PN}-gentoo.patch" #591904 +) + +python_prepare_all() { + sed -i \ + -e "/pysol.desktop/d" \ + -e "s:share/icons:share/pixmaps:" \ + -e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \ + setup.py || die + + mv docs/README{,.txt} || die + + distutils-r1_python_prepare_all +} + +python_install_all() { + make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02 + + if use extra-cardsets; then + insinto /usr/share/${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 +} diff --git a/games-board/pysolfc/pysolfc-2.2.0.ebuild b/games-board/pysolfc/pysolfc-2.2.0.ebuild new file mode 100644 index 000000000000..874ce3fcf38b --- /dev/null +++ b/games-board/pysolfc/pysolfc-2.2.0.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +PYTHON_REQ_USE="tk" + +inherit eutils distutils-r1 + +MY_PN=PySolFC + +DESCRIPTION="An exciting collection of more than 1000 solitaire card games" +HOMEPAGE="http://pysolfc.sourceforge.net/" +SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz + extra-cardsets? ( mirror://sourceforge/${PN}/archive/${P}/${MY_PN}-Cardsets-2.0.tar.bz2 )" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="extra-cardsets minimal +sound" + +S=${WORKDIR}/${MY_PN}-${P} + +DEPEND="" +RDEPEND="${RDEPEND} + python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] ) + python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] ) + !minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}] + dev-tcltk/tktable ) + sound? ( dev-python/pygame[${PYTHON_USEDEP}] )" + +PATCHES=( + "${FILESDIR}/${PN}-gentoo.patch" #591904 + "${FILESDIR}/${PN}-locales.patch" +) + +python_prepare_all() { + sed -i \ + -e "/pysol.desktop/d" \ + -e "s:share/icons:share/pixmaps:" \ + -e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \ + setup.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + pushd html-src > /dev/null || die "html-src not found" + PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed" + mv images html/ || die "mv images failed" + popd > /dev/null +} + +python_install_all() { + make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02 + + if use extra-cardsets; then + insinto /usr/share/${PN} + doins -r "${WORKDIR}"/${MY_PN}-Cardsets-2.0/* + fi + + dosym /usr/share/doc/${PF}/html /usr/share/${PN}/html + + doman docs/*.6 + DOCS=( README.md AUTHORS docs/README docs/README.SOURCE ) + HTML_DOCS=( html-src/html/. ) + distutils-r1_python_install_all +} -- cgit v1.2.3