gentoo resync : 14.07.2018

7 files changed, 339 insertions, 0 deletions

diff --git a/games-fps/aaquake2/Manifest b/games-fps/aaquake2/Manifest
new file mode 100644
index 000000000000..0df2df94a45d
--- /dev/null
+++ b/games-fps/aaquake2/Manifest
@@ -0,0 +1,8 @@
+AUX 0.1-gentoo.patch 2539 BLAKE2B 7235721af47a838b94a1b690b045d27e9dc6ea8705a31ff89855e7fc6033b4774d58dd41f5988e342140fe6bc206f577490b25d41c3ce364c8fe10165fdb66ba SHA512 2d288074c7181f0359d83b84dc4733d99924455fe733b67e52ee95976e8103536e2935b79ab9a1b8fc481c57d1c7472386fdb9e185db64adca61ea376aae1d09
+AUX aaquake2-0.1-gcc41.patch 739 BLAKE2B bcc9a33912c860f2d167390f447478f993b12b85f8c65285c7926a6cde844de597de39c894e671255543970d6a0b69db216d70b98f3e2fd7f85e449c15546b05 SHA512 d5678631a35cb19beb99001fdaeb2223c89e699cd57dbaee8c0c30d77d8d75cc9505bb382c1cbda00f308133c26551f2e528b2880de378df92e3ec5370e8135e
+AUX aaquake2-0.1-glibc.patch 338 BLAKE2B 7daab77b94bc7d043e80c8f22358af9bf9e34e3742b3269a2c05387ddbb928f6122fa5db4481fb901658bc3da9b407bf7c806468e6d366045028d90d4541533e SHA512 6aca1c77b20030c3a70fbec76ec5c27ec767434069fa4cddcac478e52cc52d286b4c9765e50309e64aff0a0fcb3021c47059a5b027ad98cb5a3d3ced0d92e824
+AUX aaquake2-0.1-ldflags.patch 3564 BLAKE2B 569d2796e96c86843285b86ecc51875c1b2e1e5898ad611ef557fb5effeef46596ea83fc92be84dad2c4a668d9af2a3af78bcc6563256f39aecca11cce177e72 SHA512 4ef54ac768e76e4abc917f9c6ddbde426bbd8c71510ce398bbebaf1a5969ee59ca642dedea32b3150a58c2550b14b0a8953123017bf101ec3fac09f90e92ad72
+DIST q2source-3.21.zip 1477764 BLAKE2B afdeeff318e23397d24f9ecc68f4015b03d58d3f7794dd23febc4e285a916b2cf8c93b872a62a33dc1a4b7c2fff34ad92781e0320296cc13d4721b8cd5bf345a SHA512 eb3fcf3327272b7472a044336be4d73111f5b9f50b4916609996ecb690555654990c1f86e63cd6e7d4a30844e66d3eca2e428e29a598bce52e953c326caf9752
+DIST quake2-ref_softaa-0.1.tar.gz 12931 BLAKE2B b20644662b903e7604f53283008b54c86e83e7b1dd6b66a505bbaa41fdfaa3c783cbb73d320418595498b54ddc2f72e94d53096bc82cb173be9fcdd192dee2b9 SHA512 d5f7e46485084217f5cb8fdcfa360106eafbfac9dad03e4853367e9cf6857a9789ec4d37d3bca656730282649b3e33b0ab04d4c0a73de36f794d98f3c048401c
+EBUILD aaquake2-0.1.ebuild 1464 BLAKE2B 4201ced22006e750064336fe4d9646a118b069d2f602974db7d794003f8e034ca1f754c655045f425238fd018703583140245a1f573adb097254e02f0c388471 SHA512 0367992b1d5d4513b837bf0567154c917871fb6eaf0950357caa0877ca721adc5e317038494bdb08b91433799bd027a168b6577e0f8d9fc41c50a659e31dcfbe
+MISC metadata.xml 627 BLAKE2B f3919c638d66c1ea85f095ed0218b44ddc636e42f4a29f5ad3b9444e89a27d10e7dfd98814f2388d9a9b49296b584df31853036a9d851569c6eb88669e1cbdf7 SHA512 f212c3b4649df80d15c769067fe816d491201fc3d9193f5a54bad860aa19aab23cd5d6f82be7985ffe9493079de3c56348052657ac55bbbe8e298392887fabc1
diff --git a/games-fps/aaquake2/aaquake2-0.1.ebuild b/games-fps/aaquake2/aaquake2-0.1.ebuild
new file mode 100644
index 000000000000..a7aa57c721bd
--- /dev/null
+++ b/games-fps/aaquake2/aaquake2-0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="text mode Quake II"
+HOMEPAGE="https://www.jfedor.org/aaquake2/"
+SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
+	https://www.jfedor.org/aaquake2/quake2-ref_softaa-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="media-libs/aalib"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/quake2-3.21/linux
+
+src_prepare() {
+	cd .. && epatch \
+		"${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/${P}-gcc41.patch
+	cd "${S}" && epatch \
+		"${FILESDIR}"/${P}-glibc.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+	sed -i \
+		-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
+}
+
+src_compile() {
+	mkdir -p releasei386-glibc/ref_soft
+	emake -j1 \
+		GENTOO_CFLAGS="${CFLAGS}" \
+		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
+		build_release
+}
+
+src_install() {
+	cd release* || die
+
+	exeinto "$(games_get_libdir)"/${PN}
+	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
+
+	newgamesbin quake2 aaquake2
+
+	insinto "${GAMES_SYSCONFDIR}"
+	echo "$(games_get_libdir)"/${PN} > ${PN}.conf
+	doins ${PN}.conf
+
+	prepgamesdirs
+}
diff --git a/games-fps/aaquake2/files/0.1-gentoo.patch b/games-fps/aaquake2/files/0.1-gentoo.patch
new file mode 100644
index 000000000000..cc7bb1733f64
--- /dev/null
+++ b/games-fps/aaquake2/files/0.1-gentoo.patch
@@ -0,0 +1,90 @@
+--- linux/Makefile.old
++++ linux/Makefile
+@@ -54,7 +54,7 @@
+ RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops \
+ 	-fomit-frame-pointer -fexpensive-optimizations
+ else
+-RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \
++RELEASE_CFLAGS=$(BASE_CFLAGS) -g $(GENTOO_CFLAGS) -DGENTOO_DATADIR=\\\"$(GENTOO_DATADIR)\\\" -O6 -ffast-math -funroll-loops \
+ 	-fomit-frame-pointer -fexpensive-optimizations
+ endif
+ 
+@@ -92,7 +92,7 @@
+ #############################################################################
+ 
+ ifeq ($(ARCH),axp)
+-TARGETS=$(BUILDDIR)/q2ded \
++TARGETS=\
+ 	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
+ 	$(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \
+ #	$(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) \
+@@ -100,11 +100,7 @@
+ else
+ TARGETS=$(BUILDDIR)/quake2 \
+ 	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
+-	$(BUILDDIR)/ref_soft.$(SHLIBEXT) \
+-	$(BUILDDIR)/ref_softx.$(SHLIBEXT) \
+ 	$(BUILDDIR)/ref_softaa.$(SHLIBEXT) \
+-	$(BUILDDIR)/ref_gl.$(SHLIBEXT) \
+-	$(BUILDDIR)/ref_glx.$(SHLIBEXT) \
+ 	$(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \
+ #	$(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) \
+ #	$(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT)
+@@ -125,9 +121,6 @@
+ build_release:
+ 	@-mkdir $(BUILD_RELEASE_DIR) \
+ 		$(BUILD_RELEASE_DIR)/client \
+-		$(BUILD_RELEASE_DIR)/ded \
+-		$(BUILD_RELEASE_DIR)/ref_soft \
+-		$(BUILD_RELEASE_DIR)/ref_gl \
+ 		$(BUILD_RELEASE_DIR)/game \
+ 		$(BUILD_RELEASE_DIR)/ctf \
+ #		$(BUILD_RELEASE_DIR)/xatrix \
+--- linux/sys_linux.c.old
++++ linux/sys_linux.c
+@@ -220,7 +220,7 @@
+ 	char	curpath[MAX_OSPATH];

+ 	char	*path;

+ #ifdef __i386__

+-	const char *gamename = "gamei386.so";

++	const char *gamename = "GENTOO_DIR/gamei386.so";

+ #elif defined __alpha__

+ 	const char *gamename = "gameaxp.so";

+ #else

+@@ -250,6 +250,14 @@
+ 		{

+ 			Com_Printf ("LoadLibrary (%s)\n",name);

+ 			break;

++		} else {

++			sprintf (name, "%s", gamename);

++			game_library = dlopen (name, RTLD_LAZY );

++			if (game_library)

++			{

++				Com_Printf ("LoadLibrary (%s)\n",name);

++				break;

++			}

+ 		}

+ 	}

+ 

+--- qcommon/files.c.old
++++ qcommon/files.c
+@@ -865,7 +865,7 @@
+ 	//

+ 	// start up with baseq2 by default

+ 	//

+-	FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) );

