gentoo auto-resync : 20:12:2022 - 13:51:21

4 files changed, 4 insertions, 105 deletions

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index d1b697d7db2a..310b70f448b2 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,9 +1,7 @@
 AUX wesnoth-1.16.6-fix-build-with-boost-1.81.patch 1907 BLAKE2B 8c98e374f17ceb8afd29aad80ee2e3971d62fcd8b996379b6d198c162fe8376fde7f7d68122a955e65852a40f9712bfdd941630722011a8326c0216eaf73aed2 SHA512 3d930b1de00163e7970c35e80d2c87069050b1a64884cbd5ed7c9e44f47857e070561d0cb31575e7263b4cfd5907d82f067445115acf7a66823a1f5eed752a55
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20 SHA512 7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
 DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758 SHA512 fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
 DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449 SHA512 8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a
-EBUILD wesnoth-1.16.3.ebuild 2230 BLAKE2B 72027fdc814cc0aa769a94d971b7eb5f769265861ffadf1a30f612ef1d01b89725e04d16ffd32f9889c4a2b19796be7dfd072504fce1826f4dbb4afd37e9b73f SHA512 2efd412cce8e8cda42cf3421de5d60ff514778bd7355155c7252ef06859eb23ccb650719677968339b2a77a060cbb6b911a6ca23523e44a5b91f95147b1f72a2
-EBUILD wesnoth-1.16.6.ebuild 2304 BLAKE2B 29929dda7e4950588c33ae9a1159c072ce0bd284df9bcde29e1d7540b89d4e91eca9ddb54781f835ff2f0cdbad691e61ef9657df755fb6551dc40531863861b7 SHA512 57435db84babedb9d0aba64dcc083f569eba539632b0bd2fe3827a8177cdc283df881af9ca049d4a5077faa6d341a777a82fe76f97e7833b825b87dad0d99479
+EBUILD wesnoth-1.16.6.ebuild 2294 BLAKE2B 62b4cbe66b8f06e4b4fd3f502b4f5808ba3d1d9e114004e3c7c80ccd903f82e1a2ea4a51470d7b38467ce9f20e5e6b73b38711ba5652d443f55872d2e133a3af SHA512 40a414cdce3528956fbd769283705c4b44665027793c5b0f6f1e7b014bb348fad108f54bb57f15c1274017421e3f5481e2a41814e1326bc006cb9e2fe9487aec
 EBUILD wesnoth-1.17.11.ebuild 2203 BLAKE2B 9c5f81f08b619e228052ca7bc4c8d667524a15df4e8d81db47a3a54bc3165f53ee07db38f593debf37f0d4fbee1af4242147e7843f1a0e47923f082397fec4a3 SHA512 4776a5abc4f2d048e4f628d29ee5ebbe4a372dd4d6e049965b4c583258f09c3c8e688175d99121228a842b314ae91a6f40086f1e8d1aec5d8f2034c78be5cb27
-MISC metadata.xml 418 BLAKE2B 636dfbbd604111ba7c6241fbbc8ba8bd9a4f1f6e30811c9f3788a3624deadf751ad62dca9e24a74f19709900c32530fd3b12363ba288a94d2d94eb9c7e15b6f1 SHA512 298467b69ae7455c096e186061df02c45dd42aa33241ea12bd672a551589dd62a7cf5d2e383a6e94a6ee1332bc29b24f80e4597cbb0771e64b40d3bee5249102
+MISC metadata.xml 475 BLAKE2B fe3a0b92f39b2158ec38fe2d7528463bb243cc44df562f7ad450227b35bab1d59a1638fe1d702cd70358a0137851e08be1878d590afbcc28dd19176b2a7df7fd SHA512 6293671db448eef2a211ae8dbb88624a42ac46712331db441a55d44566e7843f820047dde7936d725fea6d24a8196223e30712ffbd3864e63614f7f849cda6b4
diff --git a/games-strategy/wesnoth/metadata.xml b/games-strategy/wesnoth/metadata.xml
index 42cfc4670216..8ad2ac460037 100644
--- a/games-strategy/wesnoth/metadata.xml
+++ b/games-strategy/wesnoth/metadata.xml
@@ -10,5 +10,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">wesnoth</remote-id>
+    <remote-id type="github">wesnoth/wesnoth</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/games-strategy/wesnoth/wesnoth-1.16.3.ebuild b/games-strategy/wesnoth/wesnoth-1.16.3.ebuild
deleted file mode 100644
index 1ee6998e389d..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.16.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 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"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-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"
-
-RDEPEND="
-	acct-group/wesnoth
-	acct-user/wesnoth
-	dev-libs/boost:=[bzip2,context,icu,nls]
-	>=media-libs/libsdl2-2.0.4: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-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
-
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-
-	# 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
-
-	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
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_STRICT_COMPILATION="OFF"
-		)
-	cmake_src_configure
-}
-
-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
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
index ebb79a331120..1a92e4f2d992 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/wesnoth-1.16.6-fix-build-with-boost-1.81.patch" )
+PATCHES=( "${FILESDIR}"/${P}-fix-build-with-boost-1.81.patch )
 
 src_prepare() {
 	cmake_src_prepare