gentoo resync : 30.10.2021

10 files changed, 68 insertions, 29 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index eea2f3c3da2e..a975c0839075 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index c94b149b0c0f..b616530ad512 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -3,9 +3,11 @@ DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a1
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
 DIST Geekbench-5.4.1-Linux.tar.gz 93161586 BLAKE2B 3d7c1915b6eeb83f5e7c3f2ab2e3d863d0e1e9252d76a612d58f2549e0c2ef664d1ebade93d2eaca336e78d54641768d1cfc9d9d736eb00c7457d312af565ab2 SHA512 b1a6634c9173254aa46111b06367dbc13aeb0813ba53b770a1dc7757140c1821c03dee566f40c0378d79f8658ff4c06bfb8170be631c2d95c2e367d239554492
-EBUILD geekbench-2.4.2.ebuild 1029 BLAKE2B 325e02bfccabae6f54f24fd7a5f601517eebaec7e51f6d9c4fb15adead8eaa255423fd69a2ed0788fa6e407c4cc7c228e23c2357f4d3699f2f1f725770eee79b SHA512 19d8807a97e5bfbea9155857740c2c3c6138c6366f426defde44976a224f89c48b7dd366bd1ec1079b49b45df0c0aaefaae6e5ca8d367a3034c2c26296385a53
-EBUILD geekbench-2.4.3.ebuild 1089 BLAKE2B 010a26131e1de8b5eb4d7735f10603dc9bcef864ee688b9ba71e6d20c79424b9818b0a99a33d0ad48804872964b4ecce0e69c5a6bafaba865c03a057a6f76e97 SHA512 58ced2485af8de54dfc1a6736b0ddac21089f208c895665aa043efc381a9f04db359bcc0c2db360455b6a55b02d0bcc489c7a65c9414f43d9006b821ce3e6a02
-EBUILD geekbench-3.4.2.ebuild 1089 BLAKE2B 8512afa8c9dc00969d53b4b743158ddc1f5abb94dcfca1312a55e5a75b4204abc67ad86d4902dd95fd1139934c7d2c3c83389434b5466cec490608b76870118a SHA512 ecb7293edca2f48939fe0736dc24c1b4ab71601ff434dfdb0b3e85fabeca6f6f64c343d49edc8ab4bd69a09a598bc7122e3b34be30a91de0aebd2521136a17b2
-EBUILD geekbench-4.4.1.ebuild 1083 BLAKE2B 58703fd44f5a9276dcb69c0a976e25afad4e3ff39eb4657dc2650fc804242193618ae6187d526343db8534396e91954d5bbda75a1c6f50ef49471f2c33ea47fb SHA512 82f9440171735d13befa0aa0120d4e722c416d7633ee08a46e7f8089bc177d8b206f546d34265dfd54428cd4c9a17d589f4b322ebd87434183e05c0592c268c3
-EBUILD geekbench-5.4.1.ebuild 1030 BLAKE2B 4d6e7cdc1b6df833af68ac9592fcc96aea1a8a6c7612add61df7c8f61a967c6c9d4992fa8b8e279dcbbd63dccfd9082aac415f4be4650767e04042985ddee51f SHA512 aa160280a524a86e8c78504255cc984a2ba18ca13ec0df019728f54841d18108844bea3e946091c2de3c30ac7f1c01659ac56c56cd7cc4aca77a6e01ae72ca2f
+DIST Geekbench-5.4.2-Linux.tar.gz 93166278 BLAKE2B bc3abcf6fc8fbabdf8084085694b594d177537624310b962e55d7ad4128d67c1b0f03f11c5dd4d5e714e71f700d25e689601c2137c3b4d25322d683a0e7ff401 SHA512 f1e38ceca1c6c3e670409563e32ed24e6eac0038fb1d61e839e29975b09f9505c1bcd18dd5b8064a952f49053e298e7135cd9639ffa41dfe07ecbb2601647dfb
+EBUILD geekbench-2.4.2-r1.ebuild 1028 BLAKE2B 75e84bed9e787a465867397f183eb8bcbd100a91c9ce5610bbd4b11b92ebf13aef9227fa8c8c06012a773bb872daa20c9bfc4754aa6ef9f1d16121f2ed2815b6 SHA512 497985b5c7a877473fa89ead3e04dfba6bb8a1df2042eaedc1964ee5dfbc3c4685fb389a96d9b1cda93f4badb174719af7765646cd6b957ed657dbf50c08337a
+EBUILD geekbench-2.4.3-r1.ebuild 1088 BLAKE2B f6699780652748451d42b106a2c74b5113778066ff83b92bf216e9da4efe63527cd454f84046be456d6e9266f4ee85efb4c3655f45bbe4e4ace3ab9867cc847c SHA512 1f8b1640a4e121767e51b6c4fcd9ff77cd60fe37f5010fb7bbb670d763fc1166beaefb5ec74b4acf8390ccc19956d1f9945151af61c37f7f2767c5f47c53c2c6
+EBUILD geekbench-3.4.2-r1.ebuild 1088 BLAKE2B d822b727b3fe1703fb60d48dec922cb34d9585b1500f3068d24712261bee6fb3bc0c0837316e286d593ed399b91cef8d4debcbf2c52728fef7a1a4e1d5bf5ba9 SHA512 c1f2e1fe7d45cef07586c0a82e3893229376136a6aed394ea9ac5712c0d69216226c31ce10bb81c3d8d66f46d32a83869e9df14e065ff169c8f6c172c4f3cb85
+EBUILD geekbench-4.4.1-r1.ebuild 1082 BLAKE2B a2ffb958cf707996944a6a1afd1a84d0fb6ea200de5f9bb28e09d5df3ee8d8ee247b3607bb823ab3311f4ed40b7f91d6b793ec8f5f66f058559cd9c90bb9fcad SHA512 be426669bf92c82d74eb2539529925f8fbfcae05ed80bc7d004677f5ccffc8fae870897f2dca4f31321dfb940f6f0646d8b0a86bbb61eb1d17d3836bfa0a54aa
+EBUILD geekbench-5.4.1-r1.ebuild 1029 BLAKE2B 2c0f88dc035fa2865098f022d5d3aee83066e0c87cbf4770c39e6ee5a41406ff4c492b7ef1ac6293eb9ef4c2e95219a82f77eaf80949bc750297ec9f1d940fe3 SHA512 c09af2ba3e043276fb8a14eb7c8bb309b173c63739275b53147e96e6841cfdd3efd28fe4dcffbfdc493f13ad5b6e9487c7623b92c0e1f240b05c362e12fc6881
+EBUILD geekbench-5.4.2.ebuild 1030 BLAKE2B a08dc430269cb372146dead0e57b02618765718c77fa221caf21596686161428f719576985202fd40de257522457b4378cf20336986ff27e840d4123d1fb7e14 SHA512 1a5e2a5e0aec66bcde70af612f1b04936ab762b64a224862ad50f7f34beb330b9f1bd5e3c2db76625c5f455c390a66bc683f3e0320fd640e39cea03fe16ca466
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/app-benchmarks/geekbench/geekbench-2.4.2.ebuild b/app-benchmarks/geekbench/geekbench-2.4.2-r1.ebuild
index 72a97542161a..0b1ff2c7cfc8 100644
--- a/app-benchmarks/geekbench/geekbench-2.4.2.ebuild
+++ b/app-benchmarks/geekbench/geekbench-2.4.2-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
 HOMEPAGE="https://www.geekbench.com"
 SRC_URI="https://cdn.primatelabs.com/Geekbench-${PV}-LinuxARM.tar.gz"
+S="${WORKDIR}/dist/Geekbench-${PV}-LinuxARM"
 
 KEYWORDS="-* arm"
 LICENSE="geekbench"
@@ -13,8 +14,6 @@ SLOT="2"
 
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}/dist/Geekbench-${PV}-LinuxARM"
-
 QA_PREBUILT="opt/geekbench2/geekbench opt/geekbench2/geekbench_arm_32"
 
 pkg_nofetch() {
diff --git a/app-benchmarks/geekbench/geekbench-2.4.3.ebuild b/app-benchmarks/geekbench/geekbench-2.4.3-r1.ebuild
index cb416e92c5c5..57304c2b28df 100644
--- a/app-benchmarks/geekbench/geekbench-2.4.3.ebuild
+++ b/app-benchmarks/geekbench/geekbench-2.4.3-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
 HOMEPAGE="https://www.geekbench.com"
 SRC_URI="https://cdn.primatelabs.com/Geekbench-${PV}-Linux.tar.gz"
+S="${WORKDIR}/dist/Geekbench-${PV}-Linux"
 
 KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
@@ -13,8 +14,6 @@ SLOT="2"
 
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}/dist/Geekbench-${PV}-Linux"
-
 QA_PREBUILT="opt/geekbench2/geekbench opt/geekbench2/geekbench_x86_32 opt/geekbench2/geekbench_x86_64"
 
 pkg_nofetch() {
diff --git a/app-benchmarks/geekbench/geekbench-3.4.2.ebuild b/app-benchmarks/geekbench/geekbench-3.4.2-r1.ebuild
index 7b396a012b92..1dd285154c72 100644
--- a/app-benchmarks/geekbench/geekbench-3.4.2.ebuild
+++ b/app-benchmarks/geekbench/geekbench-3.4.2-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
 HOMEPAGE="https://www.geekbench.com"
 SRC_URI="https://cdn.primatelabs.com/Geekbench-${PV}-Linux.tar.gz"
+S="${WORKDIR}/dist/Geekbench-${PV}-Linux"
 
 KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
@@ -13,8 +14,6 @@ SLOT="3"
 
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}/dist/Geekbench-${PV}-Linux"
-
 QA_PREBUILT="opt/geekbench3/geekbench opt/geekbench3/geekbench_x86_32 opt/geekbench3/geekbench_x86_64"
 
 pkg_nofetch() {
diff --git a/app-benchmarks/geekbench/geekbench-4.4.1.ebuild b/app-benchmarks/geekbench/geekbench-4.4.1-r1.ebuild
index cde1b3d69e92..19a34c7d6a7a 100644
--- a/app-benchmarks/geekbench/geekbench-4.4.1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.4.1-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
 HOMEPAGE="https://www.geekbench.com"
 SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
+S="${WORKDIR}/Geekbench-${PV}-Linux"
 
 KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
@@ -13,8 +14,6 @@ SLOT="4"
 
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}/Geekbench-${PV}-Linux"
-
 QA_PREBUILT="
 	opt/geekbench4/geekbench4
 	opt/geekbench4/geekbench_x86_32
diff --git a/app-benchmarks/geekbench/geekbench-5.4.1.ebuild b/app-benchmarks/geekbench/geekbench-5.4.1-r1.ebuild
index 87ca7c029dbb..2c4984b7d2ab 100644
--- a/app-benchmarks/geekbench/geekbench-5.4.1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.4.1-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
 HOMEPAGE="https://www.geekbench.com/"
 SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
+S="${WORKDIR}/Geekbench-${PV}-Linux"
 
 KEYWORDS="-* amd64"
 LICENSE="geekbench"
@@ -13,8 +14,6 @@ SLOT="5"
 
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}/Geekbench-${PV}-Linux"
-
 QA_PREBUILT="
 	opt/geekbench5/geekbench5
 	opt/geekbench5/geekbench_x86_64
diff --git a/app-benchmarks/geekbench/geekbench-5.4.2.ebuild b/app-benchmarks/geekbench/geekbench-5.4.2.ebuild
new file mode 100644
index 000000000000..099604ac1c64
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-5.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com/"
+SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
+S="${WORKDIR}/Geekbench-${PV}-Linux"
+
+KEYWORDS="-* ~amd64"
+LICENSE="geekbench"
+SLOT="5"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="
+	opt/geekbench5/geekbench5
+	opt/geekbench5/geekbench_x86_64
+"
+
+pkg_nofetch() {
+	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	exeinto /opt/geekbench5
+	doexe geekbench5 geekbench_x86_64
+
+	insinto /opt/geekbench5
+	doins geekbench.plar
+
+	dodir /opt/bin
+	dosym ../geekbench5/geekbench5 /opt/bin/geekbench5
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench5 -r <email address> <license key>"
+}
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 86d5b4096db3..4e3c9effa60b 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,3 @@
-DIST stress-ng-0.13.05.tar.xz 590340 BLAKE2B 214e98ef5db575a0835ccef15d9145bba6d25774bb26ce1ac2ffa3b29309a62416752b298ccb5b1ce91ad40a3c68dee7ada7c59fd85c06d8372e24c72a927480 SHA512 39a1622d63e88a1d0f535b36c57a01f734e686a3f4f2dc9dcf69154e7b0e4986c6bd654a42803cc3dc0e9a22151db9e2ae79a772758e9d80beb22bd39492d13a
-EBUILD stress-ng-0.13.05.ebuild 864 BLAKE2B a5fd3d9ba6d3e82ac303fef88418b915f0a883d8808d747e0d68434b2f2b17795e895babb46c0498d5c1c0a215c88ba43060b60626d218f80f17229601b72985 SHA512 7934595a8a43430c8ef6c24f895b476a7444ef0e04e5d0f29efcf0ac72f38ce0f7b472916aa6fd3af56d79f6b1299d2a48931a748376f436e2062823a5345fba
+DIST stress-ng-0.13.06.tar.gz 1014981 BLAKE2B a93ff571919707568cd0162479e47c6241b4081713cfa88b30594227d01f9af2a6e3ad759ba62f5f5485322d68768ba1ea19087d07281fa1c2b949bcac99f70e SHA512 7aefc794edaa5799f96dd4afe099b747d532e4367bd372b9ed29db03f8276322113509fdd4885500864d292beeb9f407dc3f2ef2a04f92b65f240ee73eb174bb
+EBUILD stress-ng-0.13.06.ebuild 887 BLAKE2B 79e1a5abfefd3a3aae4aa62926d5ba7f8ed37936178a7918088271d55d3b25a74bd5d174c2d08db015d3294fd8f45ce868c1c132b041d8da9b048ac54ab196c4 SHA512 cc51cb4c9b0a623103b7f1a4b6ff0ddef61ba87d3ec28a81bbc21a3c3e6d7bfddbe09f5963d1c126e804c4cd9b84f4163dde6a03ccd80c0d37b23f52481468c0
 MISC metadata.xml 835 BLAKE2B 88b503bcc225861dfd5a5e016bc0c6df87d13e758f9eb8d73103deb5f1d88163f260f24efcb4988a245b1ea2888e18da86d031d52c9dcdc702dbd9a7c510b691 SHA512 dfc8c9cb83e0960fd0881affc5cd12fe843743faa92e3af0edf0ba86ad8107de60669cd32e156be9ea645a817f38f7091be2b9c870902e7109f937e584feac99
diff --git a/app-benchmarks/stress-ng/stress-ng-0.13.05.ebuild b/app-benchmarks/stress-ng/stress-ng-0.13.06.ebuild
index ec9f38a8fde6..a91c3da6c136 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.13.05.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.13.06.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit optfeature toolchain-funcs
 
 DESCRIPTION="Stress test for a computer system with various selectable ways"
-HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
-SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
+HOMEPAGE="https://github.com/ColinIanKing/stress-ng"
+SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"