match patches to version

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

12 files changed, 282 insertions, 23 deletions

diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog
index 3eee2e1c7857..7233b596a706 100644
--- a/games-board/xboard/ChangeLog
+++ b/games-board/xboard/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-board/xboard
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.63 2014/09/15 16:38:11 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.64 2014/09/15 17:00:12 mr_bones_ Exp $
+
+  15 Sep 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/xboard-4.7.3-Xaw3d.patch, +files/xboard-4.7.3-configure-switches.patch,
+  +files/xboard-4.7.3-gettext.patch, +files/xboard-4.7.3-gnuchess-default.patch,
+  +files/xboard-4.7.3-paths.patch, files/xboard-4.7.2-Xaw3d.patch,
+  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,
+  xboard-4.7.3.ebuild:
+  match patches to version
 
 *xboard-4.7.3 (15 Sep 2014)
 
diff --git a/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch b/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch
index a180d9288e22..4427f5b10af4 100644
--- a/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch
+++ b/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch
@@ -7,8 +7,6 @@ Date:   Sat Sep 7 12:48:58 2013 +0200
     Listing both one after another leads to withXaw being false
     if you pass "--with-Xaw3d --without-Xaw".
 
-diff --git a/configure.ac b/configure.ac
-index 1664491..6548295 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -248,8 +248,7 @@ fi
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
index 3a84624a9020..7646f1babe02 100644
--- a/games-board/xboard/files/xboard-4.7.2-configure-switches.patch
+++ b/games-board/xboard/files/xboard-4.7.2-configure-switches.patch
@@ -6,8 +6,6 @@ Date:   Fri Sep 6 16:56:15 2013 +0200
 
 	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=""
diff --git a/games-board/xboard/files/xboard-4.7.2-gettext.patch b/games-board/xboard/files/xboard-4.7.2-gettext.patch
index 0483babb5eef..a50009a70efa 100644
--- a/games-board/xboard/files/xboard-4.7.2-gettext.patch
+++ b/games-board/xboard/files/xboard-4.7.2-gettext.patch
@@ -7,8 +7,6 @@ Date:   Fri Sep 6 16:37:22 2013 +0200
     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
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
index ab76920850df..9b55fe01cc98 100644
--- a/games-board/xboard/files/xboard-4.7.2-gnuchess-default.patch
+++ b/games-board/xboard/files/xboard-4.7.2-gnuchess-default.patch
@@ -4,8 +4,6 @@ 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 {
@@ -19,8 +17,6 @@ index 5326af8..0fe90ed 100644
  #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 {
@@ -34,8 +30,6 @@ index 04692b5..508b52f 100644
  #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 @@
diff --git a/games-board/xboard/files/xboard-4.7.2-paths.patch b/games-board/xboard/files/xboard-4.7.2-paths.patch
index 511010d865b5..d97d57e15ead 100644
--- a/games-board/xboard/files/xboard-4.7.2-paths.patch
+++ b/games-board/xboard/files/xboard-4.7.2-paths.patch
@@ -10,8 +10,6 @@ Date:   Fri Sep 6 16:35:03 2013 +0200
 
 	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
@@ -85,8 +83,6 @@ index 61aa1d7..25f1138 100644
  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 @@
diff --git a/games-board/xboard/files/xboard-4.7.3-Xaw3d.patch b/games-board/xboard/files/xboard-4.7.3-Xaw3d.patch
new file mode 100644
index 000000000000..4427f5b10af4
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.7.3-Xaw3d.patch
@@ -0,0 +1,21 @@
+commit 7bc79645d4e404d00fee43b5a6cee4e3b6bf7a35
+Author: hasufell <hasufell@gentoo.org>
+Date:   Sat Sep 7 12:48:58 2013 +0200
+
+    BUILD: fix withXaw conditional
+    
+    Listing both one after another leads to withXaw being false
+    if you pass "--with-Xaw3d --without-Xaw".
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -248,8 +248,7 @@ fi
+ 
+ dnl | make results available in Makefile.am
+ AM_CONDITIONAL([withGTK],   [test x"$with_GTK" = x"yes"])
+-AM_CONDITIONAL([withXaw],   [test x"$with_Xaw3d" = x"yes"])
+-AM_CONDITIONAL([withXaw],   [test x"$with_Xaw" = x"yes"])
++AM_CONDITIONAL([withXaw],   [test x"$with_Xaw3d" = x"yes" || test x"$with_Xaw" = x"yes"])
+ 
+ 
+ AC_SUBST(FRONTEND_CFLAGS)
diff --git a/games-board/xboard/files/xboard-4.7.3-configure-switches.patch b/games-board/xboard/files/xboard-4.7.3-configure-switches.patch
new file mode 100644
index 000000000000..7646f1babe02
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.7.3-configure-switches.patch
@@ -0,0 +1,35 @@
+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
+
+--- 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.3-gettext.patch b/games-board/xboard/files/xboard-4.7.3-gettext.patch
new file mode 100644
index 000000000000..a50009a70efa
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.7.3-gettext.patch
@@ -0,0 +1,20 @@
+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
+
+--- 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.3-gnuchess-default.patch b/games-board/xboard/files/xboard-4.7.3-gnuchess-default.patch
new file mode 100644
index 000000000000..9b55fe01cc98
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.7.3-gnuchess-default.patch
@@ -0,0 +1,45 @@
+commit 0b6d8acf55b4d8721e854cfba025e621f61ff5c2
+Author: hasufell <hasufell@gentoo.org>
+Date:   Fri Sep 6 18:15:38 2013 +0200
+
+    set gnuchess as default engine
+
+--- 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              ""
+--- 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              ""
+--- 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.3-paths.patch b/games-board/xboard/files/xboard-4.7.3-paths.patch
new file mode 100644
index 000000000000..d97d57e15ead
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.7.3-paths.patch
@@ -0,0 +1,145 @@
+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
+
+--- 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
+--- 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.3.ebuild b/games-board/xboard/xboard-4.7.3.ebuild
index f6243842b80b..3f7284d919c7 100644
--- a/games-board/xboard/xboard-4.7.3.ebuild
+++ b/games-board/xboard/xboard-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.7.3.ebuild,v 1.1 2014/09/15 16:38:11 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.7.3.ebuild,v 1.2 2014/09/15 17:00:12 mr_bones_ Exp $
 
 EAPI=5
 inherit autotools eutils fdo-mime gnome2-utils games
@@ -40,11 +40,11 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-4.7.2-paths.patch \
-		"${FILESDIR}"/${PN}-4.7.2-gettext.patch \
-		"${FILESDIR}"/${PN}-4.7.2-configure-switches.patch \
-		"${FILESDIR}"/${PN}-4.7.2-gnuchess-default.patch \
-		"${FILESDIR}"/${PN}-4.7.2-Xaw3d.patch
+		"${FILESDIR}"/${P}-paths.patch \
+		"${FILESDIR}"/${P}-gettext.patch \
+		"${FILESDIR}"/${P}-configure-switches.patch \
+		"${FILESDIR}"/${P}-gnuchess-default.patch \
+		"${FILESDIR}"/${P}-Xaw3d.patch
 	eautoreconf
 }