gentoo resync : 02.08.2019

10 files changed, 208 insertions, 52 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 5d221b704c49..0ae50030b800 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 01f629e05553..1050b3936f30 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,11 +1,11 @@
 AUX scorched3d-44-fix-c++14.patch 566 BLAKE2B 0924707c4da94b1ca088b46db19e145191708d38be6f848cdeec5a84a1f90002736d40ed3e95b8e836580adb496d5fbb0f247f31df991a28c797842086cca01e SHA512 f74db569f471e1ac24fe6dfa15c319ac6dce52a6b35d333efb314b59156b150e7a09c843e7046d804a4768eea294671546313043c46bc38ac5e951d1daa1c23d
 AUX scorched3d-44-fixups.patch 717 BLAKE2B 24af35bbc6d1070d08282e4915d4575f1d0783a49d542a3d7aca45ad91ac8ab8378a0a48d19e7e593d71e39882ea1964a1686d6f4fbcacedb00cbc26f8e68d65 SHA512 8045df51e6a09d9101d971056edc77e03694b2872819cd892d1239c04ad5c59afa8a60adc2ca04a63a5d501bbb113221408522a33159eee836e600bb2b8d40c7
-AUX scorched3d-44-freetype.patch 1372 BLAKE2B a2b5f4551ae2d64c8a35cf9f305c3ff67b62d0cf5bf939b2c2a450fa347d6f39d6bc240346ee3deda98b8c3b87053a6fbcc22125c5ba0c63d149c64ab7194775 SHA512 98688db48920b32aa87aeb9fbfb245f18ebc0f5b2a92a341ffd49ad94fc10e6bee4ee5864e15497e7617467759cc1fe809887e107d881b199965f5b22045bfc9
+AUX scorched3d-44-freetype.patch 715 BLAKE2B e3eba5c6d3d606db4d8e6055b79dc4afea648a07df75a4dde475ebc86e10247ddf600284b2ee7c404f3afe0d9e376631f9bbf2ad81d75e263b8f3d5c7b447572 SHA512 a1718b97a039282481e8ebdda5a9bc61de91b9a3a34002969e891c2db43872cd85742426150d988db176a4a17f557a42925042d77b78264b7794c7719c6791f5
 AUX scorched3d-44-gcc43.patch 561 BLAKE2B 4fb787d19161ecb21b40f0636288d521af62d281bfe9af7408761851f3f527e0645d0c698f42b47765743f72d2d07d85b45d32875182c6febe1b38e0862b3e45 SHA512 c00bfcf2feb7d740e4fc4337a5577962a198d56296bae68a96902046f78fd29856d83b57f309ea9c61d36d4a767e76ae101639a8ed786c5451b440b5a0d908c1
 AUX scorched3d-44-jpeg9.patch 614 BLAKE2B de7f71778be9530801a6f764d64f6020a260c9cef328dbf0481f9a486f50211879db981fffc54ec4fa67309a365fa8f1e712be28b72514dc69473c23c7b422e5 SHA512 8adb3bd124b11b006d8124e57fc506e8dc56415c89cca70440901cef7aa547f241d100c42281345fd489c95f9e8eb105d5e5de5ef18382087e203877cc8f6ca4
 AUX scorched3d-44-odbc.patch 503 BLAKE2B 90c212fd77732bad90d5455e967cbc18f3e28c6352637e6325dd9c3ae91e9e86d759dac66d1054a75a84ddfa827fb5b80aa4483d90e77782a5632ad4bc29fdd6 SHA512 8bf3e3f9a91502a7c84be73a73e0909c09b050266fb2c6847be2cca13b1a368697dd70c373b6bbce4b12ba97241b2d577cce3604640b4182b2be223d009a4f6e
 AUX scorched3d-44-win32.patch 464 BLAKE2B 51362a695212dd8d37013c1b4a11d77fb1b8564b54e3ec9ce3e0165ee83e42d65883dc3df964180d975885a555b1ae02e87fc20cc3c85d4507308110ee7cf810 SHA512 992224f65f80527276c0b6e139ea44c6c29a2fbfa3a0af78e2f2366897dbd51e9988b065aa21ac95cf9b1a0efc8866e2e45646e1851f8afd195651b3c47a81dd
 AUX scorched3d-44-wxgtk.patch 7001 BLAKE2B b120e1cc12343fa5be2e4348930d2656eb2c727224a8e9e63f00dfb4da71888918d3fcccc1a9a439737ce2f6fbe6224be06d4801b4cb857ad1e4765d2c444e4e SHA512 99e21ff6854bbea676c8ea0a5ef2b28a4d6020b34fbae134d9346d4febb7b6defbd39cb712f29b3dcff7ac829b2e76275a85d7d740e921835898f550c4471120
 DIST Scorched3D-44-src.tar.gz 41689613 BLAKE2B 61f5536ad6e9dedeb0e778f90d73aa918f890632385278d4d788a43f1e199e817d6199f923c264dadbe8084fa53c32968b599c9b08784de0d5752069f9bed818 SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca
-EBUILD scorched3d-44-r2.ebuild 2310 BLAKE2B 3826272ff4fe72b696980b08102036a1bd87e4bbd1da35fa5d64abf39f86b14dec6c11fa8169393edb8e6935a10f91e76677a3a4fc8ab164fa9445a38326a06b SHA512 239d20d7d6125eb299c9e88a7d69feafbce593190daf724539bf846cc1dd4de13df6be9e8b8d02f59e4d2ad601310b7b37ef31e55d51909c4e245f5b30ccd74f
+EBUILD scorched3d-44-r2.ebuild 2301 BLAKE2B ff038355d46948eef5702741babf7e15932295f04889757c4543ce8c8fd7cf8cfcd4cd59821796f82891c9b82a088f50cb800f02ed33b72ce3de4c94a113bd01 SHA512 fbc910fdc1ab6385ca6f8e1f5a6ccabb4c845d041aea151e98644b26c8e190426057eff38f8fe91a9089d25ffa61d5a1eb82fdb3e19159b9857908f43ba52bdb
 MISC metadata.xml 333 BLAKE2B da791c5728d5a17950492280dcf23b0543b6c444885f852b491a8eaa65f2befcd755470183e8084034a16fb6507b073b2de91afdb00d4db2eaca68077495daa8 SHA512 91b1e0f50ec4635e81ee904179228d25b8168bf74d00eacb734365514e43e681879c121cc2f60302b446367b8b6fb388842e28890719f6785fb5bf389f638171
