gentoo resync : 03.11.2021

34 files changed, 89 insertions, 739 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 20af337e9c0c..470466c14f09 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest
index 179106ee5c8c..ea87aea9753f 100644
--- a/sci-libs/fflas-ffpack/Manifest
+++ b/sci-libs/fflas-ffpack/Manifest
@@ -4,5 +4,5 @@ AUX fflas-ffpack-2.4.3-no-fabi-version.patch 1170 BLAKE2B 90e9c080291251d4a5231c
 AUX fflas-ffpack-2.4.3-no-test-echelon.patch 1374 BLAKE2B f62631e7e4e358584a826fb5ec3e9f36b892b5f0636c965677c55a97901ffefe3ad47dea79c46d65bb3090668e335d4f7cfc04cd12bc2b72f1c3c7db45833108 SHA512 9c9ee6e7df7d04fcc5ffc84cd3a2dae08e960540371671cc79c4eb99606bc1fd150a6e0ad96f16a51904ff83fabe69bdc9bfc6e9603855fe21acea535fc31dc1
 AUX fflas-ffpack-2.4.3-no-test-fgesv.patch 1268 BLAKE2B 51c0cf74dac9b296a944e918475807e97a2cf71f066cda9c067b63b344e260b9fbb9ea2851db7ac2170e2b239c0778be0c9a99e0efbbbb9215df921197208784 SHA512 9a57cba58a6bab69092c4d335d92994651bb51d2f4e867d4f0396813e14f492d720232779615299b5203603bb76553ec8a4881ffb9677c349f22c0ef3975df0d
 DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44
-EBUILD fflas-ffpack-2.4.3-r2.ebuild 2246 BLAKE2B 0fead17a7af7d854fd5c594190e404d0ca1da9cd4bf4c2f94619d47b5c275aa0f97e64683e88d8c7dc3495c19fd3fc47b83abf51a98368e1c72a81304fc2524f SHA512 d68841bcdcf7da78ea18a5908089674c1d7cc17bcff1bd9372572ba91407b862d65926d4cf033b62d33af46a19a375f91c36b24f6676390216a00285109ec60d
+EBUILD fflas-ffpack-2.4.3-r2.ebuild 2245 BLAKE2B deb3c0666641c90eb6789d83023b394423c0fa0f3e1167d787d7ba1d68fbeddad9855c1a2e252374990bf0948b99ada21fc8019e6ada0791e8f9b52120b691de SHA512 e12cb9f870745ccc604f2511a71278db867f6f911ee13c8beb4137515b3e0d22845f98fcc1a94a1cfee8e6703f3937151ac258be41cbc109e46dd5db9c216db6
 MISC metadata.xml 1492 BLAKE2B 46a6b13fb1bae6f2aa43a9d7a96c7882d4d7de4b885a4ac92f320f72ce3076ad820c4c5f75c0f2d60334801d2764c20524ea26c1cc6c9975be13e00906708927 SHA512 fc6d90e2945f67a32594f601df69952baec0821d1e529a03c8dc332723848ca531f747efe7c30ea00885c4c4a081cdb81c0ea05085e7ca3acd7db304bb4f468b
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
index d13e3c0f530c..5428716175bf 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl"
 
 # Our autotools patch hacks in PKG_CHECK_MODULES calls.
diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest
index 7edddca25b4c..faff0df8d192 100644
--- a/sci-libs/givaro/Manifest
+++ b/sci-libs/givaro/Manifest
@@ -1,5 +1,4 @@
 AUX givaro-4.1.1-gcc-10.patch 1035 BLAKE2B 460371ff8e628e1945a29d9c6d2b718c7d98b07b023540bc49a439cd941a19191db44536a1514495014084a85028debfb4e714d6d9efd9ae7c7c12687d5f8400 SHA512 3e154b3cf6c11a106f78778eeaaf0c2cfe81e25d18f623b5b071b306f1221c8513f27f87ab3e3684a8b3f18138dfbb516c33691dbb854072a35a0be21ac0bc48
 DIST givaro-4.1.1.tar.gz 1008358 BLAKE2B 246fd1a263174f58d96dd66fa79e6113368b6c318c33d68858a339bd9cb778dfda84636c683ee9d02f2ac72ccff8ac22d395b92741448a8ed2ce08c041ac8ba9 SHA512 7ad15ac24f55ad65c9c5d0d48ff4388d0494e75dc7b66d1e139195cd086ff2371259bdb5df940fead1db2fd378bb76289f2327a8d6f41575d99d424a74cf644c
-EBUILD givaro-4.1.1-r1.ebuild 1797 BLAKE2B 2bc0f4d503d59240a01caa2f4101dbd9fc04e8a0c99ca42befe3f7810e2956816bf1bdbd3eb29ecd5427e41b7893c3172fd3c1de4c67a0b735986eda3cd5300d SHA512 9ba90e4c926b04036effd65e005c8a43cd28e665fd0f97f8cb9f4100bdd3ab8f66ac0ea65e3ea2fba3a3fac877bd7253760c7738716105a680d9987dbe2ee382
-EBUILD givaro-4.1.1-r2.ebuild 1852 BLAKE2B 4769a6d4991897a6d3cbd12879d6930a47cc97e89909d19e35a27db7bcd4e1fc8c8a5877de18ed1e1173affb745e1c14979b04e3b634815cbd9b8fb3cb4f73f8 SHA512 76fae7f9ed7efdc87ce6c0d10349484b97955e9bfdbd4a01f83bb66ae0ad9a732308d61c9b27aef47ed2ff1bc7316c3fe4f920cf88bb0b5252c172027294b316
+EBUILD givaro-4.1.1-r2.ebuild 1850 BLAKE2B 43eb2f568b4169ca1ad1240ef6410fc56773c7790ccf310219b18bb9cc922e3d08617b19748c3e9d3a6cb1bab09e3ba929896a2b7a1b97f06e5236e2082d772f SHA512 03f79aa8a454c4fe1c62901cd7dfd204f813ab8feea3dd98d41c4a341e78bf374a1a8195c5ae29afae0ad2fc04eb81890c862a96d797a988d5f2a04598e53508
 MISC metadata.xml 769 BLAKE2B b407b31de2f554fdf554b2d77c2dd0b1bbf39f36b29fdf565f50362153798c60bcfecf0411247eec556ff6ddc92af0c49e11a9b242b5e3e7b7dcc1066527d08c SHA512 063ccc3fcd55f3d7033fd23efe5095d83784d0e60cca2e1092e534fe06d0e69d5d340a0a25547bddc2962d2906c14a2c996852e2c198124ed007ecdfde4fff2e
diff --git a/sci-libs/givaro/givaro-4.1.1-r1.ebuild b/sci-libs/givaro/givaro-4.1.1-r1.ebuild
deleted file mode 100644
index 6a3e28a1f14e..000000000000
--- a/sci-libs/givaro/givaro-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ library for arithmetic and algebraic computations"
-HOMEPAGE="https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/"
-SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="CeCILL-B"
-SLOT="0/9"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-DEPEND="dev-libs/gmp:0[cxx(+)]"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_configure() {
-	# Passing "--disable-doc" also accidentally enables building
-	# the documentation, so we can't just $(use_enable doc) here.
-	# https://github.com/linbox-team/givaro/issues/148
-	econf \
-		$(usex doc --enable-doc "" "" "") \
-		--with-docdir="/usr/share/doc/${PF}/html" \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_fma3 fma) \
-		$(use_enable cpu_flags_x86_fma4 fma4) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_ssse3 ssse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse41) \
-		$(use_enable cpu_flags_x86_sse4_2 sse42) \
-		$(use_enable cpu_flags_x86_avx avx) \
-		$(use_enable cpu_flags_x86_avx2 avx2)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/givaro/givaro-4.1.1-r2.ebuild b/sci-libs/givaro/givaro-4.1.1-r2.ebuild
index 2e76210dd2e3..06e829557472 100644
--- a/sci-libs/givaro/givaro-4.1.1-r2.ebuild
+++ b/sci-libs/givaro/givaro-4.1.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar
 
 LICENSE="CeCILL-B"
 SLOT="0/9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libbraiding/Manifest b/sci-libs/libbraiding/Manifest
index d38d35e011aa..66df95130787 100644
--- a/sci-libs/libbraiding/Manifest
+++ b/sci-libs/libbraiding/Manifest
@@ -1,5 +1,3 @@
-DIST libbraiding-1.0.tar.gz 377140 BLAKE2B 93520ca1af05dfe77028d3a8d94e94fb4b387662c0f71048db5aa8b1dcc4115996be2ac95108c01a574095cdaba97db1997a65e98a64f87230dda4ae1b6bd8cb SHA512 0fb389d4483b665165bf9ef8dc770b51884eb4ab576c4ca06944080d87ddae806bcf4ebee1fd586f97de171d2ec79c89aeef86ffdeac10eed49ffd0541989ee6
 DIST libbraiding-1.1.tar.gz 377161 BLAKE2B 48a80823f15920fce17c7d67cdc0a7e851855a4d6dfa5e9e461c8ce408c9c73d8aeeeacd27ac1c5f33c4436e8174c6ae9be275a71187d3a9887d37cf3bc8b8db SHA512 3032a290d0c7c0c13519136e111500a9e22f36ae7f9cc36df5a22670f18ebbce03a01e72c81e556ef4f6eea1ccf10e90ba6a9343be4a229e420e2f7da6289115
-EBUILD libbraiding-1.0.ebuild 787 BLAKE2B 70a7d79780f451145b298c1a2955cef6e7c6a105241c5833284cf4e65933b0dbf9e057c7af8b6cb677403ca5303ed2a261abc8347bdbc84732c16a86e4fad24b SHA512 07133513b88cd231bc8ae369b9b7d2913bc0837b73a5ff0793c04e6f5792296f0d0edf7a1329af95a36c96071997871b58b11109177a9e4821fb32fc17e4d6b2
-EBUILD libbraiding-1.1.ebuild 640 BLAKE2B e8fd24a60100f8bac017e9e014add0b1c8a3393194a0984ee372de4ea3a5f6b7d02726b4a0290a8c1a0a633b0362dcfe273117a2fd1b8f687c19adbd1a6d68a9 SHA512 e1ad717b61ed8609edb2561d59c13f43f021f9cd15af1d871b352afac1b12ee11e9004deaa8ad1d41646a01cfb955b95920ae759a410a78e65a87ef1ff571bfa
+EBUILD libbraiding-1.1.ebuild 639 BLAKE2B e154d5f9cfc99515ddca38ae8cae2486b5eac1417a2bcbba9a227d4b0204c446ce1a6fe3aac38adeea0f0a1d9cc786ef970c5fba4d04fa5c79b2812005dd845c SHA512 6fbc25eb5a81fc310c920d582b66739affebc5e0eb9923cf53808446f883ad463b2ce18223a16b1d48625e6af5945b5d6f19569051a50b08a1039c331a44561c
 MISC metadata.xml 1040 BLAKE2B de527a0accea92adf75f22b086920888d621f9c3e24c1a136149af13f4eaa8fdf4127354d6805b5e50d1772c906ff1db7dfd906eb7156908e95b5058c1c490f7 SHA512 cf25e11fae981f51eb8b9a16db8495f49d27e2a1e038e29bdf41f836aa2d56e9204b8912b9725d333ea2e3ba75ab52303e784d6ac3bc82f83f5e44509d71ccba
diff --git a/sci-libs/libbraiding/libbraiding-1.0.ebuild b/sci-libs/libbraiding/libbraiding-1.0.ebuild
deleted file mode 100644
index c2f848f1a9bf..000000000000
--- a/sci-libs/libbraiding/libbraiding-1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Expose the functionality of cbraid as a shared library"
-HOMEPAGE="https://github.com/miguelmarco/libbraiding"
-
-# The github release is missing the generated autotools files, like the
-# ./configure script. Rather than involve autotools.eclass, let's just
-# get it from sage.
-SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.gz"
-
-# A few source headers still say GPLv2, but I believe that to be an
-# oversight: https://github.com/jeanluct/cbraid/issues/4
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="static-libs"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libbraiding/libbraiding-1.1.ebuild b/sci-libs/libbraiding/libbraiding-1.1.ebuild
index 890bf6aaa4cd..5df2a0d47167 100644
--- a/sci-libs/libbraiding/libbraiding-1.1.ebuild
+++ b/sci-libs/libbraiding/libbraiding-1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${PV}/${P}.tar.g
 # oversight: https://github.com/jeanluct/cbraid/issues/4
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/sci-libs/libhomfly/Manifest b/sci-libs/libhomfly/Manifest
index 13178942c5ab..aca8318e5f0a 100644
--- a/sci-libs/libhomfly/Manifest
+++ b/sci-libs/libhomfly/Manifest
@@ -1,3 +1,3 @@
 DIST libhomfly-1.02r6.tar.gz 359354 BLAKE2B 7b60c54e56777dc4b81240cbdd63726591323dc6d841f8d56d641ea304d9a4c1c3ffb3078fc54861f22b5007b36bd32c5f397e2fe8d40f10362eca8d08ba4915 SHA512 44f81815a0ba4c0358d433eb9769944af2ee02790d78aaa08e791d03ba68ba3dcf0389b4287f687211e6a7ba84e1bea3d2ebe69fc8bb4f12d677b7f54872d618
-EBUILD libhomfly-1.02.6.ebuild 631 BLAKE2B 6fc461a2bb6706658f5a0b3c0c193b7bed274c8055e82a7bf52eb32344633b59140976ec69ecb6dd3f84407d3fdaeaa1381f2081bedc5834d3c7bb5ecae1bf15 SHA512 f08f26e98f14a4895bcf9e655350a68d4dab3df8d1c04be90f7e9dc644de6d83a53d1bc20c92b57edb1cb3b89092cdc2a4d2fd8ce011f9d221bd81471de54f04
+EBUILD libhomfly-1.02.6.ebuild 630 BLAKE2B c278d54e79c598f31abfa45539ce1f26e08c92fc928c24c0a370f4207e1d12a550c12e714b1720cbd42fe3144479ec272c16bce1347f940d485c7a3f2e910ae0 SHA512 3ea5fddfea16cc47074b2082921578826b1aa95df5a45bde9979a86c93b7e3fec3c0eb379ab976d41e0c384e4e494ef246d7d9a4f6226dd7e158b046516d6604
 MISC metadata.xml 774 BLAKE2B 338cffc1f9b5c0ad1fd278145378ff8f34975214d9327511e28dad604d9e3cbd767557310e3ec4d73dfb4f88c9c22579942af64f07948a34231840d071350e31 SHA512 8ca83da670dd56a48576a508b55e0f950b92c1a44e8541278bab8be57aa7b2daf37bf456e953fc9578c42ead46f88c5f1830c32a027496f77709a3e680837264
diff --git a/sci-libs/libhomfly/libhomfly-1.02.6.ebuild b/sci-libs/libhomfly/libhomfly-1.02.6.ebuild
index 88332bd13714..9107465b4d8c 100644
--- a/sci-libs/libhomfly/libhomfly-1.02.6.ebuild
+++ b/sci-libs/libhomfly/libhomfly-1.02.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${MY_PV}/${MY_P}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="static-libs"
 
 DEPEND="dev-libs/boehm-gc"
diff --git a/sci-libs/linbox/Manifest b/sci-libs/linbox/Manifest
index d55fdf9e6a61..ecb896cfbf56 100644
--- a/sci-libs/linbox/Manifest
+++ b/sci-libs/linbox/Manifest
@@ -1,4 +1,4 @@
 AUX linbox-1.6.3-pc.patch 1082 BLAKE2B 7d5b055c0622b61245f193eb39d7e52951262c56456dceba5b3e72f54add82b2fc1660c4590eba2c4a97009bd78119893bfccb0909ed5374752f4bf563e75655 SHA512 5739738de34c28fb9970a869ee97a6ab528fd48e3f8b3d82f39966959fa97d6076a44263678d25c06bea3c46e06c8869ba4ea94484d5b57aee3a302df49fd06b
 DIST linbox-1.6.3.tar.gz 1968034 BLAKE2B 55fb83db7da375d8d97f2567c6a120ac48fefc41eb02db68152cc32f1f16009b8c8108a07bbc68087ad2ef3279108db61b48b805c9ce39f4c5f0072ab6e96304 SHA512 ccef3b4c7b9d8f999e5e4ce4e544f22cd869154513827501ecb7e1abf132ff585dfb3315cced963abe842feecda9331dda9081efb3948987365d338223a8305c
-EBUILD linbox-1.6.3-r1.ebuild 3335 BLAKE2B 0945362c28a3795236aa967ead174b193df3de5080cdc8426c0bd9eb596674aadf7a405cacdd7af327e4ca3583e5a668318caeca3f3fe10cd1c2b0bab8dbcac6 SHA512 be8ba12c5e8d51b535965a798fbd39bc969956883e3743ff3ea49ea9730379b9793a40bce38c6ae8d3d651d777d4698a6daecb9b0a53459ca86b39e5a9a2f993
+EBUILD linbox-1.6.3-r1.ebuild 3334 BLAKE2B d9332c8bb46f771c217e50587bf4aa59617e97188a41cf555970ddc04d0eaaef4178cd5a9eea4093acdf7395e8849381a54482ce67512c129b57c9aa05458f89 SHA512 9ddc67db13986a2a78e778785a15a72b9fc30b270aea68c8d2af2e0e0a0bdc9264f27717b981aed9578fdbf2fcfd603f054316d8edd1eb3c59a6f3c8d16a1ca2
 MISC metadata.xml 1273 BLAKE2B 44f0e4d4b7533e7206ec34c2683977ca85a3e4e635f8dd8611f4915e09d004b5faf7639d34ae2807bb1242be19f5c8abc6b3de2913bfe3a5c807560237e2962c SHA512 c29ebb754e2d681dab82a020d12d383dd243a88f704470881b0c471d87028027b7fc3ce9ade55aff211e1e33c7a387539d8f97f428d670e56a73c0021ce42d53
