gentoo auto-resync : 26:08:2024 - 12:00:09

9 files changed, 377 insertions, 6 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 154a603673b1..5827c4fe4ffe 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest
index 96ee65912a1e..f960f4ca0fbb 100644
--- a/games-strategy/dopewars/Manifest
+++ b/games-strategy/dopewars/Manifest
@@ -1,3 +1,5 @@
 DIST dopewars-1.6.1.tar.gz 1024168 BLAKE2B 28d650e0d1eccdfa9aa799bb4b35e82facc800ed9cbde9778c7182bd615ad0b1ec7d3fd323473f381f3ed1902b8e305a7994a5e351728aa1028be2e0665bfa57 SHA512 fab27b483b5a24abd95ffe6a52fe92c7179d8ee3e7d27393f0e7c265202781ab6a58e3b3214ff84bbc0e8195644b5c2ec94616b5f63b3fa9dc2ad2f9216e37d1
+DIST dopewars-1.6.2.tar.gz 1030811 BLAKE2B 96d333b7760786b215c3b6079498067149de0784099fd16b30c47a785a0f6d4d1d9030e6654a1d309f59803896d2675181146180411aef558e3cf28b715ac192 SHA512 ce41bc4b7f3a45bc759a76e3f70be84cc6ec1243127a60e8c4c96c908bf70d2d6fbb7d871afbeeec18591dac2cfb5d6d2646e14c7e2771ec02cf7b20e5a25a8f
 EBUILD dopewars-1.6.1.ebuild 1510 BLAKE2B 5eabb5c98a771353ffc1d1f64cdad67ab6b1661d526bcb98f75a064d98fb74ac2fa5c47d20494f550ffac881c97bc2146c123b4b7ff899a2a1d8457e6ecbabdd SHA512 1202134a565c078ffd83bc9d8a36cd01f95f5471b22e95f4b3e7eecd3b161baede697afddc81debe79aada0a0818d5dca7f60b95d74127062bd0bd353576ab85
