public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-board/scid/files/, games-board/scid/
@ 2020-06-21 12:37 Ulrich Müller
  0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2020-06-21 12:37 UTC (permalink / raw
  To: gentoo-commits

commit:     5a9f03995769cfd967bed5fd4f018ca16e6fe430
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 09:23:28 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 12:35:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a9f0399

games-board/scid: Make pgnfix script work with Python 3.

Closes: https://bugs.gentoo.org/728876
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../scid/files/scid-4.6.2-pgnfix-python3.patch     | 97 ++++++++++++++++++++++
 games-board/scid/scid-4.6.2-r1.ebuild              |  5 +-
 2 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch b/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch
new file mode 100644
index 00000000000..79b64e5ef6f
--- /dev/null
+++ b/games-board/scid/files/scid-4.6.2-pgnfix-python3.patch
@@ -0,0 +1,97 @@
+--- a/scripts/pgnfix.py
++++ b/scripts/pgnfix.py
+@@ -12,7 +12,6 @@
+ # put in the Site or Event field, and move them to the Date field.
+ 
+ import sys
+-import string
+ import re
+ 
+ if len(sys.argv) < 2:
+@@ -69,16 +68,16 @@
+             if match:
+                 full = match.group(0)
+                 last, first = match.groups()
+-                first = string.strip(first)
+-                full  = string.strip(full)
+-                last  = string.strip(last)
++                first = str.strip(first)
++                full  = str.strip(full)
++                last  = str.strip(last)
+                 if first:
+                     for name in (full, last,
+                                  last + " " + first,
+                                  last + ", " + first[0],
+                                  last + " " + first[0]):
+-                        name = string.lower(name)
+-                        if spelling.has_key(name):
++                        name = str.lower(name)
++                        if name in spelling:
+                             del spelling[name]
+                         else:
+                             spelling[name] = full
+@@ -107,16 +106,16 @@
+                 if error:
+                     out = sys.stderr
+                     error = 0
+-                out.write(string.join(current, ""))
++                out.write("".join(current))
+                 current = []
+                 bad_lines = []
+         else:
+             if headers:
+                 for field, value in specials.items():
+-                    if not headers.has_key(field):
++                    if not field in headers:
+                         headers[field] = value
+                 for field in order:
+-                    if headers.has_key(field):
++                    if field in headers:
+                         current.append('[%s "%s"]\n' % (field, headers[field]))
+                         del headers[field]
+                 for field, value in headers.items():
+@@ -172,7 +171,7 @@
+                 specials["Date"] = "%04d.%02d.%02d" % (year, month, day)
+                 value = re.sub("\(?([0-9]+)/([0-9]+)/([0-9]+)\)?", "", value)
+ 
+-        value = string.strip(value)
++        value = str.strip(value)
+ 
+         if field in ("White", "Black"):
+             name = re.sub("[MW][0-9]{5}", "", value)
+@@ -193,21 +192,21 @@
+                     name = re.sub("_", " ", name)
+                     name = re.sub("\.", "", name)
+                     name = re.sub("([A-Za-z])([0-9])", "\\1 \\2", name)
+-                    name = string.strip(name)
++                    name = str.strip(name)
+                     name = re.sub("^([A-Z]+?)\s*([A-Z][a-z].+)", "\\2, \\1",
+                                   name)
+ 
+                 name = re.sub(",\s*([GI]M)?$", "", name)
+ 
+-            name = string.strip(name)
+-            t = string.lower(name)
++            name = str.strip(name)
++            t = str.lower(name)
+ 
+-            if spelling.has_key(t):
++            if t in spelling:
+                 name = spelling[t]
+ 
+             headers[field] = name
+ 
+-        elif not bogus.has_key(field) or not re.search(bogus[field], value):
++        elif not field in bogus or not re.search(bogus[field], value):
+             headers[field] = value
+ 
+ if current:
+@@ -215,7 +214,7 @@
+     if error:
+         out = sys.stderr
+         error = 0
+-    out.write(string.join(current, ""))
++    out.write("".join(current))
+     current = []
+     bad_lines = []
+ 

diff --git a/games-board/scid/scid-4.6.2-r1.ebuild b/games-board/scid/scid-4.6.2-r1.ebuild
index f31b6be08e8..9a9a52b97b9 100644
--- a/games-board/scid/scid-4.6.2-r1.ebuild
+++ b/games-board/scid/scid-4.6.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit eutils toolchain-funcs gnome2-utils python-any-r1
 
 DESCRIPTION="a free chess database application"
@@ -38,6 +38,7 @@ src_unpack() {
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-pgnfix-python3.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/scid/files/, games-board/scid/
@ 2016-03-22 17:42 Michael Sterrett
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett @ 2016-03-22 17:42 UTC (permalink / raw
  To: gentoo-commits

commit:     15b36676c04c576a406300a76a4a75bfe6840848
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 05:25:17 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 17:42:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b36676

games-board/scid: clean old; dropped ppc to unstable

Package-Manager: portage-2.2.26

 games-board/scid/Manifest                      |   1 -
 games-board/scid/files/scid-4.5.2-gentoo.patch | 160 -------------------------
 games-board/scid/files/scid-4.6.0-gentoo.patch | 124 -------------------
 games-board/scid/scid-4.5.2.ebuild             | 102 ----------------
 4 files changed, 387 deletions(-)

diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest
index 7996684..2603877 100644
--- a/games-board/scid/Manifest
+++ b/games-board/scid/Manifest
@@ -1,4 +1,3 @@
-DIST Scid-4.5.2.zip 10271344 SHA256 9e371e78c9fa43cbda4d5851b6bad35f72f3f4f538c4bb9b28667d8ba59bbf43 SHA512 161c2ff1b1808c7e6d4ee02b527251d935b4554546385e336c3f7370a1c47891e31b975d59f5da0ed39175365f53b3400c1fffd550ea40caa090f87fbfbe62b7 WHIRLPOOL 7a362d22588542ce96e4b0d9df03a810bfe4c618329958838261eec5dca9431534dedbd58626e335c7c6d266beec1f1e2e1c695f4f903b3d739ecdb7a92cbb3d
 DIST photos.zip 1007488 SHA256 21aca2673df908a5960875872f127e0393bda0ef1db31003dd1c0d31583ff5a4 SHA512 c04fc810b457d4dbd9a9cfaac90feaa8c32a2abee05e28a79042ae81cb01e8580e2a1cf0abeff230ec2928da883f862b8901d679cb1448fd9ca0923323fbddd6 WHIRLPOOL dbbb8dd4ae37f0d84be929f09e6b583553b6c1cb6e866806388c61c54c09fb31b2a82baa6119b614416aa36dfc5250e63ac9afabbe6c561dcad8e71fe13caa99
 DIST ratings.zip 969347 SHA256 bb41a1bf35314231201d2f7d635497002b9dbc6d0f896a611239587a8c1b2830 SHA512 9b2a7280a7e72e2b464cc3da6be82ec9825b11d3c7e2219ab03a711c69f185f7d954eb3acdd441bff210e9296613df79a7e147a2ccbb4ed37b50af762abbd243 WHIRLPOOL a2b9ece83e167f0e1b330e1aa31cc46aa2cc79c3d124f1bcbd0f0edc7f9d434d210fdc78467efd1b7acb6f299a6f3440bc8599c5d7c62a55e5dc694685e56575
 DIST scid-4.6.2.zip 9768139 SHA256 4c04a7ce8fb44ded1af17aacf7950d8aeab4eb962dd76486dbf4a69307743af7 SHA512 d33f730857362dfefe55aaf395b0fc42087e190743ed63072128509fc6ac33791a4c2f67f89f03ec39170660fc6b7a6804fea084b383cf97cbb21661ce0569b2 WHIRLPOOL a8024ecab40aaf461b33237b362d9efb86c513bf5a49f8b2a64965cdbd1cce5b1f984636779dcab330efdf0adea958b4e45f051093d8c9c446288602951f987f

diff --git a/games-board/scid/files/scid-4.5.2-gentoo.patch b/games-board/scid/files/scid-4.5.2-gentoo.patch
deleted file mode 100644
index ce388e7..0000000
--- a/games-board/scid/files/scid-4.5.2-gentoo.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- engines/togaII1.2.1a/src/Makefile.old
-+++ engines/togaII1.2.1a/src/Makefile
-@@ -18,23 +18,16 @@
- 
- # general
- 
--CXX      = g++
--CXXFLAGS = -pipe -Wall
--LDFLAGS  = -lm
- 
- # C++
- 
--CXXFLAGS += -fno-exceptions -fno-rtti
- 
- # optimisation
- 
--CXXFLAGS += -O3 -fstrict-aliasing
--CXXFLAGS += -fomit-frame-pointer
- # CXXFLAGS += -march=athlon-xp # SELECT ME
- 
- # strip
- 
--LDFLAGS += -s
- 
- # dependencies
- 
---- tcl/utils/sound.tcl.old
-+++ tcl/utils/sound.tcl
-@@ -41,7 +41,7 @@
-   variable soundFolder
-   
-   ::splash::add "Setting up audio move announcement..."
--  if {[catch {package require snack 2.0}]} {
-+  if {[catch {package require snack}]} {
-     set hasSnackPackage 0
-     ::splash::add "    Move speech disabled - Snack sound package not found"
-     return
---- Makefile.conf.old
-+++ Makefile.conf
-@@ -193,7 +193,7 @@
- # Small extra programs. Most are written in Tcl using tkscid, but
- # a few contributed ones may be in Python or other languages.
- #
--SCRIPTS= sc_addmove sc_epgn sc_spell sc_eco sc_import sc_remote sc_tree scidpgn pgnfix spliteco spf2spi
-+SCRIPTS= sc_addmove sc_epgn sc_spell sc_eco sc_import sc_remote sc_tree scidpgn pgnfix eco2pgn spliteco spf2spi
- 
- ####################
- 
-@@ -218,25 +218,25 @@
- install: $(INSTALL)
- 
- install_scid: all_scid
--	install -m 755 -d $(SHAREDIR)
--	install -m 755 -d $(BINDIR)
--	install -m 755 scid $(SCRIPTS) $(EXECS) $(BINDIR)
--	install -m 644 -p scid.eco $(SHAREDIR)
--	install -m 755 -d $(SHAREDIR)/books
--	install -m 666 ./books/*.* $(SHAREDIR)/books/
--	install -m 755 -d $(SHAREDIR)/bases
--	if test -d ./bases; then install -m 666 ./bases/*.* $(SHAREDIR)/bases/ ; fi
--	install -m 755 -d $(SHAREDIR)/html
--	cp -r ./html/* $(SHAREDIR)/html/
--	install -m 755 -d $(SHAREDIR)/img/
--	cp -r ./img/* $(SHAREDIR)/img/
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)"
-+	install -m 755 -d "$(DESTDIR)$(BINDIR)"
-+	install -m 755 scid $(SCRIPTS) $(EXECS) "$(DESTDIR)$(BINDIR)"
-+	install -m 644 -p scid.eco "$(DESTDIR)$(SHAREDIR)"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/books"
-+	install -m 666 ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/bases"
-+	if test -d ./bases; then install -m 666 ./bases/*.* "$(DESTDIR)$(SHAREDIR)/bases/" ; fi
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/html"
-+	cp -r ./html/* "$(DESTDIR)$(SHAREDIR)/html/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/img/"
-+	cp -r ./img/* "$(DESTDIR)$(SHAREDIR)/img/"
- 
- install_engines: all_engines
--	install -m 755 -d $(SHAREDIR)/engines
--	install -m 755 -d $(SHAREDIR)/engines/phalanx-scid
--	install ./engines/phalanx-scid/phalanx-scid $(SHAREDIR)/engines/phalanx-scid
--	install -m 755 -d $(SHAREDIR)/engines/togaII1.2.1a
--	install ./engines/togaII1.2.1a/src/togaII $(SHAREDIR)/engines/togaII1.2.1a/
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
-+	install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"
-+	install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
- 
- install_mac: all
- 	install -m 755 -d dist/Scid.app/Contents/MacOS
-@@ -288,25 +288,25 @@
- 	hdiutil create -fs "HFS+" -volname Scid -srcfolder dist "Scid $(SCID_VERSION) (`sw_vers -productName` `sw_vers -productVersion` `uname -p`).dmg"
- 
- uninstall:
--	rm -rf $(SHAREDIR)/engines
--	rm -rf $(SHAREDIR)/books
--	rm -rf $(SHAREDIR)/bases
--	rm -rf $(SHAREDIR)/data/
--	rm -f $(SHAREDIR)/data/scid.eco
--	rm -f $(BINDIR)/scid $(BINDIR)/sc_addmove $(BINDIR)/sc_epgn
--	rm -f $(BINDIR)/sc_spell $(BINDIR)/sc_eco $(BINDIR)/sc_import
--	rm -f $(BINDIR)/sc_remote $(BINDIR)/sc_tree $(BINDIR)/scidpgn
--	rm -f $(BINDIR)/pgnfix $(BINDIR)/spliteco
--	rm -f $(BINDIR)/pgnscid $(BINDIR)/tkscid
--	rm -f $(BINDIR)/scmerge $(BINDIR)/scidlet
--	rm -rf $(SHAREDIR)/html
-+	rm -rf "$(DESTDIR)$(SHAREDIR)/engines"
-+	rm -rf "$(DESTDIR)$(SHAREDIR)/books"
-+	rm -rf "$(DESTDIR)$(SHAREDIR)/bases"
-+	rm -rf "$(DESTDIR)$(SHAREDIR)/data/"
-+	rm -f "$(DESTDIR)$(SHAREDIR)/data/scid.eco"
-+	rm -f "$(DESTDIR)$(BINDIR)/scid $(BINDIR)/sc_addmove" "$(DESTDIR)$(BINDIR)/sc_epgn"
-+	rm -f "$(DESTDIR)$(BINDIR)/sc_spell" "$(DESTDIR)$(BINDIR)/sc_eco" "$(DESTDIR)$(BINDIR)/sc_import"
-+	rm -f "$(DESTDIR)$(BINDIR)/sc_remote" "$(DESTDIR)$(BINDIR)/sc_tree" "$(DESTDIR)$(BINDIR)/scidpgn"
-+	rm -f "$(DESTDIR)$(BINDIR)/pgnfix" "$(DESTDIR)$(BINDIR)/spliteco"
-+	rm -f "$(DESTDIR)$(BINDIR)/pgnscid" "$(DESTDIR)$(BINDIR)/tkscid"
-+	rm -f "$(DESTDIR)$(BINDIR)/scmerge" "$(DESTDIR)$(BINDIR)/scidlet"
-+	rm -rf "$(DESTDIR)$(SHAREDIR)/html"
- 
- ### To remove Scid files placed in the BINDIR and SHAREDIR directories,
- #   type "make distclean".
- #
- distclean:
--	cd $(BINDIR) && rm -f $(EXECS) $(SCRIPTS)
--	-rm -f $(SHAREDIR)/scid.eco
-+	cd $(DESTDIR)$(BINDIR) && rm -f "$(EXECS)" "$(SCRIPTS)"
-+	-rm -f "$(DESTDIR)$(SHAREDIR)/scid.eco"
- 
- ### To remove object and executable files: type "make clean".
- #
---- tcl/start.tcl.old
-+++ tcl/start.tcl
-@@ -186,7 +186,7 @@
- 
-   # scidShareDir, scidImgDir, scidBooksDir, scidBasesDir, ecoFile:
-   # Location of Scid resources
--  set scidShareDir [file normalize [file join $scidExeDir "../share/scid"]]
-+  set scidShareDir "@GENTOO_DATADIR@"
-   if {! [file isdirectory $::scidShareDir]} {
-     set scidShareDir $::scidExeDir
-   }
-@@ -849,7 +849,7 @@
- 
- ### Audio move announcement options:
- 
--set ::utils::sound::soundFolder [file nativename [file join $::scidExeDir sounds]]
-+set ::utils::sound::soundFolder "@GENTOO_DATADIR@/sounds"
- set ::utils::sound::announceNew 0
- set ::utils::sound::announceForward 0
- set ::utils::sound::announceBack 0
-@@ -858,7 +858,7 @@
- if {$windowsOS} {
-   set spellCheckFile [file join $scidDataDir "spelling.ssp"]
- } else {
--  set spellCheckFile "/usr/local/share/scid/spelling.ssp"
-+  set spellCheckFile "@GENTOO_DATADIR@/spelling.ssp"
- }
- 
- # book configuration

diff --git a/games-board/scid/files/scid-4.6.0-gentoo.patch b/games-board/scid/files/scid-4.6.0-gentoo.patch
deleted file mode 100644
index a6f525a..0000000
--- a/games-board/scid/files/scid-4.6.0-gentoo.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- scid-4.6.0.orig/engines/togaII1.2.1a/src/Makefile
-+++ scid-4.6.0/engines/togaII1.2.1a/src/Makefile
-@@ -18,23 +18,16 @@
- 
- # general
- 
--CXX      = g++
--CXXFLAGS = -pipe -Wall
--LDFLAGS  = -lm
- 
- # C++
- 
--CXXFLAGS += -fno-exceptions -fno-rtti
- 
- # optimisation
- 
--CXXFLAGS += -O3 -fstrict-aliasing
--CXXFLAGS += -fomit-frame-pointer
- # CXXFLAGS += -march=athlon-xp # SELECT ME
- 
- # strip
- 
--LDFLAGS += -s
- 
- # dependencies
- 
---- scid-4.6.0.orig/Makefile.conf
-+++ scid-4.6.0/Makefile.conf
-@@ -157,32 +157,31 @@
- install: $(INSTALL)
- 
- install_scid: all_scid
--	install -m 755 -d "$(SHAREDIR)"
--	install -m 755 -d "$(BINDIR)"
--	install -m 755 $(SCRIPTS) $(EXECS) "$(BINDIR)"
--	rm -f "$(BINDIR)/scid"
--	@echo "#!/bin/sh" > "$(BINDIR)/scid"
--	@echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(BINDIR)/scid"
--	chmod 755 "$(BINDIR)/scid"
--	chmod +x "$(BINDIR)/scid"
--	install -m 644 -p scid.eco "$(SHAREDIR)"
--	install -m 755 -d "$(SHAREDIR)/books"
--	install -m 666 ./books/*.* "$(SHAREDIR)/books/"
--	install -m 755 -d "$(SHAREDIR)/bases"
--	if test -d ./bases; then install -m 666 ./bases/*.* "$(SHAREDIR)/bases/" ; fi
--	install -m 755 -d "$(SHAREDIR)/html"
--	cp -r ./html/* "$(SHAREDIR)/html/"
--	install -m 755 -d "$(SHAREDIR)/img/"
--	cp -r ./img/* "$(SHAREDIR)/img/"
--	install -m 755 -d "$(SHAREDIR)/tcl/"
--	cp -r ./tcl/* "$(SHAREDIR)/tcl/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)"
-+	install -m 755 -d "$(DESTDIR)$(BINDIR)"
-+	install -m 755 $(SCRIPTS) $(EXECS) "$(DESTDIR)$(BINDIR)"
-+	@echo "#!/bin/sh" > "$(DESTDIR)$(BINDIR)/scid"
-+	@echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(DESTDIR)$(BINDIR)/scid"
-+	chmod 755 "$(DESTDIR)$(BINDIR)/scid"
-+	chmod +x "$(DESTDIR)$(BINDIR)/scid"
-+	install -m 644 -p scid.eco "$(DESTDIR)$(SHAREDIR)"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/books"
-+	install -m 666 ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/bases"
-+	if test -d ./bases; then install -m 666 ./bases/*.* "$(DESTDIR)$(SHAREDIR)/bases/" ; fi
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/html"
-+	cp -r ./html/* "$(DESTDIR)$(SHAREDIR)/html/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/img/"
-+	cp -r ./img/* "$(DESTDIR)$(SHAREDIR)/img/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/tcl/"
-+	cp -r ./tcl/* "$(DESTDIR)$(SHAREDIR)/tcl/"
- 
- install_engines: all_engines
--	install -m 755 -d "$(SHAREDIR)/engines"
--	install -m 755 -d "$(SHAREDIR)/engines/phalanx-scid"
--	install ./engines/phalanx-scid/phalanx-scid "$(SHAREDIR)/engines/phalanx-scid"
--	install -m 755 -d "$(SHAREDIR)/engines/togaII1.2.1a"
--	install ./engines/togaII1.2.1a/src/togaII "$(SHAREDIR)/engines/togaII1.2.1a/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
-+	install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"
-+	install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
- 
- install_mac: all
- 	install -m 755 -d dist/Scid.app/Contents/MacOS
---- scid-4.6.0.orig/tcl/start.tcl
-+++ scid-4.6.0/tcl/start.tcl
-@@ -93,7 +93,7 @@
- 
-   # scidShareDir, scidImgDir, scidTclDir, scidBooksDir, scidBasesDir, ecoFile:
-   # Location of Scid resources
--  set scidShareDir [file normalize [file join $scidExeDir "../share/scid"]]
-+  set scidShareDir "@GENTOO_DATADIR@"
-   if {! [file isdirectory $::scidShareDir]} {
-     set scidShareDir $::scidExeDir
-   }
-@@ -785,7 +785,7 @@
- }
- 
- ### Audio move announcement options:
--set ::utils::sound::soundFolder [file nativename [file join $::scidExeDir sounds]]
-+set ::utils::sound::soundFolder "@GENTOO_DATADIR@/sounds"
- set ::utils::sound::announceNew 0
- set ::utils::sound::announceForward 0
- set ::utils::sound::announceBack 0
-@@ -794,7 +794,7 @@
- if {$windowsOS} {
-   set spellCheckFile [file join $scidDataDir "spelling.ssp"]
- } else {
--  set spellCheckFile "/usr/local/share/scid/spelling.ssp"
-+  set spellCheckFile "@GENTOO_DATADIR@//spelling.ssp"
- }
- 
- # book configuration
---- scid-4.6.0.orig/tcl/utils/sound.tcl
-+++ scid-4.6.0/tcl/utils/sound.tcl
-@@ -43,7 +43,7 @@
-   variable soundFolder
- 
-   set hasSound 1
--  if {[catch {package require snack 2.0}]} {
-+  if {[catch {package require snack}]} {
-     if {$::windowsOS} {
-       catch {
-         set ::utils::sound::pipe [open "| scidsnd.exe" "r+"]

diff --git a/games-board/scid/scid-4.5.2.ebuild b/games-board/scid/scid-4.5.2.ebuild
deleted file mode 100644
index 57ac948..0000000
--- a/games-board/scid/scid-4.5.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils toolchain-funcs gnome2-utils python-any-r1 games
-
-DESCRIPTION="a free chess database application"
-HOMEPAGE="http://scid.sourceforge.net/"
-SRC_URI="mirror://sourceforge/scid/Scid-${PV}.zip
-	mirror://sourceforge/scid/spelling.zip
-	mirror://sourceforge/scid/ratings.zip
-	mirror://sourceforge/scid/photos.zip
-	mirror://sourceforge/scid/scidlet40k.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-CDEPEND="dev-lang/tk:0
-	>=sys-libs/zlib-1.1.3"
-RDEPEND="${CDEPEND}
-	!games-board/chessdb"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	games_pkg_setup
-}
-
-src_unpack() {
-	default
-	mv scid-code-* ${P} || die
-}
-
-src_prepare() {
-	edos2unix engines/togaII1.2.1a/src/Makefile
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		tcl/start.tcl \
-		src/scidlet.cpp \
-		|| die "sed failed"
-	gzip ../ratings.ssp
-	python_fix_shebang .
-}
-
-src_configure() {
-	# configure is not an autotools script
-	./configure \
-		COMPILE="$(tc-getCXX)" \
-		LINK="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		OPTIMIZE="${CXXFLAGS}" \
-		TCL_INCLUDE="" \
-		BINDIR="${GAMES_BINDIR}" \
-		SHAREDIR="${GAMES_DATADIR}/${PN}" \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake all_scid
-}
-
-src_install() {
-	emake DESTDIR="${D}" install_scid
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r sounds
-
-	dodoc ChangeLog TODO
-	dohtml help/*.html
-
-	newicon -s scalable svg/scid_app.svg ${PN}.svg
-	make_desktop_entry scid Scid
-
-	cd .. || die
-	doins spelling.ssp ratings.ssp.gz *.spf
-	newins scidlet40k.sbk scidlet.sbk
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-	elog "To enable speech, emerge dev-tcltk/snack"
-	elog "To enable some piece sets, emerge dev-tcltk/tkimg"
-	elog "To enable Xfcc support, emerge dev-tcltk/tdom"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-06-21 12:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-21 12:37 [gentoo-commits] repo/gentoo:master commit in: games-board/scid/files/, games-board/scid/ Ulrich Müller
  -- strict thread matches above, loose matches on Subject: below --
2016-03-22 17:42 Michael Sterrett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox