From b355649c4c23392040d456a20f17d1b56a78312b Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sun, 5 Mar 2023 02:59:25 +0000
Subject: games-simulation/senken: fix implicit func decls

Closes: https://bugs.gentoo.org/899022
Signed-off-by: Sam James <sam@gentoo.org>
---
 .../senken-0.3.0-implicit-function-decl.patch      | 29 ++++++++++
 games-simulation/senken/senken-0.3.0-r1.ebuild     | 51 ------------------
 games-simulation/senken/senken-0.3.0-r2.ebuild     | 62 ++++++++++++++++++++++
 3 files changed, 91 insertions(+), 51 deletions(-)
 create mode 100644 games-simulation/senken/files/senken-0.3.0-implicit-function-decl.patch
 delete mode 100644 games-simulation/senken/senken-0.3.0-r1.ebuild
 create mode 100644 games-simulation/senken/senken-0.3.0-r2.ebuild

diff --git a/games-simulation/senken/files/senken-0.3.0-implicit-function-decl.patch b/games-simulation/senken/files/senken-0.3.0-implicit-function-decl.patch
new file mode 100644
index 000000000000..f4792cfb0649
--- /dev/null
+++ b/games-simulation/senken/files/senken-0.3.0-implicit-function-decl.patch
@@ -0,0 +1,29 @@
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -47,6 +47,7 @@
+ #include "client.h"
+ #include "landvalue.h"
+ #include "gtkhelp_reports.h"
++#include "support.h"
+ 
+ #include "sdlwin.h"
+ #include "utils.h"
+--- a/src/gtkhelp_reports.c
++++ b/src/gtkhelp_reports.c
+@@ -5,6 +5,7 @@
+ #include "player.h"
+ #include "client.h"
+ #include "gtkhelp_reports.h"
++#include "support.h"
+ 
+ /**** HELPERS ****/
+ 
+--- a/src/gtkhelp_reports.h
++++ b/src/gtkhelp_reports.h
+@@ -17,4 +17,6 @@ extern void update_population_report(GtkWidget *window, client_t *client);
+ extern void setup_info_treeview(GtkWidget *window);
+ extern void update_info_report(GtkWidget *window, client_t *client, int mapx, int mapy);
+ 
++extern void update_info_window(GtkWidget *window, client_t *client, int mapx, int mapy);
++
+ #endif /* GTKHELP_REPORTS */
diff --git a/games-simulation/senken/senken-0.3.0-r1.ebuild b/games-simulation/senken/senken-0.3.0-r1.ebuild
deleted file mode 100644
index 206d6b75324d..000000000000
--- a/games-simulation/senken/senken-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="city simulation game"
-HOMEPAGE="https://savannah.nongnu.org/projects/senken/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.4
-	media-libs/sdl-image
-	x11-libs/gtk+:2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${P}-warnings.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/share:/usr/share:" \
-		lib/utils.h || die
-}
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-
-	#dodir "${GAMES_DATADIR}"
-	#mv "${D}/${GAMES_PREFIX}/share/senken" "${D}/${GAMES_DATADIR}/" || die
-	#rm -rf "${D}/${GAMES_PREFIX}"/{include,lib,man,share} || die
-
-	insinto /usr/share/senken/img
-	doins img/*.png
-
-	find "${D}/usr/share/" -type f -exec chmod a-x \{\} +
-	find "${D}/usr/share/" -name "Makefile.*" -exec rm -f \{\} +
-}
diff --git a/games-simulation/senken/senken-0.3.0-r2.ebuild b/games-simulation/senken/senken-0.3.0-r2.ebuild
new file mode 100644
index 000000000000..a9c9fdf39deb
--- /dev/null
+++ b/games-simulation/senken/senken-0.3.0-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="City simulation game"
+HOMEPAGE="https://savannah.nongnu.org/projects/senken/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.4
+	media-libs/sdl-image
+	x11-libs/gtk+:2
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-warnings.patch
+	"${FILESDIR}"/${P}-implicit-function-decl.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/share:/usr/share:" \
+		lib/utils.h || die
+
+	# Clang 16, bug #899022
+	sed -i -e "s:configure.in:configure.ac:" Makefile.in || die
+	eautoconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+
+	#dodir "${GAMES_DATADIR}"
+	#mv "${D}/${GAMES_PREFIX}/share/senken" "${D}/${GAMES_DATADIR}/" || die
+	#rm -rf "${D}/${GAMES_PREFIX}"/{include,lib,man,share} || die
+
+	insinto /usr/share/senken/img
+	doins img/*.png
+
+	find "${D}/usr/share/" -type f -exec chmod a-x \{\} +
+	find "${D}/usr/share/" -name "Makefile.*" -exec rm -f \{\} +
+}
-- 
cgit v1.2.3-65-gdbad