Adding metadata

6 files changed, 177 insertions, 104 deletions

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index a62cdd29afab..0b86f16f152a 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,4 +1,3 @@
-DIST wesnoth-1.18.6.tar.gz 516082967 BLAKE2B a8d094ad58497bbe7c4f25877b8146e73e00bdf4df031fb92f57a2f346a6a543d9098c25875dbb89d284c58c72c6d032b942a8ca095ef232c822f77ec9214e93 SHA512 8f0bcb9191074c85f4b5dbc9cbbb46f0ea9f8d31a802f47fad364970c2e3a6b62f9aff57944e734a183b9cdfae1bda77223c9ec60e32df821b26eddceb1806c0
-DIST wesnoth-1.18.7.tar.gz 516301673 BLAKE2B 63a650b1e267c21d8d630c132109350a45ca22f52fddc6cf7df71cb472dec8020ae35404decf3e204f92d4c89dac5f4341259d690d6ca5e4d7df2fe76f84dd4b SHA512 292c96944f2fdb8c21e3f69afac1353b076c8f21c0e0654173c0aaac4f9caaa9a1191c2c3038142f3ac1dbe39000f340d52b9faf6bfd02a3f7f64626da4b1caa
-DIST wesnoth-1ab3208a1fceb12fca8f24ba57d6e13c5bff15e3.tar.gz 463275 BLAKE2B f4e1f852c923f20fcdecea6fe46065489659df4ab61dfbab0260eee66ea64d5d64fe593df9f61777619de386c9264208595cd2d1efe613fbe69bff1cadd78123 SHA512 45c65cd8c579412d2d89c3899c5a98157c66306423ecaafa31b3c386f62ef900f7832de45b8c6a2804001f7676afda1ce8785b3933830dd21515a2c49b0a1fe7
-DIST wesnoth-d4405b3f1f930cc4a617406c5e62ab1ae5026663.tar.gz 42114 BLAKE2B cfedf05deb96d8ec2b21fe2692eac2d660dc13ace6affa0bb8482b414d7cb1999e4336d8f23b5d417286aac85ee8c8ab1146284cae05e459c9285764e191854a SHA512 dbf7e5ab0542b0b0325585c3a892facbb54423c6f7eda0e3114b05006a866a182b909afe0306b24b4173e60ede89c6006da9df9f5844bb8c5f80e1533701e6ff
+DIST wesnoth-1.18.6.tar.bz2 467190064 BLAKE2B 3af57b8e78fbcd2ad34318990ff4915b3257367287ce86a69409dbaf79bb4026abcac3457f6ec894e7f9fc61cb89444caab00d5887f03314d52a0949da14a131 SHA512 ef48783e7bd5f95e4763bbdae92e28267bba69709f56bef749bb4af8f2e2d75a1bfe567bbc1e177935eeeb4b73b5348a9f34a3e7483014d826af99dc8183edc1
+DIST wesnoth-1.19.18.tar.bz2 617048843 BLAKE2B 290b0d724d4951ca0b9b6c7f97adc5fa6e96282b3f788f23d4f9bbfe1214555efcc931df53b25549e4a986bedd8ce0484af206bd56136a95da0315be4891703d SHA512 89e03194195023d58c6d58529ca8533e72031aa821a9c58c4e391f46082ed4835cdee36229c8401efa0acaaf29d89d79b2817396096853fe1e8e3ca9511627e4
+DIST wesnoth-1.19.19.tar.bz2 623738775 BLAKE2B dfab8633d5909b1797b7447104d7eb661bc4c437ef12e3937ef3be8fc9cda8e13d34a2c92e22969de8ff4683fd40fa04948b59f47c858bd6752370af78b1015c SHA512 861fa0e4ba9d69cfd0d67c0a8f56674e728f3a7070a7e34ccd4289d82c37edaa478aea0d30580f21596c1e3bc568b24da87cb244324d77d8c6829a53e8dadecf
diff --git a/games-strategy/wesnoth/files/third_party-1.17.26.patch b/games-strategy/wesnoth/files/third_party-1.17.26.patch
deleted file mode 100644
index c3fb12944d9d..000000000000
--- a/games-strategy/wesnoth/files/third_party-1.17.26.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN wesnoth-1.17.26.orig/CMakeLists.txt wesnoth-1.17.26/CMakeLists.txt
---- wesnoth-1.17.26.orig/CMakeLists.txt	2024-02-24 20:11:17.077027218 +0100
-+++ wesnoth-1.17.26/CMakeLists.txt	2024-02-24 20:18:50.970059908 +0100
-@@ -67,7 +67,7 @@
- 		message(FATAL_ERROR "Lua ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR} C++ not found. Try setting 'LUA_DIR'.")
- 	endif()
- else()
--	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/src/modules/lua/.git")
-+	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/src/modules/lua/.gitignore")
- 		message(FATAL_ERROR "Lua submodule does not exist. You must run 'git submodule update --init --recursive' to initialize it.")
- 	else()
- 		message("-- Lua submodule found.")
diff --git a/games-strategy/wesnoth/metadata.xml b/games-strategy/wesnoth/metadata.xml
index 68981eb160ff..cb92e7777137 100644
--- a/games-strategy/wesnoth/metadata.xml
+++ b/games-strategy/wesnoth/metadata.xml
@@ -2,19 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
-  <maintainer type="project">
     <email>games@gentoo.org</email>
     <name>Gentoo Games Project</name>
   </maintainer>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:wesnoth:wesnoth</remote-id>
