fix cboard component (bug #117464) with patch from nyhm; use make install; add modular X deps

Package-Manager: portage-2.1_pre10-r2

7 files changed, 110 insertions, 18 deletions

diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog
index c47da4774847..cf351b35b406 100644
--- a/games-board/xboard/ChangeLog
+++ b/games-board/xboard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-board/xboard
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.6 2006/01/23 21:10:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.7 2006/05/04 04:51:53 mr_bones_ Exp $
+
+  04 May 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/xboard-4.2.7-cmail.patch,
+  +files/xboard-4.2.7-default-program.patch,
+  +files/xboard-4.2.7-destdir.patch, xboard-4.2.7.ebuild:
+  fix cboard component (bug #117464) with patch from nyhm; use make install;
+  add modular X deps
 
   23 Jan 2006; Markus Rothe <corsair@gentoo.org> xboard-4.2.7.ebuild:
   Added ~ppc64; bug #120092
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
index 6b3639afe1a0..de5b2e511ed4 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -6,20 +6,31 @@ AUX xboard-4.2.6-patch.diff 362 RMD160 20dd011e2f3c98e42f99c42998435af8feb8e96a
 MD5 f99bdbe68caa44c40ef71762f27da40c files/xboard-4.2.6-patch.diff 362
 RMD160 20dd011e2f3c98e42f99c42998435af8feb8e96a files/xboard-4.2.6-patch.diff 362
 SHA256 8dbaea3493c26ad50307551c6acf31f48e416bb767af5d5808e3393f5187fc9a files/xboard-4.2.6-patch.diff 362
-DIST xboard-4.2.7.tar.gz 1318110 size 1318110
-EBUILD xboard-4.2.7.ebuild 700 RMD160 aec32cabd70afdf7065a2b26c8dbc04bfa0c0eae SHA1 d2e34cb41a698c3eb01b5fed8630c37dc257a03a SHA256 7969a5725a406e8f36e08f74cc7126ddee58627ada0606eba91362f435807dff size 700
-MD5 80ae4a00a6cb4fe8a54dc68acc640c82 xboard-4.2.7.ebuild 700
-RMD160 aec32cabd70afdf7065a2b26c8dbc04bfa0c0eae xboard-4.2.7.ebuild 700
-SHA256 7969a5725a406e8f36e08f74cc7126ddee58627ada0606eba91362f435807dff xboard-4.2.7.ebuild 700
-MISC ChangeLog 876 RMD160 e321a004ad8a903f5092c6e6bb9bbb8fcf2633f6 SHA1 f2154c578c600b60835c0707154abae4828c811d SHA256 40abdfb0eb5d67dc058af775980f41239e0cf350019e755dc3c6d5a37b7ac766 size 876
-MD5 5b250c9f59c3424a1831bc69d42e4d1e ChangeLog 876
-RMD160 e321a004ad8a903f5092c6e6bb9bbb8fcf2633f6 ChangeLog 876
-SHA256 40abdfb0eb5d67dc058af775980f41239e0cf350019e755dc3c6d5a37b7ac766 ChangeLog 876
+AUX xboard-4.2.7-cmail.patch 368 RMD160 78d3e9c40116166784031fec22d78fec3ac5a194 SHA1 04b9fe761190bb68f31c6666a9d88ce0d5c20a3d SHA256 96cc84ac52ba592f40131bba47e3766a269ecb13a511a76af3dbdbaab09140d6 size 368
+MD5 a68a94ca6e0969480bffc1cf1df949c7 files/xboard-4.2.7-cmail.patch 368
+RMD160 78d3e9c40116166784031fec22d78fec3ac5a194 files/xboard-4.2.7-cmail.patch 368
+SHA256 96cc84ac52ba592f40131bba47e3766a269ecb13a511a76af3dbdbaab09140d6 files/xboard-4.2.7-cmail.patch 368
+AUX xboard-4.2.7-default-program.patch 362 RMD160 20dd011e2f3c98e42f99c42998435af8feb8e96a SHA1 64db648acada1aeab0cbc844058714eafc4e895f SHA256 8dbaea3493c26ad50307551c6acf31f48e416bb767af5d5808e3393f5187fc9a size 362
+MD5 f99bdbe68caa44c40ef71762f27da40c files/xboard-4.2.7-default-program.patch 362
+RMD160 20dd011e2f3c98e42f99c42998435af8feb8e96a files/xboard-4.2.7-default-program.patch 362
+SHA256 8dbaea3493c26ad50307551c6acf31f48e416bb767af5d5808e3393f5187fc9a files/xboard-4.2.7-default-program.patch 362
+AUX xboard-4.2.7-destdir.patch 1743 RMD160 c0a63982372edfc9eb3824a85bbb79e76e5ddfec SHA1 589f8f43942ba2a24a0c101f16c66844417025a4 SHA256 dcf3a64a48c632357ffb6c5ada05492ee8bb046a154202418a3812236a503803 size 1743
+MD5 be90d99c1ee3151e6adeba8fde6ea164 files/xboard-4.2.7-destdir.patch 1743
+RMD160 c0a63982372edfc9eb3824a85bbb79e76e5ddfec files/xboard-4.2.7-destdir.patch 1743
+SHA256 dcf3a64a48c632357ffb6c5ada05492ee8bb046a154202418a3812236a503803 files/xboard-4.2.7-destdir.patch 1743
+DIST xboard-4.2.7.tar.gz 1318110 RMD160 bd05a47319a35f7024a1743bea622e26052f4d28 SHA256 5b21f12e3e99be0c69a3fa5f3d4cb79def24b6a2195ed94efc1b6ab415fb8d3b size 1318110
+EBUILD xboard-4.2.7.ebuild 946 RMD160 4f94b265227d7c8ad1ae4b62f555f8b0746f1e4b SHA1 af7a85ff8c09b39f741b6f361b928445b482c2f8 SHA256 4e96ec7de037fa3d45f363447aef9df3255b22ebf5157bb55df193f4ffa19a20 size 946
+MD5 5af20faa17091d04cc1c70b97effe62e xboard-4.2.7.ebuild 946
+RMD160 4f94b265227d7c8ad1ae4b62f555f8b0746f1e4b xboard-4.2.7.ebuild 946
+SHA256 4e96ec7de037fa3d45f363447aef9df3255b22ebf5157bb55df193f4ffa19a20 xboard-4.2.7.ebuild 946
+MISC ChangeLog 1170 RMD160 a7b077c4513af8a15be30298da51c664b31d7189 SHA1 f2e17df715493dff321585b823bee7a441ccbd23 SHA256 ae0a24b1b5bdd44bbaf928141c25014078e6e9d214050705d82afa8b32c7313f size 1170
+MD5 4a22823ad9615c0ff13feada4590dcaf ChangeLog 1170
+RMD160 a7b077c4513af8a15be30298da51c664b31d7189 ChangeLog 1170
+SHA256 ae0a24b1b5bdd44bbaf928141c25014078e6e9d214050705d82afa8b32c7313f ChangeLog 1170
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 4e6718e88e8b86630db7846e5d65fd04 files/digest-xboard-4.2.7 65
-RMD160 dd731ef27987367b2f88e3c939bb2feb4138d588 files/digest-xboard-4.2.7 65
-SHA256 181dd01d3ab80129a778cab7cc370ce617883d5a31649ed8149fb6cca40bc6ed files/digest-xboard-4.2.7 65
-size 65 files/digest-xboard-4.2.7 65
+MD5 b735c7ba0879dbbee3043a01122d3ce2 files/digest-xboard-4.2.7 241
+RMD160 d9dc58918c86fb003e1378c1939ad2c9209ba25b files/digest-xboard-4.2.7 241
+SHA256 ffccc9292cbc12142ab0527d5deb9d17cd7010e42f9701dcc1f1e4866251cf22 files/digest-xboard-4.2.7 241
diff --git a/games-board/xboard/files/digest-xboard-4.2.7 b/games-board/xboard/files/digest-xboard-4.2.7
index 8a91649444b3..aaa7565960be 100644
--- a/games-board/xboard/files/digest-xboard-4.2.7
+++ b/games-board/xboard/files/digest-xboard-4.2.7
@@ -1 +1,3 @@
 MD5 b70ad8ff7569975302c5fb402d5eea32 xboard-4.2.7.tar.gz 1318110
+RMD160 bd05a47319a35f7024a1743bea622e26052f4d28 xboard-4.2.7.tar.gz 1318110
+SHA256 5b21f12e3e99be0c69a3fa5f3d4cb79def24b6a2195ed94efc1b6ab415fb8d3b xboard-4.2.7.tar.gz 1318110
diff --git a/games-board/xboard/files/xboard-4.2.7-cmail.patch b/games-board/xboard/files/xboard-4.2.7-cmail.patch
new file mode 100644
index 000000000000..22179a92b260
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.2.7-cmail.patch
@@ -0,0 +1,11 @@
+--- backend.c
++++ backend.c
+@@ -6949,7 +6949,7 @@
+ 	|| (nCmailMovesRegistered + nCmailResults == nCmailGames)) {
+ 	sprintf(string, partCommandString,
+ 		appData.debugMode ? " -v" : "", appData.cmailGameName);
+-	commandOutput = popen(string, "rb");
++	commandOutput = popen(string, "r");
+ 
+ 	if (commandOutput == NULL) {
+ 	    DisplayError("Failed to invoke cmail", 0);
diff --git a/games-board/xboard/files/xboard-4.2.7-default-program.patch b/games-board/xboard/files/xboard-4.2.7-default-program.patch
new file mode 100644
index 000000000000..34c8f72091b7
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.2.7-default-program.patch
@@ -0,0 +1,11 @@
+--- xboard.old	2002-04-13 19:44:26.000000000 -0700
++++ xboard.h	2002-04-13 19:44:08.000000000 -0700
+@@ -100,7 +100,7 @@
+ 
+ #define BORDER_X_OFFSET 3
+ #define BORDER_Y_OFFSET 27
+-#define FIRST_CHESS_PROGRAM	"gnuchessx"
++#define FIRST_CHESS_PROGRAM	"gnuchess"
+ #define SECOND_CHESS_PROGRAM	"gnuchessx"
+ 
+ /* Default to no flashing (the "usual" XBoard behavior) */
diff --git a/games-board/xboard/files/xboard-4.2.7-destdir.patch b/games-board/xboard/files/xboard-4.2.7-destdir.patch
new file mode 100644
index 000000000000..8fbf539ca8a0
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.2.7-destdir.patch
@@ -0,0 +1,38 @@
+--- Makefile.in.orig	2006-05-04 00:03:28.000000000 -0400
++++ Makefile.in	2006-05-04 00:14:10.000000000 -0400
+@@ -21,7 +21,7 @@
+ # Yuck; the autoconf generated configure script sets an infodir variable
+ # and provides a command-line flag to change it, but the default is 
+ # /usr/info instead of /usr/share/info.
+-infodir = $(prefix)/share/info
++infodir = /usr/share/info
+ 
+ CC = @CC@
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ -DINFODIR=\"$(infodir)\"
+@@ -63,18 +63,16 @@
+ all: default pseudosource info FAQ html dvi ps
+ 
+ install: installdirs default
+-	$(INSTALL_PROGRAM) -s xboard $(bindir)/xboard
+-	$(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm
+-	$(INSTALL_PROGRAM) cmail $(bindir)/cmail
+-	$(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard
+-	$(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
+-	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
+-	$(INSTALL_DATA) xboard.info $(infodir)/xboard.info
+-	-PATH=$$PATH:/sbin:/usr/sbin install-info \
+-		$(infodir)/xboard.info $(infodir)/dir
++	$(INSTALL_PROGRAM) xboard $(DESTDIR)$(bindir)/xboard
++	$(INSTALL_PROGRAM) zic2xpm $(DESTDIR)$(bindir)/zic2xpm
++	$(INSTALL_PROGRAM) cmail $(DESTDIR)$(bindir)/cmail
++	$(INSTALL_PROGRAM) $(srcdir)/pxboard $(DESTDIR)$(bindir)/pxboard
++	$(INSTALL_DATA) $(srcdir)/xboard.man $(DESTDIR)$(man6dir)/xboard$(man6ext)
++	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(DESTDIR)$(man6dir)/zic2xpm$(man6ext)
++	$(INSTALL_DATA) xboard.info $(DESTDIR)$(infodir)/xboard.info
+ 
+ installdirs: mkinstalldirs
+-	$(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir) $(DESTDIR)$(man6dir) $(DESTDIR)$(infodir)
+ 
+ uninstall:
+ 	rm -f $(bindir)/xboard $(bindir)/cmail $(bindir)/pxboard
diff --git a/games-board/xboard/xboard-4.2.7.ebuild b/games-board/xboard/xboard-4.2.7.ebuild
index ef7430088d0c..529a125fccfc 100644
--- a/games-board/xboard/xboard-4.2.7.ebuild
+++ b/games-board/xboard/xboard-4.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.2.7.ebuild,v 1.9 2006/04/23 06:44:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.2.7.ebuild,v 1.10 2006/05/04 04:51:53 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -13,16 +13,28 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc ~ppc64 x86"
 IUSE=""
 
-DEPEND="games-board/gnuchess"
+RDEPEND="games-board/gnuchess
+	|| (
+		( x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXmu
+		x11-libs/libXext
+		x11-libs/libICE
+		x11-libs/libXpm
+		x11-libs/libXaw )
+		virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xproto ) virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-default-program.patch"
+	epatch "${FILESDIR}"/${P}*
 }
 
 src_install() {
-	egamesinstall || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc FAQ READ_ME ToDo ChangeLog*
 	dohtml FAQ.html
 	prepgamesdirs