From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 games-fps/darkplaces/Manifest                      |  2 +-
 games-fps/darkplaces/darkplaces-20140513-r1.ebuild | 27 ++++++++++++++++------
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'games-fps/darkplaces')

diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index ffbc908c47ee..613adcc4124f 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,5 +1,5 @@
 DIST darkplacesengine20140513.zip 28113487 BLAKE2B 9e3ffa759921fd61d1308f7c08cc1253a5a3d32c57e8dd8c2a05771aa0b5019fac7932ad337e4be95545bf093f4a2f20d221328ae0bfa45c2b00a7f5700fc04a SHA512 45864b590057c6de0ea978b3cc967feb879b87b2d376f3b4d8525e037b10ca1fc68599c152506494bb06669c6c2304e0aa0ee1b28f7a0d589d10c23f7285052c
 DIST fuhquake-lits.rar 8388829 BLAKE2B fb9c4db151deb43424de9331641154f412394ae6346864bc62a210c7d8d12c6ed6c8647cb4cd83fa853155c5f562f7e9b8d3c779fe74c1bb3f05bb6f627b1d5e SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925
 DIST id1.pk3 350470 BLAKE2B 76426667de5f42633f608b75286671344d439398aa9b819e9ba3979ca317a93930b1077de7efb4b1bad670a6341c7536d572cfc2590a5812c71dd0c4e8def784 SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331
-EBUILD darkplaces-20140513-r1.ebuild 4349 BLAKE2B 168c527e8b886ff65886c4f27c0161b1699a3652934b639968914f22ee3e55161abb908a065eb145e7ca37db6073aabe0f43a7e36ce291b112f26c05b8dc1919 SHA512 61984cf0e710c3fa838d09b25b21c0268bae358e4252ee19fcdc727fd7e7da504403ab00e7fd1061201a6223f723423deedb96d4e553de5afced5b1ae8bf094d
+EBUILD darkplaces-20140513-r1.ebuild 4482 BLAKE2B 3572a76783bfd7301effe4fe8ee4de5dbe987333b23b4a0ad2af5a82cc23ad7c85eaae903630cb47eaf7039f630f2c446273233fce9455f34f6ed1753f6c652c SHA512 300e90637dcdb64629f630300733b799092f7bf43675f68ac071bb430d1d0c03a1d1a1ca11aec63475d105d191cfdbb8912aa0b23424802d165198acd043f553
 MISC metadata.xml 567 BLAKE2B 46fb34c2aab597b51dd9e8d5effb76af828734a9a7826c503de0a843d12ddeb275d31d846f419635450a3ce1880eb31a1942e684cdc82d1aad83d1aa1cc97d17 SHA512 719f0053b4390b1dccb63e70bddb518f9aad79c8b240dd37ed16b1680a1053a51e309632893c87c51d6057e2602bc6a3fbe8c7d11330da76d5646b3c8c542bbd
diff --git a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
index 7ba3bcdb4ce9..7934dcbe22d3 100644
--- a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
+++ b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic unpacker
+EAPI=7
+
+inherit desktop flag-o-matic wrapper unpacker
 
 # Latest versions are in http://icculus.org/twilight/darkplaces/files/
 MY_PV="${PV/_beta/beta}"
@@ -18,6 +19,7 @@ SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
 	lights? (
 		http://www.fuhquake.net/files/extras/${MY_LIGHTS}
 		http://www.kgbsyndicate.com/romi/id1.pk3 )"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -60,14 +62,17 @@ DEPEND="lights? ( || (
 	!opengl? ( !sdl? ( !dedicated? (
 		${UIRDEPEND}
 		${UIDEPEND} ) ) )
-	virtual/pkgconfig
+"
+BDEPEND="
 	app-arch/unzip
+	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${PN}"
 dir="/usr/share/quake1"
 
-opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
+opengl_client() {
+	use opengl || ( ! use dedicated && ! use sdl )
+}
 
 src_unpack() {
 	if use lights ; then
@@ -76,6 +81,7 @@ src_unpack() {
 		mv *.lit maps/ || die
 		mv ReadMe.txt rtlights.txt
 	fi
+
 	unpack "${MY_ENGINE}"
 	unpack ./${PN}*.zip
 }
@@ -92,7 +98,7 @@ src_prepare() {
 	# Only additional CFLAGS optimization is the -march flag
 	local march=$(get-flag -march)
 	sed -i \
-		-e "s:-lasound:$(pkg-config --libs alsa):" \
+		-e "s:-lasound:$($(tc-getPKG_CONFIG) --libs alsa):" \
 		-e "/^CPUOPTIMIZATIONS/d" \
 		-e '/^OPTIM_RELEASE/s/=.*/=$(CFLAGS)/' \
 		-e '/^OPTIM_DEBUG/s/=.*/=$(CFLAGS)/' \
@@ -115,6 +121,12 @@ src_prepare() {
 src_compile() {
 	local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1"
 
+	# Protect against people choosing a strip implementation
+	# bug #739194
+	unset STRIP
+
+	tc-export CC
+
 	# Preferred sound is alsa
 	local sound_api="NULL"
 	use oss && sound_api="OSS"
@@ -168,6 +180,7 @@ src_install() {
 	if use lights ; then
 		insinto "${dir}"/id1
 		doins -r "${WORKDIR}"/{cubemaps,maps}
+
 		if use demo ; then
 			# Set up symlinks, for the demo levels to include the lights
 			local d
-- 
cgit v1.2.3