gentoo resync : 03.03.2021

6 files changed, 22 insertions, 9 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 6954884ecb0d..934d6d2aaa10 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/chessx/Manifest b/games-board/chessx/Manifest
index c33ceae4a97f..6bb1705dbc92 100644
--- a/games-board/chessx/Manifest
+++ b/games-board/chessx/Manifest
@@ -1,6 +1,6 @@
 AUX chessx-1.5.4-install.patch 707 BLAKE2B 00199be5811a78ad2e610dd919a063d84d94156bdaed9aef6134c6a09227d3072b75b443e403b5c82d1ac36059709c1e2f7e4988dd68f813bdc56608a7a8dec0 SHA512 28adbaf8288b4688c1ccb6d8fc5cac019bc752d5d555ae8b2e3017e3085bbd7a28b896bd1c583933f4dda44964bc7d0f21842841666b8e454be946c20eabc0cd
 AUX chessx-1.5.4-missing-translations.patch 1502 BLAKE2B f0b745ceaf0f3b97e59b156515ec286f830b1163164ffd6d63a76d1118b648f9af221e89aa0c22d71a2a1fabc56074b436bd9fad433db1733b8742504559962e SHA512 a922dd05b98ea8ed54f203fa7d7d56c1fb87ef7fe97edde9e05ada37a6e4175f02465bbef2f7d8df3f672d74134722d1706fd6ecf559167ae0f1cd717d0f28cd
-AUX chessx-1.5.4-system-quazip.patch 2232 BLAKE2B b4cdc1e62be10293135d7c244b0c6765e833b2e12d738bb3bb6b2ca4b5e6d7444014420a43975cbaff94805b73b13e4f81de1d878aa817e376ec93807f002a8f SHA512 7d74d68998406d41f6142d1ccf092c7ee0a80fa1a1e6e18acc20a39ebe697b01412bddc50eaae3163f46575d2ec651455f0a0803bd5ec6fe12fa9880ee7f4e45
+AUX chessx-1.5.4-system-quazip.patch 2237 BLAKE2B 2e94f7d6b6c16dec100e09e6f6bb77185cfafa9dc16f4640212a582e6f267cf78100d8e849f4e762b095ebee7286f1ff0b64d6e975a7679acdab2790b028cba9 SHA512 dc3408200cc27a7d38f90af2136163f91fb1d874673a9645626f4d035312d17e0995bf6b23433fdfc5b28468f823c65f4a8cf7966271f4630526caa7926fa929
 DIST chessx-1.5.4.tgz 3663299 BLAKE2B 3a0f222d2c122e70f66600f15a2b9a9606e56407db364a616515ebc1b7f333e260c131e61e22f59fb3cbd340555bb8c238bfd560fbc23f4c173288cd4b7e7369 SHA512 9f112b185ed8af3690cb50eafead7dfbd7896d3baebc9b10c3d32103a51cc49834703c232c159dffe24fd09601f2b41db02598c435ca56fc1031195fb9762a42
-EBUILD chessx-1.5.4-r2.ebuild 953 BLAKE2B 0872b962309c11765db6fd939be6a3bf70f5edfb3c8a0f216e739b1ce54b7be10cc4f4b900e92e04f872a4ce3cc32573fcc52f81290747229260da0c968ab5a5 SHA512 1413ee6263e8cb3b1f35616ddc64b224bfde1434918283d1a7f1b76f72bfcc6daed194a111ca2c3dd801352edd15f54251df772f63812a30a69c9e13512e190a
+EBUILD chessx-1.5.4-r3.ebuild 1105 BLAKE2B b023d915e68ee6020ba77cb452f3dd079961de57493735129e8703b49d20ee93605bfb330931c1e8533f5dab940c2e204faa2c6f574570f89593900d04a45a07 SHA512 f0642f36460759b41e3b500a05bd0e9137ec2762180aa4b5f9d4aea7ecc1b378faa798e94c882fd9ff61d35b63b81b0c2f538df8326e945ff6af846493e9a2b6
 MISC metadata.xml 329 BLAKE2B 199a6f1de51ae4a4a1104bbd4419200e7440abafe3fc5dfe40eafc08c00449461c71131cfdf1d60a0b8375f575290bbdd0af6355ae10a9259c38728e3065e6cf SHA512 41215eff9af3f31175db0f20dd13574378e4124dda8a1670440897391a5b66423c953471d6e22984dbfb3e0abef8ea3d56fa3690b45c189fae2a3c26560ec1a8
