Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/scid/, games-board/scid/files/
Date: Sun, 25 Jul 2021 01:36:35
Message-Id: 1627176910.d6314a589936029a7512249250414af228d3edd7.ionen@gentoo
1 commit: d6314a589936029a7512249250414af228d3edd7
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 25 00:49:32 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 25 01:35:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6314a58
7
8 games-board/scid: drop 4.6.2-r1
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 games-board/scid/Manifest | 5 -
13 games-board/scid/files/scid-4.6.2-gentoo.patch | 127 -------------------------
14 games-board/scid/scid-4.6.2-r1.ebuild | 99 -------------------
15 3 files changed, 231 deletions(-)
16
17 diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest
18 index 9fe9859e527..03d47a9060b 100644
19 --- a/games-board/scid/Manifest
20 +++ b/games-board/scid/Manifest
21 @@ -1,7 +1,2 @@
22 -DIST photos.zip 1007488 BLAKE2B 8b0f9b0402d9102bda4cfe1333cafdf048592004b2b8cb7f8f085eacc10b6b89811afd39c3d849a4f6288ad63145fc760e60bcd70867ae339459a451c537cbf3 SHA512 c04fc810b457d4dbd9a9cfaac90feaa8c32a2abee05e28a79042ae81cb01e8580e2a1cf0abeff230ec2928da883f862b8901d679cb1448fd9ca0923323fbddd6
23 -DIST ratings.zip 969347 BLAKE2B 47d050f7c0e00e96aa0371db7f328e699cd0e34eafa3652664f00df7fe08b98adc4197c5235303d6df2c5bcf7ea568c753d23ac5fffe3616de6db9dae21a31a3 SHA512 9b2a7280a7e72e2b464cc3da6be82ec9825b11d3c7e2219ab03a711c69f185f7d954eb3acdd441bff210e9296613df79a7e147a2ccbb4ed37b50af762abbd243
24 -DIST scid-4.6.2.zip 9768139 BLAKE2B 8e9baf2fe67c3566111f23ead005cba34d32f986afbaaed2117dc46aab65190dd8675df721c6fff3e7c5f338a07d7b787265dee63480141258625f6b6f54ec6d SHA512 d33f730857362dfefe55aaf395b0fc42087e190743ed63072128509fc6ac33791a4c2f67f89f03ec39170660fc6b7a6804fea084b383cf97cbb21661ce0569b2
25 DIST scid-4.7.0_x64_linux.tar.gz 129771457 BLAKE2B 65ad7b58685a498954ebcf5216287216e2d2805bf0379784195b096c9eb04b333a8bbfb6c020c321b66c63d7bad2cfba724750b4d26f8172f620047219f98a73 SHA512 c9fb6f19741d60fe4952c643240f7e2eaa476eab35379c0a053b35217fe7a4b9ecfbc68edc45df4c9a2354babe8e0ddd2211db014d5396ce9bbb59db531c1179
26 DIST scid-code-4.7.0.zip 15782104 BLAKE2B f1b927a1b23478d2e27a098e2ec99acb9a2061c373686cfcfa14ac219a1dce47468c3e46b3fe786655792177c86180bbe8e1dc91927b3ad2a80ea9b0bdb17fd3 SHA512 3c43fb8877da4a8dda9c99b1b856fe3f3840c7013041d53c31c8411ecf2e9ccbaf3b7c098e35cb23f5d0d7cac6b7514ca3bfb719fcbc111f5e1ef07f765f2708
27 -DIST scidlet40k.zip 242632 BLAKE2B a16c5a3c04f721a40221db33f9ff7192dba724203ff81a61286903c2f4ab8a33b442503882550a7a59ab0a0e6d735a74b3f34bf9dd89f9677f2b7a8b8082d398 SHA512 e8cb4ca276ca94378f224fad972b0659f3e8159668fa395dcae4be1de6cdd9d29082fdddba393bbea6c909bab4f388042ea05c7dff41edf850d731bc7479850d
28 -DIST spelling.zip 3147998 BLAKE2B 40b33e0c5fab487247af13b0e3fa22d91b17cfb1dbc7d3fafd080db306700e684b30bf46a7222dd7ae16dc1407239973be8de1ee619b31cbcb373684a7f1487c SHA512 394a8835f23336b6f4bebe4e33ab9f64ffa505e9d9bb984de82396e671df0b57b088aab28c5cf648c1a11bc28370b431cb6db54765ac4ab6056a707276ba8f42
29
30 diff --git a/games-board/scid/files/scid-4.6.2-gentoo.patch b/games-board/scid/files/scid-4.6.2-gentoo.patch
31 deleted file mode 100644
32 index 6afd56b5bad..00000000000
33 --- a/games-board/scid/files/scid-4.6.2-gentoo.patch
34 +++ /dev/null
35 @@ -1,127 +0,0 @@
36 ---- scid-4.6.1.orig/engines/togaII1.2.1a/src/Makefile
37 -+++ scid-4.6.1/engines/togaII1.2.1a/src/Makefile
38 -@@ -18,23 +18,16 @@
39 -
40 - # general
41 -
42 --CXX = g++
43 --CXXFLAGS = -pipe -Wall
44 --LDFLAGS = -lm
45 -
46 - # C++
47 -
48 --CXXFLAGS += -fno-exceptions -fno-rtti
49 -
50 - # optimisation
51 -
52 --CXXFLAGS += -O3 -fstrict-aliasing
53 --CXXFLAGS += -fomit-frame-pointer
54 - # CXXFLAGS += -march=athlon-xp # SELECT ME
55 -
56 - # strip
57 -
58 --LDFLAGS += -s
59 -
60 - # dependencies
61 -
62 ---- scid-4.6.1.orig/Makefile.conf
63 -+++ scid-4.6.1/Makefile.conf
64 -@@ -157,32 +157,32 @@
65 - install: $(INSTALL)
66 -
67 - install_scid: all_scid
68 -- install -m 755 -d "$(SHAREDIR)"
69 -- install -m 755 -d "$(BINDIR)"
70 -- install -m 755 $(SCRIPTS) $(EXECS) "$(BINDIR)"
71 -- rm -f "$(BINDIR)/scid"
72 -- @echo "#!/bin/sh" > "$(BINDIR)/scid"
73 -- @echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(BINDIR)/scid"
74 -- chmod 755 "$(BINDIR)/scid"
75 -- chmod +x "$(BINDIR)/scid"
76 -- install -m 644 -p scid.eco "$(SHAREDIR)"
77 -- install -m 755 -d "$(SHAREDIR)/books"
78 -- install -m 666 ./books/*.* "$(SHAREDIR)/books/"
79 -- install -m 755 -d "$(SHAREDIR)/bases"
80 -- if test -d ./bases; then install -m 666 ./bases/*.* "$(SHAREDIR)/bases/" ; fi
81 -- install -m 755 -d "$(SHAREDIR)/html"
82 -- cp -r ./html/* "$(SHAREDIR)/html/"
83 -- install -m 755 -d "$(SHAREDIR)/img/"
84 -- cp -r ./img/* "$(SHAREDIR)/img/"
85 -- install -m 755 -d "$(SHAREDIR)/tcl/"
86 -- cp -r ./tcl/* "$(SHAREDIR)/tcl/"
87 -+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)"
88 -+ install -m 755 -d "$(DESTDIR)$(BINDIR)"
89 -+ install -m 755 $(SCRIPTS) $(EXECS) "$(DESTDIR)$(BINDIR)"
90 -+ rm -f "$(DESTDIR)$(BINDIR)/scid"
91 -+ @echo "#!/bin/sh" > "$(DESTDIR)$(BINDIR)/scid"
92 -+ @echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(DESTDIR)$(BINDIR)/scid"
93 -+ chmod 755 "$(DESTDIR)$(BINDIR)/scid"
94 -+ chmod +x "$(DESTDIR)$(BINDIR)/scid"
95 -+ install -m 644 -p scid.eco "$(DESTDIR)$(SHAREDIR)"
96 -+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/books"
97 -+ install -m 666 ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/"
98 -+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/bases"
99 -+ if test -d ./bases; then install -m 666 ./bases/*.* "$(DESTDIR)$(SHAREDIR)/bases/" ; fi
100 -+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/html"
101 -+ cp -r ./html/* "$(DESTDIR)$(SHAREDIR)/html/"
102 -+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/img/"
103 -+ cp -r ./img/* "$(DESTDIR)$(SHAREDIR)/img/"
104 -+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/tcl/"
105 -+ cp -r ./tcl/* "$(DESTDIR)$(SHAREDIR)/tcl/"
106 -
107 - install_engines: all_engines
108 -- install -m 755 -d "$(SHAREDIR)/engines"
109 -- install -m 755 -d "$(SHAREDIR)/engines/phalanx-scid"
110 -- install ./engines/phalanx-scid/phalanx-scid "$(SHAREDIR)/engines/phalanx-scid"
111 -- install -m 755 -d "$(SHAREDIR)/engines/togaII1.2.1a"
112 -- install ./engines/togaII1.2.1a/src/togaII "$(SHAREDIR)/engines/togaII1.2.1a/"
113 -+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines"
114 -+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
115 -+ install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
116 -+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"
117 -+ install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
118 -
119 - install_mac: all
120 - install -m 755 -d dist/Scid.app/Contents/MacOS
121 ---- scid-4.6.1.orig/tcl/options.tcl
122 -+++ scid-4.6.1/tcl/options.tcl
123 -@@ -598,7 +598,7 @@
124 - }
125 -
126 - ### Audio move announcement options:
127 --set ::utils::sound::soundFolder [file nativename [file join $::scidExeDir sounds]]
128 -+set ::utils::sound::soundFolder "@GENTOO_DATADIR@/sounds"
129 - set ::utils::sound::announceNew 0
130 - set ::utils::sound::announceForward 0
131 - set ::utils::sound::announceBack 0
132 -@@ -607,7 +607,7 @@
133 - if {$windowsOS} {
134 - set spellCheckFile [file join $scidExeDir "spelling.ssp"]
135 - } else {
136 -- set spellCheckFile "/usr/local/share/scid/spelling.ssp"
137 -+ set spellCheckFile "@GENTOO_DATADIR@/spelling.ssp"
138 - }
139 -
140 - # book configuration
141 ---- scid-4.6.1.orig/tcl/start.tcl
142 -+++ scid-4.6.1/tcl/start.tcl
143 -@@ -93,7 +93,7 @@
144 -
145 - # scidShareDir, scidImgDir, scidTclDir, scidBooksDir, scidBasesDir, ecoFile:
146 - # Location of Scid resources
147 -- set scidShareDir [file normalize [file join $scidExeDir "../share/scid"]]
148 -+ set scidShareDir "@GENTOO_DATADIR@"
149 - if {! [file isdirectory $::scidShareDir]} {
150 - set scidShareDir $::scidExeDir
151 - }
152 ---- scid-4.6.1.orig/tcl/utils/sound.tcl
153 -+++ scid-4.6.1/tcl/utils/sound.tcl
154 -@@ -43,7 +43,7 @@
155 - variable soundFolder
156 -
157 - set hasSound 1
158 -- if {[catch {package require snack 2.0}]} {
159 -+ if {[catch {package require snack}]} {
160 - if {$::windowsOS} {
161 - catch {
162 - set ::utils::sound::pipe [open "| scidsnd.exe" "r+"]
163
164 diff --git a/games-board/scid/scid-4.6.2-r1.ebuild b/games-board/scid/scid-4.6.2-r1.ebuild
165 deleted file mode 100644
166 index a0b1c5a74bd..00000000000
167 --- a/games-board/scid/scid-4.6.2-r1.ebuild
168 +++ /dev/null
169 @@ -1,99 +0,0 @@
170 -# Copyright 1999-2021 Gentoo Authors
171 -# Distributed under the terms of the GNU General Public License v2
172 -
173 -EAPI=6
174 -
175 -PYTHON_COMPAT=( python3_{7,8,9} )
176 -inherit desktop edos2unix toolchain-funcs gnome2-utils python-any-r1
177 -
178 -DESCRIPTION="a free chess database application"
179 -HOMEPAGE="http://scid.sourceforge.net/"
180 -SRC_URI="mirror://sourceforge/scid/${P}.zip
181 - mirror://sourceforge/scid/spelling.zip
182 - mirror://sourceforge/scid/ratings.zip
183 - mirror://sourceforge/scid/photos.zip
184 - mirror://sourceforge/scid/scidlet40k.zip"
185 -
186 -LICENSE="GPL-2"
187 -SLOT="0"
188 -KEYWORDS="~amd64 ~x86"
189 -
190 -CDEPEND="dev-lang/tk:0
191 - dev-tcltk/tkimg
192 - >=sys-libs/zlib-1.1.3"
193 -RDEPEND="${CDEPEND}
194 - !games-board/chessdb"
195 -DEPEND="${CDEPEND}
196 - ${PYTHON_DEPS}
197 - app-arch/unzip"
198 -
199 -pkg_setup() {
200 - python-any-r1_pkg_setup
201 -}
202 -
203 -src_unpack() {
204 - default
205 - mv scid-src ${P} || die
206 -}
207 -
208 -PATCHES=(
209 - "${FILESDIR}"/${P}-gentoo.patch
210 - "${FILESDIR}"/${P}-pgnfix-python3.patch
211 -)
212 -
213 -src_prepare() {
214 - default
215 - edos2unix engines/togaII1.2.1a/src/Makefile
216 - sed -i \
217 - -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
218 - tcl/start.tcl || die
219 - sed -i \
220 - -e "/COMPILE.*testzlib/s:\$var(COMPILE):$(tc-getCXX):" \
221 - configure || die
222 - gzip ../ratings.ssp || die
223 - python_fix_shebang .
224 -}
225 -
226 -src_configure() {
227 - # configure is not an autotools script
228 - ./configure \
229 - COMPILE="$(tc-getCXX)" \
230 - LINK="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}" \
231 - CC="$(tc-getCC)" \
232 - OPTIMIZE="${CXXFLAGS}" \
233 - TCL_INCLUDE="" \
234 - BINDIR="/usr/bin" \
235 - SHAREDIR="/usr/share/${PN}" || die
236 -}
237 -
238 -src_compile() {
239 - emake all_scid
240 -}
241 -
242 -src_install() {
243 - emake DESTDIR="${D}" install_scid
244 - insinto /usr/share/${PN}
245 - doins -r sounds
246 -
247 - dodoc ChangeLog TODO help/*.html
248 -
249 - newicon -s scalable svg/scid_app.svg ${PN}.svg
250 - make_desktop_entry scid Scid
251 -
252 - doins ../spelling.ssp ../ratings.ssp.gz ../*.spf
253 - newins ../scidlet40k.sbk scidlet.sbk
254 -}
255 -
256 -pkg_preinst() {
257 - gnome2_icon_savelist
258 -}
259 -
260 -pkg_postinst() {
261 - gnome2_icon_cache_update
262 - elog "To enable speech, emerge dev-tcltk/snack"
263 - elog "To enable Xfcc support, emerge dev-tcltk/tdom"
264 -}
265 -
266 -pkg_postrm() {
267 - gnome2_icon_cache_update
268 -}