fix build which was broken by multilib madness

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

3 files changed, 78 insertions, 3 deletions

diff --git a/games-strategy/liquidwar6/ChangeLog b/games-strategy/liquidwar6/ChangeLog
index 66e5d815d757..3d64f518b625 100644
--- a/games-strategy/liquidwar6/ChangeLog
+++ b/games-strategy/liquidwar6/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/liquidwar6
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/ChangeLog,v 1.5 2014/05/15 17:05:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/ChangeLog,v 1.6 2014/06/09 15:40:46 hasufell Exp $
+
+  09 Jun 2014; Julian Ospald <hasufell@gentoo.org> liquidwar6-0.4.3681.ebuild,
+  +files/liquidwar6-0.4.3681-check-headers.patch:
+  fix build which was broken by multilib madness
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> liquidwar6-0.0.13_beta.ebuild,
   liquidwar6-0.2.3551.ebuild, liquidwar6-0.4.3681.ebuild:
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch
new file mode 100644
index 000000000000..34dd76b48ea0
--- /dev/null
+++ b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch
@@ -0,0 +1,70 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Jun  4 16:01:18 UTC 2014
+Subject: fix header checks
+
+	our multilib wrapped headers are broken shit
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@
+ AC_SUBST(LW6_VERSION_MINOR)
+ 
+ dnl Headers, some are optional
+-AC_CHECK_HEADERS(arpa/inet.h caca.h ctype.h CUnit/CUnit.h CUnit/Automated.h CUnit/CUCurses.h dirent.h errno.h execinfo.h expat.h fcntl.h gc/gc.h gmp.h GL/gl.h GL/glu.h GLES2/gl2.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h)
++AC_CHECK_HEADERS(arpa/inet.h caca.h ctype.h CUnit/CUnit.h CUnit/Automated.h CUnit/CUCurses.h dirent.h errno.h execinfo.h expat.h fcntl.h gc/gc.h gmp.h GL/gl.h GL/glu.h GLES2/gl2.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h)
+ 
+ dnl GNULIB stuff, http://www.gnu.org/software/gnulib/
+ gl_00GNULIB
+@@ -477,40 +477,42 @@
+ fi
+ SDL_EXTRA="${SDL_EXTRA_CFLAGS} ${SDL_EXTRA_LIBS}"
+ 
++CFLAGS="$CFLAGS $SDL_EXTRA_CFLAGS"
++
+ AC_CHECK_HEADER(SDL/SDL.h, HAVE_SDL_H=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL (http://www.libsdl.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ AC_CHECK_LIB(SDL, SDL_Init, HAVE_LIBSDL=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL (http://www.libsdl.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ 
+ AC_CHECK_HEADER(GL/gl.h, HAVE_GL_GL_H=1,AC_MSG_WARN([
+ *** Liquid War 6 needs Mesa (http://www.mesa3d.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ AC_CHECK_LIB(GL, glBegin, HAVE_LIBGL=1, AC_MSG_WARN([
+ *** Liquid War 6 needs Mesa (http://www.mesa3d.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ 
+ AC_CHECK_HEADER(GL/glu.h, HAVE_GL_GLU_H=1,AC_MSG_WARN([
+ *** Liquid War 6 needs GLU (http://www.mesa3d.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ AC_CHECK_LIB(GLU, gluBeginCurve, HAVE_LIBGLU=1, AC_MSG_WARN([
+ *** Liquid War 6 needs GLU (http://www.mesa3d.org/)
+-]),[${SDL_EXTRA}])
++]),[])
+ 
+ AC_CHECK_HEADER(SDL/SDL_image.h, HAVE_SDL_IMAGE_H=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL_image (http://www.libsdl.org/projects/SDL_image/)
+-]),[${SDL_EXTRA}])
++]),[])
+ AC_CHECK_LIB(SDL_image, IMG_Load, HAVE_LIBSDL_IMAGE=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL_image (http://www.libsdl.org/projects/SDL_image/)
+-]),[${SDL_EXTRA}])
++]),[])
+ 
+ AC_CHECK_HEADER(SDL/SDL_ttf.h, HAVE_SDL_TTF_H=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL_ttf (http://www.libsdl.org/projects/SDL_ttf/)
+-]),[${SDL_EXTRA}])
++]),[])
+ AC_CHECK_LIB(SDL_ttf, TTF_Init, HAVE_LIBSDL_TTF=1, AC_MSG_WARN([
+ *** Liquid War 6 needs SDL_ttf (http://www.libsdl.org/projects/SDL_ttf/)
+-]),[${SDL_EXTRA}])
++]),[])
+ 
+ AC_ARG_ENABLE([mod-gl1], AS_HELP_STRING([--enable-mod-gl1],[compile mod-gl1 default=yes]), [enable_mod_gl1=$enableval], [enable_mod_gl1=yes])
+ 
diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild
index 391237c224d6..9ceb48cdd3a2 100644
--- a/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild
+++ b/games-strategy/liquidwar6/liquidwar6-0.4.3681.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-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild,v 1.2 2014/05/15 17:05:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild,v 1.3 2014/06/09 15:40:46 hasufell Exp $
 
 EAPI=5
 
@@ -64,7 +64,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.3551-{ldconfig,paths}.patch
+	epatch "${FILESDIR}"/${PN}-0.2.3551-{ldconfig,paths}.patch \
+		"${FILESDIR}"/${PN}-0.4.3681-check-headers.patch
 
 	sed -i \
 		-e 's/-Werror//' \