gentoo auto-resync : 15:02:2023 - 01:59:31

5 files changed, 42 insertions, 23 deletions

diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 6945897ebe34..3e4b53fca06a 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -1,15 +1,17 @@
 DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b3320303258a5dcc6f169cee0134f1114927ff52745d5f6c0b5d604698e45a464a157454a249cab8e3114b01dad3f7b693ca45a5b0b SHA512 0acc0ce61aa5d2575976c66aeae6ebb88ba895dd89c07daf55e2c7af344858a620336f3e79ccfc5e7b8829caa9d600f97a35a4d6e4da630d19d723dd887fdafe
 DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
-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-3.4.4-Linux.tar.gz 9998564 BLAKE2B feb3b2c9b2c57c1a71bb51481107529ba562732aa583bd675fcfc20aed39c42d09410e311a9d8fcfd7c42e289d0b4da3f2f71228d304feb42a7a7d309add221c SHA512 cf1453be244a0ae32c0c4fcd5e42fd0faeb7b4273287390e8fb1c4c29d14ad4d0ecc63eeaa0fd008c720e6f8ff67c8296c90718d7870c31a826bd69c30556481
+DIST Geekbench-4.4.4-Linux.tar.gz 71089467 BLAKE2B 257f79644e20189950fb7c9121e32337526e0c9bf5b0f0f66568c107e2a15c65459eecd332bea4fcbc2d9bb1287bab0e4f37b2100f419ffa52c5396828d86c38 SHA512 c43e1d658d361347efb012824ff0b81975ace35c866a1c2a227adeb86167292b639f19e8fe190d2f0de395f19280a99cb20342325177222f634c9e71c9226e78
 DIST Geekbench-5.4.6-Linux.tar.gz 93188716 BLAKE2B 6a38449b8b494fe878d2c583838c2cc95eef736a174231d8ab25b616c39b8deb4edbadd5f9545176a01a9fff55935f20c572fb9cb3902dddc2fad2836cba5166 SHA512 6c1bc9db284ee4dea282f329b08bc75172c92951d1d43131226eaa42e05e1e39e11d34fe0c3d29f45e6b421bea16a102170a631a4b11a7a3d026024171ba5ccb
 DIST Geekbench-5.5.1-Linux.tar.gz 93199992 BLAKE2B e2ff24da19134778dd1b3036ac3fb8b2d99746dbe41b1959cb74522613a7b9a8a0e3796d22351af877a9ea7a734c6b101a0ffadfd3bbc2e29fb9b12e59106848 SHA512 0fd90d55eaaf178e4c981ef6ef54808d1ff86edc92c907a5d8e2a3a379c2289e614d917db330a3d748c818bcedb2dc69cad250b1b98ba80287c6d9a66382bcc4
+DIST Geekbench-5.5.1-LinuxARMPreview.tar.gz 111581640 BLAKE2B be413e306a77c0612be380d0ec0d589067365ac1c4091b55a08b722d469180c9cf9126cc0597e3f3c8a75acf77d2a0423bc43b753f30a219924b1a7df640243d SHA512 1d76b9a7928f89f1fdfa0e3cc9859c305e109cbbe72b013b4c249b03722273c985ad1e5d818341a6e399e9e7b3c61136856df87c9f5e61bcc9e7e0455f80e61b
 DIST Geekbench-6.0.0-Linux.tar.gz 258039528 BLAKE2B d77b8920f7b935b1db5023b58624fa7c3f0596c0ac8413725e23765e191e5225cb0862d0bd722b5f40056fe3027f417bfa2e97519930e2ad3ce3cd896e8cdd12 SHA512 e3e724c7dad7879a5be3d885dc1a163b3d84d78bf60b501279c289aad55c610c9634ecfa46352b0ea9ad7946129e1cc97d8ef4f5970888f8ee03fcd7a2bf9475
+DIST Geekbench-6.0.0-LinuxARMPreview.tar.gz 222261452 BLAKE2B c7f58abaabdbb8ed3800862b186d6415cbcaae5cc36220cbb5872b0dfcc5236f0bff3c677a48bbc1f9cb8e47d2798c8cc99ca8f9ee2a7913788b7c4c944dfa8f SHA512 dadc476b5e88c608a532b35088d0884a330ab5994fb72085ec0ed70c5bcba641328b5fe1c47d8e0c0d4ef9201329a25d8ae1fddce1fa917a74ad3fcc0a08cf41
 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-3.4.4.ebuild 1086 BLAKE2B ae0d15dba696a0b5e13fbdc11665867cf716784b0a9b2a7457ff76b72d3c9ed319c4f3b4c640864e6239800bb3c011cca213eae93de20184b9ae4704930692ed SHA512 deb2bc643708f9399b09003fbea3497e33fd461af152af97bab66c23f7e10245d43f32217ad39b6677b829e77db53929039495a15d2b3b2a0a319a21200e2aa8
