Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/files/, games-board/pysolfc/
Date: Mon, 29 Jul 2019 22:24:49
Message-Id: 1564439047.2a0eaa29b442c711d3a666375188713f8ac2c969.chewi@gentoo
1 commit: 2a0eaa29b442c711d3a666375188713f8ac2c969
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 29 22:23:18 2019 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 29 22:24:07 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0eaa29
7
8 games-board/pysolfc: Drop all old versions
9
10 Closes: https://bugs.gentoo.org/585124
11 Closes: https://bugs.gentoo.org/656194
12 Closes: https://bugs.gentoo.org/666670
13 Closes: https://bugs.gentoo.org/670046
14 Closes: https://bugs.gentoo.org/671836
15 Package-Manager: Portage-2.3.69, Repoman-2.3.13
16 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
17
18 games-board/pysolfc/Manifest | 4 --
19 .../pysolfc/files/pysolfc-PIL-imports.patch | 49 ---------------
20 games-board/pysolfc/files/pysolfc-pillow-6.patch | 20 -------
21 games-board/pysolfc/pysolfc-2.0-r5.ebuild | 64 --------------------
22 games-board/pysolfc/pysolfc-2.2.0.ebuild | 69 ---------------------
23 games-board/pysolfc/pysolfc-2.4.0-r1.ebuild | 69 ---------------------
24 games-board/pysolfc/pysolfc-2.6.2.ebuild | 70 ----------------------
25 7 files changed, 345 deletions(-)
26
27 diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
28 index fddaf75fe51..f3084ac40b3 100644
29 --- a/games-board/pysolfc/Manifest
30 +++ b/games-board/pysolfc/Manifest
31 @@ -1,7 +1,3 @@
32 -DIST PySolFC-2.0.tar.bz2 4208776 BLAKE2B 0675de0923c6ee381f58f8abbaef5e27bd6fc85bbee9dcd182026ba7259c25c38282623e0cd35b582e8999754d21b092d6a824499bc890a2c0c89c53679182fd SHA512 ec5a11565bd43e097cf1854fe246b8f92acd74077c0b3b158c999f9dc45966e8f805c60a2cfbd815137d970e0e6409d0ae437b9807bac9c39353657cf596b6fc
33 DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b SHA512 56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a
34 DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
35 -DIST pysolfc-2.2.0.tar.gz 4504375 BLAKE2B ea48910d36b704667654292cd4fc2e62bcf259d9a3677369371ab7aadd387505d5ae658496ad8982e08ca0405b44971bc1e2375e91cd90f84c569f8f26249ff3 SHA512 c6d09803eab8fe7fc2c4203537d75b8db3216dfcbd5cc60be5b89f23544c871a37f7b16d20df7be4b70c6f014d47b8c361e1557ab04cb1008451f41b456d0ad2
36 -DIST pysolfc-2.4.0.tar.gz 6788273 BLAKE2B c852ec9912aabc37317f92941fea2c0fb7230467d188ac3a0a8a78b4a4e243bfac8b3d1ddbb03dde136d7518d03cf3fb02b48386e35218ce5891b54049e9c981 SHA512 177edf60797346b763c9da9daf73feae5fb3ef88529227a60e98b68eb6120289cd0cd76b8ca5925b0452cf43298b12acbb16a53872c892d56b71cbcf0fe93e03
37 -DIST pysolfc-2.6.2.tar.gz 6791741 BLAKE2B 473105f04bfb2fb174d3b50de5a7a55d586756a75e37eb36a9ff688a5a4b148ee940467b18fa4710f828d461d9156163c8fc9cd323b1562da18f0eb02e096916 SHA512 37b4f5f5f53c8041e7b908719456ad3c26401744389ffd44f445402d653b515c44e02ba55950e24d6a3aa2fc2bf914f8575f630335fe1b52c698154b47fb5717
38 DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906
39
40 diff --git a/games-board/pysolfc/files/pysolfc-PIL-imports.patch b/games-board/pysolfc/files/pysolfc-PIL-imports.patch
41 deleted file mode 100644
42 index 64d9980a881..00000000000
43 --- a/games-board/pysolfc/files/pysolfc-PIL-imports.patch
44 +++ /dev/null
45 @@ -1,49 +0,0 @@
46 -https://sourceforge.net/p/pysolfc/patches/10/
47 -https://bugs.gentoo.org/show_bug.cgi?id=471514
48 -
49 -Index: pysollib/mfxutil.py
50 -===================================================================
51 -diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
52 ---- a/pysollib/mfxutil.py (revision 279)
53 -+++ b/pysollib/mfxutil.py (working copy)
54 -@@ -41,18 +41,18 @@
55 - Image = ImageTk = ImageOps = None
56 - if TOOLKIT == 'tk':
57 - try: # PIL
58 -- import Image
59 -- import ImageTk
60 -- import ImageOps
61 -+ from PIL import Image
62 -+ from PIL import ImageTk
63 -+ from PIL import ImageOps
64 - except ImportError:
65 - Image = None
66 - else:
67 - # for py2exe
68 -- import GifImagePlugin
69 -- import PngImagePlugin
70 -- import JpegImagePlugin
71 -- import BmpImagePlugin
72 -- import PpmImagePlugin
73 -+ from PIL import GifImagePlugin
74 -+ from PIL import PngImagePlugin
75 -+ from PIL import JpegImagePlugin
76 -+ from PIL import BmpImagePlugin
77 -+ from PIL import PpmImagePlugin
78 - Image._initialized = 2
79 - USE_PIL = False
80 - if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':
81 -Index: scripts/cardset_viewer.py
82 -===================================================================
83 -diff --git a/scripts/cardset_viewer.py b/scripts/cardset_viewer.py
84 ---- a/scripts/cardset_viewer.py (revision 279)
85 -+++ b/scripts/cardset_viewer.py (working copy)
86 -@@ -7,7 +7,7 @@
87 - from math import sqrt, sin, cos, pi
88 - from Tkinter import *
89 - try:
90 -- import Image, ImageTk
91 -+ from PIL import Image, ImageTk
92 - except ImportError:
93 - Image = None
94 -
95
96 diff --git a/games-board/pysolfc/files/pysolfc-pillow-6.patch b/games-board/pysolfc/files/pysolfc-pillow-6.patch
97 deleted file mode 100644
98 index 4682ed34683..00000000000
99 --- a/games-board/pysolfc/files/pysolfc-pillow-6.patch
100 +++ /dev/null
101 @@ -1,20 +0,0 @@
102 -diff -U2 -r PySolFC-pysolfc-2.6.2.orig/pysollib/mfxutil.py PySolFC-pysolfc-2.6.2/pysollib/mfxutil.py
103 ---- PySolFC-pysolfc-2.6.2.orig/pysollib/mfxutil.py 2019-02-27 21:52:26.000000000 +0100
104 -+++ PySolFC-pysolfc-2.6.2/pysollib/mfxutil.py 2019-04-03 14:09:51.059349643 +0200
105 -@@ -52,5 +52,5 @@
106 - Image._initialized = 2
107 - USE_PIL = False
108 --if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':
109 -+if TOOLKIT == 'tk' and Image:
110 - USE_PIL = True
111 -
112 -diff -U2 -r PySolFC-pysolfc-2.6.2.orig/pysollib/ui/tktile/tkutil.py PySolFC-pysolfc-2.6.2/pysollib/ui/tktile/tkutil.py
113 ---- PySolFC-pysolfc-2.6.2.orig/pysollib/ui/tktile/tkutil.py 2019-02-27 21:52:26.000000000 +0100
114 -+++ PySolFC-pysolfc-2.6.2/pysollib/ui/tktile/tkutil.py 2019-04-03 14:19:22.450363811 +0200
115 -@@ -354,5 +354,5 @@
116 - return None
117 - im = image._pil_image
118 -- if Image.VERSION >= '1.1.7':
119 -+ if True:
120 - # use an alpha image
121 - sh = Image.new('RGBA', im.size, color)
122
123 diff --git a/games-board/pysolfc/pysolfc-2.0-r5.ebuild b/games-board/pysolfc/pysolfc-2.0-r5.ebuild
124 deleted file mode 100644
125 index b98ccfee931..00000000000
126 --- a/games-board/pysolfc/pysolfc-2.0-r5.ebuild
127 +++ /dev/null
128 @@ -1,64 +0,0 @@
129 -# Copyright 1999-2016 Gentoo Foundation
130 -# Distributed under the terms of the GNU General Public License v2
131 -
132 -EAPI=6
133 -
134 -PYTHON_COMPAT=( python2_7 )
135 -PYTHON_REQ_USE="tk"
136 -DISTUTILS_SINGLE_IMPL="1"
137 -
138 -inherit eutils distutils-r1
139 -
140 -MY_PN=PySolFC
141 -SOL_URI="mirror://sourceforge/${PN}"
142 -
143 -DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
144 -HOMEPAGE="http://pysolfc.sourceforge.net/"
145 -SRC_URI="${SOL_URI}/${MY_PN}-${PV}.tar.bz2
146 - extra-cardsets? ( ${SOL_URI}/${MY_PN}-Cardsets-${PV}.tar.bz2 )"
147 -
148 -LICENSE="GPL-3"
149 -SLOT="0"
150 -KEYWORDS="~amd64 ~x86"
151 -IUSE="extra-cardsets minimal +sound"
152 -
153 -S=${WORKDIR}/${MY_PN}-${PV}
154 -
155 -DEPEND=""
156 -RDEPEND="${RDEPEND}
157 - !minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
158 - dev-tcltk/tktable )
159 - sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
160 -
161 -PATCHES=(
162 - "${FILESDIR}/${PN}-PIL-imports.patch" #471514
163 - "${FILESDIR}/${PN}-gentoo.patch" #591904
164 -)
165 -
166 -python_prepare_all() {
167 - sed -i \
168 - -e "/pysol.desktop/d" \
169 - -e "s:share/icons:share/pixmaps:" \
170 - -e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
171 - setup.py || die
172 -
173 - mv docs/README{,.txt} || die
174 -
175 - distutils-r1_python_prepare_all
176 -}
177 -
178 -python_install_all() {
179 - make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
180 -
181 - if use extra-cardsets; then
182 - insinto /usr/share/${PN}
183 - doins -r "${WORKDIR}"/${MY_PN}-Cardsets-${PV}/*
184 - fi
185 -
186 - doman docs/*.6
187 -
188 - DOCS=( README AUTHORS docs/README.txt docs/README.SOURCE )
189 - HTML_DOCS=( docs/*html )
190 -
191 - distutils-r1_python_install_all
192 -}
193
194 diff --git a/games-board/pysolfc/pysolfc-2.2.0.ebuild b/games-board/pysolfc/pysolfc-2.2.0.ebuild
195 deleted file mode 100644
196 index 874ce3fcf38..00000000000
197 --- a/games-board/pysolfc/pysolfc-2.2.0.ebuild
198 +++ /dev/null
199 @@ -1,69 +0,0 @@
200 -# Copyright 1999-2018 Gentoo Foundation
201 -# Distributed under the terms of the GNU General Public License v2
202 -
203 -EAPI=6
204 -
205 -PYTHON_COMPAT=( python{2_7,3_5,3_6} )
206 -PYTHON_REQ_USE="tk"
207 -
208 -inherit eutils distutils-r1
209 -
210 -MY_PN=PySolFC
211 -
212 -DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
213 -HOMEPAGE="http://pysolfc.sourceforge.net/"
214 -SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
215 - extra-cardsets? ( mirror://sourceforge/${PN}/archive/${P}/${MY_PN}-Cardsets-2.0.tar.bz2 )"
216 -
217 -LICENSE="GPL-3"
218 -SLOT="0"
219 -KEYWORDS="~amd64 ~x86"
220 -IUSE="extra-cardsets minimal +sound"
221 -
222 -S=${WORKDIR}/${MY_PN}-${P}
223 -
224 -DEPEND=""
225 -RDEPEND="${RDEPEND}
226 - python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] )
227 - python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] )
228 - !minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
229 - dev-tcltk/tktable )
230 - sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
231 -
232 -PATCHES=(
233 - "${FILESDIR}/${PN}-gentoo.patch" #591904
234 - "${FILESDIR}/${PN}-locales.patch"
235 -)
236 -
237 -python_prepare_all() {
238 - sed -i \
239 - -e "/pysol.desktop/d" \
240 - -e "s:share/icons:share/pixmaps:" \
241 - -e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
242 - setup.py || die
243 -
244 - distutils-r1_python_prepare_all
245 -}
246 -
247 -python_compile_all() {
248 - pushd html-src > /dev/null || die "html-src not found"
249 - PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed"
250 - mv images html/ || die "mv images failed"
251 - popd > /dev/null
252 -}
253 -
254 -python_install_all() {
255 - make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
256 -
257 - if use extra-cardsets; then
258 - insinto /usr/share/${PN}
259 - doins -r "${WORKDIR}"/${MY_PN}-Cardsets-2.0/*
260 - fi
261 -
262 - dosym /usr/share/doc/${PF}/html /usr/share/${PN}/html
263 -
264 - doman docs/*.6
265 - DOCS=( README.md AUTHORS docs/README docs/README.SOURCE )
266 - HTML_DOCS=( html-src/html/. )
267 - distutils-r1_python_install_all
268 -}
269
270 diff --git a/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild b/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild
271 deleted file mode 100644
272 index af1ee277708..00000000000
273 --- a/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild
274 +++ /dev/null
275 @@ -1,69 +0,0 @@
276 -# Copyright 1999-2019 Gentoo Authors
277 -# Distributed under the terms of the GNU General Public License v2
278 -
279 -EAPI=6
280 -
281 -PYTHON_COMPAT=( python{2_7,3_5,3_6} )
282 -PYTHON_REQ_USE="tk"
283 -
284 -inherit eutils distutils-r1
285 -
286 -MY_PN=PySolFC
287 -
288 -DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
289 -HOMEPAGE="http://pysolfc.sourceforge.net/"
290 -SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
291 - extra-cardsets? ( mirror://sourceforge/${PN}/archive/${P}/${MY_PN}-Cardsets-2.0.tar.bz2 )"
292 -
293 -LICENSE="GPL-3"
294 -SLOT="0"
295 -KEYWORDS="~amd64 ~x86"
296 -IUSE="extra-cardsets minimal +sound"
297 -
298 -S=${WORKDIR}/${MY_PN}-${P}
299 -
300 -DEPEND="dev-python/six"
301 -RDEPEND="${DEPEND}
302 - python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] )
303 - python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] )
304 - !minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
305 - dev-tcltk/tktable )
306 - sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
307 -
308 -PATCHES=(
309 - "${FILESDIR}/${PN}-gentoo.patch" #591904
310 - "${FILESDIR}/${PN}-locales.patch"
311 -)
312 -
313 -python_prepare_all() {
314 - sed -i \
315 - -e "/pysol.desktop/d" \
316 - -e "s:share/icons:share/pixmaps:" \
317 - -e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
318 - setup.py || die
319 -
320 - distutils-r1_python_prepare_all
321 -}
322 -
323 -python_compile_all() {
324 - pushd html-src > /dev/null || die "html-src not found"
325 - PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed"
326 - mv images html/ || die "mv images failed"
327 - popd > /dev/null
328 -}
329 -
330 -python_install_all() {
331 - make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
332 -
333 - if use extra-cardsets; then
334 - insinto /usr/share/${PN}
335 - doins -r "${WORKDIR}"/${MY_PN}-Cardsets-2.0/*
336 - fi
337 -
338 - dosym /usr/share/doc/${PF}/html /usr/share/${PN}/html
339 -
340 - doman docs/*.6
341 - DOCS=( README.md AUTHORS docs/README docs/README.SOURCE )
342 - HTML_DOCS=( html-src/html/. )
343 - distutils-r1_python_install_all
344 -}
345
346 diff --git a/games-board/pysolfc/pysolfc-2.6.2.ebuild b/games-board/pysolfc/pysolfc-2.6.2.ebuild
347 deleted file mode 100644
348 index 04193353ffb..00000000000
349 --- a/games-board/pysolfc/pysolfc-2.6.2.ebuild
350 +++ /dev/null
351 @@ -1,70 +0,0 @@
352 -# Copyright 1999-2019 Gentoo Authors
353 -# Distributed under the terms of the GNU General Public License v2
354 -
355 -EAPI=6
356 -
357 -PYTHON_COMPAT=( python{2_7,3_5,3_6} )
358 -PYTHON_REQ_USE="tk"
359 -
360 -inherit eutils distutils-r1
361 -
362 -MY_PN=PySolFC
363 -
364 -DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
365 -HOMEPAGE="http://pysolfc.sourceforge.net/"
366 -SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
367 - extra-cardsets? ( mirror://sourceforge/${PN}/archive/${P}/${MY_PN}-Cardsets-2.0.tar.bz2 )"
368 -
369 -LICENSE="GPL-3"
370 -SLOT="0"
371 -KEYWORDS="~amd64 ~x86"
372 -IUSE="extra-cardsets minimal +sound"
373 -
374 -S=${WORKDIR}/${MY_PN}-${P}
375 -
376 -DEPEND="dev-python/six"
377 -RDEPEND="${DEPEND}
378 - python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] )
379 - python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] )
380 - !minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
381 - dev-tcltk/tktable )
382 - sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
383 -
384 -PATCHES=(
385 - "${FILESDIR}/${PN}-gentoo.patch" #591904
386 - "${FILESDIR}/${PN}-locales.patch"
387 - "${FILESDIR}/${PN}-pillow-6.patch"
388 -)
389 -
390 -python_prepare_all() {
391 - sed -i \
392 - -e "/pysol.desktop/d" \
393 - -e "s:share/icons:share/pixmaps:" \
394 - -e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
395 - setup.py || die
396 -
397 - distutils-r1_python_prepare_all
398 -}
399 -
400 -python_compile_all() {
401 - pushd html-src > /dev/null || die "html-src not found"
402 - PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed"
403 - mv images html/ || die "mv images failed"
404 - popd > /dev/null
405 -}
406 -
407 -python_install_all() {
408 - make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
409 -
410 - if use extra-cardsets; then
411 - insinto /usr/share/${PN}
412 - doins -r "${WORKDIR}"/${MY_PN}-Cardsets-2.0/*
413 - fi
414 -
415 - dosym /usr/share/doc/${PF}/html /usr/share/${PN}/html
416 -
417 - doman docs/*.6
418 - DOCS=( README.md AUTHORS docs/README docs/README.SOURCE )
419 - HTML_DOCS=( html-src/html/. )
420 - distutils-r1_python_install_all
421 -}