EAPI=5; work with newer versions of patch (bug #544480)

Package-Manager: portage-2.2.14/cvs/Linux x86_64

7 files changed, 49 insertions, 45 deletions

diff --git a/games-fps/aaquake2/ChangeLog b/games-fps/aaquake2/ChangeLog
index c2fcfdd6efa5..8fc289e3c107 100644
--- a/games-fps/aaquake2/ChangeLog
+++ b/games-fps/aaquake2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/aaquake2
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/aaquake2/ChangeLog,v 1.9 2010/09/21 09:11:01 tupone Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/aaquake2/ChangeLog,v 1.10 2015/03/25 17:23:51 mr_bones_ Exp $
+
+  25 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> aaquake2-0.1.ebuild,
+  files/0.1-gentoo.patch, files/aaquake2-0.1-gcc41.patch,
+  files/aaquake2-0.1-glibc.patch, files/aaquake2-0.1-ldflags.patch:
+  EAPI=5; work with newer versions of patch (bug #544480)
 
   21 Sep 2010; Tupone Alfredo <tupone@gentoo.org> files/0.1-gentoo.patch,
   aaquake2-0.1.ebuild, files/aaquake2-0.1-gcc41.patch,
diff --git a/games-fps/aaquake2/Manifest b/games-fps/aaquake2/Manifest
index 77f753692cf7..19b33c5042e5 100644
--- a/games-fps/aaquake2/Manifest
+++ b/games-fps/aaquake2/Manifest
@@ -1,9 +1,9 @@
-AUX 0.1-gentoo.patch 2815 RMD160 dbbec5cd629125168abf745c9fcdc7c1b4d0aa3c SHA1 214c958e9e891612cdca187feb8593f6024e998a SHA256 fe9955229846622a2fe42421c15e928c6902dc82a6d532851551ce2959b9831a
-AUX aaquake2-0.1-gcc41.patch 895 RMD160 3d928d287c698f0e48e15ce486d69a34e3ff147e SHA1 421210b23ba44ecc239545c799a5da61e1d17cf3 SHA256 47229149ccde423fe2e59b491ac3e67aef53a2e18d16159300b99cf5d804097c
-AUX aaquake2-0.1-glibc.patch 482 RMD160 3acc6552c8bfcd39b4a2fb5054c8a03108515510 SHA1 0f7c7a9b8854c21b62eca223fb5ad656ed8d5e77 SHA256 65d04355be243b6b9924c2092041f8b01473024849fe6f8f9615223adf7eafe2
-AUX aaquake2-0.1-ldflags.patch 3636 RMD160 4d008a968c6738117623a1611fefb9a193c71110 SHA1 60075c313993713b1f246ef9a7fd3ccaebbde689 SHA256 d2938a7a97f2d9f2def6bac3d4bb4eb8400a8719cae9faa6df96ba0baeee6d95
-DIST q2source-3.21.zip 1477764 RMD160 c23beea8062c94ef5d45f9acf3d884961b8d8564 SHA1 2e3fa6e6eab67be92a272b24b3f24f6c2aa462c8 SHA256 c9200316de189638d0d997a0092f36b85f2c3f9e4ebe30f4b1c356745ad676ca
-DIST quake2-ref_softaa-0.1.tar.gz 12931 RMD160 79086b65413eabc5e7200abda6c968e6a425ff4c SHA1 c03696ae4eb495dfc9148c43d2b11402504ec9e1 SHA256 e848919804e65c99dc900b640e5d5c6f018d2181908a48bb1b0330efa90d3a6a
-EBUILD aaquake2-0.1.ebuild 1671 RMD160 e6f793e97ceaf74de14a305a9097a7dc0121a809 SHA1 90b052ad02d5f8769e4929dadd520a1e5e08a3ec SHA256 ca53ee0c6bcf5feb24ded1eac85b521b464b731538fd8dba8fad92e6c19add8a
-MISC ChangeLog 1238 RMD160 d3a60f2a433f6e58374fbfe35e0fe78f03ae16ca SHA1 f328590afe00c8feecb726cdc0d30dcc0e26af60 SHA256 6bcbe12d5917d556360425a75bdde431719413cd929e4b2fde5086cf4481f6f5
-MISC metadata.xml 536 RMD160 b96baf29eebcb09bd22af1fe5ebf0f44aa2d0032 SHA1 26bc44fb1377ab1f3407ce0fb60b0012e5cb6969 SHA256 db2948d335ccba4bf0a377033d4160d3bd2a79207e7b5a36f2548d50634a91cb
+AUX 0.1-gentoo.patch 2539 SHA256 60d4883d1c50bf806c04254db29c784f0baafc69c2d093c45cd89f94a6bd1c80 SHA512 2d288074c7181f0359d83b84dc4733d99924455fe733b67e52ee95976e8103536e2935b79ab9a1b8fc481c57d1c7472386fdb9e185db64adca61ea376aae1d09 WHIRLPOOL 338731d1be571bcb953228c8741e7f8decc92e8e9daed98cf1a3f897270f3656e53c71ca4af754d15aa6e9c9689e9987fc3f1d0218527f055018e3e9f4a0f39c
+AUX aaquake2-0.1-gcc41.patch 739 SHA256 18e8b7dcf3234b8422b90a32049a89ba3c91d29e4d6165e92c73185b168ef10f SHA512 d5678631a35cb19beb99001fdaeb2223c89e699cd57dbaee8c0c30d77d8d75cc9505bb382c1cbda00f308133c26551f2e528b2880de378df92e3ec5370e8135e WHIRLPOOL 50933b612f3c9aecf4c50fcfe713eb429b208000e8161545fd48477d60bc950c69ccaa87a0f10b7dd9bcc9fa5fe17c0aa0e68bbf3c550c07e1496648bc1d899d
+AUX aaquake2-0.1-glibc.patch 338 SHA256 68f6ac5ec933fa6a0bf88c6460627d65a54204361c5cf7987a0a4733e81f699f SHA512 6aca1c77b20030c3a70fbec76ec5c27ec767434069fa4cddcac478e52cc52d286b4c9765e50309e64aff0a0fcb3021c47059a5b027ad98cb5a3d3ced0d92e824 WHIRLPOOL f5ed5cc66cff5f9caa9008fd7e39b7fb255afa2cb650a87a361d6c6e4681f009047f3bea970aab70d42d6ed90cfe959b80f7fcb58db61157bb88dff57c6ae12b
+AUX aaquake2-0.1-ldflags.patch 3564 SHA256 26534690b339a0d064c80089f83e35af19767ce0ab66b81678c4f59827027871 SHA512 4ef54ac768e76e4abc917f9c6ddbde426bbd8c71510ce398bbebaf1a5969ee59ca642dedea32b3150a58c2550b14b0a8953123017bf101ec3fac09f90e92ad72 WHIRLPOOL de135c52107455be7cf1c9a441aca8e3bca2889e11fbc6453e8177cb5df683d99ee7933ad17acd5780ecd2d342b64dc6ee1b00a1bacbe2b43336eb6905fee642
+DIST q2source-3.21.zip 1477764 SHA256 c9200316de189638d0d997a0092f36b85f2c3f9e4ebe30f4b1c356745ad676ca SHA512 eb3fcf3327272b7472a044336be4d73111f5b9f50b4916609996ecb690555654990c1f86e63cd6e7d4a30844e66d3eca2e428e29a598bce52e953c326caf9752 WHIRLPOOL 7b372c99d97e4bf807b07d93726cba748116e21c9e5f3348e0571632742a2574cc395e762e7e30a529fe5d45a82e3f047605cc4d788fb1e67d0ee9a615d8af34
+DIST quake2-ref_softaa-0.1.tar.gz 12931 SHA256 e848919804e65c99dc900b640e5d5c6f018d2181908a48bb1b0330efa90d3a6a SHA512 d5f7e46485084217f5cb8fdcfa360106eafbfac9dad03e4853367e9cf6857a9789ec4d37d3bca656730282649b3e33b0ab04d4c0a73de36f794d98f3c048401c WHIRLPOOL 568c28704c9577d9b789b6fff32baf05ceaab692c65ebd84a2200222d98178e53909375a859dac35d60e37664e9450252c8d9d8d286252836b49663b12ab8f74
+EBUILD aaquake2-0.1.ebuild 1578 SHA256 8221a2b8fc2db58921f67097359cb145f261a9c339c6e82247e55b60f38559cc SHA512 2a6ad3981fc2a0a8c2309a206648179aba7b88d1a110c2617a36ee84e42ab8cbb436d86b72021351136d56bf1133d214a5bc17daea5fb3c101357497a7374005 WHIRLPOOL 3d94976be9233c913508f0cc59d6c2f515ab8110597f49a6c795bbb6c78406c6924a6d51958572f9fe1e3342411cb74fe931b7c7d434668e5931d493ef1ad425
+MISC ChangeLog 1503 SHA256 ac4bfdd59ee9f5414be669656d766621a1e2e9e63d9140e56d0d2bf05ef10962 SHA512 2bf681c4835a7cd031ac8d51e3ae1b2337bb7b6e1554a77c6ece821b5527e76ecb4581bf6e5abdc9f72aa386c1f0472ea39e5e6dd57e5b937defe84b45729be3 WHIRLPOOL 92e56b14d7b95f03f3d8e01d0cb86c4fae1686e01e6cf7567eb7347d7dc995f1983eb6a8eb59ead6be1c03ca2cb62a0312563ae53e596ce7494353a91494e329
+MISC metadata.xml 536 SHA256 db2948d335ccba4bf0a377033d4160d3bd2a79207e7b5a36f2548d50634a91cb SHA512 1adc7e562e3fa32398cc19f80903d39c297c10d011025ec8ce3d17b3772d51179d63a1103e7e652a0f34eabe8dba6e9f71887f8c4a3179a8d35729ed3366dbd8 WHIRLPOOL fcf174403b661732115bd18f841ea3c7ab3859b77ff3aa6fac394745837e57186814720eb28dd58d2762e6c10774268cbf9ac7bbd93e0a19e3e9adf1668a04b0
diff --git a/games-fps/aaquake2/aaquake2-0.1.ebuild b/games-fps/aaquake2/aaquake2-0.1.ebuild
index b0096cd25758..f66373409ab7 100644
--- a/games-fps/aaquake2/aaquake2-0.1.ebuild
+++ b/games-fps/aaquake2/aaquake2-0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/aaquake2/aaquake2-0.1.ebuild,v 1.13 2010/10/13 21:23:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/aaquake2/aaquake2-0.1.ebuild,v 1.14 2015/03/25 17:23:51 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="text mode Quake II"
@@ -22,43 +22,42 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/quake2-3.21/linux
 
 src_prepare() {
-	epatch \
+	cd .. && epatch \
 		"${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/${P}-gcc41.patch
+	cd "${S}" && epatch \
 		"${FILESDIR}"/${P}-glibc.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
 		"${FILESDIR}"/${P}-ldflags.patch
 	sed -i \
-		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" sys_linux.c \
-		|| die "sed failed"
+		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" sys_linux.c || die
 	sed -i \
 		-e "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
-		sys_linux.c vid_so.c \
-		|| die "sed failed"
+		sys_linux.c vid_so.c || die
 }
 
 src_compile() {
 	mkdir -p releasei386-glibc/ref_soft
-	make \
+	emake -j1 \
 		GENTOO_CFLAGS="${CFLAGS}" \
 		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
-		build_release || die
+		build_release
 }
 
 src_install() {
-	cd release*
+	cd release* || die
 
 	exeinto "$(games_get_libdir)"/${PN}
-	doexe gamei386.so ref_softaa.so || die "doexe failed"
+	doexe gamei386.so ref_softaa.so
 	dosym ref_softaa.so "$(games_get_libdir)"/${PN}/ref_softx.so
 	dosym ref_softaa.so "$(games_get_libdir)"/${PN}/ref_soft.so
 	exeinto "$(games_get_libdir)"/${PN}/ctf
-	doexe ctf/gamei386.so || die "doexe failed"
+	doexe ctf/gamei386.so
 
-	newgamesbin quake2 aaquake2 || die "newgamesbin failed"
+	newgamesbin quake2 aaquake2
 
 	insinto "${GAMES_SYSCONFDIR}"
 	echo "$(games_get_libdir)"/${PN} > ${PN}.conf
-	doins ${PN}.conf || die "doins failed"
+	doins ${PN}.conf
 
 	prepgamesdirs
 }
diff --git a/games-fps/aaquake2/files/0.1-gentoo.patch b/games-fps/aaquake2/files/0.1-gentoo.patch
index 4a9b38bf5ecb..cc7bb1733f64 100644
--- a/games-fps/aaquake2/files/0.1-gentoo.patch
+++ b/games-fps/aaquake2/files/0.1-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2001-12-29 20:37:22.000000000 -0500
-+++ Makefile	2003-07-17 22:14:50.000000000 -0400
+--- linux/Makefile.old
++++ linux/Makefile
 @@ -54,7 +54,7 @@
  RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops \
  	-fomit-frame-pointer -fexpensive-optimizations
@@ -40,8 +40,8 @@
  		$(BUILD_RELEASE_DIR)/game \
  		$(BUILD_RELEASE_DIR)/ctf \
  #		$(BUILD_RELEASE_DIR)/xatrix \
---- sys_linux.c.old	2001-12-22 18:45:58.000000000 -0500
-+++ sys_linux.c	2003-07-17 22:34:11.000000000 -0400
+--- linux/sys_linux.c.old
++++ linux/sys_linux.c
 @@ -220,7 +220,7 @@
  	char	curpath[MAX_OSPATH];

  	char	*path;

@@ -66,8 +66,8 @@
  		}

  	}

  

---- ../qcommon/files.c.old	2001-12-22 16:32:26.000000000 -0500
-+++ ../qcommon/files.c	2003-07-17 22:34:29.000000000 -0400
+--- qcommon/files.c.old
++++ qcommon/files.c
 @@ -865,7 +865,7 @@
  	//

  	// start up with baseq2 by default

@@ -77,8 +77,8 @@
  

  	// any set gamedirs will be freed up to here

  	fs_base_searchpaths = fs_searchpaths;

---- ../qcommon/qcommon.h.old	2001-12-22 16:32:26.000000000 -0500
-+++ ../qcommon/qcommon.h	2003-07-17 21:20:03.000000000 -0400
+--- qcommon/qcommon.h.old
++++ qcommon/qcommon.h
 @@ -25,7 +25,7 @@
  

  #define	VERSION		3.21

diff --git a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch b/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
index f3d3da6cad63..bb2e8e5979e5 100644
--- a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
+++ b/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
@@ -1,5 +1,5 @@
---- ../game/g_local.h.old	2006-05-05 21:26:25.000000000 +0200
-+++ ../game/g_local.h	2006-05-05 21:26:48.000000000 +0200
+--- game/g_local.h.old
++++ game/g_local.h
 @@ -458,11 +458,6 @@
  extern	int	sm_meat_index;

  extern	int	snd_fry;

