version bump

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

6 files changed, 362 insertions, 2 deletions

diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog
index 35d93143ee3e..903e0e51c5eb 100644
--- a/games-board/xboard/ChangeLog
+++ b/games-board/xboard/ChangeLog
@@ -1,6 +1,14 @@
 # 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.53 2012/07/16 19:05:51 mr_bones_ Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.54 2013/09/06 16:40:27 hasufell Exp $
+
+*xboard-4.7.2 (06 Sep 2013)
+
+  06 Sep 2013; Julian Ospald <hasufell@gentoo.org> +xboard-4.7.2.ebuild,
+  +files/xboard-4.7.2-configure-switches.patch,
+  +files/xboard-4.7.2-gettext.patch,
+  +files/xboard-4.7.2-gnuchess-default.patch, +files/xboard-4.7.2-paths.patch:
+  version bump
 
   16 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org>
   -files/xboard-4.5.3a-gentoo.patch, -files/xboard-4.6.0-gentoo.patch,
diff --git a/games-board/xboard/files/xboard-4.7.2-configure-switches.patch b/games-board/xboard/files/xboard-4.7.2-configure-switches.patch
new file mode 100644
index 000000000000..3a84624a9020
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.7.2-configure-switches.patch
@@ -0,0 +1,37 @@
+commit adcbc6072fa0d1a9bf84e018f04b1c18dfedab5c
+Author: hasufell <hasufell@gentoo.org>
+Date:   Fri Sep 6 16:56:15 2013 +0200
+
+    BUILD: fix configure switches
+
+	https://savannah.gnu.org/bugs/?39971
+
+diff --git a/configure.ac b/configure.ac
+index 0a24161..1664491 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,18 +138,18 @@ FRONTEND_LIBS=""
+ 
+ AC_ARG_WITH([gtk],
+             [AS_HELP_STRING([--with-gtk],[use GTK front-end (experimental)])],
+-            [with_GTK=yes],
+-            [with_GTK=no])
++            [with_GTK=$withval],
++            [with_GTK="no"])
+ 
+ AC_ARG_WITH([Xaw3d],
+             [AS_HELP_STRING([--with-Xaw3d],[use Xaw3d front-end (not fully supported anymore)])],
+-            [with_Xaw3d=yes],
+-            [with_Xaw3d=no])
++            [with_Xaw3d="$withval"],
++            [with_Xaw3d="no"])
+ 
+ AC_ARG_WITH([Xaw],
+             [AS_HELP_STRING([--with-Xaw],[use Xaw front-end (default)])],
+-            [with_Xaw=yes],
+-            [with_Xaw=no])
++            [with_Xaw="$withval"],
++            [with_Xaw="no"])
+ 
+ AC_ARG_WITH([iconsdir],
+ 			[AS_HELP_STRING([--with-iconsdir=DIR],
diff --git a/games-board/xboard/files/xboard-4.7.2-gettext.patch b/games-board/xboard/files/xboard-4.7.2-gettext.patch
new file mode 100644
index 000000000000..0483babb5eef
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.7.2-gettext.patch
@@ -0,0 +1,22 @@
+commit 7688073f2967bb3438d1a2d8ccffc53f697219fb
+Author: hasufell <hasufell@gentoo.org>
+Date:   Fri Sep 6 16:37:22 2013 +0200
+
+    BUILD: fix gettext version
+    
+    https://bugs.gentoo.org/show_bug.cgi?id=418267
+	https://savannah.gnu.org/bugs/index.php?39970
+
+diff --git a/configure.ac b/configure.ac
+index 2a69733..0a24161 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,7 +76,7 @@ AC_ISC_POSIX
+ 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/files/xboard-4.7.2-gnuchess-default.patch b/games-board/xboard/files/xboard-4.7.2-gnuchess-default.patch
new file mode 100644
index 000000000000..ab76920850df
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.7.2-gnuchess-default.patch
@@ -0,0 +1,51 @@
+commit 0b6d8acf55b4d8721e854cfba025e621f61ff5c2
+Author: hasufell <hasufell@gentoo.org>
+Date:   Fri Sep 6 18:15:38 2013 +0200
+
+    set gnuchess as default engine
+
+diff --git a/gtk/xboard.h b/gtk/xboard.h
+index 5326af8..0fe90ed 100644
+--- a/gtk/xboard.h
++++ b/gtk/xboard.h
+@@ -118,8 +118,8 @@ typedef struct {
+ 
+ #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/xaw/xboard.h b/xaw/xboard.h
+index 04692b5..508b52f 100644
+--- a/xaw/xboard.h
++++ b/xaw/xboard.h
+@@ -118,8 +118,8 @@ typedef struct {
+ 
+ #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/xboard.conf.in b/xboard.conf.in
+index 38186c2..08a4f6e 100644
+--- a/xboard.conf.in
++++ b/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
diff --git a/games-board/xboard/files/xboard-4.7.2-paths.patch b/games-board/xboard/files/xboard-4.7.2-paths.patch
new file mode 100644
index 000000000000..788e24c3b78f
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.7.2-paths.patch
@@ -0,0 +1,149 @@
+commit 3c112927b309889c14f8164a58020d1ddefd58d6
+Author: hasufell <hasufell@gentoo.org>
+Date:   Fri Sep 6 16:35:03 2013 +0200
+
+    BUILD: make paths modifiable
+    
+    This can help with setups where games are installed in their
+    own location, but system data files like desktopfiles
+    should still go to /usr/share.
+
+	https://savannah.gnu.org/bugs/index.php?39969
+
+diff --git a/Makefile.am b/Makefile.am
+index 61aa1d7..25f1138 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -84,24 +84,26 @@ sysconf_DATA = xboard.conf
+ 
+ ### icon files
+ 
+-icondir = $(datadir)/icons/hicolor/48x48/apps
++icondir = @ICONSDIR@
+ dist_icon_DATA = xboard.png
+-svgicondir = $(datadir)/icons/hicolor/scalable/apps
++svgicondir = @SVGICONSDIR@
+ dist_svgicon_DATA = xboard.svg
+ 
+ 
+ ### desktop files for KDE and gnome
+ 
+-Applicationsdir = $(datadir)/applications
++Applicationsdir = @DESKTOPDIR@
+ Applications_DATA = xboard.desktop xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop  xboard-config.desktop
+ 
+ ### mime file
+-mimedir = $(datadir)/mime/packages
++mimedir = @MIMEDIR@
+ mime_DATA = xboard.xml
+ 
++gamedatadir = @GAMEDATADIR@
++
+ ### directory and files for svgs
+ 
+-svgdir = $(datadir)/games/xboard/themes/default
++svgdir = $(gamedatadir)/themes/default
+ dist_svg_DATA = svg/icon_white.svg         svg/icon_black.svg      \
+            svg/BlackAdvisor.svg       svg/WhiteAdvisor.svg    \
+            svg/BlackArchbishop.svg    svg/WhiteArchbishop.svg  \
+@@ -134,7 +136,7 @@ dist_svg_DATA = svg/icon_white.svg         svg/icon_black.svg      \
+            svg/eo_Thinking.svg      svg/eo_Unknown.svg        \
+            svg/eo_White.svg
+ 
+-shogidir = $(datadir)/games/xboard/themes/shogi
++shogidir = $(gamedatadir)/themes/shogi
+ dist_shogi_DATA = \
+            themes/shogi/WhiteGold.svg        themes/shogi/WhiteCrownedBishop.svg\
+            themes/shogi/WhiteBishop.svg      themes/shogi/WhiteKing.svg\
+@@ -151,7 +153,7 @@ dist_shogi_DATA = \
+            themes/shogi/BlackRook.svg        themes/shogi/BlackCrownedRook.svg\
+            themes/shogi/BlackAdvisor.svg     themes/shogi/BlackGoldSilver.svg
+ 
+-xiangqidir = $(datadir)/games/xboard/themes/xiangqi
++xiangqidir = $(gamedatadir)/themes/xiangqi
+ dist_xiangqi_DATA = themes/xiangqi/BlackAdvisor.svg  themes/xiangqi/WhiteAdvisor.svg \
+            themes/xiangqi/BlackCanon.svg    themes/xiangqi/WhiteCanon.svg    \
+            themes/xiangqi/BlackElephant.svg themes/xiangqi/WhiteElephant.svg \
+@@ -162,17 +164,17 @@ dist_xiangqi_DATA = themes/xiangqi/BlackAdvisor.svg  themes/xiangqi/WhiteAdvisor
+ 
+ ### directory and files for pixmaps
+ 
+-pixmapsdir = $(datadir)/games/xboard/pixmaps/textures
++pixmapsdir = $(gamedatadir)/pixmaps/textures
+ dist_pixmaps_DATA = pixmaps/cross32.xpm pixmaps/cross48.xpm pixmaps/board32.xpm pixmaps/board48.xpm pixmaps/ini32.xpm pixmaps/ini48.xpm
+ 
+ ### directory and files for pngs
+ 
+-pngdir = $(datadir)/games/xboard/themes/textures
++pngdir = $(gamedatadir)/themes/textures
+ dist_png_DATA = png/hatch.png png/wood_d.png png/wood_l.png png/xqboard.png
+ 
+ ### directory and files for sound files
+ 
+-soundsdir = $(datadir)/games/xboard/sounds
++soundsdir = $(gamedatadir)/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 --git a/configure.ac b/configure.ac
+index d7a6381..2a69733 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -151,6 +151,42 @@
+             [with_Xaw="$withval"],
+             [with_Xaw="no"])
+ 
++AC_ARG_WITH([iconsdir],
++			[AS_HELP_STRING([--with-iconsdir=DIR],
++							[path where icons get installed (default: $datadir/icons/hicolor/48x48/apps)])],
++			[ICONSDIR="$withval"],
++			[ICONSDIR="$datadir/icons/hicolor/48x48/apps"])
++
++AC_ARG_WITH([svgiconsdir],
++			[AS_HELP_STRING([--with-svgiconsdir=DIR],
++							[path where svg icons get installed (default: $datadir/icons/hicolor/scalable/apps)])],
++			[SVGICONSDIR="$withval"],
++			[SVGICONSDIR="$datadir/icons/hicolor/scalable/apps"])
++
++AC_ARG_WITH([desktopdir],
++			[AS_HELP_STRING([--with-desktopdir=DIR],
++							[path where desktop files get installed (default: $datadir/applications)])],
++			[DESKTOPDIR="$withval"],
++			[DESKTOPDIR="$datadir/applications"])
++
++AC_ARG_WITH([mimedir],
++			[AS_HELP_STRING([--with-mimedir=DIR],
++							[path where mime files get installed (default: $datadir/mime/packages)])],
++			[MIMEDIR="$withval"],
++			[MIMEDIR="$datadir/mime/packages"])
++
++AC_ARG_WITH([gamedatadir],
++			[AS_HELP_STRING([--with-gamedatadir=DIR],
++							[path where game data files get installed (default: $datadir/games/xboard)])],
++			[GAMEDATADIR="$withval"],
++			[GAMEDATADIR="$datadir/games/xboard"])
++
++AC_SUBST(ICONSDIR)
++AC_SUBST(SVGICONSDIR)
++AC_SUBST(DESKTOPDIR)
++AC_SUBST(MIMEDIR)
++AC_SUBST(GAMEDATADIR)
++
+ dnl | check for libraries
+ if test x"$with_GTK" = x"yes" ; then
+   PKG_CHECK_MODULES([GTK], [ gtk+-2.0 >= 2.16.0 gmodule-2.0 ])
+@@ -515,8 +551,12 @@
+ echo ""
+ echo "        prefix:          $prefix       "
+ echo "        datarootdir:     $datarootdir  "
+-echo "        datadir:         $datadir   (icons will go in \$datadir/icons/hicolor/...)"
+-echo "                                    (bitmaps will go in \$datadir/games/xboard/...)"
++echo "        datadir:         $datadir      "
++echo "        gamedatadir:     $GAMEDATADIR  "
++echo "        desktopdir:      $DESKTOPDIR   "
++echo "        mimedir:         $MIMEDIR      "
++echo "        iconsdir:        $ICONSDIR     "
++echo "        svgiconsdir:     $SVGICONSDIR  "
+ echo "        infodir:         $infodir   (info files will go here)"
+ echo "        sysconfdir:      $sysconfdir   (xboard.conf will go here)"
+ echo ""
diff --git a/games-board/xboard/xboard-4.7.2.ebuild b/games-board/xboard/xboard-4.7.2.ebuild
new file mode 100644
index 000000000000..241daa48e421
--- /dev/null
+++ b/games-board/xboard/xboard-4.7.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.7.2.ebuild,v 1.1 2013/09/06 16:40:27 hasufell Exp $
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils 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"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="Xaw3d +default-font gtk nls xpm zippy"
+REQUIRED_USE="?? ( Xaw3d gtk ) xpm? ( !gtk )"
+RESTRICT="test" #124112
+
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	x11-libs/cairo[X]
+	Xaw3d? ( x11-libs/libXaw3d )
+	!Xaw3d? ( !gtk? ( x11-libs/libXaw ) )
+	default-font? (
+		media-fonts/font-adobe-100dpi[nls?]
+		media-fonts/font-misc-misc[nls?]
+	)
+	!gtk? (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXmu
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-paths.patch \
+		"${FILESDIR}"/${P}-gettext.patch \
+		"${FILESDIR}"/${P}-configure-switches.patch \
+		"${FILESDIR}"/${P}-gnuchess-default.patch
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--datadir=/usr/share \
+		$(use_enable nls) \
+		$(use_enable xpm) \
+		$(use_enable zippy) \
+		--disable-update-mimedb \
+		$(use_with gtk) \
+		$(use_with Xaw3d) \
+		$(usex gtk "--without-Xaw" "$(use_with !Xaw3d Xaw)") \
+		--with-gamedatadir="${GAMES_DATADIR}"/${PN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS COPYRIGHT ChangeLog NEWS README TODO ics-parsing.txt
+	use zippy && dodoc zippy.README
+	dohtml FAQ.html
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	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
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}