gentoo resync : 12.07.2021

24 files changed, 36 insertions, 351 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a09971bc658a..da5d24e31090 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index f811072c9dec..aeb3f36d37f4 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,5 @@
 DIST eog-40.1.tar.xz 3601652 BLAKE2B 6e3ec73742a0de864a131b25b2ed2c3346aecea9455ccbae701d70a50a45dace90d4002c56829e9a831a16ec827df6e1ab257c9ec5b755b863e98d63cd8a59bf SHA512 1fd2f6689f8a74254f4436fedf8a5ee7c1488d70b467dfb94c3ca3e0e269aaa75a77d15d5bb3544e699f5c8759e30a25942857188cb98b4d9537165b67d6d14c
 DIST eog-40.2.tar.xz 3601788 BLAKE2B ab66481d8fa5c076f0e12c3f16ff4a67d3a544b7483a2791833ea7d7f605898b20e8d8ed100a538e7a7f21a1359c74b96fa81aaf8712bfdb419df37fe711f7bf SHA512 e28c2deb320436606ebf0a971d845e536197ea23c2e7869d3d10dfe5174c8177c7977da37bf01178dc87f875cff2c3f0fbdad63c77578c2334dbfd9d354c19ad
 EBUILD eog-40.1.ebuild 1591 BLAKE2B b021bdc30c23209e66970052e2a05b295013fd53765e966436cad01af8d33084306accddecca864ed3ea07fb97dd675b74b6e76d15a761f0a1f9fd8eca82d311 SHA512 38158a2a01bae2503b81aa8ed540c7b0f45a138915d1fdf5eb5cf3d4e661769cf2d92d89f743256922436dd2ff1a69a21902dafbcb6de89627d6bfe3d0b6d598
-EBUILD eog-40.2.ebuild 1593 BLAKE2B e40e84edd2b76c87e8fa42b84fa255d470c13fed651263c0237a8c645df7affd497b72394f79c143ceb1067c7aa871855a3331e1a2f1800904e2092356938907 SHA512 ff4b3988b9d508c1df713d2f720b36084c23dc50f57f20ddba970f543ac3ae45831553e46a2586c073d6af1cd4fde0816c40efffd67904f6546a5bc75e2c1d64
+EBUILD eog-40.2.ebuild 1591 BLAKE2B b021bdc30c23209e66970052e2a05b295013fd53765e966436cad01af8d33084306accddecca864ed3ea07fb97dd675b74b6e76d15a761f0a1f9fd8eca82d311 SHA512 38158a2a01bae2503b81aa8ed540c7b0f45a138915d1fdf5eb5cf3d4e661769cf2d92d89f743256922436dd2ff1a69a21902dafbcb6de89627d6bfe3d0b6d598
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-40.2.ebuild b/media-gfx/eog/eog-40.2.ebuild
index e0fd2241d634..8b0331ef5a00 100644
--- a/media-gfx/eog/eog-40.2.ebuild
+++ b/media-gfx/eog/eog-40.2.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 35c388ffd5ef..932b4e937025 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -4,7 +4,7 @@ DIST fotoxx-21.41.tar.gz 8619224 BLAKE2B 28ec5fef8780001a023527c0859b58e1b3347b9
 DIST fotoxx-21.42.tar.gz 8617093 BLAKE2B bccb36c43636fe6811f5fda7df3e81a3ca8ecce0e1df6b4d3a761c31674e32796d42d5b305d391dcd1fa22fadef3224c9ec71f2bf2619091a592f5e8f0acb00a SHA512 cf5cb91cd061e18ac059b93326ff17c406d6a595c6793be55ca74f4e66dbe0172baf48910bc0813263caed9c0fd8571039131b3d5635d9451a14cdaa7efab520
 DIST fotoxx-21.44.tar.gz 8670703 BLAKE2B e3c1a0d68ab530345048833c5c33ababa1f3ef27e99379888c748297a2d69a248eb64b6881b53bcdde759f53aea75292d3c205ca11d9ed291465514bf294d323 SHA512 06446fbd0c44a632d5525acec155f8d51ee9ffd66dc9ba97a01bb30f4a8e4b9355650ea50967a537cbf077062898def227c46b07dd7d6d2c6ab8af3f4654c490
 EBUILD fotoxx-21.40.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
-EBUILD fotoxx-21.41.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
+EBUILD fotoxx-21.41.ebuild 2261 BLAKE2B 5d8bb0d2391b4b3e1b3390acbfb3b599f7a885d76d8ed1215485e995c9dd5af932abe57cd25de998d749ceef1d8ccb739bf01da1002bb0206638f44a456ae1bd SHA512 7afc256fc2817dbe177fc1087116121f854c4c0d030571bb330523def5198f125d8c4e938ecd4a9e4fbaae31468e301e2149873fe2c19fc14707fec76f501166
 EBUILD fotoxx-21.42.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
 EBUILD fotoxx-21.44.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
 MISC metadata.xml 850 BLAKE2B 463cae7d8df56ad93adaf7fbb4cf31f2838452e1349e61175c9981db4e95cc506b992cba2876885f8e949061808300752ef5806e9a096647f769bca654cca8e9 SHA512 e5c38d8602a52ae25bf90990136a98b57f69701cea70d4762f6102dc791f97b134853f7321894d1fbbbfdd353cebad7afa27cb56373f256d9497c3600d66d19e
diff --git a/media-gfx/fotoxx/fotoxx-21.41.ebuild b/media-gfx/fotoxx/fotoxx-21.41.ebuild
index 12a78336fe75..1ddec16ee369 100644
--- a/media-gfx/fotoxx/fotoxx-21.41.ebuild
+++ b/media-gfx/fotoxx/fotoxx-21.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 # For required dependencies read doc/README, for required tools read
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 99a7f866022f..ab54a3f1693a 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -5,12 +5,9 @@ AUX freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch 907 BLAKE2B 154
 AUX freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch 842 BLAKE2B d1eef077e3290bb469786a62c36d66f46f5016b2ed34065c0c3aa20a82cb451bb8a7242c3504113d924de2564b03fb1c581684d4b9da1325228ad2d82704a116 SHA512 2df1ad94c735c5f38eec0bcc24bf11a1d1814e991539082259983601352603273ae502856e41c0c737d65f9a488a676894d2f4d4d93cf8e2cbb1c3752f99aa7b
 AUX freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch 1959 BLAKE2B 3863f4f311a4fba648d4503c6b3daecb87d233caea4ce7f22dff47f69435995ff422cd2ee97e8a491ddf85527b325d63543e041ccc91e5c844fede750c6764ef SHA512 b9af575349498393ee78e1c75247e736412d331fb872475c180c4828a6007f9a34ccd379eed8fe2551e53b88eee0b400202c63a1365df8b6069ce3b0727b2056
 AUX freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch 1054 BLAKE2B d6a67b22390b64ed566c49af6117de2f34e0f57094a069ccae6cd15da5fa3a53a4cd71d94bd65a201c60042893da713a2d397890c7b072b197e101697cd388fd SHA512 beecd51a4b59890cd162eb76b726bd1e82a32da387ed67d886293930175deaf014445afd4db93e262daa06ced5b6c267218e4d777bd32c940fbc8b057b077fa1
-AUX freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch 861 BLAKE2B 305d1e7110e72c0b7e1f4398283816ca8ca01e1fe8460fee9fc002401c5937414d11ee46f0875d0859e57c94b03a67ccb7b4bed1b4935b1032e6db41b9e64a85 SHA512 0eaa8b23a92237648e128304bcb84a227cfb081826266efad9b3afd8a63444a61930dfba465b2d1e205cb43fc616e0a63c1f8bbb1618a462d8a0cff04e764ea0
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
-DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118 SHA512 5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b00009d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
-EBUILD freecad-0.19.1-r1.ebuild 9245 BLAKE2B 882d13a380200fa0e366203f6c3278e2117044461bd4023f1c7effba670476b50507bd153f108e9d0e586960a4a4324bac580674e7fbf001d565dc0013224b62 SHA512 e034af0baf4885d3e9ddc013851f7d2f0debd93b74fca3ec04482364317e24034e853cc727eb0d47b4e83ebcd804ccf468413399c61b2c444719de22330676a1
-EBUILD freecad-0.19.2-r2.ebuild 12372 BLAKE2B 5211016e7d0db01e6bf3e8946697e525dc7d9e4c5ef07ba47d1879a27a4d4ffae1e4bc31edb5d8c95c037206cc8fd00ad8364c752f471056cdf182f21c808f8e SHA512 b2cb906c8554c7c72fda09091767dfe8d09c4643d1c80e115d2f59ccfaac460b1b2e641801086e548366256b3918fc1562cb628abebcdbea8c6cb9d534270b5e
-EBUILD freecad-9999.ebuild 12126 BLAKE2B 3a8a24f55304f1351e4edd3bfa169918d598a18b02bdba9aa2fafcf407504fd946f3e46bc7f9f11238696fe12dba8542226fb8071780da51c7b0cd41b6825bcd SHA512 e419c9b902ce9964a6c72d7241a354f35de29df95634c1950e5a24d61ea9aa36d0e450d17b3c61edf86de7e8c510af1917dbebf3acb0a1cf52ec41a1c08d0d15
-MISC metadata.xml 3728 BLAKE2B dfe01a38234955bbea4ebc4d561fa15d06548f80338ace10091b8c8e5ab485532e462ad8ea35d52552fb87d18be05bc10953d100389cd4302e07adbb2cbc8a9a SHA512 c1c6693f824aaf9ace443bd5001a581187a4dbbb134a18454ef96d5dbd674b98284136d021f04316de0e0d8400bdb3e7f0dab5722e1ed0d45b33f0263c8ae6d3
+EBUILD freecad-0.19.2-r3.ebuild 12374 BLAKE2B 927540e365fb77eb8a547adaef29f2b3cf804cf5c2187e8cd1f5f2c214e30e175f8bd4c45c9235e897888b29113074003eb0e49a7ca660bc00f711c25dd43293 SHA512 8dd47065bba4f10c8b3185c3d26c1064aab30c8c7433d7fa4a7d2347b11ecab1f317360e75a5a6c8604a579cbd3ff5e1ad531a15011ca4f2a6b177c3319f383b
+EBUILD freecad-9999.ebuild 12128 BLAKE2B 6a6e494ee9ea040a606976c3c60795d22a4462eb38de8c264c2f704815e6ee4873962fac94d8f662936e7cc31b107df90386f9676c90646c2869ea9d1804d287 SHA512 2383306704b548cb855c7de1bee5a99e216bab2f1fdf6141356fb2ade5ae7a246c5cf80f9b1d1e8fc04d9901f7a1fa930c4f82a9942dc603c66975bf42b11096
+MISC metadata.xml 3267 BLAKE2B a9ac18b801fbe7f379298f8e0f820e83441536bfc28a09963990006d2251deb88211d80e086d13646a8ff18380e8aa4c0ac399765c557194c8311475f34744f7 SHA512 1b8674896d56605d8018fd0cc1a56ca6e121171c9630d76c5b1933a78dd31b619f27e986163b01051f0ff8e32b390498a8f0b534103d67a6fd32a91cea97a300
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
deleted file mode 100644
index 9f4131f15a3d..000000000000
--- a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e08aec1344e753cd338a61c3584230741e00b23f Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Thu, 31 Dec 2020 13:26:44 +0100
-Subject: [PATCH 1/2] FindCoin3DDoc.cmake: fix patch for coin docs
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cMake/FindCoin3DDoc.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cMake/FindCoin3DDoc.cmake b/cMake/FindCoin3DDoc.cmake
-index c6c92f2..1af53c2 100644
---- a/cMake/FindCoin3DDoc.cmake
-+++ b/cMake/FindCoin3DDoc.cmake
-@@ -22,7 +22,7 @@ IF (COIN3D_FOUND)
-       # Unix systems

-       find_path(COIN3D_DOC_PATH index.html 

-                 /usr/share/doc/libcoin80-doc/html

--                /usr/share/doc/coin/html

-+                /usr/share/doc/coin-4.0.0/html

-                 /usr/share/doc/Coin/html

-       )

-       IF( EXISTS ${COIN3D_DOC_PATH})

--- 
-2.30.0
-
diff --git a/media-gfx/freecad/freecad-0.19.1-r1.ebuild b/media-gfx/freecad/freecad-0.19.1-r1.ebuild
deleted file mode 100644
index 95e44586e4c4..000000000000
--- a/media-gfx/freecad/freecad-0.19.1-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# vtk needs updating to use 3.9
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
-	S="${WORKDIR}/freecad-${PV}"
-else
-	MY_PV=$(ver_cut 1-2)
-	MY_PV=$(ver_rs 1 '_' ${MY_PV})
-	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/FreeCAD-${PV}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="debug headless pcl test"
-RESTRICT="!test? ( test )"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
-FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
-	inspection material mesh openscad part-design path points
-	raytracing robot show spreadsheet surface techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
-	IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-	IUSE="${IUSE} ${module}"
-done
-unset module
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-cpp/eigen-3.3.1:3
-	dev-libs/OpenNI2[opengl(+)]
-	dev-libs/libspnav[X]
-	dev-libs/xerces-c
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	>=media-libs/coin-4.0.0
-	media-libs/freetype
-	media-libs/qhull:=
-	sci-libs/flann[openmp]
-	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-	sci-libs/opencascade:=[vtk(+)]
-	sci-libs/orocos_kdl:=
-	sys-libs/zlib
-	virtual/glu
-	virtual/libusb:1
-	virtual/opengl
-	cloud? (
-		dev-libs/openssl:=
-		net-misc/curl
-	)
-	fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
-	mesh? ( sci-libs/hdf5:=[fortran,zlib] )
-	openscad? ( media-gfx/openscad )
-	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[python,threads(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
-		dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
-		addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
-		mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/swig"
-
-# To get required dependencies:
-# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-# We set the following requirements by default:
-# draft, import, part, qt5, sketcher, start, web.
-#
-# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
-# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
-# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
-# reflected by the REQUIRES_MODS macro, but at
-# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	arch? ( mesh )
-	debug? ( mesh )
-	drawing? ( spreadsheet )
-	fem? ( mesh )
-	inspection? ( mesh points )
-	openscad? ( mesh )
-	path? ( mesh robot )
-	ship? ( image plot )
-	techdraw? ( spreadsheet drawing )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
-	"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
-	"${FILESDIR}"/${P}-0001-Gentoo-specific-Remove-ccache-usage.patch
-)
-
-DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
-
-CHECKREQS_DISK_BUILD="3G"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	python-single-r1_pkg_setup
-	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
-}
-
-src_prepare() {
-	# the upstream provided file doesn't find the coin doc tag file,
-	# but cmake ships a working one, so we use this.
-	rm "${S}/cMake/FindCoin3D.cmake" || die
-
-	# Fix OpenCASCADE lookup
-	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
-		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
-		-i cMake/FindOpenCasCade.cmake || die
-
-	# Fix desktop file
-	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_ADDONMGR=$(usex addonmgr)
-		-DBUILD_ARCH=$(usex arch)
-		-DBUILD_ASSEMBLY=OFF
-		-DBUILD_CLOUD=$(usex cloud)
-		-DBUILD_COMPLETE=OFF					# deprecated
-		-DBUILD_DRAFT=ON						# basic workspace, enable it by default
-		-DBUILD_DRAWING=$(usex drawing)
-		-DBUILD_ENABLE_CXX_STD:STRING="C++14"	# needed for >=boost-1.75.0
-		-DBUILD_FEM=$(usex fem)
-		-DBUILD_FEM_NETGEN=OFF
-		-DBUILD_FLAT_MESH=$(usex mesh)
-		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
-		-DBUILD_FREETYPE=ON						# automagic dep
-		-DBUILD_GUI=$(usex !headless)
-		-DBUILD_IDF=$(usex idf)
-		-DBUILD_IMAGE=$(usex image)
-		-DBUILD_IMPORT=ON						# import module for various file formats
-		-DBUILD_INSPECTION=$(usex inspection)
-		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
-		-DBUILD_MATERIAL=$(usex material)
-		-DBUILD_MESH=$(usex mesh)
-		-DBUILD_MESH_PART=$(usex mesh)
-		-DBUILD_OPENSCAD=$(usex openscad)
-		-DBUILD_PART=ON							# basic workspace, enable it by default
-		-DBUILD_PART_DESIGN=$(usex part-design)
-		-DBUILD_PATH=$(usex path)
-		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
-		-DBUILD_POINTS=$(usex points)
-		-DBUILD_QT5=ON							# OFF means to use Qt4
-		-DBUILD_RAYTRACING=$(usex raytracing)
-		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
-		-DBUILD_ROBOT=$(usex robot)
-		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
-		-DBUILD_SHOW=$(usex show)
-		-DBUILD_SKETCHER=ON						# needed by draft workspace
-		-DBUILD_SMESH=$(usex mesh)
-		-DBUILD_SPREADSHEET=$(usex spreadsheet)
-		-DBUILD_START=ON						# basic workspace, enable it by default
-		-DBUILD_SURFACE=$(usex surface)
-		-DBUILD_TECHDRAW=$(usex techdraw)
-		-DBUILD_TUX=$(usex tux)
-		-DBUILD_VR=OFF
-		-DBUILD_WEB=ON							# needed by start workspace
-		-DBUILD_WITH_CONDA=OFF
-
-		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
-		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
-
-		-DFREECAD_BUILD_DEBIAN=OFF
-
-		-DFREECAD_USE_CCACHE=OFF
-		-DFREECAD_USE_EXTERNAL_KDL=ON
-		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
-		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
-		-DFREECAD_USE_FREETYPE=ON
-		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
-		-DFREECAD_USE_PCL=$(usex pcl)
-		-DFREECAD_USE_PYBIND11=$(usex mesh)
-		-DFREECAD_USE_QT_FILEDIALOG=ON
-		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
-
-		# Use the version of shiboken2 that matches the selected python version
-		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
-		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
-	)
-
-	if use debug; then
-		mycmakeargs+=(
-			# sandbox needs mesh support
-			-DBUILD_SANDBOX=$(usex mesh)
-			-DBUILD_TEMPLATE=ON
-			-DBUILD_TEST=ON
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_SANDBOX=OFF
-			-DBUILD_TEMPLATE=OFF
-			-DBUILD_TEST=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use headless; then
-		dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
-		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
-	fi
-	dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
-
-	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use plot; then
-		einfo "Note: You are enabling the 'plot' USE flag."
-		einfo "This conflicts with the plot workbench that can be loaded"
-		einfo "via the addon manager! You can only install one of those."
-	fi
-
-	if use ship; then
-		einfo "Note: You are enabling the 'ship' USE flag."
-		einfo "This conflicts with the ship workbench that can be loaded"
-		einfo "via the addon manager! You can only install one of those."
-	fi
-
-	einfo "You can load a lot of additional workbenches using the integrated"
-	einfo "AddonManager."
-
-	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
-	einfo "support. Some of them are available in Gentoo. Take a look at"
-	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
-	optfeature "interact with git repositories" dev-python/GitPython
-	optfeature "work with COLLADA documents" dev-python/pycollada
-	optfeature "dependency graphs" media-gfx/graphviz
-	optfeature "PBR Rendering" media-gfx/povray
-	optfeature "FEM mesh generator" sci-libs/gmsh
-	optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-gfx/freecad/freecad-0.19.2-r2.ebuild b/media-gfx/freecad/freecad-0.19.2-r3.ebuild
index fc330f2ea53d..954e1f8b1fed 100644
--- a/media-gfx/freecad/freecad-0.19.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r3.ebuild
@@ -79,7 +79,7 @@ RDEPEND="
 		dev-libs/openssl:=
 		net-misc/curl
 	)
-	fem? ( sci-libs/vtk[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
 	openscad? ( media-gfx/openscad )
 	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
 	$(python_gen_cond_dep '
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 3d41d5d0ca12..cb6c6efe011b 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -79,7 +79,7 @@ RDEPEND="
 		dev-libs/openssl:=
 		net-misc/curl
 	)
-	fem? ( sci-libs/vtk[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
 	openscad? ( media-gfx/openscad )
 	pcl? ( ~sci-libs/pcl-${PV}:=[opengl,openni2(+),qt5(+),vtk(+)] )
 	$(python_gen_cond_dep '
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 57211691f591..3c4e9f49f5de 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -14,18 +14,10 @@
 			Build the addon manager module for automatic handling of 3rd 
 			party addons
 		</flag>
-		<flag name="arch">
-			Build the architecture workbench for working with architectural 
-			elements
-		</flag>
 		<flag name="cloud">
 			Build the Cloud workbench, to access cloud providers (mostly
 			Amazon S3).
 		</flag>
-		<flag name="drawing">
-			Build the drawing module and workbench to display 3D work on a 
-			2D sheet
-		</flag>
 		<flag name="fem">
 			Build the FEM module and workbench which provides Finite Element 
 			Analysis (FEA) workflows
@@ -49,10 +41,6 @@
 		<flag name="material">
 			Build the material module and workbench to work with materials
 		</flag>
-		<flag name="mesh">
-			Build the mesh module and workbench to work with triangulated 
-			meshes
-		</flag>
 		<flag name="openscad">
 			Build the OpenSCAD module for interoperability with OpenSCAD 
 			and repairing Constructive Solid Geometry (CSG) history
@@ -89,10 +77,6 @@
 		<flag name="show">
 			Build the show module, a helper module for visibility automation
 		</flag>
-		<flag name="spreadsheet">
-			Build the spreadsheet module and workbench to create and manipulate 
-			spreadsheet data
-		</flag>
 		<flag name="surface">
 			Build the surface module and workbench
 		</flag>
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index a1db98c83d59..f965eda2e32e 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-screenshot-40.0-fix-hidpi.patch 1351 BLAKE2B a94ce580d6f4af9e7945bdb13b3ba5b13787b564954e0933f9324c9d086e04f6efcb0affafc8775d2b41004f9c501edbe380e869723e038355c6c6ce7cb8b43b SHA512 68e8d178800036025a03786e8842aadfce0eaec61e36405406909ba8055db86d31350bae201226e54e667879da4610d5ea94df05fcf419f6609202a8c00d9c64
 DIST gnome-screenshot-40.0.tar.xz 358088 BLAKE2B cad407f471e953667946b741ed59fe210d7ba3d079f2db8101974e565a1d0bfaec0cb1b40791be0e183dd399a82db5f15bbbec741ef16b4b572b043fcaf8ea8e SHA512 0889d7701711f17de68f8a55f512b7764fed087b1b2f86b372d1a38ee956f05ca8c833ca16a1de2396b07c01de79204d988192036780f521b82733436d019cb0
-EBUILD gnome-screenshot-40.0-r1.ebuild 1402 BLAKE2B 62a8e7629339554173a4313d0a27db22ad15d9885b7b12dda4bdaac25cfd7aad40dcb07593d8f16cdd18cd3e7535acb416b8552a47545cb9bbaec48032a5237c SHA512 8966c62edda0d1657a201b05adf5d185c69c8ac9c2e696e240aa5649c125aaa63b2cd49bdc73a560ea6fdce4dedbcf8bd7595cfb897c462529b1ecfe87005bc1
+EBUILD gnome-screenshot-40.0-r1.ebuild 1400 BLAKE2B 3369ae9ba121e89f470806ebe040e690d594c177b84145a2420d22311b870df4c525a0132bfb7bf0c2ad8babf4f78ea05385c61a8fad7c0a6ca946bd8fe62b09 SHA512 3123aa95489a10cc87dcc7c8584aba0b2440fac9c954443c4f8c5cb63fb6d29b06b468f4f97f22953fa5180c4721be0f36444705dfc208dd34e3d6dadfd6f431
 EBUILD gnome-screenshot-40.0.ebuild 1243 BLAKE2B 63b06fb6a2e40510e5d8301744eb8a3bb860fd36c46e546dba6ea78dd72017574d8ec78efdf33c731f5f0f34258617c656039dc7f9052dafb8e87c9bbb1308f2 SHA512 ad608f1e60dd59631895a0868e9a4ebbfb9cd063c45db01e1f72eeb29611828b153edf7dcc796efc571531a2dd5402eb7be017dd642d5ba21a5b5adcec02b262
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild
index 530e596f46da..deff071d1e0a 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="X"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	X? (
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 7957465bbd8c..5dd7deac764a 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,5 @@
 DIST lximage-qt-0.16.0.tar.xz 100920 BLAKE2B 17a41013b7d7e599662a698fa24b6b15a550b2211dd818fbfda19b0fb9439bf77b63b2d8248ad8a65605fee8fc73c78d294ae86401d5660f6d798aa775273709 SHA512 2da46d23567cff7044a884e14b30de36b3a19d802768585b7c3332897b0af2fc42993ed9bb9d062db7988a0526cc7357a09fbac5f283a615b109ea8dfbf474b5
 DIST lximage-qt-0.17.0.tar.xz 109772 BLAKE2B e49c6fb2b3db9b5ff829f7003862ab8124773d82a540019f2ba64c48fa4fffff0eb5f317b8222be95b1b030b5d64a961d4c96298275a835f56816dc857cc6e27 SHA512 fb7867f5589fa45f3e2d37dcd0733c49fb5439206b11d2a43020305c5c7d222796aa0cf2dbf19d5fc7829a34d3877241cb4bb36ea2883a41503eadd39deaf8e0
 EBUILD lximage-qt-0.16.0.ebuild 959 BLAKE2B 3a34d5641750e187e535301f03c17e1658c05e8601eae6d29f3b93be0767cc5961a8880a8653a90ecd90ee92947169bc42687f2c5c3acf8c92dd064dd86ff5eb SHA512 d3bf56b433b6a1350d6c721dad015a336f6f3c5614f5c9b86e4856fd131e45592d744beaa9266c5b84e1e16da3655076ee51cb20b4734600fcacc09ad2566763
-EBUILD lximage-qt-0.17.0.ebuild 938 BLAKE2B 5d3bef87e5584628a8391fad17648b0a5641d070bcbd763ae6a0a8ac26cd713529206f4b58b31ebc583faaf1637a7a22f7688f1a1faa0f9f523f73beedf80a91 SHA512 535ace519ac94cb0cdfa70eff46402046714a00cf6ce1c9b89d5f983003690d07b32176a285983d8a1b16564934acdfc72d6ec0cb15afa8da4171f3bfa8c248f
+EBUILD lximage-qt-0.17.0.ebuild 936 BLAKE2B 5f0a6363ca624dccc7b3f635c871f2674e0a3fe6111ca41287fc1680a8d31c4b85c3aafdff7c4014316f24327109f1cdd9c2f2503c7731433e3c65d56c54c725 SHA512 370f139488cb11bde1860e7ed3159ba0a8aadd8a43e4eeb3b0211cf0cfe543ad0d5c8953a36ac6997601383e9f9821d3865f01c2e1e2a222e11b9ad17fe4a864
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.17.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.17.0.ebuild
index ff0920adf74e..1e48571aa98b 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.17.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.17.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index c49431777234..a2ee2ea0af34 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,9 +1,10 @@
 AUX openvdb-7.1.0-0001-Fix-multilib-header-source.patch 2825 BLAKE2B 089bc79bbb8bd4544889c65d8bf064bf95869990778cb66595a19be402db85b569acb836b5918c902e6f6a10011a1480ef89e03636f951e30e5833eb667478cb SHA512 6968a60737b08bbec96beb8ec3796b7d99a713a798e37d8cd4015eacce7e7197b5befcd6721b310a4cdcfaca1781ab0cd7165958b14b487796a4159e9e214499
 AUX openvdb-7.1.0-0002-Fix-doc-install-dir.patch 1014 BLAKE2B 380c26e69da18479266201fd1233d19f3c39b13ee67d11cadca5bba900c470218a7563590f12a400a1f954155bfdfacc00862511ef05f3a61a54679924c57cae SHA512 21d4abf1cae31dfa8e59b6648a7c40f6f5f9572bdb87e6410144b427244ede488e059bf572344efc4e4cea91e7fb59b56364a7df6041f717db759002d09e8ee7
+AUX openvdb-8.0.1-glfw-libdir.patch 495 BLAKE2B 6a47bd300b3cd2186be8b749abd1e1fcbcb50e24d1965a783d8f2cec07ef8737ee6287018f40fed4ea4520c2c6be20b5936bdf0bd95ab07f277e728b6fccbb07 SHA512 29cd8d4dfd24f262c8e03a4d55502839a99bdac8eae1738b99cd667292034ea5cddec60303daf3a0c0d76a68021b3b4d6fc2f0e5be108d94243f5c11308c194d
 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
 DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2 SHA512 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2
-EBUILD openvdb-7.0.0-r1.ebuild 2805 BLAKE2B 077df7ddf81711bafc1021cd9255fa7e8413fd2d97c3a824f11145b1faafa5f6d2bb2c1e3731a6ed993b1a0b0603feed02a4d801c9d162a2fb2e53942549f3eb SHA512 a8917f92a8cd316a3dc49c784707ba63692251141aad32821465e5d46b8033c00906e426a54adba9402a56d946ebe8cbb5522625239c35cc16e0d2d7cde3338f
-EBUILD openvdb-7.1.0-r1.ebuild 2735 BLAKE2B 0e9347c59b0f1404db23e63635a4c3fdda3be0d34bda329de8b65507a3037692206a3d0573984bee7a9f937d5c9f425decd94b00214001e8792317af45f39b1b SHA512 2ce5ea094c66437efdd17279a3a2740cfab364775cede0986e9a65e35871cf90cb443c354b6590f82153b2d4acaadb0bfb44f8b2a72b632be64640e5094d7a15
-EBUILD openvdb-8.0.1.ebuild 2769 BLAKE2B db8c781c1d61337e9669c7ab245abfdd926f22c0605d4cbfddc95b826d705ceb4bf7590d0fe658c8b0a099b46b05d5eb1f49b594bd35aa1f6b61da5aa56808e9 SHA512 6ae5eb57763fdd15f3ce6d527785305cb1d69f359eb5f6ac8ebcbcaddeec9c4bc00ed10c6b82f0e22458135220a335b5c9743d3ec55f988bdc69108e1e0fc3c6
+EBUILD openvdb-7.0.0-r1.ebuild 2850 BLAKE2B 042072b65ba212949817da393ca0816be24f6ed00e5dc8f685241e0edbc3ca4d7225ff551624d9340ebce2c8a0c51edcb58c9043542458ac40f9cba4320828ca SHA512 e2ca1e6f279b45a63643e098c7bd3d92117ee1373ce02ae25ca090abcc1577005dc4303a7ea94b5ab7cba1fe72c4aeb4f9f63b8f8c4b3396cf5eda1be585dc92
+EBUILD openvdb-7.1.0-r1.ebuild 2780 BLAKE2B 4183344ab52862ba20546b358e267c1525b01b3ab77a3043cd102d33252760cf61e3a66d913ffc6857dc86b1445b1deb2bd1dc9226545a969689906cd687305a SHA512 7ace5d72a976f3925e7c62a90c51af81c746f7280ffaa424abcf4a1b6e4f5dda0a88ae9f06a60a331f1528780074db1a0ba94dc53b71498c827e4819d43a460d
+EBUILD openvdb-8.0.1.ebuild 2807 BLAKE2B 50388b1d5c3d401cf4a3849431240478c531cd0f5120a45140fb79edcfe454ed9dce276b41d6c7a5ff8814a18d0bb573b7a1079e1587b23dbbd5a5201e9f0c14 SHA512 fa2079ed52041b9591e719563f1c3477b7bf3afe64de00d70c756f30580871086c5da7e692e54dc4e1eea2ea72cdd4eb8d743a49e9760cf8699920294e12a891
 MISC metadata.xml 1548 BLAKE2B f6a9752e3535febae4a9aeddc13b036fe8f964b02371060389edf83ce25932e36a53856eea891dbf9734ffab5e3eff9ad10d31a592ddc5b7816375179e0cbd1f SHA512 77036fce5e1217d4d47547fa925006b4a605d43d4473fe8cebc7d768c5770d8faf25a2e2fe46498cbf53071bf67e2d99286a8f59d5a8d389b2a8cd14b98341fc
diff --git a/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch b/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch
new file mode 100644
index 000000000000..991c5a6a568d
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch
@@ -0,0 +1,12 @@
+Custom cmake file used to find GLFW always looks at lib/cmake first
+ignoring alternate libdirs and leads to using wrong libraries.
+https://bugs.gentoo.org/800200
+--- a/cmake/OpenVDBGLFW3Setup.cmake
++++ b/cmake/OpenVDBGLFW3Setup.cmake
+@@ -84,5 +84,5 @@
+ list(APPEND _GLFW3_ROOT_SEARCH_DIR ${SYSTEM_LIBRARY_PATHS})
+ 
+-set(_GLFW3_PATH_SUFFIXES "lib/cmake/glfw3" "cmake/glfw3" "glfw3")
++set(_GLFW3_PATH_SUFFIXES "cmake/glfw3" "glfw3")
+ 
+ # GLFW 3.1 installs CMake modules into glfw instead of glfw3
diff --git a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
index 21735fd515a3..10868f647c6b 100644
--- a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
@@ -66,6 +66,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
 	"${FILESDIR}/${PN}-7.1.0-0002-Fix-doc-install-dir.patch"
+	"${FILESDIR}/${PN}-8.0.1-glfw-libdir.patch"
 )
 
 pkg_setup() {
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
index 52e0454b1757..ed2847345e4e 100644
--- a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
@@ -66,6 +66,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${P}-0001-Fix-multilib-header-source.patch"
 	"${FILESDIR}/${P}-0002-Fix-doc-install-dir.patch"
+	"${FILESDIR}/${PN}-8.0.1-glfw-libdir.patch"
 )
 
 pkg_setup() {
diff --git a/media-gfx/openvdb/openvdb-8.0.1.ebuild b/media-gfx/openvdb/openvdb-8.0.1.ebuild
index 11350d22c911..f6827c2006ec 100644
--- a/media-gfx/openvdb/openvdb-8.0.1.ebuild
+++ b/media-gfx/openvdb/openvdb-8.0.1.ebuild
@@ -65,6 +65,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
+	"${FILESDIR}/${P}-glfw-libdir.patch"
 )
 
 pkg_setup() {
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 2d8f47ed6b40..51b3a426e465 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
 DIST shotwell-0.30.11.tar.xz 6499416 BLAKE2B 8b63b2ff64ae41560221d9bcca2c88d0dff8c40416278d3344dbdbf50e4352e999e3ae52ea9fbcc871d5023ffeeb6ee954ee91a2d7eddc1a8f1df45dc4e12cf8 SHA512 71a057aa1ae2b432f385e174429e29f46ca29055aa6003b6017f3da54551027536c70e9f8ca605719e8e008233bdb6f17981462a54495d91e94aebdbe5718c9f
 DIST shotwell-0.30.12.tar.xz 6519996 BLAKE2B 7417f1bf0057b4974b45be675b177f6fba232d60d56c3d98cc6d5a7a95a31281add5190a04eab965739759aa7d826515996f2fd62350352a54ebf969dc732d95 SHA512 3274f15969be7f75ad2fa44e78773b76e11ee6cf8d4990c7f658fa8ce7e84a8fa5f06542fbab4b585c70e41c097c7b07ba702540102e4d0dfca8e927e00180cf
 EBUILD shotwell-0.30.11.ebuild 1769 BLAKE2B ce81642084c5b8ac1b41b72842ac4c798ab3a2a136e95f899735bd4dbab8d013809c1a0b6139f366b2f0e6a76d7a26a314b80ea453405e2a2f4eb1dbfd2e5d3a SHA512 e8aab87360f510ee71ae3b06f9904a7895223ea31ec1b7a5e29f9f8238668e523d5654bad84c4f459fdad78cc6853f4478994c2383535b834c342a4c6469e081
-EBUILD shotwell-0.30.12.ebuild 1771 BLAKE2B 301664fc4c7ee4412d7f026ecb18a0acba139aeca6b84c64d2f76fb9f3d86b8fe421369a47cbf8f706e6961cbb1785ec3dbc7577363c2f193efdff459a52f572 SHA512 788ac87b1fc37afb3e14848279311be0886093559fde326ca738e2421dafe0e1394977309fe752ff014156ac914e6ae8716569d3f5e8e55b8a84f54a9ddec296
+EBUILD shotwell-0.30.12.ebuild 1769 BLAKE2B ce81642084c5b8ac1b41b72842ac4c798ab3a2a136e95f899735bd4dbab8d013809c1a0b6139f366b2f0e6a76d7a26a314b80ea453405e2a2f4eb1dbfd2e5d3a SHA512 e8aab87360f510ee71ae3b06f9904a7895223ea31ec1b7a5e29f9f8238668e523d5654bad84c4f459fdad78cc6853f4478994c2383535b834c342a4c6469e081
 MISC metadata.xml 795 BLAKE2B 4b5da2cc205b128a0cb9d10a50c3743b8d12302d266e37d5e0479915824af75af8c22b7b12ffca57146aa0a999e2bff3d7c4969af9e19f317a70b9195b02333f SHA512 d3ceceeed90fd4cadd5e212d047b3d6f7882860d145cb80521a4db8e9baaf461910ff70cb5bb2c1cda991939bf2c8917bb7f252bf68c7487d40271b0419c6322
diff --git a/media-gfx/shotwell/shotwell-0.30.12.ebuild b/media-gfx/shotwell/shotwell-0.30.12.ebuild
index 3397e5e68673..46f2f6e7fac2 100644
--- a/media-gfx/shotwell/shotwell-0.30.12.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index c84ab278c256..1247d63ab167 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,4 +1,4 @@
 AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
 DIST simple-scan-40.1.tar.xz 1471116 BLAKE2B 4e9071c497cf47600cef7dcbf4c47dff6f8cd8cbd8a72ae45e4ac68b749f5fc89d0e97912e174cab02959efe2e30451403ab0336221ead44fc87747dbe4e29e1 SHA512 1ccd512ce84ed0d2f97f4e2e5220a2e8a850e575cb9dac58ef446f8cc37575a72a2e80ffa240874532433667225b632cd1dd4e68f66dae3dd26be118f3ec21cf
-EBUILD simple-scan-40.1.ebuild 1444 BLAKE2B 035a45eec8130dad0ea1abf7947b3249f6977d5836b2590bd10478e4220265d8428b12323faa874430e11ffc6759aabcb65a0e7dd852408d88f69d7c964c8cb6 SHA512 4721404d5f5a89286d3113a6e2ebbc2bf82787bc54ad19c3f11042ec44ef780304fd523e484f2353de9a017155695675245c04df33b0c61da8ed3282b55ce832
+EBUILD simple-scan-40.1.ebuild 1446 BLAKE2B d337303876bb8b236326f29bf4324f34c8a9e59bb6f0bafd8bb2ead1797484d6de9a5dc6525120afdaca61cb6a0d0ebfd630f36274596c2592f22cc972ed3fd2 SHA512 80bf6ab5a88eeb60094495f151e1155b96c426c41eea747ead16a6afdb7b1299a75c6a293941162d140b9572fb32ed6c36ec1ee0e21ec06be2455c13618b30b5
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-40.1.ebuild b/media-gfx/simple-scan/simple-scan-40.1.ebuild
index edb7364a65fc..802c4565cc4a 100644
--- a/media-gfx/simple-scan/simple-scan-40.1.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.1.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	gui-libs/libhandy[vala]
+	gui-libs/libhandy:1[vala]
 	dev-libs/libgusb[vala]
 	colord? ( x11-misc/colord[vala] )
 "