Reroll patch and add more deps to the scmerge build to fix bug #273200

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 22 insertions, 8 deletions

diff --git a/games-board/chessdb/ChangeLog b/games-board/chessdb/ChangeLog
index 10799cd2c267..5f0269a6c54c 100644
--- a/games-board/chessdb/ChangeLog
+++ b/games-board/chessdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/chessdb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/chessdb/ChangeLog,v 1.4 2009/09/15 17:41:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/chessdb/ChangeLog,v 1.5 2009/09/15 18:05:04 mr_bones_ Exp $
+
+  15 Sep 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  chessdb-3.6.18.ebuild, files/chessdb-3.6.18-gentoo.patch:
+  Reroll patch and add more deps to the scmerge build to fix bug #273200
 
   15 Sep 2009; Michael Sterrett <mr_bones_@gentoo.org>
   chessdb-3.6.18.ebuild:
diff --git a/games-board/chessdb/chessdb-3.6.18.ebuild b/games-board/chessdb/chessdb-3.6.18.ebuild
index 1820b33da9be..2ab651a63738 100644
--- a/games-board/chessdb/chessdb-3.6.18.ebuild
+++ b/games-board/chessdb/chessdb-3.6.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/chessdb/chessdb-3.6.18.ebuild,v 1.4 2009/09/15 17:41:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/chessdb/chessdb-3.6.18.ebuild,v 1.5 2009/09/15 18:05:04 mr_bones_ Exp $
 
 EAPI=2
 inherit toolchain-funcs eutils games
@@ -28,7 +28,6 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}"-gentoo.patch
 	sed -i \
 		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		-e "s:@snack_path@:/usr/lib/snack2.2:" \
 		tcl/start.tcl || die "sed failed"
 }
 
diff --git a/games-board/chessdb/files/chessdb-3.6.18-gentoo.patch b/games-board/chessdb/files/chessdb-3.6.18-gentoo.patch
index b39957d12ce6..83e79bc8f34c 100644
--- a/games-board/chessdb/files/chessdb-3.6.18-gentoo.patch
+++ b/games-board/chessdb/files/chessdb-3.6.18-gentoo.patch
@@ -1,5 +1,6 @@
---- Makefile.conf.old	2007-07-11 23:58:57.000000000 +0200
-+++ Makefile.conf	2007-07-12 00:01:32.000000000 +0200
+diff -ru ChessDB-3.6.18.orig/Makefile.conf ChessDB-3.6.18/Makefile.conf
+--- ChessDB-3.6.18.orig/Makefile.conf	2007-04-25 06:09:51.000000000 -0400
++++ ChessDB-3.6.18/Makefile.conf	2009-09-15 13:58:13.390702234 -0400
 @@ -227,14 +227,14 @@
  #   for all users, and put extra files in $SHAREDIR, type "make install".
  #
@@ -22,14 +23,24 @@
  	install -m 755 chessdb $(SCRIPTS) $(EXECS) $(DESTDIR)$(BINDIR)
  	-install -m 755 -d $(DESTDIR)$(SHAREDIR)
  	-install -m 644 -p chessdb.eco ratings.ssp $(DESTDIR)$(SHAREDIR)
---- tcl/start.tcl.old	2007-07-13 08:10:20.000000000 +0200
-+++ tcl/start.tcl	2007-07-13 08:15:07.000000000 +0200
+@@ -339,7 +339,7 @@
+ 
+ scmerge: src/scmerge.o src/misc.o src/index.o src/date.o src/namebase.o \
+           src/gfile.o src/bytebuf.o src/textbuf.o src/myassert.o \
+-          src/stralloc.o
++          src/stralloc.o $(OBJS)
+ 	$(LINK) -o scmerge src/scmerge.o $(OBJS) -lz
+ 
+ pgnchessdb: src/pgnchessdb.o $(OBJS)
+diff -ru ChessDB-3.6.18.orig/tcl/start.tcl ChessDB-3.6.18/tcl/start.tcl
+--- ChessDB-3.6.18.orig/tcl/start.tcl	2007-04-21 17:51:42.000000000 -0400
++++ ChessDB-3.6.18/tcl/start.tcl	2009-09-15 13:59:18.354832575 -0400
 @@ -17,7 +17,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 tkchessdb: \
 -exec tkchessdb "$0" "$@"
-+TCLLIBPATH="@snack_path@ $TCLLIBPATH" exec tkchessdb "$0" "$@"
++TCLLIBPATH="/usr/lib/snack2.2 $TCLLIBPATH" exec tkchessdb "$0" "$@"
  
  # For the above to work, tkchessdb must be in a directory in your PATH.
  # Alternatively, you can set the first line to start tkchessdb directly