* [gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/files/, games-board/pysolfc/
@ 2016-08-02 16:59 Austin English
0 siblings, 0 replies; 7+ messages in thread
From: Austin English @ 2016-08-02 16:59 UTC (permalink / raw
To: gentoo-commits
commit: f98a786711acd2debf7537239e03a923ae9468a1
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 16:57:32 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 16:59:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98a7867
games-board/pysolfc: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: portage-2.3.0
.../pysolfc/files/pysolfc-PIL-imports.patch | 12 ++--
games-board/pysolfc/pysolfc-2.0-r4.ebuild | 80 ++++++++++++++++++++++
2 files changed, 86 insertions(+), 6 deletions(-)
diff --git a/games-board/pysolfc/files/pysolfc-PIL-imports.patch b/games-board/pysolfc/files/pysolfc-PIL-imports.patch
index ed174d8..64d9980 100644
--- a/games-board/pysolfc/files/pysolfc-PIL-imports.patch
+++ b/games-board/pysolfc/files/pysolfc-PIL-imports.patch
@@ -3,9 +3,9 @@ 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)
+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':
@@ -35,9 +35,9 @@ diff --git a/PySolFC/trunk/pysollib/mfxutil.py b/PySolFC/trunk/pysollib/mfxutil.
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)
+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 *
diff --git a/games-board/pysolfc/pysolfc-2.0-r4.ebuild b/games-board/pysolfc/pysolfc-2.0-r4.ebuild
new file mode 100644
index 0000000..6c57179
--- /dev/null
+++ b/games-board/pysolfc/pysolfc-2.0-r4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+DISTUTILS_SINGLE_IMPL="1"
+
+inherit eutils python-single-r1 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}] )"
+
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-PIL-imports.patch" #471514
+ )
+
+ distutils-r1_python_prepare_all
+}
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ distutils-r1_src_prepare
+
+ sed -i \
+ -e "/pysol.desktop/d" \
+ -e "s:share/icons:share/pixmaps:" \
+ setup.py || die
+
+ 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 /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
+}
+
+src_install() {
+ distutils-r1_src_install
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/files/, games-board/pysolfc/
@ 2016-09-06 4:15 Austin English
0 siblings, 0 replies; 7+ messages in thread
From: Austin English @ 2016-09-06 4:15 UTC (permalink / raw
To: gentoo-commits
commit: c234d6101d5b724ed825049fe3c1d4c096257dca
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 03:04:09 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 04:05:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c234d610
games-board/pysolfc: fix USE=extra-cardsets not showing extra cardsets
Gentoo-Bug: https://bugs.gentoo.org/591904
Package-Manager: portage-2.3.0
games-board/pysolfc/files/pysolfc-gentoo.patch | 10 ++++
games-board/pysolfc/pysolfc-2.0-r5.ebuild | 82 ++++++++++++++++++++++++++
2 files changed, 92 insertions(+)
diff --git a/games-board/pysolfc/files/pysolfc-gentoo.patch b/games-board/pysolfc/files/pysolfc-gentoo.patch
new file mode 100644
index 00000000..07a7b66
--- /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/pysolfc-2.0-r5.ebuild b/games-board/pysolfc/pysolfc-2.0-r5.ebuild
new file mode 100644
index 00000000..6b7b752
--- /dev/null
+++ b/games-board/pysolfc/pysolfc-2.0-r5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+DISTUTILS_SINGLE_IMPL="1"
+
+inherit eutils python-single-r1 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}] )"
+
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}/${PN}-PIL-imports.patch" #471514
+ "${FILESDIR}/${PN}-gentoo.patch" #591904
+ )
+
+ distutils-r1_python_prepare_all
+}
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ distutils-r1_src_prepare
+
+ 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
+}
+
+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 /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
+}
+
+src_install() {
+ distutils-r1_src_install
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/files/, games-board/pysolfc/
@ 2018-05-20 8:44 Andrey Grozin
0 siblings, 0 replies; 7+ messages in thread
From: Andrey Grozin @ 2018-05-20 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 011b0a1ccc898788f7693466e0b5a339e2690d99
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 08:44:14 2018 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun May 20 08:44:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=011b0a1c
games-board/pysolfc: bump to 2.2.0
Package-Manager: Portage-2.3.19, Repoman-2.3.6
games-board/pysolfc/Manifest | 1 +
games-board/pysolfc/files/pysolfc-locales.patch | 11 ++++
games-board/pysolfc/pysolfc-2.2.0.ebuild | 69 +++++++++++++++++++++++++
3 files changed, 81 insertions(+)
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 940b7b49699..66cfc9f4882 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/games-board/pysolfc/files/pysolfc-locales.patch b/games-board/pysolfc/files/pysolfc-locales.patch
new file mode 100644
index 00000000000..defac9bfba8
--- /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/pysolfc-2.2.0.ebuild b/games-board/pysolfc/pysolfc-2.2.0.ebuild
new file mode 100644
index 00000000000..774ae85ef5b
--- /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=../pysollib "${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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/files/, games-board/pysolfc/
@ 2019-07-29 22:24 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2019-07-29 22:24 UTC (permalink / raw
To: gentoo-commits
commit: 2a0eaa29b442c711d3a666375188713f8ac2c969
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 22:23:18 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 22:24:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0eaa29
games-board/pysolfc: Drop all old versions
Closes: https://bugs.gentoo.org/585124
Closes: https://bugs.gentoo.org/656194
Closes: https://bugs.gentoo.org/666670
Closes: https://bugs.gentoo.org/670046
Closes: https://bugs.gentoo.org/671836
Package-Manager: Portage-2.3.69, Repoman-2.3.13
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-board/pysolfc/Manifest | 4 --
.../pysolfc/files/pysolfc-PIL-imports.patch | 49 ---------------
games-board/pysolfc/files/pysolfc-pillow-6.patch | 20 -------
games-board/pysolfc/pysolfc-2.0-r5.ebuild | 64 --------------------
games-board/pysolfc/pysolfc-2.2.0.ebuild | 69 ---------------------
games-board/pysolfc/pysolfc-2.4.0-r1.ebuild | 69 ---------------------
games-board/pysolfc/pysolfc-2.6.2.ebuild | 70 ----------------------
7 files changed, 345 deletions(-)
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index fddaf75fe51..f3084ac40b3 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,7 +1,3 @@
-DIST PySolFC-2.0.tar.bz2 4208776 BLAKE2B 0675de0923c6ee381f58f8abbaef5e27bd6fc85bbee9dcd182026ba7259c25c38282623e0cd35b582e8999754d21b092d6a824499bc890a2c0c89c53679182fd SHA512 ec5a11565bd43e097cf1854fe246b8f92acd74077c0b3b158c999f9dc45966e8f805c60a2cfbd815137d970e0e6409d0ae437b9807bac9c39353657cf596b6fc
DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b SHA512 56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a
DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
-DIST pysolfc-2.2.0.tar.gz 4504375 BLAKE2B ea48910d36b704667654292cd4fc2e62bcf259d9a3677369371ab7aadd387505d5ae658496ad8982e08ca0405b44971bc1e2375e91cd90f84c569f8f26249ff3 SHA512 c6d09803eab8fe7fc2c4203537d75b8db3216dfcbd5cc60be5b89f23544c871a37f7b16d20df7be4b70c6f014d47b8c361e1557ab04cb1008451f41b456d0ad2
-DIST pysolfc-2.4.0.tar.gz 6788273 BLAKE2B c852ec9912aabc37317f92941fea2c0fb7230467d188ac3a0a8a78b4a4e243bfac8b3d1ddbb03dde136d7518d03cf3fb02b48386e35218ce5891b54049e9c981 SHA512 177edf60797346b763c9da9daf73feae5fb3ef88529227a60e98b68eb6120289cd0cd76b8ca5925b0452cf43298b12acbb16a53872c892d56b71cbcf0fe93e03
-DIST pysolfc-2.6.2.tar.gz 6791741 BLAKE2B 473105f04bfb2fb174d3b50de5a7a55d586756a75e37eb36a9ff688a5a4b148ee940467b18fa4710f828d461d9156163c8fc9cd323b1562da18f0eb02e096916 SHA512 37b4f5f5f53c8041e7b908719456ad3c26401744389ffd44f445402d653b515c44e02ba55950e24d6a3aa2fc2bf914f8575f630335fe1b52c698154b47fb5717
DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906
diff --git a/games-board/pysolfc/files/pysolfc-PIL-imports.patch b/games-board/pysolfc/files/pysolfc-PIL-imports.patch
deleted file mode 100644
index 64d9980a881..00000000000
--- a/games-board/pysolfc/files/pysolfc-PIL-imports.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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-pillow-6.patch b/games-board/pysolfc/files/pysolfc-pillow-6.patch
deleted file mode 100644
index 4682ed34683..00000000000
--- a/games-board/pysolfc/files/pysolfc-pillow-6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -U2 -r PySolFC-pysolfc-2.6.2.orig/pysollib/mfxutil.py PySolFC-pysolfc-2.6.2/pysollib/mfxutil.py
---- PySolFC-pysolfc-2.6.2.orig/pysollib/mfxutil.py 2019-02-27 21:52:26.000000000 +0100
-+++ PySolFC-pysolfc-2.6.2/pysollib/mfxutil.py 2019-04-03 14:09:51.059349643 +0200
-@@ -52,5 +52,5 @@
- Image._initialized = 2
- USE_PIL = False
--if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':
-+if TOOLKIT == 'tk' and Image:
- USE_PIL = True
-
-diff -U2 -r PySolFC-pysolfc-2.6.2.orig/pysollib/ui/tktile/tkutil.py PySolFC-pysolfc-2.6.2/pysollib/ui/tktile/tkutil.py
---- PySolFC-pysolfc-2.6.2.orig/pysollib/ui/tktile/tkutil.py 2019-02-27 21:52:26.000000000 +0100
-+++ PySolFC-pysolfc-2.6.2/pysollib/ui/tktile/tkutil.py 2019-04-03 14:19:22.450363811 +0200
-@@ -354,5 +354,5 @@
- return None
- im = image._pil_image
-- if Image.VERSION >= '1.1.7':
-+ if True:
- # use an alpha image
- sh = Image.new('RGBA', im.size, color)
diff --git a/games-board/pysolfc/pysolfc-2.0-r5.ebuild b/games-board/pysolfc/pysolfc-2.0-r5.ebuild
deleted file mode 100644
index b98ccfee931..00000000000
--- a/games-board/pysolfc/pysolfc-2.0-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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
deleted file mode 100644
index 874ce3fcf38..00000000000
--- a/games-board/pysolfc/pysolfc-2.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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
-}
diff --git a/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild b/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild
deleted file mode 100644
index af1ee277708..00000000000
--- a/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="dev-python/six"
-RDEPEND="${DEPEND}
- 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
-}
diff --git a/games-board/pysolfc/pysolfc-2.6.2.ebuild b/games-board/pysolfc/pysolfc-2.6.2.ebuild
deleted file mode 100644
index 04193353ffb..00000000000
--- a/games-board/pysolfc/pysolfc-2.6.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="dev-python/six"
-RDEPEND="${DEPEND}
- 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"
- "${FILESDIR}/${PN}-pillow-6.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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/files/, games-board/pysolfc/
@ 2021-09-12 19:19 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2021-09-12 19:19 UTC (permalink / raw
To: gentoo-commits
commit: 2a52470694fe7c2bf228826f0314f95ce471d1e0
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 12 19:06:18 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 12 19:15:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a524706
games-board/pysolfc: drop 2.6.4-r1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-board/pysolfc/Manifest | 3 -
.../pysolfc/files/pysolfc-2.6.4-python38.patch | 13 ----
games-board/pysolfc/files/pysolfc-gentoo.patch | 10 ---
games-board/pysolfc/files/pysolfc-locales.patch | 11 ---
games-board/pysolfc/pysolfc-2.6.4-r1.ebuild | 86 ----------------------
5 files changed, 123 deletions(-)
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 110a3b08ce5..8a8afb5961f 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,6 +1,3 @@
DIST PySolFC-2.12.0.tar.xz 3816376 BLAKE2B c37388873fcfc665f237ce7cae21d7d263b95f96efea118c6660f2d2fd18b4b5b2e935519b1318ec3f444085ec12dcfb65dc70a43937a9ec3dd7199f59c8edac SHA512 893012e93ca1cba72fac5f9f428c548af3aa59fa094aa9d027ed6740c91b34c5be62972e6522fb89264d1eb0f887234ddb07fa67a765573e105dbc25d885d1c5
-DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b SHA512 56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a
DIST PySolFC-Cardsets--Minimal-2.0.2.tar.xz 6969096 BLAKE2B 50e87073cf4ab69031e1e4116115ddb1771197da176ac609c09e2f5fab1cc48ccb6f3ba40d7b581f67013835893106f7ab579a2cbc744aad98095944fbd2d5d9 SHA512 5317866d6259b154219ec6efea349af3f9cb0fe9309a895ee55f7be87ebc8c34df12b81a08e1dee907a3f475f4e623c3609fdbd7e357890c2ade418ec5d68cb2
-DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
DIST PySolFC-Cardsets-2.1PRE.tar.bz2 34399177 BLAKE2B 12f577e67e858b96e9d76bb3aceafaaf1cb267b1805c91f36a51ae0b92652cc265d675543bc16923b216b125142b36aee858b54c2dc8f2eeccdd0d6c3e435fe7 SHA512 7fb83450fb3579d9a4e3e0ec1404d5da779c3e99d0ceaaad9d35adf599e2d9ef173f9d2bbf272ff08dc3c3e043a5dda78ae054c95c6fad828e80dff4c9011314
-DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906
diff --git a/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch b/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch
deleted file mode 100644
index 9a857f3b266..00000000000
--- a/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
-index f461ed1..c71a61f 100644
---- a/pysollib/mfxutil.py
-+++ b/pysollib/mfxutil.py
-@@ -143,7 +143,7 @@ def getprefdir(package):
-
-
- # high resolution clock() and sleep()
--uclock = time.clock
-+uclock = time.process_time
- usleep = time.sleep
- if os.name == "posix":
- uclock = time.time
diff --git a/games-board/pysolfc/files/pysolfc-gentoo.patch b/games-board/pysolfc/files/pysolfc-gentoo.patch
deleted file mode 100644
index 07a7b662f32..00000000000
--- a/games-board/pysolfc/files/pysolfc-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index defac9bfba8..00000000000
--- a/games-board/pysolfc/files/pysolfc-locales.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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/pysolfc-2.6.4-r1.ebuild b/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
deleted file mode 100644
index 442a95d8a33..00000000000
--- a/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 desktop
-
-MY_PN=PySolFC
-CARD_BASE="${MY_PN}-Cardsets"
-CARD_BASEV="${CARD_BASE}-2.0"
-CARD_BASE_MINV="${CARD_BASE}--Minimal-2.0.1"
-SF_CARD_BASE="mirror://sourceforge/${PN}/${CARD_BASE}"
-
-DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="https://pysolfc.sourceforge.net/"
-SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
- extra-cardsets? ( ${SF_CARD_BASE}/${CARD_BASEV}/${CARD_BASEV}.tar.bz2 )
- !extra-cardsets? ( ${SF_CARD_BASE}/minimal/${CARD_BASE_MINV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extra-cardsets minimal +sound"
-
-S="${WORKDIR}/${MY_PN}-${P}"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/random2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- !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"
- "${FILESDIR}/${P}-python38.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}"/"${CARD_BASEV}"/*
- else
- # upstream bug #89
- # repo does not contain minimal cardsets in archive
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}"/"${CARD_BASE_MINV}"/*
- fi
-
- dosym ../doc/${PF}/html /usr/share/${PN}/html
-
- doman docs/*.6
- DOCS=( README.md AUTHORS.md docs/README docs/README.SOURCE )
- HTML_DOCS=( html-src/html/. )
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/files/, games-board/pysolfc/
@ 2023-07-09 8:13 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-07-09 8:13 UTC (permalink / raw
To: gentoo-commits
commit: 43e257ac22ca19d6f9594eb9a6ccde4401dd11c6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 9 08:05:33 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 9 08:08:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e257ac
games-board/pysolfc: fix compat w/ pillow 10
Closes: https://bugs.gentoo.org/910081
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../pysolfc/files/pysolfc-2.20.1-pillow-10.patch | 138 +++++++++++++++++++++
games-board/pysolfc/pysolfc-2.20.1-r1.ebuild | 72 +++++++++++
2 files changed, 210 insertions(+)
diff --git a/games-board/pysolfc/files/pysolfc-2.20.1-pillow-10.patch b/games-board/pysolfc/files/pysolfc-2.20.1-pillow-10.patch
new file mode 100644
index 000000000000..d4a803b97aec
--- /dev/null
+++ b/games-board/pysolfc/files/pysolfc-2.20.1-pillow-10.patch
@@ -0,0 +1,138 @@
+https://bugs.gentoo.org/910081
+https://github.com/shlomif/PySolFC/commit/75a3000ca1301e15d5fdbc6bae6df8dbf1cac066
+
+From 75a3000ca1301e15d5fdbc6bae6df8dbf1cac066 Mon Sep 17 00:00:00 2001
+From: Joe R <joeraz5@verizon.net>
+Date: Sun, 2 Jul 2023 11:07:24 -0400
+Subject: [PATCH] New logic for getting resampling method, for compatibility
+ with newer Pillow versions.
+
+--- a/pysollib/mfxutil.py
++++ b/pysollib/mfxutil.py
+@@ -106,6 +106,17 @@ def format_time(t):
+ return "%d:%02d:%02d" % (t // 3600, (t % 3600) // 60, t % 60)
+
+
++def get_default_resampling():
++ if not USE_PIL:
++ return 0
++ elif hasattr(Image, "ANTIALIAS"):
++ return Image.ANTIALIAS
++ elif hasattr(Image, "LANCZOS"):
++ return Image.LANCZOS
++ else:
++ return Image.NEAREST
++
++
+ def print_err(s, level=1):
+ if level == 0:
+ ss = PACKAGE+': ERROR:'
+--- a/pysollib/options.py
++++ b/pysollib/options.py
+@@ -28,7 +28,8 @@
+ import configobj
+
+ import pysollib.settings
+-from pysollib.mfxutil import Image, USE_PIL, print_err
++from pysollib.mfxutil import USE_PIL,\
++ get_default_resampling, print_err
+ from pysollib.mygettext import _
+ from pysollib.mygettext import myGettext
+ from pysollib.pysoltk import STATUSBAR_ITEMS, TOOLBAR_BUTTONS, TOOLKIT
+@@ -474,7 +475,8 @@ def __init__(self):
+ self.tabletile_scale_method = 0
+ self.resampling = 0
+ if USE_PIL:
+- self.resampling = int(Image.ANTIALIAS)
++ self.resampling = int(get_default_resampling())
++
+ # solver
+ self.solver_presets = [
+ 'none',
+--- a/pysollib/ui/tktile/menubar.py
++++ b/pysollib/ui/tktile/menubar.py
+@@ -94,32 +94,32 @@ def createResamplingMenu(menubar, menu):
+ variable=menubar.tkopt.resampling,
+ value=int(Image.NEAREST),
+ command=menubar.mOptResampling)
+- if Image.BILINEAR:
++ if hasattr(Image, "BILINEAR"):
+ submenu.add_radiobutton(label=n_("&Bilinear"),
+ variable=menubar.tkopt.resampling,
+ value=int(Image.BILINEAR),
+ command=menubar.mOptResampling)
+- if Image.BICUBIC:
++ if hasattr(Image, "BICUBIC"):
+ submenu.add_radiobutton(label=n_("B&icubic"),
+ variable=menubar.tkopt.resampling,
+ value=int(Image.BICUBIC),
+ command=menubar.mOptResampling)
+- if Image.LANCZOS:
++ if hasattr(Image, "LANCZOS"):
+ submenu.add_radiobutton(label=n_("&Lanczos"),
+ variable=menubar.tkopt.resampling,
+ value=int(Image.LANCZOS),
+ command=menubar.mOptResampling)
+- elif Image.ANTIALIAS:
++ elif hasattr(Image, "ANTIALIAS"):
+ submenu.add_radiobutton(label=n_("&Antialiasing"),
+ variable=menubar.tkopt.resampling,
+ value=int(Image.ANTIALIAS),
+ command=menubar.mOptResampling)
+- if Image.BOX:
++ if hasattr(Image, "BOX"):
+ submenu.add_radiobutton(label=n_("B&ox"),
+ variable=menubar.tkopt.resampling,
+ value=int(Image.BOX),
+ command=menubar.mOptResampling)
+- if Image.HAMMING:
++ if hasattr(Image, "HAMMING"):
+ submenu.add_radiobutton(label=n_("&Hamming"),
+ variable=menubar.tkopt.resampling,
+ value=int(Image.HAMMING),
+--- a/pysollib/ui/tktile/tkutil.py
++++ b/pysollib/ui/tktile/tkutil.py
+@@ -24,7 +24,8 @@
+ import os
+ import re
+
+-from pysollib.mfxutil import Image, ImageDraw, ImageOps, ImageTk
++from pysollib.mfxutil import Image, ImageDraw, ImageOps, ImageTk, \
++ get_default_resampling
+ from pysollib.settings import TITLE, WIN_SYSTEM
+
+ from six.moves import tkinter
+@@ -288,7 +289,10 @@ def subsample(self, r):
+ im = PIL_Image(image=im)
+ return im
+
+- def resize(self, xf, yf, resample=Image.ANTIALIAS):
++ def resize(self, xf, yf, resample=-1):
++
++ if resample == -1:
++ resample = get_default_resampling()
+
+ w, h = self._pil_image_orig.size
+ w0, h0 = int(w*xf), int(h*yf)
+@@ -456,7 +460,10 @@ def _createBottomImage(image, color='white', backfile=None):
+ size = (w-th*2, h-th*2)
+ tmp = Image.new('RGBA', size, color)
+ tmp.putalpha(60)
+- mask = out.resize(size, Image.ANTIALIAS)
++
++ resampling = get_default_resampling()
++
++ mask = out.resize(size, resampling)
+ out.paste(tmp, (th, th), mask)
+ if backfile:
+ back = Image.open(backfile).convert('RGBA')
+@@ -465,7 +472,7 @@ def _createBottomImage(image, color='white', backfile=None):
+ a = min(float(w1)/w0, float(h1)/h0)
+ a = a*0.9
+ w0, h0 = int(w0*a), int(h0*a)
+- back = back.resize((w0, h0), Image.ANTIALIAS)
++ back = back.resize((w0, h0), resampling)
+ x, y = (w1 - w0) // 2, (h1 - h0) // 2
+ out.paste(back, (x, y), back)
+ return out
+
diff --git a/games-board/pysolfc/pysolfc-2.20.1-r1.ebuild b/games-board/pysolfc/pysolfc-2.20.1-r1.ebuild
new file mode 100644
index 000000000000..e4a685a7a5c3
--- /dev/null
+++ b/games-board/pysolfc/pysolfc-2.20.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="tk"
+inherit distutils-r1 xdg
+
+MY_PN="PySolFC"
+MY_P="${MY_PN}-${PV}"
+PS_CARD_P="${MY_PN}-Cardsets-2.2"
+PS_CARD_MIN_P="${MY_PN}-Cardsets--Minimal-2.2.0"
+
+DESCRIPTION="Exciting collection of more than 1000 solitaire card games"
+HOMEPAGE="https://pysolfc.sourceforge.io/"
+SRC_URI="mirror://sourceforge/pysolfc/${MY_P}.tar.xz
+ extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_P}.tar.bz2 )
+ !extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_MIN_P}.tar.xz )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extra-cardsets minimal +sound"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ dev-python/pysol_cards[${PYTHON_USEDEP}]
+ dev-python/random2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+ !minimal? ( dev-python/pillow[jpeg,tk,${PYTHON_USEDEP}] )')
+ !minimal? ( dev-tcltk/tktable )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-pillow-10.patch
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ distutils-r1_src_prepare
+
+ # make pip check happier, pycotap is not needed
+ sed -i "/'pycotap'/d" setup.py || die
+
+ if use extra-cardsets; then
+ find ../${PS_CARD_P} -type d -name .thumbnails -exec rm -r {} + || die
+ fi
+}
+
+python_install_all() {
+ local DOCS=( AUTHORS.md NEWS.asciidoc README.md )
+ distutils-r1_python_install_all
+
+ doman docs/pysol{,fc}.6
+
+ insinto /usr/share/${MY_PN}
+ doins -r ../$(usex extra-cardsets ${PS_CARD_P} ${PS_CARD_MIN_P})/.
+
+ # html files are used at runtime, keep at default location
+ dosym -r /usr/share/{${MY_PN},doc/${PF}}/html
+
+ # russian translation is not currently displaying right
+ # https://forums.gentoo.org/viewtopic-t-1142910.html
+ rm "${ED}"/usr/share/locale/ru/LC_MESSAGES/pysol.mo || die
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/files/, games-board/pysolfc/
@ 2023-08-06 4:32 Ionen Wolkens
0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2023-08-06 4:32 UTC (permalink / raw
To: gentoo-commits
commit: d778b6a076f6214e84a4c30a1e2fe7955c3d12dc
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 00:43:36 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Aug 6 04:27:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d778b6a0
games-board/pysolfc: drop 2.20.1, 2.20.1-r1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-board/pysolfc/Manifest | 1 -
.../pysolfc/files/pysolfc-2.20.1-pillow-10.patch | 138 ---------------------
games-board/pysolfc/pysolfc-2.20.1-r1.ebuild | 72 -----------
games-board/pysolfc/pysolfc-2.20.1.ebuild | 68 ----------
4 files changed, 279 deletions(-)
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index eb39c9a41115..8dbe78a6cdb0 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,4 +1,3 @@
-DIST PySolFC-2.20.1.tar.xz 9175764 BLAKE2B 3eba9044cc37f96d85e51f5bb5faa5605e8a5de887fe0c73a9bea7dde1a49e63263d7a9b66113e975a26d71de2611e0b5dc176713734316b8c0410fb8145a539 SHA512 f801dacfb3f538496a7dd2fd1777897681521928fe7ea8aec7ea514c1422e8d4ad6c0943ba534914d95544d8eb5e4868f860e6864a8e105f6cc0d16a3d678346
DIST PySolFC-2.21.0.tar.xz 20021468 BLAKE2B afb73675ab57ffbad96b3a6113733494343c481d18651c0932a2da28d58649a67031d280b49ee31b672abe2ca840d0ce1bb92f7e498f5fc567524eb7bdb26792 SHA512 7e2f4d45810288880a8b0d866110be00805c27d20dc94a4393079b94579253ee6bc1ed7355752842faf092d7a1bfe03ec4c3d6e1e61f2ddb39b959b3a830448d
DIST PySolFC-Cardsets--Minimal-2.2.0.tar.xz 23145612 BLAKE2B f98e51c9609bda850cf39ffcd255c7d5c729bc01c35475b1f99a4a4d4ec6a436d44d7e5ecdcce3726616aeaff19617dba6735861f6c5677d2c197882d631a475 SHA512 d5eb0753d14e0758f410d843f553ca6c03acc6d4283b447016e959c889c9dada29fa3facead44354782010b52ec51e0d095858d3b78243ad5280068ec6cd3e31
DIST PySolFC-Cardsets-2.2.tar.bz2 65408375 BLAKE2B 7c0f4bb245d628222e0c8e3b56739c52d77aa6f62088b547c077368591ac3632300a9a35145ddbc33bfdf3accd91d261d103be6777db8c3cbb5576683358b0de SHA512 5562e572909eba96399c79487127b3d98c8f0e1ad145469e48fd6c3803334ba11c41e403d7dcaab5cd01324219426f7afdba9459d97b03071dd67b6dd73ce304
diff --git a/games-board/pysolfc/files/pysolfc-2.20.1-pillow-10.patch b/games-board/pysolfc/files/pysolfc-2.20.1-pillow-10.patch
deleted file mode 100644
index d4a803b97aec..000000000000
--- a/games-board/pysolfc/files/pysolfc-2.20.1-pillow-10.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-https://bugs.gentoo.org/910081
-https://github.com/shlomif/PySolFC/commit/75a3000ca1301e15d5fdbc6bae6df8dbf1cac066
-
-From 75a3000ca1301e15d5fdbc6bae6df8dbf1cac066 Mon Sep 17 00:00:00 2001
-From: Joe R <joeraz5@verizon.net>
-Date: Sun, 2 Jul 2023 11:07:24 -0400
-Subject: [PATCH] New logic for getting resampling method, for compatibility
- with newer Pillow versions.
-
---- a/pysollib/mfxutil.py
-+++ b/pysollib/mfxutil.py
-@@ -106,6 +106,17 @@ def format_time(t):
- return "%d:%02d:%02d" % (t // 3600, (t % 3600) // 60, t % 60)
-
-
-+def get_default_resampling():
-+ if not USE_PIL:
-+ return 0
-+ elif hasattr(Image, "ANTIALIAS"):
-+ return Image.ANTIALIAS
-+ elif hasattr(Image, "LANCZOS"):
-+ return Image.LANCZOS
-+ else:
-+ return Image.NEAREST
-+
-+
- def print_err(s, level=1):
- if level == 0:
- ss = PACKAGE+': ERROR:'
---- a/pysollib/options.py
-+++ b/pysollib/options.py
-@@ -28,7 +28,8 @@
- import configobj
-
- import pysollib.settings
--from pysollib.mfxutil import Image, USE_PIL, print_err
-+from pysollib.mfxutil import USE_PIL,\
-+ get_default_resampling, print_err
- from pysollib.mygettext import _
- from pysollib.mygettext import myGettext
- from pysollib.pysoltk import STATUSBAR_ITEMS, TOOLBAR_BUTTONS, TOOLKIT
-@@ -474,7 +475,8 @@ def __init__(self):
- self.tabletile_scale_method = 0
- self.resampling = 0
- if USE_PIL:
-- self.resampling = int(Image.ANTIALIAS)
-+ self.resampling = int(get_default_resampling())
-+
- # solver
- self.solver_presets = [
- 'none',
---- a/pysollib/ui/tktile/menubar.py
-+++ b/pysollib/ui/tktile/menubar.py
-@@ -94,32 +94,32 @@ def createResamplingMenu(menubar, menu):
- variable=menubar.tkopt.resampling,
- value=int(Image.NEAREST),
- command=menubar.mOptResampling)
-- if Image.BILINEAR:
-+ if hasattr(Image, "BILINEAR"):
- submenu.add_radiobutton(label=n_("&Bilinear"),
- variable=menubar.tkopt.resampling,
- value=int(Image.BILINEAR),
- command=menubar.mOptResampling)
-- if Image.BICUBIC:
-+ if hasattr(Image, "BICUBIC"):
- submenu.add_radiobutton(label=n_("B&icubic"),
- variable=menubar.tkopt.resampling,
- value=int(Image.BICUBIC),
- command=menubar.mOptResampling)
-- if Image.LANCZOS:
-+ if hasattr(Image, "LANCZOS"):
- submenu.add_radiobutton(label=n_("&Lanczos"),
- variable=menubar.tkopt.resampling,
- value=int(Image.LANCZOS),
- command=menubar.mOptResampling)
-- elif Image.ANTIALIAS:
-+ elif hasattr(Image, "ANTIALIAS"):
- submenu.add_radiobutton(label=n_("&Antialiasing"),
- variable=menubar.tkopt.resampling,
- value=int(Image.ANTIALIAS),
- command=menubar.mOptResampling)
-- if Image.BOX:
-+ if hasattr(Image, "BOX"):
- submenu.add_radiobutton(label=n_("B&ox"),
- variable=menubar.tkopt.resampling,
- value=int(Image.BOX),
- command=menubar.mOptResampling)
-- if Image.HAMMING:
-+ if hasattr(Image, "HAMMING"):
- submenu.add_radiobutton(label=n_("&Hamming"),
- variable=menubar.tkopt.resampling,
- value=int(Image.HAMMING),
---- a/pysollib/ui/tktile/tkutil.py
-+++ b/pysollib/ui/tktile/tkutil.py
-@@ -24,7 +24,8 @@
- import os
- import re
-
--from pysollib.mfxutil import Image, ImageDraw, ImageOps, ImageTk
-+from pysollib.mfxutil import Image, ImageDraw, ImageOps, ImageTk, \
-+ get_default_resampling
- from pysollib.settings import TITLE, WIN_SYSTEM
-
- from six.moves import tkinter
-@@ -288,7 +289,10 @@ def subsample(self, r):
- im = PIL_Image(image=im)
- return im
-
-- def resize(self, xf, yf, resample=Image.ANTIALIAS):
-+ def resize(self, xf, yf, resample=-1):
-+
-+ if resample == -1:
-+ resample = get_default_resampling()
-
- w, h = self._pil_image_orig.size
- w0, h0 = int(w*xf), int(h*yf)
-@@ -456,7 +460,10 @@ def _createBottomImage(image, color='white', backfile=None):
- size = (w-th*2, h-th*2)
- tmp = Image.new('RGBA', size, color)
- tmp.putalpha(60)
-- mask = out.resize(size, Image.ANTIALIAS)
-+
-+ resampling = get_default_resampling()
-+
-+ mask = out.resize(size, resampling)
- out.paste(tmp, (th, th), mask)
- if backfile:
- back = Image.open(backfile).convert('RGBA')
-@@ -465,7 +472,7 @@ def _createBottomImage(image, color='white', backfile=None):
- a = min(float(w1)/w0, float(h1)/h0)
- a = a*0.9
- w0, h0 = int(w0*a), int(h0*a)
-- back = back.resize((w0, h0), Image.ANTIALIAS)
-+ back = back.resize((w0, h0), resampling)
- x, y = (w1 - w0) // 2, (h1 - h0) // 2
- out.paste(back, (x, y), back)
- return out
-
diff --git a/games-board/pysolfc/pysolfc-2.20.1-r1.ebuild b/games-board/pysolfc/pysolfc-2.20.1-r1.ebuild
deleted file mode 100644
index e4a685a7a5c3..000000000000
--- a/games-board/pysolfc/pysolfc-2.20.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="tk"
-inherit distutils-r1 xdg
-
-MY_PN="PySolFC"
-MY_P="${MY_PN}-${PV}"
-PS_CARD_P="${MY_PN}-Cardsets-2.2"
-PS_CARD_MIN_P="${MY_PN}-Cardsets--Minimal-2.2.0"
-
-DESCRIPTION="Exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="https://pysolfc.sourceforge.io/"
-SRC_URI="mirror://sourceforge/pysolfc/${MY_P}.tar.xz
- extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_P}.tar.bz2 )
- !extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_MIN_P}.tar.xz )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extra-cardsets minimal +sound"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/attrs[${PYTHON_USEDEP}]
- dev-python/configobj[${PYTHON_USEDEP}]
- dev-python/pysol_cards[${PYTHON_USEDEP}]
- dev-python/random2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
- !minimal? ( dev-python/pillow[jpeg,tk,${PYTHON_USEDEP}] )')
- !minimal? ( dev-tcltk/tktable )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-pillow-10.patch
-)
-
-distutils_enable_tests unittest
-
-src_prepare() {
- distutils-r1_src_prepare
-
- # make pip check happier, pycotap is not needed
- sed -i "/'pycotap'/d" setup.py || die
-
- if use extra-cardsets; then
- find ../${PS_CARD_P} -type d -name .thumbnails -exec rm -r {} + || die
- fi
-}
-
-python_install_all() {
- local DOCS=( AUTHORS.md NEWS.asciidoc README.md )
- distutils-r1_python_install_all
-
- doman docs/pysol{,fc}.6
-
- insinto /usr/share/${MY_PN}
- doins -r ../$(usex extra-cardsets ${PS_CARD_P} ${PS_CARD_MIN_P})/.
-
- # html files are used at runtime, keep at default location
- dosym -r /usr/share/{${MY_PN},doc/${PF}}/html
-
- # russian translation is not currently displaying right
- # https://forums.gentoo.org/viewtopic-t-1142910.html
- rm "${ED}"/usr/share/locale/ru/LC_MESSAGES/pysol.mo || die
-}
diff --git a/games-board/pysolfc/pysolfc-2.20.1.ebuild b/games-board/pysolfc/pysolfc-2.20.1.ebuild
deleted file mode 100644
index 2ea1b0efaf6e..000000000000
--- a/games-board/pysolfc/pysolfc-2.20.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="tk"
-inherit distutils-r1 xdg
-
-MY_PN="PySolFC"
-MY_P="${MY_PN}-${PV}"
-PS_CARD_P="${MY_PN}-Cardsets-2.2"
-PS_CARD_MIN_P="${MY_PN}-Cardsets--Minimal-2.2.0"
-
-DESCRIPTION="Exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="https://pysolfc.sourceforge.io/"
-SRC_URI="mirror://sourceforge/pysolfc/${MY_P}.tar.xz
- extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_P}.tar.bz2 )
- !extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_MIN_P}.tar.xz )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extra-cardsets minimal +sound"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/attrs[${PYTHON_USEDEP}]
- dev-python/configobj[${PYTHON_USEDEP}]
- dev-python/pysol_cards[${PYTHON_USEDEP}]
- dev-python/random2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
- !minimal? ( dev-python/pillow[jpeg,tk,${PYTHON_USEDEP}] )')
- !minimal? ( dev-tcltk/tktable )"
-
-distutils_enable_tests unittest
-
-src_prepare() {
- distutils-r1_src_prepare
-
- # make pip check happier, pycotap is not needed
- sed -i "/'pycotap'/d" setup.py || die
-
- if use extra-cardsets; then
- find ../${PS_CARD_P} -type d -name .thumbnails -exec rm -r {} + || die
- fi
-}
-
-python_install_all() {
- local DOCS=( AUTHORS.md NEWS.asciidoc README.md )
- distutils-r1_python_install_all
-
- doman docs/pysol{,fc}.6
-
- insinto /usr/share/${MY_PN}
- doins -r ../$(usex extra-cardsets ${PS_CARD_P} ${PS_CARD_MIN_P})/.
-
- # html files are used at runtime, keep at default location
- dosym -r /usr/share/{${MY_PN},doc/${PF}}/html
-
- # russian translation is not currently displaying right
- # https://forums.gentoo.org/viewtopic-t-1142910.html
- rm "${ED}"/usr/share/locale/ru/LC_MESSAGES/pysol.mo || die
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-08-06 4:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-12 19:19 [gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/files/, games-board/pysolfc/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2023-08-06 4:32 Ionen Wolkens
2023-07-09 8:13 Sam James
2019-07-29 22:24 James Le Cuirot
2018-05-20 8:44 Andrey Grozin
2016-09-06 4:15 Austin English
2016-08-02 16:59 Austin English
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox