diff options
author | Austin English <wizardedit@gentoo.org> | 2017-09-06 18:26:13 -0500 |
---|---|---|
committer | Austin English <wizardedit@gentoo.org> | 2017-09-06 18:28:35 -0500 |
commit | 76f2db06c1012a473d4b2ea6bb35a66c8c8d2b4b (patch) | |
tree | 7f7d9a9181c6b82a7a3a6512bbea36a212485013 /games-fps | |
parent | games-fps/turtlearena: remove deprecated games eclass (diff) | |
download | gentoo-76f2db06c1012a473d4b2ea6bb35a66c8c8d2b4b.tar.gz gentoo-76f2db06c1012a473d4b2ea6bb35a66c8c8d2b4b.tar.bz2 gentoo-76f2db06c1012a473d4b2ea6bb35a66c8c8d2b4b.zip |
games-fps/wolfgl: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'games-fps')
-rw-r--r-- | games-fps/wolfgl/files/0.93-gcc.patch | 93 | ||||
-rw-r--r-- | games-fps/wolfgl/files/0.93-sample-rate.patch | 4 | ||||
-rw-r--r-- | games-fps/wolfgl/files/0.93-sprite.patch | 8 | ||||
-rw-r--r-- | games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch | 4 | ||||
-rw-r--r-- | games-fps/wolfgl/wolfgl-0.93-r2.ebuild | 56 |
5 files changed, 109 insertions, 56 deletions
diff --git a/games-fps/wolfgl/files/0.93-gcc.patch b/games-fps/wolfgl/files/0.93-gcc.patch index 3789aa2e255d..a22923393678 100644 --- a/games-fps/wolfgl/files/0.93-gcc.patch +++ b/games-fps/wolfgl/files/0.93-gcc.patch @@ -1,6 +1,6 @@ -diff -abur common/console.c common/console.c ---- common/console.c 2000-09-27 16:19:44.000000000 +0200 -+++ common/console.c 2003-09-11 19:59:46.037562040 +0200 +diff -abur a/common/console.c b/common/console.c +--- a/common/console.c 2000-09-27 16:19:44.000000000 +0200 ++++ b/common/console.c 2003-09-11 19:59:46.037562040 +0200 @@ -3,6 +3,14 @@ #include "id_us.h" #include "console.h" @@ -16,10 +16,9 @@ diff -abur common/console.c common/console.c static char con_lines[32][45]; // buffer static int con_active; // console is visible static int con_current; // current line -Only in common: console.c.orig -diff -abur common/id_in.h common/id_in.h ---- common/id_in.h 2000-09-27 16:04:26.000000000 +0200 -+++ common/id_in.h 2003-09-11 19:32:14.368653880 +0200 +diff -abur a/common/id_in.h b/common/id_in.h +--- a/common/id_in.h 2000-09-27 16:04:26.000000000 +0200 ++++ b/common/id_in.h 2003-09-11 19:32:14.368653880 +0200 @@ -178,6 +178,7 @@ void IN_Startup(); @@ -28,20 +27,18 @@ diff -abur common/id_in.h common/id_in.h void IN_Default(wbool gotit, ControlType in); void IN_ClearKeysDown(); void IN_ReadControl(int player, ControlInfo *info); -Only in common: id_in.h.rej -diff -abur common/id_vh.c common/id_vh.c ---- common/id_vh.c 2000-09-26 17:39:36.000000000 +0200 -+++ common/id_vh.c 2003-09-11 19:24:57.183116184 +0200 +diff -abur a/common/id_vh.c b/common/id_vh.c +--- a/common/id_vh.c 2000-09-26 17:39:36.000000000 +0200 ++++ b/common/id_vh.c 2003-09-11 19:24:57.183116184 +0200 @@ -230,3 +230,4 @@ } */ \ No newline at end of file + -Only in common: id_vh.c.rej -diff -abur common/opengl.c common/opengl.c ---- common/opengl.c 2000-09-27 16:04:26.000000000 +0200 -+++ common/opengl.c 2003-09-11 19:22:35.622636648 +0200 +diff -abur a/common/opengl.c b/common/opengl.c +--- a/common/opengl.c 2000-09-27 16:04:26.000000000 +0200 ++++ b/common/opengl.c 2003-09-11 19:22:35.622636648 +0200 @@ -1,5 +1,10 @@ #include <stdio.h> #include <stdlib.h> @@ -53,9 +50,9 @@ diff -abur common/opengl.c common/opengl.c #include "system.h" #include "opengl.h" #include "wl_def.h" -diff -abur common/wl_act2.c common/wl_act2.c ---- common/wl_act2.c 2000-09-27 16:04:26.000000000 +0200 -+++ common/wl_act2.c 2003-09-11 19:19:45.511497472 +0200 +diff -abur a/common/wl_act2.c b/common/wl_act2.c +--- a/common/wl_act2.c 2000-09-27 16:04:26.000000000 +0200 ++++ b/common/wl_act2.c 2003-09-11 19:19:45.511497472 +0200 @@ -1,5 +1,9 @@ // WL_ACT2.C @@ -66,9 +63,9 @@ diff -abur common/wl_act2.c common/wl_act2.c #include "wl_def.h" //============================================================================= -diff -abur common/wl_agent.c common/wl_agent.c ---- common/wl_agent.c 2003-09-11 20:04:40.738760648 +0200 -+++ common/wl_agent.c 2003-09-11 19:57:06.860760592 +0200 +diff -abur a/common/wl_agent.c b/common/wl_agent.c +--- a/common/wl_agent.c 2003-09-11 20:04:40.738760648 +0200 ++++ b/common/wl_agent.c 2003-09-11 19:57:06.860760592 +0200 @@ -3,6 +3,10 @@ #include <string.h> #include "wl_def.h" @@ -80,9 +77,9 @@ diff -abur common/wl_agent.c common/wl_agent.c //============================================================================= // LOCAL CONSTANTS //============================================================================= -diff -abur common/wl_draw.c common/wl_draw.c ---- common/wl_draw.c 2003-09-11 20:04:40.739760496 +0200 -+++ common/wl_draw.c 2003-09-11 19:20:33.512200256 +0200 +diff -abur a/common/wl_draw.c b/common/wl_draw.c +--- a/common/wl_draw.c 2003-09-11 20:04:40.739760496 +0200 ++++ b/common/wl_draw.c 2003-09-11 19:20:33.512200256 +0200 @@ -2,6 +2,11 @@ #include <stdio.h> @@ -95,9 +92,9 @@ diff -abur common/wl_draw.c common/wl_draw.c #include "system.h" #include "opengl.h" #include "wl_def.h" -diff -abur common/wl_menu.c common/wl_menu.c ---- common/wl_menu.c 2000-09-27 16:04:27.000000000 +0200 -+++ common/wl_menu.c 2003-09-11 20:07:38.892677136 +0200 +diff -abur a/common/wl_menu.c b/common/wl_menu.c +--- a/common/wl_menu.c 2000-09-27 16:04:27.000000000 +0200 ++++ b/common/wl_menu.c 2003-09-11 20:07:38.892677136 +0200 @@ -5,6 +5,10 @@ // //////////////////////////////////////////////////////////////////// @@ -109,18 +106,18 @@ diff -abur common/wl_menu.c common/wl_menu.c #include <string.h> #include "opengl.h" #include "wl_def.h" -diff -abur common/wl_menu.h common/wl_menu.h ---- common/wl_menu.h 2000-09-26 17:38:31.000000000 +0200 -+++ common/wl_menu.h 2003-09-11 18:31:41.593919584 +0200 +diff -abur a/common/wl_menu.h b/common/wl_menu.h +--- a/common/wl_menu.h 2000-09-26 17:38:31.000000000 +0200 ++++ b/common/wl_menu.h 2003-09-11 18:31:41.593919584 +0200 @@ -233,3 +233,4 @@ void NonShareware(); /*int GetYorN(int x,int y,int pic); */ \ No newline at end of file + -diff -abur common/wl_play.c common/wl_play.c ---- common/wl_play.c 2000-09-27 16:04:27.000000000 +0200 -+++ common/wl_play.c 2003-09-11 19:40:31.293109880 +0200 +diff -abur a/common/wl_play.c b/common/wl_play.c +--- a/common/wl_play.c 2000-09-27 16:04:27.000000000 +0200 ++++ b/common/wl_play.c 2003-09-11 19:40:31.293109880 +0200 @@ -1,6 +1,11 @@ // WL_PLAY.C @@ -133,9 +130,9 @@ diff -abur common/wl_play.c common/wl_play.c #include "wl_def.h" #include "system.h" -diff -abur common/wl_state.c common/wl_state.c ---- common/wl_state.c 2000-09-27 16:04:27.000000000 +0200 -+++ common/wl_state.c 2003-09-11 19:23:26.895841936 +0200 +diff -abur a/common/wl_state.c b/common/wl_state.c +--- a/common/wl_state.c 2000-09-27 16:04:27.000000000 +0200 ++++ b/common/wl_state.c 2003-09-11 19:23:26.895841936 +0200 @@ -2,6 +2,10 @@ #include "wl_def.h" @@ -147,9 +144,9 @@ diff -abur common/wl_state.c common/wl_state.c //============================================================================= // GLOBAL VARIABLES //============================================================================= -diff -abur common/wl_text.c common/wl_text.c ---- common/wl_text.c 2000-09-26 17:40:23.000000000 +0200 -+++ common/wl_text.c 2003-09-11 19:19:00.110399488 +0200 +diff -abur a/common/wl_text.c b/common/wl_text.c +--- a/common/wl_text.c 2000-09-26 17:40:23.000000000 +0200 ++++ b/common/wl_text.c 2003-09-11 19:19:00.110399488 +0200 @@ -4,6 +4,10 @@ #include "wl_def.h" #include "system.h" @@ -161,9 +158,9 @@ diff -abur common/wl_text.c common/wl_text.c #ifndef SPEAR void FreeMusic(); // WL_MENU.C -diff -abur linux/sound.c linux/sound.c ---- linux/sound.c 2000-09-26 17:57:48.000000000 +0200 -+++ linux/sound.c 2003-09-11 19:55:16.702507192 +0200 +diff -abur a/linux/sound.c b/linux/sound.c +--- a/linux/sound.c 2000-09-26 17:57:48.000000000 +0200 ++++ b/linux/sound.c 2003-09-11 19:55:16.702507192 +0200 @@ -9,6 +9,8 @@ #include <stdlib.h> @@ -173,9 +170,9 @@ diff -abur linux/sound.c linux/sound.c #include <fcntl.h> #include <unistd.h> -diff -abur linux/sound.h linux/sound.h ---- linux/sound.h 2000-09-26 17:57:48.000000000 +0200 -+++ linux/sound.h 2003-09-11 19:44:03.663824624 +0200 +diff -abur a/linux/sound.h b/linux/sound.h +--- a/linux/sound.h 2000-09-26 17:57:48.000000000 +0200 ++++ b/linux/sound.h 2003-09-11 19:44:03.663824624 +0200 @@ -1,5 +1,8 @@ void S_LoadSound(int id, void* data, long length); void S_PlaySound(int id, int pan); @@ -185,9 +182,9 @@ diff -abur linux/sound.h linux/sound.h extern int DigitalDevice; -diff -abur linux/system.c linux/system.c ---- linux/system.c 2000-09-26 17:57:48.000000000 +0200 -+++ linux/system.c 2003-09-11 19:42:14.955350824 +0200 +diff -abur a/linux/system.c b/linux/system.c +--- a/linux/system.c 2000-09-26 17:57:48.000000000 +0200 ++++ b/linux/system.c 2003-09-11 19:42:14.955350824 +0200 @@ -1,9 +1,12 @@ #include <stdio.h> +#include <string.h> diff --git a/games-fps/wolfgl/files/0.93-sample-rate.patch b/games-fps/wolfgl/files/0.93-sample-rate.patch index 4beb8886355d..6e7156a1c716 100644 --- a/games-fps/wolfgl/files/0.93-sample-rate.patch +++ b/games-fps/wolfgl/files/0.93-sample-rate.patch @@ -1,5 +1,5 @@ ---- linux/sound.c.orig 2003-09-11 20:28:32.032170976 +0200 -+++ linux/sound.c 2003-09-11 20:28:45.111182664 +0200 +--- a/linux/sound.c 2003-09-11 20:28:32.032170976 +0200 ++++ b/linux/sound.c 2003-09-11 20:28:45.111182664 +0200 @@ -64,7 +64,7 @@ #define BUFMUL 4 #define MIXBUFFERSIZE (SAMPLECOUNT*BUFMUL) diff --git a/games-fps/wolfgl/files/0.93-sprite.patch b/games-fps/wolfgl/files/0.93-sprite.patch index 0ba91fc76a24..135eb8e26eed 100644 --- a/games-fps/wolfgl/files/0.93-sprite.patch +++ b/games-fps/wolfgl/files/0.93-sprite.patch @@ -1,5 +1,5 @@ ---- common/wl_agent.c.orig 2003-09-11 20:39:02.674298800 +0200 -+++ common/wl_agent.c 2003-09-11 20:42:17.229721880 +0200 +--- a/common/wl_agent.c 2003-09-11 20:39:02.674298800 +0200 ++++ b/common/wl_agent.c 2003-09-11 20:42:17.229721880 +0200 @@ -919,32 +919,31 @@ viewdist = 0x7fffffffl; closest = NULL; @@ -42,8 +42,8 @@ } // hit something ---- common/wl_draw.c.orig 2003-09-11 20:43:26.473195272 +0200 -+++ common/wl_draw.c 2003-09-11 20:46:57.859059736 +0200 +--- a/common/wl_draw.c 2003-09-11 20:43:26.473195272 +0200 ++++ b/common/wl_draw.c 2003-09-11 20:46:57.859059736 +0200 @@ -877,7 +877,7 @@ tilespot = &tilemap[0][0]+spotloc; diff --git a/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch b/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch index 6916df70bcc4..f9da771e1d79 100644 --- a/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch +++ b/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch @@ -1,5 +1,5 @@ ---- linux/Makefile.old 2009-02-06 14:27:11.000000000 +0100 -+++ linux/Makefile 2009-02-06 14:27:40.000000000 +0100 +--- a/linux/Makefile 2009-02-06 14:27:11.000000000 +0100 ++++ b/linux/Makefile 2009-02-06 14:27:40.000000000 +0100 @@ -19,7 +19,7 @@ @echo 'Do not call this file directly' diff --git a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild new file mode 100644 index 000000000000..2fb858261675 --- /dev/null +++ b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +#ECVS_SERVER="wolfgl.cvs.sourceforge.net:/cvsroot/wolfgl" +#ECVS_MODULE="wolfgl" +#inherit cvs + +inherit eutils + +DESCRIPTION="Wolfenstein and Spear of Destiny port using OpenGL" +HOMEPAGE="http://wolfgl.sourceforge.net/" +SRC_URI="mirror://gentoo/${P}.tbz2 + mirror://sourceforge/wolfgl/wolfdata.zip + mirror://sourceforge/wolfgl/sdmdata.zip" +# mirror://sourceforge/wolfgl/wolfglx-wl6-${PV}.zip +# mirror://sourceforge/wolfgl/wolfglx-sod-${PV}.zip + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +RDEPEND="virtual/opengl" +DEPEND="${RDEPEND} + app-arch/unzip + x11-proto/xproto" + +PATCHES=( + "${FILESDIR}"/${PV}-gcc.patch + "${FILESDIR}"/${PV}-sample-rate.patch + "${FILESDIR}"/${PV}-sprite.patch + "${FILESDIR}"/${P}-as-needed.patch + "${FILESDIR}"/${PV}-gcc4.patch +) + +src_compile() { + emake -j1 CFLAGS="${CFLAGS}" DATADIR="/usr/share/${PN}" || die "emake failed" +} + +src_install() { + newbin linux/SDM/wolfgl wolfgl-sdm + newbin linux/SOD/wolfgl wolfgl-sod + newbin linux/WL1/wolfgl wolfgl-wl1 + newbin linux/WL6/wolfgl wolfgl-wl6 + + insinto /usr/share/${PN} + doins "${WORKDIR}"/*.{sdm,wl1} +} + +pkg_postinst() { + elog "This installed the shareware data files for" + elog "Wolfenstein 3D and Spear Of Destiny." + elog "If you wish to play the full versions just" + elog "copy the data files to /usr/share/${PN}/" +} |