* [gentoo-commits] repo/gentoo:master commit in: games-action/0verkill/, games-action/0verkill/files/
@ 2016-07-01 18:57 Austin English
0 siblings, 0 replies; 2+ messages in thread
From: Austin English @ 2016-07-01 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 13162a44fca97ec87f3022b4759bee5e12810b64
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 1 18:57:16 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Fri Jul 1 18:57:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13162a44
games-action/0verkill: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: portage-2.2.28
games-action/0verkill/0verkill-0.16-r4.ebuild | 63 ++++++++++++++++++++++
games-action/0verkill/files/0verkill-0.16-CC.patch | 4 +-
.../files/0verkill-0.16-gentoo-paths.patch | 4 +-
.../files/0verkill-0.16-home-overflow.patch | 4 +-
.../0verkill/files/0verkill-0.16-ovflfix.patch | 8 +--
5 files changed, 73 insertions(+), 10 deletions(-)
diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild b/games-action/0verkill/0verkill-0.16-r4.ebuild
new file mode 100644
index 0000000..5eb0dc1
--- /dev/null
+++ b/games-action/0verkill/0verkill-0.16-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="a bloody 2D action deathmatch-like game in ASCII-ART"
+HOMEPAGE="http://artax.karlin.mff.cuni.cz/~brain/0verkill/"
+SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-libs/libXpm )"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-docs.patch
+ "${FILESDIR}"/${P}-home-overflow.patch
+ "${FILESDIR}"/${P}-segv.patch
+ "${FILESDIR}"/${P}-gentoo-paths.patch
+ "${FILESDIR}"/${P}-ovflfix.patch
+ "${FILESDIR}"/${P}-CC.patch
+ "${FILESDIR}"/${P}-underflow-check.patch #136222
+)
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s:data/:/usr/share/${PN}/data/:" cfg.h || die
+ sed -i \
+ -e "s:@CFLAGS@ -O3 :@CFLAGS@ :" Makefile.in || die
+ sed -i \
+ -e "/gettimeofday/s/getopt/getopt calloc/" configure.in || die
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with X x)
+}
+
+src_install() {
+ local x
+ dobin 0verkill
+ for x in avi bot editor server test_server ; do
+ newbin ${x} 0verkill-${x}
+ done
+ if use X ; then
+ dobin x0verkill
+ for x in avi editor ; do
+ newbin ${x} 0verkill-${x}
+ done
+ fi
+
+ insinto "/usr/share/${PN}"
+ doins -r data grx
+
+ rm doc/README.OS2 doc/Readme\ Win32.txt doc/COPYING
+ dodoc -r doc/
+}
diff --git a/games-action/0verkill/files/0verkill-0.16-CC.patch b/games-action/0verkill/files/0verkill-0.16-CC.patch
index b2ba0f0..568f8a4 100644
--- a/games-action/0verkill/files/0verkill-0.16-CC.patch
+++ b/games-action/0verkill/files/0verkill-0.16-CC.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2010-11-08 13:30:42.060916323 -0500
-+++ Makefile.in 2010-11-08 13:31:03.199940471 -0500
+--- a/Makefile.in 2010-11-08 13:30:42.060916323 -0500
++++ b/Makefile.in 2010-11-08 13:31:03.199940471 -0500
@@ -24,7 +24,7 @@
server.o: server.c server.h net.h data.h hash.h cfg.h time.h math.h config.h error.h
client.o: client.c data.h sprite.h cfg.h net.h hash.h time.h math.h console.h help.h blit.h config.h error.h
diff --git a/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch b/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch
index a5ecaec..d48b758 100644
--- a/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch
+++ b/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch
@@ -1,5 +1,5 @@
---- sprite.c.orig 2007-11-15 18:26:30.000000000 -0500
-+++ sprite.c 2007-11-15 18:26:57.000000000 -0500
+--- a/sprite.c 2007-11-15 18:26:30.000000000 -0500
++++ b/sprite.c 2007-11-15 18:26:57.000000000 -0500
@@ -2,6 +2,7 @@
#include <ctype.h>
#include <stdlib.h>
diff --git a/games-action/0verkill/files/0verkill-0.16-home-overflow.patch b/games-action/0verkill/files/0verkill-0.16-home-overflow.patch
index ec9b7ef..63bfb5f 100644
--- a/games-action/0verkill/files/0verkill-0.16-home-overflow.patch
+++ b/games-action/0verkill/files/0verkill-0.16-home-overflow.patch
@@ -1,5 +1,5 @@
---- client.c.orig 2001-12-16 04:26:38.000000000 -0500
-+++ client.c 2003-11-17 15:12:52.850772508 -0500
+--- a/client.c 2001-12-16 04:26:38.000000000 -0500
++++ b/client.c 2003-11-17 15:12:52.850772508 -0500
@@ -191,9 +191,9 @@
unsigned char txt[256];
diff --git a/games-action/0verkill/files/0verkill-0.16-ovflfix.patch b/games-action/0verkill/files/0verkill-0.16-ovflfix.patch
index 3df8a07..a8a832e 100644
--- a/games-action/0verkill/files/0verkill-0.16-ovflfix.patch
+++ b/games-action/0verkill/files/0verkill-0.16-ovflfix.patch
@@ -1,5 +1,5 @@
---- server.c.old 2010-11-08 11:53:18.000000000 +0100
-+++ server.c 2010-11-08 11:53:43.000000000 +0100
+--- a/server.c 2010-11-08 11:53:18.000000000 +0100
++++ b/server.c 2010-11-08 11:53:43.000000000 +0100
@@ -905,8 +905,8 @@
int len;
@@ -11,8 +11,8 @@
send_chunk_packet_to_player(packet,len,player);
}
---- console.c.old 2010-11-08 11:53:26.000000000 +0100
-+++ console.c 2010-11-08 11:54:44.000000000 +0100
+--- a/console.c 2010-11-08 11:53:26.000000000 +0100
++++ b/console.c 2010-11-08 11:54:44.000000000 +0100
@@ -206,7 +206,7 @@
void c_setcolor_3b(unsigned char a)
{
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/0verkill/, games-action/0verkill/files/
@ 2020-11-21 21:02 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2020-11-21 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 35ac0c893a3c15c90100033ed7962f63640b7fb7
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 21:01:48 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 21:01:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ac0c89
games-action/0verkill: Port to EAPI 7
Closes: https://bugs.gentoo.org/708718
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
games-action/0verkill/0verkill-0.16-r4.ebuild | 17 +++--
.../0verkill/files/0verkill-0.16-fno-common.patch | 87 ++++++++++++++++++++++
2 files changed, 96 insertions(+), 8 deletions(-)
diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild b/games-action/0verkill/0verkill-0.16-r4.ebuild
index e1b5419bf8c..39ebed3ca4c 100644
--- a/games-action/0verkill/0verkill-0.16-r4.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -18,13 +18,14 @@ DEPEND="X? ( x11-libs/libXpm )"
RDEPEND=${DEPEND}
PATCHES=(
- "${FILESDIR}"/${P}-docs.patch
- "${FILESDIR}"/${P}-home-overflow.patch
- "${FILESDIR}"/${P}-segv.patch
- "${FILESDIR}"/${P}-gentoo-paths.patch
- "${FILESDIR}"/${P}-ovflfix.patch
- "${FILESDIR}"/${P}-CC.patch
- "${FILESDIR}"/${P}-underflow-check.patch #136222
+ "${FILESDIR}"/${P}-docs.patch
+ "${FILESDIR}"/${P}-home-overflow.patch
+ "${FILESDIR}"/${P}-segv.patch
+ "${FILESDIR}"/${P}-gentoo-paths.patch
+ "${FILESDIR}"/${P}-ovflfix.patch
+ "${FILESDIR}"/${P}-CC.patch
+ "${FILESDIR}"/${P}-underflow-check.patch #136222
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_prepare() {
diff --git a/games-action/0verkill/files/0verkill-0.16-fno-common.patch b/games-action/0verkill/files/0verkill-0.16-fno-common.patch
new file mode 100644
index 00000000000..bf03ff424e2
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-fno-common.patch
@@ -0,0 +1,87 @@
+--- a/bot.c
++++ b/bot.c
+@@ -104,7 +104,7 @@
+
+ /* objects */
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ struct it* hero;
+
+ unsigned long_long game_start_offset; /* time difference between game start on this machine and on server */
+--- a/client.c
++++ b/client.c
+@@ -97,7 +97,7 @@
+
+ /* objects */
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ struct it* hero;
+
+ /* important sprites */
+--- a/data.c
++++ b/data.c
+@@ -13,6 +13,9 @@
+ #include "md5.h"
+ #include "error.h"
+
++unsigned char *weapon_name[ARMS];
++struct obj_attr_type obj_attr[N_TYPES];
++struct weapon_type weapon[ARMS];
+
+ #ifdef TRI_D
+ int tri_d=0;
+--- a/data.h
++++ b/data.h
+@@ -62,7 +62,7 @@
+
+ #define ARMS 5
+
+-unsigned char *weapon_name[ARMS];
++extern unsigned char *weapon_name[ARMS];
+
+ /* STATUS
+ 0: walk
+@@ -91,7 +91,8 @@
+ bit 1=server updates
+ bit 2=server sends updates to clients
+ */
+-}obj_attr[N_TYPES];
++};
++extern struct obj_attr_type obj_attr[N_TYPES];
+
+
+ /* weapon attribut table */
+@@ -107,7 +108,8 @@
+ unsigned char add_ammo;
+ unsigned char max_ammo;
+ my_double shell_xspeed,shell_yspeed;
+-}weapon[ARMS];
++};
++extern struct weapon_type weapon[ARMS];
+
+
+ /* object in the game */
+--- a/editor.c
++++ b/editor.c
+@@ -26,7 +26,7 @@
+ int oldx=0,oldy=0; /* old cursor position */
+
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ int level_number;
+
+
+--- a/server.c
++++ b/server.c
+@@ -100,7 +100,7 @@
+ struct object_list objects;
+
+ struct player_list *last_player;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+
+
+ #ifdef WIN32
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-21 21:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-01 18:57 [gentoo-commits] repo/gentoo:master commit in: games-action/0verkill/, games-action/0verkill/files/ Austin English
-- strict thread matches above, loose matches on Subject: below --
2020-11-21 21:02 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox