gentoo (valentine's day) resync : 14.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
commit: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree: c44943ee0563a3fa957716de909fed683117fcb9 /media-gfx
parent: 69051588e2f955485fe5d45d45e616bc60a2de57 (diff)
88 files changed, 763 insertions, 1765 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6d5579df4048..40f3eefec4e5 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index f99971415a96..457128f9190e 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,3 +1,3 @@
 DIST ahoviewer-1.6.5.tar.gz 227653 BLAKE2B 691a9eaa62b55d91b2d215d41ce402c39ca7490a44506a489061aaadd97fac2ac84aa1b28a7d1b4c097d69153ffe146fac105e9b086adc6b66b9f459e6b98eb5 SHA512 30309cff22008d444eec113bd5d79bdc0e9ff1bbc1b117bd3ecefabfdef79773fd17347766115bb0a192db76dbb24f30c853b27123f0a333c8625b94dc2a8775
-EBUILD ahoviewer-1.6.5-r2.ebuild 1772 BLAKE2B 409609d051ed29af47f876d27d00a3673f4915fec8b22daa4605fdbf4984e8585f25cacf85abdfcc143bf36a710e08f3aa101284c259d50d70b6ce0f6e1af9a6 SHA512 bf46f766f01a39bc9c7a64d01bb7b1b1da78aaf613b1810c173ff21571d1a9036fdb3aa0e593240eb5baad836738cf500198caf02aae481d4a776737455d23ac
+EBUILD ahoviewer-1.6.5-r3.ebuild 1774 BLAKE2B c78b47185467f18bed89a39f2faa7c435b4e493207d6fdf004f984d34780d05ce410e16603dcf1a55a79d8af1b29e53b5b3356c59a3d5324111bec2ead1144e6 SHA512 56f9f6370203be73749c6e552e448a0cb8f2e4c50096b880024a7fd682823a0e4ec0600b36010cac2ff91ed5ca0f74dad57fc42dd090d40640af21de43751118
 MISC metadata.xml 335 BLAKE2B ac1be824313f6bf5cd421eb87ee42a1297a5a7f9eccdd6b95b322c6a968644ef7b4a4a3ec2071fa2444f0dfe270d7e3e5f1792e8e6c06cb00016bfb677ee91d2 SHA512 4bee9e8b32da56338c3aba72eaf59fc8c3e769490fb17ac3d6be0e20710e8ea9f4cffe3491170695b68d96d237ffca35a593be2de0aec426030ce9c5ba148f70
diff --git a/media-gfx/ahoviewer/ahoviewer-1.6.5-r2.ebuild b/media-gfx/ahoviewer/ahoviewer-1.6.5-r3.ebuild
index 5ce0c6377025..bff03cef4b0c 100644
--- a/media-gfx/ahoviewer/ahoviewer-1.6.5-r2.ebuild
+++ b/media-gfx/ahoviewer/ahoviewer-1.6.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ DEPEND="
 		media-libs/gst-plugins-bad:1.0
 		media-libs/gstreamer:1.0
 	)
-	rar? ( app-arch/unrar )
+	rar? ( app-arch/unrar:= )
 	ssl? (
 		gnutls? (
 			net-libs/gnutls:=
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 39a93554e5c7..f82731c1f2d5 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,11 +1,4 @@
-AUX alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch 2596 BLAKE2B 1fd91c988e5c6cb313a9ace85aa7e49043d5369c6dec0004e0d5c42161df5256a4fed47baadad04528c6d737b923e786027c4281c3df274215891f927c4f15f8 SHA512 5c3ec7db124640c7c3de655f7800f722d27f622904272418fb21a9312e10d30af75db13e41bdc46676d47beef74baa3db5fa3f84064ea00da87c1e03b072d10b
-AUX alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch 2926 BLAKE2B b403452e5b6fe45efc8d277299b76716b6b2d3251f0a8b992c264fce5b37ff074953d7b83cfb83c2608ec580f1e3b6ab302410599833d11309f3d6198b69bbb6 SHA512 6aa6eaff11d9abffb0b3b72db53a83d0780ddef4f9f22c94acfd239870355334c44c09df22ac85a7bde37e0b067f8c5f2c0b6a181c4a8a8ed61dbadaa4d09555
-AUX alembic-1.7.11-0003-Fix-env-var-for-renderman.patch 828 BLAKE2B 8e135e4d814a7dc9b60a8599b20ba1356d0e470755e0e7295ad31f2b4fe57a97dcdddb75867304d6ecf69727b05254c462bf9e5aa973d6c7f33c97dc39edabd2 SHA512 e5eba451947dd0eaf20b91c468960c35b1900c8ac4eb28f1114e9b829aec4c799b671c4e42ac9812478fa8a69b75a8c87845d561761346da2a3e435f6545b695
-AUX alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch 1044 BLAKE2B 49ed2fe0b260e9917f781ed5e1e2fb5ffaad89f567be893ff68580f7ec766ceb7f3ffc884d5f5cf030d467b0fcd096d56363b4273e8d1968c1ed3d5b9016fda8 SHA512 18d32d6b1d611f9ec9f545281f5900f58673cf773b11fbcf457d9a0c39a8c87690e1d39b2dfb910f74696b73d34e23f7adefa8242c29d80595ac3fb0879d87d6
 AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58a32d5c7afbbd4b1a738d3a69644034d18d487f2d48348ca4de32e3e691a8c5ec137c4829079cb0fedbdd9c5cfc98ff38144097845f07e0065 SHA512 b025cc77c21c57b43d9536e488ac5d68037cfa186c561399409ba863c722fca20f75b939aa7d5166d302b92e636deba05e0db4747d614f3420b4e76d30a8cbb2
-AUX alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch 1074 BLAKE2B 1d8b252eb8fcfe18e019a11350d1b9974d30a1d95146d5dd8eda8feb585c4e7d1070543f290d32e41929b17e86fda9a6eca7d045d4b4cf8fc31b4075addedf7a SHA512 059c89cbe402429684e56fa14041cf65974259b4ad1d464edd925bb6353d758402689e8de7021a3b3de6f98b1225a90fc50bbc843639b9be2823527afe77ee57
-DIST alembic-1.7.12.tar.gz 827983 BLAKE2B 7d508fdbfd92f213936635666a221fdad30f242a37ef8ff54a6272854565ebb890ffd11d8fe010f1558c0872fcb23080413d76380772ebf5db52033bdf0d9c85 SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
 DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
-EBUILD alembic-1.7.12.ebuild 2398 BLAKE2B 304acd044f9cc247f99df23810934a2917df21bdc7e7885a52857c458e6419f502460a35f1bebe947bbc4513c47dd1e09dfc4d447fa278ae0fcfd568ae683b98 SHA512 2c31a9759a2725576b0c22745db5cb59b376b5cf5bbe4d72df641666304533d8005d9417702073bbe0570772e56b06687571d45876840eeb899b9f52866458f0
-EBUILD alembic-1.7.16.ebuild 1241 BLAKE2B f4f0a1ea27ae8e8539c0e4c14e399d9d2e546053367a80d7bb6074295257cb701b2affcc01bc614ca516bfe11417f5fd37d3a5ad897eb647fe4645fed91f6440 SHA512 5715deaf8e193709500879591572d4c73734c7ad1c161fe344ce68f3c2d868ab1ebcdf2c50c7f93b2f4c253a7d4e6eabfbc6d213eb86101fdba2225807841ccc
-MISC metadata.xml 1061 BLAKE2B 5b15f06e392250e29645c008123cd23313b91162a4d42f769981249ec31250f5169332916eedb2bd0cbe9388be92adf151b9db8a11aedaaa4afbf9f33551481e SHA512 eb435c88829cdd15a3c993528e291d415c05f56d0b82d95b7b89e389f1dbb62ce50e822a180676f4c9191af4ba72a74a8935619af5ff96828117f72cc10b262a
+EBUILD alembic-1.7.16.ebuild 1240 BLAKE2B 5179e8f1e56d2bc788684e50adf4d8229246cd9a30684a841f913c69ab966edf6a5a8603678c8aa6492101e4c4a548b7178937fbd12224ca0fdbd54756ad740a SHA512 c6778b410482a1b3c789d5ab4f55b240c0f3c07d42da568488ba341f3564e37549616c05f6ce49aef8b9cf6f377ba6b884c84e33c4652adb929c3787f05c863e
+MISC metadata.xml 865 BLAKE2B a70a3ad887cc4a8247ac1c275c6a3dfd8db13371473c7f5548d629983ac521b53df0fb0fccebeb6505ef424f5c6080682552bbf825b8b2457731e91ad223b5ed SHA512 be0126102a7a6321349b5a680ba600dbef3f8bd757fcf35518672c39525633c3862bf4d795dddbf5d2ffbbc4ae639e20162656a482e916a808ff5af970e7aaaa
diff --git a/media-gfx/alembic/alembic-1.7.12.ebuild b/media-gfx/alembic/alembic-1.7.12.ebuild
deleted file mode 100644
index d67d4611da19..000000000000
--- a/media-gfx/alembic/alembic-1.7.12.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multiprocessing
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+boost doc examples hdf5 prman test zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	hdf5? ( zlib )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=media-libs/openexr-2.3.0:=
-	boost? ( >=dev-libs/boost-1.65.0:= )
-	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
-	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-doc/doxygen-1.8.14-r1 )"
-
-DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch"
-	"${FILESDIR}/${PN}-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch"
-	"${FILESDIR}/${PN}-1.7.11-0003-Fix-env-var-for-renderman.patch"
-	"${FILESDIR}/${PN}-1.7.11-0004-Fix-a-compile-issue-with-const.patch"
-	"${FILESDIR}/${PN}-1.7.11-0005-Fix-install-locations.patch"
-	"${FILESDIR}/${PN}-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	if use doc; then
-		doxygen -u Doxyfile || die "Failed to update Doxyfile"
-		sed -i -e 's|DOT_NUM_THREADS[ \t]*= 0|DOT_NUM_THREADS = '$(makeopts_jobs)'|' Doxyfile || die "Failed to change dot threads"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_SHARED_LIBS=ON
-		# The CMakeLists.txt file needs C++11 or C++-0x if none of them
-		# is defined
-		-DALEMBIC_LIB_USES_BOOST=$(usex boost)
-		-DALEMBIC_LIB_USES_TR1=$(usex !boost)
-		-DUSE_ARNOLD=OFF
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=OFF
-		-DUSE_PRMAN=$(usex prman)
-		-DUSE_PYALEMBIC=OFF
-		-DUSE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen Doxyfile || die "Failed to build documentation"
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	cmake_src_install
-}
-
-pkg_postinst() {
-	if use prman; then
-		einfo "If you're looking for an ebuild for renderman, you may want to"
-		einfo "try the waebbl overlay: 'eselect repository enable waebbl'"
-		einfo "followed by 'emerge renderman'"
-	fi
-}
diff --git a/media-gfx/alembic/alembic-1.7.16.ebuild b/media-gfx/alembic/alembic-1.7.16.ebuild
index e7b7b255e52c..1fde48d28344 100644
--- a/media-gfx/alembic/alembic-1.7.16.ebuild
+++ b/media-gfx/alembic/alembic-1.7.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="hdf5 test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch b/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch
deleted file mode 100644
index d36e2503427f..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2060f95c43685895f36269667c30acf7499b81b6 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 13:19:57 +0200
-Subject: [PATCH 1/5] Fix to find boost with >=cmake-3.11
-
-Cmake version 3.11 and later has a new syntax introduced, when
-looking for boost libraries.
-This patches adds this syntax if an appropriate cmake version is used.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/AlembicBoost.cmake        | 10 +++++++++-
- python/PyAlembic/CMakeLists.txt |  8 ++++----
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/AlembicBoost.cmake b/cmake/AlembicBoost.cmake
-index 21b3515..db59157 100644
---- a/cmake/AlembicBoost.cmake
-+++ b/cmake/AlembicBoost.cmake
-@@ -79,7 +79,15 @@ IF (USE_PYALEMBIC AND APPLE)
- ENDIF()
- 
- IF (USE_PYALEMBIC)
--    FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+    # cmake>=3.11 has a new syntax when searching for boost, which
-+    # needs to add the python version.
-+    # Hardcode the python version number, as PYTHON_VERSION_{MAJOR,MINOR}
-+    # are not yet know in the configuration phase.
-+    IF(CMAKE_MINOR_VERSION VERSION_GREATER 10)
-+         FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python27)
-+    ELSE()
-+         FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+    ENDIF()
- ELSE()
-     FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options)
- ENDIF()
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index a3fdb31..af8dcb5 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -33,12 +33,12 @@
- ##
- ##-*****************************************************************************
- 
--MESSAGE(STATUS "Boost_PYTHON_LIBRARY: ${Boost_PYTHON_LIBRARY}")
-+MESSAGE(STATUS "Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY: ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE}")
- 
- # set core libs
--IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
--    MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON_LIBRARY}")
--    SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON_LIBRARY})
-+IF (Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE AND ALEMBIC_PYTHON_LIBRARY)
-+    MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE}")
-+    SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE})
- 
-     # lots of warnings coming from unused local typedefs inside boost python
-     IF (NOT WINDOWS)
--- 
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch b/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch
deleted file mode 100644
index c561e26a6656..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 60bbcde225f3c28a36d8643c451509d9deb09222 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 13:34:09 +0200
-Subject: [PATCH 2/5] Find IlmBase by setting a proper ILMBASE_ROOT value and
- by using pkg-config to determine the installed ilmbase version, instead of
- using the cmake STRINGS command.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/Modules/FindIlmBase.cmake   | 18 +++++++++++++++++-
- cmake/Modules/FindPyIlmBase.cmake |  2 +-
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
-index 679a02f..0fe2b1a 100644
---- a/cmake/Modules/FindIlmBase.cmake
-+++ b/cmake/Modules/FindIlmBase.cmake
-@@ -52,7 +52,7 @@ IF(NOT DEFINED ILMBASE_ROOT)
-           SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
-         ELSE()
-           # TODO: set to default install path when shipping out
--          SET( ALEMBIC_ILMBASE_ROOT "/usr/local/ilmbase-1.0.1/" )
-+          SET( ALEMBIC_ILMBASE_ROOT "/usr" )
-         ENDIF()
-     ELSE()
-         IF ( ${WINDOWS} )
-@@ -87,6 +87,21 @@ SET(_ilmbase_SEARCH_DIRS
-     /usr/freeware
- )
- 
-+# use pkg-config to determine the correct version
-+include(FindPkgConfig)
-+IF(PKG_CONFIG_FOUND)
-+    PKG_CHECK_MODULES(PC_ILMBASE QUIET IlmBase)
-+    IF(PC_ILMBASE_FOUND)
-+        SET(ILMBASE_VERSION ${PC_ILMBASE_VERSION})
-+        SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${PC_ILMBASE_INCLUDE_DIRS})
-+        STRING(REGEX MATCH "-lHalf" ALEMBIC_ILMBASE_HALF_LIB ${PC_ILMBASE_LDFLAGS})
-+        STRING(REGEX MATCH "-lIex" ALEMBIC_ILMBASE_IEX_LIB ${PC_ILMBASE_LDFLAGS})
-+        STRING(REGEX MATCH "-lIexMath" ALEMBIC_ILMBASE_IEXMATH_LIB ${PC_ILMBASE_LDFLAGS})
-+        STRING(REGEX MATCH "-lIlmThread" ALEMBIC_ILMBASE_ILMTHREAD_LIB ${PC_ILMBASE_LDFLAGS})
-+        String(REGEX MATCH "-lImath" ALEMBIC_ILMBASE_IMATH_LIB ${PC_ILMBASE_LDFLAGS})
-+    ENDIF()
-+ELSE(PKG_CONFIG_FOUND)
-+
- FIND_PATH(ILMBASE_INCLUDE_DIR
-   NAMES
-     IlmBaseConfig.h
-@@ -179,6 +194,7 @@ IF ( ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY} STREQUAL "ALEMBIC_ILMBASE_INCLUDE_DIRE
-   MESSAGE( FATAL_ERROR "ilmbase header files not found, required: ALEMBIC_ILMBASE_ROOT: ${ALEMBIC_ILMBASE_ROOT}" )
- ENDIF()
- 
-+ENDIF(PKG_CONFIG_FOUND)
- 
- MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
- MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
-diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
-index d55f8d3..b5f3cb5 100644
---- a/cmake/Modules/FindPyIlmBase.cmake
-+++ b/cmake/Modules/FindPyIlmBase.cmake
-@@ -44,7 +44,7 @@ ELSE()
-               SET(ALEMBIC_PYILMBASE_ROOT NOTFOUND)
-             ELSE()
-               # TODO: set to default install path when shipping out
--              SET(ALEMBIC_PYILMBASE_ROOT "/usr/local/pyilmbase/")
-+              SET(ALEMBIC_PYILMBASE_ROOT "/usr")
-             ENDIF()
-         ELSE()
-             IF (${WINDOWS})
--- 
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch b/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch
deleted file mode 100644
index 9777bad13e8b..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3ca71af0e83fce89df0bfb472b28abe3c4e08c57 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 15:13:03 +0200
-Subject: [PATCH 3/5] Fix env var for renderman. This is called RMANTREE on
- linux.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/AlembicPRMan.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/AlembicPRMan.cmake b/cmake/AlembicPRMan.cmake
-index e02b237..fdbf26c 100644
---- a/cmake/AlembicPRMan.cmake
-+++ b/cmake/AlembicPRMan.cmake
-@@ -66,8 +66,8 @@ ELSE()
- ENDIF()
- 
- # Prefer PRMAN_ROOT set from the environment over the CMakeCache'd variable
--IF(NOT $ENV{PRMAN_ROOT}x STREQUAL "x")
--  SET( ALEMBIC_PRMAN_ROOT $ENV{PRMAN_ROOT})
-+IF(NOT $ENV{RMANTREE}x STREQUAL "x")
-+  SET( ALEMBIC_PRMAN_ROOT $ENV{RMANTREE})
- ENDIF()
- 
- 
--- 
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch b/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch
deleted file mode 100644
index 73e989ba6a6f..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d1895084e41970c8f91e9357fcb739ac29c47109 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 16:19:30 +0200
-Subject: [PATCH 4/5] WriteGeo.cpp: Fix a compile issue, where an invalid
- conversion from char* to const char* took place.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- prman/Procedural/WriteGeo.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/prman/Procedural/WriteGeo.cpp b/prman/Procedural/WriteGeo.cpp
-index 95b4867..5ad0b71 100644
---- a/prman/Procedural/WriteGeo.cpp
-+++ b/prman/Procedural/WriteGeo.cpp
-@@ -898,7 +898,7 @@ void ProcessCurves( ICurves &curves, ProcArgs &args )
- void WriteIdentifier( const ObjectHeader &ohead )
- {
-     std::string name = ohead.getFullName();
--    char* nameArray[] = { const_cast<char*>( name.c_str() ), RI_NULL };
-+    const char* nameArray[] = { const_cast<char*>( name.c_str() ), RI_NULL };
- 
-     RiAttribute(const_cast<char*>( "identifier" ), const_cast<char*>( "name" ),
-                 nameArray, RI_NULL );
--- 
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch b/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch
deleted file mode 100644
index 6bb8090344f1..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13b88370a862e16b417e9df6e40c2a9cba10852c Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 2 Aug 2019 21:31:03 +0200
-Subject: [PATCH] python/PyAlembic/Tests/CMakeLists.txt: fix variable
-
-The patch fixes a boost_python related variable which didn't had
-the version suffix for python.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- python/PyAlembic/Tests/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/python/PyAlembic/Tests/CMakeLists.txt b/python/PyAlembic/Tests/CMakeLists.txt
-index c32a018..ed9b23d 100644
---- a/python/PyAlembic/Tests/CMakeLists.txt
-+++ b/python/PyAlembic/Tests/CMakeLists.txt
-@@ -57,7 +57,7 @@ TARGET_LINK_LIBRARIES(PyAlembic_Test Alembic::Alembic ${ALEMBIC_PYILMBASE_LIBS})
- 
- ADD_TEST(PyAlembic_Python_TEST PyAlembic_Test)
- 
--GET_FILENAME_COMPONENT(BOOST_LIBRARY_DIR ${Boost_PYTHON_LIBRARY} PATH)
-+GET_FILENAME_COMPONENT(BOOST_LIBRARY_DIR ${Boost_PYTHON27_LIBRARY} PATH)
- GET_FILENAME_COMPONENT(ILMBASE_LIBRARY_DIR ${ALEMBIC_ILMBASE_IMATH_LIB} PATH)
- 
- CONFIGURE_FILE(
--- 
-2.22.0
-
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index 49d1fe2caa65..cbe5fd8cc576 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>waebbl@gmail.com</email>
+	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
 <maintainer type="project">
@@ -14,12 +14,7 @@
 	developed by Sony Pictures Imageworks Inc. and Lucasfilm Ltd.
 </longdescription>
 <use>
-	<flag name="boost">Use <pkg>dev-libs/boost</pkg> library</flag>
-	<flag name="examples">Install alembic examples</flag>
 	<flag name="hdf5">Add support <pkg>sci-libs/hdf5</pkg></flag>
-	<flag name="prman">
-		Compile Alembic plugin for Renderman (experimental)
-	</flag>
 	<flag name="test">Build and run the test-suite</flag>
 	<flag name="zlib">Use <pkg>sys-libs/zlib</pkg> for compressions</flag>
 </use>
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index ac8bf1e741cd..9b47235980b8 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,4 +1,4 @@
 AUX converseen-0.9.6.2-gnuinstalldirs.patch 4784 BLAKE2B 245c5ddeff91bf4e1c74471cd8a9f3c93bf786e5c44c48b62560cdc34913aeb97b5392355421ba19e42074547a81f0a471899e19dab7294434b37b9f6ab8e0df SHA512 9e5abc254e1a1d1b2a92d5ba04f24640b90ea49f79222ed81c83fedb0f007adcffb371952db6074c18b3d1d853f81de21f45a3803df2b7fc4b18dc93ee7ab5e8
 DIST converseen-0.9.6.2.tar.gz 276879 BLAKE2B 3f41c8a85d275b2a2fb1c2c8971f92e447b0c7b236d5b90a07629400925b8627e1e9e837239e2114cd2e6f755941b4ef28adfbecf9813963d01b925af4e348e0 SHA512 897bcb4554ca05d92dc939837f74022fcc21e05273cb40445c0d02ce3e10e87f9e74eeccee69e4ed1bdf63ca3bd759d4d51769daee5ea34df7997114c7937f7c
-EBUILD converseen-0.9.6.2.ebuild 798 BLAKE2B ccac8901c9e063b0191e94083bf0299a67bd04d8389c73f30ab8b497f78148b68518f3d4b2c55dcef8f70e5eee4d7aed093eefafe05d4a1de8f3fb18a977cbee SHA512 da05e793225b69d19d98ab25556292d80219b5373a5961eb4ce441f0a6a4761cf94896b750550de2a046595ad9fceb8e53e19cdc754d32e5851b3c8eb3d8a817
+EBUILD converseen-0.9.6.2.ebuild 839 BLAKE2B f04a7d944709ae6bfc9ae32db9ac80ea94fbc84502f97d385ea10280ddb6c272c750b0b466425c25d65f3404b3485b6184181b214027daddd029e86f9ac0cb6b SHA512 761bf3c502adda2c29f4164da59fd95066be9c4cc1a8ce531bf403ff6dc8b8625fb5cb31ad0d9c55c54e637fa89f8ecb3c2ceb081e189546440e6631b0509101
 MISC metadata.xml 252 BLAKE2B 85d312e9856476325a3b52f7e18559dc488db547c2a07da42e5e35921c22d893dd5b665fe34d18a391fc74ace49af2be8b60f59df208b83ae25a8ee1b36647dc SHA512 155ed9dbb0dd8e884779b634a9661de44f25cca743fd1b4e81164a1fa7bccf95b122f7492475a6648ac34230e1a4933d9d873204440f9d9ebce162aa0a707caa
diff --git a/media-gfx/converseen/converseen-0.9.6.2.ebuild b/media-gfx/converseen/converseen-0.9.6.2.ebuild
index 803e1a01e295..4432577b94d1 100644
--- a/media-gfx/converseen/converseen-0.9.6.2.ebuild
+++ b/media-gfx/converseen/converseen-0.9.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,10 +6,11 @@ EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="Batch image converter and resizer based on ImageMagick"
-HOMEPAGE="http://converseen.fasterland.net/"
+HOMEPAGE="https://converseen.fasterland.net/
+	https://github.com/Faster3ck/Converseen/"
 SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index bea8a206c437..ad6f49aee482 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,6 +1,3 @@
-AUX cura-4.6.1-fix-install-paths.patch 1478 BLAKE2B 177cd0d14fdecd0da4da0cbc4d1ff86082adbc4182c3789dd9d4ec056ab76b43d6ce7b48e027c5fc5d7b1684a15e310101361e6896fa980cd3370b1d2f2860c5 SHA512 4ddf154f398b9d285fb51e9255a7dd5d10caef0a1980bcf3f37c231d1c3c91433cfa9d351b7c96404364db1924f1fed63a98e8f317eef6905fd14e96171af3b0
-DIST cura-4.7.0.tar.gz 29712949 BLAKE2B b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f SHA512 0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d
 DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153 SHA512 0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711
-EBUILD cura-4.7.0-r1.ebuild 1875 BLAKE2B e31a488ab5dd67bf53f6bcdfb67f53475aa7432e74605058f4351b6a4ce6baa78675b0dff28431c2dcf28635b5bdfae15190363229d6b869ce3236352f0f1d3d SHA512 d9da18fac32dba4274ce84bdcb79355350470eeb7bb1aac396aa984777bbef9b81c7427416e3fa239aff638e5093a7d7d50669a301c534a21a0ffcf1310bf6dc
 EBUILD cura-4.8.0.ebuild 1966 BLAKE2B fb232dbe948e892b71ae184225b8c0a36feb34375dafd510332aa950bc0490512983a1ae15378f94beb863c3c4c012e7c5f6fd06c5f181558ad17c569c4ab73e SHA512 05d22e7c757079fa99eeeacd2f398526ff64373b450f46f058d627e85660a59b9d9ae8eb59222b07f364a381a0d9e8e16cbb16c112c69c7f4a46b2150332bcfe
-MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
+MISC metadata.xml 1038 BLAKE2B 888ad9975a914f5af17e3e43582eb8b2d2cd032cd157fd043271c2c17d098d24a8d8390a70c05587b180a3ff973c854f073fea60f2edfc8c89ffea40c914decb SHA512 100ef5e05d7585bbaaea67d0e91026dfad180d4d007dc4b833dd995cc1726706d53b7b67aa6576a91a7924be9280eec706221556cdcff1176c839c81423d09cc
diff --git a/media-gfx/cura/cura-4.7.0-r1.ebuild b/media-gfx/cura/cura-4.7.0-r1.ebuild
deleted file mode 100644
index e6ec0adefd39..000000000000
--- a/media-gfx/cura/cura-4.7.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..8})
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~media-gfx/curaengine-${PV}
-	~media-gfx/fdm-materials-${PV}
-	$(python_gen_cond_dep '
-			dev-python/mypy[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
-			sci-libs/shapely[${PYTHON_MULTI_USEDEP}]
-			usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-			zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-DOCS=(README.md)
-PATCHES=("${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch")
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -i -e "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	# trimesh not available in portage
-	local mycmakeargs=(
-		-DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader"
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon icons/*.png
-	python_fix_shebang "${D}/usr/bin/cura"
-	python_optimize "${D}${get_libdir}"
-}
diff --git a/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
deleted file mode 100644
index 4d5f00ad47d7..000000000000
--- a/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Cura-4.5.0-orig/CMakeLists.txt	2020-03-01 16:32:23.380956083 +0200
-+++ Cura-4.5.0/CMakeLists.txt	    2020-02-25 17:16:45.000000000 +0200
-@@ -48,6 +48,15 @@
-     find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
- endif()
- 
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+   if(APPLE OR WIN32)
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   else()
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   endif()
-+endif()
- 
- if(NOT ${URANIUM_DIR} STREQUAL "")
-     set(CMAKE_MODULE_PATH "${URANIUM_DIR}/cmake")
-@@ -80,10 +89,10 @@
-             DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages/cura)
-     else()
-         install(DIRECTORY cura
--            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
-             FILES_MATCHING PATTERN *.py)
-         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
--            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura)
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
-     endif()
-     install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
-             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index 19761d81848f..615b4b60345e 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -28,6 +28,8 @@
 		<flag name="usb">Access 3D printers via USB</flag>
 	</use>
 	<upstream>
+		<bugs-to>https://github.com/Ultimaker/Cura/issues</bugs-to>
+		<doc>https://github.com/Ultimaker/Cura/wiki</doc>
 		<remote-id type="github">Ultimaker/Cura</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 5e051ac42189..c6fa039d313c 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,6 +1,3 @@
-AUX curaengine-4.7.0-fix-tests.patch 359 BLAKE2B a84af3a8b47f2bca74f8aa3bc774a55719fc642048edca310dea0568fddff6cc90269f1711006c26dcca2b64d997a34858442fd674bc99b03aeffcafb93820bd SHA512 9ef48243ada474e2639cbf804be381ac1dabfd656ac58a2a296265b3d16bf416a867147a2f7415256bb0af14ff994e5eeb2e42e61a6f36afa29f7a96bc7ad0e0
-DIST curaengine-4.7.0.tar.gz 1684860 BLAKE2B da25da5656eb2c2d9cd9bd1c8ea0f633284a6d300f2b5ab7a916be262d20106d07a17a5c5ac63b854b32e98f616ecadbc05a912146f4f6d396c646ca69637116 SHA512 4c5f2eb70912315595e7f090ba9a34196ecb740eb25b5b2da2decf6485260999e8a87f7c2619c6efab9b46280e9eecf11f7e6bb021359c3b72da9fb900b0c1c3
 DIST curaengine-4.8.0.tar.gz 1690082 BLAKE2B 7c582ad0743a937ad4efa2a224e052383b90632c8f33f666a4139a74954a7243e17107ac39b35c1a5e41df89e303d618e4407d7e9a75efc5d96913aaaf498273 SHA512 be0d12cfe61932bf03dde61df8fb7f31cbd0aef6a44292130a7a67e318891f37db685722ba5d3cf66e88d4ff1de64ac86be5e494b750f8f7ff4b52d7976cb670
-EBUILD curaengine-4.7.0.ebuild 2287 BLAKE2B edf6a643b44302269a589d8040ed39d54d26ef5a602f9d8d2e6a196e754f78b0e3e0f3439781f6b29afa39424642b57914b34538ccfc510f2de1a8291394a5c7 SHA512 5b83c30d7ace834f57ea23f3a963bfbbf407a46d87175181df73d1e367725eb0d1fed080204f90a352965ba83ce45c70ae81b7f6852bfd7cb70af525049893ed
 EBUILD curaengine-4.8.0.ebuild 2233 BLAKE2B a4454674fbfc4c81334a21090a10fa324a1a594db66302105ba2fb8d448154dfdc6334ccf27984b210ed93ac9ccf67f7d846cab36b4c0af147603ab63ba6b724 SHA512 dbb6cb64ab13d53deff7f34d9acf9d7ceb0ea847ff0870255cb956fa3f5c7adf02009da850d404f3cdfb69ea9e5b8664d6cf561cbf62e1eab3aa90c1fb34b604
-MISC metadata.xml 1468 BLAKE2B 7aec44b3b8d90adfa9c95365a7e299907fb0879c2358d5770b96b41f175d0d916e6786b25cc7a3b39f599d2a3e61a00cd4b3a0d039c95cd6e0fd122d2be54e4e SHA512 3ab874f2117073a17297234b29e95b70fe73ab90fbddcfe024586dc2b0b47af23998e0cc5ae271614be95f4c41fc2a9485f097ba3eefea0345d8d592d5e0f390
+MISC metadata.xml 1536 BLAKE2B c2dc9d4c9e4027fac86acdeed68d620bcb97c5d5e458c2e11b03ac78cb1f7dcf7946d8ba3b84a071b8bb6f5fbcfac4e736ac25dd73f63d28e7f13abe9e3a6597 SHA512 b47c97c4ab56a5274f0308d7e4e168cd426f2c2c801a156e0eb8b5a12ed06f4b33fe7eedfd7f8c7f9e0c377be40655fc30b0dcb98f4ddebc4ecedabb47aafb74
diff --git a/media-gfx/curaengine/curaengine-4.7.0.ebuild b/media-gfx/curaengine/curaengine-4.7.0.ebuild
deleted file mode 100644
index 74a7ec34474b..000000000000
--- a/media-gfx/curaengine/curaengine-4.7.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+arcus doc openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	arcus? (
-		~dev-libs/libarcus-${PV}:*
-		dev-libs/protobuf:=
-	)
-	dev-libs/clipper
-	dev-libs/rapidjson
-	dev-libs/stb"
-
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-fix-tests.patch" )
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	rm -r "${S}"/libs || die
-
-	# remove static linking
-	# respect cflags
-	sed -i \
-		-e "s/-static-libstdc++//g" \
-		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \
-		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \
-		CMakeLists.txt || die
-
-	if use test; then
-		find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \
-		 -type f -name '*.cpp' | xargs sed -i \
-			-e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\
-			-e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \
-			-e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\
-			-e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\
-			-e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\
-			-e 's <../src/utils/string.h> "../../src/utils/string.h" g' \
-			-e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \
-			-e 's#include "../src#include "../../src#g'|| die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DENABLE_ARCUS=$(usex arcus ON OFF)
-		-DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF
-		-DENABLE_OPENMP=$(usex openmp ON OFF)
-		-DUSE_SYSTEM_LIBS=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		doxygen || die "generating docs failed"
-		mv docs/html . || die
-		find html -type f \(-name '*.md5' -o -name '*.map'\) -delete || die
-		HTML_DOCS=( html/. )
-	fi
-}
diff --git a/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch b/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch
deleted file mode 100644
index 33feab3d3949..000000000000
--- a/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream issue: https://github.com/Ultimaker/CuraEngine/issues/1318
-
---- a/tests/utils/SparseGridTest.cpp
-+++ b/tests/utils/SparseGridTest.cpp
-@@ -1,6 +1,7 @@
- //Copyright (c) 2019 Ultimaker B.V.
- //CuraEngine is released under the terms of the AGPLv3 or higher.
- 
-+#include <algorithm>
- #include <gtest/gtest.h>
- #include <unordered_set>
- #include <vector>
-
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index 45587a19e8cd..9bb6b008a456 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -37,6 +37,7 @@
 		<subslots>soname major version number</subslots>
 	</slots>
 	<upstream>
+		<bugs-to>https://github.com/Ultimaker/CuraEngine/issues</bugs-to>
 		<remote-id type="github">Ultimaker/CuraEngine</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 899665bbf0c2..ba942ab9cbd2 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -8,11 +8,13 @@ DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
 DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070 SHA512 0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
 DIST darktable-3.4.0.tar.xz 4444452 BLAKE2B 98b717aafe940a6916a2c2c42577be4956a171e7b445d69d20cb6aa1db35a255919524e8547c229461c64022fa3df5ace57a9e7a5ed32304820d5f263c3acbfc SHA512 b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f
+DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 EBUILD darktable-2.6.2.ebuild 3475 BLAKE2B 447c7330f1721443008a4794458d2365c5459a17e9257e4b2ae9a218824b78481ac66f37b230689035021d345908815135d71bfffad40e5c7d28bc7687cfcaa6 SHA512 23cf95b35f5445d7b21f13f11304e1eed211adb738d6d4389123b82596a77bcd8c8412b89c793d93fe1f6ab5dfde104618903ec35ab1e59a784eb7e43328362b
 EBUILD darktable-3.2.1-r1.ebuild 4250 BLAKE2B 6b29ac0b75ea866c64f8ee57ace0c85d315537f1df46b705b357b477528917f732e927cb14ce6465d5787b19e113030f62fac68cc1f0d42f626108cbb4ecf4ce SHA512 6f86a3688b660a76af91dd5124540af6333df5625b304f33b4fc3b0d668ea127592bdaf5b6b705420fef905b7e16dc09a9d130f3d96f4938f5a2ad9421147ce0
-EBUILD darktable-3.4.0-r1.ebuild 4585 BLAKE2B 219537b19aeb5096cee8d029aa4d50bc75a45b45c8cd3b22c624ec4c5affc0f4697a9c1a5b176f054742ffdc2de700bff8001258dff340c246e8e4d207d5aae2 SHA512 2978b96f9e4ea1eae466e5db8ccef786596e72b8018cf3e576076f1bba900b2996dc306cc34a1da1b1fa9b9cbfb9dda710222ca30a353a3f13b16806e0ecedb0
+EBUILD darktable-3.4.0-r1.ebuild 4584 BLAKE2B a5a88c6d232a309f7b900f76d9736102a7863fed509db5534feef5e66b778195d2bd225ebaec4ab447971ea10a7996c08d727dcbfc3dcb0cac4a7e2f4f0b7da3 SHA512 b9bf993563d4ea36113ebaf911d5b49c55458a6e521b0bf479523d37652d372e290d44451cb30969bc916e30eef1375b64c2e0ad70ea69c8a7be926f56601de3
+EBUILD darktable-3.4.1.ebuild 4475 BLAKE2B 014357ed56681c237b4ed9dc2c2070613298c858a3d996fcf763db981411f6cf7ffdc84ac44fcf5cfa9070af991409e608e742357c476cf387502764c40291bd SHA512 c0e9dee7f87d2d9a6e44406573b7ea0f7ab6dab096adfc1ad6b8edaf55bd5897bde6df086dfa235cbaef0eeed3afbed4cd5170dfa762af8336af19bf20efdc12
 EBUILD darktable-9999.ebuild 4475 BLAKE2B 3afed84176b49c7604c36fc5605a75f7db9bbe0fbde3a438dc964010a184b70031565b4f20914315c934c9d8d1f4e24d2f12e05d8e20a7498a972bb83a2d1ec9 SHA512 5294cb5cf18fe9be1d6b43553ab46759925dbb904c0b0a5fca9349a9b860d6756cb834eb4aa493f0b831a49554387898d5107191f92f05d9f03f35989cae0dd6
 MISC metadata.xml 1296 BLAKE2B 41415c7a013551a7e5cec72b8df9304b446d273f80b1975dd5f15672ec128f20e1b6d94be67d2e8e049674e1f12fae0d85840bd9aced2b62b213fe519b85f80d SHA512 110b05e5c449e0e1bb9fc0228a4b762e2f2fee74215ba0b084d9f719481af682d2a70c8df04313eb89916051f2c3ba1e057321b839144ad70298faf90605acd7
diff --git a/media-gfx/darktable/darktable-3.4.0-r1.ebuild b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
index cb8b5d62769c..7f946caeaa10 100644
--- a/media-gfx/darktable/darktable-3.4.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
 		doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 
diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild b/media-gfx/darktable/darktable-3.4.1.ebuild
new file mode 100644
index 000000000000..c66c363f4918
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+	DOC_PV="3.4.0"
+	MY_PV="${PV/_/}"
+	MY_P="${P/_/.}"
+
+	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+		doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+	KEYWORDS="~amd64 ~arm64"
+	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+	lto lua nls opencl openmp openexr test tools webp
+	${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-python/jsonschema-3.2.0 )
+"
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.8:0=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	avif? ( >=media-libs/libavif-0.8.2 )
+	colord? ( x11-libs/colord-gtk:0= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gmic? ( media-gfx/gmic )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lua? ( ${LUA_DEPS} )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	opencl? (
+		>=sys-devel/clang-4
+		>=sys-devel/llvm-4
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+)
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			test-flags-CC -floop-block &> /dev/null || \
+				die "Please switch to a gcc version built with USE=graphite"
+		fi
+
+		if use openmp ; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
+		-DBUILD_PRINT=$(usex cups)
+		-DCUSTOM_CFLAGS=ON
+		-DDONT_USE_INTERNAL_LUA=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GMIC=$(usex gmic)
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LUA=$(usex lua)
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_WEBP=$(usex webp)
+		-DWANT_JSON_VALIDATION=$(usex test)
+	)
+	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# This USE flag is masked for -9999
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+	if use nls; then
+		for lang in ${LANGS} ; do
+			if ! use l10n_${lang}; then
+				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "When updating a major version,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade any more."
+	elog
+	ewarn "It will not be possible to downgrade!"
+	ewarn
+}
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 14ca45600481..0b4db4c27a5d 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,6 +1,4 @@
-AUX fbida-2.10-fprintf-format.patch 172 BLAKE2B 1abaa348e1bdd459b9f6458d361bed01787566a29c57ecec108b64688ed0401bd6c40f4d498a74953e4e5b606a29416ad477675941e06d22070806354fd05af1 SHA512 a340550e87b9532b9a5cf2240bb965879696760c37031f8bfc7d251891e81b10391408626c45ef636dc67c2ccb6746195837587a4ff8e6598262a6a1f920eddd
 AUX fbida-2.10-giflib-4.2.patch 542 BLAKE2B e41f1cb27860b0fdf99d4e9a3961021e4be64f6ac9e47099e6dd7b784b96599490137f6340e54052216af1692e2d9177d831612248ed7be849e6141ab5eb86b0 SHA512 7610721d965c3640c4524311626ba099501cac1aef6cea62d32158e8a7720cc23bdb0c83422795676de021f88a592c3d2f7d4d26d810dc06d959f7c85e91019e
-AUX fbida-2.13-Autoconf.patch 239 BLAKE2B 749fa77fe9f2a5b8b61051dcebfacc6efcf97cd2f9bd7d9d4de737bca89689203dff7a1c3baff620289ddc211419a1b31a3924b7542049db345af5503479e5f0 SHA512 b87ed3f79fe9efea02fc97d6cde0e6d67c2e6baf93ab3a19564090f2806cbfa1b67610a16a4151ba8df31d570f79f8f964dd608ce4fda95e7f7cbcc562902847
 AUX fbida-2.14-Autoconf.patch 244 BLAKE2B 52b9fff1bcb3eaae0753842e953566ce7eebb4ff445dc288b2ca84342247ec0744dac9327c53dc863cf564543e791305d5a27ffda059837320cac461f4e222fb SHA512 cb31757e3ca3eabbff4c4ecb27581b39b8fef386412b4f26558a070b6b08891b09a31a06861d965009f5158e03ab227b86873f4b64316cf63bc7b51ce6074221
 AUX fbida-2.14-cpp.patch 222 BLAKE2B e8bfabd42c57a08261982b0ab71532135db8a289963c12a0ee3d8793806761a630a75671c655a2ab25cc24be714fa25eababac6f853d7b2323f2dac910741bba SHA512 8fe4bc3e5eb6bfbb8b362807238d9635df9dbc11b4f33a5ed485000f59722c68d3bc8a93953d74e7b86af33d7107c6fb7e253798396a4574baf517a41e44db14
 AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1def9a77a4faa55742858d2eeb75a8d2ba4c4151505dbaa683b31b49e1ce6d88aef6ab9b3e6b830a59533903e02597 SHA512 4fe7560be0a5cb4f00ebe8a1574f131b6fd83902c6dbe54995f384a250b25b03e5f0022a5c38c306a709de6240f447c53c9af3ba3aca863b08e725567746185e
diff --git a/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch b/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch
deleted file mode 100644
index d1c0b36dbfba..000000000000
--- a/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/wr/write-ps.c
-+++ b/wr/write-ps.c
-@@ -458,7 +458,7 @@
- 	    fprintf(fp,"\n");
- 	}
-     }
--    fprintf(fp,footer);
-+    fprintf(fp, "%s", footer);
-     return 0;
- }
- 
diff --git a/media-gfx/fbida/files/fbida-2.13-Autoconf.patch b/media-gfx/fbida/files/fbida-2.13-Autoconf.patch
deleted file mode 100644
index 41c4e2f7d9bb..000000000000
--- a/media-gfx/fbida/files/fbida-2.13-Autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mk/Autoconf.mk
-+++ b/mk/Autoconf.mk
-@@ -162,7 +162,7 @@
- 	@true
- 
- Make.config: $(srcdir)/GNUmakefile
--	@echo -e "$(make-config-q)" > $@
-+	@printf "$(make-config-q)" > $@
- 	@echo
- 	@echo "Make.config written, edit if needed"
- 	@echo
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index bed82a0006c1..d29099f1ef9f 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,5 +1,3 @@
-DIST fdm-materials-4.7.0.tar.gz 41139 BLAKE2B a372d8273809a7d1a14e0b6e35a9c7266d626f26013f53a5d6c8462e2b1054bd65c72745ed1afdf96b17d6573f74b8555c946ef76c94acb8d860efa459d9955e SHA512 cbc42e2777d1332b5187cf1f826f73bf5c1c5a1106d851dc08d8082f41bde6846f349ed2339ae60ad00b2005b0983f01850931adc765d545de0a700f1d9cccaf
 DIST fdm-materials-4.8.0.tar.gz 43850 BLAKE2B d9fa025eeb4f11c027fd64a2615d214a47024df62d53ee6b43391ac5383812581ae2ca075804277b6f7094639238646211cb5b978580edf91d004e83ef7ce405 SHA512 6e2812dc61ad00437d4c7943c3746cd915e1e49edef49f89ea2c4ca4cf023d67c400d1ae1e3c40923928d20ac09b184fc0632b828900b6236f9dfd346f19036d
-EBUILD fdm-materials-4.7.0.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
 EBUILD fdm-materials-4.8.0.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
 MISC metadata.xml 949 BLAKE2B d84bebe6a29c4eb2a6e644347492fe06a60e758efcaba9158d2395d2e3714565f805d01ed029bf8906c54ed286e49902adf6b4e8cef9870219cf3fd13912f5e7 SHA512 d7f04589e2e66b471a721aafa2d2be2d531211f2e5003ed7ffed918e770e6980cf891bc5728a0d1a27c3bcaebf2706ac9dd6d9dac847c412e1b7adde091a7594
diff --git a/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild
deleted file mode 100644
index 99506a67b867..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="fdm_materials"
-
-DESCRIPTION="FDM materials for media-gfx/cura"
-HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="embedded"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DEMBEDDED=$(usex embedded on off)
-	)
-	cmake_src_configure
-}
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 91a7b5bd761c..53319c5cdc71 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,6 +1,6 @@
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
 DIST feh-3.6.1.tar.bz2 2116064 BLAKE2B cae12f9475a2678c2f521baac9deb6668eae07811ae0904bbefef873fd54182b94532bf811394964e725f0e45890f65fcfc3dc988135d388ddcf625adbeca4e0 SHA512 b4350f1c5f66a450b2f088affea973abab9e184df110b693e46e1fc532d213d62a52bf08029f345daf92d45c828ff3bd380dcd7b167f319f1ff3b1d04150cd75
 DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7
-EBUILD feh-3.6.1.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a
+EBUILD feh-3.6.1.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 EBUILD feh-3.6.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/media-gfx/feh/feh-3.6.1.ebuild b/media-gfx/feh/feh-3.6.1.ebuild
index 7d87a35ace60..d0173f659d38 100644
--- a/media-gfx/feh/feh-3.6.1.ebuild
+++ b/media-gfx/feh/feh-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
 IUSE="debug curl exif test xinerama"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index c1aedbda5c44..1521a79097d9 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,4 +1,5 @@
-AUX fotoxx-15.05.patch 460 BLAKE2B 95f19579fecaa13dacf5249cae1e05561070f2ac9cf8856d17d0bbf0e4b4c55ea476960f5e49580200e190d0f84daa3c29862a1414848a14b6d72a058b694767 SHA512 e4d2ddd827de492ac4890c8c8b34719b9dcc6acd555de60c7d5bef35d8c0dca032635fac9b989c92594ea92d5bd47c0300acca9074696058321bd401fdbb7b0b
+AUX fotoxx-15.05-docdir.patch 395 BLAKE2B b0fb1bdd0e56f29569b49ca6b6d2acd205a1272924ab955d5778ffb7150400193ee12052a169ee9a2e0e07dd6b40c0ccb0f62e84463c651577447d32109fa273 SHA512 9204f4712ced994b22137b8f5fc80976120835ea5bde14b5caaa5db604b10de7a7b6ea743333603a1887a8012d806a5af8cf0ffea26f8ea8eb74d228fb822c1e
+AUX fotoxx-15.05-gcc-11.patch 925 BLAKE2B ac27fa95bc877b66607f5aca75c44462c0a8c39ee3acc117c9f6949a9d4975728156470dc04dce9b8a95582c72e5c236b68e4d2f01508246bdef0ac23b087621 SHA512 19801bf47e796953d148a12cdeb1eb5dbac23f4d54b41782923c61096f9dabf791b6d7afbc529f2c4214f940d83ba6807816afb0f8303b3ab514330bc01dfb63
 DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
-EBUILD fotoxx-15.05.ebuild 1158 BLAKE2B e2885489ef78b828f1141a268876333168088c3a042208cbcedbf068613711e47526ca8fb79121d61f067030d6cb2cc7cb671161c8d2a26a5e6480c7915965f7 SHA512 374c9c7e979a9427003ed76f36aa0b7233667407fc2a7ee1498e7bbba9e351ba3202efaaa676eed84ddb5997a9d0cba1f5f38ee878c3f75aac5054d7ba8100d8
+EBUILD fotoxx-15.05.ebuild 1199 BLAKE2B deaad80fe616d8691961775ca86ac57c93fad6920a5f7bd46b97163ec83f7d8450bb7d3d5b925b26402c9817be6d8c94b7ab365bb649093a5db6a3f34c30615b SHA512 cb0117567b401365354eb10b3554363afa48400f6b4412468897fca144921c849be45d7839eb47dcdae25dd4488fac212b1ba1370fa31fde88f25c2859dbd57d
 MISC metadata.xml 773 BLAKE2B 75c03d8cf914e9aeb25db837d5e945908082d8711b19fbeb8694371ebb8c2ff6c69088dd4c887ce4f29eb456e2f412f6d992ac04c447a31e814838dbf5932aa1 SHA512 1fbf87c22810a242a8d7f0e91e6ee6bcb6b1a08cb39c3e827171e110bdcc5468a2440c42d56f1630860555a54fee0133483d8551dac164492bb630fcb45c7cc8
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05.patch b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
index 15fdaa9abacf..8cab49ff51ea 100644
--- a/media-gfx/fotoxx/files/fotoxx-15.05.patch
+++ b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
@@ -1,4 +1,3 @@
-diff -r -U1 fotoxx-14.10.2.orig/Makefile fotoxx-14.10.2/Makefile
 --- fotoxx-14.10.2.orig/Makefile	2014-10-09 15:17:09.000000000 +0700
 +++ fotoxx-14.10.2/Makefile	2014-10-13 20:44:55.061728475 +0700
 @@ -16,3 +16,3 @@
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
new file mode 100644
index 000000000000..5d84e687d397
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
@@ -0,0 +1,31 @@
+Fix 'smart_erase_blur' declaration and definition mismatch.
+
+https://bugs.gentoo.org/768207
+--- a/f.repair.cc
++++ b/f.repair.cc
+@@ -2265,7 +2265,7 @@ void smart_erase_func(int mode)
+ 
+ //  add blur to the erased area to help mask the side-effects
+ 
+-int smart_erase_blur(float radius)
++void smart_erase_blur(float radius)
+ {
+    int         ii, px, py, dx, dy, adx, ady;
+    float       blur_weight[12][12];                                        //  up to blur radius = 10
+@@ -2274,7 +2274,7 @@ int smart_erase_blur(float radius)
+    float       red, green, blue;
+    float       *pix9, *pix3, *pixN;
+ 
+-   if (sa_stat != 3) return 0;
++   if (sa_stat != 3) return;
+ 
+    rad = radius - 0.2;
+    rad2 = rad * rad;
+@@ -2342,7 +2342,6 @@ int smart_erase_blur(float radius)
+    CEF->Fmods++;
+    CEF->Fsaved = 0;
+    Fpaint2();                                                              //  update window
+-   return 0;
+ }
+ 
+ 
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
index b0b0b1e02756..b15710b39828 100644
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ b/media-gfx/fotoxx/fotoxx-15.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,10 @@ RDEPEND="${DEPEND}
 	media-libs/exiftool
 	x11-misc/xdg-utils"
 
-PATCHES=( "${FILESDIR}"/${P}.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-docdir.patch
+	"${FILESDIR}"/${P}-gcc-11.patch
+)
 
 src_compile() {
 	tc-export CXX
diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest
index 9eaaf3ee4eaf..125f349b1ccd 100644
--- a/media-gfx/frogr/Manifest
+++ b/media-gfx/frogr/Manifest
@@ -2,4 +2,4 @@ DIST frogr-1.3.tar.xz 2552456 BLAKE2B 562f88898fec153c50696dce59b5396b6f9e88bc68
 DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4
 EBUILD frogr-1.3.ebuild 626 BLAKE2B 9e17e2f7206f357020256d796ffc92b2f3bb63d3b5f8b52209289628d8ee76cf6ac18e84d5982ddd4828437275f2cefd039025d9104ce0d0f3ab958b9bf2cb96 SHA512 8b2eaa44c95a0266e1568becdc8fccca0dec6de3e31d9cd71a228fa068a361ea223efdc39b318459abb68c285efb9ef688cf5b44eed79f1d79e4db76b6d7427d
 EBUILD frogr-1.5.ebuild 891 BLAKE2B 444fd6ab77b7bd9015785d6c4eeefcfef3990d83b314f11119e91621e84646d633664bc2527150052252b40b39edfddf1213f051c3ff90d3942cbc689881aff4 SHA512 22e34ccd09564056a188cf2486b1c47edad79e231f27f909b2b38184a0067df1f9762eec4b35d65e15096d37bb67b6eaaa3fe48640f6b783a8cf9aec2a83948f
-MISC metadata.xml 471 BLAKE2B 98553d988349910ccfe0ef4130d85d7cfa800907b6ab4f7823368fccfbfdb2cf5ecc05bb1b567e7749f92e240f2e2ec8bd95cb3ced30e9d0f3c011f3e8ad4664 SHA512 4c254ca88582b48b89673a930d4bc1e4d051b828c4241a8fd30c28375099fb78b8691ea65c90ddd3b60305ec68d3db9986959ac899b8f2341f562c6d435442e1
+MISC metadata.xml 386 BLAKE2B 5b6c13b6c0a981e0e1fd0c7092204999a4849c2339bb35de15b69bd04e736f8f5d1ea905f429f036852e34a7c729e744518f0171ef29c6cf016fc047332b2838 SHA512 660c88d236b1c2ba2ea1e20d0d2ea9a3acc5a9f8d0306b3ed98bfec2d616e67b9e8aceb137438e6b0a6517588252a676c715f6177b9e369d09019064254c8f53
diff --git a/media-gfx/frogr/metadata.xml b/media-gfx/frogr/metadata.xml
index a75837990a74..56b1b12cb47e 100644
--- a/media-gfx/frogr/metadata.xml
+++ b/media-gfx/frogr/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sobhan@gentoo.org</email>
-		<name>Sobhan Mohammadpour</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Frogr is a small application for the GNOME desktop that allows users to
 		manage their accounts in the Flickr image hosting website. It supports all
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 0dc0b392511b..4151a5075253 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,6 +1,8 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
 DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
 DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
+DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
 EBUILD gmic-2.9.2-r1.ebuild 4848 BLAKE2B 19cec459abf67e10c99319c9fc1174eba19390e94bfe07595d75c3bcf144cad2235281b1a07eabb56c245aba87ceda414c602f64b51734669010961f652db473 SHA512 1857c8b9c01dbd03f3e2dee257fece0ebb6574ce1eb91db76be86e1b3879b0aed7067ba25857e247e49ec1adfb4cc483f52b41ede31f9156b8650e4f295593c8
-EBUILD gmic-2.9.4.ebuild 4848 BLAKE2B 19cec459abf67e10c99319c9fc1174eba19390e94bfe07595d75c3bcf144cad2235281b1a07eabb56c245aba87ceda414c602f64b51734669010961f652db473 SHA512 1857c8b9c01dbd03f3e2dee257fece0ebb6574ce1eb91db76be86e1b3879b0aed7067ba25857e247e49ec1adfb4cc483f52b41ede31f9156b8650e4f295593c8
+EBUILD gmic-2.9.4.ebuild 4846 BLAKE2B 1b70a21c2004aba565a4e81372930200a373c9985dc47f7a3c23a8cc076bc11c4bc565ebe356384dfcbe94db60c5f568f75c772f4dcb3a885d7b39318309e36b SHA512 bc6dbdb81baef52096e0afe4cec2df0161b227a75a6dac150d07f2b8e37e2d09856b046a9c670db2818eb538b046be21f7eb30512c9b74909c3bdde3d1c09b83
+EBUILD gmic-2.9.5.ebuild 4262 BLAKE2B ea9fdfb207a5a28d1d04136a916d806bab9906e0d4495dd37b29ecae0296a57d5c9f2fdfd6485ac7bfda9b7d5f104b976c4fb9232910839256c3727a115532ad SHA512 2402560d48ea661dabcb9b727d3dcb6669f71fe7270bf3986db57aa5a8f51366133d3950d748e0e631dec77c346ca9057bdd8540aef93c4d5d9bf8a20fd33bbd
 MISC metadata.xml 605 BLAKE2B f1ed3b46614a3e3273e4bdedfd7b45629eca482a0805ff1bda2161e4d785a478b91f8ccdbab399b184ec93d020211e35e4503fbf4205b1e2e1f04c7e547303bd SHA512 8303e0a301edb88bdb7522baf47e29b39e895ccaa729231d64b6a39af73f0eb1626c39439f1ed70d496d982f3abca4ff9586d20fc5a9d08b0e57a19b60bf088d
diff --git a/media-gfx/gmic/gmic-2.9.4.ebuild b/media-gfx/gmic/gmic-2.9.4.ebuild
index 4af6d1c63fa1..0c669de12cc1 100644
--- a/media-gfx/gmic/gmic-2.9.4.ebuild
+++ b/media-gfx/gmic/gmic-2.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
new file mode 100644
index 000000000000..20cad100504d
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 8fd6de3d292c..0fe26b7fb5ba 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,12 +1,6 @@
-AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0c9714a776868303bda17af26cca8f3c4160d7f9060d0a8a116ad30a17b416ddd2963da0e66d4ca76fdc351507c51ae30998 SHA512 fa1bdbe718ae8ae49a58f6fc1728f1bb6b869a907f77e41eec92c452f86e05cf821548409f2a5d55dcdb38b8a80d7ef2b1d37d2111c3fd5088a118626479ad2c
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
-AUX graphicsmagick-1.3.35-CVE-2020-12672.patch 2753 BLAKE2B 864a77b650f5cec350d83bc5eec289736171a141e8609c41d4c66f49a58b2d332cb2ab343f557879a547e6a291665d16c5707ab7573bf48263a838ba24940475 SHA512 57387a3f1e2e07fdf4617b0fc73106b4f00fe1a7dc0d88919b39490213d42180a4617653b48e54749f7d2807dca4d1b052f14389c30b7a059f841c012ca2b1a6
-AUX graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch 988 BLAKE2B 4906fffe43150ef209c4d2f87d433cf78cd5e3c03a9db22426e3c3455028a5ff63c189ace1f46f47e1fa04fe8d78388b76dcabc288a9a75e57b7ebbb68f8c90d SHA512 95776534891eed617b09873fd70af020c6d6370a6765ba7aaf8185268e8b73b774ce2aeb1b284641fb12260ca0047c4543b17a18ed4ef28db725b75f988c7215
-AUX graphicsmagick-1.3.35-oss-fuzz-23042.patch 1350 BLAKE2B 415bd540a7aa194235ce1e6482035dd9b8ee4d4f5192f4d898e178875d453fd8b481efcbe139db602d411f788e3067a95106ba128ab14af63d3848f92c035405 SHA512 d345b54570e3396db81f0f60980633e139f90a54b579ad953a36aa5e16c1edfe7a5186b4e2d5a2e02f759544b372981278b06d2b688324e6b091c841a5bae133
 AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a
-DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
 DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
-EBUILD graphicsmagick-1.3.35-r1.ebuild 3244 BLAKE2B 20a05ba460b52292328b8152c8b8991653bc5478dde0768085df9b1ed53e16aa74d485a6b49054d97fc4c30eadc7d8be959519711023c495208537d3387bf099 SHA512 a9f44ee9b36fc6859c30a46f6d61338ce5d4d5819508cb2c59e042fab00fbbcccab25219e292413536376e1a7fed734268c50cd1afa1ef68b0ef285a2543cf85
-EBUILD graphicsmagick-1.3.36.ebuild 3121 BLAKE2B d43927f189cadec119d1ebf48bb7110fd91a4d898fd8e38c33268d0fd42b9a7395cfdb7702de3935a8dbc73078ccb8051e4bcaf7e9ecceb4417b1cb8b7315119 SHA512 994e4f88adb26d0c244ef4b684d4f47b2cf8c80acea9de42bf734e8f1c1080fa54d91345b0ee77c967a9ad1079ebcf17aad86509dc8b80aa808d47300c16ca4f
-EBUILD graphicsmagick-9999.ebuild 3126 BLAKE2B 4ae429e70dcb36ac4aa03bc6dd0dc21f5540751faeb531e962cad24402e0ff1aa078193e3f9c2cd34d09858215041d4b03f61245636b43c1909e79eefbf43a84 SHA512 6a53a3861721ae9d305dee052da5637fc570c1ffe9c1f7588701a0f9c612740f1e75b3c6d931414f08ca2332b5b2ab8dd13c93e8570f41bc32490a23b9f861d0
+EBUILD graphicsmagick-1.3.36.ebuild 3165 BLAKE2B 45ce77b1bc701748867b55ae2cb14e13901a9e41ee8b0da5c144e227688ee82c0eaafb66b0444bb2fd85067f80b16247f36e986c4cde798bcd9faa3aed7794f0 SHA512 f11cec24ecb3eec4767be8ed08bd25e0c86209c9435a7a57ca7d960049092fd3adf3edd490a4e958a53041f4705215d452804b6d9a9f5e78a7a5eddf48b11ff1
+EBUILD graphicsmagick-9999.ebuild 3171 BLAKE2B 7ec34831b9d3297e7fe1acf566f735fb733874da436d0a5346b40021e7a6485c08fd8b112ed149a26d8c8276ffdf2eaa75c34c8f19dc9198904b239c0213197e SHA512 a931780d798844c966fdf35afe2698da6085cee5bec3882349947d7c29c08770272918fe47e615ac68267f916f5ef626db0383400977fe6bf33e07bfcae84109
 MISC metadata.xml 1071 BLAKE2B 899c521ae7916dc5702bada0b782b3020084f84397f0ab62aa4ac15d14d74045ee3dca8b9c9c98591481502694a59e33fcfd8467b7da836a8ee16fb16fbd4727 SHA512 50d6c48e7459d3772d0b804785f5b40cce16bc7a1ac6602a1d5475cd5616e725aa111385eab50a5347418073f1c7afc03f66aa4fd8959474835d899b22c9bca8
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch
deleted file mode 100644
index 1ebef5400337..000000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Fix various preprocessor, compiler, and linker flags added to config wrappers.
-Previously they would add build time flags to the files which is incorrect.
-
---- GraphicsMagick-1.3.19/configure.ac
-+++ GraphicsMagick-1.3.19/configure.ac
-@@ -346,6 +346,7 @@
- 
- AC_OPENMP([C])
- CFLAGS="$OPENMP_CFLAGS $CFLAGS"
-+MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS"
- #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
- #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS"
- AC_SUBST(OPENMP_CFLAGS)
-@@ -3407,9 +3408,10 @@
- MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/  */ /g'`
- #LIBS=`echo $LIBS | sed -e 's/  */ /g'`
- 
--MAGICK_API_CFLAGS=$CFLAGS
-+MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/  */ /g'`
- MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/  */ /g'`
--MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-+MAGICK_API_CXXFLAGS=""
-+MAGICK_API_LDFLAGS="-L$LIB_DIR"
- MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS"
- MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS"
- 
-@@ -3440,6 +3442,7 @@
- 
- AC_SUBST(MAGICK_API_CFLAGS)
- AC_SUBST(MAGICK_API_CPPFLAGS)
-+AC_SUBST(MAGICK_API_CXXFLAGS)
- AC_SUBST(MAGICK_API_PC_CPPFLAGS)
- AC_SUBST(MAGICK_API_LDFLAGS)
- AC_SUBST(MAGICK_API_LIBS)
---- GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in
-+++ GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in
-@@ -30,7 +30,7 @@
-       echo @PACKAGE_VERSION@
-       ;;
-     --cflags)
--      echo '@CFLAGS@'
-+      echo '@MAGICK_API_CFLAGS@'
-       ;;
-     --cppflags)
-       echo '@MAGICK_API_CPPFLAGS@'
---- GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in
-+++ GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in
-@@ -33,7 +33,7 @@
-       echo '@MAGICK_API_CPPFLAGS@'
-       ;;
-     --cxxflags)
--      echo '@CXXFLAGS@'
-+      echo '@MAGICK_API_CXXFLAGS@'
-       ;;
-     --ldflags)
-       echo '@MAGICK_API_LDFLAGS@'
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch
deleted file mode 100644
index b314ea288e43..000000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -r 4917a4242fc0 -r 50395430a371 coders/png.c
---- a/coders/png.c	Fri May 01 13:49:13 2020 -0500
-+++ b/coders/png.c	Sat May 30 10:18:16 2020 -0500
-@@ -5304,7 +5304,7 @@
-               if (logging)
-                 (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-                                       "MAGN chunk (%lu bytes): "
--                                      "First_magnified_object_id=%u, Last_magnified_object_id=%u, "
-+                                      "First_magnified_object_id=%u, Las t_magnified_object_id=%u, "
-                                       "MB=%u, ML=%u, MR=%u, MT=%u, MX=%u, MY=%u, "
-                                       "X_method=%u, Y_method=%u",
-                                       length,
-@@ -5679,6 +5679,8 @@
-           /*
-             If magnifying and a supported method is requested then
-             magnify the image.
-+
-+            http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html#mng-MAGN
-           */
-           if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) &&
-               ((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5)))
-@@ -5689,7 +5691,28 @@
- 
-               if (logging)
-                 (void) LogMagickEvent(CoderEvent,GetMagickModule(),
--                                      "  Processing MNG MAGN chunk");
-+                                      "  Processing MNG MAGN chunk: MB=%u, ML=%u,"
-+                                      " MR=%u, MT=%u, MX=%u, MY=%u,"
-+                                      " X_method=%u, Y_method=%u",
-+                                      mng_info->magn_mb,mng_info->magn_ml,
-+                                      mng_info->magn_mr,mng_info->magn_mt,
-+                                      mng_info->magn_mx,mng_info->magn_my,
-+                                      mng_info->magn_methx,
-+                                      mng_info->magn_methy);
-+
-+              /*
-+                If the image width is 1, then X magnification is done
-+                by simple pixel replication.
-+              */
-+              if (image->columns == 1)
-+                  mng_info->magn_methx = 1;
-+
-+              /*
-+                If the image height is 1, then Y magnification is done
-+                by simple pixel replication.
-+              */
-+              if (image->rows == 1)
-+                  mng_info->magn_methy = 1;
- 
-               if (mng_info->magn_methx == 1)
-                 {
-@@ -5734,12 +5757,10 @@
-                   Image
-                     *large_image;
- 
--                  int
--                    yy;
--
-                   long
-                     m,
--                    y;
-+                    y,
-+                    yy;
- 
-                   register long
-                     x;
-
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch
deleted file mode 100644
index c7921dd2e699..000000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -r 50395430a371 -r 83b4d2b4b873 coders/wpg.c
---- a/coders/wpg.c	Sat May 30 10:18:16 2020 -0500
-+++ b/coders/wpg.c	Sat May 30 17:33:51 2020 -0500
-@@ -403,7 +403,7 @@
-   x++; \
-   if((long) x>=ldblk) \
-   { \
--    if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) RetVal=-6; \
-+    if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg_raser_error; } \
-     x=0; \
-     y++; \
-     if(y>=image->rows) break; \
-@@ -537,6 +537,7 @@
-         }
-       }
-     }
-+unpack_wpg_raser_error:;
-   MagickFreeMemory(BImgBuff);
-   return(RetVal);
- }
-@@ -552,7 +553,7 @@
-   x++; \
-   if((long) x >= ldblk) \
-   { \
--    if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) RetVal=-6; \
-+    if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg2_error; } \
-     x=0; \
-     y++; \
-     XorMe = 0; \
-@@ -729,6 +730,7 @@
-             }
-         }
-     }
-+unpack_wpg2_error:;
-   FreeUnpackWPG2RasterAllocs(BImgBuff,UpImgBuff);
-   return(RetVal);
- }
-
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch
deleted file mode 100644
index 197a230a3401..000000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -r 24ed4812e580 -r b0aa53a5f970 coders/wpg.c
---- a/coders/wpg.c	Tue Jun 02 07:45:45 2020 -0500
-+++ b/coders/wpg.c	Sat Jun 06 14:12:18 2020 -0500
-@@ -413,9 +413,12 @@
- 
- /** Call this function to ensure that all data matrix is filled with something. This function
-  * is used only to error recovery. */
--static void ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image,
--                                int bpp, long ldblk)
-+static MagickPassFail ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image,
-+                                          int bpp, long ldblk)
- {
-+  MagickPassFail
-+    status = MagickPass;
-+
-   while(y<image->rows && image->exception.severity!=UndefinedException)
-   {
-     if((long) x<ldblk) 
-@@ -427,9 +430,13 @@
-         x = 0;		/* Next pass will need to clear whole row */
-     }
-     if(InsertRow(BImgBuff,y,image,bpp) == MagickFail)
--      break;
-+      {
-+        status = MagickFail;
-+        break;
-+      }
-     y++;
-   }
-+  return status;
- }
- 
- 
-@@ -528,7 +535,6 @@
-                 }
-               if(InsertRow(BImgBuff,y,image,bpp)==MagickFail)
-                 { 
--                  ZeroFillMissingData(BImgBuff,x,y,image,bpp,ldblk);
-                   MagickFreeMemory(BImgBuff);
-                   return(-6);
-                 }
-
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
deleted file mode 100644
index 2533e3b977e4..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
-	openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
-	webp wmf X zlib"
-
-RDEPEND="dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	fpx? ( media-libs/libfpx )
-	imagemagick? ( !media-gfx/imagemagick )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lzma? ( app-arch/xz-utils )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	svg? ( dev-libs/libxml2 )
-	tiff? ( media-libs/tiff:0 )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libSM
-		x11-libs/libXext
-		)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.19-flags.patch
-	"${FILESDIR}"/${PN}-1.3.19-perl.patch
-	"${FILESDIR}"/${P}-CVE-2020-12672.patch
-	"${FILESDIR}"/${P}-oss-fuzz-20045-20318-21956.patch
-	"${FILESDIR}"/${P}-oss-fuzz-23042.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local depth=8
-	use q16 && depth=16
-	use q32 && depth=32
-
-	local openmp=disable
-	if use openmp && tc-has-openmp; then
-		openmp=enable
-	fi
-
-	local myeconfargs=(
-		--${openmp}-openmp
-		--enable-largefile
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable debug prof)
-		$(use_enable debug gcov)
-		$(use_enable imagemagick magick-compat)
-		$(use_with threads)
-		$(use_with dynamic-loading modules)
-		--with-quantum-depth=${depth}
-		--without-frozenpaths
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options=INSTALLDIRS=vendor
-		$(use_with bzip2 bzlib)
-		$(use_with postscript dps)
-		$(use_with fpx)
-		$(use_with jbig)
-		$(use_with webp)
-		$(use_with jpeg)
-		--without-jp2
-		$(use_with lcms lcms2)
-		$(use_with lzma)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with truetype ttf)
-		$(use_with wmf)
-		--with-fontpath="${EPREFIX}"/usr/share/fonts
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
-		$(use_with svg xml)
-		$(use_with zlib)
-		$(use_with X x)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use perl && emake perl-build
-}
-
-src_test() {
-	unset DISPLAY # some perl tests fail when DISPLAY is set
-	default
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		emake -C PerlMagick DESTDIR="${D}" install
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
index a70b15d94c85..65ad34f3ab08 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -7,7 +7,7 @@ inherit autotools toolchain-funcs
 
 MY_P=${P/graphicsm/GraphicsM}
 DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
+HOMEPAGE="http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/"
 LICENSE="MIT"
 SLOT="0/${PV%.*}"
 
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 9881f65ad846..029471742cac 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools toolchain-funcs
 
 MY_P=${P/graphicsm/GraphicsM}
 DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
+HOMEPAGE="http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/"
 LICENSE="MIT"
 SLOT="0/${PV%.*}"
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 7316330e6d30..22458b53fb75 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.11-58.tar.xz 9167216 BLAKE2B 48fa4d6ced002a08268bb607bcf5988bb9fdb27c6c5fc20e5c73c06b9e48837c972b884e73d8a57d16dc0a1d9ba0cb4cf6aaee144a7193caa3d9fbd5ec6839a8 SHA512 b116596bb737cf78b9ec27ae4cc8aa3163f4201e68c3bbc9666421766859d2a2d7521697a4fdd94c6276d190667161816d0ee31dde3e06303bf09ffe79409885
-DIST ImageMagick-6.9.11-60.tar.xz 9167220 BLAKE2B e212c2435414ef052de478c3c65c25291dac2f7b8d213b4408a1971d9c3b57180269a430b6f9fbe9da45587dc52fe62cd9b520f2b2a8e5b03fd86260107c2d0c SHA512 5a4de32a76cca71ae1ccbdc67f160aa451fbf44cf77fb7476ba3a2a6116783034a334f9dec7b8fbb328f06a2a4bec2423f72e4a6b452436b6953bec83a49a8b5
-DIST ImageMagick-7.0.10-58.tar.xz 9655792 BLAKE2B b16db99046427bc0c764588fbf7d10f9f7cdf665d8662b03103ec69c75d44aea80575ae1b8381b15e33dc6a393216918cecbdbd93ea61639b4b09ec15d1588c8 SHA512 ec58eba8a35d78e481d98ae6e13daddc81a8e28904b1524735ce54a7d1557b4ec22d314ecdfcb199685ba55604e6fcdc3cbf9193775627dbd42bf61983c98593
-DIST ImageMagick-7.0.10-60.tar.xz 10143800 BLAKE2B 665cb5517cf9864ffd7e132bdeb01df02fbc5211b73be568751ef3cdd2638a9052862a6607e0b5236cd44df3a796e107f4f0ec5d088b032d6829342f937d56b1 SHA512 bfc3192ad465511ed8b88947cf4b8f306202b6ed3ec230ac524a13a17a5adcab44788d79b659d071df82d4da7833d1e9bca0481c83de51dfdfb9cc16b97537d6
-EBUILD imagemagick-6.9.11.58.ebuild 7058 BLAKE2B 9c8142d44c502984ab0c4f27d4f2013997fae642170a03516b2cb0443c79486dd70f603d66080f7cfb6c5c79add8acaa8e5e6c3002dd02994f57c9b7909bcf88 SHA512 f7933e87df9ba40eca3b71a3fdb78effb79293062cb1e7ac821b7ce3a90309623efaad40048daf2d5f13be26d186aa78c00b3bd54db80b20a394b040edea5dcd
-EBUILD imagemagick-6.9.11.60.ebuild 7065 BLAKE2B 0b37c67158ae3b4bce0fc69f2d891f6de22d5546aaed84666465cb34f2faf00af94c33dc2576e3680a7244cbd96f909e05785e22131121f6037d139db3f3395a SHA512 1c3993e04b1189cd20781f01b651a28e64360a2db7bdaa654ea54b6fdd4fa9371014f2e3312bc5d5138e0e192b20223120912bcd6acb67352ff5f498cd63dce6
-EBUILD imagemagick-7.0.10.58.ebuild 7367 BLAKE2B f35bd66be7bbbe541c44f790a02c4afbfa7f74da18c4c938eb8741fd4536f10fa93bb18243c1b8ebecfb520254657ff824e3e7ca8f07e69dfb2d6f90f665fa94 SHA512 46423ee52a846340dc791a1faea012883a8d58b9858874fb12d4fea4a26890195b3b0848035e88fa7e482dfa694fe799914de8322fd6cbeae226c8be9d1130df
-EBUILD imagemagick-7.0.10.60.ebuild 7375 BLAKE2B 3b5c65437c1e0cec41a5b001a03941962c2fba2e8e78ba013b03fc6b75bb7f5773f734ca493287d26e31feee50d299d787b7f2bb1d53911a77214c1217a3a394 SHA512 d02334f79bff26688d48be19d66293201ecdc833e306efeb6d39e8f7299ace14d5e320db0c075abf0a8fd19ae59c82129b1322544df0055a28b661bbe426a2df
-EBUILD imagemagick-9999.ebuild 7375 BLAKE2B 3b5c65437c1e0cec41a5b001a03941962c2fba2e8e78ba013b03fc6b75bb7f5773f734ca493287d26e31feee50d299d787b7f2bb1d53911a77214c1217a3a394 SHA512 d02334f79bff26688d48be19d66293201ecdc833e306efeb6d39e8f7299ace14d5e320db0c075abf0a8fd19ae59c82129b1322544df0055a28b661bbe426a2df
+DIST ImageMagick-6.9.11-61.tar.xz 9171260 BLAKE2B 89047378e414a7455baa28d413f49dfce3eb54e462211ba5e61f786111c569b26166217ca7e9f5e12c0602bde64c8e9726a67ee3c6be4366d692c2b6232dbbbf SHA512 742fb0b3ff4da98ff05a7fd48b1c5db038bf276975575c4e549f30d61001384c6b508cff526f621467d38a29a9cf015f0cc8c42801720f1b47d6737afb4bac78
+DIST ImageMagick-7.0.10-61.tar.xz 10143308 BLAKE2B bc343b72567d326f30825637366e5d5614e8d53e5222fce357acf0acc9aceae84fe99d67bc7ff2d593e754b990d1e8449785a04724437b61a35e9282f9af799b SHA512 f90d8847fed7f1a5ca3fa247eb1ea115d6afe6fe379fb48733c539456663ca89426336f7ef8be087c1caa0eeafc7d63285f3c35c400fa94b30459796650421c3
+EBUILD imagemagick-6.9.11.61-r1.ebuild 7059 BLAKE2B 15ee8b4d1965bbae05ff93a7ccbbf2e40aa70f8111984895c85e1e78941f8b8403f94c423ed439e2ff3593f48964a481aa02f96e436f0f4bbc93e197018f3c45 SHA512 a868f2837298bd861abf52e88d1ead03c533a5f68a080ed2367748a409bb90ceb68415f9837be68f8f03d859e31aef34347594a22ba4250196e259a64be82126
+EBUILD imagemagick-7.0.10.61-r1.ebuild 7368 BLAKE2B 399ea3aa93222b7639b2eebae045bb5ba3b6d98d6725c8a5daf6de62c98c8f8ef5a9841c74a29b48c84a61be2b747fa59c4be3c190e3755649254544682f7c29 SHA512 e6b19106e96f8e7350c828d45678a18c352b3097828987bb924842878628404573ac530490c108ee7be2643033de06beff5da0f6e93ce2d71d2f2df93ebc3546
+EBUILD imagemagick-9999.ebuild 7376 BLAKE2B 7e8ca320022e06c6a086f1db7feaf0aeb6d08b5b56246e254a481e612e93adff13ea5fda44338bae4c57eb140128b14911c2c47456e26fba4467dcbd7038a355 SHA512 6262bb1875caeb3f6aa40849f1dc8686846ac95c5ed6e476f355bdf1eea30880deea6fc29c861ef959eb788963c091332362f87d19d6b1024b03b5a43652258f
 MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild
deleted file mode 100644
index d80bdfa74e82..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.11.60.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-37"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-#S="${WORKDIR}/ImageMagick6-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local mesa_cards ati_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.61-r1.ebuild
index 8b0ce8fdad51..923c0a8e8415 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.61-r1.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://www.imagemagick.org/"
 SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
-SLOT="0/6.9.11-37"
+SLOT="0/6.9.11-60"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild
deleted file mode 100644
index 67687ea276c1..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.10.60.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.10-37"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.61-r1.ebuild
index 5d7a1d8dc05b..2f9f0b5033d8 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.61-r1.ebuild
@@ -20,8 +20,8 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
-SLOT="0/7.0.10-37"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+SLOT="0/7.0.10-60"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 67687ea276c1..7ac9327f5a45 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
 SLOT="0/7.0.10-37"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index 44ad4d4b1412..734118adfedb 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,5 +1,5 @@
 DIST img2pdf-0.3.6.tar.gz 91006 BLAKE2B ad89b42be4613c30383770f336b07773bf13e87061fca61eb7d5e25d6489662fc2bae94d9a6d61d531a77f41b9e94492d0db1f32570f6d471fa9f8cb0816630d SHA512 2a9d31b9de52123941fd650123a483f4dc0757edda304da994353b5f3167bddbb25fa1ed8fededcf859c5d07b65b9c2d5185000949002a68dcae1e7bf0f1547d
 DIST img2pdf-0.4.0.tar.gz 107027 BLAKE2B 0bf13e2d4a5aff68779130bc14100a5c6d1ac4eaca9da28ceb50104550b6e4331f6a2202514bcdac0480c0148794d18e9f2dd46ded68bbaa301a207460f91c85 SHA512 bab9ee6ef5273a686cb10e52bdeb62b6df3c0da99d0f0558677e07dc7ad776c2d62829a2f5e9c5639acfb9fc6e9c5e3a81aed42dc288c2a39d245775f1d4391b
 EBUILD img2pdf-0.3.6.ebuild 561 BLAKE2B 2a2400caf780866c957a7f102bf587eab18fe4f3906b585d24b173b07ccb8f40e9c29844e5e40a58d8555707e0943fea7ae098f2e186133a08cbafb1e14f9621 SHA512 6d03d49992770664c2cd3cbd25e6416d07bce3b084c5ea8ef45863b6f0beb5d8d0f9d07e03ab10f2c56f373fbda308d02a98927cebae89e0d5fe9132662e6429
-EBUILD img2pdf-0.4.0.ebuild 1229 BLAKE2B b11202968dfce6f9c1aceecf4b4c1befdafdfc464e059ba1f3cee9798c671028bab6554587065d3a4bae8c3a676cd6ff209a2640967fadece11a6f8dd2dc33df SHA512 97e9c28fd8f0d91058233958f239286990347c4e6b88678821a6b48519fd3ffd7f622e4bed892920dd5a4ace5748262f4454fa24f5386703156f1210ca4e6169
+EBUILD img2pdf-0.4.0.ebuild 1234 BLAKE2B 121a5c328b846954b7b10ecc4f0561677f260fdd109b672ca3d76f547cd0362cd34794f8d5b599e1d39ef226b64beb5d54669cbb4777794d112b79f9402d6df8 SHA512 4a0e069457d40140e05e4a8caca931d8da22fa0885d16f5b2ee9279ce8654ee0c1b4a77db1cdb615b1b415dae52d33f79897ead0e324379cb2a1c89206d468a2
 MISC metadata.xml 1120 BLAKE2B df864ac9c560f0e55a889701014713ecc210b15b094ad729b94bfbe29fcadbf6d31f37d4b2761a538fa6e4a9617a0b030f487b2e2d5c3b347d834a2c287f07ec SHA512 825a15bf571a32a1b458a4d731fdc578ac024f8a067ff61e9cdd85066fcae5f92bb48a3fcb4bf0e78c5b01f5d4550b6a3b7bd6c1951f7e7264fb4c8078c216e2
diff --git a/media-gfx/img2pdf/img2pdf-0.4.0.ebuild b/media-gfx/img2pdf/img2pdf-0.4.0.ebuild
index aeda8aad1be4..03f64a2071de 100644
--- a/media-gfx/img2pdf/img2pdf-0.4.0.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="gui"
 
 # missing dev-python/pdfrw dependency and
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 4e13a3d5a52a..46cf19366bdf 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -16,9 +16,11 @@ AUX iscan-3.62.0-tests-linkage.patch 3921 BLAKE2B 0dedae75fbbe387d2db900eb88b0e8
 AUX iscan-3.62.0-tests-tesseract.patch 3825 BLAKE2B ee16bab5f36e866d2a212f832f90b8fa078cfea51dd81ae8175086ce896b718c52f2dd5c56ba15ddf89427abde6231b93672a71467d18fc47c45fdd166efce54 SHA512 63cf6b7f42f6cc1dfc05e9a5d333514aa56ba658e96a860b753d9a120df79a41abbd0fcc04070e103908bf05648dcdff96eab343981fa0f5293aee4258309980
 AUX iscan-3.63.0-autoconf-2.70.patch 1147 BLAKE2B d87e32fa8510096fe965ec24a21276e0c7ba0b838cb2eb5228bb0a336db037dd77240895d61eb574abbc03334d44b0c1467c4bf1dc48a69c72518cfd64d90a51 SHA512 6a58a0df2cd579ea85ea30c263d4538dae8abbfc65d3e102ac546e282bbc8ef72762894c926fc0500322b99364b815f29eb86a098989e4c67675d5d92efa304a
 DIST imagescan_3.63.0.orig.tar.gz 12776113 BLAKE2B d1a9f1d60ba4a2239c6ed74f7f9e0da078e2743e78e0abb67a69506bf90ac35b069f84b5a092a6eb8fd73f60eb668e78b4c7fae56b3a65b6b3d8600f082c064a SHA512 3c9b18e630d6fb1c042244542675e89a8b467469d7212ab684f72100810d1f7d0ec16d13c472a83ca05a3a4fc44e366f692a36cd6b0e81c9a332dd3b40de9535
+DIST imagescan_3.65.0.orig.tar.gz 12651383 BLAKE2B e1436b6d6bf9fc3fc4e5185706fc814e1a4351bf37cd733a3fb88cd16a1c3422ebe0bf4cca77ac00c431edc990aaa50b8994e3bc0f72acba3b0e0608882b63ae SHA512 c719ac540af496efe72b2be87a2b89cbec8eee61a2a985574d0db766c00b7187315378382d8501e26dad132e93de3d3e9431c8e679b569f3c35ea8181b1ca022
 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.4.2-r1.ebuild 4000 BLAKE2B 9d315f3c51ba848fda0feea5a22d004cb6010112cba8dda3372bac5a9b9ecb6ee7aec3d9cee254ba0e77305eee99be1bb342180c71a6a8048c0625cbe1b10aa6 SHA512 b42e39b888418f016a2a147aba40a3241a75d7930132a8290163d2ea4e57ee7bf57125d6382229440cf3078482f3a7f2158575d28353ae1d7d9a69bb5f389043
 EBUILD iscan-3.63.0.ebuild 2899 BLAKE2B fa560b7857120e9180165b2d72161cdd3705fa8002b93022ef675a2df1ed22852453a72199e67e2bbe3ec08402860700eff9c76f6d0bd406441dfd64a57ea150 SHA512 72991e80c75e6d86362adedf76c63827b0752da2815ccdbbe72ecd84c621a5f733f3a8491b07a0452ac09f236fd24c866f52a03d46dca5b72e200c29bfe3ed30
+EBUILD iscan-3.65.0.ebuild 2899 BLAKE2B cd559e4c31210618297d7a70f4713a8b9d806f80eb20f508b1af1e27a4abb03755edc9654fbf8b0c835f5f41b72a4ce3e3d4a2592d1c7c1d5ce08200793b21b1 SHA512 b5a93e50d29d8a3ed3d85377affc23a3710a0e7392a7e15025ecde99969f544699a6d35a1efcc4f7515e59b51444010289a7a0f85e4a834fb48a4c43968d218d
 MISC metadata.xml 930 BLAKE2B d2cf4fae5cdcb660357ffe5566ad8d99eef6287f565a45f1824c810b3979e9d2930f458766ff524b231ef8dfd793062ff23cf4bfc2a78a36c5393a6c4224feea SHA512 d609a5cd8f8bbc7653e784d153757849eafb9c772355d0928325a6ecf673e8aa055623601d957f912709f9f16acfde5ca0b0480a1f2a17bfc24825895d861fc0
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
new file mode 100644
index 000000000000..f143a5474646
--- /dev/null
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic udev xdg-utils
+
+DESCRIPTION="EPSON Image Scan v3 for Linux"
+HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi"
+SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="graphicsmagick gui test"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	dev-libs/boost:=
+	media-gfx/sane-backends
+	media-libs/tiff
+	virtual/jpeg
+	virtual/libusb:1
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+	gui? ( dev-cpp/gtkmm:2.4 )
+"
+# Disable opencl as during reorient.utr test it produces inconsistent results
+DEPEND="${RDEPEND}
+	test? (
+		app-text/tesseract[png,tiff,training,-opencl]
+		media-fonts/dejavu
+		virtual/imagemagick-tools[png,tiff]
+	)
+"
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
+	"${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
+	"${FILESDIR}"/${PN}-3.62.0-gcc-10.patch
+	"${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch
+	"${FILESDIR}"/${PN}-3.62.0-fix-symbols.patch
+	"${FILESDIR}"/${PN}-3.62.0-tests-boost.patch
+	"${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch
+	"${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
+	"${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
+)
+
+src_prepare() {
+	default
+
+	# Remove vendored libraries
+	rm -r upstream/boost || die
+	# Workaround for deprecation warnings:
+	# https://gitlab.com/utsushi/utsushi/issues/90
+	sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die
+	# Disable check-soname test
+	sed -e '/SANE_BACKEND_SANITY_CHECKS +=/d' -i sane/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	# Workaround for:
+	# /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory
+	append-ldflags $(no-as-needed)
+	# https://bugs.gentoo.org/720994
+	append-ldflags -pthread
+	local myconf=(
+		$(use_with gui gtkmm)
+		--enable-sane-config
+		--enable-udev-config
+		--with-boost=yes
+		--with-jpeg
+		--with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick)
+		--with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick)
+		--with-sane
+		--with-tiff
+		--with-udev-confdir="$(get_udevdir)"
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc lib/devices.conf
+	find "${ED}" -name '*.la' -delete || die
+	if use gui; then
+		newicon -s scalable doc/icon.svg "${PN}".svg
+		make_desktop_entry utsushi "Image Scan"
+	fi
+}
+
+pkg_postinst() {
+	use gui && xdg_icon_cache_update
+	elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
+	elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
+}
+
+pkg_postrm() {
+	use gui && xdg_icon_cache_update
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 1e52307d2fcc..3575b5df79cb 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,9 +1,10 @@
 AUX libimagequant-2.12.2-fix-pkgconfig.patch 840 BLAKE2B 6b16c3b0a7b916c60814817b69a9d653802e67da5d3431dd0bd00bea21cea7eb60a6d046ec380fc68ca25182c1863a81336f0c76259bb8fcdeeb30644eca06cd SHA512 bb0b1a502dee7126cf64e48628469729a12abafd9a9f58cb76b18d250cb578a49e38c1b05009173ebb4acfbf54e2696f0fa5f7f660248653a8bb8600843fa157
 AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
-DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
+AUX libimagequant-2.14.0-fix-openmp-pragma.patch 1209 BLAKE2B 9a6ea44db62524b454c37abd236d9a7186e3dc5cbda4b0d55a4f96216bd74db13e6bcf8d9d06a490e7ba1a717f7ec8de320780ee3699e10e1c700f441a4d18a5 SHA512 fad1505e2037b87f031838643443d0e2f728855d4a1929b1cae3f37b3d2d22c2408f11461b81818d4c68f52c99d981a134ad8c0ae738fe9240b41e4a460155fc
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
-EBUILD libimagequant-2.11.7.ebuild 1147 BLAKE2B 41943e15f697966749897fd14aec98dec919ce81189ec5f481517d14eb94a91b95b0b0cdc9f057854a745a2fea5ccf094411900db06eb54dc6aeba410521e871 SHA512 ec8d4ce66233a74974ff6edb4c67dcf5d7f12f4535001bb770d70a995cc5a9b2600f900777fc1996335d49f85efe10a3dc21e547c2b535c68720ee455ec4352f
+DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de85195779e4829dd04acec28ba93ea8d629846fa71d765949e721f592300da1d35227ec7bb28e00c600c575ba3fdc4fe SHA512 d34aa2ac9f08eebd80fb9e3e7fe22a3f10ce840152c4192735d57ae37c223350af09eeff6870ee2634b3fc51b03d1663cd6afd17daeab923af3b5f60fbef57d4
 EBUILD libimagequant-2.12.2.ebuild 1403 BLAKE2B 40d79a5387b2091818a33cf3c5620558fa9543f9e75a76a7ed310ac751bd2a8b5f592340f591a831f68604873365b6141c7d388552d31162e1b259df8e7bfa57 SHA512 268b848f7d11fe9568b13a2b90b57e5f6369cad1f8043d47ef06c8ddd05909e9da83844b2ef6367125bf2c7e86a158fd82ab99ec257b5a290e90fbb9bdf5fb58
 EBUILD libimagequant-2.12.3.ebuild 1410 BLAKE2B 5e7c09cc1ea3218fc56e25d053409bf99112c567efe1ab9046b817f20703f06d3b7bfd8112be02b07882e3f32e9b660adcd57400fc0b3aaa555a1661eb5e10ea SHA512 06156624711397f8e90faf24040bdb9c877495d939e5a9b157152e5b827b00175a7d1dfcbe6bffc307c720a3b84229bcca8a037720d1f609e55f6c8402e6cec0
+EBUILD libimagequant-2.14.0.ebuild 1247 BLAKE2B 92006ddcdecbd884658c8c95014efb3e0213762c6af664dcaf3785dda29637f1515e68bbbc9398aba926ecb17460ec4eff80e82c3d32cee6c66c4cd162f91abe SHA512 630037675eada9f300fc5db6fac53e626ee92f3374e507298c195d0c887af8321ba4b68debc35e4c21bd8cd07ab34ffd5e452d002a95c44b50cc71792f42d940
 MISC metadata.xml 430 BLAKE2B 026b07580a573d4221658d920a91ef9a48b74b1b3314250413e16027fb45ae30589ae800f064f8caaf3117b6e9439202554f04394fa3d30d419c61e8a60dd588 SHA512 968098402f9783f65232dda56e60013050eca50176347beb3f40814509f9540879480ce9dd5480c62f1ae9ec9e3059414b620314bff611830d4148974cbb1e5f
diff --git a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
new file mode 100644
index 000000000000..7e2d58619618
--- /dev/null
+++ b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
@@ -0,0 +1,25 @@
+From 44525d34b738f733a81037286ece603ca0fdcf10 Mon Sep 17 00:00:00 2001
+From: Kornel <kornel@geekhood.net>
+Date: Wed, 27 Jan 2021 17:36:33 +0000
+Subject: [PATCH] Update OMP pragma
+
+---
+ libimagequant.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/libimagequant.c b/libimagequant.c
+index 4f0b48f..828f768 100644
+--- a/libimagequant.c
++++ b/libimagequant.c
+@@ -1279,10 +1279,7 @@ LIQ_NONNULL static float remap_to_palette(liq_image *const input_image, unsigned
+ 
+ #if __GNUC__ >= 9 || __clang__
+     #pragma omp parallel for if (rows*cols > 3000) \
+-        schedule(static) default(none) shared(acolormap,average_color,cols,input_image,map,n,output_pixels,rows,transparent_index) reduction(+:remapping_error)
+-#else
+-    #pragma omp parallel for if (rows*cols > 3000) \
+-        schedule(static) default(none) shared(acolormap) shared(average_color) reduction(+:remapping_error)
++        schedule(static) default(none) shared(background,acolormap,average_color,cols,input_image,map,n,output_pixels,rows,transparent_index) reduction(+:remapping_error)
+ #endif
+     for(int row = 0; row < rows; ++row) {
+         const f_pixel *const row_pixels = liq_image_get_row_f(input_image, row);
diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.14.0.ebuild
index b318487fa32a..21f2b031268b 100644
--- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.14.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -11,37 +11,37 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_sse2 debug openmp"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
+	"${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
+	"${FILESDIR}"/libimagequant-2.14.0-fix-openmp-pragma.patch
+)
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
+src_prepare() {
+	default
+	sed -i '/install.*STATICLIB/d' Makefile || die
+}
+
 src_configure() {
 	tc-export AR CC
 	# Hand rolled configure script, so not all flags are supported.
 	./configure \
 		--prefix="${EPREFIX}/usr" \
-		$(use debug && echo --enable-debug) \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable debug) \
 		$(use_enable cpu_flags_x86_sse2 sse) \
 		$(use_with openmp) \
 		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+		LDFLAGS="${LDFLAGS}" || die
 }
 
 src_compile() {
-	emake shared
-	use static-libs && emake static
-}
-
-src_install() {
-	dolib.so libimagequant.so
-	dolib.so libimagequant.so.*
-	use static-libs && dolib.a libimagequant.a
-	doheader libimagequant.h
-	einstalldocs
+	emake shared imagequant.pc
 }
diff --git a/media-gfx/llgal/Manifest b/media-gfx/llgal/Manifest
index 40a122544452..6f948c5e4e0c 100644
--- a/media-gfx/llgal/Manifest
+++ b/media-gfx/llgal/Manifest
@@ -1,3 +1,3 @@
 DIST llgal-0.13.19.tar.gz 96675 BLAKE2B b306eed900a1071898ebe2d0dcbfeb9c505271ec8d5889e75fcf189dee22489fb8d671ede05a1af74a7761b604d8af8e3b26b8771ec50c8e49036000e90258fd SHA512 24f247071678f21c79e37002a443ff222e9e99e9bf04363fc123c5d9538a35db100ea814408e2bcc9e20781982145301df3337e521413651547828654a92d169
-EBUILD llgal-0.13.19.ebuild 1071 BLAKE2B b5b2c4b2b548880a68f9bd77bfd50f2e479042fd50578273fc9bc390fc1c832ed726dbb02c81ed9c5aa15de9939daa1012bcb7a3c171f9d579d2b3b3246b2851 SHA512 aecc703b62a977357ba104b11713476f07a6e3982f3c879d2620f7da2bdafc45d1ed47cf913052ab50f018991e2026d35be114e060e1e651380eb75883b0d9a6
-MISC metadata.xml 247 BLAKE2B 40a951853ad971fb856cb2bc8e102caf52d803f2c07466f49cff536bfa108711f107e5dd89745bd16cc74d90df7022747f27d1e664e17b079f20e3f636b8e50b SHA512 077ebd8acee5d10820d2a4e3f8c5d0f50b7dc0e4c8f8ab749b6b2547b397f30348abc858b0a9d1890d9b3d96949b76bdf2f92e277ba61dfac08e9f83fbc58021
+EBUILD llgal-0.13.19-r1.ebuild 1079 BLAKE2B ad3bae53d8f940d5ff42b50a1341e0f2ac61db29e0a9bee7b588b39fbb6b673f64cf076d426e92bbb233d3938905fecf01b4ede78aaeec884fceccb478e87d50 SHA512 b3e0397f72d785874f26fdcb47ec4921a757938fd4e6f9d5334de5de970c7da2f0feb68bf85a4a16ad76eb7d5eac93d6e14a3215b849ad6de852b422271900cb
+MISC metadata.xml 327 BLAKE2B 4c37b55c4e24ccdee42792bb7cb025a1759271fed7b5925c4006ec90a0defe28675c1cac3e7ac36a8fc96f832ac32765029be54b5710b6ec4a3ec94cf74dba45 SHA512 d42bcf251367c45e5b222a8ff8c30c1e72074029e0611b4cc914fc7b380835cb8bff4de25954c64f98f7f3f1b5aad1120385b415875ebbbe5d52734e61cb425a
diff --git a/media-gfx/llgal/llgal-0.13.19.ebuild b/media-gfx/llgal/llgal-0.13.19-r1.ebuild
index e42d2ab056a7..95f0b64a59c2 100644
--- a/media-gfx/llgal/llgal-0.13.19.ebuild
+++ b/media-gfx/llgal/llgal-0.13.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,11 +15,13 @@ KEYWORDS="amd64 ~ppc x86"
 # Package warrants IUSE doc and possibly examples
 IUSE="exif"
 
-RDEPEND="media-gfx/imagemagick
+RDEPEND="
 	 dev-perl/Image-Size
 	 dev-perl/URI
 	 dev-perl/Locale-gettext
-	 exif? ( media-libs/exiftool )"
+	 exif? ( media-libs/exiftool )
+	 virtual/imagemagick-tools
+"
 
 S="${WORKDIR}/${PN}-${P}"
 
diff --git a/media-gfx/llgal/metadata.xml b/media-gfx/llgal/metadata.xml
index b946dc190e7e..3b43b50502a0 100644
--- a/media-gfx/llgal/metadata.xml
+++ b/media-gfx/llgal/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>aballier@gentoo.org</email>
-  <name>Alexis Ballier</name>
-</maintainer>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bgoglin/llgal</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
index 3bf40d98abad..10d5c2c0bf06 100644
--- a/media-gfx/opencsg/Manifest
+++ b/media-gfx/opencsg/Manifest
@@ -1,4 +1,4 @@
 AUX opencsg-1.4.2-includepath.patch 537 BLAKE2B c54c3ff9bc802f34a92a72620fd20277d90174a3d0e69ec7d34987b387da44e37d1a6487f6c6063b555bca8c40a2d827d91b3ab0d9c0b8adbab5648fce90a639 SHA512 7ccc4b75560682ad7c3c340b8d8824d1339a8a1859f459139ad84d9a06e25072eba84a78c6d30aa4dbd72cf82465a176550a7e89b2590ccd85e4129511ad3893
 DIST OpenCSG-1.4.2.tar.gz 933135 BLAKE2B 20882afaddf40cc4e0c43c3e70bad334aae3885241a3993ce7083de20f9b10d6e6c4eb3a55abba2b1eca64fdae784c491492543a5012b8b2d67eb63a16dd693b SHA512 fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778
 EBUILD opencsg-1.4.2-r1.ebuild 1245 BLAKE2B 29b8ca3a2f400d4ac9296acda2fe7aa25ec9d2de8a3d9efb798279aa6da4c623c2f151e385a035fc84a7596a81c665b84df9427758337a913be8cbbd15b6b570 SHA512 f2a0114ff5f19beab0941af6b67895b8a94372637fe7256f79577980aafec1792d79c3c1529c0bae9050a059a1e5e606e61d47102da3543b18719eb21281a0b2
-MISC metadata.xml 1264 BLAKE2B b5ec9e7e27832a3f8ea90363ef0590a41695b1792b468a2d804fd6b7af0e8b76d3221d695620a61a74d9c2afa4f3552be48931ee6e4ea14d6d1697bbee9c6cb3 SHA512 4568f3cf0cc0e5d2e46c113657d29b9bf08b5a9ba3de24709d099d29bd2eacf358606ed46052f1fa3122e2671f006ad181c62a3b8a4d026cdaa93f0691c34d16
+MISC metadata.xml 1272 BLAKE2B 2821bf6650664d0effd47957979eedee7194b41ca4de6c1b0c2e248e8b5deb06cbe9a7b2c3bfb263f74c4cec4aa5ff7789698f943cbc59492d3ebf4637487489 SHA512 090bf25e68133962ded9a9f457ea404bd362118ff76988266b5f023a7a21236d932aa95267af4997298117585c9dd2ee71933892973d6b8055f3edf112ab3f4b
diff --git a/media-gfx/opencsg/metadata.xml b/media-gfx/opencsg/metadata.xml
index a1b015f1f907..be0edabb6659 100644
--- a/media-gfx/opencsg/metadata.xml
+++ b/media-gfx/opencsg/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>waebbl@gmail.com</email>
+		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index e65fce8aeb12..a900641f5b9a 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -8,4 +8,4 @@ DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f
 EBUILD openscad-2019.05-r3.ebuild 2069 BLAKE2B 04ea91d2e612adf7ed8b4d94c30c769713a99893da2120eb8675081c862a2804c0aabf21da51dfa78a10240d01b71144c1586d7859b69f4a639e22a5e090138c SHA512 0663545e9fb542b534bd7fcc98ca8e131de799a8f8ceac29a8aad31e5a1283fff22efa1a5a4677f991b8319ff824643e088e124d5b07d0fe7105f649e45e04d3
 EBUILD openscad-2019.05-r4.ebuild 2369 BLAKE2B 95903f34bfe2c81a4449cd1e63b1a4bc3b3abcb806bda09ee237ec56cd784f10e669f863f2672e0c45531d31d59ccb8e36d5bbd7b18f8df445a4ba9345b15dcd SHA512 ba74ea5aadf631a650756f30fca4781dec31b459799f3fcf0637156df3e31d292c4532fc3630c31316a2df4a70dfb8b1ce869c1b02018075001b4e5b961892db
 EBUILD openscad-9999.ebuild 1900 BLAKE2B b7da0c8a17bcc88faa4c9367b4a664a8f58aafe8177d984001fd23ab0ea39f00f40349963691d4aa667d994761c7f60ee7bf0104c023ab43d85e51bde4349b4d SHA512 6378969e22ca27c2ef80928559b2f122e4b86df35a3858ae70537782b1f9209951fa34c55bd791f10cc23a9f0572a6305ba854f3270e4ea11eb045058e9c5b77
-MISC metadata.xml 1123 BLAKE2B d182b2b81115ec212b553802174d5305dd37af439aaafb25dd05368b1431b960cb4e35e65bec0519438e9c1ed767124fc686e293d07e5d44807bbf4ca8d74ea2 SHA512 10fda921c2d18d8e3a12d986cd2de9eebf47d9d2f843381b4ea2874d2483a42b84c6aa6c216ceb4c1ecf4183bbc8d43d7202bafbfcddc15de1bcd6b0f297f29c
+MISC metadata.xml 1131 BLAKE2B 5ac140803c4f9b522ccb4649a1247323a10d397885c0ae780379483832dc85a6c4d50ee3cf6c85dced42aa0debcaa559039f7c911eda7630cbd11a13c3440c96 SHA512 1f5a48746b34e61dd451ec8bd6fb9b3678ce9901e4ca8784dac19eeaea5e7e1bc636b6d9c528bf06af1aed1fb37a5d1e6b190b465b6170cd713f494874e8a807
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 5ed7ed33c62b..75aa20b67f16 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>waebbl@gmail.com</email>
+	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
 <maintainer type="project">
diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest
index 96fbd19bfeef..664251ddc6eb 100644
--- a/media-gfx/pngcheck/Manifest
+++ b/media-gfx/pngcheck/Manifest
@@ -1,3 +1,5 @@
 DIST pngcheck-2.3.0.tar.gz 59864 BLAKE2B 3c635555f76d22d6949309707b7054608f5e093d3a557eb88eb9fc48aef76326f8e6b0dbcdf8e30213a042416f0e6f798e41411763e7604b12495b6b2748cddc SHA512 d099a360d41fc553e9ea02e56ae9812a4a72f3b7f1cd73c021fdb0b9233bb247e100b95fe8e297a2dcdd1bb996128a365794cb8f5702e5c93618af03f18140ad
+DIST pngcheck-3.0.2.tar.gz 63202 BLAKE2B 4cc6040e087aa2f5829e79ea1a5feb45af8bb15fa72325f9cb4822169c7d278306d6d89b936fd4c3c3819a09380e07f1f64ce0c276e776c3146c1533b1ee1363 SHA512 81bba699141c0f506ee589785eccc4b1ea882df5d211bcd91885bbcc4230bf14d23fc1298ffc10a110d6a8459522f6a01bfba1f81739f6085e4d3de964bda3d5
 EBUILD pngcheck-2.3.0.ebuild 643 BLAKE2B 3ddd07326f91f14c7efc71c9a0b442d050ab3095ed52336f99edee0e34b325def2d14f18e96ce4c1cd726071b1610fdbf629c898f22a26c500e41954d0055f71 SHA512 cfcc71d19d8869482b92d390b9b4a65e81aa1ac9865af2b914a10e57afdc0b71f2df5738e7283c310604b550ebcd6b99edd7a8f7d3a15539bf72d39bb88e9eb8
+EBUILD pngcheck-3.0.2.ebuild 690 BLAKE2B 1e51643aa788db7736a3ef873eb897550636bda3acd514cdfaaa20920c20dec4cbd1e6752dd8910cf3d74c6949f1ce9c637974001de85ac5f4822433681f4ee0 SHA512 97b469bafb99f807b7d62089ccbed09ae0f6f5f2fbf6b47f672ba1122e12d75691295b557acc6628951eace4022a2c12892bdfd45e759d60ce3ebddc74f3cd1b
 MISC metadata.xml 244 BLAKE2B 5498c23eb35a869f92ff882d6931f50645f2a10ea31c9e22f892e9c5e11b54cbe7063decd5750b2cca2e8737ca7e5e5e7fa154401ddf8a2baadf7037be981241 SHA512 c6d20cd9c770b2ffa18b02ad2495493b61d681c2f1d54716aaf5a22a63db01219db3f4d3f743ec8abd24cba27bf5e3c0da3b80158a1b06b933965d8481349417
diff --git a/media-gfx/pngcheck/pngcheck-3.0.2.ebuild b/media-gfx/pngcheck/pngcheck-3.0.2.ebuild
new file mode 100644
index 000000000000..660faab0b47c
--- /dev/null
+++ b/media-gfx/pngcheck/pngcheck-3.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Verifies the integrity of PNG, JNG and MNG files with internal checksums"
+HOMEPAGE="http://www.libpng.org/pub/png/apps/pngcheck.html"
+SRC_URI="mirror://sourceforge/png-mng/${P}.tar.gz"
+
+LICENSE="HPND GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake -f Makefile.unx \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		CFLAGS="${CFLAGS} ${LDFLAGS} -DUSE_ZLIB" \
+		ZLIB="-lz"
+}
+
+src_install() {
+	dobin png{check,split,-fix-IDAT-windowsize}
+	doman pngcheck.1 gpl/pngsplit.1
+
+	einstalldocs
+}
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 8ade99d481de..23dbeebf5f3a 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -1,5 +1,4 @@
 AUX povray-3.7.0.0-automagic.patch 812 BLAKE2B 86bd0a0419b215c3731517596544c8ebe48b5ffa6038e47f9f4fa01d4f21ce3474c2f825b21036b4b7fad7a6c31eb5513d3d95635b6356282ffccf6f028e2d68 SHA512 c76ccc429b2868fbae4d40f66d81c07d8b5eba3ec419b2377d3ee541f34b7e597ecf232d1a268abd85fa47abd4f9c7b3cbf26293746b2b10361cef2ea4c34709
