gentoo resync : 29.12.2022

6 files changed, 25 insertions, 62 deletions

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 7e267c574b6a..02b4436de502 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,9 +1,8 @@
-AUX wesnoth-1.14.14-ar.patch 576 BLAKE2B 5cc3995992f9e92f1179e502d8cb3981191953d2ef438d68e8b6a0666fec1485152200861b4b4e32e05875a8d7115d050cc9e9030b97e8ce5a183b0f5d7aa9b8 SHA512 8e612f56a292fe3e155ab072204938888a2fda2e73559029145cdda3b4d201437e616525596610bfd7022a85ec59d761c9711732f227a335ff56040b57e94b75
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024 SHA512 3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
-DIST wesnoth-1.15.15.tar.gz 512968280 BLAKE2B 2b5c979244fb168e674d120a5eeef3905560992a7ca50735ef30918144ad7b21a9d57bef8cf19d564e02226955fb1c6922b27151fef36825a9b06cbe3d9e40ee SHA512 7f59ac11223e6ca93f926ca978638828e366ea2fd75530b317656e5edd8b0f042f86beb57fd17b8cc9b2d3d093d60580cd3449e1c3bf53b8ee37f656df7198a2
-DIST wesnoth-1.16.0.tar.gz 515780018 BLAKE2B 1a9d6aa9b294b9919d3b51528928f43d786f30fda739f0af2e62ebbb210b8f071945fe6130c00e2055d3726ae7eabf63b57fd2f1d5d8981a4cd0feedbfbffbfb SHA512 6d999a99e140916ef2070c524898ef69c7b45b3240f208aa380e81a1d1822a02c05a7fc9c5049a05a230e5126d8ff8723e16b6a62ba532b81c031f78ad8c85fe
-EBUILD wesnoth-1.14.14-r1.ebuild 2524 BLAKE2B e53ddf2cac6ffd8d95edd0708e00c595e2ab9f015ff98fb314e85683d1f2a42b76ceff356095ae70d010694baa6343dc8c99341c38ea260c624a20f7b847e321 SHA512 dc3e7c29bb2273d175b899b82c95499dfb44e9f167bf1e1990fc5da4fe8c27b4e409534efbb3217267c581c9453ecacc9a3fee8e1c1ee704a550136a9a2a0f27
-EBUILD wesnoth-1.15.15.ebuild 2454 BLAKE2B 063e06beb12e8b609dd355655c55d7771b6df994c6f89892fdd5ec5e1308997e3c4cbae69259c8a4e8110b3cfff43040e4748a7a231f3854b9e4c1c8e62b6ffe SHA512 8a1ac9bc1f80882d56a94ac76d1abc0c47cacc6fa870b74cb979e41094ea54cbe494ba7f623735f5526b591a892139f0b259a822854dc89306c711e7710c0ec6
-EBUILD wesnoth-1.16.0-r1.ebuild 2373 BLAKE2B d9a7061e0de3223fd2fd0b7ecc85d101949e0ee0689953e19fc6fc3be1d725db6c1d9863757517a72e261c9ae588ddec834e0751ca125cfe4582415976a6fa78 SHA512 4813c803874ede90b4b2a84f6e3cd533756ee5918c2f59fb122d3f6b8490918365b7a8bc141b2083e955bbf48e4499659c98ac91c3d7f1a09ab9c9fa180aadda
-MISC metadata.xml 486 BLAKE2B a9dc64cc59fd1a47f9e6e13f6ebb9ba05845437efb6ec4e4fa68b5f1a1018d12fa7d1371fb4fb9ac0f83a3e2dbcc9eaade90a15ddd2213891dd8dff37280cb1d SHA512 10477ca40a5c3ba502f85841bed2ae73e8125b94c6c504288d8c9fc5742c0084f17c7b0901a298772a28e5c813c9d5034058b68d32ee4ec37513fadaf49442d1
+DIST wesnoth-1.16.2.tar.gz 517313669 BLAKE2B b1b9a2795a7a298edd1d952547db518a31f217f983aaf39cdde7a14773f2538485c980205e9242d4a1c8f933011a09a7e858de128c7d17c16c552e34b2a59bf3 SHA512 19cb4c64d9cce780ffbb54e357bf88c3cf2eedc835fab7162bd9caa62485a60ab2a1ba68ab0c4b98dc05bab4fb22889f4a8237b9542baa5478fbda08034d9f66
+DIST wesnoth-1.16.3.tar.gz 518049863 BLAKE2B e862de2e6f71a1dfe11b0cb6343ea1da78c0eb035893d7bd16ca86586b689b21f39b5266ba86476829c1c9005f7abc37058c2f0ac8ea1ae2970d609880e0da20 SHA512 7f37a1a16ed51ffa935a457553b1a3890398b928bb5893720b746080b37a121a86e21ae402bdddfe30572adccf71a985bf1e3223a0eb443bf7a696ee213d9bf0
+DIST wesnoth-1.17.5.tar.bz2 418959651 BLAKE2B 3b6e015192a4050e5d16b25b0e67f91894eeae772125e4bbbefa81082b17fc9c479cf0f4c68d3b74afc5e656c8680319d336d1c14f421f875a64df9b6adbd830 SHA512 7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377
+EBUILD wesnoth-1.16.2.ebuild 2241 BLAKE2B 3b85bf93462df6be33d01f54c2105f884b3c73a68de91f464cf3295420ab449d3bc4089a7c88354612242dd96f226c10f72b0cd6344e2c2510ee3932898a54bb SHA512 037e7760f3b474fa8a674b25b78f7503c8b484b2f4c2f30b0ccdbf2eeaa885972eb9d011a5253d801738931cc12c3edf10fb4b2e2c8c538c9d2d9391cdd9f755
+EBUILD wesnoth-1.16.3.ebuild 2241 BLAKE2B 3b85bf93462df6be33d01f54c2105f884b3c73a68de91f464cf3295420ab449d3bc4089a7c88354612242dd96f226c10f72b0cd6344e2c2510ee3932898a54bb SHA512 037e7760f3b474fa8a674b25b78f7503c8b484b2f4c2f30b0ccdbf2eeaa885972eb9d011a5253d801738931cc12c3edf10fb4b2e2c8c538c9d2d9391cdd9f755
+EBUILD wesnoth-1.17.5.ebuild 2214 BLAKE2B da4ccb1c6eab6c3c7c4ae7c863aa4a920b43672acd58fbb2067058f3cd875fec58ea0da4369612bb03667ac62ca835bd344aa62504cd460a5f394da5f9725491 SHA512 bbd9c354e5f7d5fc2b1eb3d40a5aa21f31ea750417b0ee5531104d1acba7a88c004070d4cb5e89c3918bd46c459cf9a34c890d5872daa5ecd92314dcfe28c85f
+MISC metadata.xml 418 BLAKE2B 636dfbbd604111ba7c6241fbbc8ba8bd9a4f1f6e30811c9f3788a3624deadf751ad62dca9e24a74f19709900c32530fd3b12363ba288a94d2d94eb9c7e15b6f1 SHA512 298467b69ae7455c096e186061df02c45dd42aa33241ea12bd672a551589dd62a7cf5d2e383a6e94a6ee1332bc29b24f80e4597cbb0771e64b40d3bee5249102
diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
deleted file mode 100644
index 4a7c8cf41e72..000000000000
--- a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Leave default AR as is, https://bugs.gentoo.org/732096
-
-diff -r 419bf3de54e5 CMakeLists.txt
---- a/CMakeLists.txt	Sat Oct 24 19:50:25 2020 +0000
-+++ b/CMakeLists.txt	Sat Oct 24 19:50:53 2020 +0000
-@@ -390,8 +390,6 @@
- 	MESSAGE("Using ar, ranlib, and default linker")
- 	find_program(NON_LTO_AR NAMES ar)
- 	find_program(NON_LTO_RANLIB NAMES ranlib)
--	set(CMAKE_AR "${NON_LTO_AR}" CACHE STRING "Does not support LTO" FORCE)
--	set(CMAKE_RANLIB "${NON_LTO_RANLIB}" CACHE STRING "Does not support LTO" FORCE)
- endif()
- MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB)
- 
diff --git a/games-strategy/wesnoth/metadata.xml b/games-strategy/wesnoth/metadata.xml
index 55f36d0dfad5..42cfc4670216 100644
--- a/games-strategy/wesnoth/metadata.xml
+++ b/games-strategy/wesnoth/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="server">Enable compilation of server</flag>
-    <flag name="fribidi">Support for right-to-left languages</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">wesnoth</remote-id>
diff --git a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
index 12aaafe9867e..17cdd9a055f7 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake flag-o-matic toolchain-funcs xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -64,10 +64,6 @@ src_prepare() {
 
 src_configure() {
 	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
 
 	if use dedicated || use server ; then
 		mycmakeargs=(
@@ -97,7 +93,7 @@ src_configure() {
 src_install() {
 	local DOCS=( README.md changelog.md )
 	cmake_src_install
-	if use dedicated || use server; then
+	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.15.15.ebuild b/games-strategy/wesnoth/wesnoth-1.16.3.ebuild
index c9a69554f398..17cdd9a055f7 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.15.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake flag-o-matic toolchain-funcs xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -14,14 +14,14 @@ LICENSE="GPL-2"
 SLOT="0"
 # uneven minor versions are development versions
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 IUSE="dbus dedicated doc nls server"
 
 RDEPEND="
 	acct-group/wesnoth
 	acct-user/wesnoth
-	>=dev-libs/boost-1.50:=[nls,threads(+),icu]
+	dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
 	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
 	!dedicated? (
 		dev-libs/glib:2
@@ -46,8 +46,6 @@ BDEPEND="
 src_prepare() {
 	cmake_src_prepare
 
-	sed 's@ coroutine@@' -i CMakeLists.txt || die
-	sed '/Boost::coroutine/d' -i src/CMakeLists.txt || die
 	if ! use doc ; then
 		sed -i \
 			-e '/manual/d' \
@@ -66,10 +64,6 @@ src_prepare() {
 
 src_configure() {
 	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
 
 	if use dedicated || use server ; then
 		mycmakeargs=(
@@ -99,8 +93,8 @@ src_configure() {
 src_install() {
 	local DOCS=( README.md changelog.md )
 	cmake_src_install
-	if use dedicated || use server; then
-		rmdir "${ED}/run/wesnothd" || die
+	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.14.14-r1.ebuild b/games-strategy/wesnoth/wesnoth-1.17.5.ebuild
index 4350dcbc1a9b..764fb71cac25 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.17.5.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake flag-o-matic toolchain-funcs xdg
+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"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,12 +16,12 @@ SLOT="0"
 if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
-IUSE="dbus dedicated doc fribidi nls server"
+IUSE="dbus dedicated doc nls server"
 
 RDEPEND="
 	acct-group/wesnoth
 	acct-user/wesnoth
-	>=dev-libs/boost-1.50:=[nls,threads(+),icu]
+	dev-libs/boost:=[bzip2,context,icu,nls,threads(+)]
 	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
 	!dedicated? (
 		dev-libs/glib:2
@@ -29,13 +29,11 @@ RDEPEND="
 		>=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/sdl2-ttf-2.0.12
 		media-libs/libvorbis
 		>=x11-libs/pango-1.22.0
 		>=x11-libs/cairo-1.10.0
 		sys-libs/readline:0=
 		dbus? ( sys-apps/dbus )
-		fribidi? ( dev-libs/fribidi )
 	)"
 DEPEND="${RDEPEND}
 	x11-libs/libX11
@@ -45,10 +43,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/wesnoth-1.14.14-ar.patch"
-)
-
 src_prepare() {
 	cmake_src_prepare
 
@@ -70,10 +64,6 @@ src_prepare() {
 
 src_configure() {
 	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
 
 	if use dedicated || use server ; then
 		mycmakeargs=(
@@ -95,7 +85,6 @@ src_configure() {
 		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
 		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_FRIBIDI="$(usex fribidi)"
 		-DENABLE_STRICT_COMPILATION="OFF"
 		)
 	cmake_src_configure
@@ -104,8 +93,8 @@ src_configure() {
 src_install() {
 	local DOCS=( README.md changelog.md )
 	cmake_src_install
-	if use dedicated || use server; then
-		rmdir "${ED}/run/wesnothd" || die
+	if use dedicated || use server ; then
+		rmdir "${ED}"/run{/wesnothd,} || die
 		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
 	fi
 }