gentoo resync : 31.05.2021

6 files changed, 15 insertions, 72 deletions

diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
index 7826f504366a..849ecb4aaef8 100644
--- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit desktop toolchain-funcs wxwidgets xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop toolchain-funcs python-any-r1 wxwidgets xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -36,9 +37,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE="editor +lobby nvtt pch test"
 RESTRICT="test"
 
-BDEPEND="virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
+# virtual/rust is for bundled SpiderMonkey
+# Build-time Python dependency is for SM too
+# TODO: Unbundle premake5
+# See bug #773472 which may help (bump for it)
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	virtual/rust
+	test? ( dev-lang/perl )
+"
 # remove dependency on nvtt
 # as we use the bundled one
 # bug #768930
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 89511736105a..7f5f50f2b666 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -4,6 +4,6 @@ AUX 0ad-0.0.24b_alpha-rust-1.50.patch 3529 BLAKE2B 0f354b806399f1cf9fc515a1f799d
 DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510
 DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea
 DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726
-EBUILD 0ad-0.0.24_alpha_pre20210116040036-r2.ebuild 6140 BLAKE2B 50e5c807012bd422ad7629e849696592a3a7a7c9bc2130658342cae4ad4ccd9c16f0be8e360037513777ccf3b7e7b253a546311f179ed33d3eb9363c41d0d9b2 SHA512 7c1df2ce366003d11a4816e4b4d4615eeb41799ceac185140e95bf4c18c0c71f0a513c485058a029c135c4519da48a08ad729abddebadcfdde7361c44b0204fd
+EBUILD 0ad-0.0.24_alpha_pre20210116040036-r2.ebuild 6380 BLAKE2B c3baa01f84d1527b0ecff261db42ae84b32110896b98c853c7990c2a76af405ee169710dd3817ec139a31b02a2e97f8300789262849b040040fae4d81e5c17dc SHA512 7d70dc9d942c2956bda278949b0297496be4ecf44a352c5a429eb496884461048721ea42dc3ed2fa5c7b373280b556d1aa323dc8d4c668b3aefd3fad6f7088ac
 EBUILD 0ad-0.0.24b_alpha.ebuild 6580 BLAKE2B 9c2aaf06b4f5365facf6818abb06fdd602988a41567f9db236199a5cd4d5da7e246fd6555a560993954be81a2ea47678839d8210af05621e76527d7bbb6a15df SHA512 628e1d1af80bc0ff90d5cc727f6668d270028b5a8587a26d31109b2dfe21a98564ea40cbe13018e8f11cbe72963892e57781e9af3a6302f8f0982850511e7c31
 MISC metadata.xml 715 BLAKE2B b611d7f5a8ad31e43b744dec6607293165c3e60a901b3598d62859a6d65852c9369429c090e557a970320947557ab5d3e418ecd0a39b0b1ae7a77384e6202b28 SHA512 43cd54bb88313ef72649034afbbde262917d6aa390eb7dd5b1369d851d9dcbed7d0c03169edf0d156ad0351ae7a8e485a20217e6c686b9c6b266303c8ce2b481
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 5d941744cca2..83005d0ad2af 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index bad28ceba79d..85c5745eea56 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,5 +1,3 @@
-DIST naev-0.8.1-source.tar.gz 359781119 BLAKE2B 021824b0af031af8ff2aa565989c3d7811fcbcdc082649f208e8318b0d69b1c3c27492936a6afdc38de9448aa0dcca2f8ef73879155217e34968f81246017aa6 SHA512 8f9aede300d06b0beae12d4809cc58ac740bc1934c2fa5fdb04452cd2eb63de697e0bbf2aacf5af4878b62eee30878ed50388ee8386fbb19f9d56cb7cad8d7f2
 DIST naev-0.8.2-source.tar.gz 394232958 BLAKE2B 2e109636cb1d282bc8236c84ee40b9b96224baf70bf315677b6a02bf9c4c0059d34c5225c31b925a8c66c5995fd9ab8fc022816b66a7e1c174e017e3ebf5e956 SHA512 2ad120639efc13635370bb498d0a4100b2306779cf593e6aecffd331e0f4dec1b8af4729b2c4d484af1be9069d2ac7e47e17ebdc8ce65af878fcff9484f810b0
