gentoo resync : 14.05.2020

6 files changed, 35 insertions, 8 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 523288d0aa18..a8575c1d147c 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index c317f15d7a08..7f78554a18d1 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -8,5 +8,5 @@ DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed
 DIST ultrastar-songs-libre-3.zip 5289866 BLAKE2B 2c3fc640ad808b12987e9b50510df644ab8dd1ae41a4b9e5056950c7aa1823678a4b568a60a260b93a4bdf06f199fac1b99bd22e4e39301bf34f337c08d68b69 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66
 DIST ultrastar-songs-restricted-3.zip 10242651 BLAKE2B de923f72bdd3081f2870457fd734ae2f8c11a84a74344af165aa5c6cf7b812c98fd53b3ab18ac9ac51f488fbf3fe274289205724c9f8547a31245536bea3c6b1 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8
 DIST ultrastar-songs-shearer-1.zip 50411551 BLAKE2B b91896197b6750dce6998ad309a9aca42aaf11b48c92bd1c30a67befcaf4ac64b6c5207f492e0f8588b986033d297a37bc8c9e505baea809591aa3255034fed4 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b
-EBUILD performous-1.1-r1.ebuild 2460 BLAKE2B d51df6439b75bfe14852179a3a4b54cc114887c2bb5ed3e75f94c7fce209705f2553e17d6231e30051e084e277e4e434dd524016ed223db4ea8043c1c8b875f5 SHA512 f7ba83837744e0a34ab55a58a8d2299636be98d7833f5842a34b80b4bd26dd95cf5104c575f191ff0332bd9110453a49b21b24b9ecf9a47a6a073ceff39aeb1f
+EBUILD performous-1.1-r2.ebuild 2464 BLAKE2B 834c8cb5933de793e3a74ba0534faf56ac404f2b6d8cde2d1cbc8ff622e4c8cee030156ce10e5b275c095e4a7f7259ab42eedc667c66b5f94f09e49c3e6f523a SHA512 1df98adeea374e069f6e568b292367805e3e75d7375ab55cd1e168b0295f0dd4aac18ca31fc15d7ecb7232ecc7766f17e1a03742c2361295b05194b0c9c8867b
 MISC metadata.xml 856 BLAKE2B d467d86270f2f571d310ceac4934aea595a62fa9e234e8897ef0b22871df612cdb335e7e3298a0991db6c98b78ea68b04882de8696150d5acb65944d9ff80c3d SHA512 24da96b0da902a2d54d92e2f74d8c57fdd1e84f35b96d416cb15898485f0387c70f3430e21ba7eebd5bc289f76f02695d246746abe7eb041f9f7e2e0e8e1e4e0
diff --git a/games-arcade/performous/performous-1.1-r1.ebuild b/games-arcade/performous/performous-1.1-r2.ebuild
index 7901eeb37e89..5e1eeb5741dd 100644
--- a/games-arcade/performous/performous-1.1-r1.ebuild
+++ b/games-arcade/performous/performous-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,7 @@ RDEPEND="
 	media-libs/libsdl2[joystick,video]
 	media-libs/portaudio
 	sys-libs/zlib
-	virtual/ffmpeg
+	media-video/ffmpeg
 	virtual/glu
 	virtual/jpeg:0
 	virtual/libintl
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index f9174bcba69d..17b5d2823cba 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -2,8 +2,9 @@ AUX supertux-0.5.0-tinygettext.patch 920 BLAKE2B 9558c2df82a03e1893ae10c0f283f25
 AUX supertux-0.6.0-icon.patch 531 BLAKE2B ffe235acd0ebaac3ecb2588d195496ac2ea34a906874e01fead00df73b6b9e694aa92d335bf3e69c42e4f773c3bfdd8c7a191d8610e400381e102a82a10357d2 SHA512 c1ec17a90100fb12d52561e028366264e6588e08fa1af1ace0438ebc4c2ea8b783c8720d47a9bf43e907ea8fcc3c6a91c510a221ac9c488234205a18ec567b6e
 AUX supertux-0.6.0-license.patch 696 BLAKE2B 76ba58368ce9c02ce66f2a51f54e6c95ede9058130dc54e9560ad060f69806623ea6496a3cb89d823cfbae8d84ce00e4da19eb38e60519f48726a083a3633b76 SHA512 8b4baf774be6625ff253614bb68436ddc26149722af7acea0a4f0772d496c6b30013a22fd3777b11275bd901128caf11b968a37b6a7b99ab344bac78309a6e8e
 AUX supertux-0.6.0-obstack.patch 1063 BLAKE2B ab251d7514f38a8a641e680df6c69bea88b8cfb360fc93b7e91a5274ca20e0ef4210429f8ab0694cd5c3e9eee89c6ee955b54a20dd04b11cb385bccc5bb6be6c SHA512 32da8175888fca98b76640739aa531fbfcc132dbce0a89e76be49bca29bc5878266c702e5f4c7499ddd0473804b344c62d03f39f6b14941f0e669e20d2c2241d
-DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59 SHA512 7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
+AUX supertux-0.6.2_rc1-boost-1.73.patch 613 BLAKE2B 1eafd4033ecd9ae48c8486572062021bce26beddf83bf6d9a83084d04abe47f6b3bd87134112ef8039f8fd97733c7fe18d0d17e8980b07ed683a850110722e35 SHA512 d7a389fe530da2c7a42210cd25331e18952b2c5260e777e39efe6efe797f27c9eac5a120351db8a7ee275079e832b9822ae3ecd10650030f0f8bb1852cf4c8e5
 DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866 SHA512 9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
-EBUILD supertux-0.6.0.ebuild 1438 BLAKE2B a7c3ff666020b4f8cc919b6f03ba595528288239cb9e85dbd1410b7f3ff95e3a7f05123b2d9db3fff98610be3ab04829b4edddb3e84d2f2429f5a3a6c8ff0f92 SHA512 895e3faff9861ccbf85ee7a20f744c07048cbad8c89394ff5779c80a7fb3efa4655d2155a3365dd8e0d9ef9ebf8d3cbf0dd147ec9b93028cdeebf1c0abf8faf4
+DIST SuperTux-v0.6.2-rc.1-Source.tar.gz 172372034 BLAKE2B cd0825ba957bb8d3114ffefa623b32fce55467aef6ae2455fc3b7bf78ceeb58797a8ff7b2e920376e9ee1b7412ff3b5f7a9f238e2da8a9d99d9bf659d51d2ec4 SHA512 cc33e6340bbe0a7cc8f9bf11ebcecdf50e08d224de73837f5a34d67b7b4b739b1e9d148553198208cb097651d923696a28351c4ea40eaca7166b51657bb45113
 EBUILD supertux-0.6.1.1.ebuild 1358 BLAKE2B 210189a07f9766cb6fd3f51f07a595dbbde42e55537c1dc6b954b62bb55fa7a36d5b9d7dc34196c6a69559c78d8eea03f17ef798332bdc0945653de4194e3052 SHA512 b7c0107970b68e011a678b63fae9fc827a6c7a6391575cf241c2e74550f065312adfbefd6684e0ad6584566764a16d9060ab9b089aed074024bcbfc7b44693fd
+EBUILD supertux-0.6.2_rc1.ebuild 1435 BLAKE2B 2b36b593476910d5a82946299451486f138da99341acb1b32ccf764a2e7a6659867a51d41baf26319952a15c853b7c3242202d8a580e5390d1a9edc36fbb1907 SHA512 b73be27696a4112ccabbccccfe2d1d14f78c95ecc995756b17a767ba0de5f177b1871463a385c6db878d951e64b5072c6b36d912c22ed541fb5e96ccd0326735
 MISC metadata.xml 389 BLAKE2B 960cbba61ef7e12c35b66f36620ba2570e159517b06a520b0c233496c0910b2949f4f87b789f3c948621b6beb2ba0a4d5e8bdb277516213cbbc115d31af58698 SHA512 e61b89a6c0da8bf74f2b126e185fbf4be02b7ac7bc80082bd4c6e80384ab00db73a196af1ed9448a31435dbb62768b7eee8c8e64a40c51a6257bffe8170deb65
diff --git a/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch b/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
new file mode 100644
index 000000000000..55fa95b70fb4
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.2_rc1-boost-1.73.patch
@@ -0,0 +1,25 @@
+From dec7fb943c532f855e5c0ae2eb39d2d82a46a506 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sat, 9 May 2020 03:04:02 +0200
+Subject: [PATCH] Fix build with boost-1.73
+
+---
+ src/editor/object_settings.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/editor/object_settings.hpp b/src/editor/object_settings.hpp
+index bc9049a94..15b77b1e4 100644
+--- a/src/editor/object_settings.hpp
++++ b/src/editor/object_settings.hpp
+@@ -22,6 +22,8 @@
+ 
+ #include "editor/object_option.hpp"
+ 
++#include <algorithm>
++
+ class Color;
+ enum class Direction;
+ enum class WalkMode;
+-- 
+2.26.2
+
diff --git a/games-arcade/supertux/supertux-0.6.0.ebuild b/games-arcade/supertux/supertux-0.6.2_rc1.ebuild
index 16d3cbb706a9..be67a6a7509f 100644
--- a/games-arcade/supertux/supertux-0.6.0.ebuild
+++ b/games-arcade/supertux/supertux-0.6.2_rc1.ebuild
@@ -6,11 +6,12 @@ EAPI=7
 : ${CMAKE_MAKEFILE_GENERATOR:=emake}
 inherit cmake flag-o-matic
 
-MY_P="SuperTux-v${PV}-Source"
+MY_PV="${PV/_rc/-rc.}"
+MY_P="SuperTux-v${MY_PV}-Source"
 
 DESCRIPTION="A game similar to Super Mario Bros."
 HOMEPAGE="https://supertux.org/"
-SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
 SLOT="0"
@@ -34,6 +35,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
 	"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+	"${FILESDIR}"/${PN}-0.6.2_rc1-boost-1.73.patch
 )
 
 src_prepare() {
@@ -53,7 +55,6 @@ src_configure() {
 		-DINSTALL_SUBDIR_DOC=share/doc/${PF}
 		-DINSTALL_SUBDIR_SHARE=share/${PN}2
 		-DENABLE_SQDBG="$(usex debug)"
-		-DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
 		-DUSE_SYSTEM_PHYSFS=ON
 	)
 	cmake_src_configure