gentoo auto-resync : 24:10:2022 - 21:52:37

11 files changed, 243 insertions, 75 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 6defd48d5109..0a77b45d7425 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/qudos/Manifest b/games-fps/qudos/Manifest
index 89df8d19900c..1986c077c338 100644
--- a/games-fps/qudos/Manifest
+++ b/games-fps/qudos/Manifest
@@ -1,6 +1,12 @@
 AUX qudos-0.40.1-gnusource.patch 265 BLAKE2B beb6c3f71b39c28789e3dcaa58185464a312d63fe416324ee7cbc8eec084af41a8ca7590e95b19c02a2bfaacc510f7c0c477c1e96cf8726bfc63ae92076d0e30 SHA512 99e30dbcd4773021e6d8e2dc20cbf054534c1d18d86877688bdcb5ea34e7644e877ae0a674baaa471283899c596293336faa7afd4492336b3284d77256fd318b
-AUX qudos-0.40.1-libpng15.patch 209 BLAKE2B 9fb92e63f23f2acd2b5f14e0ef8d85385af868fcc1ef7200b35a18a979ef556b33a49325c860e54e3ae11aabb7a70097fb0733f3b826b78d650dcf2caf1b3124 SHA512 5e8fd8eef45902dbd41e64f7fcd3a31c91f19edc71e2eb1c89d161f46ef4f4c04894f27db8e0c5f9946673bdf72580aac067c63297214fe45531119d1f948380
+AUX qudos-0.40.1-libjpeg-clash.patch 961 BLAKE2B 5b33d8122054de9295a52af11da7dec272cd8a58ae89f4142d495bc5c1c2d916de6a8b9796cc3298f65c31154243f1fbc09555bf0b7ba82ff826bf5bf37799df SHA512 3ca43812848e7974ec29451cbdd3f68d082c46e9e41a5284ee8bb58ba54f49201db877612405df3ab35d8a060f768518c977350b7d528ceec8086097af3f713d
+AUX qudos-0.40.1-libpng.patch 997 BLAKE2B af1bffb598f21488dd873688351e83b3b96bfca60bb5355ad365a9a0105a3ce74ed77118ad7c236e09be74dd1ad77e8baf0953274151f79fa3210c991e4dc0b1 SHA512 ca62553c5310161fbc1be1042c33365340887a77812d41aaa0886f7645b4c22e83dd884e0eb0a1a2c987ba895e3cb87784268aba3c8ea2a6c30aa2d5ba9d12e3
+AUX qudos-0.40.1-no-bits-nan.patch 317 BLAKE2B b9c12827056b162a9d5e8946ec3bdc6cced9d8dcfa8bc5d52f5ce0dbf495a2abff43cbbecc966b69fcd55a343c7ca0be094d9d963c54d82a78b97f8e720c346a SHA512 5538210b96bafda9144bb62fac6f96513fc828d757a77f8b656f67dfb29d548755e8ba4454773e90c7c92afa3e7f7a6391ec57d2af30b0395a701217ec3c22e1
+AUX qudos-0.40.1-respect-cc.patch 389 BLAKE2B 2f7edbc95d8525d38428b338c725a07124a7f9f4cb8622441aebbc6dcd9def9ed8c3662396e6b79f2964099581f1e03df10ceb515da29094bb463a58f6458073 SHA512 f3f89abf6d6194c427b2aff3cf4d1ca48d4f4e80ff68a5f2f2e47ba8c47e85de7daf7c0a9a914f0f1e4890694d0c538a85135268a6986dd58aaed5e90fd708c9
+AUX qudos-0.40.1-respect-libdir.patch 1516 BLAKE2B fbd0b4075ffab070db54448bd044c962925cac16b98d1b07c0fb8b6dd72b47f203b9e0489db129f1285819d1db09723e4fca5b944f119c461971f9bae8742447 SHA512 20f154f00d3595e0c404ebafb53ab681cd17a3c79352dbe7baedad77cb8bdbe8e5a7c61f375afb580d59f5f91654e3bfa73987d0828007b6a676fc10fcdd5b81
+AUX qudos-0.40.1-use-pkg-config.patch 969 BLAKE2B 176b214f2161432aaeb8fe5cb029b06450c4b60820fdcf0b89556c0aedabb7e14bb6777a776bdd4a106a7fa429e8450d63606b49409f5b065d200a483ecb6d69 SHA512 77ff07b101b50ce714bf43c45a1cf7afe39ca3d8670233c13857421a368581b44f05ef3a104cbf0a828b87220f55195c6ddcc4d6c68e9763f8920fdf6b508d74
+AUX qudos-0.40.1-zlib-build.patch 388 BLAKE2B dae75195ab0a4742277e1b240479fe9df195d81906998b349c5bd891ef67a38804e3471022eb8469cb198a222e80deae50e962a1e876a54b69c213ea06a2b7bc SHA512 f615d44b257487f2762de98bbfa8f4089e8f4f3b09c54e964022ee23f3699f94bd3befc2cfae458a82426fad744513dcc2228c9d6736b2c0e5237b9ca8e1e02d
 DIST QuDos-0.40.1-src.tar.bz2 2031636 BLAKE2B 4940f589cc6239e1489bb81f2e0c0afd6efb36930595c57131927b777913c904ada04883eb5f12f9aaf0ba06d687bf4be8b03f369dd9684fe21d7b1068240599 SHA512 97b9c6bac0d09c060ab33174604deb2781f0ebdc48b00bd0bc402523fb04cdf84edd8abc18507bba8c7e616f6d460a1de6debc96ec39bb5562b20a7f06eea734
 DIST QuDos-0.40.1.pk3 4210489 BLAKE2B 98e07682368e52f4c318e7b9ab98d01b0363986bfea54edff3b13f7f2f4cad20de0146eb498569d024d22200830b341b02f135bf50df4a317915429bb1437439 SHA512 19c3c6b3d17cbd9642320d8eb7a83d667afeafd0ee5eb818e9f07be71e2ab69182474c1f529ecbcfcfa59590bafedb0de3c70dfff10e4bc7a6e07a1546f27d4b
