old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 5 insertions, 85 deletions

diff --git a/games-fps/avp/ChangeLog b/games-fps/avp/ChangeLog
index cd26dcc4c3b2..9ba1e5394682 100644
--- a/games-fps/avp/ChangeLog
+++ b/games-fps/avp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/avp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/avp/ChangeLog,v 1.20 2015/03/27 10:16:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/avp/ChangeLog,v 1.21 2015/04/20 19:29:06 mr_bones_ Exp $
+
+  20 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> -avp-20070130-r1.ebuild,
+  -files/avp-20070130-gcc42.patch, -files/avp-20070130-glibc2.10.patch:
+  old
 
   27 Mar 2015; Agostino Sarubbo <ago@gentoo.org> avp-20150214.ebuild:
   Stable for x86, wrt bug #544628
diff --git a/games-fps/avp/avp-20070130-r1.ebuild b/games-fps/avp/avp-20070130-r1.ebuild
deleted file mode 100644
index 77fb20eda49c..000000000000
--- a/games-fps/avp/avp-20070130-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 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.6 2015/03/14 18:08:19 mgorny Exp $
-
-EAPI=2
-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=""
-
-RDEPEND="virtual/opengl
-	media-libs/openal
-	media-libs/libsdl
-	amd64? ( app-emulation/emul-linux-x86-sdl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc42.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch
-	sed -i \
-		-e '/^CC /s:=:?=:' \
-		-e '/^CXX /s:=:?=:' \
-		-e "/^CFLAGS/s/-g.*/${CFLAGS}/" \
-		-e "/^LDLIBS/s/$/${LDFLAGS}/" \
-		-e 's:openal-config:pkg-config openal:' \
-		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}"
-	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
deleted file mode 100644
index 245caa03f7c6..000000000000
--- a/games-fps/avp/files/avp-20070130-gcc42.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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/avp-20070130-glibc2.10.patch b/games-fps/avp/files/avp-20070130-glibc2.10.patch
deleted file mode 100644
index 908f1a6c047e..000000000000
--- a/games-fps/avp/files/avp-20070130-glibc2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- avp/win95/jsndsup.cpp
-+++ avp/win95/jsndsup.cpp
-@@ -109,7 +109,7 @@
- {
- 	if(!SoundSwitchedOn) return (0);
- 
--	char * wavname = strrchr (fname, '\\');
-+	char * wavname = strrchr ((char *)fname, '\\');
- 	
- 	if (wavname)
- 	{