match patches to version

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

13 files changed, 294 insertions, 40 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/Manifest b/games-board/xboard/Manifest
index 5bee2f4d04ac..0019f771f1f7 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -1,21 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX xboard-4.7.2-Xaw3d.patch 757 SHA256 a1a13d4a742b548473fe9641b99dd0803f45fa5dd5416738cba337cf405d1172 SHA512 c4371d149e778eaae916f09e0a3a0c1830abaf3475e88269e2f64f08c76b41fbacdcc962cd3ecfa9abed226dbdda536ab223bfa6374af841179df541bf585147 WHIRLPOOL 48cc58b785affc1e55beefe37cf6f62265d05a15fe9523138221752a5c55043422e15efef11534c00d349b1d1aee54ca06425115b7dff43746e1629d0ab27fef
-AUX xboard-4.7.2-configure-switches.patch 1115 SHA256 57d28b97ecdaad88d83840dd0d0ea26a7a68871ec16e993ca84d9d10995c7801 SHA512 37a389b811a651161f27605a9f3b139baaf01455868705b7425b30b8e3a8ce840cfcb628f367b59dd91a53c3f42d08277d1587040e6cd155e70cc6d84d7a5ea0 WHIRLPOOL ead1e9eeefb7a2dc7df78598f0b68be370c54a89eb60f9f96668804ea5f6f9f2a8ef4241d3742de8b1609c6c2feb2ec65d87d39e1ea1139784c73b4fb9488b8b
-AUX xboard-4.7.2-gettext.patch 573 SHA256 d5af04d6b145e3ccdeced3c346c0a0662db306d181d28beaf82d3593b3bac327 SHA512 1aa6268ca3ab41f15818782b24f80656815d88df6e91d49ec64771bad14b21ab218802cbcf679aa70c70cc8afe19b9cf08fb21a0181cbf2ec8e0dfeee81986c3 WHIRLPOOL 57ed0eace7a3293ccfb6c979e12f59bcdf2893531f12236c831167a87fa92c056972f412ef723dfcdf4de2f8f0ea9e8d9bd322a5c61aaa926ae0ddbbcb097899
-AUX xboard-4.7.2-gnuchess-default.patch 1507 SHA256 5da35616933c0ca7bb593f7e90d39b3832b2eb31f1eeb27a86a675289ae3a487 SHA512 12ab109c5f12be35a3aeefd0e499f8c367a812c9747a5bec7d103d3651d1774d6cacfd57de4a26fff235407a69bba116aec3433e1460086e67033a0c2bdf5235 WHIRLPOOL 787ac52a533acf21b87aed6a266b762c6cbb916b6e75b0d0c13bdb265265d053e466fbe35993cb4ffbdf003743bdc394a57d0ab893fee9cd6638fe6f624ed44a
-AUX xboard-4.7.2-paths.patch 5781 SHA256 8e098a68992786cc21a09450f8d08482518d72bb1d652a4d24ac8ddfe84dd41a SHA512 6e86f48b69289345af8b191ae7d82951c01c83fa723ec9c39d3ad55541a97086fccbb3206f6df8ccf493004722b9c9e8a77b95611b1d0141fe6b0a68cc1c3979 WHIRLPOOL 7b2d28893800705a0a7c33f3a87e2799394fce87de79e4b574e4f86ecff2ed63788161bab344c719be635ad9fc38c8bcdfc1b67e85489bf3dda243bd8850ef41
+AUX xboard-4.7.2-Xaw3d.patch 686 SHA256 7bab1b3831772e2054c03165345af7b5997d38edd8afd802a76abcfefd0c8fd5 SHA512 29ad1fc343f9b9f0062f106161fb3b8b78f9c24f736ced70e513221aa048f9aaf73e6a4359462efbc294d1dd1ab3f271d154033650b899fb829aeba287f98aa6 WHIRLPOOL ac3453fd7de7ad6a471ef748fe5dfc5b8f01d0f0658b8e126a84a85683cba3667c3d600ec7085c71ba7f57b628b3753f5158cf81d7e09ec06e880f223b2cad2a
+AUX xboard-4.7.2-configure-switches.patch 1044 SHA256 ab79ef69dc7d817ab7010b6191d9ae85f720e47b17213cea342f92c71aa6f9cf SHA512 5e6fbeb5dcf195f4fbf8dbd1590bb66d11e2685b4471eb76b147adfa8d58b611b2efcded43bc0a1e6b5215cd7692d16633a56ae0e24821b6e2fee7542c7488d5 WHIRLPOOL 637811f02ad4050faeed640ebe68a221863a76a81273f09612b308179a47a38e9b35aa8b2bd61007b1d9ac6d96e8649edb28012f27401284adef84c680e51ae1
+AUX xboard-4.7.2-gettext.patch 502 SHA256 0ead11bb251fe8add31f694f4534dca87065f1b41938fd5af0a222727001febf SHA512 1e2e68d972e7fcc299940be72bf3f486cf132fc247ed9f95585379108a35cdbe00824108ec7ca679e37c612357ca5b03fe6bbc8d1082bf8d40a809e021c4c0a9 WHIRLPOOL bd0afd275926bff345b143de03b73f04c8b1c5265744371f7a84010866fb71a1230a46100d69fee01bcf5547cfd6258e44b6fc3a15b697cef27fa5b3f185a607
+AUX xboard-4.7.2-gnuchess-default.patch 1290 SHA256 c4ec2af96be9b53d70783d23273e9b99a95e239b826fa30e0d9658b2f2a090e1 SHA512 19a265b6f210056c897fa1076a0767b010feb13a1836b4ac1c01eb092adecddc0307693a50bb875354776ed4a6f0f5b57fa1aa5b7ad1e128986825a9769ec070 WHIRLPOOL a63dd6e843520ab9957ac5edabe3be01ca693cf584148a257f8a9e522a8ee28addfc15caecca5d2162ea6a054d82456a5f2ed07c96912ce6a6899ec17acba691
+AUX xboard-4.7.2-paths.patch 5641 SHA256 06880f91ee2d2252c5fc1ea1be7126dadcdd340f8f61e7873b23b6cbbf994d2a SHA512 9a881c2b55cb6ac3ed4fcae821e429f3c2d8ac82ca0bedd8c76d2bf734adcf0d2db45c382c93de469d49ff2750dcf6c2ff6b5ab2deef116cbc6c9382d3498708 WHIRLPOOL bda0e61a4207734d440d66f06a6a4c430cd582e79309c156e73b197b141bfbc0cb89991c28e8c86f97dba78089b83d6de8054395a365c116092c000f8c6354b5
+AUX xboard-4.7.3-Xaw3d.patch 686 SHA256 7bab1b3831772e2054c03165345af7b5997d38edd8afd802a76abcfefd0c8fd5 SHA512 29ad1fc343f9b9f0062f106161fb3b8b78f9c24f736ced70e513221aa048f9aaf73e6a4359462efbc294d1dd1ab3f271d154033650b899fb829aeba287f98aa6 WHIRLPOOL ac3453fd7de7ad6a471ef748fe5dfc5b8f01d0f0658b8e126a84a85683cba3667c3d600ec7085c71ba7f57b628b3753f5158cf81d7e09ec06e880f223b2cad2a
+AUX xboard-4.7.3-configure-switches.patch 1044 SHA256 ab79ef69dc7d817ab7010b6191d9ae85f720e47b17213cea342f92c71aa6f9cf SHA512 5e6fbeb5dcf195f4fbf8dbd1590bb66d11e2685b4471eb76b147adfa8d58b611b2efcded43bc0a1e6b5215cd7692d16633a56ae0e24821b6e2fee7542c7488d5 WHIRLPOOL 637811f02ad4050faeed640ebe68a221863a76a81273f09612b308179a47a38e9b35aa8b2bd61007b1d9ac6d96e8649edb28012f27401284adef84c680e51ae1
+AUX xboard-4.7.3-gettext.patch 502 SHA256 0ead11bb251fe8add31f694f4534dca87065f1b41938fd5af0a222727001febf SHA512 1e2e68d972e7fcc299940be72bf3f486cf132fc247ed9f95585379108a35cdbe00824108ec7ca679e37c612357ca5b03fe6bbc8d1082bf8d40a809e021c4c0a9 WHIRLPOOL bd0afd275926bff345b143de03b73f04c8b1c5265744371f7a84010866fb71a1230a46100d69fee01bcf5547cfd6258e44b6fc3a15b697cef27fa5b3f185a607
+AUX xboard-4.7.3-gnuchess-default.patch 1290 SHA256 c4ec2af96be9b53d70783d23273e9b99a95e239b826fa30e0d9658b2f2a090e1 SHA512 19a265b6f210056c897fa1076a0767b010feb13a1836b4ac1c01eb092adecddc0307693a50bb875354776ed4a6f0f5b57fa1aa5b7ad1e128986825a9769ec070 WHIRLPOOL a63dd6e843520ab9957ac5edabe3be01ca693cf584148a257f8a9e522a8ee28addfc15caecca5d2162ea6a054d82456a5f2ed07c96912ce6a6899ec17acba691
+AUX xboard-4.7.3-paths.patch 5641 SHA256 06880f91ee2d2252c5fc1ea1be7126dadcdd340f8f61e7873b23b6cbbf994d2a SHA512 9a881c2b55cb6ac3ed4fcae821e429f3c2d8ac82ca0bedd8c76d2bf734adcf0d2db45c382c93de469d49ff2750dcf6c2ff6b5ab2deef116cbc6c9382d3498708 WHIRLPOOL bda0e61a4207734d440d66f06a6a4c430cd582e79309c156e73b197b141bfbc0cb89991c28e8c86f97dba78089b83d6de8054395a365c116092c000f8c6354b5
 DIST xboard-4.7.2.tar.gz 3415953 SHA256 9b6736994b051499dcbe564051f6d964114a38fe47bbaab6dc7bde71a52ba9ee SHA512 00fada24279165e715426282e38f3f7a8dfd2aa15900ed7edd3c3e8de57ac425c1eb721df7bcf4ec4a980955cb42d69762ddd5e07af899e556820fff20607ad0 WHIRLPOOL 4dc5d9cc18725953509e25a8ba2cb04dd803228f092feb0507a878c66bed86b4072d672470462208532b60f9b9c3736a9f2207427a0bc173642bf0450e1795c2
 DIST xboard-4.7.3.tar.gz 3424771 SHA256 7fd0b03f53dad57c587bc3438459612e2455534f715cfb0e637b6290f34cbeaa SHA512 e9da88e48329f88c39ecea0623849706013dedfdd67022d9ff0f7277e339932c8b3890933db0189d80ed552e7ea42f98d2406795f17712a604ecffde2760e6cb WHIRLPOOL 3ac83d327107f565bc8e8e08fc1e1c4df64c5eb07db29e2164f432159722a0ffa62bf80d5029cdb03ff7b0267bae850d1286f6d8a3a730b1c61609975e76c029
 EBUILD xboard-4.7.2.ebuild 2279 SHA256 d8df7037aaf47222847c8c20651ceb7a0b1c0665045862f7d4c2de063d48ee58 SHA512 cc97c371aea872092935de55c9eb6262dc57af7d48496fa56b02a681c69de3609814c64dd3ca72c1eef436b58d473f3d2b9c601c2edeb383e2ed6da8fa74e5e6 WHIRLPOOL a9229356f5f437e52ce7802dc955b249fc12c7dc69293654a5e5d08ee537c47b23679f10af9da2ae8a182193476cffd89e8a7c81f56dbd1f76085bf5613d647e
-EBUILD xboard-4.7.3.ebuild 2318 SHA256 7fc56ec1eebd41d2fad969f66255eebb588b92c61ba82e5f73d916ab97894bc3 SHA512 a0bfe62d851c90963d31a2d6a1916451cf429aaafa0c5f07021cd63eb0339c3e9b05a683ad6941004265d0ee24b73c27c966ab283ed139c3f9dd2464c7c71485 WHIRLPOOL f052884fe37e9035c9703e03c0f305fcf2abdfbd68463c2bbee518a301db9c5618856133d8a9212c4a356ffd0a34977abde280564ead6df7ed12bb1b6001704d
-MISC ChangeLog 9063 SHA256 3fdad1b3cfdcbcd7e9d18be1ccc9b9853e9cf6f9283ca1c903a83b5c89b2043f SHA512 a4eefe011b2aefc2a1be1d594826b95155a7a05c03d7135f3bdb1fc76a7a9fcaa0e1645dadbbd592d16a8fe845895d3f2ea0eca9f1dd5bc43cf8f71ab513c655 WHIRLPOOL f743262ec75619318586af83327b886eaffd07c09101b92f55fe04ccc2969e15f7ee1d71c8fcc815e09dce815720f0dffeb071aec3481bf0dbddc852d0af33cd
+EBUILD xboard-4.7.3.ebuild 2287 SHA256 5f2f4e0d8ec475e9056a0c5dcb225c00731e62e3f3d32c0a14ded97e9aa0d376 SHA512 3951cf7a6e85d5cf586ca83e65e30948257f0dc35872ae2579b758f7c1033e4ff0f9bb903c9f7d49dcb2e470c17dda2b29d87854a009cd286201048d5647655f WHIRLPOOL a0f7e607fc61271bc254675b9802cae8be08f6096400fbae3cbe9c4d490a8af22eacb7cf6b6fd5d1dc8072f47b8006ae566321d00cbcea5d917498e68bda7003
+MISC ChangeLog 9560 SHA256 1f01d68161e386c8f054816ec727ac268c1084cf342db8dc84e3c5979c001dd1 SHA512 e043bbc2cbcd6ea76f65ca49e9b9940e99c986fc18349dc8727a53ca682e257ff9a89d35bb128d48dcbe0e400f9006b1e102b72de77e7f76f7cedaaa9d27552e WHIRLPOOL fd805b54b5a5f39153c18afe81baef063be4aea25fe443d45ca656005bc74f8e5260e23e2481fe8d6fb9678d96de6b6bd105f502bfdf75499319ea0e517f9250
 MISC metadata.xml 319 SHA256 1b7947629144f869664be4bd08e38dddbd61fc134d37c26d393837c9bb41851c SHA512 7ad0f40154f6d1ac4026dea028a9bf45bd1178e9fcce63809f6180607f687dd77e52e3fea92fa9c032d2b143af1915d2cafb2923d5f63be9d06495ce664d9b8a WHIRLPOOL 16bcb699ead87c5c824765d8f0344d9ef29f223ab10813d8b421d2f4e16b78166fadd4c9c5262c1a73fbd26df7c4e912470b8b9e8d8bbe9cbd7813816e612d4d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlQXFfgACgkQsAvGakAaFgDcPACfaXgA5Xz27DyQO0P8L4Zx3x2p
-09gAoMgVPE2KseX2+iPNq8B0CJpUMMF9
-=shpF
------END PGP SIGNATURE-----
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
 }