Add errno patch from edi via bug 37013; also, support X use better and sed in unpack; more error checking/messages

4 files changed, 41 insertions, 14 deletions

diff --git a/games-board/gnushogi/ChangeLog b/games-board/gnushogi/ChangeLog
index c6a5498412f4..c5668ac3225a 100644
--- a/games-board/gnushogi/ChangeLog
+++ b/games-board/gnushogi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/gnushogi
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/ChangeLog,v 1.2 2003/09/10 20:23:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/ChangeLog,v 1.3 2004/01/02 22:30:20 mr_bones_ Exp $
+
+  02 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> gnushogi-1.3.ebuild:
+  Add errno patch from edi via bug 37013; also, support X use better and sed in
+  unpack; more error checking/messages
 
   03 Sep 2003; Michael Sterrett <msterret@gentoo.org> gnushogi-1.3.ebuild:
   use sed >= 4; error messages
diff --git a/games-board/gnushogi/Manifest b/games-board/gnushogi/Manifest
index eb8f89c20657..e1689d353f62 100644
--- a/games-board/gnushogi/Manifest
+++ b/games-board/gnushogi/Manifest
@@ -1,4 +1,5 @@
-MD5 f8edbdacef436ff98020098835f675b4 ChangeLog 584
-MD5 513712ec8d845383bb0c5c5600698b18 gnushogi-1.3.ebuild 990
+MD5 7b06c8f391918937c71f2f40d7eb2cfc ChangeLog 783
+MD5 7807cfdf63dcaa958afcf295fe08e15e gnushogi-1.3.ebuild 1267
 MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
+MD5 97c87cb301c5365d234901fe7ea9456d files/1.3-errno.patch 304
 MD5 a46c4bdecc0df352e8f7735ee4e6e37b files/digest-gnushogi-1.3 64
diff --git a/games-board/gnushogi/files/1.3-errno.patch b/games-board/gnushogi/files/1.3-errno.patch
new file mode 100644
index 000000000000..8ce9cfd29f03
--- /dev/null
+++ b/games-board/gnushogi/files/1.3-errno.patch
@@ -0,0 +1,10 @@
+--- gnushogi-1.3/gnushogi/gnushogi.h.orig	2002-04-26 17:42:22.000000000 +0200
++++ gnushogi-1.3/gnushogi/gnushogi.h	2004-01-02 13:18:37.000000000 +0100
+@@ -118,6 +118,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <string.h>
++#include <errno.h>
+ 
+ #include <sys/param.h>
+ #include <sys/types.h>
diff --git a/games-board/gnushogi/gnushogi-1.3.ebuild b/games-board/gnushogi/gnushogi-1.3.ebuild
index dbb729b2e459..7324de944105 100644
--- a/games-board/gnushogi/gnushogi-1.3.ebuild
+++ b/games-board/gnushogi/gnushogi-1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/gnushogi-1.3.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/gnushogi-1.3.ebuild,v 1.2 2004/01/02 22:30:20 mr_bones_ Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="Japanese version of chess (commandline + X-Version)"
 HOMEPAGE="http://www.gnu.org/directory/games/gnushogi.html"
@@ -18,22 +18,34 @@ DEPEND=">=sys-devel/bison-1.34
 	>=sys-apps/sed-4
 	X? ( virtual/x11 )"
 
-src_compile() {
+src_unpack() {
+	local f
+
+	unpack ${A}
+	cd ${S}
 	for f in `grep -Rl -- -ltermcap *` ; do
+		einfo "Fixing ${f}"
 		sed -i \
-			-e 's:-ltermcap:-lcurses:' ${f} || \
-				die "sed ${f} failed"
+			-e 's:-ltermcap:-lcurses:' ${f} \
+				|| die "sed ${f} failed"
 	done
+	epatch "${FILESDIR}/${PV}-errno.patch"
+}
 
-	egamesconf || die
+src_compile() {
+	egamesconf \
+		`use_with X x` \
+		`use_with X xshogi` || die
 	addpredict /usr/games/lib/gnushogi/gnushogi.hsh
 	emake || die "emake failed"
 }
 
 src_install() {
-	dogamesbin gnushogi/gnushogi
-	use X && dogamesbin xshogi/xshogi
-	dogameslib gnushogi/gnushogi.bbk
+	dogamesbin gnushogi/gnushogi      || die "dogamesbin failed"
+	if [ `use X` ] ; then
+		dogamesbin xshogi/xshogi      || die "dogamesbin failed (X)"
+	fi
+	dogameslib gnushogi/gnushogi.bbk  || die "dogameslib failed"
+	dodoc INSTALL README NEWS CONTRIB || die "dodoc failed"
 	prepgamesdirs
-	dodoc COPYING INSTALL.generic INSTALL README NEWS CONTRIB
 }