-AUX povray-3.7.0.0-boost-1.50.patch 2739 BLAKE2B e13ba49fa2d6a2ee57110f5e22f3be9e9040d730d27cb611e16566596b9a6cb52deb008fabfe48da16a3dbd362842a93d60238678bde077bae37ce8137068abf SHA512 90b5f03bd290b8fd4431fae208a38d8d54c56bbe3e39db728546a0598ce953eb6f98745bd2ad527d4f8f39dc02cb066b4aee999e7fc7e1348c0da98e9f6bbc1b
 AUX povray-3.7.0.0-gcc6-openexr.patch 1153 BLAKE2B 645b9148b8ebc9eb14fd7a01f7479397542c015b1cfe10543870844326f929b9258e8c8bc7518b38c2bbc396070fd1e0336121a4502eed0460aac47e4634aad5 SHA512 0be944d63df3e1df031e25f535bddb7ef0416da8447167c1dbba1dc1b007e4c86119c01004953a7280a847640a7f630f3081fdd624028bb923620b78b5e20cec
 AUX povray-3.7.0.0-r1-boost-1.50.patch 3582 BLAKE2B d505f7aa1fa9f4a7c645c5eb815a29f51568490f5d3726991a58891fdf66010e2f1e5a03f35e686281cd43ead20d197af3843be00d1dff6d1bb4f93332686cb6 SHA512 5ab0f29e67e98e47fe8fb991d8a510cb1ff92f27be6e0191c7d8c8f91ec3d67b3127d7227bdbfe8f263b9c6ada216ac46d0bb2e1f221230b253f07424ba689db
 AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4cde1346ab77afd73d016f95eec444e6a1c741be87751c3e794c061fcc9534ac0ebb722ab6b16079044d5971be6b5b649 SHA512 f25ad7e0738a6e0e759aba7405d29839f69a3013170b7072e17afebda7e5d700906280491499628859a8d61c27ee3fc54f0b9fd3f472e0771cdad4f7a3bf6664