-MISC metadata.xml 332 BLAKE2B 37111175fefbc638c0e0b0ac57988eb28def430f9140f9eb411566a5c6b9ad27fdb4de4df557b72d1a8a2d6d57bf27e0ae38fab9a54f4c9ec8abca812968747b SHA512 30383bc97bba57511c351d77f1c17152a0be7d14573348e2159b3df908bb28733d25476f5a5db211334966db3c3a2addae2047e27650b2a60e6a8928344c66c4
+EBUILD dopewars-1.6.2.ebuild 1542 BLAKE2B 39ca243409f381e6e981a9535781c1e8da1d1f04fcf3e058b60b2347a1edc74ef94fb9cebe5e0b24b6c1e4040599fa5909909ba84003f6c5661e52e69503b250 SHA512 9206baf5bf36939ad8cbb466ba9bdc1f16d4cfd6fcb894e4b3a7af8ec44438c424f9422e5fa45537f5a416aadfd17f28c47ce9e91e7033606bc07cddd41dcd33
+MISC metadata.xml 389 BLAKE2B faeb3588a03eb4157b892bca2a14275432b53a1c0ee8e3046d2eb39f1c6f3a54c26eb0b14e278d40628c4919e4544bec77295c4090720fa11f27f89ed3d7d2a0 SHA512 292846b61e3cee79012666ee7680c6f8f64267d75fd8e8d9ff450df11f8d6c102c89ce0d536e6cd8dc7480cb9dbcff43effef9aa70534fe8b563f48f296c310a
diff --git a/games-strategy/dopewars/dopewars-1.6.2.ebuild b/games-strategy/dopewars/dopewars-1.6.2.ebuild
new file mode 100644
index 000000000000..cd4655886e70
--- /dev/null
+++ b/games-strategy/dopewars/dopewars-1.6.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop toolchain-funcs
+
+DESCRIPTION="Re-Write of the game Drug Wars"
+HOMEPAGE="https://dopewars.sourceforge.io/"
+SRC_URI="https://github.com/benmwebb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls ncurses gtk gnome sdl"
+
+RDEPEND="
+	ncurses? ( >=sys-libs/ncurses-5.2:0= )
+	gtk? ( x11-libs/gtk+:2 )
+	dev-libs/glib:2
+	nls? ( virtual/libintl )
+	sdl? (
+		media-libs/libsdl2
+		media-libs/sdl2-mixer
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README.md TODO doc/example-cfg doc/example-igneous )
+
+src_prepare() {
+	default
+	eautoreconf
+	sed -i -e 's:index.html:html/index.html:' \
+		src/dopewars.c || die
+	sed -i -e "s/\-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/g" \
+		configure || die
+}
+
+src_configure() {
+	local myservconf
+
+	if ! use gtk ; then
+		myservconf="--disable-gui-client --disable-gui-server --disable-glibtest --disable-gtktest"
+	fi
+
+	local myeconfargs=(
+		$(use_enable ncurses curses-client)
+		$(use_enable nls)
+		$(use_with sdl)
+		--without-esd
+		--enable-networking
+		--enable-plugins
+		${myservconf}
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -r "${ED}"/usr/share/gnome || die
+	rm -r "${ED}"/usr/share/doc || die
+	make_desktop_entry "${PN}" "Dopewars" /usr/share/pixmaps/dopewars-weed.png
+	HTML_DOCS="doc/*html doc/help/"
+	einstalldocs
+}
diff --git a/games-strategy/dopewars/metadata.xml b/games-strategy/dopewars/metadata.xml
index aca5e3fff917..b8a14ab9ab42 100644
--- a/games-strategy/dopewars/metadata.xml
+++ b/games-strategy/dopewars/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dopewars</remote-id>
+		<remote-id type="github">benmwebb/dopewars</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest
index 801a7d85395f..13b8b316f931 100644
--- a/games-strategy/endless-sky/Manifest
+++ b/games-strategy/endless-sky/Manifest
@@ -1,3 +1,5 @@
 DIST endless-sky-0.10.6.tar.gz 256438340 BLAKE2B 39699f458b691dd8aa0586ebbb5b537b8b999ea0084abc561803e21e97986dd6ef28582545fc79cc5cd3ef5d4c587b96860fd7b94294acf2fee31224543ac4ff SHA512 815f64db07997cc8732b12887f55d363f0ef7e44a158dc83fc0b6c4c12c69dab3bf7e1b14c7e93fe920974d8c28b8043f39808227219f09adfe618a00389a530
+DIST endless-sky-0.10.8.tar.gz 257381131 BLAKE2B ea6fe5e4240b9744a9e1d64137a731c8a67f88acbd688fad13f3beab2bb6d16e46b3c85fd1288350917eff18264b5a477ed964729edaa098eff07fef10ca81ee SHA512 d6cfb3efba6214a42b112d315dda945085f6a9f915a22bd3fe0ff78cb628a242aa8c0613165a2e1c67d81f5c32f937c2b73a7851efe3984ebe94af4e456df547
 EBUILD endless-sky-0.10.6.ebuild 2077 BLAKE2B fda16b09d2f8bb729b2bf6ee4cbe332cf9ad5478e35b2c8c3925dc9614ccf13ad179df42d0dda1281996e139cd8ef66fadcc8ebd0a511c3c67a301948c2df97b SHA512 429c3d421ce9432e73dc9d6015a1bde8ef28d2053ec5e466ba439aa05f113437e0adbc57359ef31e000cd60eb2459f8facc60a8547fe3dc85a672752c64c446a
+EBUILD endless-sky-0.10.8.ebuild 2077 BLAKE2B fda16b09d2f8bb729b2bf6ee4cbe332cf9ad5478e35b2c8c3925dc9614ccf13ad179df42d0dda1281996e139cd8ef66fadcc8ebd0a511c3c67a301948c2df97b SHA512 429c3d421ce9432e73dc9d6015a1bde8ef28d2053ec5e466ba439aa05f113437e0adbc57359ef31e000cd60eb2459f8facc60a8547fe3dc85a672752c64c446a
 MISC metadata.xml 732 BLAKE2B 05e221e5b8bc45baf62a5361a1fa11affd5bfce04bb1ed4127251c151771df72c873e9c2deab4aa9b4800fa3314fa768c635e61bf941e3eb74241ee5f2a8aabf SHA512 2aefeccd986719aab4be77af1bf4458b36a873918c04905f9b432a591a44dfdd001faf29ab16ced565c069e846bfe5a96e2c12ffa1e4d62a7b202cf7fc356949
diff --git a/games-strategy/endless-sky/endless-sky-0.10.8.ebuild b/games-strategy/endless-sky/endless-sky-0.10.8.ebuild
new file mode 100644
index 000000000000..d1f1437b24c2
--- /dev/null
+++ b/games-strategy/endless-sky/endless-sky-0.10.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake prefix xdg
+
+DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal Velocity"
+HOMEPAGE="https://endless-sky.github.io/"
+SRC_URI="
+	https://github.com/endless-sky/endless-sky/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="
+	GPL-3+
+	CC-BY-2.0 CC-BY-3.0 CC-BY-4.0
+	CC-BY-SA-3.0 CC-BY-SA-4.0
+	CC0-1.0 public-domain
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gles2-only test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/libglvnd
+	media-libs/libjpeg-turbo:=
+	media-libs/libmad
+	media-libs/libpng:=
+	media-libs/libsdl2[video]
+	media-libs/openal
+	sys-apps/util-linux
+	gles2-only? ( media-libs/libsdl2[gles2] )
+	!gles2-only? (
+		media-libs/glew:0=
+		media-libs/libsdl2[opengl]
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# no /usr/*games/ on Gentoo, adjust docdir, install even if != Release,
+	# and GLEW is unused if USE=gles2-only (using sed for less rebasing)
+	sed -e '/install(/s: games: bin:' \
+		-e '/install(/s: share/games: share:' \
+		-e "/install(/s: share/doc/endless-sky: share/doc/${PF}:" \
+		-e '/install(/s: CONFIGURATIONS Release::' \
+		-e 's:GLEW REQUIRED:GLEW:' \
+		-i CMakeLists.txt || die
+	sed -i '/PATH/s:share/games:share:' source/Files.cpp || die
+
+	hprefixify -w /PATH/ source/Files.cpp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DES_GLES=$(usex gles2-only)
+		-DES_USE_SYSTEM_LIBRARIES=yes
+		-DES_USE_VCPKG=no
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	gzip -d -- "${ED}"/usr/share/man/man6/${PN}.6.gz || die
+	rm -- "${ED}"/usr/share/doc/${PF}/{copyright,license.txt} || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Endless Sky provides high-res sprites for high-dpi screens."
+		elog "If you want to use them, download:"
+		elog
+		elog "   https://github.com/endless-sky/endless-sky-high-dpi/releases"
+		elog
+		elog "and extract it to ~/.local/share/endless-sky/plugins/"
+	fi
+}
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index eac69ff21435..5b1dcaf446a0 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,6 +1,8 @@
 AUX freeciv-3.1.0-qt6.patch 775 BLAKE2B 225fb73659a5a11e1b77c04157856b52a996f1694948152650c879cf1f16d053c30c4ddb28a50125e3e875352840e27407bf1e3f257c33371c19ad408d7efb8c SHA512 e53a347ab9aad973d6283c4057783ae431b0fadc9eb618c7160b2d5457c17fbea9bc25cb286258be1c6aba34ea4848726025c6812b4570e67f7fa1b19ff2a3f8
 AUX freeciv-3.1.0_beta4-fix-manpage-install-location.patch 882 BLAKE2B 7cbe60cf4753af0331541786679b80d8d14a95a8fb99d57b1c17c0e9690001aac2b8bc205a9225c755ca5c3ffc577af992a7bd6aaf2f37d6aa37be6d5b8460ed SHA512 e2f652a05368a885531e47421dfde993fac54850092db07834399d91c393c51e35f6662c9cd79d55bd470dbc81f211a2b393cd96768a6874c3b7b680de2ac366
 DIST freeciv-3.1.0.tar.gz 127748997 BLAKE2B 75b3d1341d8ab09af244f07f3df5b1817571c4958a4296f37f35a105fe5a8e3d2e8d2e0dc7eb1d1aaf3d4a4c6574ba75355595134dc5a255535bc14c604bb99f SHA512 514d796a54466790a5ce0f2abb6fd8cb9c124a2f19ab33d48ce7a7f0d8d92096b54352a5d3655da852cdbd807baf4969467e04b82f687347bdff92e09f7aad86
+DIST freeciv-3.1.2.tar.gz 127861796 BLAKE2B ab9c1b8ce2f54725505a21570bbadc906cde34db5e6796fd469556a6ee3bf9e0e05387a2da323f4fd18596e5c5fcb9c4448293f3fd989dfcc9251fe7626300a1 SHA512 6be7e3e3bf78d3606476a51a6c0115d3ef0fe0fa1f446496152873d624c9b7c074d7fb63fe23318a9b4ae2c2ce9acb52d19c0f08c060a64c65b1034df9521340
 EBUILD freeciv-3.1.0.ebuild 5968 BLAKE2B f66374068aaf4b25559814d228febd6a0df42312aa663f87e0c9f82528e110c25d4cbfac3c5489f224efb4e4fcf3aa912523c75ceca1103d2612982e78f2cf09 SHA512 59be1c2a75afa5ff50ec6d870dc59b2768a9df29547b938647cf301f0696692f1468bac2464a06bc5c39c1ef0cf87f6b4829744b5477ffd2205876fb3cdaf032
-EBUILD freeciv-9999.ebuild 5920 BLAKE2B a097b6afc92267c174981f2efca3c2525700f17d8267b412d66ec7c0ebd4b0a1888ba2f9d3d0ae38badde732ae884d4927c3e1a188d0ede052a02b85aa501199 SHA512 842200f491bbba8a9721e2eba8192f45d8d6a559000782c98a8bb16d5b0fd16ba5ee9a465be6974835c7ed153f3768a3bb681a502ee7bed8c0659daa49d5ae68
+EBUILD freeciv-3.1.2.ebuild 5839 BLAKE2B 7d617f5e18d2b07038aa63b4a016d5079f85ef849a25c589b775f279f9237d2ebb4f192fa368006e8c696474c359eb49059f7a971a4428a32dd552984be633cd SHA512 9f63045103c5041f7aea462ba8e79b37810a68b897c79a39f2079374c40012def29c75a579b1460e3b5bf65fc8e0049db19fb0491bf0b1e5426c417ac3a67acd
+EBUILD freeciv-9999.ebuild 5839 BLAKE2B 7d617f5e18d2b07038aa63b4a016d5079f85ef849a25c589b775f279f9237d2ebb4f192fa368006e8c696474c359eb49059f7a971a4428a32dd552984be633cd SHA512 9f63045103c5041f7aea462ba8e79b37810a68b897c79a39f2079374c40012def29c75a579b1460e3b5bf65fc8e0049db19fb0491bf0b1e5426c417ac3a67acd
 MISC metadata.xml 1298 BLAKE2B c744a6fa5ab5345aeafa4bea7edc493beee1ded63cc2d9d26fe7e883dd81d4de6cec288a8ceb49567f2bdfe2fcd647ab9231055429244c14d8b05978dc13ad7a SHA512 767b482284030363aeaf521b13511fe10f69db940b411fe637a4f9d00324172b3b3e1426e74fa575cb414eb1a038fca87ab473237804699879975448f9ca0f1f
diff --git a/games-strategy/freeciv/freeciv-3.1.2.ebuild b/games-strategy/freeciv/freeciv-3.1.2.ebuild
new file mode 100644
index 000000000000..eca61092a9e5
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-3.1.2.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit desktop lua-single meson xdg
+
+DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="https://www.freeciv.org/ https://github.com/freeciv/freeciv/"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeciv/freeciv/"
+else
+	MY_PV="R${PV//./_}"
+	SRC_URI="https://github.com/freeciv/freeciv/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	if [[ ${PV} != *_beta* ]]; then
+		KEYWORDS="~amd64 ~ppc64 ~x86"
+	fi
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline rule-editor sdl +server +sound +system-lua web-server"
+
+# I'm pretty sure that you can't build both qt flavours at the same time
+REQUIRED_USE="
+	system-lua? ( ${LUA_REQUIRED_USE} )
+	!dedicated? ( || ( gtk3 gtk4 qt5 qt6 sdl ) )
+	dedicated? ( !gtk3 !gtk4 !mapimg !nls !qt5 !qt6 !sdl !sound )
+	qt5?  ( !qt6 )
+	qt6?  ( !qt5 )
+"
+
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-build/libtool
+	dev-db/sqlite:3
+	dev-libs/icu:=
+	net-misc/curl
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libpng
+		gtk3? ( x11-libs/gtk+:3 )
+		gtk4? ( gui-libs/gtk:4 )
+		mapimg? ( media-gfx/imagemagick:= )
+		nls? ( virtual/libintl )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? (
+			dev-qt/qtbase:6[gui,widgets]
+		)
+		sdl? (
+			media-libs/libsdl2[video]
+			media-libs/sdl2-gfx
+			media-libs/sdl2-image[png]
+			media-libs/sdl2-ttf
+		)
+		sound? (
+			media-libs/libsdl2[sound]
+			media-libs/sdl2-mixer[vorbis]
+		)
+	)
+	json? ( dev-libs/jansson:= )
+	readline? ( sys-libs/readline:= )
+	system-lua? (
+		${LUA_DEPS}
+	)
+"
+DEPEND="${RDEPEND}
+	!dedicated? ( x11-base/xorg-proto )
+"
+# Calls gzip during build
+BDEPEND="
+	app-arch/gzip
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	use system-lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	# Upstream's meson.build is not very friendly to our needs
+	sed -i -e "s:doc/freeciv:doc/${PF}:" meson.build || die
+	sed -i -e "/custom_target('gzip_ChangeLog/,+6d" meson.build || die
+	default
+}
+
+src_configure() {
+	# Docs here: https://github.com/freeciv/freeciv/blob/main/doc/INSTALL.meson
+	local myclient=() emesonargs=() myfcmp=()
+
+	# Upstream considers meson "experimental" until 3.2.0 according to their roadmap
+	emesonargs+=( -Dack_experimental=true )
+
+	if use dedicated || use server ; then
+		emesonargs+=( -Dserver=enabled )
+	elif use web-server; then
+		emesonargs+=( -Dserver=freeciv-web )
+	else
+		emesonargs+=( -Dserver=disabled )
+	fi
+
+	# Select any client backends that we want enabled; dedicated server shouldn't build a UI
+	# for sanity we'll build the modpack bin with the same UIs as the client.
+	# 'fcmp' = freeciv modpack (client) - gtk3, qt, cli, gtk4
+	freeciv_enable_ui() {
+				local flag=$1
+				local client_name=${2:-${flag}}
+				local fcmp_name=${3:-${client_name}}
+
+				if use ${flag} ; then
+					myclient+=( ${client_name} )
+					use modpack && myfcmp+=( ${fcmp_name} )
+				fi
+			}
+
+	if ! use dedicated ; then
+		# there's no SDL modpack backend; rather than incidentally pull in GTK3 (as is default)
+		# let's explicitly set the backend to CLI
+		freeciv_enable_ui sdl sdl2 cli
+		freeciv_enable_ui gtk3 gtk3.22 gtk3
+		freeciv_enable_ui gtk4
+		freeciv_enable_ui qt5 qt
+		freeciv_enable_ui qt6 qt
+		use qt5 && emesonargs+=( -Dqtver=qt5 )
+		use qt6 && emesonargs+=( -Dqtver=qt6 )
+	else
+		if use modpack ; then
+			myfcmp+=( cli )
+		fi
+	fi
+
+	# the client and fpmc arrays are now populated (or not for dedicated); let's add them to emesonargs
+	emesonargs+=(
+		-Dclients=$(echo ${myclient[*]} | sed 's/ /,/g')
+		-Dfcmp=$(echo ${myfcmp[*]} | sed 's/ /,/g')
+	)
+
+	# If we're building a live ebuild, we want to include the git revision in the version string
+	if [[ ${PV} == 9999 ]] ; then
+		emesonargs+=( -Dgitrev=true )
+	fi
+
+	# Anything that can be trivially set by meson_use goes here
+	emesonargs+=(
+		$(meson_use json json-protocol)
+		$(meson_use mapimg mwand)
+		$(meson_use nls)
+		$(meson_use readline)
+		$(meson_use rule-editor ruledit)
+		$(meson_use sound audio)
+		$(meson_use system-lua syslua)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+
+	meson_src_install
+	# Create and install the html manual and then cleanup the tool because it's useless.
+	# TODO: for proper localisation this should be run during postinst but
+	# that would require a lot of work to avoid orphan files.
+	# freeciv-manual only supports one ruleset argument at a time.
+	elog "Generating html manual..."
+	for RULESET in alien civ1 civ2 civ2civ3 classic experimental multiplayer sandbox
+	do
+		$(find "${WORKDIR}" -type d -maxdepth 1 -mindepth 1 -iname '*-build')/freeciv-manual -r ${RULESET} || die
+		docinto html/rulesets/${RULESET}
+		dodoc ${RULESET}*.html
+	done
+
+	find "${ED}" -name "freeciv-manual*" -delete || die "Failed to remove freeciv-manual"
+
+	if use dedicated ; then
+		elog "Tidying up dedicated server installation..."
+		find "${ED}"/usr/share/man/man6/ \
+			-not \( -name 'freeciv.6' -o -name 'freeciv-ruledit.6' \
+			-o -name 'freeciv-ruleup.6' -o -name 'freeciv-server.6' \) -mindepth 1 -delete || die
+	else
+		# sdl client needs some special handling
+		if use sdl ; then
+			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
+		else
+			rm "${ED}"/usr/share/man/man6/freeciv-sdl2.6 || die
+		fi
+	fi
+
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "There are a number of supported authentication backends."
+		einfo "sqlite3 is the default, however dedicated servers may wish to"
+		einfo "use another supported backend; please consult the documentation"
+		einfo "to configure freeciv for a particular backend:"
+		einfo "https://github.com/freeciv/freeciv/blob/main/doc/README.fcdb"
+	fi
+}
diff --git a/games-strategy/freeciv/freeciv-9999.ebuild b/games-strategy/freeciv/freeciv-9999.ebuild
index 0b5e2c809016..eca61092a9e5 100644
--- a/games-strategy/freeciv/freeciv-9999.ebuild
+++ b/games-strategy/freeciv/freeciv-9999.ebuild
@@ -90,10 +90,6 @@ pkg_setup() {
 	use system-lua && lua-single_pkg_setup
 }
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0_beta4-fix-manpage-install-location.patch
-)
-
 src_prepare() {
 	# Upstream's meson.build is not very friendly to our needs
 	sed -i -e "s:doc/freeciv:doc/${PF}:" meson.build || die