diff --git a/games-board/chessx/chessx-1.5.4-r2.ebuild b/games-board/chessx/chessx-1.5.4-r3.ebuild
index f24f065884e8..b3e40f7c587d 100644
--- a/games-board/chessx/chessx-1.5.4-r2.ebuild
+++ b/games-board/chessx/chessx-1.5.4-r3.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=dev-libs/quazip-0.9.1:0
+	>=dev-libs/quazip-0.9.1:0=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
@@ -41,6 +41,13 @@ PATCHES=(
 	"${FILESDIR}"/${P}-install.patch
 )
 
+src_prepare() {
+	xdg_src_prepare
+	if has_version "<dev-libs/quazip-1.0"; then
+		sed -e "/^PKGCONFIG/s/quazip1-qt5/quazip/" -i chessx.pro || die
+	fi
+}
+
 src_configure() {
 	eqmake5
 }
diff --git a/games-board/chessx/files/chessx-1.5.4-system-quazip.patch b/games-board/chessx/files/chessx-1.5.4-system-quazip.patch
index b5e4cf8f4351..6610d3c8e420 100644
--- a/games-board/chessx/files/chessx-1.5.4-system-quazip.patch
+++ b/games-board/chessx/files/chessx-1.5.4-system-quazip.patch
@@ -67,7 +67,7 @@ Index: chessx.pro
 -INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
 +
 +CONFIG += link_pkgconfig