-EBUILD qudos-0.40.1.ebuild 4205 BLAKE2B 4ea2a769ed1a04ba80f8599cfbcf61ae82b20546bfb0e9be5d288b6beb8356a191bb239c27a7e4871f6f613feb77a67520b21f8d3be62575265cbad258e90025 SHA512 aea7c9d34ad037a5b07bf4cb0525776b85ad6d06c9b0de65e099287289dc707c8a6eef20eb09e4134e32cb5ce27670b7a00ec9c327b63df53490240d56248ff6
+EBUILD qudos-0.40.1-r1.ebuild 4048 BLAKE2B 47740eee0db2309ad903c0261fba4f81cbf1d3f44bcd1b86c7fec0b3713d9bcdf265d56eafc1f0dde49bea7c8955c846e0174a6df4eb1cb3c7cf9c3ecb727064 SHA512 cd36cd94dcf45864e3b77da234908198e9a0b50874d19db437a2f692509297953885dba09e54a07ae3ff1315a250271a748454c1ff42240df0e9890a0b34587a
 MISC metadata.xml 666 BLAKE2B 847908831b34d7bcae31859484be771ddfd94b6014de51c7fdbed9da3e058adfd740e9a937cb6ffcc7994d5612037c9c2b2c8095e163767bc8fd7ecac1ab92c9 SHA512 4631a2fce2db990ff6b0a8966ff1de1e3ff79e0b35087a2c88a1ceb85f389c0aa6b5ca43edc96966d32e34842b3211eee7e27e7796cda70811e300268a7065c0
