Fix for wrong files path, one raising bug #181804

(Portage version: 2.1.2.12)

5 files changed, 83 insertions, 42 deletions

diff --git a/games-board/scid/ChangeLog b/games-board/scid/ChangeLog
index f81019c83c77..ece88597f84f 100644
--- a/games-board/scid/ChangeLog
+++ b/games-board/scid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-board/scid
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/scid/ChangeLog,v 1.14 2007/03/12 13:52:37 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/scid/ChangeLog,v 1.15 2007/08/30 10:49:10 tupone Exp $
+
+*scid-3.6.1-r2 (30 Aug 2007)
+
+  30 Aug 2007; <tupone@gentoo.org> +files/scid-3.6.1-gentoo.patch,
+  -files/scid-3.6.1-snack.patch, -scid-3.6.1-r1.ebuild,
+  +scid-3.6.1-r2.ebuild:
+  Fix for wrong files path, one raising bug #181804 by R. Stephan
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org> scid-3.6.1-r1.ebuild:
   Replacing einfo with elog
diff --git a/games-board/scid/files/digest-scid-3.6.1-r1 b/games-board/scid/files/digest-scid-3.6.1-r2
index bb3cefb37c93..9bed50b2ead3 100644
--- a/games-board/scid/files/digest-scid-3.6.1-r1
+++ b/games-board/scid/files/digest-scid-3.6.1-r2
@@ -7,9 +7,6 @@ SHA256 bb41a1bf35314231201d2f7d635497002b9dbc6d0f896a611239587a8c1b2830 ratings.
 MD5 3c9483a7990a2629a35a787c1c29eee0 scid-3.6.1.tar.gz 2272946
 RMD160 ebc660d56fe5e29429586e76904d9238185a1c0c scid-3.6.1.tar.gz 2272946
 SHA256 42665fba00f9cf8dd7d4e4c13a6b281e3c48d4dcd91d9f78f75b29e3485aaa05 scid-3.6.1.tar.gz 2272946
-MD5 1f585e7012627e9ebd82a17d5c5766dd scid-extras-08232002.tar.bz2 1209029
-RMD160 37af53ab29e5a62f10fb9590a4575bd717f1c733 scid-extras-08232002.tar.bz2 1209029
-SHA256 24ba1a34e9187d718b0c482245079ffdb0f26099e666b33db051f166d6d3d160 scid-extras-08232002.tar.bz2 1209029
 MD5 88fa5d5d38b1b5c34ede70f89d82703d scidlet40k.zip 242632
 RMD160 f8303ff4f0106ddbc5e8c19d9cdac69842d991e3 scidlet40k.zip 242632
 SHA256 fbab2a31e37f2d606140144ac1086ece035b991a756eef804a660c8ecb0f56bb scidlet40k.zip 242632
