gentoo auto-resync : 07:08:2024 - 12:37:20

6 files changed, 142 insertions, 67 deletions

diff --git a/games-server/monopd/Manifest b/games-server/monopd/Manifest
index d293b1b3caca..f67b66ec0088 100644
--- a/games-server/monopd/Manifest
+++ b/games-server/monopd/Manifest
@@ -1,4 +1,5 @@
-AUX monopd.in 391 BLAKE2B 8bf1681e070ef5240ced7cf15dae52ee2c690f93f9dd5c94ba4ae3390fe9b79c2084d83129d1add3e24ee05a81a54bd8de8315f170b448e48d8ade9d5c513805 SHA512 55b9fd625039b72032b4d0ea6769c2b5a2690ede1f5445e72900a4d423a2ea51c768cdc1f08f69577f7776f9638983d23a1e0f5afe20a174ccc2d44ef77271ab
-DIST monopd-0.10.2.tar.gz 180317 BLAKE2B a2955149963b63d4839cc65be464c8989f2816bccf8e122833cd5be8be9ded7789e72f59c5f3bb6e2c20d4565cb3553e64dfd2670b003fc5868c40da02948731 SHA512 f47d9623e110a98d9d32b522484944998fb6e7e8644e1f2b439428a1e12b3b514b902e52e7135150135a3e3251aa38604434347d06533f3cf3ffb28a2a81ede3
-EBUILD monopd-0.10.2-r1.ebuild 948 BLAKE2B 438cf373b1ff16d06340c5b93fdc3e94b15f09042f38d1e43b379fb947500f22731b25a811baac07586780a43b3f3c6452f9988a6470e5a2b6f5e2609b4d735a SHA512 8ec03ff31d7b96fa98412667f972df7e6182afa5a9bb55679f64862c93de96cadbcdd1d1e5ace4973098feda7553db1770d602fa7ced9f0941642bfcc445725f
+AUX monopd-0.10.4-fixes.patch 2134 BLAKE2B 461f7a01f847b535d9cf048a8751dde59e633a9622f67e6664bb6c47e65cbbf4e4279e7c8f5379328a327d088febdebaf329504b324b7a77a10ca7d7e9440022 SHA512 0d9e50fb104b8fb48e5ab79a08ad0b21528480addea5eaf9431ad62f5c0c5a386e02b1c2462e7ae3f899ac153f0a4237f4a7a550017521443f1b5602bc82c31c
+AUX monopd.initd 259 BLAKE2B 57d0de9ff273f2d032b9c948f728b23cf97062a51d63d4d23d9c4e3e477b63ebcf15ede8695ba577b9b2a6c581c953e03ebb9bf65ae71e5981a1636cc7f34c3a SHA512 58bba751e3e99580cf14d8db02ae2490e72b4e5a05a013651b8c7185ac14899e8bb8d7b63806b4a2f24c9817571b0d1e316e79860d34b64ec645f82a5c99a5c7
+DIST monopd-0.10.4.tar.gz 203728 BLAKE2B a32fc2e9fc1e3fb7b615b9fac546056d5c16752ed47e0b2d91868b007042a98ddd7ca1a5f681ee7a8d0e302eb052898f4303b90e3443ae172b6b53a20bbee80d SHA512 60fa9669cf28ff09890a4476a51c1b55c30b160b13f5e083c6302454d3ac38200870269c8982dc627492c4b610ed883a25bf0fc8568513dcc989a83b9805380a
+EBUILD monopd-0.10.4.ebuild 815 BLAKE2B ab1dc7e93ba1ab870ace00c3e6d6020478f1d08a19b9ea085df682e4d816fc08d08e842b19b44c405cfe829cced86746c55aefe98f59feb6b484568c131809e2 SHA512 89cfdbf00cc2dc95e067b5e553f0ad56a4321a243bd1c1f812344e3169b9c15a9e17011e86c6228954d01e8e06d0099710ce51bbacba534173094465e84ad530
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-server/monopd/files/monopd-0.10.4-fixes.patch b/games-server/monopd/files/monopd-0.10.4-fixes.patch
new file mode 100644
index 000000000000..5157231e6773
--- /dev/null
+++ b/games-server/monopd/files/monopd-0.10.4-fixes.patch
@@ -0,0 +1,82 @@
+From 0a88af9a7a5feba9944ea009eddaac1e89315539 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 28 Jul 2024 22:24:38 +0100
+Subject: [PATCH 1/3] systemd: Correct path to monopd binary
+
+It is installed to /usr/bin, not /usr/sbin.
+---
+ doc/systemd/monopd.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/systemd/monopd.service b/doc/systemd/monopd.service
+index eace183..3f370d4 100644
+--- a/doc/systemd/monopd.service
++++ b/doc/systemd/monopd.service
+@@ -3,7 +3,7 @@ Description=game server for board games like GtkAtlantic
+ 
+ [Service]
+ Type=notify
+-ExecStart=/usr/sbin/monopd
++ExecStart=/usr/bin/monopd
+ User=nobody
+ Group=nogroup
+ 
+-- 
+2.45.2
+
+
+From fb41002ae3b94c6d9b3587ed291810baf04af19f Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 28 Jul 2024 22:26:21 +0100
+Subject: [PATCH 2/3] autoconf: Don't mix up CFLAGS with CXXFLAGS
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fa0de41..e388422 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,7 @@ AC_LANG(C++)
+ AC_SEARCH_LIBS([strerror], [cposix])
+ AC_SUBST(CFLAGS, $CFLAGS)
+ AC_PROG_CC
+-AC_SUBST(CXXFLAGS, $CFLAGS)
++AC_SUBST(CXXFLAGS, $CXXFLAGS)
+ AC_PROG_CXX
+ 
+ # Checks for libraries.
+-- 
+2.45.2
+
+
+From 770eb6f7a82012776071d7af4e2c5b54d27ffb50 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 28 Jul 2024 22:27:13 +0100
+Subject: [PATCH 3/3] autoconf: Fix appending of C(XX)FLAGS
+
+configure uses /bin/sh, which may be a pure POSIX shell like dash rather
+than bash. += is not POSIX compliant.
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e388422..24cc00c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,8 +41,8 @@ AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
+ ])
+ 
+ if test "x$GCC" = "xyes"; then  \
+-     CFLAGS+=" -Wall -Wextra";  \
+-     CXXFLAGS+=" -Wall -Wextra";  \
++     CFLAGS="${CFLAGS} -Wall -Wextra";  \
++     CXXFLAGS="${CXXFLAGS} -Wall -Wextra";  \
+ fi
+ 
+ AC_CONFIG_FILES([
+-- 
+2.45.2
+
diff --git a/games-server/monopd/files/monopd.in b/games-server/monopd/files/monopd.in
deleted file mode 100644
index 9a0fbda55ffb..000000000000
--- a/games-server/monopd/files/monopd.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-    use net
-}
-
-start() {
-    ebegin "Starting monopd server"
-    start-stop-daemon --start -q -b --exec GENTOO_DIR/monopd
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping monopd server"
-    start-stop-daemon --stop -q --exec GENTOO_DIR/monopd
-    eend $?
-}
diff --git a/games-server/monopd/files/monopd.initd b/games-server/monopd/files/monopd.initd
new file mode 100644
index 000000000000..da960f96bebd
--- /dev/null
+++ b/games-server/monopd/files/monopd.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2024 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="monopd"
+command_background="true"
+command_user="nobody:nogroup"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+    use net
+}
diff --git a/games-server/monopd/monopd-0.10.2-r1.ebuild b/games-server/monopd/monopd-0.10.2-r1.ebuild
deleted file mode 100644
index da2bf28824fe..000000000000
--- a/games-server/monopd/monopd-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="server for atlantik games"
-HOMEPAGE="http://gtkatlantic.gradator.net/"
-SRC_URI="http://download.tuxfamily.org/gtkatlantic/monopd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd"
-
-RDEPEND="systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	>=dev-cpp/muParser-2
-	dev-libs/utfcpp"
-
-src_prepare() {
-	default
-
-	sed "s:GENTOO_DIR:\"/usr/bin\":" \
-		"${FILESDIR}"/monopd.in > "${T}"/monopd || die
-	sed -i \
-		-e "s:/usr/sbin:/usr/bin:" \
-		doc/systemd/monopd.service || die
-	sed -i \
-		-e '/C_SUBST(CXXFLAGS/s/CFLAGS/CXXFLAGS/' \
-		configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -I"/usr/include/utf8cpp"
-	econf $(use_with systemd systemd-daemon)
-}
-
-src_install() {
-	default
-	doinitd "${T}"/monopd
-	systemd_dounit doc/systemd/monopd.s*
-}
diff --git a/games-server/monopd/monopd-0.10.4.ebuild b/games-server/monopd/monopd-0.10.4.ebuild
new file mode 100644
index 000000000000..386dab481c7d
--- /dev/null
+++ b/games-server/monopd/monopd-0.10.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Server for the GtkAtlantic board game"
+HOMEPAGE="https://gtkatlantic.gradator.net"
+SRC_URI="https://download.tuxfamily.org/gtkatlantic/monopd/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+RDEPEND="
+	systemd? ( sys-apps/systemd )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/muParser-2
+	dev-libs/utfcpp
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fixes.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -I"${ESYSROOT}/usr/include/utf8cpp"
+	econf $(use_with systemd systemd-daemon)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use systemd && systemd_dounit doc/systemd/${PN}.s*
+}