diff --git a/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch b/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch
new file mode 100644
index 000000000000..944c1aff856c
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-libjpeg-clash.patch
@@ -0,0 +1,25 @@
+From c657cd54baee3bdfe7a92c9b91536bb5c3ddcdd8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:50:17 +0100
+Subject: [PATCH 2/5] Fix clash with libjpeg
+
+--- a/src/ref_gl/gl_image.c
++++ b/src/ref_gl/gl_image.c
+@@ -912,7 +912,7 @@ jpg_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
+ }
+ 
+ void
+-jpeg_mem_src(j_decompress_ptr cinfo, byte * mem, int len)
++qudos_jpeg_mem_src(j_decompress_ptr cinfo, byte * mem, int len)
+ {
+ 	cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr));
+ 	cinfo->src->init_source = jpg_null;
+@@ -956,7 +956,7 @@ LoadJPG(char *filename, byte ** pic, int *width, int *height)
+ 	jpeg_create_decompress(&cinfo);
+ 
+ 	/* Feed JPEG memory into the libJpeg Object */
+-	jpeg_mem_src(&cinfo, rawdata, rawsize);
++	qudos_jpeg_mem_src(&cinfo, rawdata, rawsize);
+ 
+ 	/* Process JPEG header */
+ 	jpeg_read_header(&cinfo, true);
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng.patch b/games-fps/qudos/files/qudos-0.40.1-libpng.patch
new file mode 100644
index 000000000000..78fb4cdb7bd5
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-libpng.patch
@@ -0,0 +1,30 @@
+--- a/src/ref_gl/gl_local.h
++++ b/src/ref_gl/gl_local.h
+@@ -29,6 +29,7 @@
+ #include <GL/glu.h>
+ #include <GL/glext.h>
+ 
++#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
+ #include <png.h>
+ #include <jpeglib.h>
+ 
+Subject: [PATCH] Fix build with libpng 1.4.0
+
+From the 1.4.0 release notes:
+```
+   m. The function png_set_gray_1_2_4_to_8() was removed. It has been
+      deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
+      png_set_expand_gray_1_2_4_to_8() because the former function also
+      expanded palette images.
+```
+--- a/src/ref_gl/gl_image.c
++++ b/src/ref_gl/gl_image.c
+@@ -1186,7 +1186,7 @@ LoadPNG(char *filename, byte ** pic, int *width, int *height)
+ 	if (my_png->ColorType == PNG_COLOR_TYPE_PALETTE)
+ 		png_set_palette_to_rgb(png);
+ 	if (my_png->ColorType == PNG_COLOR_TYPE_GRAY && my_png->BitDepth < 8)
+-		png_set_gray_1_2_4_to_8(png);
++		png_set_expand_gray_1_2_4_to_8(png);
+ 
+ 	/* Add alpha channel if present */
+ 	if (png_get_valid(png, pnginfo, PNG_INFO_tRNS))
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
deleted file mode 100644
index 633215be34be..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ref_gl/gl_local.h
-+++ b/src/ref_gl/gl_local.h
-@@ -29,6 +29,7 @@
- #include <GL/glu.h>
- #include <GL/glext.h>
- 
-+#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
- #include <png.h>
- #include <jpeglib.h>
- 
diff --git a/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch b/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch
new file mode 100644
index 000000000000..adcffef23c40
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-no-bits-nan.patch
@@ -0,0 +1,12 @@
+--- a/src/mods/rogue/g_local.h
++++ b/src/mods/rogue/g_local.h
+@@ -26,9 +26,6 @@
+ //==================================================================
+ 
+ #ifndef _WIN32
+-#ifdef __linux__
+-#include <bits/nan.h>
+-#endif
+ #define min(a,b) ((a) < (b) ? (a) : (b))
+ #define max(a,b) ((a) > (b) ? (a) : (b))
+ #ifdef __sun__
diff --git a/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch b/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch
new file mode 100644
index 000000000000..92c7028e1890
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-respect-cc.patch
@@ -0,0 +1,15 @@
+From 76aef29111d0b8c5e5fffe80833d0c227cca1127 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:54:38 +0100
+Subject: [PATCH 4/5] Respect CC
+
+--- a/Makefile
++++ b/Makefile
+@@ -60,7 +60,6 @@ PREFIX?=	$(LOCALBASE)
+ DATADIR?=	$(LOCALBASE)/share/quake2
+ LIBDIR?=	$(LOCALBASE)/lib/QuDos
+ 
+-CC?=		gcc
+ TYPE?=		release
+ 
+ OGG_LDFLAGS=	-lvorbisfile -lvorbis -logg
diff --git a/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch b/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch
new file mode 100644
index 000000000000..b3e0cdc5a2f7
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-respect-libdir.patch
@@ -0,0 +1,53 @@
+From 1dc6681ee4eea2d1b6e7edd04cf84fd10c407d28 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:54:12 +0100
+Subject: [PATCH 3/5] Respect libdir
+
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,6 @@ WITH_XMMS?=YES		# Enable XMMS support (thanks AprQ2).
+ 
+ # General variables.
+ LOCALBASE?=	/usr/local
+-X11BASE?=	/usr/X11R6
+ PREFIX?=	$(LOCALBASE)
+ 
+ DATADIR?=	$(LOCALBASE)/share/quake2
+@@ -98,34 +97,19 @@ GAME_NAME=	game$(ARCH).$(SHLIB_EXT)
+ endif
+ 
+ # Compilation flags.
+-CFLAGS+=	-I/usr/include -I$(LOCALBASE)/include -I$(X11BASE)/include \
++CFLAGS+=	-I/usr/include -I$(LOCALBASE)/include \
+ 		-DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
+ 
+ WARNS=	-Wshadow -Wpointer-arith -Wcast-align -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wnested-externs
+ 
+-ifeq ($(TYPE),debug)
+-CFLAGS+=	-Wall -Werror -g -ggdb -DDEBUGGING # $(WARNS)
+-else
+-  ifeq ($(TYPE),profile)
+-CFLAGS+=	-pg
+-  else
+-CFLAGS+=	-O3 -ffast-math -funroll-loops -fomit-frame-pointer \
+-		-fexpensive-optimizations
+-    ifeq ($(ARCH),i386)
+-CFLAGS+=	-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+-		-fno-strict-aliasing
+-    endif
+-  endif
+-endif
+-
+ # Linker flags.
+-LDFLAGS+=	-L/usr/lib -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lm
++LDFLAGS+=	-lm
+ 
+ ifeq ($(OSTYPE),Linux)
+ LDFLAGS+=	-ldl
+ endif
+ 
+-REF_LDFLAGS=	-L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lGLU -ljpeg -lpng
++REF_LDFLAGS=	-lX11 -lXext -lXxf86vm -lGLU -ljpeg -lpng
+ 
+ ifeq ($(strip $(WITH_DGA_MOUSE)),YES)
+ REF_LDFLAGS+= -lXxf86dga
diff --git a/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch b/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch
new file mode 100644
index 000000000000..c2aae64e2b32
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-use-pkg-config.patch
@@ -0,0 +1,30 @@
+From 372cfdd9c81043667451fc46bcb8daaa5a5e3620 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:56:14 +0100
+Subject: [PATCH 5/5] Use pkg-config
+
+--- a/Makefile
++++ b/Makefile
+@@ -64,9 +64,9 @@ TYPE?=		release
+ 
+ OGG_LDFLAGS=	-lvorbisfile -lvorbis -logg
+ 
+-SDL_CONFIG?=	sdl-config
+-SDL_CFLAGS=	$(shell $(SDL_CONFIG) --cflags)
+-SDL_LDFLAGS=	$(shell $(SDL_CONFIG) --libs)
++PKG_CONFIG?=   pkg-config
++SDL_CFLAGS=	$(shell ${PKG_CONFIG} --cflags sdl)
++SDL_LDFLAGS=	$(shell ${PKG_CONFIG} --libs sdl)
+ 
+ ifeq ($(OSTYPE),Linux)
+ ALSA_LDFLAGS=	-lasound
+@@ -96,8 +95,7 @@ GAME_NAME=	game$(ARCH).$(SHLIB_EXT)
+ endif
+ 
+ # Compilation flags.
+-CFLAGS+=	-I/usr/include -I$(LOCALBASE)/include \
+-		-DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
++CFLAGS+=	-DGAME_NAME='"$(GAME_NAME)"' -DQUDOS_VERSION='"$(VERSION)"'
+ 
+ WARNS=	-Wshadow -Wpointer-arith -Wcast-align -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wnested-externs
+ 
diff --git a/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch b/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch
new file mode 100644
index 000000000000..d2e1474f2d7b
--- /dev/null
+++ b/games-fps/qudos/files/qudos-0.40.1-zlib-build.patch
@@ -0,0 +1,12 @@
+From bdd75315feed9fbaaf9dcf87f9a7e5eb18ca0b8b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 24 Oct 2022 17:50:02 +0100
+Subject: [PATCH 1/5] Fix zlib build
+
+--- a/src/qcommon/unzip/ioapi.h
++++ b/src/qcommon/unzip/ioapi.h
+@@ -1,3 +1,4 @@
++#define OF(x) x
+ /*
+  * ioapi.h -- IO base function header for compress/uncompress .zip files
+  * using zlib + zip or unzip API
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1-r1.ebuild
index 24a6a4e01612..2a289162e2d7 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop flag-o-matic toolchain-funcs
 
@@ -20,21 +20,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures"
 
-DEPEND="opengl? (
-		virtual/opengl
-		virtual/glu )
-	sdl? ( media-libs/libsdl[joystick?,opengl,sound,video]
-		virtual/opengl
-		virtual/glu )
-	virtual/jpeg:0
+DEPEND="
 	media-libs/libogg
-	media-libs/libpng:0
+	media-libs/libjpeg-turbo
+	media-libs/libpng
 	media-libs/libvorbis
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm"
+	x11-libs/libXxf86vm
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	sdl? (
+		media-libs/libsdl[joystick?,opengl,sound,video]
+		virtual/opengl
+		virtual/glu
+	)
+"
 RDEPEND="
 	${DEPEND}
 	cdinstall? ( games-fps/quake2-data )
@@ -45,8 +50,14 @@ RDEPEND="
 dir=usr/share/${MY_PN}
 
 PATCHES=(
-	"${FILESDIR}"/${P}-libpng15.patch
+	"${FILESDIR}"/${P}-libpng.patch
 	"${FILESDIR}"/${P}-gnusource.patch
+	"${FILESDIR}"/${P}-zlib-build.patch
+	"${FILESDIR}"/${P}-libjpeg-clash.patch
+	"${FILESDIR}"/${P}-respect-libdir.patch
+	"${FILESDIR}"/${P}-respect-cc.patch
+	"${FILESDIR}"/${P}-use-pkg-config.patch
+	"${FILESDIR}"/${P}-no-bits-nan.patch
 )
 
 default_client() {
@@ -81,38 +92,19 @@ pkg_setup() {
 
 	if default_client ; then
 		elog "Selected the ${snd_drv} sound driver as the default."
-		echo
 	fi
 }
 
-src_unpack() {
-	unpack "${FILE_STEM}.tar.bz2"
-}
-
 src_prepare() {
 	rm docs/gnu.txt || die
 
+	default
+
 	# Change default sound driver and its location
 	sed -i \
 		-e "s:\"oss\":\"${snd_drv}\":" \
 		-e "s:\"\./snd:\"/usr/$(get_libdir)/${PN}/snd:" \
 		src/client/snd_dma.c || die
-
-	sed -i \
-		-e 's:jpeg_mem_src:qudos_jpeg_mem_src:g' \
-		src/ref_gl/gl_image.c || die
-
-	if has_version '>=sys-libs/zlib-1.2.5.1-r1' ; then
-		sed -i \
-			-e '1i#define OF(x) x' \
-			src/qcommon/unzip/ioapi.h || die
-	fi
-
-	sed -i -e '106,119 s/CFL/LED/' Makefile || die
-
-	sed -i -e 's:-L/usr/lib -L$(LOCALBASE)/lib :: ' Makefile || die
-
-	default
 }
 
 src_configure() {
@@ -122,7 +114,7 @@ src_configure() {
 
 src_compile() {
 	yesno() {
-		usex ${1} YES NO;
+		usex ${1} YES NO
 	}
 
 	local client="YES"
@@ -131,36 +123,39 @@ src_compile() {
 	local type="release"
 	use debug && type="debug"
 
-	emake \
-		BUILD_QUAKE2="${client}" \
-		BUILD_DEDICATED=$(yesno dedicated) \
-		BUILD_GLX=$(yesno opengl) \
-		BUILD_SDLGL=$(yesno sdl) \
-		BUILD_ALSA_SND=NO \
-		BUILD_SDL_SND=$(yesno sdl) \
-		BUILD_OSS_SND=$(yesno oss) \
-		WITH_XMMS=NO \
-		WITH_DGA_MOUSE=$(yesno dga) \
-		WITH_JOYSTICK=$(yesno joystick) \
-		TYPE="${type}" \
-		DATADIR="${dir}" \
-		LOCALBASE=/usr \
-		LIBDIR="/usr/$(get_libdir)"/${PN} \
-		WITH_QMAX=$(yesno qmax) \
-		BUILD_3ZB2=$(yesno mods) \
-		BUILD_CTF=$(yesno mods) \
-		BUILD_JABOT=$(yesno mods) \
-		BUILD_ROGUE=$(yesno mods) \
-		BUILD_XATRIX=$(yesno mods) \
-		BUILD_ZAERO=$(yesno mods) \
-		WITH_BOTS=$(yesno mods) \
-		HAVE_IPV6=$(yesno ipv6) \
-		CC="$(tc-getCC)" \
-		WITH_X86_ASM=NO \
-		WITH_DATADIR=YES \
-		WITH_LIBDIR=YES \
-		BUILD_DEBUG_DIR=release \
+	local myemakeargs=(
+		BUILD_QUAKE2="${client}"
+		BUILD_DEDICATED=$(yesno dedicated)
+		BUILD_GLX=$(yesno opengl)
+		BUILD_SDLGL=$(yesno sdl)
+		BUILD_ALSA_SND=NO
+		BUILD_SDL_SND=$(yesno sdl)
+		BUILD_OSS_SND=$(yesno oss)
+		WITH_XMMS=NO
+		WITH_DGA_MOUSE=$(yesno dga)
+		WITH_JOYSTICK=$(yesno joystick)
+		TYPE="${type}"
+		DATADIR="${dir}"
+		LOCALBASE=/usr
+		LIBDIR="/usr/$(get_libdir)"/${PN}
+		WITH_QMAX=$(yesno qmax)
+		BUILD_3ZB2=$(yesno mods)
+		BUILD_CTF=$(yesno mods)
+		BUILD_JABOT=$(yesno mods)
+		BUILD_ROGUE=$(yesno mods)
+		BUILD_XATRIX=$(yesno mods)
+		BUILD_ZAERO=$(yesno mods)
+		WITH_BOTS=$(yesno mods)
+		HAVE_IPV6=$(yesno ipv6)
+		CC="$(tc-getCC)"
+		WITH_X86_ASM=NO
+		WITH_DATADIR=YES
+		WITH_LIBDIR=YES
+		BUILD_DEBUG_DIR=release
 		BUILD_RELEASE_DIR=release
+	)
+
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {