1 |
commit: 2a52470694fe7c2bf228826f0314f95ce471d1e0 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 12 19:06:18 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 12 19:15:37 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a524706 |
7 |
|
8 |
games-board/pysolfc: drop 2.6.4-r1 |
9 |
|
10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
11 |
|
12 |
games-board/pysolfc/Manifest | 3 - |
13 |
.../pysolfc/files/pysolfc-2.6.4-python38.patch | 13 ---- |
14 |
games-board/pysolfc/files/pysolfc-gentoo.patch | 10 --- |
15 |
games-board/pysolfc/files/pysolfc-locales.patch | 11 --- |
16 |
games-board/pysolfc/pysolfc-2.6.4-r1.ebuild | 86 ---------------------- |
17 |
5 files changed, 123 deletions(-) |
18 |
|
19 |
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest |
20 |
index 110a3b08ce5..8a8afb5961f 100644 |
21 |
--- a/games-board/pysolfc/Manifest |
22 |
+++ b/games-board/pysolfc/Manifest |
23 |
@@ -1,6 +1,3 @@ |
24 |
DIST PySolFC-2.12.0.tar.xz 3816376 BLAKE2B c37388873fcfc665f237ce7cae21d7d263b95f96efea118c6660f2d2fd18b4b5b2e935519b1318ec3f444085ec12dcfb65dc70a43937a9ec3dd7199f59c8edac SHA512 893012e93ca1cba72fac5f9f428c548af3aa59fa094aa9d027ed6740c91b34c5be62972e6522fb89264d1eb0f887234ddb07fa67a765573e105dbc25d885d1c5 |
25 |
-DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b SHA512 56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a |
26 |
DIST PySolFC-Cardsets--Minimal-2.0.2.tar.xz 6969096 BLAKE2B 50e87073cf4ab69031e1e4116115ddb1771197da176ac609c09e2f5fab1cc48ccb6f3ba40d7b581f67013835893106f7ab579a2cbc744aad98095944fbd2d5d9 SHA512 5317866d6259b154219ec6efea349af3f9cb0fe9309a895ee55f7be87ebc8c34df12b81a08e1dee907a3f475f4e623c3609fdbd7e357890c2ade418ec5d68cb2 |
27 |
-DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8 |
28 |
DIST PySolFC-Cardsets-2.1PRE.tar.bz2 34399177 BLAKE2B 12f577e67e858b96e9d76bb3aceafaaf1cb267b1805c91f36a51ae0b92652cc265d675543bc16923b216b125142b36aee858b54c2dc8f2eeccdd0d6c3e435fe7 SHA512 7fb83450fb3579d9a4e3e0ec1404d5da779c3e99d0ceaaad9d35adf599e2d9ef173f9d2bbf272ff08dc3c3e043a5dda78ae054c95c6fad828e80dff4c9011314 |
29 |
-DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906 |
30 |
|
31 |
diff --git a/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch b/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch |
32 |
deleted file mode 100644 |
33 |
index 9a857f3b266..00000000000 |
34 |
--- a/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch |
35 |
+++ /dev/null |
36 |
@@ -1,13 +0,0 @@ |
37 |
-diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py |
38 |
-index f461ed1..c71a61f 100644 |
39 |
---- a/pysollib/mfxutil.py |
40 |
-+++ b/pysollib/mfxutil.py |
41 |
-@@ -143,7 +143,7 @@ def getprefdir(package): |
42 |
- |
43 |
- |
44 |
- # high resolution clock() and sleep() |
45 |
--uclock = time.clock |
46 |
-+uclock = time.process_time |
47 |
- usleep = time.sleep |
48 |
- if os.name == "posix": |
49 |
- uclock = time.time |
50 |
|
51 |
diff --git a/games-board/pysolfc/files/pysolfc-gentoo.patch b/games-board/pysolfc/files/pysolfc-gentoo.patch |
52 |
deleted file mode 100644 |
53 |
index 07a7b662f32..00000000000 |
54 |
--- a/games-board/pysolfc/files/pysolfc-gentoo.patch |
55 |
+++ /dev/null |
56 |
@@ -1,10 +0,0 @@ |
57 |
---- a/pysollib/settings.py 2014-04-07 20:05:02.335276008 +0200 |
58 |
-+++ b/pysollib/settings.py 2014-04-07 20:05:33.099062670 +0200 |
59 |
-@@ -63,6 +63,7 @@ |
60 |
- '/usr/local/share/PySolFC', |
61 |
- '/usr/games/PySolFC', |
62 |
- '/usr/local/games/PySolFC', |
63 |
-+ '/usr/share/pysolfc', |
64 |
- ] |
65 |
- if os.name == 'nt': |
66 |
- pass |
67 |
|
68 |
diff --git a/games-board/pysolfc/files/pysolfc-locales.patch b/games-board/pysolfc/files/pysolfc-locales.patch |
69 |
deleted file mode 100644 |
70 |
index defac9bfba8..00000000000 |
71 |
--- a/games-board/pysolfc/files/pysolfc-locales.patch |
72 |
+++ /dev/null |
73 |
@@ -1,11 +0,0 @@ |
74 |
-diff -r -U2 PySolFC-pysolfc-2.2.0.orig/setup.py PySolFC-pysolfc-2.2.0/setup.py |
75 |
---- PySolFC-pysolfc-2.2.0.orig/setup.py 2018-04-16 15:05:24.000000000 +0200 |
76 |
-+++ PySolFC-pysolfc-2.2.0/setup.py 2018-05-19 17:52:08.434768430 +0200 |
77 |
-@@ -45,7 +45,4 @@ |
78 |
- ['data/images/misc/pysol01.png', |
79 |
- 'data/images/misc/pysol02.png', ])) |
80 |
-- for l in ('ru', 'ru_RU'): |
81 |
-- data_files.append(('share/locale/%s/LC_MESSAGES' % l, |
82 |
-- ['locale/%s/LC_MESSAGES/pysol.mo' % l])) |
83 |
- data_files.append((data_dir, ['data/pysolfc.glade'])) |
84 |
- data_files.append(('share/applications', ['data/pysol.desktop'])) |
85 |
|
86 |
diff --git a/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild b/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild |
87 |
deleted file mode 100644 |
88 |
index 442a95d8a33..00000000000 |
89 |
--- a/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild |
90 |
+++ /dev/null |
91 |
@@ -1,86 +0,0 @@ |
92 |
-# Copyright 1999-2021 Gentoo Authors |
93 |
-# Distributed under the terms of the GNU General Public License v2 |
94 |
- |
95 |
-EAPI=7 |
96 |
- |
97 |
-PYTHON_COMPAT=( python3_{8,9} ) |
98 |
-DISTUTILS_SINGLE_IMPL=1 |
99 |
-PYTHON_REQ_USE="tk" |
100 |
- |
101 |
-inherit distutils-r1 desktop |
102 |
- |
103 |
-MY_PN=PySolFC |
104 |
-CARD_BASE="${MY_PN}-Cardsets" |
105 |
-CARD_BASEV="${CARD_BASE}-2.0" |
106 |
-CARD_BASE_MINV="${CARD_BASE}--Minimal-2.0.1" |
107 |
-SF_CARD_BASE="mirror://sourceforge/${PN}/${CARD_BASE}" |
108 |
- |
109 |
-DESCRIPTION="An exciting collection of more than 1000 solitaire card games" |
110 |
-HOMEPAGE="https://pysolfc.sourceforge.net/" |
111 |
-SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz |
112 |
- extra-cardsets? ( ${SF_CARD_BASE}/${CARD_BASEV}/${CARD_BASEV}.tar.bz2 ) |
113 |
- !extra-cardsets? ( ${SF_CARD_BASE}/minimal/${CARD_BASE_MINV}.tar.xz )" |
114 |
- |
115 |
-LICENSE="GPL-3" |
116 |
-SLOT="0" |
117 |
-KEYWORDS="~amd64 ~x86" |
118 |
-IUSE="extra-cardsets minimal +sound" |
119 |
- |
120 |
-S="${WORKDIR}/${MY_PN}-${P}" |
121 |
- |
122 |
-RDEPEND=" |
123 |
- $(python_gen_cond_dep ' |
124 |
- dev-python/random2[${PYTHON_USEDEP}] |
125 |
- dev-python/six[${PYTHON_USEDEP}] |
126 |
- !minimal? ( |
127 |
- dev-python/pillow[tk,${PYTHON_USEDEP}] |
128 |
- dev-tcltk/tktable |
129 |
- ) |
130 |
- sound? ( |
131 |
- dev-python/pygame[${PYTHON_USEDEP}] |
132 |
- ) |
133 |
- ')" |
134 |
- |
135 |
-PATCHES=( |
136 |
- "${FILESDIR}/${PN}-gentoo.patch" #591904 |
137 |
- "${FILESDIR}/${PN}-locales.patch" |
138 |
- "${FILESDIR}/${P}-python38.patch" |
139 |
-) |
140 |
- |
141 |
-python_prepare_all() { |
142 |
- sed -i \ |
143 |
- -e "/pysol.desktop/d" \ |
144 |
- -e "s:share/icons:share/pixmaps:" \ |
145 |
- -e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \ |
146 |
- setup.py || die |
147 |
- |
148 |
- distutils-r1_python_prepare_all |
149 |
-} |
150 |
- |
151 |
-python_compile_all() { |
152 |
- pushd html-src > /dev/null || die "html-src not found" |
153 |
- PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed" |
154 |
- mv images html/ || die "mv images failed" |
155 |
- popd > /dev/null |
156 |
-} |
157 |
- |
158 |
-python_install_all() { |
159 |
- make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02 |
160 |
- |
161 |
- if use extra-cardsets; then |
162 |
- insinto /usr/share/${PN} |
163 |
- doins -r "${WORKDIR}"/"${CARD_BASEV}"/* |
164 |
- else |
165 |
- # upstream bug #89 |
166 |
- # repo does not contain minimal cardsets in archive |
167 |
- insinto /usr/share/${PN} |
168 |
- doins -r "${WORKDIR}"/"${CARD_BASE_MINV}"/* |
169 |
- fi |
170 |
- |
171 |
- dosym ../doc/${PF}/html /usr/share/${PN}/html |
172 |
- |
173 |
- doman docs/*.6 |
174 |
- DOCS=( README.md AUTHORS.md docs/README docs/README.SOURCE ) |
175 |
- HTML_DOCS=( html-src/html/. ) |
176 |
- distutils-r1_python_install_all |
177 |
-} |