++	FS_AddGameDirectory (va(BASEDIRNAME) );

+ 

+ 	// any set gamedirs will be freed up to here

+ 	fs_base_searchpaths = fs_searchpaths;

+--- qcommon/qcommon.h.old
++++ qcommon/qcommon.h
+@@ -25,7 +25,7 @@
+ 

+ #define	VERSION		3.21

+ 

+-#define	BASEDIRNAME	"baseq2"

++#define	BASEDIRNAME	GENTOO_DATADIR

+ 

+ #ifdef WIN32

+ 

diff --git a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch b/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
new file mode 100644
index 000000000000..bb2e8e5979e5
--- /dev/null
+++ b/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
@@ -0,0 +1,39 @@
+--- game/g_local.h.old
++++ game/g_local.h
+@@ -458,11 +458,6 @@
+ extern	int	sm_meat_index;

+ extern	int	snd_fry;

+ 

+-extern	int	jacket_armor_index;

+-extern	int	combat_armor_index;

+-extern	int	body_armor_index;

+-

+-

+ // means of death

+ #define MOD_UNKNOWN			0

+ #define MOD_BLASTER			1

+--- ctf/g_local.h.old
++++ ctf/g_local.h
+@@ -466,11 +466,6 @@
+ extern	int	sm_meat_index;

