Fixing gcc-4.2 compilation problem. Bug #184423

(Portage version: 2.1.2.12)

4 files changed, 78 insertions, 1 deletions

diff --git a/games-fps/avp/ChangeLog b/games-fps/avp/ChangeLog
index 4487cc3e52ad..65e4d14152e8 100644
--- a/games-fps/avp/ChangeLog
+++ b/games-fps/avp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-fps/avp
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/avp/ChangeLog,v 1.8 2007/01/30 22:41:43 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/avp/ChangeLog,v 1.9 2007/09/07 18:38:49 tupone Exp $
+
+  07 Sep 2007; <tupone@gentoo.org> +files/avp-20070130-gcc42.patch,
+  +avp-20070130-r1.ebuild:
+  Fixing gcc-4.2 compilation problem. Bug #184423 by Tristan Heaven
+
+*avp-20070130-r1 (07 Sep 2007)
+
+  07 Sep 2007;  <>  avp-20070130-r1.ebuild files/digest-avp-20070130-r1
+  # INSERT ENTRY HERE
 
 *avp-20070130 (30 Jan 2007)
 
diff --git a/games-fps/avp/avp-20070130-r1.ebuild b/games-fps/avp/avp-20070130-r1.ebuild
new file mode 100644
index 000000000000..badec70c00c8
--- /dev/null
+++ b/games-fps/avp/avp-20070130-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/avp/avp-20070130-r1.ebuild,v 1.1 2007/09/07 18:38:49 tupone Exp $
+
+inherit eutils games
+
+DESCRIPTION="Linux port of Aliens vs Predator"
+HOMEPAGE="http://www.icculus.org/avp/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="AvP"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+DEPEND="media-libs/openal
+	media-libs/libsdl"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc42.patch
+	sed -i \
+		-e "/^CFLAGS/s/-g.*/${CFLAGS}/" \
+		-e "/^LDLIBS/s/$/${LDFLAGS}/" \
+		Makefile \
+		|| die "sed failed"
+}
+
+src_install() {
+	newgamesbin AvP.bin AvP || die "newgamesbin failed"
+	dodoc README TODO
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "please follow the instructions in"
+	elog "/usr/share/doc/${PF}/README.gz"
+	elog "to install the rest of the game"
+}
diff --git a/games-fps/avp/files/avp-20070130-gcc42.patch b/games-fps/avp/files/avp-20070130-gcc42.patch
new file mode 100644
index 000000000000..245caa03f7c6
--- /dev/null
+++ b/games-fps/avp/files/avp-20070130-gcc42.patch
@@ -0,0 +1,22 @@
+--- avp/win95/gadgets/conscmnd.hpp.old	2007-09-06 20:42:31.000000000 +0200
++++ avp/win95/gadgets/conscmnd.hpp	2007-09-06 20:42:43.000000000 +0200
+@@ -36,7 +36,7 @@
+ 		(
+ 			ProjChar* pProjCh_ToUse,
+ 			ProjChar* pProjCh_Description_ToUse,
+-			void (&f) (void),
++			void (*f) (void),
+ 			OurBool Cheat = FALSE
+ 		);
+ 		static void Make
+--- avp/win95/gadgets/conscmnd.cpp.old	2007-09-06 20:44:24.000000000 +0200
++++ avp/win95/gadgets/conscmnd.cpp	2007-09-06 20:43:49.000000000 +0200
+@@ -138,7 +138,7 @@
+ (
+ 	ProjChar* pProjCh_ToUse,
+ 	ProjChar* pProjCh_Description_ToUse,
+-	void (&f) (void),
++	void (*f) (void),
+ 	OurBool Cheat
+ )
+ {
diff --git a/games-fps/avp/files/digest-avp-20070130-r1 b/games-fps/avp/files/digest-avp-20070130-r1
new file mode 100644
index 000000000000..0bb966c7c7dd
--- /dev/null
+++ b/games-fps/avp/files/digest-avp-20070130-r1
@@ -0,0 +1,3 @@
+MD5 a1bfcae5e46ae8439960ac6ddbe18c37 avp-20070130.tar.bz2 1523270
+RMD160 3ad032b2489ccddf1bd4ae60a602eefe9da121a1 avp-20070130.tar.bz2 1523270
+SHA256 f857040fc591ff7e8983be4e0d1ca44ea290e6b954ba9a234a6664ff01b4be58 avp-20070130.tar.bz2 1523270