gentoo auto-resync : 13:10:2022 - 13:42:21

4 files changed, 50 insertions, 35 deletions

diff --git a/games-arcade/stardork/Manifest b/games-arcade/stardork/Manifest
index 17a0cc1c2f17..28aea5777acd 100644
--- a/games-arcade/stardork/Manifest
+++ b/games-arcade/stardork/Manifest
@@ -1,3 +1,4 @@
+AUX stardork-0.7-clang16.patch 293 BLAKE2B 980ce28e9c0b1612aa93ad7c5db8c5d3607835c3dc9b02d5ad9dd817c285c4818409e80b0fde81916bfc80039d2a6fbfc5559b24d53df96d2441d753db25c37a SHA512 caa65ecd7b1f7845e045680b5c9d6ca48b02eba084a4263a230aafc3e066beef80125208050b0c3009b675400c837cf151227caaf9a4bb91a6de8dcf551849e9
 DIST stardork-0.7.tar.gz 3951 BLAKE2B a35e8ceed5b5a6eb210408d6a7a32e2c38a3e2bbd05458055e44a1866b1bd0d2f222a6dce8ee8cbf6fe11d0c0541095ae0d9bad8e0b883ea74fd255e96364019 SHA512 3726b55cc2f107a0d69580b3c30406ea2596769433db915d4b3bded4345611c9d67596cbf373b19671960909d0bfdfc997d5c41d677f0309317445aeadcae733
-EBUILD stardork-0.7-r1.ebuild 600 BLAKE2B 3918e0abc6ff1a206e09b817fa44f177375cfe6110ee263865551b5d8f0e1cecb298de2040d5dca082b02f60ae686a0492774dbf0e8c7b45e73e06d57504466d SHA512 e4c72cf2602b5ab906f24e85599ea84a6436e5b3ae121d79e1b773d3d5748eeafae3b868e616631fdfdcf59cdb31c621ff0fb5803f34f02f905232c4f80b4b85
+EBUILD stardork-0.7-r2.ebuild 716 BLAKE2B 138b5aedd633fbe919b7405ec3db55482d41531f4e14e1adcfe2ebeefbbf18e06a5774ad1d44c60fa3b451f6dad0d240415cf8d72e28bbd282efe0f509cdbc15 SHA512 27b3a55def1dbab7d02649e627360e67e00993786bb0f2dd9b2b6c8ccb51ec3e71ec6663534edd0273ea1903fcacad999bc7fe54e1dc741382cd6497f34e957d
 MISC metadata.xml 332 BLAKE2B 4fca63ac5c47b9cf8da8473df2c6c485fe86734e719508e3f35039493f115ba2960fd872327caf34f9bbe249ba7990ed337c41866288dbf8eb4da8b18493fa02 SHA512 af728ecee37582c68142153969d3f83fde3dc313270e0b7eef926aa19415b281fba824939066cea2500ee5b0fb2ed91bda275d68b33457829628a0415b18c944
diff --git a/games-arcade/stardork/files/stardork-0.7-clang16.patch b/games-arcade/stardork/files/stardork-0.7-clang16.patch
new file mode 100644
index 000000000000..c815fcd281fb
--- /dev/null
+++ b/games-arcade/stardork/files/stardork-0.7-clang16.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/871498
+--- a/stardork.c
++++ b/stardork.c
+@@ -376,3 +376,3 @@
+ 
+-void plot_wormhole(y, x) {
++void plot_wormhole(int y, int x) {
+     int r1, r2, i, j;
+@@ -564,3 +564,3 @@
+ 
+-void change_colors(color) {
++void change_colors(int color) {
+     if (has_colors() != FALSE) { 
diff --git a/games-arcade/stardork/stardork-0.7-r1.ebuild b/games-arcade/stardork/stardork-0.7-r1.ebuild
deleted file mode 100644
index d2b7e070c095..000000000000
--- a/games-arcade/stardork/stardork-0.7-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="An ncurses-based space shooter"
-HOMEPAGE="http://stardork.sourceforge.net/"
-SRC_URI="mirror://sourceforge/stardork/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	rm -f Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-	einstalldocs
-}
diff --git a/games-arcade/stardork/stardork-0.7-r2.ebuild b/games-arcade/stardork/stardork-0.7-r2.ebuild
new file mode 100644
index 000000000000..f6b1fece5104
--- /dev/null
+++ b/games-arcade/stardork/stardork-0.7-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="ncurses-based space shooter"
+HOMEPAGE="https://stardork.sourceforge.net/"
+SRC_URI="mirror://sourceforge/stardork/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
+src_compile() {
+	tc-export CC
+	append-cppflags $($(tc-getPKG_CONFIG) ncurses --cflags || die)
+	append-libs $($(tc-getPKG_CONFIG) ncurses --libs || die)
+
+	emake -f /dev/null LDLIBS="${LIBS}" ${PN}
+}
+
+src_install() {
+	dobin ${PN}
+	einstalldocs
+}