gentoo resync : 10.09.2021

9 files changed, 71 insertions, 30 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 3ed60663da8f..6ff4054de817 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/box2d/Manifest b/games-engines/box2d/Manifest
index 0b364c39eb7f..d9d3fba88aaf 100644
--- a/games-engines/box2d/Manifest
+++ b/games-engines/box2d/Manifest
@@ -1,3 +1,3 @@
 DIST box2d-2.4.1.tar.gz 1224516 BLAKE2B 4f268c082d6c51d574fe6974351a64e98693e7eb71aa36626561fe23cb5fa890c77946e34d91fce92298af7e723c34306dfc6a934251a8566f431821397d1b82 SHA512 d900f925b77906777719c91488bdc5e2df1ad1f4a8ca39a574229f5e57070e3a843bdd7530e817112605fde6d82145c872d8afdfc65b84531a73199098c81162
-EBUILD box2d-2.4.1.ebuild 584 BLAKE2B 0b0396e850a13d9b68bbd5bc1f02784992b05cc2bfa50097ff1f2440fc1fecd692d8c8d26e5f4be1bb5c9882c75e3145a90987e0a431149a3b219952e3ad034c SHA512 1aa00c6c9c29266494577e19e9e13e32f18471e758dbca2abdc366721b4498e9349d101aa009f18400e539f654e619230429cbfaa6ed52c1a9e772468df85aae
+EBUILD box2d-2.4.1.ebuild 656 BLAKE2B 74d322ad4364c8ac318a5cb134f9e0722b93f9effb1353f38c15dfeca811b6c2f7479007a9f686f853253ea6d7f6ac76ed5e33b9d92013611482aafccc6205b9 SHA512 d4486bc80d1e7b39846b9c6147b8e3a3faa6e2d9e00048987f55a411201f20e177365c4a436ab4ea85a8a5e8d40b70c3232620151fc2cd054900b73a9ec10a87
 MISC metadata.xml 333 BLAKE2B 8744749fd1f8ee25c33a64b870a484d69549b738d2f5d663bd0e10fc09eeb40b347e1bc32cc80b7623c2aef4c4b37d185cc06f42159396f368ca2917b0f06d84 SHA512 27fa995f144fdde8f6e62aed1d6bc68e830ab912f34a2f4f24b4fa0882a42f3cabd5f1d5f81361a1ce8311a5cc56156408782e16cae8c9faa621c98c2b64bcce
diff --git a/games-engines/box2d/box2d-2.4.1.ebuild b/games-engines/box2d/box2d-2.4.1.ebuild
index 9dfc4358d3dc..bbb16ef9e92c 100644
--- a/games-engines/box2d/box2d-2.4.1.ebuild
+++ b/games-engines/box2d/box2d-2.4.1.ebuild
@@ -12,13 +12,15 @@ SRC_URI="https://github.com/erincatto/Box2D/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
 	local mycmakeargs=(
 		-DBOX2D_BUILD_TESTBED=OFF # bundled libs, broken anyway right now
+		-DBOX2D_BUILD_UNIT_TESTS=$(usex test)
 		-DBOX2D_BUILD_DOCS=$(usex doc)
 	)
 	cmake_src_configure
diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest
index b3ca9d992b75..7d11aabbb1ba 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1,6 +1,7 @@
 AUX scummvm-tools-1.8.0-binprefix.patch 539 BLAKE2B 8c3ebc7202e209552fe2521e445a8a1dd025bfa872bd78cc31f05c01b2d559f619f3f1f15dd9f26a66d192410fc5404a5b0afee636cd33603112535500d07459 SHA512 4d2f06dcc3092dd5abab218b68c83dfc2353810b56e3a1d41fab1c7eb20b008ed2e54af486c4c4f2ecbd383ef0afa6f333ed90c694ed3b1733393a6f2ef6fbe3
