version bump (bug #418367)

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

6 files changed, 119 insertions, 140 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/Manifest b/games-board/xboard/Manifest
index 916c164a3031..2e9e257a2205 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -1,13 +1,14 @@
-AUX xboard-4.5.2a-gentoo.patch 4226 RMD160 5efb586ac44d3e7aa50d9d800eb727925553593e SHA1 314e27175ec9f0a6978c29e39c1518a42ac6de94 SHA256 791b580b6fa3c3011f118c9f3937cc19c8fee36d995b51415ba2fdff61e3600e
 AUX xboard-4.5.3a-gentoo.patch 4226 RMD160 5efb586ac44d3e7aa50d9d800eb727925553593e SHA1 314e27175ec9f0a6978c29e39c1518a42ac6de94 SHA256 791b580b6fa3c3011f118c9f3937cc19c8fee36d995b51415ba2fdff61e3600e
 AUX xboard-4.6.0-gentoo.patch 2729 RMD160 34bfbedd293ed698d39252ff23f7a6c0ad901143 SHA1 93740d5f607b29c54c6cffcc1b40857630c21f9b SHA256 c0525e3dfd2ec8969b35a37a9ba95b889331f840b2e16f73b9999edab26217b7
 AUX xboard-4.6.0-gettext.patch 386 RMD160 1a9c4ae8f80aa36c6b9addd983c56bb8dd9fb1a5 SHA1 e60151b2721dcfbbe9c78e4a8c08d36e2d4126b4 SHA256 749d7be2b6b4c37b058d5a7aa25ff2894e7346a46397fac146897cd2c881d21d
-DIST xboard-4.5.2a.tar.gz 2387060 RMD160 00f6b2d744138fe62575550aa8852208074c412e SHA1 1ff3c1c8bf4fd705532e1c96bc047e8931867e02 SHA256 0f45cf82ed412c0e383c8a2f00605a699db3116c103d13f4e592e298f5e65980
+AUX xboard-4.6.2-gentoo.patch 2729 RMD160 34bfbedd293ed698d39252ff23f7a6c0ad901143 SHA1 93740d5f607b29c54c6cffcc1b40857630c21f9b SHA256 c0525e3dfd2ec8969b35a37a9ba95b889331f840b2e16f73b9999edab26217b7
+AUX xboard-4.6.2-gettext.patch 386 RMD160 1a9c4ae8f80aa36c6b9addd983c56bb8dd9fb1a5 SHA1 e60151b2721dcfbbe9c78e4a8c08d36e2d4126b4 SHA256 749d7be2b6b4c37b058d5a7aa25ff2894e7346a46397fac146897cd2c881d21d
 DIST xboard-4.5.3a.tar.gz 2413474 RMD160 17d9eee83c5187f183363cfb9e7c0438c05d7c95 SHA1 01e87180260d4e47be955fbc76a7d050adb1c9ad SHA256 3bc078a518d7d14781740cea137e2a8aa10c0ded1c42b0f0b6242d3eaf957cdc
 DIST xboard-4.6.0.tar.gz 2945028 RMD160 8e578a9fb320e79991462a9f686fcc4a0ac21158 SHA1 3adf6112193a656d745859b64918243d619c287c SHA256 656786430c58d92cec6e505bcf70b490bd91c9f628dd7ba55aef2ab1103f3473
+DIST xboard-4.6.2.tar.gz 2956198 RMD160 b2c457785538865712df53643fe45a96160b218e SHA1 fdda353252495978be22d3e79f8487142f87ea77 SHA256 2e57f2d2c6e90f704a2c5bc0c6e14840d88dc4f9a450ecf1b4c06516a00389df
 DIST xboard.png 479 RMD160 d0e7fa9cc30e2cf58c13eaf08f2d576e2ea9b076 SHA1 fa96fd0c0d220a3e88e1a7312b3e8308a387764c SHA256 1c36fd6ca934eef29d7cdc72159019585d8c449f489f6a6ccc2d787bba03f41d
-EBUILD xboard-4.5.2a.ebuild 1680 RMD160 74781ec1af1a0ec4e79bd8dd12f1fe4ecc7902f3 SHA1 efc49dbaa818dc28d87de44386be3c9081543ceb SHA256 458f83cfc5ab7d12d8b74602c9583937bbc5ab0513defaa2e4447887340ec53d
 EBUILD xboard-4.5.3a.ebuild 1681 RMD160 b200c99d331f35dda866fc8c506fcf4316479e3a SHA1 89c08514d1dd097a200bb29fb451e495b1965cdf SHA256 0e4807f63775976e1a4db4572ec53fdd8151d7053b909486bc8c685c5257da42
 EBUILD xboard-4.6.0.ebuild 1685 RMD160 e3f6e5875aedc156c431f18c5e75f5ceca46bb16 SHA1 fce0313082821b2e0fbf3d807c3efff52757c7ba SHA256 053cc2ab17a2f86ac02ef124178ff0d5932381f47ee09ee401a52f58f1ea1908
-MISC ChangeLog 6601 RMD160 842a49937ba6d028cf79d2bf828854089186fe81 SHA1 8a4080c0b0e9356f2e58007ae1a942e00c0b7b4f SHA256 a6dd35537bb579a8e6afd288d4a16d5a5e446cc16a6da354202f2321b0d8ba89
+EBUILD xboard-4.6.2.ebuild 1685 RMD160 c948076f20ee7df807949f95bc14d20d0327fafc SHA1 690902c598abe6b37c80f59773835908236970d8 SHA256 d9c243a0afd9640d9ea43fb311ea1766b29049b8b219ba9c77692a12b82f42dc
+MISC ChangeLog 6868 RMD160 fb5a36779199c0bedbc5553149d56d6696a28cd3 SHA1 bdd6bee1a09ea087c9849f3780bf6103e6ab543b SHA256 e8bdd25be9335032e88770490dd9957164f77959b755fc2c3feef592e0547143
 MISC metadata.xml 319 RMD160 ebce12d6fdd00bd48ac7d5b17ea08de5283e5167 SHA1 e697368a0c5827c430d5ae91ba66c624a47143fa SHA256 1b7947629144f869664be4bd08e38dddbd61fc134d37c26d393837c9bb41851c
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
 }