version bump (bug #418367)

(Portage version: 2.1.10.49/cvs/Linux x86_64)

5 files changed, 114 insertions, 136 deletions

diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog
index 8a50cd8ba3a5..d11ba5d51755 100644
--- a/games-board/xboard/ChangeLog
+++ b/games-board/xboard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-board/xboard
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.46 2012/05/30 19:55:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.47 2012/05/31 14:13:42 mr_bones_ Exp $
+
+*xboard-4.6.2 (31 May 2012)
+
+  31 May 2012; Michael Sterrett <mr_bones_@gentoo.org> -xboard-4.5.2a.ebuild,
+  -files/xboard-4.5.2a-gentoo.patch, +xboard-4.6.2.ebuild,
+  +files/xboard-4.6.2-gentoo.patch, +files/xboard-4.6.2-gettext.patch:
+  version bump (bug #418367)
 
   30 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
   files/xboard-4.5.2a-gentoo.patch, files/xboard-4.5.3a-gentoo.patch,
diff --git a/games-board/xboard/files/xboard-4.5.2a-gentoo.patch b/games-board/xboard/files/xboard-4.5.2a-gentoo.patch
deleted file mode 100644
index ca6c0030ead6..000000000000
--- a/games-board/xboard/files/xboard-4.5.2a-gentoo.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- xboard-4.5.2a.orig/Makefile.am
-+++ xboard-4.5.2a/Makefile.am
-@@ -33,14 +33,10 @@
- 		 $(ZPY)
- xboard_LDADD = -lm @XAW_LIBS@ @X_LIBS@
- 
--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/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,14 @@
- 
- ### icon files
- 
--icondir = $(datadir)/icons/hicolor/48x48/apps
-+icondir = /usr/share/icons/hicolor/48x48/apps
- dist_icon_DATA = xboard.png
--svgicondir = $(datadir)/icons/hicolor/scalable/apps
-+svgicondir = /usr/share/icons/hicolor/scalable/apps
- dist_svgicon_DATA = xboard.svg
- 
- 
--### desktop files for KDE and gnome
--
--Applicationsdir = $(datadir)/applications
--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 for pixmaps
- 
--pixmapsdir = $(datadir)/games/xboard/pixmaps/textures
-+pixmapsdir = $(datadir)/pixmaps/textures
- dist_pixmaps_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm
- 
- 
- ### directory and files for sound files
- 
--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
---- xboard-4.5.2a.orig/configure.ac
-+++ xboard-4.5.2a/configure.ac
-@@ -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],
--            [AS_HELP_STRING([--with-Xaw3d],[use Xaw3d instead of Xaw])],
--            [],
--            [with_Xaw3d=no])
--
--dnl | check availability of Xaw3d
--XAW_LIBS=
--AS_IF([test x"$with_Xaw3d" != x"no"],
--      [AC_CHECK_LIB([Xaw3d], 
--                    [XawTextReplace],
--                    [AC_SUBST([XAW_LIBS],["-lXaw3d"])
--                     AC_DEFINE([USE_XAW3D], [1],
--                               [Define if you want to use Xaw3d])],
--                    [AC_MSG_ERROR([--with-Xaw3d was given, but test for Xaw3d failed. Make sure that you have Xaw3d installed, else you might want to try the configure option --without-Xaw3d])],
--			       [-lXaw])])
--dnl | no Xaw3d, check for Xaw
--if test x"$with_Xaw3d" = x"no" ; then
--   AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes", xaw_headers="no")
--   if test x"$xaw_headers" = x"no" ; then
--      AC_MSG_ERROR([Xaw headers not found. Please install the Xaw package and headers.])
--   fi
--   XAW_LIBS="-lXaw"
-+if test "$withval" = yes; then
-+       AC_DEFINE(USE_XAW3D)
-+       XAW_LIBS="-lXaw3d"
-+else
-+       XAW_LIBS="-lXaw"
- fi
-+
- AC_SUBST(XAW_LIBS)
- 
- dnl | end Xaw/Xaw3d test
---- xboard-4.5.2a.orig/xboard.conf.in
-+++ xboard-4.5.2a/xboard.conf.in
-@@ -57,7 +57,7 @@
- ;
- ; Engines & adjudicatons in engine-engine games
- ;
---firstChessProgram fairymax
-+-firstChessProgram gnuchess
- -secondChessProgram fairymax
- -niceEngines 0
- -polyglotDir ""
---- xboard-4.5.2a.orig/xboard.h
-+++ xboard-4.5.2a/xboard.h
-@@ -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"
- #define FIRST_DIRECTORY         "."
- #define SECOND_DIRECTORY        "."
diff --git a/games-board/xboard/files/xboard-4.6.2-gentoo.patch b/games-board/xboard/files/xboard-4.6.2-gentoo.patch
new file mode 100644
index 000000000000..a45b11b4c208
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.6.2-gentoo.patch
@@ -0,0 +1,83 @@
+--- Makefile.am.old
++++ Makefile.am
+@@ -42,10 +42,9 @@
+ DISTCLEANFILES = stamp-h
+ 
+ AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' \
+-	    -DBITMAPDIR='"$(datadir)/games/xboard/bitmaps/default"' \
++	    -DBITMAPDIR='"$(bitmapsdir)"' \
+ 	    -DLOCALEDIR='"$(localedir)"'
+ 
+-ACLOCAL_AMFLAGS = -I m4
+ 
+ info_TEXINFOS =  xboard.texi
+ xboard_TEXINFOS =  copyright.texi 
+@@ -59,15 +59,15 @@
+ 
+ ### icon files
+ 
+-icondir = $(datadir)/icons/hicolor/48x48/apps
++icondir = /usr/share/icons/hicolor/48x48/apps
+ dist_icon_DATA = xboard.png
+-svgicondir = $(datadir)/icons/hicolor/scalable/apps
++svgicondir = /usr/share/icons/hicolor/scalable/apps
+ dist_svgicon_DATA = xboard.svg
+ 
+ 
+ ### desktop files for KDE and gnome
+ 
+-Applicationsdir = $(datadir)/applications
++Applicationsdir = /usr/share/applications
+ Applications_DATA = xboard.desktop xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop
+ 
+ ### mime file
+@@ -76,7 +76,7 @@
+ 
+ ### directory and files for bitmaps
+ 
+-bitmapsdir = $(datadir)/games/xboard/bitmaps/default
++bitmapsdir = $(datadir)/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 \
+@@ -145,12 +145,12 @@
+ 
+ ### directory and files for pixmaps
+ 
+-pixmapsdir = $(datadir)/games/xboard/pixmaps/textures
++pixmapsdir = $(datadir)/pixmaps/textures
+ dist_pixmaps_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm pixmaps/cross32.xpm pixmaps/cross48.xpm pixmaps/board32.xpm pixmaps/board48.xpm
+ 
+ ### directory and files for sound files
+ 
+-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
+--- xboard.conf.in.old
++++ xboard.conf.in
+@@ -67,8 +67,8 @@
+ ;
+ ; Engines & adjudicatons in engine-engine games
+ ;
+--firstChessProgram fairymax
+--secondChessProgram fairymax
++-firstChessProgram gnuchess
++-secondChessProgram gnuchess
+ -firstChessProgramNames {fairymax
+ "Fruit 2.1" -fcp fruit -fUCI
+ "Crafty" -fcp crafty
+--- xboard.h.old
++++ xboard.h
+@@ -119,8 +119,8 @@
+ 
+ #define BORDER_X_OFFSET 3
+ #define BORDER_Y_OFFSET 27
+-#define FIRST_CHESS_PROGRAM	"fairymax"
+-#define SECOND_CHESS_PROGRAM	"fairymax"
++#define FIRST_CHESS_PROGRAM	"gnuchess"
++#define SECOND_CHESS_PROGRAM	"gnuchess"
+ #define FIRST_DIRECTORY         "."
+ #define SECOND_DIRECTORY        "."
+ #define SOUND_BELL              ""
diff --git a/games-board/xboard/files/xboard-4.6.2-gettext.patch b/games-board/xboard/files/xboard-4.6.2-gettext.patch
new file mode 100644
index 000000000000..8c5145eac7e8
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.6.2-gettext.patch
@@ -0,0 +1,14 @@
+xboard-4.6.0 bundles files from a different version of gettext than it claims to in configure.ac
+Bug 418267: https://bugs.gentoo.org/show_bug.cgi?id=418267
+
+--- configure.ac.orig
++++ configure.ac
+@@ -76,7 +76,7 @@
+ AC_PROG_INSTALL
+ 
+ dnl| add gettext support
+-AM_GNU_GETTEXT_VERSION(0.17)
++AM_GNU_GETTEXT_VERSION(0.18)
+ AM_GNU_GETTEXT([external])
+ 
+ AC_CHECK_PROGS(RSH, remsh rsh, rsh)
diff --git a/games-board/xboard/xboard-4.5.2a.ebuild b/games-board/xboard/xboard-4.6.2.ebuild
index aecb479f596c..da36d9a13147 100644
--- a/games-board/xboard/xboard-4.5.2a.ebuild
+++ b/games-board/xboard/xboard-4.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.4 2011/11/02 01:10:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.6.2.ebuild,v 1.1 2012/05/31 14:13:42 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -10,21 +10,18 @@ HOMEPAGE="http://www.gnu.org/software/xboard/"
 SRC_URI="mirror://gnu/xboard/${P}.tar.gz
 	mirror://gentoo/${PN}.png"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~ppc ~ppc64 x86"
+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
+	!Xaw3d? ( x11-libs/libXaw )
 	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"
@@ -34,7 +31,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}*
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-gettext.patch
 	eautoreconf
 }
 
@@ -42,6 +41,7 @@ src_configure() {
 	egamesconf \
 		--disable-dependency-tracking \
 		--datadir="${GAMES_DATADIR}"/${PN} \
+		--localedir=/usr/share/locale \
 		$(use_with Xaw3d) \
 		$(use_enable zippy)
 }
@@ -52,7 +52,6 @@ src_install() {
 	use zippy && dodoc zippy.README
 	dohtml FAQ.html
 	doicon "${DISTDIR}"/xboard.png
-	make_desktop_entry ${PN} "Xboard (Chess)"
 	prepgamesdirs
 }