+AUX scummvm-tools-2.2.0-strings.patch 559 BLAKE2B 44d3c40cd57293cc589a19b7e73f737e84cbbc88ece32e8b078dbf3ada0b4a9d8cafa0a96ad2c2020803da61172ae3f8dfadc66842cb773b2192091a71a3eeb7 SHA512 60e53a68acbab3ee983471f604a691eb66344f2f4a6a30a57d268c52d00cac05083606ec062f043bcf511edb32c27fce69d95c5a17229e94dd16af98806ac701
 DIST scummvm-tools-2.1.0.tar.xz 710124 BLAKE2B e6985c2e12a31aa9b11a80193186b101e663ce7eaf95de68639482bc82e104c879518f253c40e733c829ceb75b62d4905314cf7ad959766c4b7b49c1ee9e0136 SHA512 40e0b1a545257922dd1846d520ef0c18ef7a2682a3d7bb1709bcd49b1338ed7cefea438958941586329271d84e01bf189a14e31f5758e500df607d162ee9cc15
 DIST scummvm-tools-2.2.0.tar.xz 712048 BLAKE2B bb5307ee25476c9b4042fa0704f8b9bbfc4a57c09670bc699c83b9d5ebb0a7b9cda55f7267aafa6ae57e3ce53993740a1523616e39cf0a2c0c7249b23208372e SHA512 97d23a94772809b6fe6dcfc4d1bde9e1a12c124cb49b0a465456adbbd56358a1612b9797abb9577dc350e1150fb4a70d4b7451e794c436c8e91692b4a83deb89
 EBUILD scummvm-tools-2.1.0.ebuild 1303 BLAKE2B 13cc74cfc4fc745e1f0debfef0a2415b5b693f92e1544e9969cd65d0c4f832c61084b26617e433eeca36c70071f9e8459336c6fd5f44fe946ace11a731310a4e SHA512 952d76a10e16e13ac2c138d19132e295972d705773cd2428dde0e67ffec22a1febdb81e16095d1a50a5f4f623d3f7c61680396751364f222e4baf7acb87adee5
