build with gcc47 with patch from Nicolas Schlumberger via bug #413861

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

4 files changed, 37 insertions, 19 deletions

diff --git a/games-util/catcodec/ChangeLog b/games-util/catcodec/ChangeLog
index 551fd0389f8c..9e916994ac51 100644
--- a/games-util/catcodec/ChangeLog
+++ b/games-util/catcodec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-util/catcodec
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/catcodec/ChangeLog,v 1.9 2011/07/23 16:50:09 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/catcodec/ChangeLog,v 1.10 2012/05/19 20:27:17 mr_bones_ Exp $
+
+  19 May 2012; Michael Sterrett <mr_bones_@gentoo.org> catcodec-1.0.3.ebuild,
+  +files/catcodec-1.0.3-gcc47.patch:
+  build with gcc47 with patch from Nicolas Schlumberger via bug #413861
 
   23 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> catcodec-1.0.3.ebuild:
   ppc/ppc64 stable wrt #375389
diff --git a/games-util/catcodec/Manifest b/games-util/catcodec/Manifest
index 2fc15c5ec196..620c4a3f4791 100644
--- a/games-util/catcodec/Manifest
+++ b/games-util/catcodec/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX catcodec-1.0.0-build.patch 823 RMD160 1ca9bf536b7d0fc85181a43e65ef395c61b5c445 SHA1 3480a238c6398deb353dd5d8c546db5011482016 SHA256 5063c6b925c581e500a647855f2b03079957869bf2b09e1d2d16b69ddc590fae
+AUX catcodec-1.0.3-gcc47.patch 603 RMD160 4234ae2302e7a78330048500794fa9de1d2abc9d SHA1 2a1be61b9506408f808c431ca545c78eaa9f69eb SHA256 b2d7c82cd5173fb3e663e9083b1dd6d60c875ef725c8367f047774eb6a2c08f0
 DIST catcodec-1.0.0-source.tar.bz2 17858 RMD160 01c88adb05867aca0e290c62981dd866f0fe454c SHA1 058e17c6e88586f54a262a34a1a12f4f188a8d31 SHA256 4396da1a0f51451f663dcb406250bc599a1f376016d286ffe48c3591e964f46d
 DIST catcodec-1.0.3-source.tar.bz2 18536 RMD160 82ffbcfc829e1fb053ea591922b9d5ca31dd8f61 SHA1 ac7c2286819f69c44d7463f20a4e5842b95dc2f2 SHA256 b6a9fe31cf736b1432d84fd86ba7441159e3707c0387bb732eeb717f7d8aa9bb
 EBUILD catcodec-1.0.0.ebuild 692 RMD160 7ed34f551b3c6dc04873fba3a2242bdbcc09db60 SHA1 1b5514a4d246e973cddc2657e70073d31a9ca9f4 SHA256 0cbff3c9efc6546a0ed47a8383bc2a49e9e059dfcd6d5e64c57d19de3afe48e0
-EBUILD catcodec-1.0.3.ebuild 707 RMD160 b78fc56ef92ceb618269c5429f3925ce656bcd53 SHA1 25ceaaad4b5673a9290b33699e659449b4a3282f SHA256 5943dadbe07e4b563ac69f25f9f470c9f9e461e55d50586d9c23de59f214e1a1
-MISC ChangeLog 1311 RMD160 a2bd8db5ff42827a800a8e48dec0fe4766d89e72 SHA1 fdd796fa97092b35c2e1d5103e13a2c6b707b214 SHA256 93c61d80e0e68450bb4f0020b6f51a1ebf9fd59f241178fe6b2e16a286bed0f2
+EBUILD catcodec-1.0.3.ebuild 752 RMD160 4e5d89bea63365dc9e6b41ffd22536aff5f9fe3b SHA1 6c5db8fa98f2a88a9a0a92443bf3aa4e766baf84 SHA256 3eea4562947736507486a9cdf3e4eb476515e5a4c50b7e0c01926bd56d441482
+MISC ChangeLog 1499 RMD160 6b2163d91a00ff01536fe4e1cce99ca675a42160 SHA1 0b49be55140c6e7831010b0e110e4b57a7051ba6 SHA256 398e45a1044f034d97078b87f6d08d5117498001083dc0dc198c77c162fc3fe1
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk4q+8YACgkQIiMqcbOVdxTu8QP7BA8K2gbqbijvjELhJ1ExJtGU
-rlpYghxqNoHFQ8E5lZ8xFXV9YOP17w/rBdlFPGEB8g7yKhDcG2z+3IMTdF39T8YB
-yCSEnt1P7PqP+La5DhPI4aGWTfUHPJn0mYBjDQu+Z/LGo+6LqOYvhu9Es1VrbRNv
-0ihntJ6p4P0tZg4KVPY=
-=FN4O
------END PGP SIGNATURE-----
diff --git a/games-util/catcodec/catcodec-1.0.3.ebuild b/games-util/catcodec/catcodec-1.0.3.ebuild
index 993263948838..f91bc512fb97 100644
--- a/games-util/catcodec/catcodec-1.0.3.ebuild
+++ b/games-util/catcodec/catcodec-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/catcodec/catcodec-1.0.3.ebuild,v 1.4 2011/07/23 16:50:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/catcodec/catcodec-1.0.3.ebuild,v 1.5 2012/05/19 20:27:17 mr_bones_ Exp $
 
 EAPI=2
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Decodes and encodes sample catalogues for OpenTTD"
 HOMEPAGE="http://www.openttd.org/en/download-catcodec"
@@ -16,6 +16,7 @@ IUSE=""
 
 src_prepare() {
 	tc-export CXX
+	epatch "${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_compile() {
diff --git a/games-util/catcodec/files/catcodec-1.0.3-gcc47.patch b/games-util/catcodec/files/catcodec-1.0.3-gcc47.patch
new file mode 100644
index 000000000000..a36546a43aab
--- /dev/null
+++ b/games-util/catcodec/files/catcodec-1.0.3-gcc47.patch
@@ -0,0 +1,24 @@
+diff -ruN src/io.cpp.orig src/io.cpp
+--- src/io.cpp.orig     2012-05-19 20:48:05.930777509 +0200
++++ src/io.cpp  2012-05-19 20:49:04.303822711 +0200
+@@ -20,6 +20,8 @@
+ 
+ /** @file io.cpp Implementation of reading/writing to files */
+ 
++#include <unistd.h>
++
+ #include "stdafx.h"
+ #include "io.hpp"
+ 
+diff -ruN src/catcodec.cpp.orig src/catcodec.cpp
+--- src/catcodec.cpp.orig       2012-05-19 20:47:55.847255343 +0200
++++ src/catcodec.cpp    2012-05-19 20:48:38.937144091 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ #include "stdafx.h"
+ #include "io.hpp"
+