-  </upstream>
   <use>
     <flag name="server">Enable compilation of server</flag>
-    <flag name="fribidi">Support for right-to-left languages</flag>
   </use>
+  <upstream>
+    <bugs-to>https://github.com/wesnoth/wesnoth/issues/</bugs-to>
+    <doc>https://wiki.wesnoth.org/StartingPoints</doc>
+    <changelog>https://github.com/wesnoth/wesnoth/blob/master/changelog.md</changelog>
+  </upstream>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/games-strategy/wesnoth/wesnoth-1.18.6-r2.ebuild b/games-strategy/wesnoth/wesnoth-1.18.6.ebuild
index 63b72f060f17..5bf77990a699 100644
--- a/games-strategy/wesnoth/wesnoth-1.18.6-r2.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.18.6.ebuild
@@ -1,35 +1,34 @@
-# Copyright 2021-2026 Liguros Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
 inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org https://github.com/wesnoth/wesnoth"
-LUA_COMMIT="1ab3208a1fceb12fca8f24ba57d6e13c5bff15e3"
-MARIADBPP_COMMIT="d4405b3f1f930cc4a617406c5e62ab1ae5026663"
-SRC_URI="
-	https://github.com/wesnoth/wesnoth/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/viaduck/mariadbpp/archive/${MARIADBPP_COMMIT}.tar.gz -> ${PN}-${MARIADBPP_COMMIT}.tar.gz
-	https://github.com/lua/lua/archive/${LUA_COMMIT}.tar.gz -> ${PN}-${LUA_COMMIT}.tar.gz
-"
+HOMEPAGE="https://www.wesnoth.org
+	https://github.com/wesnoth/wesnoth"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus dedicated doc nls server"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-group/wesnoth
 	acct-user/wesnoth
 	dev-libs/boost:=[bzip2,context,icu,nls]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	>=media-libs/libsdl2-2.0.10:0[joystick,video,X]
 	!dedicated? (
 		dev-libs/glib:2
 		dev-libs/openssl:0=
-
 		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png]
+		>=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
 		>=media-libs/sdl2-mixer-2.0.0[vorbis]
 		media-libs/libvorbis
 		>=x11-libs/pango-1.22.0
@@ -37,8 +36,7 @@ RDEPEND="
 		sys-libs/readline:0=
 		dbus? ( sys-apps/dbus )
 	)"
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	x11-libs/libX11
 "
 BDEPEND="
