version bump; stable for x86; drop ppc to ~ (bug #375407)

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

7 files changed, 73 insertions, 164 deletions

diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog
index ed661c3fa604..77709a2fc5d0 100644
--- a/games-board/xboard/ChangeLog
+++ b/games-board/xboard/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-board/xboard
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.42 2011/09/20 14:36:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.43 2011/11/02 01:10:36 mr_bones_ Exp $
+
+*xboard-4.5.3a (02 Nov 2011)
+
+  02 Nov 2011; Michael Sterrett <mr_bones_@gentoo.org> -xboard-4.4.4.ebuild,
+  -files/xboard-4.4.4-gentoo.patch, -xboard-4.5.1.ebuild,
+  -files/xboard-4.5.1-gentoo.patch, xboard-4.5.2a.ebuild,
+  +xboard-4.5.3a.ebuild, +files/xboard-4.5.3a-gentoo.patch:
+  version bump; stable for x86; drop ppc to ~ (bug #375407)
 
   20 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> xboard-4.4.4.ebuild,
   xboard-4.5.1.ebuild, xboard-4.5.2a.ebuild:
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
index 2db53aaa6a21..21b866aaaaed 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -1,12 +1,9 @@
-AUX xboard-4.4.4-gentoo.patch 1767 RMD160 a09ec156157e2a936bde71482c791c9a30ac011b SHA1 49281ce171255c878b778a32650afd38c65d6d00 SHA256 cef4dc6631986e8ed1f53e85cf2474f4e7a6fdacb4b8464820ed785883fcf5b7
-AUX xboard-4.5.1-gentoo.patch 3589 RMD160 2ef91be3da053ed3d02dcd21b2d26f0bc16e46b7 SHA1 d15adc41f4dc11886974691c1eb176ec6c6a8a74 SHA256 671f5d0bf99d1a93101c58db2d3bd0c2e1142a3ef0a1cf77ebfd350c109d511b
 AUX xboard-4.5.2a-gentoo.patch 4780 RMD160 c6997646ec54fae904455cdb0a7788a1ee5a18d7 SHA1 019a53773adb4582a4f04ecf5685202ada47361d SHA256 ed53588fab7a311beef280ba3d1c93c8e5b216fd343fc647f836a30860017214
-DIST xboard-4.4.4.tar.gz 1992091 RMD160 1bc507b760700bceb455ede4ccebbe594c542b76 SHA1 85dfb2711a9d0aeb2feece28ceec2f42e5739a5f SHA256 33297c170fca99d10b53ba8f6bebdfa65ac69c918358299e96156456f2b4d5a9
-DIST xboard-4.5.1.tar.gz 2357952 RMD160 f8e43a10bc90dd80b5ad16fc5839a67eca4ab392 SHA1 a1d3d3d3180db6f3c9f695ae4f9839a1dddbb054 SHA256 7af438161eef1aefc21f2e9932898ef2eec1cfec733906e95221880201ae46cc
+AUX xboard-4.5.3a-gentoo.patch 4780 RMD160 c6997646ec54fae904455cdb0a7788a1ee5a18d7 SHA1 019a53773adb4582a4f04ecf5685202ada47361d SHA256 ed53588fab7a311beef280ba3d1c93c8e5b216fd343fc647f836a30860017214
 DIST xboard-4.5.2a.tar.gz 2387060 RMD160 00f6b2d744138fe62575550aa8852208074c412e SHA1 1ff3c1c8bf4fd705532e1c96bc047e8931867e02 SHA256 0f45cf82ed412c0e383c8a2f00605a699db3116c103d13f4e592e298f5e65980
+DIST xboard-4.5.3a.tar.gz 2413474 RMD160 17d9eee83c5187f183363cfb9e7c0438c05d7c95 SHA1 01e87180260d4e47be955fbc76a7d050adb1c9ad SHA256 3bc078a518d7d14781740cea137e2a8aa10c0ded1c42b0f0b6242d3eaf957cdc
 DIST xboard.png 479 RMD160 d0e7fa9cc30e2cf58c13eaf08f2d576e2ea9b076 SHA1 fa96fd0c0d220a3e88e1a7312b3e8308a387764c SHA256 1c36fd6ca934eef29d7cdc72159019585d8c449f489f6a6ccc2d787bba03f41d
-EBUILD xboard-4.4.4.ebuild 1729 RMD160 3b9e292103da026789b110c33abf77c75b766c77 SHA1 d9a6e7d69fb4b0a9d289bd1e615d50a9192e2134 SHA256 e5f9b69e4a22be39384e03f9b1db106783cbac32462ad2a7e39ad33a2fdbb5ed
-EBUILD xboard-4.5.1.ebuild 1731 RMD160 f4ac1310231b3535cbaad31ff8ca19031ffa2a0d SHA1 d2ca97dd8d70958adc98e8587d42245550ff48d2 SHA256 29868bf80320d2fde671345f93b070d1d711cc11b910a63a146972bf375f57e1
-EBUILD xboard-4.5.2a.ebuild 1681 RMD160 a4a594f3783814aef79bdd70985e47dae4fbaa11 SHA1 0f7ff284138ecaf961c4bb541068252672a835b1 SHA256 3e9bf760e51b63bc7df14ae696e544a1f756fb0817e39a4732f7b348a9252e0e
-MISC ChangeLog 5687 RMD160 fb8fb9a99e070df2a10636f4e254c50f4d765415 SHA1 1952900a75ef333cf74ea25a9b5da34e9bc3ed65 SHA256 ab481e93bd5d69032133f147c294db03b0fdc44153279b4cfc436c120dcc6366
+EBUILD xboard-4.5.2a.ebuild 1680 RMD160 74781ec1af1a0ec4e79bd8dd12f1fe4ecc7902f3 SHA1 efc49dbaa818dc28d87de44386be3c9081543ceb SHA256 458f83cfc5ab7d12d8b74602c9583937bbc5ab0513defaa2e4447887340ec53d
+EBUILD xboard-4.5.3a.ebuild 1681 RMD160 eac0f1962416bf1760781f48022c72071ae0d167 SHA1 551e6d4dd5e10f6f5597c20d661147829c9241d7 SHA256 d2578bd0cd1900d011dc43029595c9df4124d479e41fe05024cff140dee7e558
+MISC ChangeLog 6031 RMD160 d78544ac4f76e8cf646d25ae25e2e821152013a9 SHA1 0581b44f6603a2be147c91d847b38495df36fc8b SHA256 66b9d833cbd1b9ccc4909c945a97387d46520d5a92cf8be147744e1d2974f0a7
 MISC metadata.xml 319 RMD160 ebce12d6fdd00bd48ac7d5b17ea08de5283e5167 SHA1 e697368a0c5827c430d5ae91ba66c624a47143fa SHA256 1b7947629144f869664be4bd08e38dddbd61fc134d37c26d393837c9bb41851c
diff --git a/games-board/xboard/files/xboard-4.4.4-gentoo.patch b/games-board/xboard/files/xboard-4.4.4-gentoo.patch
deleted file mode 100644
index 4570b49c0527..000000000000
--- a/games-board/xboard/files/xboard-4.4.4-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ru xboard-4.4.4.orig/configure.ac xboard-4.4.4/configure.ac
---- xboard-4.4.4.orig/configure.ac	2010-08-18 18:50:06.000000000 -0400
-+++ xboard-4.4.4/configure.ac	2010-09-04 03:21:16.475299260 -0400
-@@ -125,26 +125,15 @@
- fi
- 
- dnl | test if user wants ot use Xaw3d headers
--AC_ARG_WITH([Xaw3d],
--            [AS_HELP_STRING([--with-Xaw3d],
--                            [use Xaw3d instead of Xaw])],
--            [with_xaw3d=yes],
--            [with_xaw3d=no])
--
--XAW_LIBS=
--AS_IF([test "x$with_xaw3d" != xno],
--      [AC_CHECK_LIB([Xaw3d], 
--                    [XawTextReplace],
--                    [AC_SUBST([XAW_LIBS], 
--                              ["-lXaw3d"])
--                     AC_DEFINE([USE_XAW3D], [1],
--                               [Define if you want to use Xaw3d])],
--                    [AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes")
--		     AC_MSG_FAILURE(
--      		               [--with-Xaw3d was given, but test for Xaw3d failed])],
--			       [-lXaw])])
--if test "$with_xaw3d" = "no" ; then
--   XAW_LIBS="-lXaw"
-+AC_ARG_WITH(Xaw3d, 
-+[  --with-Xaw3d            use Xaw3d instead of Xaw],
-+[ with_xaw3d="$withval"], [enable_xaw3d="no"])
-+
-+if test "$withval" = yes; then
-+       AC_DEFINE(USE_XAW3D)
-+       XAW_LIBS="-lXaw3d"
-+else
-+       XAW_LIBS="-lXaw"
- fi
- AC_SUBST(XAW_LIBS)
- 
-diff -ru xboard-4.4.4.orig/xboard.h xboard-4.4.4/xboard.h
---- xboard-4.4.4.orig/xboard.h	2010-08-18 18:47:46.000000000 -0400
-+++ xboard-4.4.4/xboard.h	2010-09-04 03:21:36.179926257 -0400
-@@ -104,7 +104,7 @@
- 
- #define BORDER_X_OFFSET 3
- #define BORDER_Y_OFFSET 27
--#define FIRST_CHESS_PROGRAM	"fairymax"
-+#define FIRST_CHESS_PROGRAM	"gnuchess"
- #define SECOND_CHESS_PROGRAM	"fairymax"
- 
- /* Default to no flashing (the "usual" XBoard behavior) */
diff --git a/games-board/xboard/files/xboard-4.5.1-gentoo.patch b/games-board/xboard/files/xboard-4.5.3a-gentoo.patch
index 495ee48d7d34..56e1ba8e10eb 100644
--- a/games-board/xboard/files/xboard-4.5.1-gentoo.patch
+++ b/games-board/xboard/files/xboard-4.5.3a-gentoo.patch
@@ -1,24 +1,24 @@
-diff -ru xboard-4.5.1.orig/Makefile.am xboard-4.5.1/Makefile.am
---- xboard-4.5.1.orig/Makefile.am	2011-02-08 00:07:46.000000000 -0500
-+++ xboard-4.5.1/Makefile.am	2011-04-07 01:59:35.259757241 -0400
+diff -ru xboard-4.5.2a.orig/Makefile.am xboard-4.5.2a/Makefile.am
+--- xboard-4.5.2a.orig/Makefile.am	2011-05-01 23:15:52.000000000 -0400
++++ xboard-4.5.2a/Makefile.am	2011-05-06 17:24:16.268244229 -0400
 @@ -33,14 +33,10 @@
  		 $(ZPY)
  xboard_LDADD = -lm @XAW_LIBS@ @X_LIBS@
  
--EXTRA_DIST = pixmaps bitmaps winboard sounds filebrowser/README \
+-EXTRA_DIST = pixmaps bitmaps sounds winboard filebrowser/README \
 -	xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop \
 -	COPYRIGHT FAQ.html engine-intf.html ics-parsing.txt readme.htm zippy.README \
 -	xboard.conf.in SHORTLOG DIFFSTAT history.c
 -
  DISTCLEANFILES = stamp-h
  
--AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' -DBITMAPDIR='"$(datadir)/games/xboard/bitmaps/"'
-+bitmapdir = $(datadir)
-+AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' -DBITMAPDIR='"$(bitmapdir)/"'
+-AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' -DBITMAPDIR='"$(datadir)/games/xboard/bitmaps/default"'
++bitmapsdir = $(datadir)/default
++AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' -DBITMAPDIR='"$(bitmapsdir)"'
  
  info_TEXINFOS =  xboard.texi
  xboard_TEXINFOS =  copyright.texi 
-@@ -54,21 +50,20 @@
+@@ -54,21 +50,14 @@
  
  ### icon files
  
@@ -30,25 +30,45 @@ diff -ru xboard-4.5.1.orig/Makefile.am xboard-4.5.1/Makefile.am
  dist_svgicon_DATA = xboard.svg
  
  
- ### desktop files for KDE and gnome
- 
+-### desktop files for KDE and gnome
+-
 -Applicationsdir = $(datadir)/applications
-+Applicationsdir = /usr/share/applications
- Applications_DATA = xboard.desktop
+-Applications_DATA = xboard.desktop
+-
+-
+ ### directory and files for bitmaps
  
+-bitmapsdir = $(datadir)/games/xboard/bitmaps/default
+ dist_bitmaps_DATA = \
+   bitmaps/a33o.bm    bitmaps/c45s.bm        bitmaps/icon_outline.bm  bitmaps/m49o.bm   bitmaps/p45o.bm   bitmaps/r29o.bm \
+   bitmaps/a33s.bm    bitmaps/c49o.bm        bitmaps/icon_white.bm    bitmaps/m49s.bm   bitmaps/p45s.bm   bitmaps/r29s.bm \
+@@ -137,13 +126,13 @@
  
- ### directory and files to be used as bitmaps
+ ### directory and files for pixmaps
  
--bitmapdir = $(datadir)/games/xboard/
- dist_bitmap_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm
+-pixmapsdir = $(datadir)/games/xboard/pixmaps/textures
++pixmapsdir = $(datadir)/pixmaps/textures
+ dist_pixmaps_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm
  
  
-diff -ru xboard-4.5.1.orig/configure.ac xboard-4.5.1/configure.ac
---- xboard-4.5.1.orig/configure.ac	2011-02-20 19:11:12.000000000 -0500
-+++ xboard-4.5.1/configure.ac	2011-04-07 00:51:46.421901524 -0400
-@@ -133,30 +133,17 @@
+ ### directory and files for sound files
  
- dnl | test if user wants ot use Xaw3d or Xaw
+-soundsdir = $(datadir)/games/xboard/sounds
++soundsdir = $(datadir)/sounds
+ dist_sounds_DATA = \
+   sounds/cymbal.wav     sounds/pop2.wav   sounds/slap.wav     sounds/ding1.wav      sounds/laser.wav \
+   sounds/woodthunk.wav  sounds/gong.wav   sounds/penalty.wav  sounds/honkhonk.wav   sounds/phone.wav
+diff -ru xboard-4.5.2a.orig/configure.ac xboard-4.5.2a/configure.ac
+--- xboard-4.5.2a.orig/configure.ac	2011-05-01 23:17:29.000000000 -0400
++++ xboard-4.5.2a/configure.ac	2011-05-06 17:24:16.268244229 -0400
+@@ -131,32 +131,17 @@
+    exit 1
+ fi
+ 
+-dnl | test if user wants ot use Xaw3d or Xaw
++AC_ARG_WITH(Xaw3d, 
++[  --with-Xaw3d            use Xaw3d instead of Xaw],
++[ with_xaw3d="$withval"], [enable_xaw3d="no"])
  
 -dnl | add configure option for Xaw3d
 -AC_ARG_WITH([Xaw3d],
@@ -73,10 +93,6 @@ diff -ru xboard-4.5.1.orig/configure.ac xboard-4.5.1/configure.ac
 -      AC_MSG_ERROR([Xaw headers not found. Please install the Xaw package and headers.])
 -   fi
 -   XAW_LIBS="-lXaw"
-+AC_ARG_WITH(Xaw3d, 
-+[  --with-Xaw3d            use Xaw3d instead of Xaw],
-+[ with_xaw3d="$withval"], [enable_xaw3d="no"])
-+
 +if test "$withval" = yes; then
 +       AC_DEFINE(USE_XAW3D)
 +       XAW_LIBS="-lXaw3d"
@@ -87,9 +103,21 @@ diff -ru xboard-4.5.1.orig/configure.ac xboard-4.5.1/configure.ac
  AC_SUBST(XAW_LIBS)
  
  dnl | end Xaw/Xaw3d test
-diff -ru xboard-4.5.1.orig/xboard.h xboard-4.5.1/xboard.h
---- xboard-4.5.1.orig/xboard.h	2011-02-03 11:36:36.000000000 -0500
-+++ xboard-4.5.1/xboard.h	2011-04-07 00:51:46.422901324 -0400
+diff -ru xboard-4.5.2a.orig/xboard.conf.in xboard-4.5.2a/xboard.conf.in
+--- xboard-4.5.2a.orig/xboard.conf.in	2011-05-01 23:15:52.000000000 -0400
++++ xboard-4.5.2a/xboard.conf.in	2011-05-06 17:24:29.271622485 -0400
+@@ -57,7 +57,7 @@
+ ;
+ ; Engines & adjudicatons in engine-engine games
+ ;
+--firstChessProgram fairymax
++-firstChessProgram gnuchess
+ -secondChessProgram fairymax
+ -niceEngines 0
+ -polyglotDir ""
+diff -ru xboard-4.5.2a.orig/xboard.h xboard-4.5.2a/xboard.h
+--- xboard-4.5.2a.orig/xboard.h	2011-05-01 23:15:52.000000000 -0400
++++ xboard-4.5.2a/xboard.h	2011-05-06 17:24:16.268244229 -0400
 @@ -104,7 +104,7 @@
  
  #define BORDER_X_OFFSET 3
diff --git a/games-board/xboard/xboard-4.4.4.ebuild b/games-board/xboard/xboard-4.4.4.ebuild
deleted file mode 100644
index d2867cfff8ee..000000000000
--- a/games-board/xboard/xboard-4.4.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.4.4.ebuild,v 1.6 2011/09/20 14:36:55 mr_bones_ Exp $
-
-EAPI=2
-inherit autotools eutils games
-
-DESCRIPTION="GUI for gnuchess and for internet chess servers"
-HOMEPAGE="http://www.gnu.org/software/xboard/"
-SRC_URI="mirror://gnu/xboard/${P}.tar.gz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc ~ppc64 x86"
-IUSE="Xaw3d +default-font zippy"
-RESTRICT="test" #124112
-
-RDEPEND="Xaw3d? ( x11-libs/libXaw3d )
-	x11-libs/libXpm
-	x11-libs/libXaw
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXext
-	x11-libs/libICE
-	default-font? ( media-fonts/font-adobe-100dpi )"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}*
-	sed -i \
-		-e '/icons/s:\$(datadir):/usr/share:' \
-		Makefile.am \
-		|| die 'sed failed'
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--disable-dependency-tracking \
-		$(use_with Xaw3d) \
-		$(use_enable zippy)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS COPYRIGHT ChangeLog NEWS README TODO ics-parsing.txt
-	use zippy && dodoc zippy.README
-	dohtml FAQ.html
-	doicon "${DISTDIR}"/xboard.png
-	make_desktop_entry ${PN} "Xboard (Chess)"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "No chess engines are emerged by default! If you want a chess engine"
-	elog "to play with, you can emerge gnuchess or crafty."
-	elog "Read xboard FAQ for information."
-	if ! use default-font ; then
-		ewarn "Read the xboard(6) man page for specifying the font for xboard to use."
-	fi
-}
diff --git a/games-board/xboard/xboard-4.5.2a.ebuild b/games-board/xboard/xboard-4.5.2a.ebuild
index 951363d7bf35..aecb479f596c 100644
--- a/games-board/xboard/xboard-4.5.2a.ebuild
+++ b/games-board/xboard/xboard-4.5.2a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.5.2a.ebuild,v 1.3 2011/09/20 14:36:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.5.2a.ebuild,v 1.4 2011/11/02 01:10:36 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/xboard/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~ppc64 ~x86"
+KEYWORDS="~ppc ~ppc64 x86"
 IUSE="Xaw3d +default-font zippy"
 RESTRICT="test" #124112
 
diff --git a/games-board/xboard/xboard-4.5.1.ebuild b/games-board/xboard/xboard-4.5.3a.ebuild
index 9cbc28d13def..43256c22b148 100644
--- a/games-board/xboard/xboard-4.5.1.ebuild
+++ b/games-board/xboard/xboard-4.5.3a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.5.1.ebuild,v 1.3 2011/09/20 14:36:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.5.3a.ebuild,v 1.1 2011/11/02 01:10:36 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -35,16 +35,13 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}*
-	sed -i \
-		-e '/icons/s:\$(datadir):/usr/share:' \
-		Makefile.am \
-		|| die 'sed failed'
 	eautoreconf
 }
 
 src_configure() {
 	egamesconf \
 		--disable-dependency-tracking \
+		--datadir="${GAMES_DATADIR}"/${PN} \
 		$(use_with Xaw3d) \
 		$(use_enable zippy)
 }