gentoo resync : 14.05.2020

7 files changed, 6 insertions, 33 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index bb72fa6a83b7..b7d1fc5abd15 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 7e17a283580b..039ff9e2424f 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,6 +1,6 @@
 AUX freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch 1030 BLAKE2B d0b4a58e85fd878fc5d332ca0f552889aff752fd8198f66d217cc54aad1ddb83cf24108d978bd0155b13a6db9d7f11f35f2b76f76456acd9ab38b1e28dbc5332 SHA512 ffd493373ccb0051aa2b41d0bd740865fa13db3ed50fbf95e83c6d97fe81e3ff04c24e865d73b011dbd0085c45a0b1a915c62eaa103ecf29a3264030d1d9ae4e
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
 DIST freeorion-0.4.9_p20200409.tar.gz 124663848 BLAKE2B 7468a386829498c9ca971e686bda216002b6f263fbc0f3784e7898854ad91278441579c1a3e0d1ef2d92b46747d14a17463e46d7ba16f06633e9a5d474ce3b9c SHA512 09fe8db818c3f22bac94577461d9ada082a2c8365cb524948bf13650ea368fcc55043f4df2f9701075011c890a08197e7f7bb13d8884cb41cc8e1346b8538345
-EBUILD freeorion-0.4.9_p20200409.ebuild 1659 BLAKE2B 4ac8aaffea568c30bd0bb3dcf8e664f72e7baa9de32b4ee7958635eb3d1b410a1a679aea9d9df514fcea098130212f0a1c985469ef82cb26c51f199757149c1c SHA512 c3f055bc27735e31a9fb1f54b2abcb85505cd6fbb683cff70716256cede43cc408e70b13ef21eafacd833fa57c8a2d0fb16c9cd17fe9c7f76fb8262cbea6a6ac
+EBUILD freeorion-0.4.9_p20200409-r1.ebuild 1663 BLAKE2B fb14a6e5665df5714126609d25c91d4caf34e5f6b602472b72a070c58f548a4d64c1876b7e9060edce0df5f2fcd7c4fdd2a0b915a6830e9de628f0a5e45b4091 SHA512 c8db259b18db09ae42b4fe2f2b2f2eb6ed08a219563d8a2fa03c5516c4762f16ea6b9e9c8805ca7df7c9767642e759adc484785db6a18cd01c1f5a1069f6fc7b
 EBUILD freeorion-9999.ebuild 1659 BLAKE2B 4ac8aaffea568c30bd0bb3dcf8e664f72e7baa9de32b4ee7958635eb3d1b410a1a679aea9d9df514fcea098130212f0a1c985469ef82cb26c51f199757149c1c SHA512 c3f055bc27735e31a9fb1f54b2abcb85505cd6fbb683cff70716256cede43cc408e70b13ef21eafacd833fa57c8a2d0fb16c9cd17fe9c7f76fb8262cbea6a6ac
 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild b/games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild
index 048d1b8bf695..c1efcaa3e7c0 100644
--- a/games-strategy/freeorion/freeorion-0.4.9_p20200409.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.67:=[python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.67:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index b31ddd670f39..ec2c5a74cbe7 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,4 +1,4 @@
 AUX hedgewars-1.0.0-qt-5.15.patch 328 BLAKE2B 9304e4e1811e2aab876b5a6c3edea584c3271c5531035bfb2a53369000a30c61264464df655396146a26e08750ee29ffd9eb25aca8f89fa91409247b69675ad1 SHA512 f45985e878c9380f4bdcf755a79f1c906bdc6a8fa243faaa15f1c73b50d7b619c461821271ae151076f631ca0aecae31ddbe00d3d97945f13afc94610e216856
 DIST hedgewars-src-1.0.0.tar.bz2 177668452 BLAKE2B cbd99a4403b911023fb4a522ed1ed04272f07705321585b0e7a8f56785ef11bf8c654df95016b0af94f603c387f73804cbd95e13a92e875990adf5fec149e334 SHA512 9aeb904550239040a878a0e7ae5006aa4d824124b61d813b9e6f6dfe1bd1c8f5fe395e0fd6e58d685ef1259abd4669e03b985be129c620be15f6e5ad82519ec2
-EBUILD hedgewars-1.0.0-r1.ebuild 2665 BLAKE2B c44898196e28979c31bd9c2040fc0b65a283bde191265baa638eafd0b3efed0985e6de31352ad4943823e217bd670e1d7f8ccf548d38386f86e0373c1141565f SHA512 f00022485830c72b57b844f4400bde8cb3837b5448d84a3489c0b8e5ce6caa3101162c6ce03c2382891e72938454e3d7b3beda786e68f5509352c681e1290281
+EBUILD hedgewars-1.0.0-r1.ebuild 2613 BLAKE2B e8c230cc14735fceaab5689c2573d8896f1e84662fe1c1cfc65bb9a7d36b49d323c9930eaafbf7e96656463de23d11abce955d2f58227013e438b1cfc0a0c46a SHA512 dafaf4ab6fa9c06e3d0f7f367e9a9ea13e1341f15fa43cace46a473f558122cfa21b6d1c9e279b8119b508a39613aa827271b44959c9e664c95ed4dca9d9ce04
 MISC metadata.xml 310 BLAKE2B 0893b58ddb3ed4a4d6a73bd5cc4d31558d185953ea37fd15f9e067804b8fd4aad9021666f35feabe695fc34df502f1c1c814e52b717fdb26a5f419c07e5696a0 SHA512 aab3f53bd107c152983576ef65b7021002724f73e0a8cbda391284347eff3eb8d8489cb26fae34512e3a58bc9529903c05f41c1277e25af155215308b3da462b
diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
index b904224542e6..95f4eb1d7eb5 100644
--- a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2"
 LICENSE="GPL-2 Apache-2.0 FDL-1.3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libav server"
+IUSE="server"
 
 QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
 QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
@@ -35,10 +35,8 @@ DEPEND="
 	media-libs/sdl2-net:=
 	media-libs/sdl2-ttf:=
 	sys-libs/zlib
-	!x86? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)"
+	!x86? ( media-video/ffmpeg:= )
+	"
 RDEPEND="${DEPEND}
 	app-arch/xz-utils
 	>=media-fonts/dejavu-2.28
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 3d2fa8715de9..03fdc4103215 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,4 +1,3 @@
-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.11.tar.gz 500178610 BLAKE2B 27af594bc86845eedb8cd8e45c814c3583e35bd94942947f91b6fa888018ae203dbd100e01ab26b5cd59712895151049105ff446d8ad3a8b2d86133d913a92cc SHA512 3c878f679e51d3657dd4d76205bdeadd6a1a95d0771cd7ab0e29f33f36e32f1963e4a96f4529dbc4b860183b3cb5a4219e86108e0e26194b8a32d3d08a5fd469
 DIST wesnoth-1.14.9.tar.gz 497393449 BLAKE2B b5235de6ce84164ef97a105339549a8a1009d7b7ed243ae355994610e56afc584b8a37b1275e0b929729a24cd2eb94d4c208e7bd22e79b76113a1e1b91c8f92d SHA512 b3e93956a40ffc48dd02e118be1d46854a2eed34ad0dca3fb34a28d0b58b4b563cb5cca588208f3525300bf075786bebe95a25c045c8098a0bdfe531a2d81e4f
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
deleted file mode 100644
index 90c526789c51..000000000000
--- a/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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));
- }
-