-+PKGCONFIG += quazip
++PKGCONFIG += quazip1-qt5
  
  win32 {
      # DEFINES += ZLIB_WINAPI
diff --git a/games-board/stockfish/Manifest b/games-board/stockfish/Manifest
index 49143276935a..64e9c22dc904 100644
--- a/games-board/stockfish/Manifest
+++ b/games-board/stockfish/Manifest
@@ -1,5 +1,6 @@
 DIST stockfish-10-src.zip 174377 BLAKE2B 58142b16f59f15773c8811d6e10588dbc680c94cd504d26f4ca285dbe632d845ede06571e501a4e2b77adbb9b00d91978236ff179a46a73dc9a03cfa1ae3490c SHA512 959c4f3c497ba3108884dabc38de824f11781ae57b4ab5fdf25daf9a7fc0326e663adb1c081b8c8d57a7bf5f2e941369502a50a0c93135a001c6bd1af360d0f8
-DIST stockfish-11.tar.gz 145868 BLAKE2B a4b7b523492cb37206f475cc6d7c512be2a626836e15e0cb0e98d43bf1737e569a6be5f2e87c7633c0802b44863130e7bfe47e49e99ec05015f150ff1baa9755 SHA512 3e6035d422d04a47c9fba61f3815f2be645c6c5cc8c57cc6b17f8f1f2a30651da9c51bafc19b17d4a843be1900b00c5b90e3d6fdd2c6ced45be7510feeb3559a
+DIST stockfish-13-nn-62ef826d1a6d.nnue 21022697 BLAKE2B 013396fec72e14dfb90ca308bdcbaf98f27b29feb03cb2c855f521dc33d0787de51812cb2a52e4aa94622120fc89a5f2302fd6296a4fb1db33e0de57156a41c3 SHA512 25a0a1b5c440fcfaa8ee122391fbb075e4b4e6bdacae816a2897bb346c0d5c459ae464fc7680414e87eadf2a5a00565d4f3ac2c559fea4bdddd1e4a38874fba7
+DIST stockfish-13.tar.gz 181226 BLAKE2B ab6f2afccce2b4767c69d07c18aa611cb71388aae9b27e8a6c95b61db4a27c18b0e7a21aa30e10b4b56d018c1a4146dcea4896c4d68d7a9f297fa0758739ce9c SHA512 5ee6581b8324ed32f02ed0f1ea5df311635203e5f1806d00f9819ad076ef4082481f8ecebbb531154cbb120bb2b396c738c3ef2e2e6ee0fd6a5bd6ff88192706
 EBUILD stockfish-10.ebuild 1790 BLAKE2B 8806e967bd8b4d781ff920b046920d5961274b16ffd7999b9b63366b947101e35a9c45a27efc1534b2d2a3089dd9bb14223ffd7070bec9577a64acd71a970d9f SHA512 18d16399e26d58f112eba0f6527875b20f7dfee26074feb5fbeb211c5b51f621bcc8272ae9a4bef6ac960304c976b740e7dfff6d81375fe4c4552bb1b28b1082
-EBUILD stockfish-11.ebuild 1850 BLAKE2B 8663d18c75a1addf37b50be6c4953f72af5aec594fd153b28fdea98fa554c136519b395606a154c2f1f6e44b2216a78921d9ad1a52ad8a12331af4b37c9d031f SHA512 4ddf33870f7dbd85a9443c9c40bc38b5444d99d0fb3ecf58a5b60fd345965d5a1e6eba36fe35c8124b7c665dcc9c2ad9d2d5dbc0e092e3181794d4c53ddfb225
+EBUILD stockfish-13.ebuild 2046 BLAKE2B aea3e5f00ee03950ffe3b8befd615c247194e6dbebc0dc216e81983e4ead327b7413ddfc4e0d7317bab0dd7aab59670fc376b983065f496db3aabc98679d8dbb SHA512 cdbc07b46b43cc18fd2b16c6b261af33472cda70b82e7ad996705309675a4df0c15ae515f490a8ccbcc2465e688e21443ca5af34202224a107b1e69152eefde5
 MISC metadata.xml 479 BLAKE2B dcf9350e25140219971b3419c7bff3aad6a437d338eca3c053fe984d3d4a94789838ffdac4a3eb9934b1ee085a0451c927bd4a50c7802becfab29c805bf52afa SHA512 5275ae82721084b73c142e8da9334b7e397563dcde764b001a15392707ed572dae65e8ce18f7de8dbddc85b785786780900d1b2ac309927ae14d532ed07fcd64
diff --git a/games-board/stockfish/stockfish-11.ebuild b/games-board/stockfish/stockfish-13.ebuild
index 1b453a187555..c473fbc9e6f2 100644
--- a/games-board/stockfish/stockfish-11.ebuild
+++ b/games-board/stockfish/stockfish-13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,10 @@ inherit toolchain-funcs
 DESCRIPTION="Free UCI chess engine, claimed to be the strongest in the world"
 HOMEPAGE="https://stockfishchess.org/"
 
-SRC_URI="https://github.com/official-stockfish/Stockfish/archive/sf_${PV}.tar.gz -> ${P}.tar.gz"
+NNUE_FILE="nn-62ef826d1a6d.nnue"
+
+SRC_URI="https://github.com/official-stockfish/Stockfish/archive/sf_${PV}.tar.gz -> ${P}.tar.gz
+	https://tests.stockfishchess.org/api/nn/${NNUE_FILE} -> ${P}-${NNUE_FILE}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -23,6 +26,8 @@ S="${WORKDIR}/Stockfish-sf_${PV}/src"
 src_prepare() {
 	default
 
+	cp "${DISTDIR}"/${P}-${NNUE_FILE} ${NNUE_FILE} || die "copying the nnue file failed"
+
 	# prevent pre-stripping
 	sed -e 's:-strip $(BINDIR)/$(EXE)::' -i Makefile \
 		|| die 'failed to disable stripping in the Makefile'
@@ -65,5 +70,5 @@ src_compile() {
 
 src_install() {
 	dobin "${PN}"
-	dodoc ../AUTHORS ../Readme.md
+	dodoc ../AUTHORS ../README.md
 }