-EBUILD scummvm-tools-2.2.0.ebuild 1397 BLAKE2B ff7e453710830f99d665a72afe8d528751c79081ecd67f58f5cbcdb2c318ccfcaf792f11af7ca7a21adad5bc310da9a361030918c5c4f35db71ba95c0b0ac200 SHA512 4cf8eed7f6d4f9a1bb50427c15276a7a8454c24d8296d59fba5511eb2f00be9cfcd0822469bdfb191f9bab6df9c69523d016557841c4aa192f01f03476e8986e
+EBUILD scummvm-tools-2.2.0.ebuild 1355 BLAKE2B b4bde979f3fff1ed906df2b407b219f5abc764ee5384c4d44d88ba9f42f5f35c5c350988e496e32410c456f6b92ea906d7f556d9d938df97399860b5385edf9f SHA512 85111baa1aff00857fb22de4c99cfb076829d220c8244e6099526a952282ee192d2fab535daea8710d8dd5dcec73e154c89ad7a6bdb0514d70c3b75a5748627f
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch b/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch
new file mode 100644
index 000000000000..1bd3f9f399dc
--- /dev/null
+++ b/games-engines/scummvm-tools/files/scummvm-tools-2.2.0-strings.patch
@@ -0,0 +1,17 @@
+Fix build without native symlinks
+https://bugs.gentoo.org/744424
+
+--- a/configure
++++ b/configure
+@@ -1026,9 +1026,9 @@ void _ebcdic() { char* s = (char*) ebcdi
+ int main() { _ascii (); _ebcdic (); return 0; }
+ EOF
+ $CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp
+-if strings $TMPO.o | grep BIGenDianSyS >/dev/null; then
++if ${STRINGS} $TMPO.o | grep BIGenDianSyS >/dev/null; then
+ 	_endian=big
+-elif strings $TMPO.o | grep LiTTleEnDian >/dev/null; then
++elif ${STRINGS} $TMPO.o | grep LiTTleEnDian >/dev/null; then
+ 	_endian=little
+ fi
+ echo $_endian;
diff --git a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
index c514a09b8b71..3af45ddd2fa7 100644
--- a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER=3.0-gtk3
 inherit wxwidgets toolchain-funcs
@@ -17,7 +17,7 @@ IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files
 
 RDEPEND="
-	>=dev-libs/boost-1.32:=
+	dev-libs/boost:=
 	sys-libs/zlib
 	x11-libs/wxGTK:${WX_GTK_VER}
 	flac? ( media-libs/flac )
@@ -35,17 +35,18 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.8.0-binprefix.patch"
+	"${FILESDIR}/${PN}-2.2.0-strings.patch"
 )
 
 src_prepare() {
 	default
 
-	rm -rf *.bat dists/win32 || die
-	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
+	rm -r *.bat dists/win32 || die
 }
 
 src_configure() {
 	setup-wxwidgets
+	tc-export CXX STRINGS
 
 	# Not an autoconf script
 	./configure \
@@ -61,10 +62,6 @@ src_configure() {
 		$(use_enable vorbis) || die
 }
 
-src_compile() {
-	emake STRINGS="$(tc-getSTRINGS)"
-}
-
 src_install() {
 	EXEPREFIX="${PN}-" default
 }
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 0cb96d825b3e..722fa71df169 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,6 +1,6 @@
 AUX scummvm-2.2.0-fluidsynth-2.2.patch 5627 BLAKE2B 42a4d2bc56ffb9f13bce8de4af27511e0603ce8abcc17fa8ca2501e1e0fd464bdc57b2b81c7b98ca9a7d57149d1d848de1986127e7f777a8673d0f83f67b7f08 SHA512 b69d7fc1d14ea4f4cdbb0105d294b00f5f0248b8d37920cac8e11c54ee3ef1636dbde2f304d6e1b5c924aa1a8714697f2d3f8583c588961c0ff7162ba5d67c71
 AUX scummvm-2.2.0-ultima_engine_lua_dep.patch 785 BLAKE2B 73c9ef3272ce9c71d1575775a966ff38b8369ab6cb68b3ce17353dc4b0ba7590020f7288451cfe5cb2ee94ccacfa33da1ca02389d82bcc8d8570e4f2139aaa58 SHA512 bb1e67955834b8e0544e58258f31e5fe8ba0e4ec701426cad6c032714708ce6928698de42b8a3ba7b1c0bb0eda87c6fd87c5162e396595956e70df0aa5beaac1
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b SHA512 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
-EBUILD scummvm-2.2.0-r1.ebuild 3083 BLAKE2B be5bcd2c84bce46dc2ef1fd3af0e01c4099bb98a3ac2a2524e14f9d234c4cba56b4df867a6ac1ea13d8d7fe7a189ad435671756cd5751108c7cd70b96f67e0ee SHA512 a218edbee1a4f0388e223f448f6cd7128f342cb38ffb50467ec898a90fd29f8ee31043a5ffd26cc837c50a873bf7f08ce94f4a9eeefde699871582151b8a464b
-EBUILD scummvm-9999.ebuild 3023 BLAKE2B 1db51f2c18df2dff4721f496e4a51ce46ba85aa6e70be1d0a8892ef35bb8fe858734120188860b6cf6a22d94d09dbc9c37811ac39c91aa066057006fd9c6ae3e SHA512 df839f3191fdcf8098e3796f4e51ae2c0aad1293034c7d0e2f7eb33c8fb66a03b4ad603fad44449a5e15770ceb2844b5075d160b744c74eb110152c5fa632e8b
+EBUILD scummvm-2.2.0-r2.ebuild 3277 BLAKE2B 4e9f22e32cc03724564f28feddd17c45ebc05a3c3fce775ad718810367991b04d610bc2c44d35c30bbbc1fd172842c5f625864def142e967c69eaccf3236222c SHA512 6fd6444c74f2089f02f41bb33ef52be95ba11b2a0a68caf2d0ab8cff90b0520979925d997d565202b7fef45fb00796df1515d16457a340f0bc39fec30db76688
+EBUILD scummvm-9999.ebuild 3253 BLAKE2B b93f721bf4bb0c7a1022787f0d5a5dfd52163e8f3ecc92c17e9495329bdd9714a3dd23e91206f9bf6c0d059fc3c36cbee3f80d8f1ca2b0228a2a42dd96f88de9 SHA512 d1ff22ce066261a64e63f87646cd1401ba4d9d6fad1c613d0bde0780a1c7713957c7bd52249107921413f781b8635ebafe0355b62d8b16012c00715410a277ef
 MISC metadata.xml 1214 BLAKE2B 39ff67a7d7dc25406d9418349d47631fb1bbd4d10b4e6c86dc35188987e6177cffc64087ebed51137ed00431605997479ca45a426f3cfdd7f1bc30dc98eba42f SHA512 02fe128e97f053e669fcb5b65a317689c492b4ea0bb1873ccf77f70c2de8b6dd7532d55026b94a87fc6a8c5c71c44a736c3a571d94d78af71a79cbdd99a53e8a
diff --git a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
index b6022c564f3f..65afd2a5beb6 100644
--- a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0-r2.ebuild
@@ -1,16 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
 HOMEPAGE="https://www.scummvm.org/"
-SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scummvm/scummvm"
+else
+	SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/${PN}-${P}"
+fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
@@ -29,13 +36,17 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	mp3? ( media-libs/libmad )
 	mpeg2? ( media-libs/libmpeg2 )
-	net? ( media-libs/sdl2-net )
+	net? (
+		media-libs/sdl2-net
+		net-misc/curl
+	)
 	opengl? ( || (
 		virtual/opengl
 		media-libs/mesa[gles2]
 		media-libs/mesa[gles1]
 	) )
 	png? ( media-libs/libpng:0 )
+	sndio? ( media-sound/sndio:= )
 	speech? ( app-accessibility/speech-dispatcher )
 	truetype? ( media-libs/freetype:2 )
 	theora? ( media-libs/libtheora )
@@ -60,7 +71,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	xdg_src_prepare
+	default
 
 	# -g isn't needed for nasm here
 	sed -i \
@@ -75,6 +86,7 @@ src_prepare() {
 
 src_configure() {
 	use x86 && append-ldflags -Wl,-z,noexecstack
+	tc-export STRINGS
 
 	local myconf=(
 		--backend=sdl
@@ -97,6 +109,7 @@ src_configure() {
 		$(use_enable lua)
 		$(use_enable mp3 mad)
 		$(use_enable mpeg2)
+		$(use_enable net libcurl)
 		$(use_enable net sdlnet)
 		$(use_enable png)
 		$(use_enable sndio)
@@ -111,14 +124,13 @@ src_configure() {
 	echo "configure ${myconf[@]}"
 	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
 	SDL_CONFIG="sdl2-config" \
-	./configure "${myconf[@]}" "${EXTRA_ECONF}" || die
+	./configure "${myconf[@]}" ${EXTRA_ECONF} || die
 }
 
 src_compile() {
 	emake \
 		AR="$(tc-getAR) cru" \
-		RANLIB="$(tc-getRANLIB)" \
-		STRINGS="$(tc-getSTRINGS)"
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {
diff --git a/games-engines/scummvm/scummvm-9999.ebuild b/games-engines/scummvm/scummvm-9999.ebuild
index f6a91ef83cd0..cf7685a08e01 100644
--- a/games-engines/scummvm/scummvm-9999.ebuild
+++ b/games-engines/scummvm/scummvm-9999.ebuild
@@ -1,16 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit desktop flag-o-matic git-r3 toolchain-funcs xdg
+EAPI=8
+inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
 HOMEPAGE="https://www.scummvm.org/"
-EGIT_REPO_URI="https://github.com/scummvm/scummvm"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scummvm/scummvm"
+else
+	SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/${PN}-${P}"
+fi
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS=""
 IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
@@ -20,7 +27,7 @@ RDEPEND="
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
 	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	fribidi? ( dev-libs/fribidi )
 	gtk? (
 		dev-libs/glib:2
@@ -29,7 +36,10 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	mp3? ( media-libs/libmad )
 	mpeg2? ( media-libs/libmpeg2 )
-	net? ( media-libs/sdl2-net )
+	net? (
+		media-libs/sdl2-net
+		net-misc/curl
+	)
 	opengl? (
 		|| (
 			virtual/opengl
@@ -39,6 +49,7 @@ RDEPEND="
 		glew? ( media-libs/glew:0= )
 	)
 	png? ( media-libs/libpng:0 )
+	sndio? ( media-sound/sndio:= )
 	speech? ( app-accessibility/speech-dispatcher )
 	truetype? ( media-libs/freetype:2 )
 	theora? ( media-libs/libtheora )
@@ -58,7 +69,7 @@ BDEPEND="
 S="${WORKDIR}/${P/_/}"
 
 src_prepare() {
-	xdg_src_prepare
+	default
 
 	# -g isn't needed for nasm here
 	sed -i \
@@ -73,6 +84,7 @@ src_prepare() {
 
 src_configure() {
 	use x86 && append-ldflags -Wl,-z,noexecstack
+	tc-export STRINGS
 
 	local myconf=(
 		--backend=sdl
@@ -96,6 +108,7 @@ src_configure() {
 		$(use_enable lua)
 		$(use_enable mp3 mad)
 		$(use_enable mpeg2)
+		$(use_enable net libcurl)
 		$(use_enable net sdlnet)
 		$(use_enable png)
 		$(use_enable sndio)
@@ -116,8 +129,7 @@ src_configure() {
 src_compile() {
 	emake \
 		AR="$(tc-getAR) cru" \
-		RANLIB="$(tc-getRANLIB)" \
-		STRINGS="$(tc-getSTRINGS)"
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {