gentoo (leap year) resync : 29.02.2020

5 files changed, 14 insertions, 86 deletions

diff --git a/games-board/stockfish/Manifest b/games-board/stockfish/Manifest
index ed2bafd283d5..49143276935a 100644
--- a/games-board/stockfish/Manifest
+++ b/games-board/stockfish/Manifest
@@ -1,7 +1,5 @@
 DIST stockfish-10-src.zip 174377 BLAKE2B 58142b16f59f15773c8811d6e10588dbc680c94cd504d26f4ca285dbe632d845ede06571e501a4e2b77adbb9b00d91978236ff179a46a73dc9a03cfa1ae3490c SHA512 959c4f3c497ba3108884dabc38de824f11781ae57b4ab5fdf25daf9a7fc0326e663adb1c081b8c8d57a7bf5f2e941369502a50a0c93135a001c6bd1af360d0f8
-DIST stockfish-8-src.zip 159017 BLAKE2B 01f2bf017a3e822e9a1cc35b3fd3a05a1e25e3acbc51b4b8ad9d9447eb5e35a8f8e313f72b4353e5ce1937ceb0aeb581a35d393e593fd0dd9851f149ea658b73 SHA512 4dcc8c6e975367e96d5b4e76c241094e1bade53fd19fa29320a5df10177ff5ae04844ca7ae9f9cfe929aa1341d898aabbbe523bbdab4c5beef75ca8332ce50c1
-DIST stockfish-9-src.zip 171925 BLAKE2B dacfe02525e2d78bf91a41bf2d22077ecb808566f87317382515aa14baade2c03c150ecd62ae026c5883321642330cd9beab50df35db3f1c7de18c8b84922ae0 SHA512 47b5dfea9e015dd68e33c8b1a131ed83710e4e5d67abe0c278a423f2940b07c7a5d661ce27915257ae3dad83fc2bb8e50d3d28bfa11a7c4cdf396d0378cd80f8
-EBUILD stockfish-10.ebuild 1768 BLAKE2B 15a1a8d06c645fe2629738fcaf09ef4f13541a6d039b7708dbc559853acf8c0f6f5b0e678485fd0e73b97477694c9bfdfd3a6606461b0c25327f98017db6963a SHA512 fd1c07d6345fd0184f208faffa949515b5bc0769366b3d5cc2fea107aeaf9bef0cb6aaccae4d15816b375ea375e321d0d80804b49505b18cae176ad67e41520e
-EBUILD stockfish-8.ebuild 1780 BLAKE2B 7675de0d70d2570b9824c1c3c4a3a79610af479bb7447def360fc2ec91a6fbbc7f37463c1ba2cf45907d39c8bf34bde08aa8b24f6f990e9315a94e3a987d75ae SHA512 7a42f43fb26d2e01ad68f16e17daa55961b0559ee1b7b5639057d4d9814c8200d20109d3cd7a96068bbfcb03fa4541e0bf5f53ea8a9bf2abb4d7a637c0887b59
-EBUILD stockfish-9.ebuild 1773 BLAKE2B 8af8d85313f39361c455d2a4d16756bad28319dc40d50a540f34a51223cce4a3157c7da44edd2be3f6787f8f9dbc36a9ce9c3ea17020164058acaa7f0adb0610 SHA512 d80fe10b7c9e355a2f23cda9ff0f71e2042111edc9cfcfc0e407dcee9dcf8c17c248c3e2ed7d82c3c151ba4b6bfb643a86aeb42dd18b38e58766ec8b630f0857
-MISC metadata.xml 536 BLAKE2B 52bc05dae5efd0030acb6caf71fb8c42c556a3f96ab0feab4677400cfcc38094014289f56e59188320af9d527b511854b6a9f3c69cff74849e69d1be1f069433 SHA512 c428df576f969e62b0231dcaf77791ff5a8e2c5bf081f390e3df2fcf3ec9067c1cfed7d9e47f3e98359c5b206c28c5454b7385b3d6697e302c0a671bb8ef8d48
+DIST stockfish-11.tar.gz 145868 BLAKE2B a4b7b523492cb37206f475cc6d7c512be2a626836e15e0cb0e98d43bf1737e569a6be5f2e87c7633c0802b44863130e7bfe47e49e99ec05015f150ff1baa9755 SHA512 3e6035d422d04a47c9fba61f3815f2be645c6c5cc8c57cc6b17f8f1f2a30651da9c51bafc19b17d4a843be1900b00c5b90e3d6fdd2c6ced45be7510feeb3559a
+EBUILD stockfish-10.ebuild 1790 BLAKE2B 8806e967bd8b4d781ff920b046920d5961274b16ffd7999b9b63366b947101e35a9c45a27efc1534b2d2a3089dd9bb14223ffd7070bec9577a64acd71a970d9f SHA512 18d16399e26d58f112eba0f6527875b20f7dfee26074feb5fbeb211c5b51f621bcc8272ae9a4bef6ac960304c976b740e7dfff6d81375fe4c4552bb1b28b1082
+EBUILD stockfish-11.ebuild 1850 BLAKE2B 8663d18c75a1addf37b50be6c4953f72af5aec594fd153b28fdea98fa554c136519b395606a154c2f1f6e44b2216a78921d9ad1a52ad8a12331af4b37c9d031f SHA512 4ddf33870f7dbd85a9443c9c40bc38b5444d99d0fb3ecf58a5b60fd345965d5a1e6eba36fe35c8124b7c665dcc9c2ad9d2d5dbc0e092e3181794d4c53ddfb225
+MISC metadata.xml 479 BLAKE2B dcf9350e25140219971b3419c7bff3aad6a437d338eca3c053fe984d3d4a94789838ffdac4a3eb9934b1ee085a0451c927bd4a50c7802becfab29c805bf52afa SHA512 5275ae82721084b73c142e8da9334b7e397563dcde764b001a15392707ed572dae65e8ce18f7de8dbddc85b785786780900d1b2ac309927ae14d532ed07fcd64
diff --git a/games-board/stockfish/metadata.xml b/games-board/stockfish/metadata.xml
index 38f3f419b3a3..2ffc98e206f0 100644
--- a/games-board/stockfish/metadata.xml
+++ b/games-board/stockfish/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Matthias Maier</name>
 	</maintainer>
 	<use>
-		<flag name="armv7">Build for armv7; enables PIE</flag>
 		<flag name="general-32">Generic unoptimized 32-bits build</flag>
 		<flag name="general-64">Generic unoptimized 64-bits build</flag>
 		<flag name="optimize">Enable upstream -O3 optimizations (default enabled)</flag>
diff --git a/games-board/stockfish/stockfish-10.ebuild b/games-board/stockfish/stockfish-10.ebuild
index f507eeb1a674..5974776f35e1 100644
--- a/games-board/stockfish/stockfish-10.ebuild
+++ b/games-board/stockfish/stockfish-10.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=7
@@ -12,7 +12,7 @@ SRC_URI="https://stockfish.s3.amazonaws.com/${P}-src.zip"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="armv7 cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse debug
+IUSE="cpu_flags_arm_v7 cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse debug
 	general-32 general-64 +optimize"
 
 DEPEND="|| ( app-arch/unzip app-arch/zip )"
@@ -47,7 +47,7 @@ src_compile() {
 	use cpu_flags_x86_avx2 && my_arch=x86-64-bmi2
 
 	# other architectures
-	use armv7 && my_arch=armv7
+	use cpu_flags_arm_v7 && my_arch=armv7
 	use ppc && my_arch=ppc
 	use ppc64 && my_arch=ppc64
 
diff --git a/games-board/stockfish/stockfish-9.ebuild b/games-board/stockfish/stockfish-11.ebuild
index dc5c8779f356..1b453a187555 100644
--- a/games-board/stockfish/stockfish-9.ebuild
+++ b/games-board/stockfish/stockfish-11.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="Free UCI chess engine, claimed to be the strongest in the world"
 HOMEPAGE="https://stockfishchess.org/"
 
-SRC_URI="https://stockfish.s3.amazonaws.com/${P}-src.zip"
+SRC_URI="https://github.com/official-stockfish/Stockfish/archive/sf_${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="armv7 cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse debug
+IUSE="cpu_flags_arm_v7 cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse debug
 	general-32 general-64 +optimize"
 
-DEPEND="|| ( app-arch/unzip	app-arch/zip )"
+DEPEND="|| ( app-arch/unzip app-arch/zip )"
 RDEPEND=""
 
-S="${WORKDIR}/src"
+S="${WORKDIR}/Stockfish-sf_${PV}/src"
 
 src_prepare() {
 	default
@@ -47,7 +47,7 @@ src_compile() {
 	use cpu_flags_x86_avx2 && my_arch=x86-64-bmi2
 
 	# other architectures
-	use armv7 && my_arch=armv7
+	use cpu_flags_arm_v7 && my_arch=armv7
 	use ppc && my_arch=ppc
 	use ppc64 && my_arch=ppc64
 
diff --git a/games-board/stockfish/stockfish-8.ebuild b/games-board/stockfish/stockfish-8.ebuild
deleted file mode 100644
index c908d406a8cd..000000000000
--- a/games-board/stockfish/stockfish-8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Free UCI chess engine, claimed to be the strongest in the world"
-HOMEPAGE="https://stockfishchess.org/"
-
-SRC_URI="https://stockfish.s3.amazonaws.com/${P}-src.zip"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="armv7 cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse debug
-	general-32 general-64 +optimize"
-
-DEPEND="|| ( app-arch/unzip	app-arch/zip )"
-RDEPEND=""
-
-S="${WORKDIR}/${P}-src/src"
-
-src_prepare() {
-	default
-
-	# prevent pre-stripping
-	sed -e 's:-strip $(BINDIR)/$(EXE)::' -i Makefile \
-		|| die 'failed to disable stripping in the Makefile'
-}
-
-src_compile() {
-	local my_arch
-
-	# generic unoptimized first
-	use general-32 && my_arch=general-32
-	use general-64 && my_arch=general-64
-
-	# x86
-	use x86 && my_arch=x86-32-old
-	use cpu_flags_x86_sse && my_arch=x86-32
-
-	# amd64
-	use amd64 && my_arch=x86-64
-	use cpu_flags_x86_popcnt && my_arch=x86-64-modern
-
-	# both bmi2 and avx2 are part of hni (haswell new instructions)
-	use cpu_flags_x86_avx2 && my_arch=x86-64-bmi2
-
-	# other architectures
-	use armv7 && my_arch=armv7
-	use ppc && my_arch=ppc
-	use ppc64 && my_arch=ppc64
-
-	# Skip the "build" target and use "all" instead to avoid the config
-	# sanity check (which would throw a fit about our compiler). There's
-	# a nice hack in the Makefile that overrides the value of CXX with
-	# COMPILER to support Travis CI and we abuse it to make sure that we
-	# build with our compiler of choice.
-	emake all ARCH="${my_arch}" \
-		COMP=$(tc-getCXX) \
-		COMPILER=$(tc-getCXX) \
-		debug=$(usex debug "yes" "no") \
-		optimize=$(usex optimize "yes" "no")
-}
-
-src_install() {
-	dobin "${PN}"
-	dodoc ../AUTHORS ../Readme.md
-}