diff --git a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
index e4717972d81a..37aa0436eb4a 100644
--- a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
+++ b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
@@ -1,45 +1,20 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -437,7 +437,7 @@
-    if test "$FT2_CONFIG" = "no" ; then
-      no_ft=yes
-    else
--     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-+     FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG $ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`"
-      FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
-      ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
-        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
---- a/src/client/GLEXT/GLFont2dFreeType.h
-+++ b/src/client/GLEXT/GLFont2dFreeType.h
-@@ -23,10 +23,10 @@
- 

- #include <GLEXT/GLFont2dStorage.h>

- #include <ft2build.h>

--#include <freetype/freetype.h>

--#include <freetype/ftglyph.h>

--#include <freetype/ftoutln.h>

--#include <freetype/fttrigon.h>

-+#include <freetype.h>

-+#include <ftglyph.h>

-+#include <ftoutln.h>

-+#include <fttrigon.h>

- #include <string>

- 

- class GLFont2dFreeType

---- a/src/launcher/wxdialogs/TrueTypeFont.h
-+++ b/src/launcher/wxdialogs/TrueTypeFont.h
-@@ -25,10 +25,10 @@
- #include <wx/image.h>

- #include <ft2build.h>

- #include <string>

--#include <freetype/freetype.h>

--#include <freetype/ftglyph.h>

--#include <freetype/ftoutln.h>

--#include <freetype/fttrigon.h>

-+#include <freetype.h>

-+#include <ftglyph.h>

-+#include <ftoutln.h>

-+#include <fttrigon.h>

- 

- class TrueTypeFont

- {

+diff --git a/configure-ft.m4 b/configure-ft.m4
+index d27678ca..ce369bf4 100644
+--- a/configure-ft.m4
++++ b/configure-ft.m4
+@@ -1,14 +1,2 @@
+ dnl Check for FreeType2
+-AC_CHECK_FT2(7.0.1, ftype=1)
+-if test "$ftype" != 1; then
+-	AC_MSG_ERROR([
+-		FreeType2 must be installed on your system
+-		but freetype-config couldn't be found.
+-		Please check that freetype-config is in the path, the directory
+-		where the freetype libraries are installed (returned by
+-		'freetype-config --libs' command) is in LD_LIBRARY_PATH or
+-                equivalent variable and freetype version is 7.0.1 or above
+-                Try http://www.freetype.org to download freetype.
+-	])
+-fi
+-
++PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1)
diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
index 6cd098e970d6..384864e070c0 100644
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -85,9 +85,9 @@ src_install() {
 
 	# remove bundled fonts
 	rm "${ED%/}"/usr/share/${PN}/data/fonts/* || die
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf
+	dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf
+	dosym ../../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf
+	dosym ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf
 
 	if ! use dedicated; then
 		newicon data/images/tank-old.bmp ${PN}.bmp
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 2f2136539571..bdfcf44a4714 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,5 +1,8 @@
+AUX warzone2100-3.3.0_beta1-gettext_version.patch 1166 BLAKE2B f90e299a287698b1b4c84dd6aa44166a151e737843cac2099ba8051c02e2001a473dc21dc4c97aa1eb7908d13e48abdff59cfec0f4adf4814823dcc403e0a4c5 SHA512 70bdd3446913e982ac6592c243d2c8976103c893a79762993aa665a3e65b821f30c6e41d7e48eaeec2df8971ba6bfc412b0e72493bae979e493823907eab67d2
 DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc55bf031579c8e9cb0b1b159e4fb1f9e8aa63bfcc6985e91cb2667149e7cc4b354bf96726fc6b8f8a8f519375e0a88c4be21dcb69 SHA512 766698c25c02b4254424efdafb8aa7b37360c3c05d3cd2d6c7f9127cbdd6a25840f98e8e3aadd5d6af494b4632584e564214c1f20c0bd74eb637da305552e067
 DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
+DIST warzone2100-3.3.0_beta1.tar.xz 85916776 BLAKE2B ec94e6fafff103e014e063f554b6a40411577d9c415733eb7857c4cd470195f1ab9878c2d5afd6c154e1f058c2f2a645a46738518d307da42ae97e0898fdf75a SHA512 17e9d81e7eadc71ad285147ff76517a92e8ea8747a05a6a08373d994725efa6bae11f87cd6bc9068cbfd78aa24d26fea95929c65a0906d03605b96469d972f4a
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
 EBUILD warzone2100-3.2.3.ebuild 2609 BLAKE2B 05ae8aea178cb29c3776e5c0fcab5ba4442765ec76766689bc35f5cfc23c51bb7524f2dc6b12abdd07e77e87688f74fa13d8fbb705f7a76a7f3acea95b7151ea SHA512 9dcc1c4b6b095ee4ef895abf5b3a5a5d1c4d1e5c371baeced194a2592304aaf71b005a6ecdc0443d0b32f3cfb7998897f6c63d5cf909f5855f0127e91920294c
+EBUILD warzone2100-3.3.0_beta1.ebuild 2388 BLAKE2B 1e8904a8bc1e994cf1ae7d65533b0910aab94e9cda6074d2c73e05cebd7dc655ee2a366da738d5c5afcf5b286c9669fed42b842f72935c71356bf18f3e26c3dc SHA512 1014b871cf4eb60e72066bf6e3b7faed0fbfd759501f50d457efcaa7e839c7a68196ca75ecbe349ff11a0bfdb7de0c37d12c092e14d3514494ba2e6f991f5e10
 MISC metadata.xml 674 BLAKE2B b0c40e88934cfbdbcbb7ffdbc277abcc3da3400de71f7508af51301f7ec5b6e00083ff2b59f59f7435a8e3f588291d7e5dbde19fa193b6fc78677b842cfb44ee SHA512 00aa4a109f41a0469e2b0e5daadcd33f9f3b255fdd2a724b7d116912ecb0b5fa4eb5e0dd7e4ae3e45f00c062c1034aa7d40143e48da0e66bab48da3d4e047dcc
diff --git a/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch b/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch
new file mode 100644
index 000000000000..2d4b6c50a485
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch
@@ -0,0 +1,36 @@
+From 5539b080824bd4bcd0f212829012993ef193dc41 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 1 Aug 2019 04:53:14 +0200
+Subject: [PATCH] configure.ac: Raise AM_GNU_GETTEXT_VERSION to 0.17
+
+the shipped copy of po/Makefile.in.in comes from gettext-0.17 and since
+m4/po.m4 has been changed to use AC_PROG_MKDIR_P (Trac ticket #4701)
+autopoint from gettext would produce a broken po/Makefile.in.in which has
+no MKDIR_P definition. This again would result in "make install" throwing
+the following error when invoking install-data-yes target in /po/ dir:
+
+  make[1]: execvp: /usr/share: Permission denied
+
+Raising AM_GNU_GETTEXT_VERSION fixes the described issue.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7e9c31433..30a732447 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,7 +71,7 @@ AC_CHECK_HEADERS(alloca.h sys/ucontext.h)
+ 
+ # Check for gettext
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.15])
++AM_GNU_GETTEXT_VERSION([0.17])
+ 
+ # Check for pkg-config
+ PKG_PROG_PKG_CONFIG
+-- 
+2.22.0
+
diff --git a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild b/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
new file mode 100644
index 000000000000..fddc09013785
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs xdg
+
+MY_PV=$(ver_cut 1-2)
+VIDEOS_PV=2.2
+VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="http://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
+	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
+SLOT="0"
+#[[ "${PV}" == *_beta* ]] || \
+KEYWORDS="~amd64 ~x86"
+# upstream requested debug support
+IUSE="debug nls videos"
+
+# TODO: unbundle miniupnpc and quesoglc
+# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
+CDEPEND="
+	>=dev-games/physfs-2[zip]
+	dev-libs/openssl:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/freetype:2
+	media-libs/glew:=
+	media-libs/harfbuzz
+	media-libs/libogg
+	media-libs/libpng:0
+	media-libs/libsdl2[opengl,video,X]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/openal
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXrandr
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${CDEPEND}
+	dev-libs/fribidi
+	media-libs/fontconfig
+"
+RDEPEND="
+	${CDEPEND}
+	media-fonts/dejavu
+"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.0_beta1-gettext_version.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+	sed '/appdata\.xml/d' -i icons/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localedir="${EPREFIX}"/usr/share/locale
+		--with-distributor="Gentoo ${PF}"
+		--with-icondir="${EPREFIX}"/usr/share/icons/hicolor/128x128/apps
+		--with-applicationdir="${EPREFIX}"/usr/share/applications
+		$(use_enable debug debug relaxed)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local HTML_DOCS=( doc/quickstartguide.html )
+	default
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+	if use videos ; then
+		insinto /usr/share/${PN}
+		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+	fi
+	doman doc/warzone2100.6
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index ce1b5473ddd6..d0f7b724a36c 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,6 +1,7 @@
+AUX wesnoth-1.14.7-boost-1.70.patch 914 BLAKE2B a5e4a48eb7c5ee75fb23348a396f86b8ca754f7fec1b4f4eac42e31b5956cfb56c43d6b70cdf91d12b22ad70508d3142e3f94965ae432ada1dfa7fd4931e43bb SHA512 5c37986c12ece8b11301bbf69e3b7111bf50da91157c066f954f9bf7062fe064fa7ddc9e858fa3c1413bfeb13f29a4cce63a45676c662a3d7de9e4331b88701e
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.14.6.tar.gz 491891860 BLAKE2B e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3 SHA512 f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096
 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a SHA512 dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b
 EBUILD wesnoth-1.14.6.ebuild 2682 BLAKE2B 6d395a57de1c5244a68cef436135b15d0fbde4502437d688bc3acec6bfd2106dcdb1f89388975f7f34b44d48e7e2fb6f3d8570b14e44ad65bf9a55d12aaa6bb6 SHA512 e372ea2192d70c90c8000755580b64f5b127e6f27c765c42e2d8ef7ca7dc6becc6658404ed037d4c99581883a98dcb4a3fb23f24ce1da6d13b171fcffe0320de
-EBUILD wesnoth-1.14.7.ebuild 2682 BLAKE2B 6d395a57de1c5244a68cef436135b15d0fbde4502437d688bc3acec6bfd2106dcdb1f89388975f7f34b44d48e7e2fb6f3d8570b14e44ad65bf9a55d12aaa6bb6 SHA512 e372ea2192d70c90c8000755580b64f5b127e6f27c765c42e2d8ef7ca7dc6becc6658404ed037d4c99581883a98dcb4a3fb23f24ce1da6d13b171fcffe0320de
+EBUILD wesnoth-1.14.7.ebuild 2731 BLAKE2B dbb292c86d40fe75acb4668ad1a4afa8794b338a59de45c7c44efc296ea9c7982d178f1e943629d9a4e14038ef19503a24b394956e25a6a079488fefafb4919f SHA512 104d6de80ffd977b0591999dc089e200242969ebbc15c373a4cde8d5209ace402969f174a928f8ac123ee9c2cfb5ecae426f19bb9e05760acf31dff5a9a5d0c4
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
new file mode 100644
index 000000000000..90c526789c51
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
@@ -0,0 +1,24 @@
+From 9d0e3bae096563297c9f51355968f27a67dbfdec Mon Sep 17 00:00:00 2001
+From: Charles Dang <exodia339@gmail.com>
+Date: Mon, 15 Jul 2019 03:18:31 +1100
+Subject: [PATCH] Removed redundant std::ref causing problems with Boost 1.70
+ (fixes #3990)
+
+The asio socket ctor already takes a reference.
+---
+ src/server/server_base.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/server/server_base.cpp b/src/server/server_base.cpp
+index 82b46e912025..8bcf974a62d1 100644
+--- a/src/server/server_base.cpp
++++ b/src/server/server_base.cpp
+@@ -65,7 +65,7 @@ void server_base::start_server()
+ 
+ void server_base::serve()
+ {
+-	socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(std::ref(io_service_));
++	socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(io_service_);
+ 	acceptor_.async_accept(*socket, std::bind(&server_base::accept_connection, this, _1, socket));
+ }
+ 
diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
index 971ba1f87a94..e0b1b37602ec 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
@@ -40,6 +40,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${P}-boost-1.70.patch )
+
 pkg_setup() {
 	if use openmp; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"