diff --git a/sci-libs/linbox/linbox-1.6.3-r1.ebuild b/sci-libs/linbox/linbox-1.6.3-r1.ebuild
index 75ff120dbae1..1771643dd4d6 100644
--- a/sci-libs/linbox/linbox-1.6.3-r1.ebuild
+++ b/sci-libs/linbox/linbox-1.6.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc opencl openmp static-libs cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/lrslib/Manifest b/sci-libs/lrslib/Manifest
index 5a426568d667..6b17bd449cfb 100644
--- a/sci-libs/lrslib/Manifest
+++ b/sci-libs/lrslib/Manifest
@@ -1,10 +1,8 @@
 AUX lrslib-071b-makefile-cflags.patch 7312 BLAKE2B 1866059b3dfe59221f9448a9025186fce190a547b2ba5c01fc872e8ea4cac497c21c7bcc3dfceea70df7ae7b7d39dec6115e1945b497f9987ef2baa4783bad75 SHA512 460cd8ac278e02c2580581ecfc79d208b18fda77b55a4709076b31579a4533810d5d157c96c96375ed021c373d67d7bd0e3cad3758e0d09d47c3e239b479a888
 AUX lrslib-071b-makefile-ldflags.patch 11708 BLAKE2B 669a6194a3c7ae966bfa0660671a59fa16be6dc5770e0743a27274a6bd2e42f7bd5caa59476ab4bb9d128f2f48ad7d704cd85301f0507235d7f1d711f257f9f1 SHA512 c863e8c30df9b2cd608453430c6a484c94cbd9200ada9161c9a2a8e7994ffaffad125b874318ebd74b4c66e57347f7687db85b461abc75f47b7ebba8b0db2537
 DIST lrslib-062.tar.gz 292745 BLAKE2B 1a2c0e264d590c38d83ee35616b1ec36d8a093b5c7f08179019261d8b321d5b95d8889ca6555ae69853f919d6d66358a865a8a2002516dfd560bec6658f3913d SHA512 1d644a7798580457ff266730f42f6fac317ec8cdf2509ad6028e7a838e5c4c948bd0f9499b840c227bad4269f7144ff72b87fe3a19bdb9ad0925ebe4a7bc4f9f
-DIST lrslib-071.tar.gz 460165 BLAKE2B 67be1ffac1c09a94773c69fc2215db19623bc8bc78be74342a1eda497b70eed2d8cb8e9b34ce269177154a4aed6f7bde02f632a536999b24f3116b3e69be456e SHA512 451aa5dada106516aeed1688c1e939a2e216ac760addb483f9cc1d5d4ac62e88af2772a6fa589b217b544621d041d94386a79502483db2eeaf04e90c4a3fd78e
 DIST lrslib-071b.tar.gz 466789 BLAKE2B 57a8abd9d203b1cdc62d6848afa77aa6912d9d720a0dedfbe72ca602ad8ba36d13160f7da7d719e3fa140ba2cb6432d20590ae9ea9b1f66bc2e24c393d9fe1bd SHA512 feafc5726e66c977e917f0b59ae950cdb98dbd84639885b487930aab2a89a7f067a3f39c381acc3eae7206b91255e1befa5551488d8816afc0f8054d801eb539
 EBUILD lrslib-062.ebuild 1102 BLAKE2B 28715334971ebcdf529cb1454259b91fe7b4f08f5adfbb6a69e7f26e77b3a75409e59c3bdad04ec3401eaccee1d058d18c7923d50f2c10ebf954b11400316266 SHA512 fbbe152ec18650aa38811ee467f04e1698baf8e5070258c7d69e2b80a543164ed24ef85f6a22b790c12f8782e56b11371e470637d12f771301c050bb9516b27f
-EBUILD lrslib-071.ebuild 1039 BLAKE2B 4a94c591406d9e4eb5f64476327e09baf8653434bd836b8c95592c6179399d8231f3ecabb0b342e6770fecf886ef20f3bb534b0fa79501fe34a4f6e5b5749727 SHA512 c904206d02dac52865e156d08871e21b4f7cd91aef7e1d21aa7b76ec1cad4d34e06798b4d2983566e1e0acc5db9e2fe0fd29f6de535e7b29af9d211efb88458b
 EBUILD lrslib-071b-r1.ebuild 1349 BLAKE2B 41f7bc2fb58761ab49d6ab888142e9272b16ff3dbe291f2ed64dcb0bef1514e967706b080b559eea4ebc322716048346fbebae5d1cce8a960f39373d26187e5b SHA512 1b93a3e7b399519d1ccc30e141002e5c9049dd509cbe489558063dfee40925aa76457c63e7a40943897d2685657949edb0c15a68a619a65c74acc52e42237584
 EBUILD lrslib-071b.ebuild 1328 BLAKE2B 2583df67a90104c442f382c1a7b3baab92ad7294dd36552fb1fc0fc7c5eee575a1f3d221faf8efea8c6ff35efb7495ae7b72d56aafe1f8821758b2ebe62a61d8 SHA512 f0cf668e6181fcab7887afd6bdfd7757bb2d6dba4c94c980bf132128b070ecdf9aa12e2d1342bd8baf66040e5ff0ef8a18ac9e2999335ec7530e3397b8aed194
 MISC metadata.xml 770 BLAKE2B 79a7016f0c9de246e2873db9026c26f360432b238fd8d380d75830ae7560d56743981f053fef60a2516befef7d9aa6947cb0a3cdb9de077bd6a65a8faa4879d7 SHA512 007d258279f5d48fdc108176f4230958c683cbfaca08a9f16c194b5bccd3d622a6049e7aea0ee7fec65643a0959f948371d0b228501acf9ebbe58ecabf904171
diff --git a/sci-libs/lrslib/lrslib-071.ebuild b/sci-libs/lrslib/lrslib-071.ebuild
deleted file mode 100644
index dcee50eee912..000000000000
--- a/sci-libs/lrslib/lrslib-071.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Self-contained C implementation of the reverse search algorithm"
-HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html"
-SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="gmp mpi"
-
-RDEPEND="
-	gmp? (
-		dev-libs/gmp:0=
-		mpi? ( virtual/mpi )
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -e "s/-O3/${CFLAGS}/g" \
-		-e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \
-		-e "s,/usr/local,${EPREFIX}/usr,g" \
-		-e "s,/lib,/$(get_libdir),g" \
-		-i makefile || die
-}
-
-src_compile() {
-	if use gmp ; then
-		emake
-		emake all-shared
-		use mpi && emake mplrs
-	else
-		emake allmp
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-common
-	if use gmp; then
-		emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-		use mpi && dobin mplrs
-	fi
-	dodoc README
-}
diff --git a/sci-libs/m4rie/Manifest b/sci-libs/m4rie/Manifest
index 5d0d52ac0f37..2a4cbcdf75d6 100644
--- a/sci-libs/m4rie/Manifest
+++ b/sci-libs/m4rie/Manifest
@@ -1,4 +1,4 @@
 AUX m4rie-20200115-link-libm.patch 654 BLAKE2B af7ff7b56c14078817b6a12a8184c81e1547a0c75b682d7398a040645be7e392ce3f923be56110bbf282f0ed729aa5ea2fadb23d6815aa96370d99ba29f7b2b6 SHA512 6d85c998f0f2f85c9f3cb77861318eab31b38bcb88ff3133fc3bbef0492fcb412e832d92f5d76c63aa3c979cd21e55164a2a53bc08c67da6f22bd1d27d08e883
 DIST m4rie-20200115.tar.gz 500702 BLAKE2B d8b1506ef9902def6577851a97dd6f7da986dce39b3250f9f9b66f9caf8f811568b7975165fb75b6b8ab3c9faf65d890f7c2254725224266f1250a0bcf18a464 SHA512 22c990cf06de9ac790f82f48e498b2bfc87fdf6834257f4e4a4c44e2446b4226438d21692d654008b58df36d8da746bba04dcf1a3d50e34ccf8c678efd5b642b
-EBUILD m4rie-20200115-r1.ebuild 933 BLAKE2B 12572ed6021b642d2577e7b9bbaffc6521389c018ebcd8d3d50c03a54396c805a91a153fe4575b202a4414596b2fe78a1e3169b3c99e7431a55725f202832b68 SHA512 0243df3b879e999b8b59cd8abc2ddc31dafb9da6eda493ffc9529ec3f512e1467784ecaee3c62db0d5ce01e7c8cfa5752188c3effcdeab63c31e8cadc0f39602
+EBUILD m4rie-20200115-r1.ebuild 932 BLAKE2B 7843792f14c62881b34ffd565116b552d42050dd9b77fb9bcbd688943d212c233a76e23c99a9e7a7dee9538f40cd97849d7682fe44121a33e284c0beccad1ba3 SHA512 5c5ef4be1b62ea57f41abaacc08300652d3d982ec1e55c2e3e10d1b9e5446b0e2132d9ab5e0fb213877af102b53d6446e354df0dbca37bdba1d96d7215ed1ab5
 MISC metadata.xml 988 BLAKE2B 4ea83948391c49d6987869d1546745d4ba7313e051ea42be067d1220a070e8cab72c65508637a80fd0820f3bd7ed1d337f552f4c05d8f2c05b383d6b3c19b065 SHA512 03d5b6411827b46610731d20363b0fa8943f9eb94bf55c458dc7d8b7be9944fe5111e441cd684996e52d3f44fe8c494bdb1bf54430eafa66dbf8cd61144fe7a5
