gentoo resync : 16.09.2021

5 files changed, 32 insertions, 38 deletions

diff --git a/games-action/snipes/Manifest b/games-action/snipes/Manifest
index 4b1de00c728b..ef37e8ef15dd 100644
--- a/games-action/snipes/Manifest
+++ b/games-action/snipes/Manifest
@@ -1,4 +1,4 @@
-AUX snipes-1.0.4-nongnulinker.patch 711 BLAKE2B a4eca8ee51b349b652405b8d7b5565d2da7bfd88873088683f7252fd61640a372f228f41d39d782be23de5ab4dbe0fe2dece9fd8d5188a1822a24b78b117d721 SHA512 20ecb0e76e79b91fae7d9a8f3448cc88161ebbb8ee10e82c3f3eabf120c53c14392e0df4eb61530ae89f2ebbcf84db69affa9239e376c6a3d93b4f2f5dca1259
+AUX snipes-1.0.4-ldflags.patch 350 BLAKE2B 30f5249402d716ae2252aa3007ca2f860a486c7096486fa2fe5a5cf0c779b4f608eda20f033065ed71980d88035c4aede943c093881cc97d31f26fecccdfd0a8 SHA512 d1c90ab8e8ac89a3b335c89d05d3ce9cc4bb2e805290e5ad4d5ee6b96790ad91f5cd40d9ef56cfe5d31eff76fb62e35c175eba7f15877a98a8eb6ad17ac772d0
 DIST snipes-1.0.4.tar.gz 39150 BLAKE2B 00bf82f65720a86a7eb32ce50edd92db434dd8cbcfd76caad102bf5bd5087141f0b97d41260d7c0fc2709a7506470d53c08672c2b2c6733fcb3ee718b5875755 SHA512 de2cfdc3062055bfd04766f11894786af2ccd57ee1c8bcfe28d2d6894fe543830061ad7d16fa5e0363a25dcfd4a4c297ec0b81e449392a7b2b7d65da2e2a2f9b
-EBUILD snipes-1.0.4-r1.ebuild 645 BLAKE2B 82d33afc0d31ee2d41ed1efc127a7419b25cf7e5ef273137a8d48d2838a10154ffb83ef7b18fa876bf6f94d40db49df3eadfee13478fcfb1036dd7437a148e32 SHA512 e46ebe045b51c1cee8fea25a99011caac8919b319b35d3f8ea39d83abbd636ad9c8e20f79db844d0c075c67187a9ba34fea7b9d8e010823dfc45cd48001dc50e
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+EBUILD snipes-1.0.4-r1.ebuild 836 BLAKE2B ebe4712222190d20fe97f8fa6dbe5deefd1c479f3c72c0b039875dab84f4cd777834e101d1cfd6b89170089fc8cdbefc2f24675b66e911656e1ee796f4abd4a8 SHA512 4ca18c6815cede5bab983f21af0250e8fc0280e93df1b94ed2d0bcbeb23defac121212f526a926752ea2e491e0949bec07c8083b2807f12fbfd0b9c95d7459be
+MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-action/snipes/files/snipes-1.0.4-ldflags.patch b/games-action/snipes/files/snipes-1.0.4-ldflags.patch
new file mode 100644
index 000000000000..af1f40d02917
--- /dev/null
+++ b/games-action/snipes/files/snipes-1.0.4-ldflags.patch
@@ -0,0 +1,9 @@
+"fake" flags cause non-gnu linkers to fail, and need a way to pass raw flags.
+https://bugs.gentoo.org/369287
+--- a/Makefile
++++ b/Makefile
+@@ -54,3 +54,3 @@
+ $(INTERMEDIATE)/%.o: $(IMG)/%.pbm
+-	$(LD) -r -b binary -z noexecstack -z really_noexecstack -z pretty_please_noexecstack -o $@ $<
++	$(LD) -r -b binary -z noexecstack $(RAW_LDFLAGS) -o $@ $<
+ 
diff --git a/games-action/snipes/files/snipes-1.0.4-nongnulinker.patch b/games-action/snipes/files/snipes-1.0.4-nongnulinker.patch
deleted file mode 100644
index 8bdaeef3e356..000000000000
--- a/games-action/snipes/files/snipes-1.0.4-nongnulinker.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile	2011-12-18 17:24:28.795315064 +0100
-+++ b/Makefile	2011-12-18 17:24:59.005311478 +0100
-@@ -33,7 +33,7 @@
- IMGOBJ = $(OIMGS:%.pbm=$(INTERMEDIATE)/%.o)
- 
- CFLAGS += `sdl-config --cflags` -I$(INTERMEDIATE)
--LDLIBS += `sdl-config --libs`
-+LDLIBS += `sdl-config --libs` -lm
- LDFLAGS += -Wl,-z,noexecstack
- 
- 
-@@ -52,7 +52,7 @@
- 
- # Why does this result in an executable stack? Can I run my bitmaps? Do bitmaps behave like Conway's game of life, when run?
- $(INTERMEDIATE)/%.o: $(IMG)/%.pbm
--	$(LD) -r -b binary -z noexecstack -z really_noexecstack -z pretty_please_noexecstack -o $@ $<
-+	$(LD) -r -b binary -z noexecstack -o $@ $<
- 
- snipes.6: snipes.6.in
- 	sed s/'`VERSION`'/`cat VERSION`/ < $< > $@
diff --git a/games-action/snipes/metadata.xml b/games-action/snipes/metadata.xml
index 78274e0fa550..1c3ba213c494 100644
--- a/games-action/snipes/metadata.xml
+++ b/games-action/snipes/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>games@gentoo.org</email>
diff --git a/games-action/snipes/snipes-1.0.4-r1.ebuild b/games-action/snipes/snipes-1.0.4-r1.ebuild
index 666172514c64..6b6beac3a3a4 100644
--- a/games-action/snipes/snipes-1.0.4-r1.ebuild
+++ b/games-action/snipes/snipes-1.0.4-r1.ebuild
@@ -1,35 +1,40 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit desktop toolchain-funcs
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="2D scrolling shooter, resembles the old DOS game of same name"
-HOMEPAGE="https://cyp.github.com/snipes/"
-SRC_URI="https://cyp.github.com/snipes/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[sound,video]"
-RDEPEND=${DEPEND}
+RDEPEND="media-libs/libsdl[sound,video]"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-nongnulinker.patch
+	"${FILESDIR}"/${P}-ldflags.patch
 )
 
 src_compile() {
-	tc-getLD
-	default
+	tc-export CC LD
+
+	# lld requires arch flags to be passed even if native (bug #730852)
+	local archflags=
+	tc-ld-is-lld && eval archflags=\${LDFLAGS_${ARCH}}
+
+	LDLIBS=-lm emake RAW_LDFLAGS="${archflags} $(raw-ldflags)"
 }
 
 src_install() {
 	dobin snipes
 	doman snipes.6
-	dodoc ChangeLog
+	einstalldocs
+
 	doicon ${PN}.png
-	make_desktop_entry snipes "Snipes"
+	make_desktop_entry ${PN} ${PN^}
 }