+EBUILD geekbench-4.4.4.ebuild 1082 BLAKE2B f57db98cc6fb65345866324bdd646dceab92b214862137efd45c93dfd505e5f87c781911efae91fc724ccbfa9503abd1827827927e05ad6b87f5c0d737feaaf7 SHA512 e357043fcea4d2f1893d46eaa36407f34e8e98478ed556597cbbc79984a2d96c057a8632e2a3c1e387067f5969648d6050797aee8ad842209b5607dc50fd2b5f
 EBUILD geekbench-5.4.6.ebuild 1029 BLAKE2B 21713100ea8c346ede61964d9abc8b11b46724a52734a11df2ec7b4ca5b22cfabf817ed2a5403db02f89261f85cf331638dfe1c4de1720a3983cfec4905a134b SHA512 9fa94c3d28bf46fcc9c20cd81ff9e35c441522ea670fb2e640b5c245cca66d4b3281002ecb3769e1484490bdba9d39e5f5568288efe063651eb1e78d44685d1d
-EBUILD geekbench-5.5.1.ebuild 1030 BLAKE2B d66a765dc06b14098e8d1fc84bec178ef44e625b2234e977248b1a77c8aa4bba0070a5337e98c29a21796a0e275e01fea8bcc532c3bef12ce01912d0bdd03599 SHA512 8cde83917a46f26f765361ccd95bbe3bb910bda31344646a24b7e0d0c0b7195d246064ed44e903700cad8fd76718c1bc7e6c4d7754252f6211709098cfe87169
-EBUILD geekbench-6.0.0.ebuild 1126 BLAKE2B 8c66773241d356070605d2549130e406c482a13fe0afe0cdd482f9154c321460518dd1154df485e70f09f284efd6c7c5545158682c42782ce63322e8c0f56249 SHA512 5ea83638ae44009db8dbed9bb1a812075a83ea09d9ff290faf6b1394e35b47215accfd3d881beae93dcbce0b7e6a3d09402d87aab5e5df2346e081e6b854c5df
+EBUILD geekbench-5.5.1.ebuild 1362 BLAKE2B 0a758f8e2108d38e83d86551c3652de441a9b1279ad99cb273d812f10ab7784a6cc13055f6aaf40fffd336624140751b176eaa021268672de8bbca016e680f5c SHA512 4885300757e12ae3ef5df8e3eae0597a9b986aa194a3c9c4f6a1ec431e19c8dcb408f8f9241b5a696c4930cfb5f3c83d1500be1938f1b49ebd283eccaf13bac7
+EBUILD geekbench-6.0.0.ebuild 1448 BLAKE2B cc5f9160294cf66eced1213291b80424c6325d63bd1d911afe73ce9a37c1486dc677adf4cdcc121e97b6d600ef2b15b1a1b58d639cc2a4fc61ce5fbbd6cb23d5 SHA512 1180822ecc96a463516c9be15243a0b9129520fbbc5d0e49a06dfc7897ea23a79864c3310c7937849a7d2edd02b51c9111c94e6c7708b8e8688f5b13860c4d53
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/app-benchmarks/geekbench/geekbench-3.4.2-r1.ebuild b/app-benchmarks/geekbench/geekbench-3.4.4.ebuild
index 1dd285154c72..ca2ca92c220c 100644
--- a/app-benchmarks/geekbench/geekbench-3.4.2-r1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-3.4.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 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.primatelabs.com/Geekbench-${PV}-Linux.tar.gz"
+SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
 S="${WORKDIR}/dist/Geekbench-${PV}-Linux"
 
 KEYWORDS="-* amd64 x86"
diff --git a/app-benchmarks/geekbench/geekbench-4.4.1-r1.ebuild b/app-benchmarks/geekbench/geekbench-4.4.4.ebuild
index 19a34c7d6a7a..cfe8d5583c78 100644
--- a/app-benchmarks/geekbench/geekbench-4.4.1-r1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-benchmarks/geekbench/geekbench-5.5.1.ebuild b/app-benchmarks/geekbench/geekbench-5.5.1.ebuild
index f1c02f0121ce..42888fd4a066 100644
--- a/app-benchmarks/geekbench/geekbench-5.5.1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.5.1.ebuild
@@ -5,18 +5,23 @@ 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"
+SRC_URI="
+	amd64? ( https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz )
+	arm64? ( https://cdn.geekbench.com/Geekbench-${PV}-LinuxARMPreview.tar.gz )
+"
+S="${WORKDIR}"
 
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* ~amd64 ~arm64"
 LICENSE="geekbench"
 SLOT="5"
 
 RESTRICT="bindist mirror"
 
 QA_PREBUILT="
-	opt/geekbench5/geekbench5
+	opt/geekbench5/geekbench_aarch64
+	opt/geekbench5/geekbench_armv7
 	opt/geekbench5/geekbench_x86_64
+	opt/geekbench5/geekbench5
 "
 
 pkg_nofetch() {
@@ -25,11 +30,15 @@ pkg_nofetch() {
 }
 
 src_install() {
+	local MY_S="Geekbench-${PV}-Linux$(usex arm64 'ARMPreview' '')"
+
 	exeinto /opt/geekbench5
-	doexe geekbench5 geekbench_x86_64
+	use amd64 && doexe "${MY_S}"/geekbench_x86_64
+	use arm64 && doexe "${MY_S}"/geekbench_aarch64 "${MY_S}"/geekbench_armv7
+	doexe "${MY_S}"/geekbench5
 
 	insinto /opt/geekbench5
-	doins geekbench.plar
+	doins "${MY_S}"/geekbench.plar
 
 	dodir /opt/bin
 	dosym ../geekbench5/geekbench5 /opt/bin/geekbench5
diff --git a/app-benchmarks/geekbench/geekbench-6.0.0.ebuild b/app-benchmarks/geekbench/geekbench-6.0.0.ebuild
index f014020673ff..a49619128566 100644
--- a/app-benchmarks/geekbench/geekbench-6.0.0.ebuild
+++ b/app-benchmarks/geekbench/geekbench-6.0.0.ebuild
@@ -3,23 +3,27 @@
 
 EAPI=8
 
-MY_PV="k9ea2vqm"
+EGIT_COMMIT="k9ea2vqm"
 
 DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
 HOMEPAGE="https://www.geekbench.com/"
-SRC_URI="https://cdn.geekbench.com/${MY_PV}/Geekbench-${PV}-Linux.tar.gz"
-S="${WORKDIR}/Geekbench-${PV}-Linux"
+SRC_URI="
+	amd64? ( https://cdn.geekbench.com/${EGIT_COMMIT}/Geekbench-${PV}-Linux.tar.gz )
+	arm64? ( https://cdn.geekbench.com/${EGIT_COMMIT}/Geekbench-${PV}-LinuxARMPreview.tar.gz )
+"
+S="${WORKDIR}"
 
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* ~amd64 ~arm64"
 LICENSE="geekbench"
 SLOT="6"
 
 RESTRICT="bindist mirror"
 
 QA_PREBUILT="
-	opt/geekbench6/geekbench_avx
-	opt/geekbench6/geekbench6
+	opt/geekbench6/geekbench_aarch64
+	opt/geekbench6/geekbench_avx2
 	opt/geekbench6/geekbench_x86_64
+	opt/geekbench6/geekbench6
 "
 
 pkg_nofetch() {
@@ -28,11 +32,15 @@ pkg_nofetch() {
 }
 
 src_install() {
+	local MY_S="Geekbench-${PV}-Linux$(usex arm64 'ARMPreview' '')"
+
 	exeinto /opt/geekbench6
-	doexe geekbench_avx2 geekbench6 geekbench_x86_64
+	use amd64 && doexe "${MY_S}"/geekbench_avx2 "${MY_S}"/geekbench_x86_64
+	use arm64 && doexe "${MY_S}"/geekbench_aarch64
+	doexe "${MY_S}"/geekbench6
 
 	insinto /opt/geekbench6
-	doins geekbench.plar geekbench-workload.plar
+	doins "${MY_S}"/geekbench.plar "${MY_S}"/geekbench-workload.plar
 
 	dodir /opt/bin
 	dosym ../geekbench6/geekbench6 /opt/bin/geekbench6