--- scid_vs_pc-4.6.orig/tcl/config.tcl
+++ scid_vs_pc-4.6/tcl/config.tcl
@@ -8,7 +8,7 @@
 } elseif {$macApp} {
   set scidShareDir [file normalize [file join $scidExeDir "../Resources"]]
 } else {
-  set scidShareDir [file normalize [file join $scidExeDir "../share/scid"]]
+  set scidShareDir "@GENTOO_DATADIR@"
 }
 
 # also reset BooksDir if the variable is set, but doesn't exist S.A.
--- scid_vs_pc-4.6.orig/Makefile.conf
+++ scid_vs_pc-4.6/Makefile.conf
@@ -179,7 +179,7 @@
 # Small extra programs. Most are written in Tcl using tcscid, 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
+SCRIPTS= sc_addmove sc_epgn sc_spell sc_eco sc_import sc_remote sc_tree scidpgn pgnfix spliteco eco2pgn
 
 ####################
 
@@ -203,49 +203,39 @@
 install: install_scid install_engines
 
 install_scid: all_scid
-	install -m 755 -d $(SHAREDIR)
-	install -m 755 -d $(BINDIR)
-	install -m 755 -d $(SHAREDIR)/data/
-	install -m 755 scid $(SCRIPTS) $(EXECS) $(BINDIR)
-	install -m 644 -p scid.eco $(SHAREDIR)/data/
-	install -m 644 -p spelling.ssp $(SHAREDIR)
-	install -m 755 -d $(SHAREDIR)/books
-	install -m 666 ./books/* $(SHAREDIR)/books/
-	install -m 755 -d $(SHAREDIR)/bases
-	install -m 666 ./bases/* $(SHAREDIR)/bases/
-	install -m 755 -d $(SHAREDIR)/html
-	cp -r ./html/* $(SHAREDIR)/html/
-	chmod -R 0777 $(SHAREDIR)/html/*
+	install -m 755 -d $(DESTDIR)$(SHAREDIR)
+	install -m 755 -d $(DESTDIR)$(BINDIR)
+	install -m 755 -d $(DESTDIR)$(SHAREDIR)/data/
+	install -m 755 scid $(SCRIPTS) $(EXECS) $(DESTDIR)$(BINDIR)
+	install -m 644 -p scid.eco $(DESTDIR)$(SHAREDIR)/data/
+	install -m 644 -p spelling.ssp $(DESTDIR)$(SHAREDIR)
+	install -m 755 -d $(DESTDIR)$(SHAREDIR)/books
+	install -m 666 ./books/* $(DESTDIR)$(SHAREDIR)/books/
+	install -m 755 -d $(DESTDIR)$(SHAREDIR)/bases
+	install -m 666 ./bases/* $(DESTDIR)$(SHAREDIR)/bases/
+	install -m 755 -d $(DESTDIR)$(SHAREDIR)/html
+	cp -r ./html/* $(DESTDIR)$(SHAREDIR)/html/
+	chmod -R 0777 $(DESTDIR)$(SHAREDIR)/html/*
 	@if [ "`id -u`" -eq 0 ]; then \
-		install -m 755 -d $(FONTDIR); \
-		install -m 644 -p fonts/*.ttf $(FONTDIR); \
+		install -m 755 -d $(DESTDIR)$(FONTDIR); \
+		install -m 644 -p fonts/*.ttf $(DESTDIR)$(FONTDIR); \
 	else \
 		install -m 755 -d ~/.fonts; \
 		install -m 644 -p fonts/*.ttf ~/.fonts; \
 	fi
-	@if [ ! -z "`which fc-cache`" ]; then \
-		if [ "`id -u`" -eq 0 ]; then \
- 			fc-cache -fv $(FONTDIR); \
-		else \
-			fc-cache -fv ~/.fonts; \
-		fi; \
-	else \
-		echo "Don't know how to setup truetype fonts (fc-cache not available)."; \
-		echo "Please contact your system administrator."; \
-	fi
 
 install_engines: engines
-	install -m 755 -d $(SHAREDIR)/engines
-	install -m 755 -d $(SHAREDIR)/engines/phalanx
-	install -m 666 ./engines/phalanx/eco.phalanx $(SHAREDIR)/engines/phalanx
-	install -m 644 ./engines/phalanx/HISTORY $(SHAREDIR)/engines/phalanx
-	install -m 644 ./engines/phalanx/pbook.phalanx $(SHAREDIR)/engines/phalanx
-	install -m 644 ./engines/phalanx/README $(SHAREDIR)/engines/phalanx
-	install ./engines/phalanx/phalanx $(BINDIR)
-	install -m 755 -d $(SHAREDIR)/engines/toga
-	install -m 644 ./engines/toga/copying.txt $(SHAREDIR)/engines/toga
-	install -m 644 ./engines/toga/readme.txt $(SHAREDIR)/engines/toga
-	install ./engines/toga/src/fruit $(BINDIR)
+	install -m 755 -d $(DESTDIR)$(SHAREDIR)/engines
+	install -m 755 -d $(DESTDIR)$(SHAREDIR)/engines/phalanx
+	install -m 666 ./engines/phalanx/eco.phalanx $(DESTDIR)$(SHAREDIR)/engines/phalanx
+	install -m 644 ./engines/phalanx/HISTORY $(DESTDIR)$(SHAREDIR)/engines/phalanx
+	install -m 644 ./engines/phalanx/pbook.phalanx $(DESTDIR)$(SHAREDIR)/engines/phalanx
+	install -m 644 ./engines/phalanx/README $(DESTDIR)$(SHAREDIR)/engines/phalanx
+	install ./engines/phalanx/phalanx $(DESTDIR)$(BINDIR)
+	install -m 755 -d $(DESTDIR)$(SHAREDIR)/engines/toga
+	install -m 644 ./engines/toga/copying.txt $(DESTDIR)$(SHAREDIR)/engines/toga
+	install -m 644 ./engines/toga/readme.txt $(DESTDIR)$(SHAREDIR)/engines/toga
+	install ./engines/toga/src/fruit $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -rf $(SHAREDIR)/engines
--- scid_vs_pc-4.6.orig/tcl/utils/sound.tcl
+++ scid_vs_pc-4.6/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