gentoo resync : 12.03.2021

7 files changed, 22 insertions, 27 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 934d6d2aaa10..365c2a89c576 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/gambit/Manifest b/games-board/gambit/Manifest
index 63645bccf5ec..99dc78268660 100644
--- a/games-board/gambit/Manifest
+++ b/games-board/gambit/Manifest
@@ -1,4 +1,4 @@
 AUX gambit-1.0.4-compile-flags.patch 1478 BLAKE2B b57ae05465ce29f81a69e438f50f3bfa310b38b6427a150ccda7a434cf14789d26ac25075d3902423a07c3f40f9252d3b046b121d2d7067804538be30fe9df60 SHA512 97682079ea3c3b8e751df8acf71db0f32a6dd2c615e0a4178e9babbe9f6a0b624bee80d326d2a4a3c6eb82451abc5f77dfa38909dc02f4b28a3f2ff7d3f9520f
 DIST Gambit-1.0.4-src.tar.xz 1675576 BLAKE2B 4545bee38509d44f80af874473ff562b441e570be3681b166b064574e12bfad8b8a2fb5043b9d0b9089160de2d97407160336cb58864168232cf0921244cf92d SHA512 9ba12e0e9598e2b08228aa009690e6a05677916dcea1413a42be20d620accbe7cef4f4300e3ccc5d4d99e37c7fb85d923df8f5fa9146ee8049bbde2ce66ab7a9
-EBUILD gambit-1.0.4-r1.ebuild 1213 BLAKE2B 074a10ba30baa167d5fc98e5944352598cb2611346ac352073f1af5effebd402cb81f3f6bdb9c5b2aefdc3c364211ce196e1149a68ba822ae2ad6a2e16285100 SHA512 6dd7dd6cb811623f8288fa9230f5011e612e652cf317ff8b624a24d140434a53973bea3dc008cce014ed2e2d10335558eab24d97fb26a25bf1e862ebd1fdf60a
+EBUILD gambit-1.0.4-r1.ebuild 1201 BLAKE2B 0b9ef8198cefe1b5d1d130f33bd801949971e33eb2b76c67aa77a23f7e5ae490667043e09d2b94401fe1a14a2268a868cfd1d83d8976a4ce7a2186b6eeaa58b7 SHA512 01ed708d138d2f300d947f7ceb27136750ba6abe0f49c2ed7a070219e719b88a1634e5f7a6c076f32c3fe9df81c4e6296487fe9b657a53b31ae5758f9e6273e1
 MISC metadata.xml 330 BLAKE2B b37539dff6327ec46e89a9a93c5a23c0efdf321cafc5e851e98b9b265f1d561e8c70f96737b455b65958dbbd9b8a8e6efd7b44e9d589e26fb768851e23fb23ef SHA512 284c29ce4b5ae3cb4e7f1b3472cd3430ce474cd395f44b730301b37fed45c57387646e6643ab9ba2f80885e7bf2e36bd9dd018045d7a0ccefa2c73dbcfae2146
diff --git a/games-board/gambit/gambit-1.0.4-r1.ebuild b/games-board/gambit/gambit-1.0.4-r1.ebuild
index fd20cc73c5d7..6831c153f763 100644
--- a/games-board/gambit/gambit-1.0.4-r1.ebuild
+++ b/games-board/gambit/gambit-1.0.4-r1.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_IN_SOURCE_BUILD=true
-inherit cmake-utils
-
 MY_P="${P^}"
+inherit cmake desktop
 
 DESCRIPTION="Qt-based chess application + engine \"gupta\""
 HOMEPAGE="https://sourceforge.net/projects/gambitchess/"
 SRC_URI="mirror://sourceforge/project/${PN}chess/${MY_P}/${MY_P}-src.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="CC0-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-qt/qtcore:5
+DEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
@@ -26,11 +27,7 @@ DEPEND="dev-qt/qtcore:5
 	x11-libs/libX11"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}-src"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-compile-flags.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-compile-flags.patch )
 
 src_configure() {
 	local mycmakeargs=(
@@ -38,12 +35,11 @@ src_configure() {
 		-DCONFIG_GUPTA_ENGINE_DIRECTORY=/usr/bin
 		-DCONFIG_RESOURCE_PATH_PREFIX=/usr/share/${PN}/
 	)
-
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	emake -C engine/gupta VERBOSE=1 STRIP=/bin/true CFLAGS_RELEASE= release
 }
 
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
index 30efd5c2ce2f..78fafccb1d0e 100644
--- a/games-board/tali/Manifest
+++ b/games-board/tali/Manifest
@@ -3,5 +3,5 @@ DIST tali-3.38.2.tar.xz 1579972 BLAKE2B 1196f89b3cabcf1cffb36cba5b5e0c98edf9a07e
 DIST tali-3.38.3.tar.xz 1608024 BLAKE2B 5ab7e799121003a2c5faa1d54395847a215f695ba0cf5b104840bc5c1f9de48f382b305fe79b4fda69c0ac75e71c715a05c6cc34823cab375578a5598ac9c894 SHA512 dff39b3753db2bd6ad4f44a57de73a6524ff781b96b8f33e50e95cad966d91ed613d17e450c67fe669574e8fec73fc0cfe9d37dea7bb5d583cedb2bc8fd443e3
 EBUILD tali-3.36.4.ebuild 652 BLAKE2B 588e7bf429366457b0f8b70de68889359fb42d4c1dc5b91c50dad0cdddfbefc79ea0f1d126febf18bf58a6079b9e2c64544af65c674153105e33bb45c5de73b9 SHA512 212402bff4f44a927adbb18462b90fcce98594f5961cbec96ddae23641c70427bef5f8675b23075acce183e816294b5c04903c6a9b7e719de551c9cb501c938e
 EBUILD tali-3.38.2.ebuild 690 BLAKE2B e01247ac6b196258a09b8ff39719113502b67dba728a40e7c26196bee638a67b72b2f5685489bae7ef9ccd4c227220e9cf67d112f301bd677f2e8a9519a71c1d SHA512 2ea5fbcea8a73e1e4ede283038fb674446cda70c4efd7e42a5b33624dcd7ce08e2e5565fdee36d2aaeaca922e487af769e7963d70dcff884d89777b1c0ed187a
-EBUILD tali-3.38.3.ebuild 690 BLAKE2B 107c36209de3a853d4463c77e6a94ada52f1d5c656b1588ac5714f3c554425e9d03d8cb850829730ffc634d147461d784c616d084e5245b7ef830b66b8d8135c SHA512 d40f83e30a4ea67461e65f473fcf7c71d525ed840b76ba95c5e049d515c858bee81d48286ceb385f6213ffc7039f3dd664d5a2cca708412ebf148a239f7222a0
+EBUILD tali-3.38.3.ebuild 689 BLAKE2B 31b5d62ecdc509759b2d943b2e681a0d6e9bce69c35985a45f4353ca62007b29bece6d9cb098d2b54b07b89361c6f9c05742e80be385cc4ecdd395af2726ebc7 SHA512 2f9f3b397b4116d22d8fad85c58aa94c538cc058edbaae464a59634d16620e3f989b64969ab7b6d3ce9bdd0ea6aba4c21208ff6bbd095e8094851fb9acddec0c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/tali/tali-3.38.3.ebuild b/games-board/tali/tali-3.38.3.ebuild
index 1fb49b46a61f..205a4139c867 100644
--- a/games-board/tali/tali-3.38.3.ebuild
+++ b/games-board/tali/tali-3.38.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/games-board/xmille/Manifest b/games-board/xmille/Manifest
index 54d6546e45d2..6c1ce9b0d9bd 100644
--- a/games-board/xmille/Manifest
+++ b/games-board/xmille/Manifest
@@ -1,4 +1,4 @@
 DIST xmille_2.0-13.diff.gz 6276 BLAKE2B bf136bc25d3aea56b671b6ff475717d162f0620a1c8c07d3b96b9d7a4b9b9f3ccae1039fc24827048686c631312c36e450a8bd989c32e9d26ab1c594ffc317d9 SHA512 d9e4448942738a105255d9aa77e2e66cb9edc8b35fd8278d1c810dbdca4a5b8a4916bf48c8d6a16e282db0c0fa058a0b281c168976529edeedb6caf53af7cd15
 DIST xmille_2.0.orig.tar.gz 68178 BLAKE2B bd6ab40a8868b90bfc1b045a2be797c8eab49e676b695f521ceaf8646de9c01a07806c0ce029e4959a339e2ab48668635abd5b842c90e33c2cb5fd359eb971b8 SHA512 028740785dfc13b4088810855358b9dab75fbb79221dd4218ef0c19550c2180fe92e553d0a474bf45091b4008988e1a093a6d5bac99fe1ccafcaec3429cd0e8b
-EBUILD xmille-2.0-r3.ebuild 969 BLAKE2B 83b923821852b492b09a1cf30cb9a02b9ef733d0abb713feb7f41df8e9b500a114937dc3626c87805ff24b0c271ebcd9130498e9f576059a5e38f172e70bc77d SHA512 776ae5ac9669743a5efddf1badf2774514f1aa936d2bbc2fa9ed7d252a2cc426ab063517a10f13e5e0dc6169438aeda7ac6fe50d37eecea61c41ee97f0c7a4d5
+EBUILD xmille-2.0-r4.ebuild 961 BLAKE2B bca35cf3d6969e3d97e10e678af4deda476be1916faed0b37f0d6349ade52bb3a8344b5a27b25f7505b8cf68d1a3fcd5ffcc278603a0b868f053f055e65b3481 SHA512 043fce7e5f67b30bcc16b47c078022bdc8fac92d34a58eb2870c05f9a42b796b4d3ad5946d63b776091bb0f51d16b7f0705ca6bff42b0653a0e67ffa34da60d3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xmille/xmille-2.0-r3.ebuild b/games-board/xmille/xmille-2.0-r4.ebuild
index 7821de3430bb..4ca1f38b7603 100644
--- a/games-board/xmille/xmille-2.0-r3.ebuild
+++ b/games-board/xmille/xmille-2.0-r4.ebuild
@@ -1,32 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop epatch toolchain-funcs
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DEB_PATCH_VER="13"
 DESCRIPTION="Mille Bournes card game"
 HOMEPAGE="http://www.milleborne.info/"
 SRC_URI="mirror://debian/pool/main/x/xmille/${PN}_${PV}.orig.tar.gz
 	mirror://debian/pool/main/x/xmille/${PN}_${PV}-${DEB_PATCH_VER}.diff.gz"
+S="${WORKDIR}/${P}.orig"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXext"
-DEPEND="${RDEPEND}
+BDEPEND="
 	app-text/rman
 	x11-misc/imake
 "
-
-S="${WORKDIR}/${P}.orig"
+RDEPEND="x11-libs/libXext"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
-	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_PATCH_VER}.diff
-
+	eapply "${WORKDIR}"/${PN}_${PV}-${DEB_PATCH_VER}.diff
 }
 
 src_configure() {