No more using -Werror during compiling. Bug #260899

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 88 insertions, 12 deletions

diff --git a/games-fps/quakeforge/ChangeLog b/games-fps/quakeforge/ChangeLog
index 58906e4da472..1ec85ecd9737 100644
--- a/games-fps/quakeforge/ChangeLog
+++ b/games-fps/quakeforge/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for games-fps/quakeforge
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.22 2009/09/10 12:09:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.23 2009/11/20 16:57:53 tupone Exp $
 
-  10 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  20 Nov 2009; Alfredo Tupone <tupone@gentoo.org> quakeforge-0.5.5.ebuild,
+  quakeforge-0.5.5-r2.ebuild, +files/quakeforge-0.5.5-noWerror.patch:
+  No more using -Werror during compiling. Bug #260899 by
+  flameeyes@gentoo.org
+
+  10 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   quakeforge-0.5.5-r2.ebuild:
   voodoo->tdfx. Thx ssuominen.
 
-  10 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  10 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   quakeforge-0.5.5-r2.ebuild:
   Rename 3dfx useflag onto video_cards_voodoo. Per bug #283943.
 
@@ -42,7 +47,7 @@
   quakeforge-0.5.5.ebuild:
   Removing old virtual/x11 dependency.
 
-  13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   quakeforge-0.5.5.ebuild:
   Remove xmms useflag.
 
@@ -108,11 +113,11 @@
 
 *quakeforge-0.5.0 (21 julio 2002)
 
-  22 Aug 2002; J. Alberto Suárez López <bass@gentoo.org> quakeforge-0.5.0.ebuild :  
+  22 Aug 2002; J. Alberto Suárez López <bass@gentoo.org> quakeforge-0.5.0.ebuild :  
   Now SRC_URI i direct to the tarball of quakeforge in Gentoo mirrors,
   and not to the hourly created in the official homepage.
   Aclaration: before the tarball used was the _same_ of now.
 
-  21 Jul 2002; Jose Alberto Suárez López <bass@gentoo.org> quakeforge-0.5.0.ebuild :
+  21 Jul 2002; Jose Alberto Suárez López <bass@gentoo.org> quakeforge-0.5.0.ebuild :
   First Relase.
 
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-noWerror.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-noWerror.patch
new file mode 100644
index 000000000000..5f3674155143
--- /dev/null
+++ b/games-fps/quakeforge/files/quakeforge-0.5.5-noWerror.patch
@@ -0,0 +1,65 @@
+--- tools/qwaq/Makefile.am.old	2009-11-20 15:10:00.000000000 +0100
++++ tools/qwaq/Makefile.am	2009-11-20 15:10:22.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
+ QFCC=$(top_builddir)/tools/qfcc/source/qfcc
+-QCFLAGS=-qq -g -Werror --advanced
++QCFLAGS=-qq -g --advanced
+ 
+ if BUILD_QWAQ
+ qwaq=qwaq
+--- ruamoko/lib/Makefile.am.old	2009-11-20 15:12:00.000000000 +0100
++++ ruamoko/lib/Makefile.am	2009-11-20 15:12:17.000000000 +0100
+@@ -3,7 +3,7 @@
+ pkglibdir=$(libdir)/ruamoko
+ 
+ QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
+-QCFLAGS=-qq -g -Werror
++QCFLAGS=-qq -g
+ QCPPFLAGS=$(INCLUDES)
+ PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
+ RANLIB=touch
+--- ruamoko/game/Makefile.am.old	2009-11-20 15:13:05.000000000 +0100
++++ ruamoko/game/Makefile.am	2009-11-20 15:13:21.000000000 +0100
+@@ -7,7 +7,7 @@
+ 
+ QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
+ QFCC=$(QFCC_DEP)
+-QCFLAGS=-qq -g -Werror
++QCFLAGS=-qq -g
+ QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include
+ GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
+ if HAVE_ZLIB
+--- ruamoko/gui/Makefile.am.old	2009-11-20 15:13:52.000000000 +0100
++++ ruamoko/gui/Makefile.am	2009-11-20 15:14:09.000000000 +0100
+@@ -3,7 +3,7 @@
+ pkglibdir=$(libdir)/ruamoko
+ 
+ QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
+-QCFLAGS=-qq -g -Werror
++QCFLAGS=-qq -g
+ QCPPFLAGS=$(INCLUDES)
+ PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
+ RANLIB=touch
+--- ruamoko/cl_menu/Makefile.am.old	2009-11-20 15:14:37.000000000 +0100
++++ ruamoko/cl_menu/Makefile.am	2009-11-20 15:15:03.000000000 +0100
+@@ -5,7 +5,7 @@
+ 
+ QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
+ QFCC=$(QFCC_DEP)
+-QCFLAGS=-qq -g -Werror
++QCFLAGS=-qq -g
+ QCPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/ruamoko/include -I$(top_srcdir)/ruamoko/include -I$(top_builddir)/include -I$(top_srcdir)/include
+ GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
+ if HAVE_ZLIB
+--- configure.ac.old	2009-11-20 15:15:35.000000000 +0100
++++ configure.ac	2009-11-20 15:16:04.000000000 +0100
+@@ -92,6 +92,7 @@
+ AC_PROG_RANLIB
+ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
++AM_PROG_AS
+ 
+ AC_PROG_YACC
+ if echo $YACC | grep -v bison > /dev/null; then
diff --git a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
index 3ce2ca6dc5be..924b377ac333 100644
--- a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild,v 1.5 2009/09/10 12:09:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild,v 1.6 2009/11/20 16:57:53 tupone Exp $
 
 EAPI=2
-inherit eutils games
+inherit base eutils autotools games
 
 DESCRIPTION="A new 3d engine based off of id Softwares's legendary Quake and QuakeWorld game engine"
 HOMEPAGE="http://www.quakeforge.net/"
@@ -45,8 +45,14 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc41.patch
 	"${FILESDIR}"/${P}-keys.patch
 	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-noWerror.patch
 )
 
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
 src_configure() {
 	#i should do this at some point :x ... i guess if you disable all shared stuff
 	#and enable all the static options explicitly, static works ... (or so ive been told)
diff --git a/games-fps/quakeforge/quakeforge-0.5.5.ebuild b/games-fps/quakeforge/quakeforge-0.5.5.ebuild
index 0d19c8f88c0e..559597780830 100644
--- a/games-fps/quakeforge/quakeforge-0.5.5.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.19 2008/02/15 01:12:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.20 2009/11/20 16:57:53 tupone Exp $
 
 inherit eutils games
 
@@ -95,8 +95,8 @@ src_compile() {
 		--enable-sound \
 		--disable-optimize \
 		${debugopts} \
-		--with-global-cfg=${GAMES_SYSCONFDIR}/quakeforge.conf \
-		--with-sharepath=${GAMES_DATADIR}/quake1 \
+		--with-global-cfg="${GAMES_SYSCONFDIR}"/quakeforge.conf \
+		--with-sharepath="${GAMES_DATADIR}"/quake1 \
 		--with-clients=${clients} \
 		--with-servers=${servers} \
 		--with-tools=${tools} \