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

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 25 insertions, 11 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/Manifest b/games-board/chessdb/Manifest
index 94fbc6ba2859..071def88e5f9 100644
--- a/games-board/chessdb/Manifest
+++ b/games-board/chessdb/Manifest
@@ -1,6 +1,6 @@
-AUX chessdb-3.6.18-gentoo.patch 2546 RMD160 7d6e8bf1dc01d8fa8f9e1a85756b26934a175f60 SHA1 37c7d3a70fb3d628c943b5e63659133ef68edc66 SHA256 28475d1598a47d806036128610846e80d1cfa702a63aaf1b711d93edb0a93d04
+AUX chessdb-3.6.18-gentoo.patch 3069 RMD160 485e174d9ddc0c228366fd760c55b258301a8778 SHA1 460b014a39ecfd6115239f164492f7a7733fdd19 SHA256 1f5ad6873e834a8d4226056a323a7f95ad4aa1797d7d10a9daaea1f09c386b64
 DIST 4-piece-tablebases.zip 30799501 RMD160 c59961176dbdca328f0a797da8ceff7832eca4c8 SHA1 3ce9cd54705626d386c3b325451d71bdfcc7e8a3 SHA256 86706176cf3fe38caefbef6ac7331500bec3571677f240d3844adfa26681c07d
 DIST ChessDB-3.6.18.tar.gz 10183596 RMD160 7806b05f9215f0032484c6461d7e3f718d5f5528 SHA1 456ff217ebdb0f6231a507ce737747c964f77f6e SHA256 7c8dbaaba64d7b2b8131720da5a657cac297a4f1eb9710286b372e22d95d9ee6
-EBUILD chessdb-3.6.18.ebuild 1699 RMD160 c58fce5c9fc6670a3b94c33093862598c2790ad6 SHA1 a6cc8472dc45ff2c5848c51449b80560f263617e SHA256 8c55a4c04fcddd245732bc00e8acb3f2dfea132e75898091bc456341064bfaab
-MISC ChangeLog 638 RMD160 1406c07fde10e077162fb161379d5ed3876d2546 SHA1 2934da0cfda768b807dd3f95297594fcba00bf10 SHA256 4aed06d60e2466500bf5e2229676902642768ddc72a744082fe6fb44a6ecadde
+EBUILD chessdb-3.6.18.ebuild 1656 RMD160 fabe2bcc54ce932c802b7a9909d8b66bc7a89378 SHA1 9c2379beaca736732ca51d3a13dd2e4733f88b09 SHA256 f092d62e7537cfe185f6a26412f567dc13aa8a41153f3279be7aa00e04eebc52
+MISC ChangeLog 827 RMD160 5980b30ff51d173d01e0d230c7f799e5b3bdf843 SHA1 236ae32d6fc98d5d42548baffeae4d442abd60ce SHA256 00079a769c4fb26794b28c9acf01ce6d7b57771b1d666ec112cb7084b017e307
 MISC metadata.xml 1032 RMD160 5065f72f47cb8544b796015b21850a22f652f246 SHA1 110c050c82312a5cacd67549d5a7d718bc3bd922 SHA256 c24e15f790b2dec7353492b1840ac7ce5abb6c58da48126654351e7db97f1983
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