diff --git a/sci-libs/m4rie/m4rie-20200115-r1.ebuild b/sci-libs/m4rie/m4rie-20200115-r1.ebuild
index 35b709324ec4..f89f9de0c3d0 100644
--- a/sci-libs/m4rie/m4rie-20200115-r1.ebuild
+++ b/sci-libs/m4rie/m4rie-20200115-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug static-libs"
 
 DEPEND="sci-libs/m4ri"
diff --git a/sci-libs/nanoflann/Manifest b/sci-libs/nanoflann/Manifest
index d5a6933c651e..80b4702c6051 100644
--- a/sci-libs/nanoflann/Manifest
+++ b/sci-libs/nanoflann/Manifest
@@ -1,4 +1,4 @@
 DIST nanoflann-1.3.2.tar.gz 685060 BLAKE2B 2dd1ed9ae3f766099d86b00e1c84a11d9162930dba91053746177ff39b7c84f770120734a235b25196620f637b94986106d364db300f51c873171e7805849b7c SHA512 937d3787df389efe530060cd2723130251e2ca7937b10f8d770c7b0d21ffd972e6da21b2b9e655c5740d57b4af8f76f0cc6d9ae39527c440be8863be0deaa7ed
-EBUILD nanoflann-1.3.2.ebuild 731 BLAKE2B 2aa9846e59d384b3a9ea5adf66fe2f876ee15172853567a13edbca47de237821a1281277fb6e07203e4648d0703724ef6f7efd77da59a922161fd042d53fc048 SHA512 a32e282fd61c866a3d61c2febd88b922639e6703444a102c0295a5fe968f6ec3a90c8d7acd8674c0f0a17bf9507d316a9622f05be365cd1b33272e9218b2ca29
-EBUILD nanoflann-9999.ebuild 731 BLAKE2B 2aa9846e59d384b3a9ea5adf66fe2f876ee15172853567a13edbca47de237821a1281277fb6e07203e4648d0703724ef6f7efd77da59a922161fd042d53fc048 SHA512 a32e282fd61c866a3d61c2febd88b922639e6703444a102c0295a5fe968f6ec3a90c8d7acd8674c0f0a17bf9507d316a9622f05be365cd1b33272e9218b2ca29
+EBUILD nanoflann-1.3.2.ebuild 733 BLAKE2B bd2322efe8011b1504f45396b3f295d8a7ef615e16dcfb70d619726a59ec858ed274fe7dd63b4c4e894b7a4df00989ef46ee4b5ba50a23effa5951e8c231c94b SHA512 7d15b48c009e117e6a06db896b106f1eb4d3122ab08a854b63b46dae7c25a82e0642cbf9fa770545528c090f00e91e67ba24bf56c1333a4a52f66764069db371
+EBUILD nanoflann-9999.ebuild 733 BLAKE2B bd2322efe8011b1504f45396b3f295d8a7ef615e16dcfb70d619726a59ec858ed274fe7dd63b4c4e894b7a4df00989ef46ee4b5ba50a23effa5951e8c231c94b SHA512 7d15b48c009e117e6a06db896b106f1eb4d3122ab08a854b63b46dae7c25a82e0642cbf9fa770545528c090f00e91e67ba24bf56c1333a4a52f66764069db371
 MISC metadata.xml 687 BLAKE2B a0313cc046be04fdd386c7ba98ae91cd2712c7d79477f7f99479ce15c90779a3e50077259d3cd28a01b1759ae5aad497cbca6ded1adffbf2ba9e8a60220ffb4a SHA512 224495d0327860adc0a8630d6b098e56ab46c0a64fdb15f3fa4e5ce3d963756469da9849777138fd5683b311619a3d25e98b7927e687454b78d5cd55db4b6f58
diff --git a/sci-libs/nanoflann/nanoflann-1.3.2.ebuild b/sci-libs/nanoflann/nanoflann-1.3.2.ebuild
index 0e91a4124d0e..c18cb819c4ff 100644
--- a/sci-libs/nanoflann/nanoflann-1.3.2.ebuild
+++ b/sci-libs/nanoflann/nanoflann-1.3.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jlblancoc/nanoflann"
 
 if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://github.com/jlblancoc/nanoflann.git"
+	EGIT_REPO_URI="https://github.com/jlblancoc/nanoflann.git"
 else
 	SRC_URI="https://github.com/jlblancoc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/sci-libs/nanoflann/nanoflann-9999.ebuild b/sci-libs/nanoflann/nanoflann-9999.ebuild
index 0e91a4124d0e..c18cb819c4ff 100644
--- a/sci-libs/nanoflann/nanoflann-9999.ebuild
+++ b/sci-libs/nanoflann/nanoflann-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/jlblancoc/nanoflann"
 
 if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://github.com/jlblancoc/nanoflann.git"
+	EGIT_REPO_URI="https://github.com/jlblancoc/nanoflann.git"
 else
 	SRC_URI="https://github.com/jlblancoc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index ce67d9e87096..df3c3defe15f 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,9 +1,3 @@
-AUX opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch 1104 BLAKE2B 6feb1d9a4f4424a1e2df6d3056d73308effd5b53d805a0e14de65a4b7d72c767ba6666df738484ee036bc9b054674d0a714e58874f4426ba7deb81269ee183e5 SHA512 f12ad8bfe9adf5fa89db6dc789a9627facad1e78a4ca448637cd4f61c6ec738967f96c7d0aea01276aa45dff9a51cd1f0d28de4061a6df2137cf4be470aa6329
-AUX opencascade-7.4.0-find-qt.patch 3349 BLAKE2B 6520b3242927c86c4958f81f8a94e8976fb2cd262318ee7fd7e1362bb95d0d665bbf909108a0526e4d251af045f734a58ee6cfae631b14b139e1a70f7666beb3 SHA512 8d7a758f749794430267e473b6048386bb3b9e4274091f5a5662bfcbaf2c76cdf0c3c2fac4d6e8f03ea300bfe3d0258cb23b8f184de62f153d12a41746f02e75
-AUX opencascade-7.4.0-fix-flow-control-nesting.patch 787 BLAKE2B 929674b6c804411934adbbbf31eba4dc6cd52e15cb9959982c1770244f1edbfc7ff94c832e7e20516f18ef8548488464e15ee1b5d3de70022e9bd1213272c143 SHA512 1ba3f8ab5d62d42d17adc72c371e1a2c0f3d8e996a3f1dfaec1e1a248504592a5ccc27a651640de24f3e47402d4129f77943f3df7117215eacf98f44fa8678ba
-AUX opencascade-7.4.0-fix-install.patch 7870 BLAKE2B 4842ad5123a06a53b81ca80e4152434ee6d78a9eb5436a7a9f899651fcdb45a6f403f31bd6e4225611c1085fb91eb7a5640e5bb3fd49b71295ad0868b8e018dd SHA512 5315e82bd03a8782df8c72bbfb334d9cf739dd53f3aa22649f087c1b8b7fa5f88f7a80850c1f2e0c9dffd80a77dd99fd36e9674463535cbf48b896596c24f38e
-AUX opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch 1973 BLAKE2B cac9a795d91fc55de7fc6b3c9a7f1138b8d8320e1be6879d7de4e63132a0a4e729be2dafd281e64fd52f8e05790dcb8c41bed22b8bc159b32952ad7ef79aa9da SHA512 9dfac105d41775578b6ea51fc74cbf35f9627a10bdfb35f768c09d47d7d06b11d667f231653029d297d40c82444b82d50b3bcd7d3a4520989e416d83eaaaee5e
-AUX opencascade-7.4.0.env.in 4570 BLAKE2B b8a3380e9e821a1560a9a48f566c648e43285fd7695f96e6b4b088271d6a07a4f9d3f7e259860e3b8d8f8f9af1b79ef521b3bd3b1571fd13fb8d2585b35e19ab SHA512 86180a15878e17322fc34a057d2ccb0a1c00af8b4aacc8f80aab3a8ac6b7025a8f1e125b86cc77948152eeac3b6bf786a2ee3622c37f702cd3bea62bb3d11fe6
 AUX opencascade-7.5.1-0001-allow-default-search-path-for-Qt5.patch 969 BLAKE2B 5a13b58f134e8e0670ec817308d95cc9028ac5fce3b243b8e09f191dbcdf15b1587ca8aef7a726b7d9199a708b3a949328d7fc04426e816ce6c05c74b310840e SHA512 4c22f4767ed2b81e21ce7861b6e97d3b1e13e2ebb57278c63d8a9edeae7a2b9518200d39ec30d7000d3ae3b5376a81f08150354be80848247c803208aa28c480
 AUX opencascade-7.5.1-0002-remove-unnecessary-Qt5-check.patch 764 BLAKE2B 512ebf9fd13e60acbc9d47067f158a5043623c52265ff36c216d6735e3a6df9e6355d8bf400330dd00e3ff178b24410aa547ea648ade578f9b9f0dbd6ad0eed3 SHA512 55a452c22addd31b258d078c1871537588b4b06cacabc2cb1252d01b8b9972fb416779456009ea6946935b996c12292aa0ca6d72f8b9bb33407800e5434daae1
 AUX opencascade-7.5.1-0003-add-Gentoo-configuration-type.patch 841 BLAKE2B 6189432e409f20c5181a5ab3e4febd0ec0ddaf1888183d2fe5772f29ff2bece5f499e0987226a2608572a576defa990ee0ac9827d97078a2bee99f2e7e22c053 SHA512 9a4bd753c76abf32d843220210a2f2ffaac82e4e48f359a41f42482dcfbc4d67b349821f801a7886dfb604e87ff6923a0d2fd15ebe76342f8af42b5dbc5d79d9
@@ -12,12 +6,10 @@ AUX opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch 2453 BLAKE2B 0
 AUX opencascade-7.5.1-0006-fix-creation-of-custom.sh-script.patch 1245 BLAKE2B 1972c41e264a86761f8b3a3a649e67211776d0a4791b7e0f3adc859833e1d62e3a1d964484b2c53a516f5a33680ab2f32ad2010bf3fd531fca36373435307b68 SHA512 a2ffef88cb87acbc8215a7d1d7fe69ee17210392d39a64535d1538b2c08e43f5918c5b5e4a7540e8d636b1ba0df51670013e9d49f205bfc93a1e0d10a04388a7
 AUX opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch 5749 BLAKE2B 9176a738ec6b39a1cd5da61f2d72d096b09f6019f63a5b7733c5aa00796529f2cc5e3becdf5c24cfa01e4ff5b9da5ae9cd359372e6974eeaae7bcdf87e8c03c8 SHA512 5f7970e1461652966c34b1adb6e2580cfd7e3e230abbf108193027f67afbd5e78fc7451b50bf632fa3889174626384e4a0044d693e4f49ab9ece84a2ec6bd04a
 AUX opencascade-7.5.env.in 4683 BLAKE2B 4c7c3764e56110c34c9acb9ecb860936049cf03f4ed99d708a8f631b5d3dc7cfa95ca7f8fe8b259986fa637243fe80a6888a2db6a2ad6f80b3b2175a9bb8680f SHA512 773b213e8d7752fc028d951d2a5d5aa610c96ee916499c3655e60f0ec485d393c3bf13a85cae104653242829d8abb9fea451f17bf1b902e1c1fa0bf5b329f08b
-DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
 DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
-EBUILD opencascade-7.4.0-r5.ebuild 3959 BLAKE2B eb0a182ce66c63bd9aa2f57a57275c0e16c1ce4e56777932d7cf7bb6c6f380503e4549f57e4a61e91c4beb0ddf671b6a490a6e7e32cdfb62826be5fbde3d603f SHA512 a83bb2e24376c50b85c355c5d70662c3bb998098af46c9d54a21629da9bb2b2466190cf68955a3f2fc89c9eec504e49760fdc3041a39ca8a7413799e50f4bc22
 EBUILD opencascade-7.5.1-r2.ebuild 4854 BLAKE2B 940352ef80b231890575c29bfdada659b1f46bf360b5ba55558dbee66a12ba6afe9ffff63108fb1fe53c4204621ae3b7165510dd72f7e03b96866395e7d08012 SHA512 8b91d5180b6ea0a100f58274fa7eca2fcc993f1d95d9181030f79eb351db7af6a9abce358815030045354cc59e3a8134cbad3c518ec70b7288271823fdfaa651
 EBUILD opencascade-7.5.2-r1.ebuild 4632 BLAKE2B 486b02a0e64d50749afeef18765b0b66559375f40a38fc6cf93c50beaba5066ed89e7ccfe81e80d06137d248c8d07eb7cb090524b2cb202cb902f2f489ccf0ec SHA512 a551f79d098c305413507c133f7f0009bf9e94c17569341e33f17409456c692eaaecedb34faabcc9c06d0cdb28861514f1f0a2a64b0d835c1ce8fee26115c030
 EBUILD opencascade-7.5.3-r2.ebuild 4632 BLAKE2B 057fe72bfdb34b9fc03965d5ebb9eabd26c7896e3d3133dcb40f4d44a60fb85a2689d20c00bd20a628160fabe9f9a59ba9c819bcd709ba6c1cc0da8c868485a3 SHA512 13ad94752dc5dab5da155efd3ce8495c3154cb5497af5a010b06609740311ce1a6b9257b6eb4adbf14b8188f03b99ac33930310d9717b645a6f2ade2c04fa2f4
-MISC metadata.xml 1075 BLAKE2B ef2b520d3b17f3c74e652d5b8621da87e0e0fce1cd57f3ed9beca402cd41dab95e79e2535103d3dea94cd3a0a8fe7d2983c1243ee3c8727b7d8a2324ae303bd4 SHA512 39cf59672725d33e4c1eae993e1d7612014a3f96285b522601cda9b7757ab5a90d5195c0472e5a6cb5c4d1f7b96e74baab7476e2488dd7cf9f0c85c23a1e466d
+MISC metadata.xml 979 BLAKE2B f5a7d51dd3a85f7409d97671fe8b3ca8675d11f78f3de4c8511d3e7be8d95b7f37bf3993dc21a2e33de0ac8412a57cb4385ec9cd7a37d2dbe3772fbbca298b13 SHA512 eb9673f62eee92feaf2da8ff42887c3cfd7d74558b8a35a5d482809a196211c2a6953c6f23558fdd74f10d6db3f493a4c022a5f8d7b1764e39e473394cf671d6
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch b/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
deleted file mode 100644
index 0d4015cabd78..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2ddba09ea491ae5d18b074a2d1126d44c0a2b1f6 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 9 Feb 2021 22:26:14 +0100
-Subject: [PATCH] [Gentoo-specific] avoid pre-stripping files
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- adm/cmake/occt_defs_flags.cmake | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake
-index 5484c675..4e513ab5 100644
---- a/adm/cmake/occt_defs_flags.cmake
-+++ b/adm/cmake/occt_defs_flags.cmake
-@@ -137,12 +137,6 @@ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
-   set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
- endif()
- 
--# Optimize size of binaries
--if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
--  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
--  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
--endif()
--
- if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
-   set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-   set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
--- 
-2.30.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch b/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch
deleted file mode 100644
index 1ebc1106a31b..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0-find-qt.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 7304c888e57a581e9dc8ef2005e960ec579d58f4 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 9 Nov 2019 17:15:27 +0100
-Subject: [PATCH] Gentoo-specific: disable internal 3RDPARTY_QT_DIR
-
-The patch disables searching for internal 3rd-party Qt. Instead
-system installed Qt is used. The call to find_package uses REQUIRED
-flag for this.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- adm/cmake/qt.cmake       | 24 ++++++++++++------------
- adm/cmake/qt_macro.cmake |  6 +++---
- 2 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/adm/cmake/qt.cmake b/adm/cmake/qt.cmake
-index 6958bab5..b6a9b794 100644
---- a/adm/cmake/qt.cmake
-+++ b/adm/cmake/qt.cmake
-@@ -3,27 +3,27 @@
- # Qt is searched manually first (just determine root)
- message (STATUS "Processing Qt 3-rd party")
- 
--if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
--  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
-+#if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
-+#  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
- 
--  if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
--    message (FATAL_ERROR "... Qt root directory was not found")
--  endif()
-+#  if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
-+#    message (FATAL_ERROR "... Qt root directory was not found")
-+#  endif()
- 
-   # Combine directory name with absolute path and show in GUI
--  set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
--  message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
--endif()
-+#  set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
-+#  message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
-+#endif()
- 
--set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
-+#set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
- 
- # Now set CMAKE_PREFIX_PATH to point to local Qt installation.
- # Without this setting find_package() will not work
--set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
-+#set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
- 
- # Now we can apply standard CMake finder for Qt5. We do this mostly
- # to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
--find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH)
-+find_package(Qt5 COMPONENTS Widgets Quick Xml REQUIRED)
- if (NOT ${Qt5_FOUND})
-   # Now we can apply standard CMake finder for Qt. We do this mostly
-   # to have qt4_wrap_cpp() function available
-@@ -31,4 +31,4 @@ if (NOT ${Qt5_FOUND})
-   #message (STATUS "Qt4 cmake configuration")
- else()
-   #message (STATUS "Qt5 cmake configuration")
--endif()
-\ No newline at end of file
-+endif()
-diff --git a/adm/cmake/qt_macro.cmake b/adm/cmake/qt_macro.cmake
-index ec897384..8bd314a4 100644
---- a/adm/cmake/qt_macro.cmake
-+++ b/adm/cmake/qt_macro.cmake
-@@ -2,9 +2,9 @@
- 
- macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
- 
--  if ("${3RDPARTY_QT_DIR}" STREQUAL "")
--    message (FATAL_ERROR "Empty Qt dir")
--  endif()
-+#  if ("${3RDPARTY_QT_DIR}" STREQUAL "")
-+#    message (FATAL_ERROR "Empty Qt dir")
-+#  endif()
- 
-   if (${Qt5_FOUND})
-     #message (STATUS "Qt5 cmake configuration")
--- 
-2.23.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
deleted file mode 100644
index 7e2bb1d7b2ab..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e69c42386239bcc08143607df12b8bb3f1ff14ba Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 24 Feb 2021 20:06:02 +0100
-Subject: [PATCH] adm/cmake/vtk.cmake: fix flow control nesting
-
-Fix an unbalanced nesting of flow control statements
-for >=cmake-3.20.0
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- adm/cmake/vtk.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake
-index c5692fd6..00b7ff4a 100644
---- a/adm/cmake/vtk.cmake
-+++ b/adm/cmake/vtk.cmake
-@@ -156,8 +156,8 @@ if (VTK_FOUND)
-             endif()
-           endif()
-         endif()
--      endif()
--    endforeach()
-+      endforeach()
-+    endif()
-   endif()
- 
-   if (3RDPARTY_VTK_INCLUDE_DIRS)
--- 
-2.30.1
-
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch
deleted file mode 100644
index edf3545a74bd..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0-fix-install.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 95c7c85f776d6e4764f2146c8385d6e29762043d Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 16 Nov 2019 18:28:11 +0100
-Subject: [PATCH] Gentoo-specific: patch installation paths
-
-Patch parts of cmake to install into proper locations and handle slotting.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt              | 28 +++++++++++++++-------------
- adm/cmake/occt_macros.cmake |  2 +-
- 2 files changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b445de9..1fd5779e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,6 +15,8 @@ macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
-   endif()
- endmacro()
- 
-+SET(CMAKE_INSTALL_DO_STRIP OFF)
-+
- # include variable description
- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vardescr")
- 
-@@ -231,7 +233,7 @@ endif()
- # place the libraries to <prefix>/lib folder for unix and leave old structure for windows
- if (NOT DEFINED INSTALL_DIR_LIB)
-   if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
--    set (INSTALL_DIR_LIB "lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
-+    set (INSTALL_DIR_LIB "lib${LIB_SUFFIX}" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
-   else()
-     set (INSTALL_DIR_LIB "${OS_WITH_BIT}/${COMPILER}/lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
-   endif()
-@@ -315,9 +317,9 @@ endif()
- if (NOT DEFINED INSTALL_DIR_CMAKE)
-   if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
-     if (INSTALL_DIR_WITH_VERSION)
--      set (INSTALL_DIR_CMAKE "lib/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
-+      set (INSTALL_DIR_CMAKE "lib${LIB_SUFFIX}/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
-     else()
--      set (INSTALL_DIR_CMAKE "lib/cmake/opencascade" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
-+      set (INSTALL_DIR_CMAKE "lib${LIB_SUFFIX}/cmake/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
-     endif()
-   else()
-     set (INSTALL_DIR_CMAKE "cmake" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
-@@ -868,10 +870,10 @@ if (${DRAWEXE_INDEX} GREATER -1)
-   # copy draw script to install script folder
-   if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}")
-     install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
--            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-+            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-   else()
-     install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
--            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-+            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-   endif()
- 
-   # copy draw script to CMake binary folder
-@@ -892,9 +894,9 @@ if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
- 
-   set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
- 
--  file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
-+  file (WRITE "${CMAKE_BINARY_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
- else()
--  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
-+  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}")
- endif()
- 
- if (WIN32)
-@@ -1067,10 +1069,10 @@ if (BUILD_TOOL_TOOLKITS)
-   # copy tinspector script to install script folder
-   if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}")
-     install (FILES "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
--            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-+            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-   else()
-     install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
--            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-+            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-   endif()
- 
-   set (OpenCASCADE_BINARY_DIR "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
-@@ -1122,7 +1124,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
- 
- foreach (OCCT_MODULE ${OCCT_MODULES})
-   if (BUILD_MODULE_${OCCT_MODULE})
-@@ -1163,7 +1165,7 @@ endif()
- 
- # Configure and install cmake config file
- configure_file("${CMAKE_SOURCE_DIR}/adm/templates/OpenCASCADEConfig.cmake.in" "OpenCASCADEConfig.cmake" @ONLY)
--install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION  "${INSTALL_DIR_CMAKE}")
-+install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION  "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}")
- 
- # Configure cmake version file
- include(CMakePackageConfigHelpers)
-@@ -1172,11 +1174,11 @@ write_basic_package_version_file( ${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.c
-                                   COMPATIBILITY ExactVersion )
- 
- # Install cmake version file
--install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.cmake" DESTINATION "${INSTALL_DIR_CMAKE}")
-+install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.cmake" DESTINATION "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}")
- 
- # Install the export set for use with the install-tree for each configuration
- foreach (OCCT_MODULE ${OCCT_MODULES_ENABLED})
--  install(EXPORT OpenCASCADE${OCCT_MODULE}Targets DESTINATION "${INSTALL_DIR_CMAKE}")
-+  install(EXPORT OpenCASCADE${OCCT_MODULE}Targets DESTINATION "${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}")
- endforeach()
- 
- # Update generated OpenCASCADETargets-*.cmake files 
-diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
-index 8220ecd5..228d801b 100644
---- a/adm/cmake/occt_macros.cmake
-+++ b/adm/cmake/occt_macros.cmake
-@@ -598,7 +598,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
-   "cmake_policy(PUSH)
-   cmake_policy(SET CMP0007 NEW)
-   string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
--  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
-+  file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR_CMAKE}/opencascade-${OCC_VERSION_STRING_EXT}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
-   foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
-     file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
-     file (REMOVE \"\${TARGET_FILENAME}\")
--- 
-2.23.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch
deleted file mode 100644
index aacb642019ff..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cefaa5bddedcb90a06d6ef8f0837a11619e5d87e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 9 Feb 2021 20:58:43 +0100
-Subject: [PATCH] fix issue with cmake path variables
-
-Thanks to Fabio Rossi for reporting the issue.
-Upstream bug: https://tracker.dev.opencascade.org/view.php?id=32035
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- adm/templates/OpenCASCADEConfig.cmake.in | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
-index 4937103b..db99a8d1 100644
---- a/adm/templates/OpenCASCADEConfig.cmake.in
-+++ b/adm/templates/OpenCASCADEConfig.cmake.in
-@@ -16,19 +16,7 @@ set (OpenCASCADE_MINOR_VERSION       "@OCC_VERSION_MINOR@")
- set (OpenCASCADE_MAINTENANCE_VERSION "@OCC_VERSION_MAINTENANCE@")
- set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
- 
--# Compute the installation prefix from this OpenCASCADEConfig.cmake file 
--# location, by going up one level + one level if "cmake" + one level if "lib".
--# This is made to support different locations of CMake files:
--# - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade-<version>
--# - in Windows style: $INSTALL_DIR/cmake
--get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
--get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
--if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
--  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
--endif()
--if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
--  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
--endif()
-+set (OpenCASCADE_INSTALL_PREFIX "$ENV{CASROOT}")
- 
- # Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data
- set (OpenCASCADE_BINARY_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@")
--- 
-2.30.0
-
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0.env.in b/sci-libs/opencascade/files/opencascade-7.4.0.env.in
deleted file mode 100644
index cf7cc6a724df..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.4.0.env.in
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# This file sets needed and optional environment variables for
-# Open CASCADE Technology
-#
-# See: https://dev.opencascade.org/doc/overview/html/index.html#OCCT_OVW_SECTION_4_2
-# for further documentation.
-#
-# Some of the values are set at compile time depending on what USE flags
-# were enabled. Those values are marked as such.
-
-# define the root directory of Open CASCADE Technology (needed)
-CASROOT=VAR_CASROOT
-# PATH and LDPATH are used to find the binaries and libraries of OCCT (needed)
-PATH=VAR_CASROOT/bin
-LDPATH=VAR_CASROOT/lib
-
-#############################################################################
-# The MMGT_* variables are used to determine how memory management will work
-# in OCCT. All of those are optional. If they are not set here, their default
-# values will be used.
-#
-# Uncomment or change the ones you need to adapt from its default.
-#############################################################################
-# MMGT_OPT = {0,1,2} (default: 0) set at compile time
-#   if set to 0 (the default), every memory block is allocated in C
-#      memory heap directly (via malloc() and free()). Will be set, if
-#      neither the the 'optimize' nor the 'tbb' USE flags are set.
-#   if set to 1, the memory manager performs it's own internal optimization.
-#      Will be set, if the 'optimize' USE flag is set.
-#   if set to 2, Intel(R) TBB optimized memory manager is used. Will be set,
-#      if the 'tbb' USE flag is set.
-#MMGT_OPT=0
-
-# MMGT_CLEAR = {0,1} (default: 1)
-#   if set to 0, memory block is returned as it is. Will be set, if the
-#      'optimize' USE flag is set
-#   if set to 1, every allocated memory block is cleared by zeros
-#MMGT_CLEAR=1
-
-# MMGT_CELLSIZE (default: 200)
-#   defines the maximal size of blocks allocated in large pools of memory.
-#MMGT_CELLSIZE=200
-
-# MMGT_NBPAGES (default: 10000)
-#   defines the size of memory chunks allocated for small blocks in pages
-#      (OS dependant)
-#MMGT_NBPAGES=10000
-
-# MMGT_THRESHOLD (default: 40000)
-#   defines the maximal size of blocks that are recycled internally instead
-#   of being returned to the heap.
-#MMGT_THRESHOLD=40000
-
-# MMGT_MMAP = {0,1} (default: 1)
-#   if set to 0, large memory blocks will be allocated in the C heap by
-#      malloc()
-#   if set to 1, large memory blocks are allocated using memory mapping
-#      functions of the operating system.
-#MMGT_MMAP=1
-
-# CSF_LANGUAGE (default: us) optional
-#   defines the default language of messages indicated by a two-letter
-#   country code. Currently it's not verified if this work with other
-#   than the default languages, so we keep it commented.
-#CSF_LANGUAGE=us
-
-# CSF_DEBUG_BOP (default: undefined) optional
-#   if defined then it should specify the directory where diagnostic data
-#   on problems occured in Boolean operations will be saved. Not defined by
-#   default.
-#
-# NOTE: Only enable for debugging purposes. If set, this variable has a
-# large impact on the performance of boolean operations.
-#CSF_DEBUG_BOP=/var/tmp
-
-# CSF_EXCEPTION_PROMPT (default: 1) optional
-#   not documented upstream (maybe a flag indicating whether the user shall
-#   be prompted in the case of exceptions)
-#CSF_EXCEPTION_PROMPT=1
-
-# The following CSF_* variables define various directories and files where
-# OCCT is looking for resources.
-CSF_GraphicShr=VAR_CASROOT/lib/libTKOpenGl.so
-CSF_MIGRATION_TYPES=VAR_CASROOT/share/opencascade/resources/StdResource/MigrationSheet.txt
-CSF_MDTVTexturesDirectory=VAR_CASROOT/share/opencascade/resources/Textures
-CSF_PluginDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_StandardDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_StandardLiteDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_XCAFDefaults=VAR_CASROOT/share/opencascade/resources/StdResource
-CSF_XmlOcafResource=VAR_CASROOT/share/opencascade/resources/XmlOcafResource
-# The below values might be optional.
-CSF_IGESDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
-CSF_ShadersDirectory=VAR_CASROOT/share/opencascade/resources/Shaders
-CSF_SHMessage=VAR_CASROOT/share/opencascade/resources/SHMessage
-CSF_STEPDefaults=VAR_CASROOT/share/opencascade/resources/XSTEPResource
-CSF_UnitsDefinition=VAR_CASROOT/share/opencascade/resources/UnitsAPI/Units.dat
-CSF_XSMessage=VAR_CASROOT/share/opencascade/resources/XSMessage
-
-# TODO: check those
-# they were defined in the original ebuild but the directories and files
-# are not present in the current installation.
-#CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
-#CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index b0acd7390fe1..fe7ad33b9523 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -16,9 +16,6 @@
 	<flag name="gles2">
 		Use OpenGL ES 2.0
 	</flag>
-	<flag name="inspector">
-		Build the OCCT inspector tool for low-level data inspection
-	</flag>
 	<flag name="json">
 		Enable JSON support through <pkg>dev-libs/rapidjson</pkg>
 	</flag>
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
deleted file mode 100644
index b6dbf4121d02..000000000000
--- a/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO:
-# check the src files referenced in 51opencascade, i.e. resources and the like
-# check where cmake gets it's '-s' linker flag to avoid pre-stripping (QA)
-
-EAPI=7
-
-inherit check-reqs cmake flag-o-matic java-pkg-opt-2
-
-MY_PV="$(ver_rs 1- '_')"
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="https://www.opencascade.com"
-SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-S="${WORKDIR}/occt-V${MY_PV}"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug doc +examples ffmpeg freeimage gles2 inspector java optimize qt5 tbb +vtk"
-
-REQUIRED_USE="
-	inspector? ( qt5 )
-	qt5? ( examples )
-	?? ( optimize tbb )
-"
-
-RDEPEND="
-	app-eselect/eselect-opencascade
-	dev-cpp/eigen
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/tix
-	media-libs/freetype:2
-	media-libs/ftgl
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu
-	ffmpeg? ( media-video/ffmpeg )
-	freeimage? ( media-libs/freeimage )
-	java? ( virtual/jdk:1.8 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	tbb? ( dev-cpp/tbb:= )
-	vtk? (
-		>=sci-libs/vtk-8.1.0[rendering]
-		<sci-libs/vtk-9
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-# There's no easy way to test. Testing needs a rather big environment
-# properly set up.
-RESTRICT="test"
-
-CHECKREQS_MEMORY="256M"
-CHECKREQS_DISK_BUILD="3584M"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
-	"${FILESDIR}/${P}-find-qt.patch"
-	"${FILESDIR}/${P}-fix-install.patch"
-	"${FILESDIR}/${P}-fix-issue-with-cmake-path-variables.patch"
-	"${FILESDIR}/${P}-Gentoo-specific-avoid-pre-stripping-files.patch"
-	"${FILESDIR}/${P}-fix-flow-control-nesting.patch"
-)
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	use java && java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOC_Overview=$(usex doc)
-		-DBUILD_Inspector=$(usex inspector)
-		-DBUILD_WITH_DEBUG=$(usex debug)
-		-DCMAKE_CONFIGURATION_TYPES="Gentoo"
-		-DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}/ros"
-		-DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
-		-DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
-		-DINSTALL_SAMPLES=$(usex examples)
-		-DINSTALL_TEST_CASES=NO
-		-DUSE_D3D=no
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FREEIMAGE=$(usex freeimage)
-		-DUSE_GLES2=$(usex gles2)
-		-DUSE_TBB=$(usex tbb)
-		-DUSE_VTK=$(usex vtk)
-	)
-
-	use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
-	use examples && mycmakeargs+=( -DBUILD_SAMPLES_QT=$(usex qt5) )
-
-	cmake_src_configure
-
-	# prepare /etc/env.d file
-	sed -e 's|VAR_CASROOT|'${ESYSROOT}'/usr/'$(get_libdir)'/'${P}'/ros|g' < "${FILESDIR}/${P}.env.in" >> "${T}/${PV}" || die
-	sed -i -e 's|ros/lib|ros/'$(get_libdir)'|' "${T}/${PV}" || die
-
-	# use TBB for memory allocation optimizations?
-	use tbb && (sed -i -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' "${T}/${PV}" || die)
-
-	if use optimize ; then
-		# use internal optimized memory manager?
-		sed -i -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' "${T}/${PV}" || die
-		# don't clear memory ?
-		sed -i -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' "${T}/${PV}" || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	# respect slotting
-	insinto "/etc/env.d/${PN}"
-	doins "${T}/${PV}"
-
-	# remove examples
-	use examples || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples" || die)
-	use java || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples/java" || die)
-	use qt5 || (rm -rf "${ED}/usr/$(get_libdir)/${P}/ros/share/${PN}/samples/qt" || die)
-}
-
-pkg_postinst() {
-	eselect ${PN} set ${PV} || die "failed to switch to updated implementation"
-	einfo "You can switch between available ${PN} implementations using eselect ${PN}"
-}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index da84a3bea02c..c1fe5fe55c87 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -3,6 +3,7 @@ DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7
 DIST proj-8.0.1.tar.gz 5731452 BLAKE2B d2235f87bead1ec35f62b99e5236d1b6dc1a8f924555d21dec7f5e07b3d341b4b4e797dd5a3843e87d12db392716ec9bb5acae871fa2bb7a78c3404fa9487875 SHA512 cb5550a9fbccfc680bebb3b8c5ad347d53c38cb526edf4dcaa3af0eff57410b4d4d028e246954c4202a1d637e1e6f4e7a6a33e8741e8aa0a58bdfc8a5dbc68c9
 DIST proj-8.1.0.tar.gz 5786723 BLAKE2B 8960ae70beda502442548542173e3f21705c8213ba5b7b3004beca67aa16b7401db4b9778ea4abd910eae3e224b7efc73e0d67b83a3d75aaab0fead51977c9ba SHA512 0c11d43bcdf97fbb3be9238c77cc111ae6df7948dc5076b1a31350c84a60299964ea1a320edfbee0568a2d9d3c7f80eafa6322adfdf99aea5f06172d7ee53a2f
 DIST proj-8.1.1.tar.gz 5797853 BLAKE2B 5ff7640a4727db836b4ed00b36ba914b7f27e0890629dfa9c0cb477c00b74a43b6312ae45bd9fffe75e945689575def021a891110cb43dfaa2dff03624f479c2 SHA512 1f18ad83bae40c6c910900a062bd41c331838add6eebb7e83b4784e4e06fbf48706cee24aadbefe0f138f081ecc02e93a2b6fd45a84806e1372bf2997dafa852
+DIST proj-8.2.0.tar.gz 5880399 BLAKE2B be8be2f1e6b661600479aefa1cd49dfea70085abd37f66a6768cb6cca31c42fcfa43b6d10aca7ac10a5096aba8b8cc1a2a6c744ae767225c38e31b4c69cf7d40 SHA512 e7bcd959deeeb9130325a7bf63a8a0b8de2c55ba573065ca5ea32cf83c2c2643648760cfbe1c3bd1d2a2e74f65ceae4d9d525a537678386260fc2862b3927f5e
 DIST proj-data-1.7.tar.gz 585899744 BLAKE2B 4d5c81ed64a1ee20b8bd7abf0426ced747e9050d8d7548815365d35884dd3952252a716df9d38986e4bb2e450436df206ce7b51dca77ee35a681e4028b11a54f SHA512 03865e972cc5898b3995582e5a5b8d129609b89ef9a077fa775aaf0b2f4a6002605cd657443840d83ffd5f56233d7d248e3442f7d0efdddfd0f90f2959831310
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
@@ -10,4 +11,5 @@ EBUILD proj-7.2.1.ebuild 1215 BLAKE2B 26a84ff93fefa9b88ab8017fa58da6ec89f037beb7
 EBUILD proj-8.0.1.ebuild 1431 BLAKE2B 17e47bd41495796fb1d2c4017fc5ffd074e04dc35acc0e8884aadb157247b91bb4a5efb076fd3c96c3310c4066571afbf385ab73a0b0ee596d22017bfd42ce4d SHA512 fd310ac894ddaac7298bfba6c0308ff6ec496e264b25f584d1024f31ed140af2f25025731779b811b0be7cc3fe26183f17de8fe9ba088a889f57a3e66f66a9a6
 EBUILD proj-8.1.0-r1.ebuild 1498 BLAKE2B fbbdb247cd29bf471e0ba6e2a5fe6b7e171c31e626ba2718e05ed2154643719d239cf4e2e20539134c45c31cfebff26b5bea98d88ce707a61fa30e4cefd08eed SHA512 d3578c54ee71ab99f6994df2aebdbe8b7f33284160ff14a684f7582a6fc9b1008a4ba77a6e04a3ab54c5648d93ae2d243c434bfeda26068d8cc39aab12d0996b
 EBUILD proj-8.1.1.ebuild 1298 BLAKE2B 2880810174ab266045211695a1af20a32289675766f0557eeef14d63a153c1dd3748ff0fb458b5965928507e6182d8e6a7ce077a236e315b9b4dbbafd0fd49cc SHA512 d0bc55182ee6c3f83fd5d1c97a53d80d864eeabdc018862cfbaa18db7bec2eef75b24965120cdbacf4c3ab9ebc8a05868c86fc4cfad152622c16f50bfd9963b4
+EBUILD proj-8.2.0.ebuild 1431 BLAKE2B 556d17bd63e6ea0254e5658b53c8d4d32151f7e85cddcfcf5ff6870e4676210fa3a25b1fdb8e83b75a0a2a54efd3f95833f0cdd20711273b7a9c0e8003e74954 SHA512 fe7ba90d5f4bad18adafd133ebaab2a6bb2707ebe7e08fb1b7196e0fb1695458f81367e8d90271e661ca8e5ee6cee7bc08e9306d4277f364c8d0e35cf27a3cc8
 MISC metadata.xml 450 BLAKE2B a29666b3ab3d0e39d3d2ab247f250cd4f9a716ee1f01563e8d6739f507b96f553187999c6fcd501a0f8e9a564f7e5fe3a54c29dd985d1f91873da8252840ebf7 SHA512 c319fbe8249838dc881424641a19abc639d4a74d585e434be1a27802eb9fa88711a1c631ba92abd333d7baaa739b1c98faebe7c20ce7c1a4639d38b9dbe40381
diff --git a/sci-libs/proj/proj-8.2.0.ebuild b/sci-libs/proj/proj-8.2.0.ebuild
new file mode 100644
index 000000000000..55d9a6ddfb5e
--- /dev/null
+++ b/sci-libs/proj/proj-8.2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+PROJ_DATA="proj-data-1.7.tar.gz"
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj.org/"
+SRC_URI="
+	https://download.osgeo.org/proj/${P}.tar.gz
+	https://download.osgeo.org/proj/${PROJ_DATA}
+"
+
+LICENSE="MIT"
+# SONAME in 8.1.1 is actually 23 (in 8.1.0, was 22)
+# ... and now 8.2.0 is back to 22 again.
+# Please increment to 25 on the next SONAME bump, even if it's not
+# going to correspond...
+# It's far less confusing to just increment it again here (so N+1)
+SLOT="0/24"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="curl test +tiff"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	curl? ( net-misc/curl )
+	tiff? ( media-libs/tiff )"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd "${S}"/data || die
+	mv README README.DATA || die
+
+	unpack ${PROJ_DATA}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOCDIR="${EPREFIX}"/usr/share/${PF}
+		-DBUILD_TESTING=$(usex test)
+		-DENABLE_CURL=$(usex curl)
+		-DBUILD_PROJSYNC=$(usex curl)
+		-DENABLE_TIFF=$(usex tiff)
+	)
+
+	use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	cd data || die
+	dodoc README.DATA
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index d0edb926ab7f..eca220f87177 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,5 +1,5 @@
 DIST volk-2.4.1.tar.xz 315072 BLAKE2B 1ce1d220f9e1e9251332fb6caf7d72eaf3db85009a49434edbf6490b02ab016c4b1eb8677f0e5f446f5783615f2256710621b1806684dffeb1ff441756e4a635 SHA512 7c16a5d750cdea2927c3b08dcad29e19f10932a3b7b35cb25ecc66554d7e441c95906a4746fcf62f895709aee1191f1bb91189c3509b444b6b4ba37a306f9909
 DIST volk-2.5.0.tar.xz 322280 BLAKE2B edbf0f7ffecf08e8f0d8ebbb85a9bc943286c5d022442d0d7e480be4ecbd696a8b2e87e4d16d7133467b429e4894a1d166c534b5a05630cb313906aed8476cfe SHA512 94e5af925d6b6e157445ca80c2ba47a92f5ee681716d2a70a5519caa30a603b3f31a9f1ccbd14ef65349645b56a3f406b4aa1f354c322be60bd76d646a4850c6
 EBUILD volk-2.4.1.ebuild 1000 BLAKE2B 035d863124b1f4d1d471bcb5161edd7b42dd46c798a235110c1c0a43106b2d584d7b58d0889ec49d6e4dda778b94ba4d65a8c97f2915ed05907a0eab08bd2948 SHA512 bededc12c3f7729c94fcbd9eb3f7ecbd455add08bce65d1c826cf50f89f7142e569b6c0fe18567101b95badb6b87a47d022922c90cf4b06deb9db2cc4e565991
-EBUILD volk-2.5.0.ebuild 1000 BLAKE2B 035d863124b1f4d1d471bcb5161edd7b42dd46c798a235110c1c0a43106b2d584d7b58d0889ec49d6e4dda778b94ba4d65a8c97f2915ed05907a0eab08bd2948 SHA512 bededc12c3f7729c94fcbd9eb3f7ecbd455add08bce65d1c826cf50f89f7142e569b6c0fe18567101b95badb6b87a47d022922c90cf4b06deb9db2cc4e565991
-MISC metadata.xml 248 BLAKE2B 289644a08c163016713ef605da208e5e305427bc7e76b65abc70af7167fdb4db34e89b0cfef631a702965e89e85058471b9dbab0abadb6d7bec3c8b2a72f3add SHA512 9030c9a82b92ffa1e5501c40175477a47e724fd841a78019a7a0a7e3bba91f19aaee02d286af9a1d71004f0003f6e2f04abd0f6799d830f76bf12bf67163e631
+EBUILD volk-2.5.0.ebuild 1000 BLAKE2B 90c256a33f65be6a00ab88e42b015368fbc9a48cbf58dbdd2efc90489ddcd204b2f6fba050bbf58b68655d77d28922111b53e730828431a3b5a21d30d5626e68 SHA512 cf32793e963233baf10950d2b690bf3b4c910c5bc1ed5860fd584603ce0531515ebece9ed6ecbd147d9d28996d101b8144e8f70b8903b806d4ae7bf8efce08ea
+MISC metadata.xml 326 BLAKE2B add10950a24964807f5b5c4696f3852da2c19337e5db075bc1e2f9ba597812ac2b8e975b1747bf7a6a0e57420a9ea70f721d117f452c7971bb9a47765274938d SHA512 a5ce5f748eb162e852281a9a043c1bec629448da7f2f0a211f81c6671dbc10677aab06446fe9e1cd4105049ef95acbd03276d53472fbf73a8c3d608ea649787a
diff --git a/sci-libs/volk/metadata.xml b/sci-libs/volk/metadata.xml
index 97eff4632a18..7bac8b85cf68 100644
--- a/sci-libs/volk/metadata.xml
+++ b/sci-libs/volk/metadata.xml
@@ -5,4 +5,7 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">gnuradio/volk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/volk/volk-2.5.0.ebuild b/sci-libs/volk/volk-2.5.0.ebuild
index aff22b50715c..c60b99d87b2b 100644
--- a/sci-libs/volk/volk-2.5.0.ebuild
+++ b/sci-libs/volk/volk-2.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 #https://github.com/gnuradio/volk/issues/383
 CMAKE_BUILD_TYPE="None"