diff --git a/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch b/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch
deleted file mode 100644
index f8e807ad647d..000000000000
--- a/media-gfx/povray/files/povray-3.7.0.0-boost-1.50.patch
+++ /dev/null
@@ -1,72 +0,0 @@
- configure.ac         | 26 ++++++--------------------
- vfe/unix/platformbase.cpp |  2 +-
- 2 files changed, 7 insertions(+), 21 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 51596f8..900c150 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,8 +57,6 @@ AC_CONFIG_SRCDIR([unix/disp_text.cpp])
- m4_include([unix/config/acx_pthread.m4])
- m4_include([unix/config/ax_arg_enable.m4])
- m4_include([unix/config/ax_arg_with.m4])
--m4_include([unix/config/ax_boost_base.m4])
--m4_include([unix/config/ax_boost_thread.m4])
- m4_include([unix/config/ax_test_compiler_flags.m4])
- m4_include([unix/config/ax_check_lib.m4])
- m4_include([unix/config/ax_check_libjpeg.m4])
-@@ -168,6 +166,7 @@ AC_CANONICAL_HOST
- 
- AM_INIT_AUTOMAKE([1.9 dist-bzip2])
- AM_MAINTAINER_MODE
-+LT_INIT
- 
- AX_FIX_INCORRECT_PATH(C_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path C_INCLUDE_PATH"])
- AX_FIX_INCORRECT_PATH(CPLUS_INCLUDE_PATH, ".", [pov_warn_path="$pov_warn_path CPLUS_INCLUDE_PATH"])
-@@ -298,28 +297,15 @@ LIBS="$LIBS $PTHREAD_CFLAGS $PTHREAD_LIBS"  # append
- 
- # Boost; required library
- # the following macro stops with error when boost is not found
--AX_BOOST_BASE([$required_libboost_version])
--AX_BOOST_THREAD
--if test x"$ax_cv_boost_thread" != x"yes"; then
-+BOOST_REQUIRE([$required_libboost_version])
-+BOOST_THREADS
-+if test x"$boost_cv_lib_thread" != x"yes"; then
-   AC_MSG_ERROR([cannot find a suitable boost thread library])
- else
-   CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"  # append
--  LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"     # append
--  LIBS="$BOOST_THREAD_LIB $LIBS"
-+  LDFLAGS="$LDFLAGS -L$BOOST_LDPATH"     # append
-+  LIBS="$BOOST_THREAD_LIBS $LIBS"
- fi
--AC_MSG_CHECKING([whether the boost thread library is usable])
--AC_RUN_IFELSE(
--  [AC_LANG_PROGRAM([[
--#include <boost/thread/thread.hpp>
--    ]],
--    [[boost::defer_lock_t(); return 0;]])],
--  [AC_MSG_RESULT([yes])],
--  [
--    AC_MSG_RESULT([no])
--    AC_MSG_FAILURE([cannot link with the boost thread library])
--  ],
--  [AC_MSG_RESULT([cross-compiling])]  # FIXME
--)
- AC_DEFINE([USE_OFFICIAL_BOOST], [], [Use the official Boost libraries.])
- 
- # Intel Math Kernel library
-diff --git a/vfe/unix/platformbase.cpp b/vfe/unix/platformbase.cpp
-index 8669d19..83c0191 100644
---- a/vfe/unix/platformbase.cpp
-+++ b/vfe/unix/platformbase.cpp
-@@ -68,7 +68,7 @@ namespace pov_base
- #else
- 		// taken from source/base/timer.cpp
- 		boost::xtime t;
--		boost::xtime_get(&t, boost::TIME_UTC);
-+		boost::xtime_get(&t, POV_TIME_UTC);
- 		POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
- 		t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
- 		t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 5da6f08f1257..6ac7ca1e061d 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,7 +1,6 @@
 AUX PrusaGcodeviewer.desktop 208 BLAKE2B e7d041508b4dfb155748319d3c166ed1ff891cc3cf05d748d5d4ef03e90100dbb4c48a5c8daa3c5e04ad98e578e34e433caa9a1b2a85000feb16d9804832a531 SHA512 6f69d47a0f6adf3912de2ce8766c74d7654d3f8442cd269b098769d186a2345cdc6da310f10f4568d2de5ea1633bab22ac05203488617fa2e906d6c25b539964
 AUX PrusaSlicer.desktop 401 BLAKE2B 1c9bded4dd9e5e0be33c1bfb66bf8b54adc7898595fb6064d81f30dab9de7b9d6fd406ee48d45cb0ba665b1a03d02035c164d82d5b7cf13ec088b02176989777 SHA512 0777e5eda98d9931f5b289187a144f217f1279af498d8563414fa1485a24eb466a1b801498ec9af652355206543ae4b41012ed8ad8a22577680b088c6c39cc5a
-AUX prusaslicer-2.2.0-atomic.patch 200 BLAKE2B c8a4f2e3ce1974dbc3a1aba5805910796f533e85040e9886b8e6c395ba95578ddf1910f0ae35f5625a73b2c063a58cfb33409489169231983a1dea5f10edbde5 SHA512 8da19e19b7027e4f77d19c10a40796e2a9bd4776820cf1adb134dc53a487edbe8a297ba6ebc92c04a419ff5d69d14a2e6fb74b2c2a05e7066a0346015a14582c
-AUX prusaslicer-2.2.0-boost-1.73.patch 2383 BLAKE2B f8d96296c7802747ccfcd80adf9e2c954a33add590bb6fff7ef3e2e7c5334970009c63cab7d84adb7e9e0cc3b07a04200f3ea4c2c5dd9a1e1ebb5fe33ceebdde SHA512 36c325ce60c682ce1f5aeef02fc0b457a1e3ce60a2bfcc09e9ce78fddc6ee3452d100ac2a13e1d7454bfd7484d1f1c8d24a95feaa845ca784081dfefd15b2cdc
-DIST prusaslicer-2.2.0.tar.gz 30811929 BLAKE2B cde004add53ee025728d566cb7331cb7b1eac5412e9ad3bee037d13277c24dcdc6024c91f09bb9ef0653a12a3ee7c5cb5cec21e2a00825d185472ea7036e08f5 SHA512 5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d
-EBUILD prusaslicer-2.2.0-r1.ebuild 1553 BLAKE2B 0ef5f8d6f486980b3c3ac48e06c517bdf393efdcbe9621c6e1b36a89a985f9ec2fe4ea4891455672fffb8ae5f4c8ccef5afddf86fa90cff10945fcfdc6338a70 SHA512 f166da2aa6b6b7a8c8f2bbcad4f35d514961e957892b644ab4da41745b77781e3c0fb3465de5e0fcdf55bf87cdf26f9f8f7bfcfe4908dbecca757b17c9b6a46b
-MISC metadata.xml 830 BLAKE2B b0c07af4dcc135e6ce2a67137ff2373ca4f842ac1e2efdff44dad399c487b2d2c7e71bf9932a544d30bc5f0a1e5ccd64830645be647137dda0bb23d00c62575a SHA512 9441df6291bfc1f7c6c85479e8bbe14389e091a43f0bc2ac22eee68544f6868ebd0eb342c7b79316809d0bde1b15684c9ea59cd57252b59643bb735e0b87422c
+AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a291602ee6d86609244e9cd55a9eeb92a376cc4a579a94ef9f423e3072dbd01295b173c9291d615a56d5fb512cdccc93b205f665d0 SHA512 36e3c1e5d35f6cda26d8f74db3862cc5206478f7f79f35b28b3b3749291150764d1d907a3ccb67b4dcd1872fa5d0ac612791653dc67f3a56aeb98b68dc873f27
+DIST prusaslicer-2.3.0.tar.gz 34785471 BLAKE2B 89691baf30ac2be901ebee594262a82e2c922ddae75b055561707fe152c392175766082844ad1ae2cb2fefb29a9d3abe03c0302ad84c347e94d127756429d0a7 SHA512 2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d
+EBUILD prusaslicer-2.3.0.ebuild 1812 BLAKE2B 1d34a7cd0dd5fcb40dce9d8fcab86d8b643722a8ebe4810ce0b83172304d2a8aaaea76ed8a6077ed30dab134152294ff42b54476b401b5482691beb41bc8aeb8 SHA512 df62be529a5b69d88e44ac219e6a5e9a51738509f4946397aa7771a29a544aeb9bca84213525c5f6540de3649f5742ce759d2d5303783b2e9f7a70e7f6921997
+MISC metadata.xml 964 BLAKE2B fd4b95e2725a37291f9d7f39aaf75d34068789960c27d6180e809c33b9624507dc5abdb16d125eee88acffbdb424bb949751a86da6475747ef658913b0f6dc44 SHA512 27a581c15d36f0514183f663a645198feed74856c8a9eef7dc8d7c7f460bbaa89f5a5e7c4b8884d400346baffcde66b8f9552d4204f17b7ac905e9f06100b762
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch
deleted file mode 100644
index 4319ad0f1463..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/slic3r/GUI/Mouse3DController.hpp
-+++ b/src/slic3r/GUI/Mouse3DController.hpp
-@@ -8,6 +8,7 @@
-
- #include "hidapi.h"
-
-+#include <atomic>
- #include <queue>
- #include <thread>
- #include <vector>
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch
deleted file mode 100644
index 50abea11b328..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/src/admesh/stlinit.cpp
-+++ b/src/admesh/stlinit.cpp
-@@ -28,7 +28,6 @@
-
- #include <boost/log/trivial.hpp>
- #include <boost/nowide/cstdio.hpp>
--#include <boost/detail/endian.hpp>
-
- #include "stl.h"
-
-@@ -36,9 +35,9 @@
- #error "SEEK_SET not defined"
- #endif
-
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
- extern void stl_internal_reverse_quads(char *buf, size_t cnt);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
-
- static FILE* stl_open_count_facets(stl_file *stl, const char *file)
- {
-@@ -89,10 +88,10 @@
-     	// Read the int following the header.  This should contain # of facets.
- 	  	uint32_t header_num_facets;
-     	bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0;
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
-     	// Convert from little endian to big endian.
-     	stl_internal_reverse_quads((char*)&header_num_facets, 4);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
-     	if (! header_num_faces_read || num_facets != header_num_facets)
- 			BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file;
-   	}
-@@ -158,10 +157,10 @@
-       		// Read a single facet from a binary .STL file. We assume little-endian architecture!
-       		if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET)
-       			return false;
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
-       		// Convert the loaded little endian data to big endian.
-       		stl_internal_reverse_quads((char*)&facet, 48);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
-     	} else {
- 			// Read a single facet from an ASCII .STL file
- 			// skip solid/endsolid
-
---- a/CMakeLists.txt	(revision 3b2c51fd5ab04a72592bfdba1cd39cd6298b66c2)
-+++ b/CMakeLists.txt	(date 1607811414000)
-@@ -260,7 +260,7 @@
- # set(Boost_COMPILER "-mgw81")
- if(NOT WIN32)
-     # boost::process was introduced first in version 1.64.0
--    set(MINIMUM_BOOST_VERSION "1.64.0")
-+    set(MINIMUM_BOOST_VERSION "1.72.0")
- endif()
- set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time")
- find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch b/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch
new file mode 100644
index 000000000000..8fd587d3d481
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/761541
+--- a/src/libslic3r/miniz_extension.hpp	2021-01-11 08:01:51.000000000 -0500
++++ b/src/libslic3r/miniz_extension.hpp	2021-01-12 01:16:10.503404521 -0500
+@@ -4,4 +4,5 @@
+ #include <string>
+ #include <miniz.h>
++#include <miniz_zip.h>
+ 
+ namespace Slic3r {
diff --git a/media-gfx/prusaslicer/metadata.xml b/media-gfx/prusaslicer/metadata.xml
index 0d7a4d353499..dd17dbe10ea6 100644
--- a/media-gfx/prusaslicer/metadata.xml
+++ b/media-gfx/prusaslicer/metadata.xml
@@ -14,6 +14,8 @@
 		PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap community.
 	</longdescription>
 	<upstream>
+		<bugs-to>https://github.com/prusa3d/PrusaSlicer/issues</bugs-to>
+		<doc>https://help.prusa3d.com/en/article/general-info_1910</doc>
 		<remote-id type="github">prusa3d/PrusaSlicer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild
deleted file mode 100644
index f7714afa61d0..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit cmake desktop wxwidgets xdg-utils
-
-MY_PN="PrusaSlicer"
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
-SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gui test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-cpp/tbb
-	>=dev-libs/boost-1.73.0:=[threads]
-	dev-libs/cereal
-	dev-libs/expat
-	dev-libs/miniz
-	media-libs/glew:0=
-	media-libs/qhull
-	>=media-gfx/openvdb-5.0.0
-	net-misc/curl
-	>=sci-mathematics/cgal-5.0
-	sci-libs/libigl
-	sci-libs/nlopt
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/PrusaSlicer-version_${PV}"
-PATCHES=(
-	"${FILESDIR}/${P}-atomic.patch"
-	"${FILESDIR}/${P}-boost-1.73.patch"
-)
-
-src_prepare() {
-	setup-wxwidgets
-	cmake_src_prepare
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release
-
-	local mycmakeargs=(
-		-DSLIC3R_BUILD_TESTS=$(usex test)
-		-DSLIC3R_FHS=1
-		-DSLIC3R_GUI=$(usex gui)
-		-DSLIC3R_PCH=0
-	  -SLIC3R_STATIC=0
-		-DSLIC3R_WX_STABLE=1
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	doicon resources/icons/PrusaSlicer.png || die
-	domenu "${FILESDIR}/PrusaGcodeviewer.desktop" || die
-	domenu "${FILESDIR}/PrusaSlicer.desktop" || die
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild
new file mode 100644
index 000000000000..de0016701b26
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit xdg cmake desktop wxwidgets
+
+MY_PN="PrusaSlicer"
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
+SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui test"
+
+# tests fail to link with USE=-gui, bug #760096
+REQUIRED_USE="test? ( gui )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/tbb
+	>=dev-libs/boost-1.73.0:=[nls,threads]
+	dev-libs/cereal
+	dev-libs/expat
+	dev-libs/gmp:=
+	>=dev-libs/miniz-2.1.0-r2
+	dev-libs/mpfr:=
+	>=media-gfx/openvdb-5.0.0
+	media-libs/ilmbase:=
+	media-libs/libpng:0=
+	media-libs/qhull:=
+	sci-libs/libigl
+	sci-libs/nlopt
+	>=sci-mathematics/cgal-5.0:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	gui? (
+		dev-libs/glib:2
+		media-libs/glew:0=
+		net-misc/curl
+		virtual/glu
+		virtual/opengl
+		x11-libs/gtk+:3
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/qhull[static-libs]
+"
+
+S="${WORKDIR}/${MY_PN}-version_${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-miniz-zip-header.patch"
+)
+
+src_configure() {
+	use gui && setup-wxwidgets
+
+	local mycmakeargs=(
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=$(usex gui)
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_WX_STABLE=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use gui; then
+		newicon -s 128 resources/icons/PrusaSlicer_128px.png PrusaSlicer.png
+		newicon -s 128 resources/icons/PrusaSlicer-gcodeviewer_128px.png PrusaSlicer-gcodeviewer.png
+		domenu src/platform/unix/Prusa{Slicer,Gcodeviewer}.desktop
+	fi
+}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 781744756644..5f92dc2f18dc 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -8,4 +8,4 @@ DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a64115321
 EBUILD slic3r-1.3.0-r3.ebuild 2748 BLAKE2B 823f3341684d705f34faa66ee361c91f0ca1b8916ca9773e5dd6817d06d5b0a4b048abd60f747670531969ca63a673ff228156f6e05f1a1b2c9d85d7e21fb7d3 SHA512 6937adaab0083e646c74fbf4b1c0a7daab521c37c160d5220ef6fb7cdaff44815388a7e449460bd56ab05b80c3714cb0f69e7452fe2ee1460344f4b58f69ecc5
 EBUILD slic3r-1.3.1_pre20200824.ebuild 2784 BLAKE2B d3bee26847f0640e90e5df95c8c0f56976e220a3c5fc2c92b94eaf401da28ba14c0c19e04e68509b6e352b6aa6884061ac56feb0c9f42cd82c8d7030d69438cc SHA512 726a2f7f87652a160fbdfa437ab42001c13ea27361cc8818a5a725e2af8bef2a3099f836fa4cd4679eed6c0c0487f9781501b8433d3bd24b980165b44e77d139
 EBUILD slic3r-9999.ebuild 2758 BLAKE2B 2c49616aff2a3964f43d00f74aa014adfb364ee100b4f1dc6c7f86fe4469fa80e9f7eb311f4d9f27fe66a3de84d13c95a966acd7e29e7833a7a72882831f0a41 SHA512 0a77983538340eebcc19d9c3054104a8b4cfae18ac6f3eebe478b9ae99297b8ca5207b16699048b861f0f812892877850224f7b55f343c79ad683040cfd33920
-MISC metadata.xml 865 BLAKE2B ef9db95f1fa0e777afb72920bc276c2cd120e5a53d9d840131184b70e763e3d32a47e496f7a34a8de1fe6a306e6f811130ce9898be2ab851a6e13fc2288bc360 SHA512 4244599400fc0a1cf5fae81e86248d26701f333f42afb55dfb4c53aa66f6087962470117a6ca0dd0e6e92bf497514c1fc517528aaaab3990599184970b0602de
+MISC metadata.xml 911 BLAKE2B 39abbf46851ded99736fe0541b9d11d05a198e1b9d66e66b1ecd7ff0eb1b1f03c45a7de0439f634ae35954db60bd96b9587bd2014a4f3f2ad561c293d2b0db8e SHA512 9898d7e38439bc5f7ab4ca91ed8dcddd073bc5e4da2c05aa6003f6550b90355d98725765b625e9ffaab40245ec86800908a8300843e05ca092b6e97a8ef3495d
diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml
index c3ce8641cb63..41ad86d64fad 100644
--- a/media-gfx/slic3r/metadata.xml
+++ b/media-gfx/slic3r/metadata.xml
@@ -14,6 +14,7 @@
     </longdescription>
     <upstream >
         <bugs-to>https://github.com/slic3r/Slic3r/issues</bugs-to>
+        <doc>https://manual.slic3r.org/</doc>
         <remote-id type="github">slic3r/Slic3r</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-gfx/tintii/Manifest b/media-gfx/tintii/Manifest
index a9956829a057..a9e6025092d7 100644
--- a/media-gfx/tintii/Manifest
+++ b/media-gfx/tintii/Manifest
@@ -1,3 +1,3 @@
 DIST tintii-2.10.0.tar.gz 620863 BLAKE2B 61127bfe1ce1eca87cea7fcd5cc6ef95c445ad0cdf32fd2d752a27818df8132ee0d7e6eab355c37ff3535be416a79b34652e8a28d8f93e0bd523a15396f6a4cd SHA512 884a9a3393080ee064069288afc13b2f72272571efaabf013ea2029627fc2ed922dcb791b8316c1d2117faf553d6bf333cf35f0486ba82aa2dc0987f9ce5f9a3
-EBUILD tintii-2.10.0.ebuild 526 BLAKE2B e614a533c6d023328a5c54e570528f7ca358eb6a938bb6fd8196f1ead7ab3c183010c587afc100f35495476cf6d33d0928b96b425890402938ef47a271438866 SHA512 f4e0258502d19ca630df8b54cae11704c4aeff27bac1020407d790944d9112d50741e55295b1e81981e2e5963699408cb0cd67298bc6408df986b0788c7ef8fa
+EBUILD tintii-2.10.0-r1.ebuild 561 BLAKE2B ced5199db24463364ec48ebe2eb205cf7311e4a61036fea450f40dde443b19bf366cd860ded5511131bb12868082b958d9d9ce5771f8a17b3dd78adfd8529993 SHA512 ed3b7fb7fd039463cfb04e579a29e3752882a0fdfd70fe9a49cb10a9fc944fb9bef3c7775c2cc84e6f10a93da8fb070c8b9f2af0fdbaaa89e1e558a9f6e8142a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/tintii/tintii-2.10.0.ebuild b/media-gfx/tintii/tintii-2.10.0-r1.ebuild
index a063c35bd35e..b9a5dd6fbb4f 100644
--- a/media-gfx/tintii/tintii-2.10.0.ebuild
+++ b/media-gfx/tintii/tintii-2.10.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-WX_GTK_VER="3.0"
+EAPI=7
 
-inherit wxwidgets
+WX_GTK_VER="3.0-gtk3"
+inherit desktop wxwidgets
 
-DESCRIPTION="A photo editor for selective color, saturation, and hue shift adjustments"
+DESCRIPTION="Photo editor for selective color, saturation, and hue shift adjustments"
 HOMEPAGE="https://www.indii.org/software/tintii"
 SRC_URI="https://www.indii.org/files/tint/releases/${P}.tar.gz"
 
@@ -14,9 +14,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
 DEPEND="${RDEPEND}
-	dev-libs/boost"
+	dev-libs/boost
+"
+BDEPEND="sys-devel/bc"
 
 src_prepare() {
 	default
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index e8c51488825a..5d3fffa3beaf 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -5,5 +5,5 @@ AUX tuxpaint-0.9.21-underlinking.patch 592 BLAKE2B 1af0a14e4512b748fb2294e9ebe7c
 DIST tuxpaint-0.9.21.tar.gz 9543034 BLAKE2B 196a743542d72e3dc5cea69b9e66a3baecdde7e3b288cb6759632d2b472f69db8d70ad404737416afe7f2ef4d0c0d21c7b2caadb64ca8d21a909e275ee6fcc46 SHA512 fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3
 DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
 EBUILD tuxpaint-0.9.21-r2.ebuild 1701 BLAKE2B 8d08863971b633e62022a4264bc3cb22bc20bd9469c35378960f07a0eb606481715ac6924d360648e75f27109283c4fb93de44ab504ee533a2ad6fa9bf06b737 SHA512 53ba744c47ab39730e6db19fea50e44818ed0fee483aa1e4e3a7e1d6cd8b679e1dfd453523956b0cbd447d92808c6c861dcb5109af2470a14fd228eb85d6b945
-EBUILD tuxpaint-0.9.24.ebuild 1676 BLAKE2B 2311eb8e10745b07998a53cab43d967a623d70e62cb942bd818c3cfa7b605e05fb26269fcd61838fa5ae0ad379901ca3ce51c5603b976524158d81dbe6a5a692 SHA512 c84371c466b600c4326f7a82337e48242bc41d6805acb3d0a1cae61a410d95aba1b4ea5342427faaeee27f9d170ff4ed1600cef1f15dfa79eb0b28d9fee77c88
+EBUILD tuxpaint-0.9.24.ebuild 1674 BLAKE2B 5ba887bd2e613c42def2cfcd2ef6bc2b37ca5dcabbdbc4dece2255301299532b2d3fb203443e47d9e771758354cac65bf582c465e80d6d662ca384be5856383a SHA512 26c1c718f70a796cd0950c6f8abd82665a2230e5dac9d92b43540003cee6c18dd3044895d1d74a85a95afe196edcdcacc72ae3f8f9aa8f5edbdb8656d724d667
 MISC metadata.xml 618 BLAKE2B 41214f92d2223b2791c7f79b8add3c494549a9f7e4048d17ec74aa13a56c460d3c83df08bd2f93358e8aa4eb6b497a6f3b9e49cd422a6a17a211341bd44e4bdd SHA512 e1be803667ac0a7a2a364f05f08e0514826292f11b3ff261a215864cfa50d61538f4535a83b0903e85c942098155231725db6e664aee4cfca812a36d670c0f72
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
index f36eec6c6984..a76582804619 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	app-text/libpaper
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index cff6e6882a03..cd7414fb4ce6 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -1,4 +1,4 @@
 AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc
 DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68
 EBUILD yafaray-3.4.1.ebuild 3072 BLAKE2B 99207e9b3c330cc717af5649b951db81cedc259f27a18de0dd1092c9f895aa0ff1feec2cfc8eab2b24c32836b642fa2a0e5c85597f787ff2a35228f556189f23 SHA512 c3164f5fe95c9488a3dbd71bf81e724394dbc71a209153a89fbebff7345fe9102f5c2d8a316145b8359b868ebfd53120fd42de13b835dbac61421dd71d218cc0
-MISC metadata.xml 1040 BLAKE2B ab9f09e8bc2c6ee6a4abcc94d70bfec3e64707ae65dbba76ea697e3f3a741c09f4f5ed7efdb5276dbe49e8fc9a73b55a6d1df305b959653006ed84457af1f334 SHA512 fa59f31692d42bb16139f5fb7948bf117a040203047dc2824c48cc56177545e0bdb87004836ba08a8ffd6f1c7f43f345e10064c648687a355679f913f1917b43
+MISC metadata.xml 1048 BLAKE2B f05a3c07c3f5e1f9a11112c4053ff0685a5cdb72f242d3127cb0e20ede25e1076e22f326619c2a782441b66bdf12d48fb841049ef99e6cf1a7cbb68cd4e3a7c9 SHA512 640b4568d7d15b043747e644d0e75864f02934c93d99399086ff5afb1a0a01d6396de31207f9902afc5015065ee06618a87570cc53d6dd9f0c0611a027897c12
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index f4ad58bed544..2c614e94cc33 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>waebbl@gmail.com</email>
+		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
 	<maintainer type="project">
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
commit	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree	c44943ee0563a3fa957716de909fed683117fcb9 /media-gfx
parent	69051588e2f955485fe5d45d45e616bc60a2de57 (diff)