Fix build when nls is disabled thanks to Jonathan Callen (bug #372099).

Package-Manager: portage-2.2.0_alpha40/cvs/Linux x86_64

4 files changed, 53 insertions, 12 deletions

diff --git a/games-emulation/vbam/ChangeLog b/games-emulation/vbam/ChangeLog
index 5ff32708e5de..3070e09d0898 100644
--- a/games-emulation/vbam/ChangeLog
+++ b/games-emulation/vbam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/vbam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.6 2011/06/09 21:45:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.7 2011/06/17 21:01:12 radhermit Exp $
+
+  17 Jun 2011; Tim Harder <radhermit@gentoo.org> vbam-1.8.0.1009-r1.ebuild,
+  +files/vbam-1.8.0.1009-no-nls.patch:
+  Fix build when nls is disabled thanks to Jonathan Callen (bug #372099).
 
   09 Jun 2011; Tim Harder <radhermit@gentoo.org> vbam-1.8.0.1009-r1.ebuild:
   Explicitly inherit the eutils eclass.
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index e63356920472..d2412a346267 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX vbam-1.8.0.1009-desktop.patch 617 RMD160 ad4b37155c087ad17424f08d49dfe77db46f9158 SHA1 8fb592fa3dc60368fc9c2ff51fa2a3b1bc2b0a22 SHA256 85b17f66384de563cefe4809fa95a4b9f5e63ef4f962811ffe8f21b872633790
+AUX vbam-1.8.0.1009-no-nls.patch 1164 RMD160 000aa2142bb3c367b1842ba8ecf722ed057f945e SHA1 137263718de75e6c9fb239515e2829fe2ac3f08b SHA256 8e32294dd094d060dbc39b415ef4a20baa4704876a63ae9cbf2b0bd51203d895
 DIST vbam-1.8.0.1009.tar.bz2 779577 RMD160 571b51946dfd0aa85c56701e0279aef866431c64 SHA1 affc48667d140ca232120d1c3f80f311f52dc0bc SHA256 918143ae0d8a4cd30a0af16692e836b57c2d3627e8ab4db5729ff7017b6169cd
-EBUILD vbam-1.8.0.1009-r1.ebuild 1769 RMD160 2c3e13d7e5ab6178848ad0945c38d57ad1fa16df SHA1 3a5502e40a0939c6fd7aef42339cde64ec1b7f54 SHA256 4f626b1987c886561352e345b4435f30b254b1098fe545fb8572ef2eb368e6d4
-MISC ChangeLog 1605 RMD160 af99f373c7e66fca9ba63a0a9efd16a0661d47ed SHA1 41bf77483a801f95d3f03a967178c1c6483b2db7 SHA256 53b9196af73d8802076bd21b60051cc76b9e239871cd26fc120b956b5618ae7b
+EBUILD vbam-1.8.0.1009-r1.ebuild 1805 RMD160 4834a24d2bc31c4ca7bcfaa7833cddcbff8260b6 SHA1 038677500f83d0f96111aa228306e3578184082c SHA256 8b8fbada29768566404f5b88bab9cdbb57f9ccd86e02e2f02b2a7c92a9fab3c6
+MISC ChangeLog 1795 RMD160 1839f1d1b6855ee6fb8c647bcd5d296aeceb5da0 SHA1 e8ffa1f329047959593e8bc90c78fa011d5e7cb2 SHA256 159ec6010adb4efcc426d59f2c6e2824122e7dc944f636c408ae0ff07616c928
 MISC metadata.xml 331 RMD160 34d4fd47bec0dcb8f0d08d4a17cab47d506633a5 SHA1 fc463ad416b0cfc238ea427f72ae068b069da90b SHA256 d6054d5a8bdfb747166a4b83c1f7db04be3898899323aa316cbef1ab7a6b7daa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN8T8QAAoJEEqz6FtPBkyjcasH/jQwYfJ9cPvvYb3HelODF59e
-cx7qWVgMOVOH2UlwkgPTfw7X0idBStSBzfIgmeZpal6DO+cXAEzX48AaN744g1Fj
-tl5PYv3fWz7Mh3q7XT5jdrhDtwqaLkMezmTUSFau3WYL2Fzh8O5He4Ro3MHuJcTh
-xvN0lqE3/X2ToQAfqOMnDQCKSmc+D/NNl3p/sWO6lUo9sFcbWrK2uX8rzQIgJwJk
-MqHY4uNCT3jA8D1/MzLnCIs9I7gZ/inFpPP2Xb72dG5ml2peCivk3v8QESFsn359
-mxmSM0XG9JYQP+2tg7NMNahkpMUIDiUo6lvy1e7FHA667xKB81kzdNrBLeDAVO0=
-=/7rb
+iQEcBAEBAgAGBQJN+8CeAAoJEEqz6FtPBkyjg38IAJcNlundMrZWwyOwkb+TpErj
+bzJ8UEDnQW6SklcBDLeeoLkO7NfhHUpPw7rLcHk+1WBG63uX0jJ4xCco7eGnZ8Ov
+GlpYYompZ2XJOzn4wqOInlRdSRqZSG08cx7G51tQFayCMC4Be/VkfDnrgb4quZ07
+cQB/K+wCN35W14GQCAFLNAzJ0OpwWrK8QIzg2k4cuME33RxjI0t/J8XM7pQ/QCna
+Ox+beDeSv7KZq7n5BAol6eVZ5UVTaD/mnFSTNTbJLbsItMYcuqIbVvlnNo4/NRx4
+tS4bAvOVYCmFlqey7scBlVhE0TTBKsZSgxUoq1wwH9WsND3nlcasP2sEOQwPHzs=
+=DJSG
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/vbam/files/vbam-1.8.0.1009-no-nls.patch b/games-emulation/vbam/files/vbam-1.8.0.1009-no-nls.patch
new file mode 100644
index 000000000000..6b7fd0325f8a
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-1.8.0.1009-no-nls.patch
@@ -0,0 +1,35 @@
+--- vbam-1.8.0.1009.orig/src/gtk/filters.cpp
++++ vbam-1.8.0.1009/src/gtk/filters.cpp
+@@ -87,7 +87,7 @@ Filter pvGetFilter(EFilter _eFilter, EFi
+   return astFilters[_eFilter].m_apvFunc[_eDepth];
+ }
+ 
+-char* pcsGetFilterName(const EFilter _eFilter)
++const char* pcsGetFilterName(const EFilter _eFilter)
+ {
+         return gettext(astFilters[_eFilter].m_csName);
+ }
+@@ -97,7 +97,7 @@ FilterIB pvGetFilterIB(EFilterIB _eFilte
+   return astFiltersIB[_eFilterIB].m_apvFunc[_eDepth];
+ }
+ 
+-char* pcsGetFilterIBName(const EFilterIB _eFilterIB)
++const char* pcsGetFilterIBName(const EFilterIB _eFilterIB)
+ {
+         return gettext(astFiltersIB[_eFilterIB].m_csName);
+ }
+--- vbam-1.8.0.1009.orig/src/gtk/filters.h
++++ vbam-1.8.0.1009/src/gtk/filters.h
+@@ -64,10 +64,10 @@ enum EFilterDepth
+ };
+ 
+ Filter pvGetFilter(EFilter _eFilter, EFilterDepth _eDepth);
+-char* pcsGetFilterName(const EFilter _eFilter);
++const char* pcsGetFilterName(const EFilter _eFilter);
+ 
+ FilterIB pvGetFilterIB(EFilterIB _eFilterIB, EFilterDepth _eDepth);
+-char* pcsGetFilterIBName(const EFilterIB _eFilterIB);
++const char* pcsGetFilterIBName(const EFilterIB _eFilterIB);
+ 
+ } // namespace VBA
+ 
diff --git a/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild b/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild
index e22968cf5fc2..36e3bfa304e2 100644
--- a/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild
+++ b/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild,v 1.2 2011/06/09 21:45:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0.1009-r1.ebuild,v 1.3 2011/06/17 21:01:12 radhermit Exp $
 
 EAPI=2
 
@@ -36,7 +36,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch \
+		"${FILESDIR}"/${P}-no-nls.patch
 
 	sed -i -e "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" CMakeLists.txt || die
 }