gentoo (valentine's day) resync : 14.02.2021

5 files changed, 26 insertions, 8 deletions

diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild
index aff130d91e0c..a138651fac27 100644
--- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild
@@ -36,7 +36,6 @@ RESTRICT="test"
 BDEPEND="virtual/pkgconfig
 	test? ( dev-lang/perl )"
 DEPEND="
-	>=dev-lang/spidermonkey-78.6:78
 	dev-libs/boost:=
 	dev-libs/icu:=
 	dev-libs/libfmt:0=
@@ -78,14 +77,11 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# Delete check for minor version of dev-lang/spidermonkey.
-	sed -e "/^#if MOZJS_MINOR_VERSION != [[:digit:]]\+$/,/^#endif$/d" -i source/scriptinterface/ScriptTypes.h || die
+	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
 }
 
 src_configure() {
 	local myconf=(
-		--with-system-mozjs
-		--with-system-nvtt
 		--minimal-flags
 		$(usex nvtt "" "--without-nvtt")
 		$(usex pch "" "--without-pch")
@@ -124,9 +120,31 @@ src_compile() {
 	tc-export AR
 
 	# build 3rd party fcollada
+	einfo "Building bundled fcollada"
 	emake -C libraries/source/fcollada/src
 
+	# build bundled nvtt
+	# nvtt is abandoned upstream and 0ad have forked it
+	# and added fixes. Use their copy.
+	# bug #768930
+	if use nvtt ; then
+		cd libraries/source/nvtt || die
+		elog "Building bundled nvtt (bug #768930)"
+		./build.sh || die "Failed to build bundled nvtt"
+		cd "${S}" || die
+	fi
+
+	# build bundled spidermonkey
+	# We genuinely can't use the system SpiderMonkey right now.
+	# Breakages occur even on minor bumps in upstream SM,
+	# e.g. bug #768840.
+	cd libraries/source/spidermonkey || die
+	elog "Building bundled SpiderMonkey (bug #768840)"
+	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh || die "Failed to build bundled SpiderMonkey"
+	cd "${S}" || die
+
 	# build 0ad
+	elog "Building 0ad"
 	emake -C build/workspaces/gcc verbose=1
 }
 
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index d0e11109c948..8ac093549bad 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -6,5 +6,5 @@ DIST 0ad-0.0.23b-alpha-unix-build.tar.xz 31922812 BLAKE2B db7d6bf1a2bb084870b914
 DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510
 EBUILD 0ad-0.0.23_alpha.ebuild 3408 BLAKE2B bb6fbd77a2e9a0b27f086b33bb347ac5c5a8c76277b967359dfd8b4c7b6ea4b3f296aa150bacc3b3dd9a1460e5ebda436ad1429c5c1eaefe826a64403417ac1c SHA512 99db5ad39c1e0fe4ec9762df7c27e5ae12a1234007cd5d6e229110471affa705373015bb6e42e23b1f8ace93c5a3bae4afc204d966c5940f810415cd255186bc
 EBUILD 0ad-0.0.23b_alpha.ebuild 3467 BLAKE2B 567338478f564ebc53a299e132d47188c4db5d9bdea314d55539442ce1ca256dd4df5e50b24997a54aaf0dd9c3542a06a826830bf98833c7a49a9d3e37207ce7 SHA512 5b8198f364b87faa96adf108e252ea5d55d1e06f459b6c0e45901c737bb1cd1ca8c6ec1f08cea5dade892dd27d6572caad29249aed2ca15a3e421afed046ab79
-EBUILD 0ad-0.0.24_alpha_pre20210116040036.ebuild 3717 BLAKE2B c53555161dd6cf2d457361ac1379312712646788b248c949203bfc62ea0c5c60980939373dadf636ecc4fec15dd0620e839a3727fb7ea0b8acb745ac47f8f2e6 SHA512 336d69aef36a3a4cb0103310bd7b285bb90c71c75aafae0339b2f9b1ca4577571b75079f6e7d4c67ec3685b33a495f21c437592cdf272d1fcdedf09c09ee9504
+EBUILD 0ad-0.0.24_alpha_pre20210116040036-r1.ebuild 4263 BLAKE2B e4b252da916bd111bea329ebc9be7ac6f223f2f29a7caa6f74c63c56e68d602e54956b97e1496d5a41618ec6fe9d290d8ea917d4b81c013145f81ab44e634819 SHA512 52212dbe220e95b4634a4c0bcf4cc02a17254d836a4af43e0d76829e6eac3ce1fbaee30f64b41d8e4152e4a47bf5cf5a220ae6a6b8f0187044aec5765ec70b87
 MISC metadata.xml 668 BLAKE2B 9bfa86da2d6e1631217082f88905d8d8be7a2c91248839b9a0f5da9d0c214552b11f4af861eb04072e4645b47505d83d0b93c1313f7a3857b1006f94a699b3b2 SHA512 7aab21c31587f1cce5b4635ace0fbbb5bcdc2a6d811df68494ac1fb251fbfc75911cfa3a9e1a60c28f684f64a919164c6e3504fd3fbba3b0ec05afe8278ae343
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 83f4beec3c25..c78c8b17885d 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/ja2-stracciatella/Manifest b/games-strategy/ja2-stracciatella/Manifest
index 4d5d8ae61f16..ff546003ef00 100644
--- a/games-strategy/ja2-stracciatella/Manifest
+++ b/games-strategy/ja2-stracciatella/Manifest
@@ -91,5 +91,5 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD ja2-stracciatella-0.12.1_p7072.ebuild 2113 BLAKE2B d576c681712e3d5c29aaf038a19fdc430a84fe934446a6ee0e54ce9b1a40321c60b6df8e6d478e3f04b49da3825d96dfa8417a5c8da2b2f82a479b1549977d5f SHA512 8a825972f55db374c65e3be2d07f3ea6ee89545f84028740040cef915c6e76efbd95fa83d20044aa180c19f8128963b1830890e896e7e5f45254c53e65c88880
-EBUILD ja2-stracciatella-0.17.0.ebuild 4057 BLAKE2B f0599252f9298491c552be117856191c77e4089e7a0b1aa01ccae27bce0b1d3a71d94e81ac1f6ba27a0bd88ea4df66c1edff650f01e931ad72322bea20ee57cf SHA512 e55ef6a7586ee468db06caa227eebab6092f6996fa33729df72c6ab41947da5674ae0013202e2232e4df9771264778927b4ce8a4365bc1fe3b4c26c427d119f0
+EBUILD ja2-stracciatella-0.17.0.ebuild 4062 BLAKE2B 9929b2f142cfc788d29d2e65178a517006b75bcea95d6a97f76c09a85d8c0fac567fc93eeb00146ee4e039d456aa8b4cb19434659331be9e91ac615f9975b9cb SHA512 6642fab6eac691d500b270c1c6d6ff9ceff5eafa4f2d52fcb7684dea299638fddc31880d5f5a389820aaed1ac53414d72179a62b60bdeba1a3f748ac38c4609c
 MISC metadata.xml 616 BLAKE2B 4ef2302ab9784b362b425ed93bcd46be22759a12278aa55560acce275a93fef62411a22019e9bf9f4f2b1fc65d3f61efe57ff9571559362c48a55041a8b9c4a5 SHA512 bb83dae139f680080f1efcf784ed535a21c995226373aed5074313d00d85a79f8f41075eac7025a76264ed36be0a1b7c205dc1efb1f5b311100c9a667706ec84
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild
index 47d0a6964c2b..6dcb1aa202bb 100644
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild
+++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild
@@ -102,7 +102,7 @@ SRC_URI+=" $(cargo_crate_uris ${CRATES})"
 
 LICENSE="public-domain SFI-SCLA"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall editor ru-gold test"
 # Run with ja2 --unittest
 # Needs data files?