work around gettext issue (bug #418267)

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

7 files changed, 53 insertions, 48 deletions

diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog
index 3d0f654e7dfe..8a50cd8ba3a5 100644
--- a/games-board/xboard/ChangeLog
+++ b/games-board/xboard/ChangeLog
@@ -1,6 +1,12 @@
 # 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.45 2012/04/19 04:59:05 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.46 2012/05/30 19:55:08 mr_bones_ Exp $
+
+  30 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  files/xboard-4.5.2a-gentoo.patch, files/xboard-4.5.3a-gentoo.patch,
+  xboard-4.6.0.ebuild, files/xboard-4.6.0-gentoo.patch,
+  +files/xboard-4.6.0-gettext.patch:
+  work around gettext issue (bug #418267)
 
 *xboard-4.6.0 (19 Apr 2012)
 
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
index 82e6f2b63fe8..916c164a3031 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX xboard-4.5.2a-gentoo.patch 4780 RMD160 c6997646ec54fae904455cdb0a7788a1ee5a18d7 SHA1 019a53773adb4582a4f04ecf5685202ada47361d SHA256 ed53588fab7a311beef280ba3d1c93c8e5b216fd343fc647f836a30860017214
-AUX xboard-4.5.3a-gentoo.patch 4780 RMD160 c6997646ec54fae904455cdb0a7788a1ee5a18d7 SHA1 019a53773adb4582a4f04ecf5685202ada47361d SHA256 ed53588fab7a311beef280ba3d1c93c8e5b216fd343fc647f836a30860017214
-AUX xboard-4.6.0-gentoo.patch 2945 RMD160 0660ec2d8bdeeefd3af33c0678d21dadb1c22aa3 SHA1 780fa6ef323f9d136d50c76fab0803faee8bd18d SHA256 cb1b9068872d01263e5cd77ac3a2f497a022dbee3d221aff22f6a4a4ec42b7c2
+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
 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.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 1629 RMD160 bb55686c23f20ce751b112faa1679262db2b1328 SHA1 0d861032cd1863f7b6d29a18cb7afd95ead229b8 SHA256 f776b17b445e9e82a6cb5b7338cd88cadf39bdca18ccde675fde50dfe9f97fd3
-MISC ChangeLog 6337 RMD160 c684d3009dcf18b105d7839e7569b868d6230309 SHA1 f0b64c6981c6b032324805eaac844dc6e2b7058f SHA256 7c569f9703c3294d60d1da2308acec602452eba47f7e56ceaec4af0836da50d0
+EBUILD xboard-4.6.0.ebuild 1685 RMD160 e3f6e5875aedc156c431f18c5e75f5ceca46bb16 SHA1 fce0313082821b2e0fbf3d807c3efff52757c7ba SHA256 053cc2ab17a2f86ac02ef124178ff0d5932381f47ee09ee401a52f58f1ea1908
+MISC ChangeLog 6601 RMD160 842a49937ba6d028cf79d2bf828854089186fe81 SHA1 8a4080c0b0e9356f2e58007ae1a942e00c0b7b4f SHA256 a6dd35537bb579a8e6afd288d4a16d5a5e446cc16a6da354202f2321b0d8ba89
 MISC metadata.xml 319 RMD160 ebce12d6fdd00bd48ac7d5b17ea08de5283e5167 SHA1 e697368a0c5827c430d5ae91ba66c624a47143fa SHA256 1b7947629144f869664be4bd08e38dddbd61fc134d37c26d393837c9bb41851c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk+Pm6QACgkQIY77eQFFFC2mngCg5buwlqCuMSqHQpn7DnolmvGI
-RFMAn3PvQO/WXrD9GRZ/4CF8VBYxYi87
-=Y23f
------END PGP SIGNATURE-----
diff --git a/games-board/xboard/files/xboard-4.5.2a-gentoo.patch b/games-board/xboard/files/xboard-4.5.2a-gentoo.patch
index 56e1ba8e10eb..ca6c0030ead6 100644
--- a/games-board/xboard/files/xboard-4.5.2a-gentoo.patch
+++ b/games-board/xboard/files/xboard-4.5.2a-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru xboard-4.5.2a.orig/Makefile.am xboard-4.5.2a/Makefile.am
---- xboard-4.5.2a.orig/Makefile.am	2011-05-01 23:15:52.000000000 -0400
-+++ xboard-4.5.2a/Makefile.am	2011-05-06 17:24:16.268244229 -0400
+--- 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@
@@ -58,9 +57,8 @@ diff -ru xboard-4.5.2a.orig/Makefile.am xboard-4.5.2a/Makefile.am
  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 -ru xboard-4.5.2a.orig/configure.ac xboard-4.5.2a/configure.ac
---- xboard-4.5.2a.orig/configure.ac	2011-05-01 23:17:29.000000000 -0400
-+++ xboard-4.5.2a/configure.ac	2011-05-06 17:24:16.268244229 -0400
+--- xboard-4.5.2a.orig/configure.ac
++++ xboard-4.5.2a/configure.ac
 @@ -131,32 +131,17 @@
     exit 1
  fi
@@ -103,9 +101,8 @@ diff -ru xboard-4.5.2a.orig/configure.ac xboard-4.5.2a/configure.ac
  AC_SUBST(XAW_LIBS)
  
  dnl | end Xaw/Xaw3d test
-diff -ru xboard-4.5.2a.orig/xboard.conf.in xboard-4.5.2a/xboard.conf.in
---- xboard-4.5.2a.orig/xboard.conf.in	2011-05-01 23:15:52.000000000 -0400
-+++ xboard-4.5.2a/xboard.conf.in	2011-05-06 17:24:29.271622485 -0400
+--- 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
@@ -115,9 +112,8 @@ diff -ru xboard-4.5.2a.orig/xboard.conf.in xboard-4.5.2a/xboard.conf.in
  -secondChessProgram fairymax
  -niceEngines 0
  -polyglotDir ""
-diff -ru xboard-4.5.2a.orig/xboard.h xboard-4.5.2a/xboard.h
---- xboard-4.5.2a.orig/xboard.h	2011-05-01 23:15:52.000000000 -0400
-+++ xboard-4.5.2a/xboard.h	2011-05-06 17:24:16.268244229 -0400
+--- xboard-4.5.2a.orig/xboard.h
++++ xboard-4.5.2a/xboard.h
 @@ -104,7 +104,7 @@
  
  #define BORDER_X_OFFSET 3
diff --git a/games-board/xboard/files/xboard-4.5.3a-gentoo.patch b/games-board/xboard/files/xboard-4.5.3a-gentoo.patch
index 56e1ba8e10eb..ca6c0030ead6 100644
--- a/games-board/xboard/files/xboard-4.5.3a-gentoo.patch
+++ b/games-board/xboard/files/xboard-4.5.3a-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru xboard-4.5.2a.orig/Makefile.am xboard-4.5.2a/Makefile.am
---- xboard-4.5.2a.orig/Makefile.am	2011-05-01 23:15:52.000000000 -0400
-+++ xboard-4.5.2a/Makefile.am	2011-05-06 17:24:16.268244229 -0400
+--- 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@
@@ -58,9 +57,8 @@ diff -ru xboard-4.5.2a.orig/Makefile.am xboard-4.5.2a/Makefile.am
  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 -ru xboard-4.5.2a.orig/configure.ac xboard-4.5.2a/configure.ac
---- xboard-4.5.2a.orig/configure.ac	2011-05-01 23:17:29.000000000 -0400
-+++ xboard-4.5.2a/configure.ac	2011-05-06 17:24:16.268244229 -0400
+--- xboard-4.5.2a.orig/configure.ac
++++ xboard-4.5.2a/configure.ac
 @@ -131,32 +131,17 @@
     exit 1
  fi
@@ -103,9 +101,8 @@ diff -ru xboard-4.5.2a.orig/configure.ac xboard-4.5.2a/configure.ac
  AC_SUBST(XAW_LIBS)
  
  dnl | end Xaw/Xaw3d test
-diff -ru xboard-4.5.2a.orig/xboard.conf.in xboard-4.5.2a/xboard.conf.in
---- xboard-4.5.2a.orig/xboard.conf.in	2011-05-01 23:15:52.000000000 -0400
-+++ xboard-4.5.2a/xboard.conf.in	2011-05-06 17:24:29.271622485 -0400
+--- 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
@@ -115,9 +112,8 @@ diff -ru xboard-4.5.2a.orig/xboard.conf.in xboard-4.5.2a/xboard.conf.in
  -secondChessProgram fairymax
  -niceEngines 0
  -polyglotDir ""
-diff -ru xboard-4.5.2a.orig/xboard.h xboard-4.5.2a/xboard.h
---- xboard-4.5.2a.orig/xboard.h	2011-05-01 23:15:52.000000000 -0400
-+++ xboard-4.5.2a/xboard.h	2011-05-06 17:24:16.268244229 -0400
+--- xboard-4.5.2a.orig/xboard.h
++++ xboard-4.5.2a/xboard.h
 @@ -104,7 +104,7 @@
  
  #define BORDER_X_OFFSET 3
diff --git a/games-board/xboard/files/xboard-4.6.0-gentoo.patch b/games-board/xboard/files/xboard-4.6.0-gentoo.patch
index 1d73c513a69c..a45b11b4c208 100644
--- a/games-board/xboard/files/xboard-4.6.0-gentoo.patch
+++ b/games-board/xboard/files/xboard-4.6.0-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.am.old	2012-04-15 13:06:09.425029890 +0200
-+++ Makefile.am	2012-04-15 13:20:46.089910127 +0200
+--- Makefile.am.old
++++ Makefile.am
 @@ -42,10 +42,9 @@
  DISTCLEANFILES = stamp-h
  
@@ -55,8 +55,8 @@
  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	2012-04-16 21:44:25.395391094 +0200
-+++ xboard.conf.in	2012-04-16 21:44:45.014964575 +0200
+--- xboard.conf.in.old
++++ xboard.conf.in
 @@ -67,8 +67,8 @@
  ;
  ; Engines & adjudicatons in engine-engine games
@@ -68,8 +68,8 @@
  -firstChessProgramNames {fairymax
  "Fruit 2.1" -fcp fruit -fUCI
  "Crafty" -fcp crafty
---- xboard.h.old	2012-04-16 21:45:30.176682289 +0200
-+++ xboard.h	2012-04-16 21:46:00.066510987 +0200
+--- xboard.h.old
++++ xboard.h
 @@ -119,8 +119,8 @@
  
  #define BORDER_X_OFFSET 3
diff --git a/games-board/xboard/files/xboard-4.6.0-gettext.patch b/games-board/xboard/files/xboard-4.6.0-gettext.patch
new file mode 100644
index 000000000000..8c5145eac7e8
--- /dev/null
+++ b/games-board/xboard/files/xboard-4.6.0-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.6.0.ebuild b/games-board/xboard/xboard-4.6.0.ebuild
index c2f5d51b2147..5f7052d2ef2a 100644
--- a/games-board/xboard/xboard-4.6.0.ebuild
+++ b/games-board/xboard/xboard-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # 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.6.0.ebuild,v 1.1 2012/04/19 04:59:05 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.6.0.ebuild,v 1.2 2012/05/30 19:55:08 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -31,7 +31,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}*
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-gettext.patch
 	eautoreconf
 }