@@ -46,26 +44,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	$FILESDIR/third_party-1.17.26.patch
-	$FILESDIR/wesnoth-1.18.6-boost-1.89.patch
-)
+PATCHES=( "${FILESDIR}/${P}-boost-1.89.patch" )
 
 src_prepare() {
-	mv ${WORKDIR}/lua-${LUA_COMMIT}/* $S/src/modules/lua
-	mv ${WORKDIR}/lua-${LUA_COMMIT}/.[a-z]* $S/src/modules/lua
-	rmdir ${WORKDIR}/lua-${LUA_COMMIT}
-	mv ${WORKDIR}/mariadbpp-${MARIADBPP_COMMIT}/* $S/src/modules/mariadbpp
-	mv ${WORKDIR}/mariadbpp-${MARIADBPP_COMMIT}/.[a-z]* $S/src/modules/mariadbpp
-	rmdir ${WORKDIR}/mariadbpp-${MARIADBPP_COMMIT}
-
 	cmake_src_prepare
 
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
+	use doc || cmake_comment_add_subdirectory -f doc manual
 
 	# respect LINGUAS (bug #483316)
 	if [[ ${LINGUAS+set} ]] ; then
@@ -80,8 +64,10 @@ src_prepare() {
 src_configure() {
 	filter-flags -ftracer -fomit-frame-pointer
 
+	local mycmakeargs=()
+
 	if use dedicated || use server ; then
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DENABLE_CAMPAIGN_SERVER="ON"
 			-DENABLE_SERVER="ON"
 			-DSERVER_UID="${PN}"
@@ -89,7 +75,7 @@ src_configure() {
 			-DFIFO_DIR="/run/wesnothd"
 			)
 	else
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DENABLE_CAMPAIGN_SERVER="OFF"
 			-DENABLE_SERVER="OFF"
 			)
@@ -101,10 +87,16 @@ src_configure() {
 		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_NOTIFICATIONS="$(usex dbus)"
 		-DENABLE_STRICT_COMPILATION="OFF"
-		)
+		-DENABLE_TESTS="$(usex test)"
+	)
 	cmake_src_configure
 }
 
+src_test() {
+	# Allow SDL_Mixer test to pass, bug #931551
+	SDL_AUDIODRIVER=dummy cmake_src_test
+}
+
 src_install() {
 	local DOCS=( README.md changelog.md )
 	cmake_src_install
diff --git a/games-strategy/wesnoth/wesnoth-1.18.7.ebuild b/games-strategy/wesnoth/wesnoth-1.19.18.ebuild
index 63b72f060f17..786b25c8b271 100644
--- a/games-strategy/wesnoth/wesnoth-1.18.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.19.18.ebuild
@@ -1,35 +1,33 @@
-# Copyright 2021-2026 Liguros Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
 inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org https://github.com/wesnoth/wesnoth"
-LUA_COMMIT="1ab3208a1fceb12fca8f24ba57d6e13c5bff15e3"
-MARIADBPP_COMMIT="d4405b3f1f930cc4a617406c5e62ab1ae5026663"
-SRC_URI="
-	https://github.com/wesnoth/wesnoth/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/viaduck/mariadbpp/archive/${MARIADBPP_COMMIT}.tar.gz -> ${PN}-${MARIADBPP_COMMIT}.tar.gz
-	https://github.com/lua/lua/archive/${LUA_COMMIT}.tar.gz -> ${PN}-${LUA_COMMIT}.tar.gz
-"
+HOMEPAGE="https://www.wesnoth.org"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus dedicated doc nls server"
+# uneven minor versions are development versions
+if (( ($(ver_cut 2) % 2) == 0 )) ; then
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-group/wesnoth
 	acct-user/wesnoth
 	dev-libs/boost:=[bzip2,context,icu,nls]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	>=media-libs/libsdl2-2.0.18:0[joystick,video,X]
 	!dedicated? (
 		dev-libs/glib:2
 		dev-libs/openssl:0=
-
 		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png]
+		>=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
 		>=media-libs/sdl2-mixer-2.0.0[vorbis]
 		media-libs/libvorbis
 		>=x11-libs/pango-1.22.0
@@ -37,8 +35,7 @@ RDEPEND="
 		sys-libs/readline:0=
 		dbus? ( sys-apps/dbus )
 	)"
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	x11-libs/libX11
 "
 BDEPEND="
@@ -46,29 +43,15 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	$FILESDIR/third_party-1.17.26.patch
-	$FILESDIR/wesnoth-1.18.6-boost-1.89.patch
-)
-
 src_prepare() {
-	mv ${WORKDIR}/lua-${LUA_COMMIT}/* $S/src/modules/lua
-	mv ${WORKDIR}/lua-${LUA_COMMIT}/.[a-z]* $S/src/modules/lua
-	rmdir ${WORKDIR}/lua-${LUA_COMMIT}
-	mv ${WORKDIR}/mariadbpp-${MARIADBPP_COMMIT}/* $S/src/modules/mariadbpp
-	mv ${WORKDIR}/mariadbpp-${MARIADBPP_COMMIT}/.[a-z]* $S/src/modules/mariadbpp
-	rmdir ${WORKDIR}/mariadbpp-${MARIADBPP_COMMIT}
-
 	cmake_src_prepare
 
 	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
+		sed -i '/manual/d' doc/CMakeLists.txt || die
 	fi
 
 	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
+	if [[ ${LINGUAS+set} ]]; then
 		local lang langs=()
 		for lang in $(cat po/LINGUAS) ; do
 			has ${lang} ${LINGUAS} && langs+=( ${lang} )
@@ -80,31 +63,40 @@ src_prepare() {
 src_configure() {
 	filter-flags -ftracer -fomit-frame-pointer
 
+	local mycmakeargs=(
+		-Wno-dev
+		-DENABLE_STRICT_COMPILATION="OFF"
+		-DHARDEN="OFF" #936527
+		-DENABLE_GAME="$(usex !dedicated)"
+		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_NOTIFICATIONS="$(usex dbus)"
+		-DENABLE_TESTS="$(usex test)"
+	)
+
 	if use dedicated || use server ; then
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DENABLE_CAMPAIGN_SERVER="ON"
 			-DENABLE_SERVER="ON"
 			-DSERVER_UID="${PN}"
 			-DSERVER_GID="${PN}"
 			-DFIFO_DIR="/run/wesnothd"
-			)
+		)
 	else
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DENABLE_CAMPAIGN_SERVER="OFF"
 			-DENABLE_SERVER="OFF"
-			)
-	fi
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_STRICT_COMPILATION="OFF"
 		)
+	fi
+
 	cmake_src_configure
 }
 
+src_test() {
+	# Allow SDL_Mixer test to pass, bug #931551
+	SDL_AUDIODRIVER=dummy cmake_src_test
+}
+
 src_install() {
 	local DOCS=( README.md changelog.md )
 	cmake_src_install
diff --git a/games-strategy/wesnoth/wesnoth-1.19.19.ebuild b/games-strategy/wesnoth/wesnoth-1.19.19.ebuild
new file mode 100644
index 000000000000..8bfaa55523fb
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.19.19.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="https://www.wesnoth.org"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ CC-BY-SA-4.0"
+SLOT="0"
+# uneven minor versions are development versions
+if (( ($(ver_cut 2) % 2) == 0 )) ; then
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/wesnoth
+	acct-user/wesnoth
+	dev-libs/boost:=[bzip2,context,icu,nls]
+	>=media-libs/libsdl2-2.0.18:0[joystick,video,X]
+	!dedicated? (
+		dev-libs/glib:2
+		dev-libs/openssl:0=
+		>=media-libs/fontconfig-2.4.1
+		>=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
+		>=media-libs/sdl2-mixer-2.0.0[vorbis]
+		media-libs/libvorbis
+		>=x11-libs/pango-1.22.0
+		>=x11-libs/cairo-1.10.0
+		sys-libs/readline:0=
+		dbus? ( sys-apps/dbus )
+	)"
+DEPEND="${RDEPEND}
+	x11-libs/libX11
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	use doc || cmake_comment_add_subdirectory -f doc manual
+
+	# respect LINGUAS (bug #483316)
+	if [[ ${LINGUAS+set} ]]; then
+		local lang langs=()
+		for lang in $(cat po/LINGUAS) ; do
+			has ${lang} ${LINGUAS} && langs+=( ${lang} )
+		done
+		echo "${langs[@]}" > po/LINGUAS || die
+	fi
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+
+	local mycmakeargs=(
+		-Wno-dev
+		-DENABLE_STRICT_COMPILATION="OFF"
+		-DHARDEN="OFF" #936527
+		-DENABLE_GAME="$(usex !dedicated)"
+		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_NOTIFICATIONS="$(usex dbus)"
+		-DENABLE_TESTS="$(usex test)"
+	)
+
+	if use dedicated || use server ; then
+		mycmakeargs+=(
+			-DENABLE_CAMPAIGN_SERVER="ON"
+			-DENABLE_SERVER="ON"
+			-DSERVER_UID="${PN}"
+			-DSERVER_GID="${PN}"
+			-DFIFO_DIR="/run/wesnothd"
+		)
+	else
+		mycmakeargs+=(
+			-DENABLE_CAMPAIGN_SERVER="OFF"
+			-DENABLE_SERVER="OFF"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Allow SDL_Mixer test to pass, bug #931551
+	SDL_AUDIODRIVER=dummy cmake_src_test
+}
+
+src_install() {
+	local DOCS=( README.md changelog.md )
+	cmake_src_install
+	if use dedicated || use server ; then
+		rmdir "${ED}"/run{/wesnothd,} || die
+		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+	fi
+}