diff --git a/games-board/scid/files/scid-3.6.1-gentoo.patch b/games-board/scid/files/scid-3.6.1-gentoo.patch
new file mode 100644
index 000000000000..2bcd2ee6f0d5
--- /dev/null
+++ b/games-board/scid/files/scid-3.6.1-gentoo.patch
@@ -0,0 +1,70 @@
+--- tcl/utils/sound.tcl.old	2006-09-08 00:26:02.000000000 +0200
++++ tcl/utils/sound.tcl	2006-09-08 00:26:19.000000000 +0200
+@@ -38,7 +38,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
+--- tcl/start.tcl.old	2007-08-30 11:45:25.000000000 +0200
++++ tcl/start.tcl	2007-08-30 11:51:26.000000000 +0200
+@@ -16,7 +16,7 @@
+ # The "\" at the end of the comment line below is necessary! It means
+ #   that the "exec" line is a comment to Tcl/Tk, but not to /bin/sh.
+ # The next line restarts using tkscid: \
+-exec tkscid "$0" "$@"
++TCLLIBPATH="@snack_path@ $TCLLIBPATH" exec tkscid "$0" "$@"
+ 
+ # For the above to work, tkscid must be in a directory in your PATH.
+ # Alternatively, you can set the first line to start tkscid directly
+@@ -117,17 +117,13 @@
+ # scidConfigDir, scidDataDir, scidLogDir:
+ #   Location of Scid configuration, data and log files.
+ set scidConfigDir [file nativename [file join $scidUserDir "config"]]
+-set scidDataDir [file nativename [file join $scidUserDir "data"]]
++set scidDataDir "@GENTOO_DATADIR@"
+ set scidLogDir [file nativename [file join $scidUserDir "log"]]
+ 
+ # ecoFile: the ECO file for opening classification. Scid will try to load
+ # this first, and if that fails, it will try to load  "scid.eco" in the
+ # current directory.
+-if {$windowsOS} {
+   set ecoFile [file join $scidDataDir "scid.eco"]
+-} else {
+-  set ecoFile "/usr/local/share/scid/scid.eco"
+-}
+ 
+ # boardSizes: a list of the available board sizes.
+ set boardSizes [list 25 30 35 40 45 50 55 60 65 70]
+@@ -597,18 +593,14 @@
+ 
+ ### Audio move announcement options:
+ 
+-set ::utils::sound::soundFolder [file nativename [file join $::scidExeDir sounds]]
++set ::utils::sound::soundFolder [file nativename [file join $::scidDataDir sounds]]
+ set ::utils::sound::announceNew 0
+ set ::utils::sound::announceForward 0
+ set ::utils::sound::announceBack 0
+ 
+ 
+ # Spell-checking file: default is "spelling.ssp".
+-if {$windowsOS} {
+   set spellCheckFile [file join $scidDataDir "spelling.ssp"]
+-} else {
+-  set spellCheckFile "/usr/local/share/scid/spelling.ssp"
+-}
+ 
+ # Engines list file: -- OLD NAMES, NO LONGER USED
+ #set engines(file) [file join $scidUserDir "engines.lis"]
+@@ -863,7 +855,7 @@
+ }
+ 
+ makeScidDir $scidConfigDir
+-makeScidDir $scidDataDir
++#makeScidDir $scidDataDir
+ makeScidDir $scidLogDir
+ 
+ # Rename old email log file if necessary:
diff --git a/games-board/scid/files/scid-3.6.1-snack.patch b/games-board/scid/files/scid-3.6.1-snack.patch
deleted file mode 100644
index fa34a8d280d6..000000000000
--- a/games-board/scid/files/scid-3.6.1-snack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- tcl/start.tcl.old	2006-09-08 00:13:23.000000000 +0200
-+++ tcl/start.tcl	2006-09-08 00:15:06.000000000 +0200
-@@ -16,7 +16,7 @@
- # The "\" at the end of the comment line below is necessary! It means
- #   that the "exec" line is a comment to Tcl/Tk, but not to /bin/sh.
- # The next line restarts using tkscid: \
--exec tkscid "$0" "$@"
-+TCLLIBPATH="@snack_path@ $TCLLIBPATH" exec tkscid "$0" "$@"
- 
- # For the above to work, tkscid must be in a directory in your PATH.
- # Alternatively, you can set the first line to start tkscid directly
-@@ -597,7 +597,7 @@
- 
- ### Audio move announcement options:
- 
--set ::utils::sound::soundFolder [file nativename [file join $::scidExeDir sounds]]
-+set ::utils::sound::soundFolder [file nativename [file join @GENTOO_DATA@ sounds]]
- set ::utils::sound::announceNew 0
- set ::utils::sound::announceForward 0
- set ::utils::sound::announceBack 0
---- tcl/utils/sound.tcl.old	2006-09-08 00:26:02.000000000 +0200
-+++ tcl/utils/sound.tcl	2006-09-08 00:26:19.000000000 +0200
-@@ -38,7 +38,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
diff --git a/games-board/scid/scid-3.6.1-r1.ebuild b/games-board/scid/scid-3.6.1-r2.ebuild
index 4aed767c694d..3631884d2383 100644
--- a/games-board/scid/scid-3.6.1-r1.ebuild
+++ b/games-board/scid/scid-3.6.1-r2.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/scid/scid-3.6.1-r1.ebuild,v 1.3 2007/03/12 13:52:37 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/scid/scid-3.6.1-r2.ebuild,v 1.1 2007/08/30 10:49:10 tupone Exp $
 
 inherit eutils games
 
 DESCRIPTION="a free chess database application"
 HOMEPAGE="http://scid.sourceforge.net/"
 SRC_URI="mirror://sourceforge/scid/${P}.tar.gz
-	http://www.visi.com/~veldy/gentoo/scid-extras-08232002.tar.bz2
 	mirror://sourceforge/scid/photos.zip
 	mirror://sourceforge/scid/ratings.zip
 	mirror://sourceforge/scid/scidlet40k.zip"
@@ -28,10 +27,10 @@ DEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-snack.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 	sed -i \
 		-e "s:@snack_path@:/lib/snack2.2:" \
-		-e "s:@GENTOO_DATA@:${GAMES_DATADIR}/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
 		tcl/start.tcl
 }
 
@@ -56,9 +55,8 @@ src_install() {
 	dohtml help/*.html
 
 	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r sounds || die "doins failed"
-	cd "${WORKDIR}"
-	doins scidlet40k.sbk gm.spf historic.spf ratings.ssp scid.eco \
+	doins -r scid.eco sounds spelling.ssp \
+		../{gm.spf,historic.spf,ratings.ssp,scidlet40k.sbk} \
 		|| die "doins failed"
 
 	prepgamesdirs