@@ -12,8 +12,8 @@
  // means of death

  #define MOD_UNKNOWN			0

  #define MOD_BLASTER			1

---- ../ctf/g_local.h.old	2006-05-05 21:41:10.000000000 +0200
-+++ ../ctf/g_local.h	2006-05-05 21:41:23.000000000 +0200
+--- ctf/g_local.h.old
++++ ctf/g_local.h
 @@ -466,11 +466,6 @@
  extern	int	sm_meat_index;

  extern	int	snd_fry;

diff --git a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch b/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
index 580df210d472..638e91b2c393 100644
--- a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
+++ b/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
@@ -1,5 +1,5 @@
---- rw_aa.c.old	2008-03-18 23:29:28.000000000 +0100
-+++ rw_aa.c	2008-03-18 23:29:44.000000000 +0100
+--- rw_aa.c.old
++++ rw_aa.c
 @@ -61,7 +61,7 @@
  #include <signal.h>

  #include <sys/mman.h>

@@ -9,8 +9,8 @@
  

  #include <aalib.h>

  

---- rw_in_aa.c.old	2008-03-18 23:29:33.000000000 +0100
-+++ rw_in_aa.c	2008-03-18 23:29:54.000000000 +0100
+--- rw_in_aa.c.old
++++ rw_in_aa.c
 @@ -46,7 +46,7 @@
  #include <signal.h>

  #include <sys/mman.h>

diff --git a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch b/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
index 3c011f8a6851..dc2359ac48d7 100644
--- a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
+++ b/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-09-21 10:43:43.000000000 +0200
-+++ Makefile	2010-09-21 10:47:26.000000000 +0200
+--- Makefile.old
++++ Makefile
 @@ -59,7 +59,7 @@
  endif