gentoo resync : 25.11.2020

6 files changed, 113 insertions, 75 deletions

diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
index d373144c0bf1..0c0151c9f437 100644
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -1,4 +1,6 @@
-AUX alienarena-20130827-format.patch 400 BLAKE2B b98e23612337d8adcb2a0337ea2d7b0b6bcc5f2cafcd4c11996d94198c0bf4904e6ab5dcd33f690e6bfe3aee22a1d4cc85df522be139ee5bfe4c117ec2cbdfa8 SHA512 f64c502e306a7508258c62882711cc2a8b3261ebea2dd12a43624bb21d5c74f361ae82db3c629a3e903eab166c25013473fc4f0739bddc476e6740a06b69e2a6
+AUX alienarena-7.66-C99-inline.patch 841 BLAKE2B fc907aa4b287bb295589095936ca568a681f8a877f2470fd437bba50925454a51ff3559945052301fa94229288b2032da0a834770b0c7d0e8398b1f74b14dffe SHA512 acc6ac30e0d03345d8594ad9ed00ec56ec96ba68f157d2cc214224b6e1490c959511ecc1d15c3050f87d3bb33ebbd3316986c8b6840d842448407298911cf402
+AUX alienarena-7.66-ar.patch 264 BLAKE2B f1e290ad0cf6f29c93412f8e2277ebcd378740bb44c5a5e668c8d7e5b97b0480d1aed7d049d8541e060cad7b59186bc39e7dbade76b7ca5d11c628a319ca30d2 SHA512 24bad1c2fbb0073e73b4651ef4990b8df9dc8325e46812faa2da1b2295622a630977eaacc7244c86da1d8c8d88a0a7c6f6b3999d51defe1e78b5fe2d32813b60
+AUX alienarena-7.66-format.patch 400 BLAKE2B b98e23612337d8adcb2a0337ea2d7b0b6bcc5f2cafcd4c11996d94198c0bf4904e6ab5dcd33f690e6bfe3aee22a1d4cc85df522be139ee5bfe4c117ec2cbdfa8 SHA512 f64c502e306a7508258c62882711cc2a8b3261ebea2dd12a43624bb21d5c74f361ae82db3c629a3e903eab166c25013473fc4f0739bddc476e6740a06b69e2a6
 DIST alienarena-7.66-linux20130827.tar.gz 617636649 BLAKE2B 9f15772f12329dc48496d3f998f2913e801b3d2523be63c1b87b72ca278d70cbb32b676652b5287cc7adc5aeb98f7afdf4160a1f9125c1c92b63bf502809e08d SHA512 6b86387b12fc82c01cf7945df5da7beb1a60e42a492b70096c64ace254d6300107a4b40762d20969eefbfe11c7365fbb3a5603b71f288e2330410feef48141a3
-EBUILD alienarena-20130827-r1.ebuild 1496 BLAKE2B 5a300f1d79c38cf061b19d0901fd34c65d76ca9658e7c20cf4381087027b000089f1d1bd83e2f568f984c3ce4289e00ea536bea2d039b379894c8fe8bcbaa0fe SHA512 ffdfc4d2ff979c6bf1cd78508328916cdded0791d045223a38491b2a1ea2cdb63798035513a59d60e1afaafe110d7c8eba8c872feadc4304d6963fbf01387e5c
+EBUILD alienarena-7.66.ebuild 1512 BLAKE2B 8ce31045d3e119cc6e2c3498cc6bdf9dc98ef873f16bae314d43d0dc1f760332afe7ad4b7928b2d2528a3118ddf7cb1ecc3143c60dc33bd1248fb28fc7845f7f SHA512 dbd9746d4ecab3c99cc308199d13f8159e49b6a2e4fa58879e6cededd825d6a2e4252dd407fabbd1afad9f15fd46c4351c6098c24a98ba27cefdaf87f15f6aba
 MISC metadata.xml 377 BLAKE2B 7eb47fff4c65e732aeba6aa299d74e2e8bbb70b2ae0236c2ea9fe821829e5fc4d1a2d2658de762fd238ed9884e65fe822f1b8f9cf7b3bf92a69cf9e4680ca0f9 SHA512 50fc923e0986e11991d55b60137facbf8234dd9d180336664030a1c3d7dfa60665326e1937170b1803577cc55774a806824e2611fb3a1552d31426da5f662b4d
diff --git a/games-fps/alienarena/alienarena-20130827-r1.ebuild b/games-fps/alienarena/alienarena-20130827-r1.ebuild
deleted file mode 100644
index 8f32fffbdf54..000000000000
--- a/games-fps/alienarena/alienarena-20130827-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-MY_PN="alienarena-7.66"
-
-DESCRIPTION="Fast-paced multiplayer deathmatch game"
-HOMEPAGE="http://red.planetarena.org/"
-SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
-	http://red.planetarena.org/files/${MY_PN}-linux${PV}.tar.gz"
-
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated +dga +vidmode +zlib"
-
-UIRDEPEND="
-	virtual/jpeg:0
-	media-libs/openal
-	media-libs/libvorbis
-	media-libs/freetype:2
-	virtual/glu
-	virtual/opengl
-	dga? ( x11-libs/libXxf86dga )
-	vidmode? ( x11-libs/libXxf86vm )
-	zlib? ( sys-libs/zlib )
-	net-misc/curl
-"
-UIDEPEND="
-	dga? ( x11-base/xorg-proto )
-	vidmode? ( x11-base/xorg-proto )
-"
-RDEPEND="!dedicated? ( ${UIRDEPEND} )"
-DEPEND="${RDEPEND}
-	!dedicated? ( ${UIDEPEND} )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN/_/.}"
-
-PATCHES=( "${FILESDIR}"/${P}-format.patch )
-
-src_configure() {
-	econf \
-		--with-icondir=/usr/share/icons/hicolor/48x48/apps/ \
-		--without-system-libode \
-		--disable-documents \
-		$(use_enable !dedicated client) \
-		$(use_with zlib) \
-		$(use_with vidmode xf86vm) \
-		$(use_with dga xf86dga)
-}
-
-src_install() {
-	DOCS="docs/README.txt README" default
-	if ! use dedicated ; then
-		make_desktop_entry ${PN} "Alien Arena"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-fps/alienarena/alienarena-7.66.ebuild b/games-fps/alienarena/alienarena-7.66.ebuild
new file mode 100644
index 000000000000..1630e7efd263
--- /dev/null
+++ b/games-fps/alienarena/alienarena-7.66.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic xdg
+
+MY_P="${P}-linux20130827"
+
+DESCRIPTION="Fast-paced multiplayer deathmatch game"
+HOMEPAGE="http://red.planetarena.org/"
+SRC_URI="
+	http://icculus.org/alienarena/Files/${MY_P}.tar.gz
+	http://red.planetarena.org/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated +dga +vidmode +zlib"
+
+RDEPEND="
+	!dedicated? (
+		media-libs/freetype:2
+		media-libs/libvorbis
+		media-libs/openal
+		net-misc/curl
+		virtual/glu
+		virtual/jpeg:0
+		virtual/opengl
+		dga? ( x11-libs/libXxf86dga )
+		vidmode? ( x11-libs/libXxf86vm )
+		zlib? ( sys-libs/zlib )
+	)"
+DEPEND="${RDEPEND}
+	!dedicated? (
+		dga? ( x11-base/xorg-proto )
+		vidmode? ( x11-base/xorg-proto )
+	)"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-C99-inline.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# too many variables defined in .h to patch, https://bugs.gentoo.org/707814
+	append-cflags -fcommon
+
+	econf \
+		--with-icondir="${EPREFIX}/usr/share/icons/hicolor/48x48/apps/" \
+		--without-system-libode \
+		--disable-documents \
+		$(use_enable !dedicated client) \
+		$(use_with zlib) \
+		$(use_with vidmode xf86vm) \
+		$(use_with dga xf86dga)
+}
+
+src_install() {
+	DOCS=( docs/README.txt README )
+	default
+
+	use !dedicated && make_desktop_entry ${PN} "Alien Arena"
+}
diff --git a/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch b/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch
new file mode 100644
index 000000000000..0b9166a2631f
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo@debian.org>
+Date: Fri, 18 Aug 2017 23:24:22 +0200
+Subject: gcc7
+
+Fix FTBFS with GCC 7.
+
+Bug-Debian: https://bugs.debian.org/871218
+Forwarded: no
+---
+ source/ref_gl/r_iqm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/ref_gl/r_iqm.c b/source/ref_gl/r_iqm.c
+index ba5d178..cb3d2da 100644
+--- a/source/ref_gl/r_iqm.c
++++ b/source/ref_gl/r_iqm.c
+@@ -1263,7 +1263,7 @@ void IQM_Vlight (vec3_t baselight, mnormal_t *normal, vec3_t angles, vec3_t ligh
+ void R_Mesh_SetupShell (int shell_skinnum, qboolean ragdoll, qboolean using_varray, vec3_t lightcolor);

+ void R_Mesh_SetupGLSL (int skinnum, rscript_t *rs, vec3_t lightcolor);

+ 

+-inline void IQM_DrawVBO (qboolean tangents)

++void IQM_DrawVBO (qboolean tangents)

+ {

+ 	qglEnableClientState( GL_VERTEX_ARRAY );

+ 	GL_BindVBO(vbo_xyz);

diff --git a/games-fps/alienarena/files/alienarena-7.66-ar.patch b/games-fps/alienarena/files/alienarena-7.66-ar.patch
new file mode 100644
index 000000000000..7674e00e561d
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-7.66-ar.patch
@@ -0,0 +1,13 @@
+Fix for -native-symlinks
+
+diff -r 262952236ff5 configure.ac
+--- a/configure.ac	Sun Oct 11 11:33:09 2020 +0000
++++ b/configure.ac	Sun Oct 11 11:33:37 2020 +0000
+@@ -65,6 +65,7 @@
+ AC_PROG_RANLIB
+ AC_PROG_MKDIR_P
+ AM_PROG_CC_C_O
++AM_PROG_AR
+ PKG_PROG_PKG_CONFIG
+ 
+ 
diff --git a/games-fps/alienarena/files/alienarena-20130827-format.patch b/games-fps/alienarena/files/alienarena-7.66-format.patch
index 3162a558afad..3162a558afad 100644
--- a/games-fps/alienarena/files/alienarena-20130827-format.patch
+++ b/games-fps/alienarena/files/alienarena-7.66-format.patch