gentoo auto-resync : 18:01:2024 - 08:07:22

5 files changed, 13 insertions, 12 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 07c5e5793b17..b415ed9416ed 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 4d21dda2f6d3..c25c03ea82f8 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -18,6 +18,6 @@ EBUILD gdal-3.6.4.ebuild 6773 BLAKE2B 0026aafbfe6c57167c17757b99079c5dfd5e116923
 EBUILD gdal-3.7.0.ebuild 7534 BLAKE2B 03e01ea5a593aeb8d2e0d0f46b1e7ebf9c74eaeefdc607d98439d8844ad4fba651f06ad2d88d61e66e13694e812e322c41aa8e25769c97bb99e07efab5911e84 SHA512 84dc8ca6c0a379a7b8e085a79c3a2df9f2427793b58f630001a2d7bd2cb0019e24b2b11543a857ea1e0399cd1e1333caad943de178fad2d2f14cdcb8edf4e6b8
 EBUILD gdal-3.7.1.ebuild 7538 BLAKE2B 1cb6475c1ee6f56ebcb6f6502092554e0681d27838164937ac2c85a5f4bb8841be24c8444cb40465ca9ce6c897b13856562100616f7ba6f422fd268972dd386d SHA512 e4041dcb67eff0e4db3d1e4168c68e65b704fc223242282640c4f3459fb86b6d7a9b25d63381715a829e1ee7130512686f73d92f1a4b562b98e0e5d524033b50
 EBUILD gdal-3.7.2.ebuild 7538 BLAKE2B 1cb6475c1ee6f56ebcb6f6502092554e0681d27838164937ac2c85a5f4bb8841be24c8444cb40465ca9ce6c897b13856562100616f7ba6f422fd268972dd386d SHA512 e4041dcb67eff0e4db3d1e4168c68e65b704fc223242282640c4f3459fb86b6d7a9b25d63381715a829e1ee7130512686f73d92f1a4b562b98e0e5d524033b50
-EBUILD gdal-3.7.3.ebuild 7535 BLAKE2B 07fcc4f7b90fc07d6f7b969bb97633c35c7869968e49f0a578f43c47049cccd02bba5efe5912ce56f05b5e7d10c46db05bdc40b0f2abb7e6952729a7ad0a7ef1 SHA512 3a6afec3922d3a77b84cd3fdde6980412c19563ba4551d8512098bf402defc24697bf06d02787c05257a60ba1a5275ddb7dff24ad3dfd7fd5e9ae003af93bc87
+EBUILD gdal-3.7.3.ebuild 7534 BLAKE2B 03e01ea5a593aeb8d2e0d0f46b1e7ebf9c74eaeefdc607d98439d8844ad4fba651f06ad2d88d61e66e13694e812e322c41aa8e25769c97bb99e07efab5911e84 SHA512 84dc8ca6c0a379a7b8e085a79c3a2df9f2427793b58f630001a2d7bd2cb0019e24b2b11543a857ea1e0399cd1e1333caad943de178fad2d2f14cdcb8edf4e6b8
 EBUILD gdal-3.8.0.ebuild 7598 BLAKE2B d7bb586d028312a1fa9531af0bf4d5e2fc78f025f27c07824809453059f1164010ae20b44a7990c82c8ae490c1337c49264d65a18565c507f56db09d51a23b8b SHA512 b720dda6878cbb1e40ffb4159af99b63e88ddff1214d2ac8a61a7ab921f308288ef1c91ebe55db8f7b4267f892360d8e7daba87051a838d88178f88f816ecea1
 MISC metadata.xml 1297 BLAKE2B 03cb6c5ccc7d2e6ceeaedf24779e9cb4b0dd8ba7c6609604a7d74a05844079d5b102b5413e6d622b79d464784d106665496dce6c0dc902e121382b84596061bc SHA512 df991d15bd43d009c50de6a76af9939b5c6c83b64c4043b52065a77858b8ae77c8287510505b1b80e25c45eb01ccaf276de12db47a8c2b6b22f908a7cb48fae7
diff --git a/sci-libs/gdal/gdal-3.7.3.ebuild b/sci-libs/gdal/gdal-3.7.3.ebuild
index 7ecb057a2331..3b29b3152310 100644
--- a/sci-libs/gdal/gdal-3.7.3.ebuild
+++ b/sci-libs/gdal/gdal-3.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.ta
 
 LICENSE="BSD Info-ZIP MIT"
 SLOT="0/33" # subslot is libgdal.so.<SONAME>
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index 815218e2479f..d93c792c0cc6 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,4 +1,4 @@
-DIST volk-3.0.0.tar.xz 394044 BLAKE2B 04e832916375610571387db521348df2a37f5460500c4bd6d223dd6af9c0a207f3b22c599fccbf9bd51b8a87ed90cb5239512c19fc6ddd02320b7aa27c3be588 SHA512 5d1ff90f28ec6ef2d21370d74025139ccc9872e5a477b271ffe6662725b7705203715ea4ffc430554ec2fec56e8d9b40a945e75186761995d3075218e1f16313
-EBUILD volk-3.0.0-r1.ebuild 1403 BLAKE2B c8db65638b1b66110b995533538de8cc8084355a5653bfacd0e077004b8dbe80400ecccc13a786f883b1c67f397b54db73b55efb54b698064d9b49f92be5acc7 SHA512 a504c1cfe9b6635f4434dbce84704b6829a342f8940b6a6c7852e615fefd3660dae8a01e8df4ba5d4252903071ab113145a293540d4c2d96932a841ffdf690f0
+DIST volk-3.1.0.tar.xz 420088 BLAKE2B 709c3561675b0f71a1400d7b9332aa18c6d2ae848c993914cb40484890f631bde48da12ab9756be38cca9fbb20d0d851cb40ff5bfe3722ff72cd0b4daff1b11d SHA512 0c39c06e5121782461c0ea2c84402c84f9609a2a09ce7218e976472081d09531746ea1cde767f329a69d72d51cf5715bf7f2df1b26a8d8ddd1694e8239f5ff21
+EBUILD volk-3.1.0.ebuild 1292 BLAKE2B 7b96f904a2b5a5967a91027beaea1e5fa8e2b74def6ce15678e26fd72cdeec632bcd74ffbf11a9afd891433b7f6f5be3132607d74c0c21ea189ae41d7deaa075 SHA512 60d54b99e30649de03fc89b3f145afeb69b208075240e5e6762d744fbe6a8b4919b7ad9e718ac1c74ac24d540dc651046160b6f9b57eea4b27cea1d5a2da3eb7
 EBUILD volk-9999.ebuild 1292 BLAKE2B ebbd8ddc6c8fdee7047fe680220ed9d80a18f176d81504f6bd6e1953af78d3d30721c7c4fb420f6d432ab1a6e620b28f2182b4ca01a1d1d75ed095ab0400b1db SHA512 d9816eed7b44cca190fa76edfa9637435766731a7f368ac39ac42c2ea98b317c059261e4f3201098dececb745a5f2e3d30cd8b00817ebc5b5ff744de627cd720
 MISC metadata.xml 326 BLAKE2B add10950a24964807f5b5c4696f3852da2c19337e5db075bc1e2f9ba597812ac2b8e975b1747bf7a6a0e57420a9ea70f721d117f452c7971bb9a47765274938d SHA512 a5ce5f748eb162e852281a9a043c1bec629448da7f2f0a211f81c6671dbc10677aab06446fe9e1cd4105049ef95acbd03276d53472fbf73a8c3d608ea649787a
diff --git a/sci-libs/volk/volk-3.0.0-r1.ebuild b/sci-libs/volk/volk-3.1.0.ebuild
index 39eb8873bba8..0a400d90ff06 100644
--- a/sci-libs/volk/volk-3.0.0-r1.ebuild
+++ b/sci-libs/volk/volk-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,11 +11,17 @@ inherit cmake python-single-r1
 
 DESCRIPTION="vector optimized library of kernels"
 HOMEPAGE="http://libvolk.org"
-SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gnuradio/volk.git"
+else
+	SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
 
 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="orc test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -41,11 +47,6 @@ src_install() {
 	# Remove stray python files generated by the build system
 	find "${ED}" -name '*.pyc' -exec rm -f {} \; || die
 	find "${ED}" -name '*.pyo' -exec rm -f {} \; || die
-	# https://github.com/gnuradio/volk/issues/626
-	rm -f "${ED}/usr/bin/list_cpu_features"
-	rm -rf "${ED}/usr/include/cpu_features"
-	rm -rf "${ED}/usr/$(get_libdir)/cmake/CpuFeatures"
-	rm -rf "${ED}/usr/lib64/libcpu_features.a"
 	python_optimize
 }