+ extern	int	snd_fry;

+ 

+-extern	int	jacket_armor_index;

+-extern	int	combat_armor_index;

+-extern	int	body_armor_index;

+-

+-

+ // means of death

+ #define MOD_UNKNOWN			0

+ #define MOD_BLASTER			1

+@@ -556,10 +556,6 @@
+ 

+ extern	cvar_t	*sv_maplist;

+ 

+-//ZOID

+-extern	qboolean	is_quad;

+-//ZOID

+-

+ #define world	(&g_edicts[0])

+ 

+ // item spawnflags

diff --git a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch b/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
new file mode 100644
index 000000000000..638e91b2c393
--- /dev/null
+++ b/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
@@ -0,0 +1,22 @@
+--- rw_aa.c.old
++++ rw_aa.c
+@@ -61,7 +61,7 @@
+ #include <signal.h>

+ #include <sys/mman.h>

+ 

+-#include <asm/io.h>

++#include <sys/io.h>

+ 

+ #include <aalib.h>

+ 

+--- rw_in_aa.c.old
++++ rw_in_aa.c
+@@ -46,7 +46,7 @@
+ #include <signal.h>

+ #include <sys/mman.h>

+ 

+-#include <asm/io.h>

++#include <sys/io.h>

+ 

+ #include <aalib.h>

+ 

