work around gettext issue (bug #418267)

(Portage version: 2.1.10.49/cvs/Linux x86_64)

6 files changed, 47 insertions, 33 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/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
 }