-EBUILD naev-0.8.1.ebuild 1552 BLAKE2B d398392bf128e0c2f64913d7225f8f46bc1e8e9e934a8e2bf6376339936a0341fc6c9beae7995bcdb55dab5b64cd7f788f820d23e8ea7f2a4ec9dc1a0fc8604c SHA512 e87e1bdd566a5fd1ad0b34955b258b8b75ff099102fcf74cd7885b3b8276b68c9ca66b9a9710e04164c71e792ec935f88cf092d57cd2adcdb1791657080039f7
-EBUILD naev-0.8.2.ebuild 1734 BLAKE2B 4820a0ba8a88f935ef6e96b948871c503224cdfcdecce2d0e25a266881343d02e514ca068f1bbdd64511289d872ff35a61150a8e5e2c976c1685b10a21aa5c85 SHA512 1e4028e470263c4a548a97f1a9281c5ff79b077a1dea0ac5a9a426296f4ce3a4925324c34e1ec5253e1cf2885a2fb4aa7fbe501408f82c940ac4097629cf18e8
+EBUILD naev-0.8.2.ebuild 1735 BLAKE2B 7b59d264eb949f69914998e0484e244a4a7406bb7f6e5382d6b0eaa6e900dfb86de92dce285e16e8e730b11a65f94bd28b30b5deae7f1893c5076954a4dd8428 SHA512 c91781a73f2ca5bb253bc1a7214d0ee3c955171ed40d7530563fd08b47d63722a8782137d52009de11e4198b1ba3cfe98ff373c46678bffb9594d2dab5d9e475
 MISC metadata.xml 480 BLAKE2B 4d01de527c3e9c5d5b97dfc169be7b0639be97a2cfa75564b6f2f3f0543c783f9b2403b15471191ecd0b1cf6ddc97eb87d9e04d7f53fe9534fd3626398f02425 SHA512 48c3f9af6ccc92e0cd032f169c8febe7a954cc3b304717e329d2bc9f8d4fff4d9be72bcab2cbfa2c3b75c46ab85a044fe76c786638c062c2a8a9005f1fff6b54
diff --git a/games-strategy/naev/naev-0.8.1.ebuild b/games-strategy/naev/naev-0.8.1.ebuild
deleted file mode 100644
index a1df3ee985d0..000000000000
--- a/games-strategy/naev/naev-0.8.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-inherit lua-single meson xdg
-
-DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
-HOMEPAGE="https://naev.org/ https://github.com/naev/naev"
-SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +mixer nls +openal"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="${LUA_DEPS}
-	dev-libs/libzip
-	dev-libs/libxml2
-	media-libs/libsdl2[X,sound,video]
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	sci-libs/suitesparse
-	virtual/glu
-	virtual/opengl
-	mixer? ( media-libs/sdl2-mixer )
-	nls? ( virtual/libintl )
-	openal? (
-		media-libs/libvorbis
-		media-libs/openal
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-lua/ldoc
-	)
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	sed -i -e "s:lua51:lua5.1:g" meson.build || die
-	# meson can't into docdir!
-	sed -i -e "s:doc/naev:doc/${PF}:g" meson.build || die
-	sed -i -e "s:'doc/naev':get_option('datadir') / 'doc/${PF}':g" docs/meson.build || die
-	# remove license file from install
-	sed -i -e "/'LICENSE'/d" meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc docs_c)
-		$(meson_feature doc docs_lua)
-		$(meson_feature lua_single_target_luajit luajit)
-		$(meson_feature nls)
-		$(meson_feature openal)
-		$(meson_feature mixer sdl_mixer)
-	)
-	meson_src_configure
-}
diff --git a/games-strategy/naev/naev-0.8.2.ebuild b/games-strategy/naev/naev-0.8.2.ebuild
index 22f730350b05..31bd4471e1da 100644
--- a/games-strategy/naev/naev-0.8.2.ebuild
+++ b/games-strategy/naev/naev-0.8.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit lua-single meson python-any-r1 virtualx xdg
 
 DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"