diff --git a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch b/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
new file mode 100644
index 000000000000..dc2359ac48d7
--- /dev/null
+++ b/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
@@ -0,0 +1,97 @@
+--- Makefile.old
++++ Makefile
+@@ -59,7 +59,7 @@
+ endif
+ 
+ DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+-LDFLAGS=-ldl -lm
++LDLIBS=-ldl -lm
+ SVGALDFLAGS=-lvga -lm
+ XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
+ AALDFLAGS=-lm -laa
+@@ -195,7 +195,7 @@
+ endif
+ 
+ $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS)
+ 
+ $(BUILDDIR)/client/cl_cin.o :     $(CLIENT_DIR)/cl_cin.c
+ 	$(DO_CC)
+@@ -374,7 +374,7 @@
+ 	$(BUILDDIR)/ded/cd_null.o
+ 
+ $(BUILDDIR)/q2ded : $(Q2DED_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q2DED_OBJS) $(LDLIBS)
+ 
+ $(BUILDDIR)/ded/cmd.o :        $(COMMON_DIR)/cmd.c
+ 	$(DO_DED_CC)
+@@ -503,7 +503,7 @@
+ 	$(BUILDDIR)/game/m_flash.o
+ 
+ $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) : $(GAME_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
+ 
+ $(BUILDDIR)/game/g_ai.o :        $(GAME_DIR)/g_ai.c
+ 	$(DO_SHLIB_CC)
+@@ -682,7 +682,7 @@
+ 	$(BUILDDIR)/ctf/q_shared.o
+ 
+ $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) : $(CTF_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
+ 
+ $(BUILDDIR)/ctf/g_ai.o :       $(CTF_DIR)/g_ai.c
+ 	$(DO_SHLIB_CC)
+@@ -821,7 +821,7 @@
+ 	$(BUILDDIR)/xatrix/q_shared.o
+ 
+ $(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) : $(XATRIX_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
+ 
+ $(BUILDDIR)/xatrix/g_ai.o :        $(XATRIX_DIR)/g_ai.c
+ 	$(DO_SHLIB_CC)
+@@ -1048,7 +1048,7 @@
+ 	$(BUILDDIR)/rogue/q_shared.o
+ 
+ $(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT) : $(ROGUE_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
+ 
+ $(BUILDDIR)/rogue/dm_ball.o :      $(ROGUE_DIR)/dm_ball.c
+ 	$(DO_SHLIB_CC)
+@@ -1291,15 +1291,15 @@
+ 	$(BUILDDIR)/ref_soft/rw_in_aa.o
+ 
+ $(BUILDDIR)/ref_soft.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SVGA_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
+ 		$(REF_SOFT_SVGA_OBJS) $(SVGALDFLAGS)
+ 
+ $(BUILDDIR)/ref_softx.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_X11_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
+ 		$(REF_SOFT_X11_OBJS) $(XLDFLAGS)
+ 
+ $(BUILDDIR)/ref_softaa.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_AA_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
+ 		$(REF_SOFT_AA_OBJS) $(AALDFLAGS)
+ 
+ $(BUILDDIR)/ref_soft/r_aclip.o :      $(REF_SOFT_DIR)/r_aclip.c
+@@ -1445,10 +1445,10 @@
+ 	$(BUILDDIR)/ref_gl/gl_glx.o
+ 
+ $(BUILDDIR)/ref_gl.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
+ 
+ $(BUILDDIR)/ref_glx.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
+ 
+ $(BUILDDIR)/ref_gl/gl_draw.o :        $(REF_GL_DIR)/gl_draw.c
+ 	$(DO_GL_SHLIB_CC)
diff --git a/games-fps/aaquake2/metadata.xml b/games-fps/aaquake2/metadata.xml
new file mode 100644
index 000000000000..0ac912115906
--- /dev/null
+++ b/games-fps/aaquake2/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<longdescription>
+aaquake2 - Text Mode Quake II
+
+What?
+Just what you heard - text mode Quake II.
+
+Why?
+Why not? You can watch TV in text mode, you can play DVDs in text mode, 
+you can play Quake 1 in text mode. Quake II is the logical next step.
+
+Or, as the author of ttyquake put it, "If you have to ask why, you're 
+not a member of the intended audience." 
+</longdescription>
+</pkgmetadata>