gentoo resync : 28.04.2021

2 files changed, 22 insertions, 7 deletions

diff --git a/games-fps/blackshades/Manifest b/games-fps/blackshades/Manifest
index be97a4333f21..92f712705256 100644
--- a/games-fps/blackshades/Manifest
+++ b/games-fps/blackshades/Manifest
@@ -1,5 +1,5 @@
 AUX blackshades-datadir.patch 249 BLAKE2B ed0c1a3cf60eef43cf848c26eb64e6e3cb814e1533fdc810c1d2c2124454b76bbb22aa23ada77bf0c09cacf8d54c01fc6d0f04570d1d06c49983fabcd641d37f SHA512 e1f564b29fee08ab3f335933acafb90ddf2e382f7ad72a7d7d9410d3a46222864e8370ee48bbd117493ee01c01a6ba58a8f68daa6641d250cb6c6dd135ac84dd
 DIST Textures.tar.bz2 340110 BLAKE2B fa0f10c1658235352153bfaca8301090ad1db78bdd25980f50b54e0a386433cb0b0e20b04baa206eba877374b8432c73b106d9a8cc9e58d0b652746e92ad2a2f SHA512 42a2a28072972b0919a67a17ab06cf74d6bb611cbf91ff017d72726fa2d01b3c5dec905c6760a199b710eabfff8d980867269d6ad3476096beab5c4edb2cae10
 DIST blackshades-20070723.tar.bz2 761669 BLAKE2B 5baf7465ddc82c4de3d3063ae91a44550ebf067dc2fca0d001736516511e20d249f01f15f4845dfb6d9e1ac359940f42d583c4c48579c460465a9e58e97c0478 SHA512 9477c59d685227650980c16aeb59f567764bc983c01da4e256b2ec582b5a063ef89222eb4ab0d42552bf6a4ffd95ba270229800decc9ba7a9b289f093c5b9c61
-EBUILD blackshades-20070723-r1.ebuild 1266 BLAKE2B 479e06daec59436ecc9bc8345f8418166102f9876c566a5d1eeeab9879665e8bdd02a261c06146601824104485a17eb4df2a762ae55e43c6b1652f383d6c5a8f SHA512 f6b39d40ece5a33caa9c95bedd97dc9060cb3f624f23472730e53129c5ebbca675e5edff0f93f5b675c2170645303755cf9aaf6e5ad02dc843f6175f7ddd5b76
+EBUILD blackshades-20070723-r1.ebuild 1505 BLAKE2B 88591d3122dda212933d46ef0acab5b1bd7bb1a5a28b72a73c1de7da0d51654ededbb9f06ce4ac0e6ab147a66fc272bc7fb93f16c8645225aaf8d7b390499831 SHA512 d7277670d3e07045949368e4c397520d593f929583f812d7aeebf7e0b653dd1f1ce6a71795c94358b1c68233b38e9e797a222df510a6aaac91e41093c104aafe
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/blackshades/blackshades-20070723-r1.ebuild b/games-fps/blackshades/blackshades-20070723-r1.ebuild
index a531ebbe5987..1ae58711d3a8 100644
--- a/games-fps/blackshades/blackshades-20070723-r1.ebuild
+++ b/games-fps/blackshades/blackshades-20070723-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="You control a psychic bodyguard, and try to protect the VIP"
 HOMEPAGE="http://www.wolfire.com/blackshades.html
 	http://www.icculus.org/blackshades/"
 SRC_URI="http://filesingularity.timedoctor.org/Textures.tar.bz2
 	mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}"/${PN}
 
 LICENSE="blackshades"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
 	media-libs/freealut
@@ -24,8 +25,6 @@ DEPEND="
 	virtual/opengl"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-datadir.patch
 )
@@ -36,25 +35,41 @@ src_prepare() {
 	rm -rf Data/Textures || die
 	rm -f ../Textures/{,Blood/}._* || die
 	mv -f ../Textures Data || die "mv failed"
+
 	sed -i \
 		-e "s/-O2 \(-Wall\) -g/${CXXFLAGS} \1/" \
 		-e "/^LINKER/s:$: ${LDFLAGS}:" \
 		Makefile \
 		|| die "sed Makefile failed"
+
+	sed -i \
+		-e "s/CC := gcc/CC ?= gcc/" \
+		-e "s/CXX := g++/CXX ?= g++/" \
+		-e "s/LINKER := g++/LINKER ?= g++/" \
+		-e "s/LDFLAGS := /LDFLAGS := ${LDFLAGS} /" \
+		Makefile || die
+
 	sed -i "s:@DATADIR@:/usr/share/${PN}:" \
 		Source/Main.cpp \
 		|| die "sed Main.cpp failed"
 }
 
 src_compile() {
+	tc-export CC CXX
+
+	export LINKER="${CXX}"
+
 	emake bindir
 	emake
 }
 
 src_install() {
 	newbin objs/blackshades ${PN}
+
 	insinto /usr/share/${PN}
 	doins -r Data
+
 	dodoc IF_THIS_IS_A_README_YOU_HAVE_WON Readme TODO uDevGame_Readme
+
 	make_desktop_entry ${PN} "Black Shades"
 }