Fixing gcc-4.2 compilation problem. Bug #184423

Package-Manager: portage-2.1.2.12

5 files changed, 97 insertions, 9 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/Manifest b/games-fps/avp/Manifest
index fb552073b613..f29d038b098f 100644
--- a/games-fps/avp/Manifest
+++ b/games-fps/avp/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX avp-20070130-gcc42.patch 632 RMD160 3010e4b0486a187487b9d494f4d47b0a6d9f0a2e SHA1 ffb197af0e02dc0a1b2b121d47d9030222d1a47a SHA256 248345971831e739aecbe474ebaf8cb8fb6a5d43805356dff4916bc4c1c0eefa
+MD5 ed0c176a9d672bfb7c6ce070d56ed869 files/avp-20070130-gcc42.patch 632
+RMD160 3010e4b0486a187487b9d494f4d47b0a6d9f0a2e files/avp-20070130-gcc42.patch 632
+SHA256 248345971831e739aecbe474ebaf8cb8fb6a5d43805356dff4916bc4c1c0eefa files/avp-20070130-gcc42.patch 632
 DIST avp-20070130.tar.bz2 1523270 RMD160 3ad032b2489ccddf1bd4ae60a602eefe9da121a1 SHA1 768bccd025123be88b834b351d255f4a8de533b4 SHA256 f857040fc591ff7e8983be4e0d1ca44ea290e6b954ba9a234a6664ff01b4be58
+EBUILD avp-20070130-r1.ebuild 943 RMD160 dbc07d809038b8dc16bafe20ec1a7290a370cf4d SHA1 f7f5166b37ecdd33cacd469501744a97f555b37e SHA256 b54d3e6a2e24fe617cd8093827192cf083dcfb9dc3ff49e2b07d9c3923784450
+MD5 f1e5365d15c48f967b7f1e658deef4c1 avp-20070130-r1.ebuild 943
+RMD160 dbc07d809038b8dc16bafe20ec1a7290a370cf4d avp-20070130-r1.ebuild 943
+SHA256 b54d3e6a2e24fe617cd8093827192cf083dcfb9dc3ff49e2b07d9c3923784450 avp-20070130-r1.ebuild 943
 EBUILD avp-20070130.ebuild 892 RMD160 36a783c962a93ed9ea71c9a63672c6554f8d3dce SHA1 e9d97f66c88f80ca622fe6cf386a90f94640a57e SHA256 8e71050c397dc4efb1106a525c7bcfec34ead4bce670dadacdf9c12a8181cde5
 MD5 3186e1ae66a58024702d0208826854e0 avp-20070130.ebuild 892
 RMD160 36a783c962a93ed9ea71c9a63672c6554f8d3dce avp-20070130.ebuild 892
 SHA256 8e71050c397dc4efb1106a525c7bcfec34ead4bce670dadacdf9c12a8181cde5 avp-20070130.ebuild 892
-MISC ChangeLog 2735 RMD160 7302967c41fe0872ad492a5c005c31fb39db67ec SHA1 f4b5a5df1f03f4bfd6337a318804d8a4aeb63116 SHA256 227a43de03c63fd8326ebb0710eadc684c582fff1e926bb2042e4fd05e959b09
-MD5 493f4801d40b71ce167f180d62997b69 ChangeLog 2735
-RMD160 7302967c41fe0872ad492a5c005c31fb39db67ec ChangeLog 2735
-SHA256 227a43de03c63fd8326ebb0710eadc684c582fff1e926bb2042e4fd05e959b09 ChangeLog 2735
+MISC ChangeLog 3028 RMD160 0f191d1d7da333ee585090c9cabff65a90bedfdd SHA1 ed74433c2fcab808da82363d360cb3354170b579 SHA256 49faf9d71461a0596bdaa504f0a38432787452be0adb0317d968cf3645a8e0aa
+MD5 82b54e0f1e1177b183f6160f5bb2139b ChangeLog 3028
+RMD160 0f191d1d7da333ee585090c9cabff65a90bedfdd ChangeLog 3028
+SHA256 49faf9d71461a0596bdaa504f0a38432787452be0adb0317d968cf3645a8e0aa ChangeLog 3028
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -17,10 +25,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 4d7f449c1d0b32cdd418ee2e6221195a files/digest-avp-20070130 244
 RMD160 a4b148350442ea6012404953b2e33d18f496e68b files/digest-avp-20070130 244
 SHA256 bf2b239ec7c231a124753c611c605773a11b28ebfb3613170c9101d3622ac1bb files/digest-avp-20070130 244
+MD5 4d7f449c1d0b32cdd418ee2e6221195a files/digest-avp-20070130-r1 244
+RMD160 a4b148350442ea6012404953b2e33d18f496e68b files/digest-avp-20070130-r1 244
+SHA256 bf2b239ec7c231a124753c611c605773a11b28ebfb3613170c9101d3622ac1bb files/digest-avp-20070130-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF7Kiodz7hIScOURERAjedAKCiNQU2oCT70vauxeHaqNxFBHgrxwCfTJZr
-UPASta1yCtiOBZP3hA3VuNM=
-=VYr+
+iD8DBQFG4Zq/RmMZkarFlIwRAp1IAKCzuqyto0gWeyRxUYHI+1wAyzTgIACg4vtH
+ULkfWvaYzjs5qEFuowkfVEg=
+=Z+Ve
 -----END PGP SIGNATURE-----
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