gentoo resync : 25.11.2020

5 files changed, 25 insertions, 121 deletions

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 5639050a7b5b..f390a0efab42 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,8 +1,7 @@
+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.13.tar.gz 502959933 BLAKE2B 48f2e4340e9ae015c2e45f75f419ddfbb95a436a4ffbebbe417fdcf322e162ed0ad799680757adb88e19cba717cc48ec0e3d83c4c170e3502fea7be73a39a0c7 SHA512 ee1b7a93e2ae49698ec185cf6385cd93a49116315ebdec474bd5d5b73ab6af59db92ee5621fab68581edd81c74d8584237d5068fd30362054377d84a3dcb5ea0
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024 SHA512 3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
 DIST wesnoth-1.15.4.tar.gz 500087559 BLAKE2B bb46766369cfcb1432b5b5e8df62636e2a45ff45bf3ec4381aa9e73b20a4a5a6e196f0355b10d2b86ffad608cfdd24f8d2fad21061db9b18f1a2decf11b0e466 SHA512 b209e584a187934b0ca3808cb870f4703b49edd5de357b6a6b01bdad2c71b8d755b81d3628c5281cd19f82ee8d030716d6bf64a806e6636426949b0a3d85ee9d
-EBUILD wesnoth-1.14.13.ebuild 2563 BLAKE2B 86fd39282046e0bccf76a23e341e0a96b5f991d44cae79f2e1d4eec898aae187d02e08f5a3765e70069ceabad69db4befd0b2dd39488e4d6147a6cc2c0153aa4 SHA512 9dbeca625bf5b13aa2d1978b7aece2c01501b07fa84a51c8811b203ba4583bf223ad61082b188923f3a328739cdd0ac771b1ea080cee41f4c4cfd0409e3a344d
-EBUILD wesnoth-1.14.14.ebuild 2563 BLAKE2B 86fd39282046e0bccf76a23e341e0a96b5f991d44cae79f2e1d4eec898aae187d02e08f5a3765e70069ceabad69db4befd0b2dd39488e4d6147a6cc2c0153aa4 SHA512 9dbeca625bf5b13aa2d1978b7aece2c01501b07fa84a51c8811b203ba4583bf223ad61082b188923f3a328739cdd0ac771b1ea080cee41f4c4cfd0409e3a344d
-EBUILD wesnoth-1.15.4.ebuild 2563 BLAKE2B 86fd39282046e0bccf76a23e341e0a96b5f991d44cae79f2e1d4eec898aae187d02e08f5a3765e70069ceabad69db4befd0b2dd39488e4d6147a6cc2c0153aa4 SHA512 9dbeca625bf5b13aa2d1978b7aece2c01501b07fa84a51c8811b203ba4583bf223ad61082b188923f3a328739cdd0ac771b1ea080cee41f4c4cfd0409e3a344d
+EBUILD wesnoth-1.14.14.ebuild 2570 BLAKE2B 0ba8ec3c027da454e679f166b7f35ee2faae15c60da9739c2eba13aad850aa7989d0e47e9f120ffd0f3c7c08b7c735ad45733e63ede211adaea7dc49a7a2f69f SHA512 2b32bf85157098d8c49644f8629a07248998e7075e0d83cb1b9606f1b082c94bbaf7b488a994a58f65d482d1af00c667fa3dd4a21a61f310ed153d2a77a1ef0d
+EBUILD wesnoth-1.15.4.ebuild 2570 BLAKE2B 0ba8ec3c027da454e679f166b7f35ee2faae15c60da9739c2eba13aad850aa7989d0e47e9f120ffd0f3c7c08b7c735ad45733e63ede211adaea7dc49a7a2f69f SHA512 2b32bf85157098d8c49644f8629a07248998e7075e0d83cb1b9606f1b082c94bbaf7b488a994a58f65d482d1af00c667fa3dd4a21a61f310ed153d2a77a1ef0d
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
new file mode 100644
index 000000000000..4a7c8cf41e72
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
@@ -0,0 +1,14 @@
+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/wesnoth-1.14.13.ebuild b/games-strategy/wesnoth/wesnoth-1.14.13.ebuild
deleted file mode 100644
index 407e3840468a..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.14.13.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs 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 ~x86"
-fi
-IUSE="dbus dedicated doc fribidi libressl nls server"
-
-RDEPEND="
-	acct-group/wesnoth
-	acct-user/wesnoth
-	>=dev-libs/boost-1.50:=[nls,threads,icu]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-	!dedicated? (
-		dev-libs/glib:2
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl: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/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
-"
-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 [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-
-	# Work around eclass
-	append-flags -UNDEBUG
-
-	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_FRIBIDI="$(usex fribidi)"
-		-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.14.14.ebuild b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
index 407e3840468a..4d50bca27254 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/wesnoth-1.14.14-ar.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -72,9 +76,6 @@ src_configure() {
 		append-flags -fno-stack-protector
 	fi
 
-	# Work around eclass
-	append-flags -UNDEBUG
-
 	if use dedicated || use server ; then
 		mycmakeargs=(
 			-DENABLE_CAMPAIGN_SERVER="ON"
diff --git a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
index 407e3840468a..4d50bca27254 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/wesnoth-1.14.14-ar.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -72,9 +76,6 @@ src_configure() {
 		append-flags -fno-stack-protector
 	fi
 
-	# Work around eclass
-	append-flags -UNDEBUG
-
 	if use dedicated || use server ; then
 		mycmakeargs=(
 			-DENABLE_CAMPAIGN_SERVER="ON"