gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /media-gfx
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
91 files changed, 1533 insertions, 1170 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index be373195e7f1..9532b0068c45 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/album/Manifest b/media-gfx/album/Manifest
index 57c0b3e98213..315d0d9d18eb 100644
--- a/media-gfx/album/Manifest
+++ b/media-gfx/album/Manifest
@@ -3,4 +3,4 @@ DIST album-4.15.tar.gz 651380 BLAKE2B da6728f65586b242297bb7c8d8ae676de636177539
 DIST data-4.05.tar.gz 6468036 BLAKE2B 3e11911dabcf024934653f5fb5c3c3b65bd2ad5e6607c67ee1dade392540bb0b7c90de521effa5d72d2f40dc6c02016e23d373f714a3b62c15af53ebb4d438d3 SHA512 a7c577df6d10dc2db53fa6d469d2cf9c5115de99df47e79f31ecc0b009bd12e654e4ca7b9e6e78abe90a8a87d5f52ca9946a2d632e3f219d9bcb5ab7838ce42e
 EBUILD album-4.13-r2.ebuild 903 BLAKE2B 22e870b231280d06e24bc6912df99a6d752b55f787d7f15e7574a8a2714057a8ba024f4babc7ffd854e6e8585080964599e3e7907980ca421a7ccef383c108aa SHA512 d98825eb26e99da51b43405a9886595c71aa1a6f2ff9701782a931b75ab914127aa2736a17e61d0206b1f3ab9c06154a54fc2eee6b2556d7f6e6482ad13c9e02
 EBUILD album-4.15-r1.ebuild 946 BLAKE2B ef25e0ec0a61d44d3b28a4831bbf45d9dac260020468dabfed2ae24395ea8dac570d4203c9abab48a2145069a4d3e22ee06a7d0b3020c630fd3a3d0317696ea7 SHA512 4975be05ca1d2ca7bda75acd05a4150910eeb8c99f8499019a5fe0e24c4f30dfb1d9a67c1a9e6ca1dd9e2820f4463a0d5efb1eab3122a3c2d356a2041d43d8c0
-MISC metadata.xml 374 BLAKE2B 05c713b2922350914356e8a0073f22c635b6c1b84bd6d0dd8031b0515fba8580da54636e1e75dd4bfd903fd10b3f465cfbda325e4e826bffee3a40badd9cf8e8 SHA512 b0e38d10966a2d98b1f8d8235e9f8c96c294037e503179531e795ffedcf8517ddcab991d692fc7dae7d64e354510a36e07671fb216b94a62b3d78c938667d530
+MISC metadata.xml 452 BLAKE2B cd720f40a35fbf5fbdc7e5eee9af00169451f76f97a84aa969823c330bdc3a65545c037ed9a478c41dbe5158e8996a2a7b060053d3e15815324001d97694716f SHA512 bced1cebe160580909f57c74c86ac9de7eab5342766763230a381b24da5c4ea08faf0b6e8d3d4e5e7197a55a35477e9ce72a56e72d3188a711135248f003e115
diff --git a/media-gfx/album/metadata.xml b/media-gfx/album/metadata.xml
index dbfe02dd7ccd..64fc4579cb9b 100644
--- a/media-gfx/album/metadata.xml
+++ b/media-gfx/album/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer type="person">
+	<email>dilfridge@gentoo.org</email>
+</maintainer>
 <maintainer type="project">
 	<email>graphics@gentoo.org</email>
 	<name>Gentoo Graphics Project</name>
diff --git a/media-gfx/clockphoto/Manifest b/media-gfx/clockphoto/Manifest
index 24ab2c8d118b..75d4aea2a9d8 100644
--- a/media-gfx/clockphoto/Manifest
+++ b/media-gfx/clockphoto/Manifest
@@ -1,5 +1,5 @@
 DIST clockphoto-1.1.tar.xz 717820 BLAKE2B 8e8847b69bd2e5cdc3381afbc9d097f0a16763f987aa9843360aae327d02080577b371a81d31e888622e2735af271ce3df6aa7a0f014d1f275b06cedb3e30036 SHA512 21a114191445fc3a0d888b4c0288d3fcd49394b3390cc04306136b8e6569d8d039851813cf5e44f38bcadd8a60cd649adaea2fbc881a3182e3aae249c1962d0b
 DIST clockphoto-1.2.tar.xz 717836 BLAKE2B b730ed9cca21ef7c23c6d6eeacbbdb59df6b5ac6c59b5f9821f4958ebc212df6c803cd062400c19e9e66e39c711a80cdf3355d53d6f6f10237cb67e40b818e28 SHA512 db5740b3c291df8cc79dec94196aa912afd316c601ddd6809b76d3a9f12a4df9b6530d4c9a031720cd5f309d7d05cbe62530ce1e2a9d8a7c2997d56a30b97739
 EBUILD clockphoto-1.1.ebuild 532 BLAKE2B 4bbaa046a954fd83eadff39e439405ff2396d8a8131f780c1c0b57bc8ba2a306e906799527701dec74b8fee14c7e11c2934dc24db2f0bc0ac0ee7b2aeae24d26 SHA512 df59cd3a4a1ae930a2fc5a591289f4c2ef556940cb3c9f0b603b8f50c701137f3958f0aab1d244d4343191486753276dee588eae9608b5e4c47dac3a06f22d2a
-EBUILD clockphoto-1.2.ebuild 531 BLAKE2B b28d3e7c890026b66a69a97235ffbf4f424ee69f3a4193bed9687d64dbbc48f3964d616493dad61b8cfadd512e2b4cf6525022bb157c7ad18c552eece1372183 SHA512 63f10a3bb3aad34891c54b5415775601093b3cb3518f5fbc23ff57c7876a375a122d1c01d25665a51f7dd9a821a96b70d708ea2b1d899af1849fb2cba435802c
+EBUILD clockphoto-1.2.ebuild 537 BLAKE2B 8fe0cb498706bd4d025c6ca213d04039b215b6b222d40304e6d0b6dfe0de8b0124e14a5f91f17bdc23a8cb1b6e8f200044563485e0e86412d0ba4908df1a8142 SHA512 3b287250684303f6751af7edb4ba98b9b4af378f288d866af719a06863484047b15372e8bcc5ce96170cf63bd7430557313f16d4e01c209c9be4477398469ca0
 MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/media-gfx/clockphoto/clockphoto-1.2.ebuild b/media-gfx/clockphoto/clockphoto-1.2.ebuild
index c7140026fc37..3483056e2bd9 100644
--- a/media-gfx/clockphoto/clockphoto-1.2.ebuild
+++ b/media-gfx/clockphoto/clockphoto-1.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
-DESCRIPTION="Adjusts photo timestamps based on clock photos."
+DESCRIPTION="Adjusts photo timestamps based on clock photos"
 HOMEPAGE="https://git.zx2c4.com/clockphoto/about/"
 SRC_URI="https://git.zx2c4.com/clockphoto/snapshot/${P}.tar.xz"
 
@@ -14,8 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5"
-RDEPEND="media-gfx/exiv2 ${DEPEND}"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	media-gfx/exiv2
+"
 
 src_configure() {
 	eqmake5
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index bbfc90e67348..c84a916e2413 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,11 +1,14 @@
 AUX cura-3.3.0-fix-install-paths.patch 1663 BLAKE2B 293bdecb0e6ef130e80bc078f89470908bdc74f9ede901405e8b99953dc5927986d51db3f3494004c44ea543621328c24860ff3ab0c1ff4452d2347f082a53fb SHA512 0c42638c0f0f0cc108c0aec19b0319037c4a17ac4fc6d05920191a927ee32ea4901ca4cb2ae5473c3ded2afbcabd2cad55b6cbaf3ad986ad205fc22936c31fa2
 AUX cura-4.2.1-fix-install-paths.patch 1824 BLAKE2B 423ee2da55c69fa7fda2d93931f00460f16f5539dcf22e0db93210a90be533a1dfa7dabc4ae787bb404ff7ca38c7b4fdb0113cdfdf0f20a2f7907bfcb827dbcf SHA512 d88923ae9baef2889b952f6fe85e312890390228afb8ab27edab5e0abac48eba57b5a78ae0a913c96bf420fcc9f98a5281ede19c0d23d784104c85715d6bb7aa
+AUX cura-4.6.1-fix-install-paths.patch 1478 BLAKE2B 177cd0d14fdecd0da4da0cbc4d1ff86082adbc4182c3789dd9d4ec056ab76b43d6ce7b48e027c5fc5d7b1684a15e310101361e6896fa980cd3370b1d2f2860c5 SHA512 4ddf154f398b9d285fb51e9255a7dd5d10caef0a1980bcf3f37c231d1c3c91433cfa9d351b7c96404364db1924f1fed63a98e8f317eef6905fd14e96171af3b0
 DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728 SHA512 5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
 DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
 DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1 SHA512 4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52
 DIST cura-4.3.0.tar.gz 30433646 BLAKE2B 8490d703cfd4ad07fd5b30d5f776d978baa17ad8751dad53870714596998becebc85cc2fe49fa05eab37b95106315ace97eaa0bbed65b488b522ebbbcba488dc SHA512 3f4ae11e4e28b151e9587c197f814bc97bc225fb2819f4dabaab392ef9896bb119d6fab0df48c9eb4a390a815815d27045eefa933e2e4a9d53331db8d79ea815
+DIST cura-4.6.1.tar.gz 36080329 BLAKE2B 5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f222280441daf44866ffc93ebcf1295c750 SHA512 8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
 EBUILD cura-3.4.1.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
 EBUILD cura-3.6.0.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
 EBUILD cura-4.2.1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
 EBUILD cura-4.3.0-r1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
+EBUILD cura-4.6.1.ebuild 1520 BLAKE2B 31561d987bc6ce44068facd07cb9a7e2e6b2b0526238143cab7a89b3310a0149ece8c222fe56c5bc4f9b48029dda1ae51f5d3cc48cdc709deb20e280205bfc3a SHA512 12bf615a68c0e7b57ce8ec3bfe71fbdc65565668b746c0f8a59d4c8d6bce3e2cdb4f0705a85ab2bc744abe42cfe45776daca50fb06aa0b3fa405973fe4b0a123
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-4.6.1.ebuild b/media-gfx/cura/cura-4.6.1.ebuild
new file mode 100644
index 000000000000..c2d57876b251
--- /dev/null
+++ b/media-gfx/cura/cura-4.6.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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 ~x86"
+IUSE="+usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-devel/gettext"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=media-gfx/curaengine-${PV:0:3}
+	>=media-gfx/fdm-materials-${PV:0:3}
+	$(python_gen_cond_dep '
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/sentry-sdk[${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 "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doicon icons/*.png
+	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
new file mode 100644
index 000000000000..4d5f00ad47d7
--- /dev/null
+++ b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
@@ -0,0 +1,31 @@
+--- 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/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 741b66626b82..4fad1dece6ab 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -2,8 +2,10 @@ DIST curaengine-3.4.1.tar.gz 949312 BLAKE2B 4902575c40002ab49e3ef13c94c8531b6975
 DIST curaengine-3.6.0.tar.gz 1390109 BLAKE2B a0a6b8016bb5fa2f772634a671fc391df45875fc36cdf100f00ce34b9d5495f32986c473b1ba4c184cb77e50a64e2648c5d4f31053790182e657b0c981e1412c SHA512 340dad4c697fb0d7b633091715a904ae7df8973626e217ae2528d0121723c07a6cf0bbc740b9ad9980f3b288fa690c9c3ee43d90914264855dace007bbb334c8
 DIST curaengine-4.2.0.tar.gz 1654657 BLAKE2B c11f77a126e49c1c63550accd42c3616ab647d2575de0f11e64cb2188e7c565a54f3613e296c3f19e8534a7a758162fe29cdd62e8d62d691a7d9c9e6430545ce SHA512 6c3edac5a21068b50a31d3ab37dac58b986e18be2d24711d77cf210da62b521d62dc92a1b4e8865a26e5c394119349f03b3816d19d67ebee670424cc4a7b2500
 DIST curaengine-4.3.0.tar.gz 1656780 BLAKE2B 9b93e3f294a8a67c2cd4f2d4462a4047e6860e0c391e7ff550b24c498faa82fd2af4fd044845f00f93fb01d38ca3fa1511bfe65a7456b5a6e0b919821be5ab8f SHA512 60ca0ce586c0cf5f1516f803b2a05a20299ef8193f065acd6e11a0054903189225f9c60be1b536ffe5a9a22652097acd3a4aae2833920a468071b78f213f7572
+DIST curaengine-4.6.1.tar.gz 1685119 BLAKE2B 352c5b4b98866ebe6f90dc095960d2417ccf9c023334b4006b604da45aed1e3b6066700b08be3727214433fd505de87cad4da8e17d9067571d91dd0ec7660ebe SHA512 8b3a65fb00bebc37acd24a6d4277c1f09849c0318fca00867479d62c0f64b8628064a898128e1ffc5fb99eed2c1d45a310df2f97fde9c37a9ccc311f5ba4d057
 EBUILD curaengine-3.4.1.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
 EBUILD curaengine-3.6.0.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
 EBUILD curaengine-4.2.0.ebuild 1513 BLAKE2B 51f109e8db08e5e3d0caccc1016628e6570dfab14f30a5b061bc25cf2edff0516bc50409271f26e592f9223d775d4fbce66d8b48b6cdbb914e3115208d7b2a09 SHA512 78ca9ad1b1d59f3274021d57fe3e2d14b7225315e8eaea2179c656bfecb58e59384dcf520d4c5fe1d05af5dec21973cd8020af116eadd75969d1331d08d82d00
 EBUILD curaengine-4.3.0.ebuild 951 BLAKE2B 477593726cb519294f189d8175f04168582dd756de4c0a86cb254f750cf1c0736b9913365e81eb48fe821e5b2c771d1468e5a7cf3e36bae7339d0aa5310affcb SHA512 f5974e877bd0c885f2aa5856ad410b05a16029039ed87913ccb03adedd804b1cf474addb526a8f961902f45b231199b32db852bc8b78aace2b559342715a0686
+EBUILD curaengine-4.6.1.ebuild 955 BLAKE2B 733f85ddaec6e24923289023a83bba47c0f9fbd29be348ff0a338d39bdf8655255cddc54afe14d53600195c178169d3c1a83b26f25739884fee166498280596b SHA512 92d6924c086f4e8b022105d235467dce86d7f65466a9df97026f625eed054a6ec45f2901202c5cd70f5d11ddb9093de0632530e64e04957b1a86dea7eec3f569
 MISC metadata.xml 862 BLAKE2B 233eef15a865c598451d8a6100a8dc99f4c9a4c4ae4f8692a473ad2b8de5c2bc5216052b2bbf698e98f1c7f8156512084beaebc6148b9bc333d5c09d9bfda3ba SHA512 92e4cf75b949ac201537780bc5acf295720da8a342f6d882e2ca3b36aaa5691a3df31e6cf79e44b25f88d2f1177a1b6227165cbe8b9da8762b35560927239382
diff --git a/media-gfx/curaengine/curaengine-4.6.1.ebuild b/media-gfx/curaengine/curaengine-4.6.1.ebuild
new file mode 100644
index 000000000000..9a634cff090d
--- /dev/null
+++ b/media-gfx/curaengine/curaengine-4.6.1.ebuild
@@ -0,0 +1,45 @@
+# 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 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="|| ( sys-devel/gcc sys-devel/clang )
+	doc? ( app-doc/doxygen )"
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:*
+	dev-libs/protobuf
+	dev-libs/stb"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_build
+	if use doc; then
+		doxygen || die
+		mv docs/html . || die
+		find html -name '*.md5' -or -name '*.map' -delete || die
+		HTML_DOCS=( html )
+	fi
+}
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index b4631300760c..650ea0f6934e 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,4 +1,7 @@
 AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d
+AUX digikam-7.0.0_beta3-qt-5.15.patch 1796 BLAKE2B 14ae2f4b83063ec5be0a14ea7969266d36c8229a7ad5e6070976d34557165c4b3672cbcf340c256b8025ea57de91540835413736f233aab76a022fad8a8198a1 SHA512 eed37b8596b23cb22ca4d994f30258b2056ef074db38e1b740c01c726faee5021367b56bf50c768b727c56be8b4a23b7731d20a807b437d1d6e6dae8eafb75c2
 DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
+DIST digikam-7.0.0-beta3.tar.xz 571307796 BLAKE2B fb0d82557c3a747f8a4b0a188f9ae7a0f06590ed59eed1418647b73a21c59334473dc0c33018db7f27572e574ac56a202a36a47a26c4b5b589a7f54c1987d2a5 SHA512 da25e1a2ab7c426f9f437c4ed81c334f435fcabf6d388f083bc5192cca9df8114961451adbe8d4e86df319a0a7ae125fb527ce406fce349632b59912777a1f69
 EBUILD digikam-6.4.0-r1.ebuild 4310 BLAKE2B 9c69ad526cedaac830105b620f2ee096504ca4e78c4ee4a6db60ac1398602be51bf1fe38a5b5dc338af2ae87ea041c93f3d1861352303c709121673034962133 SHA512 02d6beb8875c218acfe8f42d7c08715b53282b6d9a57949c8eb70176be6680a5b752719087f26b4cfa6bcae47e055c37db62d55cbec80ee6ddb4539ef2423b98
+EBUILD digikam-7.0.0_beta3.ebuild 4251 BLAKE2B 35af6caa153eef7396deb5124b98501c9aaeb0bab75b78471aeb84e55dd28420aa75ae87d0889b3939d5d5d251c50d3be624d462cf02cf24208a65f02ad70919 SHA512 6cf34189e4fa90ed110fd7e13739c2febccf222e59a5574b679d05705cd11794f14f63d23314bc0904d5bc1ed0266dc9701150f0a24301b7863ad3c1b0acc9ff
 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
new file mode 100644
index 000000000000..3659f26f6ff2
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	if [[ ${PV} =~ beta[0-9]$ ]]; then
+		SRC_URI="mirror://kde/unstable/${PN}/"
+	else
+		SRC_URI="mirror://kde/unstable/${PN}/${PV}/"
+	fi
+	SRC_URI+="${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+
+BDEPEND="
+	>=dev-util/cmake-3.14.3
+	sys-devel/gettext
+	panorama? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=media-gfx/exiv2-0.27:=
+	media-libs/lcms:2
+	media-libs/liblqr
+	media-libs/libpng:0=
+	>=media-libs/opencv-3.3.0:=[contrib,contribdnn]
+	media-libs/tiff:0
+	virtual/jpeg:0
+	addressbook? (
+		>=kde-apps/akonadi-contacts-19.04.3:5
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+	)
+	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	heif? ( media-libs/x265:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	lensfun? ( media-libs/lensfun )
+	marble? (
+		>=dev-qt/qtconcurrent-${QTMIN}:5
+		>=kde-apps/marble-19.04.3:5
+		>=kde-frameworks/kbookmarks-${KFMIN}:5
+	)
+	mediaplayer? (
+		media-libs/qtav[opengl]
+		media-video/ffmpeg:=
+	)
+	opengl? (
+		>=dev-qt/qtopengl-${QTMIN}:5
+		virtual/opengl
+	)
+	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+	scanner? ( >=kde-apps/libksane-19.04.3:5 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+	vkontakte? ( net-libs/libkvkontakte:5 )
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost[threads]
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql[server(+)] )
+	panorama? ( media-gfx/hugin )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch )
+
+RESTRICT+=" test"
+# bug 366505
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF # bug 698192
+		-DENABLE_APPSTYLES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake_use_find_package calendar KF5CalendarCore)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package heif X265)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package lensfun LensFun)
+		$(cmake_use_find_package marble Marble)
+		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+		$(cmake_use_find_package mediaplayer QtAV)
+		-DENABLE_MYSQLSUPPORT=$(usex mysql)
+		-DENABLE_INTERNALMYSQL=$(usex mysql)
+		$(cmake_use_find_package opengl OpenGL)
+		$(cmake_use_find_package panorama KF5ThreadWeaver)
+		$(cmake_use_find_package scanner KF5Sane)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package vkontakte KF5Vkontakte)
+		-DENABLE_QWEBENGINE=$(usex !webkit)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch b/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch
new file mode 100644
index 000000000000..fe865eb73af3
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch
@@ -0,0 +1,51 @@
+From 10fd663f43148fc96ed3afeecf70de15cadd0f8a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 19 Apr 2020 09:55:03 +0200
+Subject: [PATCH] Fix build with Qt 5.15.0
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ .../dplugins/generic/view/presentation/opengl/presentationgl.cpp | 1 +
+ core/libs/dimg/filters/curves/curveswidget.cpp                   | 1 +
+ core/libs/dimg/filters/levels/histogrampainter.cpp               | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
+index b37699436e..6a4f173ab0 100644
+--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
++++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
+@@ -44,6 +44,7 @@
+ #include <QMatrix>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QTimer>
+ #include <QWheelEvent>
+diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp
+index cccccbd156..d0beef9bf2 100644
+--- a/core/libs/dimg/filters/curves/curveswidget.cpp
++++ b/core/libs/dimg/filters/curves/curveswidget.cpp
+@@ -40,6 +40,7 @@
+ #include <QColor>
+ #include <QFont>
+ #include <QFontMetrics>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QMouseEvent>
+ 
+diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp
+index 241d5fc4c8..f11ad4b560 100644
+--- a/core/libs/dimg/filters/levels/histogrampainter.cpp
++++ b/core/libs/dimg/filters/levels/histogrampainter.cpp
+@@ -30,6 +30,7 @@
+ // Qt includes
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ // KDE includes
+ 
+-- 
+2.26.1
+
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 72390be5874d..471c3f058aaf 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,4 +1,6 @@
 AUX exiv2-0.27.2-libssh-0.9.2.patch 2035 BLAKE2B aeb9be311217b80a347d76a7df14ec11fc2018626cf7e9a813865dffd76038db10432fc2c898c0c26bdb3f1556cd34c0f8e4a25b189bc32733a3b4e018b241bf SHA512 25b4ca539585ddc2f4a11fc24ba49e799689d361f5f99f5552e99bd81179c95968affc4a42acd9ac0ba56f237f29ec53970a134b4dce44274a6044638d5bd78e
 DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
+DIST exiv2-0.27.3.20-Source.tar.gz 26462789 BLAKE2B 1fab5636f2ff69a6e61b78e29f8f536ef699bc7eb6e32edfd2f643805205df99502a3e1a9654dd8cd60e4f948d1442aa2bf4c4e71a345adaf310746bce5054c5 SHA512 4efd358adf615b924ef5446b68b7b7e260dd243179c8aa290006ea84d2fa08ab7069aa1af80b594858600660e184c80613c9254e66320d47087e00c9eccc8448
 EBUILD exiv2-0.27.2.ebuild 2457 BLAKE2B 5d610e7e21b215a72a31435a305d5f5dfdb0e9ef3499b6d805ca53729273475ef85c783aa269b106d24bc846007479159551a5cd3b10f8ccf226773c3e44f7d1 SHA512 bfea82132bdad7b89a35114ad4154db0044940324adcf65427306c15ddc1cd2a5152706a11f1613150799d6a1d439f1881bfe9f1dd62f8b4accb96eeb6251bb1
+EBUILD exiv2-0.27.3_rc2.ebuild 2465 BLAKE2B 69b3aa6999e788ccf2a45bdf89a7b02ecec4dc9a0f80ad2c43f3fdbdd7c3afc84116a4f67aeacd2bde78324279bb54d5870ec14a0424992b031776278a33e2e4 SHA512 1a7b08577200674aa7f8c06acf0d1627476b7760184d6f467d740384ed4ff0d70563b36cd3c965345706f6fc3349688a9008ddb049169262afa559f4276e0eab
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild b/media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild
new file mode 100644
index 000000000000..8c6ab3c5c6d5
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.27.3_rc2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+	inherit git-r3
+else
+	SRC_URI="https://pre-release.exiv2.org/builds/${P/_rc2/.20}-Source.tar.gz"
+# 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+fi
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="https://www.exiv2.org/"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+IUSE="doc examples nls +png webready +xmp"
+
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		app-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	webready? (
+		>net-libs/libssh-0.9.1[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+
+S="${WORKDIR}/${P/_rc2/.20}-Source"
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# FIXME @upstream:
+	einfo "Converting doc/cmd.txt to UTF-8"
+	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
+
+	cmake_src_prepare
+
+	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DEXIV2_BUILD_SAMPLES=NO
+		-DEXIV2_BUILD_PO=$(usex nls)
+		-DEXIV2_ENABLE_NLS=$(usex nls)
+		-DEXIV2_ENABLE_PNG=$(usex png)
+		-DEXIV2_ENABLE_CURL=$(usex webready)
+		-DEXIV2_ENABLE_SSH=$(usex webready)
+		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
+		-DEXIV2_ENABLE_XMP=$(usex xmp)
+		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
+		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	if multilib_is_native_abi; then
+		use doc && eninja doc
+	fi
+}
+
+multilib_src_install_all() {
+	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc samples/*.cpp
+	fi
+}
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index c7f4e7f86f4c..04b6606760f6 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -2,8 +2,10 @@ DIST fdm-materials-3.4.1.tar.gz 20852 BLAKE2B 7ad125e62c1a1cf2a05440c6ef593bf511
 DIST fdm-materials-3.6.0.tar.gz 23037 BLAKE2B 842edbbef94dbf8a775d81bae3b6621dfeff9ba5cc8d9986ad672f95fe864007c931ef37d38c8702201d286c1cdb9770ab5709e364335833fd40c8c1e4c0f68f SHA512 1f868b716135a3b81495ed6445794c4d5cddc618dbf7a19b29ccdddbcd1d6f9d49190be7cea99c6dd2b8c07f1126973f1c43b223ff213ce04b6fe8811c71a577
 DIST fdm-materials-4.2.0.tar.gz 29011 BLAKE2B cd167506070e5609b0e464cb547271008b9f500312e378c9d8a16ae71cdcbde0efbd91bc0149f56ea9d9c9cf97f4a946810c542a4a0d8350344b48393dacc070 SHA512 02981374d4abcbfbcbace5b6b5d5542d4a5cc65ddf3a47569e34ad94284df56fdcc5f674801ee74c12034c502df8e5cca84a077f648f81557067f0044bf7bf9c
 DIST fdm-materials-4.3.0.tar.gz 33208 BLAKE2B 5505a885e03130757134557525e30ecda7091d3238aa5be753065c8bf81dd08914acf22ba85b95f3c78818bf5defedf97ea083d22f1886fc5113d692d70b14e6 SHA512 420accb4ff3eba754e96ceecda4980f121cab22ca3aeefe0781be47cce2ed64cd93df2a2bd974ea611e71ea45a944692e7b27bfbb6f9b0e9dd971e7621e4ff58
+DIST fdm-materials-4.6.1.tar.gz 36321 BLAKE2B bbdc28bf9d05b14f4b0545c4c50c67c31668f97aa9b6fcb8d51c5c958523ebe3307deb07587239df6a73e47c523db6c15f0ea4eb3c2560931a055c784d2b30cc SHA512 784b89acfb2a5bdc6a0e8ce864326ab21f4785887baa215ffcfe472853cc8386d32ed237199df3744c25d12abbef89605445e74b104770f0f3f8363944008c6e
 EBUILD fdm-materials-3.4.1.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a1653c7921649d5f75a7d90d1c22a5441cc614fc664943b4e2b1805d6d2a9e38a48c1ec6de8f029ff3df78ffed6587b SHA512 3ddb73a72ae39f3061c813f367cc5088b11617fde22acb7c77d43977174b4f00b156e1cf923ebe231c3a261e3684e9bbfecdc7bb9f08c08de3398a83b8c7ac44
 EBUILD fdm-materials-3.6.0.ebuild 424 BLAKE2B 86abac9f2f32f709c5e2dde549df6758108d22945a55fff32f4be6c2bf3842c210af686f00a6c403f0ae13611062e300cb4e235d4bd8fd25c0cf281fcda31f7e SHA512 aaaf876fe1c373061e94067ba1c89af62fb4836c44c7115c55d7684f01be6f11653850b94b029fdc56e70fc861eb44325aa946feac81d1ac0f06c3d48d8a7264
 EBUILD fdm-materials-4.2.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
 EBUILD fdm-materials-4.3.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
+EBUILD fdm-materials-4.6.1.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
 MISC metadata.xml 865 BLAKE2B faf20efb80033c67c5b6cacbb3679368e6f7e8a63587aebb6a5e1569a2594620d3b657f14baee3bc39046993a0e285ccd3a02e888bd19bd885735f5a731b16fc SHA512 a083d711722c5896ebe0b9f2f8d5084e3e8fb2456c8b201eb2aae775c2e6a0b8a596a6e37f8b0e2015ed0e5095b05331257f916a77ca4df739af82d9a3802738
diff --git a/media-gfx/fdm-materials/fdm-materials-4.6.1.ebuild b/media-gfx/fdm-materials/fdm-materials-4.6.1.ebuild
new file mode 100644
index 000000000000..db648b1ea936
--- /dev/null
+++ b/media-gfx/fdm-materials/fdm-materials-4.6.1.ebuild
@@ -0,0 +1,18 @@
+# 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 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
new file mode 100644
index 000000000000..888b1c655386
--- /dev/null
+++ b/media-gfx/flameshot/Manifest
@@ -0,0 +1,4 @@
+AUX flameshot-0.6.0-unbundle-qtsingleapplication.patch 1505 BLAKE2B 51b8c59945f580d7777d4f9aeb954196bbd7e473301153053d451e0e07f08abb50a21fb993f940ab6ab40bfbbc6a14e04852d8e6a54e7ce4047ab64feb8cc2b5 SHA512 7543862bdead4f58435be97d09e4045ec1a9e77f90947c55076510da891627e189dc052cbd4ec8947203d5fa2c985220c2cd3fbb6cb9470222b3f5d42c61cf14
+DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad SHA512 194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
+EBUILD flameshot-0.6.0.ebuild 1044 BLAKE2B b54aeb9ea019849b743108c8b8b93b5934488be6e1aeee1d50d6159fef2a6984acec7a98d70fd701f9e29078f16b8ca6218bcd2e5088cfef2a470cc920ca69cc SHA512 c517237fd626e61262772f8b47893302b26d1b0f51d679d9ec656f9f1d02e1e441319e951f79aaccc7816ceb2207e5f270a4019501b44ea47321a41149d86ac4
+MISC metadata.xml 366 BLAKE2B d8c8e83d8fb96199510eb45285312ca146aed73d76fd29ef52cd12cedd3b792621206b8ef064694ee60e12f73b932c6466051c85d0e1e2d8782aa2c00cb0bca4 SHA512 1bf8b212a62d64e14786dcf7ba6f97db414e04655fe0625d5ddc5b86d0e36f0c285f9722cdc1fedd39284e1331b167b947546c37b8a3a5441d59dcdf792a2506
diff --git a/media-gfx/flameshot/files/flameshot-0.6.0-unbundle-qtsingleapplication.patch b/media-gfx/flameshot/files/flameshot-0.6.0-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..7973aa1d06c8
--- /dev/null
+++ b/media-gfx/flameshot/files/flameshot-0.6.0-unbundle-qtsingleapplication.patch
@@ -0,0 +1,47 @@
+diff -ruN a/flameshot.pro b/flameshot.pro
+--- a/flameshot.pro	2020-05-25 21:16:54.044214597 +0300
++++ b/flameshot.pro	2020-05-25 21:25:03.808676488 +0300
+@@ -18,7 +18,7 @@
+     QT  += dbus
+ }
+ 
+-CONFIG += c++11 link_pkgconfig
++CONFIG += c++11 link_pkgconfig qtsingleapplication
+ 
+ #CONFIG += packaging   # Enables "make install" for packaging paths
+ 
+@@ -63,7 +63,6 @@
+ 
+ DEFINES += QT_DEPRECATED_WARNINGS
+ 
+-include(src/third-party/singleapplication/singleapplication.pri)
+ include(src/third-party/Qt-Color-Widgets//color_widgets.pri)
+ 
+ DEFINES += QAPPLICATION_CLASS=QApplication
+diff -ruN a/src/main.cpp b/src/main.cpp
+--- a/src/main.cpp	2020-05-25 21:16:54.055215952 +0300
++++ b/src/main.cpp	2020-05-25 21:25:35.095744395 +0300
+@@ -16,13 +16,13 @@
+ //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ #include "src/core/controller.h"
+-#include "singleapplication.h"
+ #include "src/utils/filenamehandler.h"
+ #include "src/utils/confighandler.h"
+ #include "src/cli/commandlineparser.h"
+ #include "src/utils/systemnotification.h"
+ #include "src/utils/pathinfo.h"
+ #include "src/core/capturerequest.h"
++#include <QtSingleApplication>
+ #include <QApplication>
+ #include <QTranslator>
+ #include <QTextStream>
+@@ -44,7 +44,7 @@
+ 
+     // no arguments, just launch Flameshot
+     if (argc == 1) {
+-        SingleApplication app(argc, argv);
++        QtSingleApplication app(argc, argv);
+ 
+         QTranslator translator;
+         QStringList trPaths = PathInfo::translationsPaths();
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0.ebuild
new file mode 100644
index 000000000000..e3d9daac1c78
--- /dev/null
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg-utils
+
+DESCRIPTION="Powerful yet simple to use screenshot software"
+HOMEPAGE="https://flameshot.js.org"
+SRC_URI="https://github.com/lupoDharkael/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="FreeArt GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtwidgets:5
+	dev-qt/qtsvg:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtdbus:5
+	sys-apps/dbus
+"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
+
+src_prepare() {
+	rm -r src/third-party/singleapplication || die
+	default
+}
+
+src_configure() {
+	eqmake5 "CONFIG+=packaging"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/flameshot/metadata.xml b/media-gfx/flameshot/metadata.xml
new file mode 100644
index 000000000000..49f9e82790bb
--- /dev/null
+++ b/media-gfx/flameshot/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>paul.kalug@gmail.com</email>
+		<name>Pavel Kalugin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/fotowall/Manifest b/media-gfx/fotowall/Manifest
index c75baad5cfb1..a2f3c2a05107 100644
--- a/media-gfx/fotowall/Manifest
+++ b/media-gfx/fotowall/Manifest
@@ -1,4 +1,5 @@
-AUX fotowall-1.0-qt-5.11.patch 585 BLAKE2B a630a7bc8b152eb342e96e94febb980852f4f29dfb4465b5fd7e21ab9eaed08cf0d96fca309e732dec09e3e76a69ffabd98bd376f7bd82ac51fcd1fc0d0471ba SHA512 10c7e9a842b5318dd8e0708f5c876b5494ed273d5509dfcfcb428c0c42c5483d82c3239c1c4cbdd60ee5e6cb5d391079fc684f0c4df992511992d20c02fecdd6
+AUX fotowall-1.0-qt-5.11.patch 581 BLAKE2B ce9ca9c40b3f7723c61359af516b848b9967bc6b6c8acc849f3019dfe31f398abac4fe11c1ddbd43264802545a2bdc6eb964af7d210087229a31aaff907b7410 SHA512 3c9f2e416d1c0ce95ae7dd0da9fab818173289eb39374ac943059e035e6fc608b45eb075088686b658b3a2db309c618deb6298b30c52e26a55a53745a9a37b19
+AUX fotowall-1.0-qt-5.15.patch 698 BLAKE2B f81d762c9cdb6c9513ac2c9fa30e444aef099ed9001dbdb6054fa342c7700d13f01294666047e3e3f751d9258082f8c420ae29562585d89cc2b3c3b5c5b35e8a SHA512 f630d182a9e255b65e7190c0cba4fb6b9dc910a335b25353cdc17092998af358bc5cb0afef54a27058fbc9fdc50c0c356354222c03917f0cf7497e1ff9d8a504
 DIST fotowall-1.0.tar.gz 1672398 BLAKE2B 8665f30b11c2fe1e6661e7655dd4de35c3b8bc1d29926d9155958ce5e8875f16281b150e710e4b94e82279e86c510c9933389df32d3255416b6ccdd53fd9c656 SHA512 ae2d887affd28d21b9caabbb3508d8ebd64058d81f84d3b3d67a205341a9cf5b528ca3a02793a4927e2e6b3ddfd73e7698c3df4bad3a7bb4d37fc9fbb226c94c
-EBUILD fotowall-1.0.ebuild 1039 BLAKE2B 2394a70ad4bf910e6551972a8f17e584931f62c1004dac270951f1715a61a013e66a0d126308eb7985abbe0fa88f8b892a15724bad51f56bc7c0492629e40ff8 SHA512 b1300687fb639ba2f6b2549016967a5f01d609a2d70294df29beb47d4880a3a13e78d7d0d3c409b17cb1001ccb010df701cddd95140567d09db3c93deed52f7f
+EBUILD fotowall-1.0.ebuild 1078 BLAKE2B 18c3c9f6b35a1cdb04c4a565727622a4a813fc99f0a8ead47b6f90e2aabd83f42c2381abd8c4598c3a8e9052d3c29003d0a519827b5dec3ff39f3fb6776fd0cd SHA512 8baa918219763e1e1c9f20938425fbadff618743ca018d690f54850a7b112edd3ed9ecee02ab2709a8f0c7f9fe5ea997655e77a6af46645c368a96913212e479
 MISC metadata.xml 396 BLAKE2B 0f50c7426ba992e6bf94bbc42cf99ea9f0daf7f4791d46cfea0ad57754692fa9e5d8462984a6357f4897e99b73553c248a1fa2f8048cccdc19083bce2d36c661 SHA512 538a67809974677e2c8f51b7ae7999047fffac2fa25677f0af5590afc061b5bd76f9908718bf8f66a6f9d4eaad4e4d2fa2e12837f5e15750035e879d79f93f59
diff --git a/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch b/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch
index db619771b476..b3ce481cbf49 100644
--- a/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch
+++ b/media-gfx/fotowall/files/fotowall-1.0-qt-5.11.patch
@@ -2,7 +2,7 @@ Fix build with Qt 5.11.
 
 Bug: https://bugs.gentoo.org/661596
 
---- a/App/tmp/CanvasAppliance.h
+--- a/App/CanvasAppliance.h
 +++ b/App/CanvasAppliance.h
 @@ -17,6 +17,9 @@
  
diff --git a/media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch b/media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch
new file mode 100644
index 000000000000..12f0e988ee23
--- /dev/null
+++ b/media-gfx/fotowall/files/fotowall-1.0-qt-5.15.patch
@@ -0,0 +1,24 @@
+From 72f7a502cb2397b0ef459e6e8f429db1d3482be6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 21 May 2020 02:33:38 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+---
+ 3rdparty/posterazor/paintcanvas.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/3rdparty/posterazor/paintcanvas.cpp b/3rdparty/posterazor/paintcanvas.cpp
+index df33b8a..fd0f319 100644
+--- a/3rdparty/posterazor/paintcanvas.cpp
++++ b/3rdparty/posterazor/paintcanvas.cpp
+@@ -23,6 +23,7 @@
+ #include "paintcanvas.h"
+ #include <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ PaintCanvas::PaintCanvas(QWidget *parent)
+     : QWidget(parent)
+-- 
+2.26.2
+
diff --git a/media-gfx/fotowall/fotowall-1.0.ebuild b/media-gfx/fotowall/fotowall-1.0.ebuild
index 660c5442ca6f..2433ced68ec4 100644
--- a/media-gfx/fotowall/fotowall-1.0.ebuild
+++ b/media-gfx/fotowall/fotowall-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
@@ -28,11 +28,14 @@ DEPEND="${RDEPEND}
 	webcam? ( media-libs/libv4l )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch"
+)
+
 src_prepare() {
 	default
 
-	eapply "${FILESDIR}/${P}-qt-5.11.patch"
-
 	sed -i -e "s|linux/videodev.h|libv4l1-videodev.h|" \
 		3rdparty/videocapture/VideoDevice.h || die
 
diff --git a/media-gfx/fr0st/Manifest b/media-gfx/fr0st/Manifest
index 44aeaf592515..ccbcec58e676 100644
--- a/media-gfx/fr0st/Manifest
+++ b/media-gfx/fr0st/Manifest
@@ -1,4 +1,4 @@
 AUX fr0st-1.4-colour.patch 342 BLAKE2B 78ea214d35a1a47eb51d40c8bec3173e8515db69926ee89616703afa832101a5ecba124aac85239c093ea1912ac9298edb6e866a63bef8678985f71b4151b286 SHA512 f3f6fe3af3dca4f709b7fcbd9b8f6c2b089c5cd7b1188a874b16d13eac9f3aae959ed5065a6ecf92ee47080ce25759c8180b86d1c9bd0f85e655217b7bd2f4b7
 DIST fr0st-1.4-src.tgz 1535978 BLAKE2B 1d1700665f6747d0665594e255d8604b1fad576aae21b73a435aa95174ef199bce0fe6d436ee3f5072fe5474657995533675bf7c9b16e6787523b1db4bb189d6 SHA512 d4ececca724bef264097466328e98699efbf82d999107a1ed8b21b938fd5025b888197f021ac56c7fb008226f0230bd058cb94efec61bb59d67f2263d3140ec5
-EBUILD fr0st-1.4-r2.ebuild 1166 BLAKE2B 897d4b4b1984c08fcf5354b96d73334b8d2b84f410e7bc91707790dd233e21a6ebf00d1380977098cb50056b6e9164653e1e9af549bbc1693af8fb7f5d8d08cb SHA512 31a16cb6e838611ff30bdbdcfa7006d102192725483b00a766813e9ce3f441e1a16d6fd596521f5e0337ebed22abc99dd34824aa03f5d2f569d49cd2e761ee3a
+EBUILD fr0st-1.4-r2.ebuild 1164 BLAKE2B 830cbae5976bb8f9d5b01f4982c9c18f4699ebabc10f41c95fe12e220cfa5a6e8bdb54fd9e1e842fdec2a6c6852899b74e9da7f3a60232648ac7c8643c09b976 SHA512 9e9322bcb75dbf53c78990826418fb4a9fb5c5552f208b0d4053311dde46b5762aae407419adfb19dad3381642ffc32b4371dc84524f3ec6b84171df0022a3b4
 MISC metadata.xml 332 BLAKE2B f3bee4c98bb888697eed1c7cfbacd104938ac1ecca79c31d2c3afb8853bf8e7c61dc6a97a875994e3f5ff6a58eb4a2078fb884ddda4f3c48c1416eae17e26e61 SHA512 9d0d54e496ce20b092cbc4080e326cfc3ccbb9d9f6a5ac2c40a12a3647c702fa018832bb701947819bc09d2704e397ebd391fc74d2010033da379ca18964d4ec
diff --git a/media-gfx/fr0st/fr0st-1.4-r2.ebuild b/media-gfx/fr0st/fr0st-1.4-r2.ebuild
index 15677c3b0257..2e138ef92e15 100644
--- a/media-gfx/fr0st/fr0st-1.4-r2.ebuild
+++ b/media-gfx/fr0st/fr0st-1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils multilib python-single-r1 wxwidgets
 
 DESCRIPTION="A fractal flame editor"
-HOMEPAGE="http://fr0st.wordpress.com/"
+HOMEPAGE="https://fr0st.wordpress.com/"
 SRC_URI="https://launchpad.net/${PN}/trunk/${PV}.0/+download/${P}-src.tgz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index d046674c61be..b325b86ea5ee 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -14,8 +14,8 @@ DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b
 DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.10.14-r1.ebuild 6134 BLAKE2B db5b6dc954866203d1aafe9e2050e1fdebf5008a191854f24f1507db881083a6cf67e6d9f8a6f6112958207d3c75e9537b7c51c8d2492e8961147f6981b245a3 SHA512 3342bb7e935077ed7ac83ac9109e873029d0b572f34a4787787aca14d73fe71b5f5ac92648ae0a2d20f06bf6a9e30a8d29823a881312852cb0981740087b935d
-EBUILD gimp-2.10.18-r1.ebuild 6152 BLAKE2B 13050ac978da7b8b99e408bd8a8fcb6aa6d725d665817e5c72953f809468007cfbdd87aa6aae852dc0ead9aa4c7cb475a43816f3892686bf38b9cb8dedd565fd SHA512 f0bd4b1790c3fede528bb25bd39f5bd4ec8080155ec510c82a1f6da1a3af39000f692effae0d3408cffa3a7933e24535d95303a1a41afc67ee2fc76570195a11
+EBUILD gimp-2.10.14-r1.ebuild 6140 BLAKE2B df34bd1bc35873d51aaec12fba454170ce08b2b10f183d00eb56adba4cc40f56877481831b319c11fa8cbbe6fe17929c60341c918610c20fca2355607b876c22 SHA512 3f86c2237be7978066780679326395666d96bd22d4e389aac60f2a0989939e809ad51f2f12018b5a4fbd7d1bbe1469b034c74c86e4321ae6fb8f8caacca9a7b1
+EBUILD gimp-2.10.18-r1.ebuild 6157 BLAKE2B d877545e911f0d707447d885bb83b83dd1bd37cb3db79ee3afd23c52949d91e321ca748f7e632146b5b56264589f633a235b9b4fd9cea3783d29d2c6b5a2d503 SHA512 564dd35735219c97cb9b8caba0aa1aaf782231a6a1cc578596e06c5972bbaacbb0599bce9d8b1cb03ca95403db36bc3caa40cb934c957b2dd399b6d394857448
 EBUILD gimp-2.8.22-r2.ebuild 5139 BLAKE2B 7e659b356107042884fddaff1622c20f1b1d627840556cdba0293fc80c43832fe02883d65ef6b338847b80d0cc041d95f6cce02ea230d071aa5545d89f55e8f8 SHA512 5b32326f52e21dd544c1f92e0f51612fb8a662ac6fa0addce482d3a3e1e9516a55b0c6a9e679407afee94b77c60a0224719ff37cd5aabcc7936a949629d4f189
 EBUILD gimp-2.9.8-r1.ebuild 6068 BLAKE2B 86c853189f8a7aa5e6247d1f973337e3149ea44e13f4adc022b2e6f15eb51ecd4473e862721fd3ee841f5f36108230b2444039e5cb21898c274c97506a285800 SHA512 da7b01a4dafbd9d991ce050b3c8c5d1ce6b1f2d9cc8c4bde6463d5ebfcba2a8399c1f8f61062f1fb564c530acfea5036b6f8d5c3b4b1a291cd575a00df9deb28
 EBUILD gimp-9999.ebuild 6188 BLAKE2B 34635a209811691a453e984a089faf958ac048ddf63adb17b93a22807924021ef134281b824d378e6d57a5ce88b747e6c2a6150d55b04806b14acc592e83a815 SHA512 ed5727af778d9acc7b1c3b2851c4d25329bc706d2054ecbb61e960c2e45b6fc0ea35e4aeddd97c4c1d8a1b0b71598be3ea65b401a0a3345c83ae67ca59a800db
diff --git a/media-gfx/gimp/gimp-2.10.14-r1.ebuild b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
index 588d8b972367..ca8f53ba5a95 100644
--- a/media-gfx/gimp/gimp-2.10.14-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="amd64 arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc64 x86"
 
 IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/gimp/gimp-2.10.18-r1.ebuild b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
index c9a15dfe4dd4..0b0909f7b22d 100644
--- a/media-gfx/gimp/gimp-2.10.18-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 arm64 ~ia64 ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 ~x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 2fafd5651b22..2bcff2a8f481 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -2,5 +2,5 @@ AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3b
 DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
 DIST graphite2-1.3.14.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
 EBUILD graphite2-1.3.13.ebuild 2661 BLAKE2B 22cde90b2406128eef2cb8401471410a0b5a620cffc76f93b30125763aac3012b03f93609a91390190bf21c97dba466d78ac2814f724e5065d28dc817ebe09a6 SHA512 64e799506bc2f08692d377660eb36f09266c6b4f098f8189754a1e844c7ad965fd208a4160552b0850ab6295c6df95b67832ec77be3453acf00a977fd88a4ec3
-EBUILD graphite2-1.3.14.ebuild 2672 BLAKE2B da481afa0cd562a309142dacfedf1a499622e3ed62b1c2e2956da81997b791da67ba0faa4cddc7528e50f95ec124a6899836de2ba9c11eb3428c2f6697c520f0 SHA512 0703a149ac36c3e0987e04912e52c992d559c6b7b72905516bac83a0507db68bb28f0884e95fe2089a140568b053786253c46f726f21e7a15b0d4628ba60d6b0
+EBUILD graphite2-1.3.14.ebuild 2668 BLAKE2B 3b6c68c52dd9b96906bdc8431841b3225484cc4e55ff37515ecf787a8c739faa775fe22109daa3797fbebcff69ba0760d9d1681c118626a825d165a1b1e5f74e SHA512 8fdcb533e80196dbb22628c962821afa7e29ccec8927ac72f54fecb489d77d56c538f4eda2038e66acbd30589da7729afcd8491a57735e1ac1c0a7a83d7d4637
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.14.ebuild b/media-gfx/graphite2/graphite2-1.3.14.ebuild
index 89ce22d2c571..6c4aeeac8686 100644
--- a/media-gfx/graphite2/graphite2-1.3.14.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 781e2f45ddad..7934394baf36 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,4 +1,6 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
+DIST graphviz-2.44.0.tar.gz 32903746 BLAKE2B 05def6b50366900fe84b8d72b802461d33624444f00d1c648801da81708dcdf7dc601f95561d8f7dc8e745eef61326cb9a234a0db1bc45c8a7d7d46e552c373b SHA512 9fd54a5c7b0d8cf3e1bf7e80409b57022182b6bfe3f57a06a219d6d29684962ac935fc76d1e7420ba88b1ffc2ab5b967cc4617e56f810818f99801d31981a752
 EBUILD graphviz-2.42.3.ebuild 7798 BLAKE2B 79de7e36c68de4af5d34874b2ede59919b79a8a18c5044043640d87e48dc1d848b9b29ae48a4b0daa66b4a0a8e9f3f054e80d256d9988c0d4b21d975620f2642 SHA512 7946ea0e9866689cc6604612fe2f7eacc454d336366925599d0742fa73c0da5cca6235ab18187bfe4018891b795eca442bd8a9412be1611a1ee15e9ecc408bad
+EBUILD graphviz-2.44.0.ebuild 7805 BLAKE2B a31064d464e96e6fd312740a32094547ffe7d84e5081546f5d981707ae26240d81060b927e504a5876a0760213194b3283514a1eaedfc6681e5b6c0f089a291d SHA512 7d21d12a1fb81d2366d613c4a84054e163a43a0c6d08a6490e598443b4f4dbf6aab091673ca311f4f0bc97d2d4f382dccfa918cd76ef3dd3ae182189e6eaa4e7
 MISC metadata.xml 2304 BLAKE2B 702643020c9a91f60460e6f6f63cb5ba6389b4307a454a47b24daba75e2ae104e8e93f3d4913a6007749a1d0e70157608b03b9b7d29ae422685e82aaabc3bfc4 SHA512 bc27ff36b8aaf76c265878095f74319314534bc28589b79e0bf4f3fed27ed965e172c1a8279a58f570b799961abb9c87281c3242dda950e936223999fa150e03
diff --git a/media-gfx/graphviz/graphviz-2.44.0.ebuild b/media-gfx/graphviz/graphviz-2.44.0.ebuild
new file mode 100644
index 000000000000..cc960e3dcb41
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.44.0.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
+SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
+
+REQUIRED_USE="
+	!cairo? ( !X !gtk !postscript !lasi )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh, tests against installed package, missing files and directory
+RESTRICT="test"
+
+BDEPEND="
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.14.5 )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )
+"
+RDEPEND="
+	>=dev-libs/expat-2
+	>=dev-libs/glib-2.11.1:2
+	dev-libs/libltdl:0
+	>=media-libs/fontconfig-2.3.95
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
+	>=media-libs/libpng-1.2:0=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libiconv
+	cairo? (
+		>=x11-libs/cairo-1.1.10[svg]
+		>=x11-libs/pango-1.12
+	)
+	devil? ( media-libs/devil[png,jpeg] )
+	gtk? ( x11-libs/gtk+:2 )
+	gts? ( sci-libs/gts )
+	lasi? ( media-libs/lasi )
+	pdf? ( app-text/poppler )
+	perl? ( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	ruby? ( dev-lang/ruby:* )
+	svg? ( gnome-base/librsvg )
+	tcl? ( >=dev-lang/tcl-8.3:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}
+	guile? (
+		dev-lang/swig
+		dev-scheme/guile
+	)
+	java? (
+		dev-lang/swig
+		>=virtual/jdk-1.5
+	)
+"
+
+# Dependency description / Maintainer-Info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+#   the ones which are always compiled in, depend on zlib, gd
+# - gtk
+#   Directly depends on gtk-2.
+#   needs 'pangocairo' enabled in graphviz configuration
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Disabled, GTK-1 junk.
+# - glitz
+#   Disabled, no particular reason
+#   needs 'pangocairo' enabled in graphviz configuration
+# - ming
+#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+#   incomplete.
+# - cairo/pango:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support (??? unsure),
+#   needs libXaw for UI
+#   UI also links directly against libX11, libXmu, and libXt
+#   and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer broken on ~x86
+# - go (disabled)
+# - io (disabled)
+# - java (enabled via java) *2
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
+#   sci-libs/gts can be used for some of these
+# - lefty:
+#   needs Xaw and X to build
+# - gvedit (via 'qt5'):
+#   based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+#   currently disabled -- it segfaults a lot
+#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
+#   with flags enabled at configure time
+
+PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# ToDo: Do the same thing for examples and/or
+	#       write a patch for a configuration-option
+	#       and send it to upstream
+	# note - the longer sed expression removes multi-line assignments that are extended via '\'
+	if ! use doc ; then
+		find . -iname Makefile.am \
+			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
+				-e '/^\(html\|pdf\)_DATA/d' || die
+	fi
+
+	# This is an old version of libtool
+	# use the ./configure option to exclude its use, and
+	# delete the dir since we don't need to eautoreconf it
+	rm -r libltdl || die
+
+	# Nuke the dead symlinks for the bindings
+	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
+
+	# replace the whitespace with tabs
+	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
+
+	# use correct version of qmake. bug #567236
+	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die
+
+	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
+	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
+
+	use java && append-cppflags $(java-pkg_get-jni-cflags)
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--enable-ltdl
+		$(use_with cairo pangocairo)
+		$(use_with devil)
+		$(use_enable gdk-pixbuf)
+		$(use_with gtk)
+		$(use_with gts)
+		$(use_with qt5 qt)
+		$(use_with lasi)
+		$(use_with pdf poppler)
+		$(use_with postscript ghostscript)
+		$(use_enable static-libs static)
+		$(use_with svg rsvg)
+		$(use_with X x)
+		$(use_with X xaw)
+		$(use_with X lefty)
+		--with-digcola
+		--with-fontconfig
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		--without-ming
+		# new/experimental features, to be tested, disable for now
+		--with-cgraph
+		--without-glitz
+		--without-ipsepcola
+		--without-smyrna
+		--without-visio
+		# Bindings:
+		$(use_enable guile)
+		$(use_enable java)
+		$(use_enable perl)
+		$(use_enable python python2)
+		$(use_enable python python3)
+		$(use_enable ruby)
+		$(use_enable tcl)
+		--disable-go
+		--disable-io
+		--disable-lua
+		--disable-ocaml
+		--disable-php
+		--disable-python
+		--disable-r
+		--disable-sharp
+		# libtool file collision, bug #276609
+		--without-included-ltdl
+		--disable-ltdl-install
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
+
+	emake DESTDIR="${D}" \
+		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
+		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
+		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
+		install
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/graphviz/demo || die
+	fi
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	einstalldocs
+
+	use python && python_optimize \
+		"${D}$(python_get_sitedir)" \
+		"${D}/usr/$(get_libdir)/graphviz/python2" \
+		"${D}/usr/$(get_libdir)/graphviz/python3"
+}
+
+pkg_postinst() {
+	# This actually works if --enable-ltdl is passed
+	# to configure
+	dot -c || die
+}
+
+pkg_postrm() {
+	# Remove cruft, bug #547344
+	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
+}
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index b672d17dd97a..7415f05fa64d 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.6.5.tar.xz 462400 BLAKE2B 3098656dd4060e480d90558f4bde3b806e31de7e17bc7fa208469d338a41a7e9fb3fbb2d12828c69e0ea745ea6945d015c35bc0d76b00a0377881aff616fba54 SHA512 5e0bfd358daaf340092a54750df791460e3e234ffd144351232e23dad40b6602d45a54e24b61eb54a11c7b8fc7eb7ca192764f67d323f86799d48096483b09d6
 DIST gscan2pdf-2.6.7.tar.xz 466260 BLAKE2B 311e21c6d024527eb8c281ff3dd99b1abea61d91c7fad88ce22d7e436144a39999c8db89ba1321ebc1d3949f09814ebdfda1b414b5453cb9faca0635cd804d75 SHA512 926df3434cebb8978ff4714b265b4ceff77c177653855c9416a87084ff6601a84a8e536d799f9efa9645336f49ef2c133672863da364145c5a785b43fd5c7c72
+DIST gscan2pdf-2.7.0.tar.xz 468752 BLAKE2B d8f41842c16ff54fff180d2ecaab3fb09c4b7c4d2eac8ba4b6cd2703cca4538844389af8151eaeac030f5962df7ce9192e60c0515f78d2d8aa9aa0ec2973fb97 SHA512 7878d7e77cf107315301bf7adb29c178f4c35c1986780843dfc1742870b8a9bc6cd7a1a0d06f1c37585e6c2050e75222c8af2359b5a7c194f308ba32b5c64f06
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
-EBUILD gscan2pdf-2.6.5.ebuild 2421 BLAKE2B 0fa711b09f01a9ac476fc921ab6365a785ce4c027f3068a63618d6c7f9a76fb908336e3061fb978a9d76535d60184f475dcc37d5865b1925565ba96d4e7494ac SHA512 cc0d0790aa2dcb1b9faef6ecdee6f14ab0a4f89a0c91099a254695884447dbdc072ba31841aa0d3276ba4e7a43473bf68cfaac2b885e6acd80e1cffb2a146873
 EBUILD gscan2pdf-2.6.7.ebuild 2421 BLAKE2B 0fa711b09f01a9ac476fc921ab6365a785ce4c027f3068a63618d6c7f9a76fb908336e3061fb978a9d76535d60184f475dcc37d5865b1925565ba96d4e7494ac SHA512 cc0d0790aa2dcb1b9faef6ecdee6f14ab0a4f89a0c91099a254695884447dbdc072ba31841aa0d3276ba4e7a43473bf68cfaac2b885e6acd80e1cffb2a146873
+EBUILD gscan2pdf-2.7.0.ebuild 2421 BLAKE2B 0fa711b09f01a9ac476fc921ab6365a785ce4c027f3068a63618d6c7f9a76fb908336e3061fb978a9d76535d60184f475dcc37d5865b1925565ba96d4e7494ac SHA512 cc0d0790aa2dcb1b9faef6ecdee6f14ab0a4f89a0c91099a254695884447dbdc072ba31841aa0d3276ba4e7a43473bf68cfaac2b885e6acd80e1cffb2a146873
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.6.5.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild
index cda89719399f..cda89719399f 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.6.5.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 2515c1bb0930..ddbcf2c385b5 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,7 +1,4 @@
-AUX hugin-2019.0.0-exiv2-0.27.1.patch 998 BLAKE2B fd072b1bfb995f3e63ca78b0ad288c6012e6256d8c268fde7b9d3e1fb346544d34807394ac45b244329d96d6e75347c7e06b8cffa44258dd9b59378f56ead112 SHA512 9127921810b9a3cbc7aa216cb961cf5d8eef04ab5beb6baef94851d25e32314dd0565e507e3e57d2d560b6079afcf54e16330935334835fe664842d337732643
-DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
-EBUILD hugin-2019.0.0.ebuild 2209 BLAKE2B 9206caa49b018f46613c673c26ebd555e6750e640aabff5753dd61a9c744d1718d6a05ab8298cb6d259e11e989d74c5a6224d1c77ea699448a377b9f839fbc10 SHA512 921e1aa1514125756ccba0ac9896978677ea4a1e5672c68eedd671bbd4e28e84f046c39ebddbe7f8489e32d93c9e4a637f8c9a9810ab8269913e4c60f83c0b8c
 EBUILD hugin-2019.2.0.ebuild 2185 BLAKE2B 25b087eccf301e5540e6e897161e7c1ccbe907a26b22feefd31a40357602c5f9c61f41e41b033958d0df171c2df04c4e49ee4061f9d0e5db002f2f8ed46c1edf SHA512 89c7d596a4fef47dc3d144ae30a4cce0745391b05760108d6755717413a76bc6bf5d790ec50b0af01a88ced13ce1467d4cc311a24c877c9584df14ad712545b0
 EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7
 MISC metadata.xml 445 BLAKE2B ac876779272c1b22b648f4231a766d738bedf3b8a5a195fed926e6976531bc4653181a992bdcfaeaa6bdd9c79c21971025f207681490870209852d561aeeae78 SHA512 f2684887481f43030dbe01cf4df354511e4b294d53d7f7fbb9627cdddeb29709d806c6017f2c32557e4e6e288615ab2430fe7d102ea30072e1ea733d60177945
diff --git a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
deleted file mode 100644
index e22023f3998e..000000000000
--- a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix build against exiv2-0.27.1 by using upstream recommended catchall header.
-
---- a/src/hugin_base/panodata/SrcPanoImage.cpp	2019-02-16 09:18:55.000000000 +0100
-+++ b/src/hugin_base/panodata/SrcPanoImage.cpp	2019-05-21 14:26:23.470193305 +0200
-@@ -40,9 +40,7 @@
- #include <vigra/diff2d.hxx>
- #include <vigra/imageinfo.hxx>
- #include <hugin_utils/utils.h>
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <lensdb/LensDB.h>
- #include "Exiv2Helper.h"
- 
---- a/src/hugin1/hugin/RawImport.cpp	2019-02-02 11:11:01.000000000 +0100
-+++ b/src/hugin1/hugin/RawImport.cpp	2019-05-21 14:33:00.522541182 +0200
-@@ -35,10 +35,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
--#include <exiv2/xmpsidecar.hpp>
-+#include <exiv2/exiv2.hpp>
- #ifdef __WXMSW__
- #include <wx/msw/registry.h>
- #endif
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
deleted file mode 100644
index 1217aa9474d5..000000000000
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
-IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	dev-db/sqlite:3
-	dev-libs/boost:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2:=
-	media-libs/freeglut
-	media-libs/glew:=
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	media-libs/openexr:=
-	media-libs/tiff:0
-	>=media-libs/vigra-1.11.0[openexr]
-	sci-libs/fftw:3.0=
-	sci-libs/flann
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/wxGTK:3.0=[X,opengl]
-	lapack? ( virtual/blas virtual/lapack )
-	python? ( ${PYTHON_DEPS} )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
-	media-libs/exiftool
-	raw? ( media-gfx/dcraw )"
-DEPEND="${CDEPEND}
-	dev-cpp/tclap
-	sys-devel/gettext
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 686366
-
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_prepare() {
-	sed -i \
-		-e "/COMMAND.*GZIP/d" \
-		-e "s/\.gz//g" \
-		"${S}"/doc/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HSI=$(usex python)
-		-DENABLE_LAPACK=$(usex lapack)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-
-	local lang
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			ca-valencia) dir=ca_ES@valencia;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang/-/_};;
-		esac
-		if ! use l10n_${lang} ; then
-			rm -r "${ED%/}"/usr/share/locale/${dir} || die
-		fi
-	done
-}
diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest
index afdfbfa80507..767d00d5eaca 100644
--- a/media-gfx/igal/Manifest
+++ b/media-gfx/igal/Manifest
@@ -1,3 +1,3 @@
 DIST igal2-2.0.tar.gz 27206 BLAKE2B 64683d32d0fc3c16d4e27f6dcd1acb3d1e1b55de8e4362065bda9b9b27e6d54409e115af46da2505dfe79f00e5004ebfb395dc4fe71d91b557c43a0c4d4f01e1 SHA512 663bc4f05fbb226c55c3304126ceb480f050715499a2849567ad1d33da568ed02f85b64ad176f6e1cb1c99c8f50650676a7323f0d0497880802a245274a77a0f
-EBUILD igal-2.0-r1.ebuild 871 BLAKE2B 873d17abc0195bbf64d35fcb5005c0e69d81cf8297825c32faf1aaf82f35f538c7f17d8da6a94f04b2fcc01d1106a235653ee81193d40ef3a5cc0b8f3cfecb8c SHA512 ebae0b89b254d6c3da1b399548d964613860a97efcb4cc67bece38ec205ff1522c6eafcb94996aa3500f7aacb2e7e2c7430bc75e5bc797dcce1dc0873dae08d2
+EBUILD igal-2.0-r1.ebuild 873 BLAKE2B 044dbb37ce303cd88754f29c59f22dbff42d528f84df0d6dd7b3593092f4f86ea87ca90bc3e03e5c882069783eb3b12b4c9f017179f7c1b1582b7084bb624299 SHA512 00d0181d625e5d801c7e4da3fdcad6adbf2599a937586dcdc38f8a0da3f4e9abea462fa96961e96d6089e0cd5c982c20cca90d92f5504c897d762cf8c2eb1f20
 MISC metadata.xml 515 BLAKE2B df57e086f1c3f791956327fcc23a384d29d8c0887abea8b9562e5dde6f041bc68d77f787120d2e20974be17c17d129a0e54078cc774a79934423c573e13b6955 SHA512 379299c58fe3018ce51c1e54302dafcc9c258661368101503c1995d7bd0a435175ffe32ff3e7ac6087fa1fb39f4d6e9623acb4ee3acd73a333c95375cb3de072
diff --git a/media-gfx/igal/igal-2.0-r1.ebuild b/media-gfx/igal/igal-2.0-r1.ebuild
index 4110b52fc42b..233dd6c64dce 100644
--- a/media-gfx/igal/igal-2.0-r1.ebuild
+++ b/media-gfx/igal/igal-2.0-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 MY_P=${PN}2-${PV}
 
 DESCRIPTION="Static HTML image gallery generator"
-HOMEPAGE="http://igal.trexler.at"
-SRC_URI="http://${PN}.trexler.at/${MY_P}.tar.gz"
+HOMEPAGE="https://igal.trexler.at"
+SRC_URI="https://${PN}.trexler.at/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index e5d37bcc59bc..fa27e6223b7c 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-7.tar.xz 9075300 BLAKE2B 669c9c4212afd7a8b6c336378b248607991156807522e0c53920bf846f87168deeba12e282a60e977d1056a32eb06302d8b2422d4982060e88048ae79ae8ad3a SHA512 7eb169679846ae18cc16fbf66d3e5903f4ad38373a4e24c1219fab7a5fe323afd60bd1c540c75931c069116ea8367a89d25c68283276dbfeda67cc4d601b2888
 DIST ImageMagick-6.9.11-9.tar.xz 9069640 BLAKE2B ab39f4723e4bc843a504ce29a840d24a0497d00ebaaf8a10589813d7bf13f5ef3774e9989dd38d667e1a9ad3dbc5357ca4a53533b5ef338781409c0b3bdde01a SHA512 8f8e6cdbbc4ff367304d29d3098dc208ac17e8037e31426e5e24d918ab13a292660e2944cb830fa814f297b69f8b2d693ac33b94f5ee4b8406cf52605ee00586
-DIST ImageMagick-7.0.10-7.tar.xz 9685636 BLAKE2B 20dd94a034038d420906779e78c35c3c7c73370ee7ee29833f63833e8923fb52416a4e4f1a5700795b6722c29dc3b060a3dc1708e267815e86e9e9756200e074 SHA512 020adb329bcc50af52e590b33edc2caf5c0f7b15eacaabd18e5dc9b755314b8238c0b869420662b2b70c406453cf125ed10d2cf0ac94d309c05dfcd7e5820b26
 DIST ImageMagick-7.0.10-9.tar.xz 9681168 BLAKE2B 0a26df054f6799dcc0cc576dc3d3e30689d3311ce658b220f4575d6ddf31063e8e9b1de57d5065171480dad5ae4f3a0bdde0d5ef7a5a7cdd267f2e76a210f30c SHA512 db19b39c41e3401ce454016a14c83d1188d38d7e4a31848c29344bd86ef14d4250208bcfb4b9e519f7d2d193a61724d980ce39e9d6e2388c872281e9383e2f54
-EBUILD imagemagick-6.9.11.7.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
-EBUILD imagemagick-6.9.11.9.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
-EBUILD imagemagick-7.0.10.7-r1.ebuild 7324 BLAKE2B 1d67b3846e05b04487a5e9f154de9d8d19afb024fc11d8c117ed4d2bdba8124414dc348b93c3c012ec6884a03e77e8e2f06bc90c448767998ff38486a92dd179 SHA512 a5df77b164a1c6ac1c6867d39afea790c3f69ff021a312abeb5d6476316d2e78caf1081235242559af1297fdb14a4add48514dd3bf611778123026fd7bc2e8bc
-EBUILD imagemagick-7.0.10.9.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
+EBUILD imagemagick-6.9.11.9.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
+EBUILD imagemagick-7.0.10.9.ebuild 7324 BLAKE2B 1d67b3846e05b04487a5e9f154de9d8d19afb024fc11d8c117ed4d2bdba8124414dc348b93c3c012ec6884a03e77e8e2f06bc90c448767998ff38486a92dd179 SHA512 a5df77b164a1c6ac1c6867d39afea790c3f69ff021a312abeb5d6476316d2e78caf1081235242559af1297fdb14a4add48514dd3bf611778123026fd7bc2e8bc
 EBUILD imagemagick-9999.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
 MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild
deleted file mode 100644
index f37a0010b4c8..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2020 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"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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="perl? ( userpriv )
-	!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
-	rm "${ED}"/usr/$(get_libdir)/*.la || 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/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.9.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
index 02b0c9655fe7..f37a0010b4c8 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild
deleted file mode 100644
index 386e11f90ca1..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2020 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
-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 )
-	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
-	rm "${ED}"/usr/$(get_libdir)/*.la || 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/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.9.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
index 4d2561accf79..386e11f90ca1 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.9.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 7c85d6ae44e0..940d6b363f7c 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -7,12 +7,12 @@ AUX iscan-2.30.3.1-fix-x86-unknown-types.patch 362 BLAKE2B c791249488661dbe3fcf3
 AUX iscan-2.30.4.2-sscanf.patch 779 BLAKE2B 8e8255c0558e225b3c1bcb5faaf42f0d794177e463119595b53fd0e194b7918703d3b9ac3c8d8fa1939cc86799deda4605764f99b2aa666f3c2047ed21333f31 SHA512 345ac7ae1c75b6da24f16f9abd5f7f4352cfd3497d24229db8a15d26d767e62c8273220a7f40f18c452ab90094b56774eaf738c880c613f0463db04b6d5d9f3d
 AUX iscan-3.61.0-ijg-libjpeg.patch 1145 BLAKE2B 781c0c9a40848f9c10ddb3418c55b6c4a145f1590c5ec41e22e371830d3d7d63c4e013d8fa69a1f15f24d4883d569c0645df66b3c6120eb724f3a1f9643e3813 SHA512 b570bc0e6aa73f74750aaab4d3ca84838864c8723b14fbf5a45fe9163be3e7819035a12bd058587a4b4964325ba4af99673e78647b11d2a7b1bcf96039522191
 AUX iscan-3.61.0-imagemagick-7.patch 1965 BLAKE2B 14685cc9540ccfda87587b5ff2df7b8c4755dd08bb428f33ce853c32baaf6ab7e6b2d3368df9153fa5f5b39d9ef17b8e468ea59530ac89098107542db2638f05 SHA512 d5545570865370229f2b132aef7131cbbfabd7e929795bee6ce1e0d791c2c623eefabdd0ec265c6cadcc41072049d61e07d5fca46a1f51c621323a38112dc316
-AUX iscan-3.62.0-boost-1.73.patch 991 BLAKE2B 0fda795d633dc7fadca96ce8eeb728f47f416a84a5f69d1011d2d53552f123ae29ee83c877ac03facce59041680ccc9dedaed0b1771dd182a59881f7d1f4cbaa SHA512 a68a82e68dc72c1ee746ee46d76602151f33ba6dc2be5209d6b321b62b7a31b8f573b975ae756903a37abbaf4cdb61628a802110e1e641e088016f20130f3404
+AUX iscan-3.62.0-boost-1.73.patch 1315 BLAKE2B 801f6f9e2f91b4a442b673a2cd9630519ea10e08131877eb09ac52bc190316bfdc98fa1ae572ac2122bd9999a10af421d808762b0d7ca07b249d94428acbfb01 SHA512 183cd4e12451dd66ae096cccdc4ea9fdb4264935894a4442aa094e42ca539ad3f9fec6b01aaac3f20263a3425956808a342de886465b6e9700a7c449c031431f
 AUX iscan-3.62.0-gcc-10.patch 503 BLAKE2B 53a351f439f43003e668cad1b8f05231b58137dd4e4a88ea3b04aa326f8ae82d46e664d19a5fba89122c6959e9aeb33beab56a43128c73b483d99c9ec25bf835 SHA512 b32438d590419a8be3c7f28a545ed4dedab0a6f0bcd0c9f3a81def67164c4156dd52064d8d8ca93cf2550b2184de12c94cffd6b91ef82d832179eb3e9f554326
 DIST imagescan_3.62.0.orig.tar.gz 12650003 BLAKE2B 732283eb8370192fdd0fba8939bc81e277a7a227b024f14856b8d3d5c562b7320c7b40aa48cfa627e23dc654544c9bac27d35add5e10bf0ca65ab0279290b90c SHA512 3b6188013d162c605a3ce1bcac9e5a7b16b1af6363bc7ef4b257aed1c0d3e3dfd402a048ec699b6b6cc42883d0b26f50f0c6f1bd0ddc917baed4ce8902a9d8fa
 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.ebuild 3958 BLAKE2B 3e1284c43d52dd91a6b9e88c2c8d5aef7ee76ed2c7b7a1e0d35781db6f5882efe1ea6c1b1152df86bf0b831941a271bf8c5a9c75fb2fe26646e99d2f73d17da8 SHA512 9b23f93cc94371c33036fec992c96baec8e94b743e732c8579755eec94cfc35ec79c95b879df664783818e03cff648c932e23217b856537a3875bab9c38a228a
-EBUILD iscan-3.62.0.ebuild 2227 BLAKE2B bc556c46a5d3eff26ff42b71ff8fa7c81574ca0c1a2eac7a83c2c597dde69140cb4d17a233c1d621c82728f9adbd0730b2a1bd911bc5d83ef69273c7bd0d2b01 SHA512 b232652df039cec4b8addc7eab24caeabd4060a8ac6ab0257df5f26648d21c1bb4ebcd23ca5b303f37e9d255bda67eab27d15ff1c8f40d3fd6ab540fcfac34a1
+EBUILD iscan-3.62.0.ebuild 2273 BLAKE2B 4a02fac7387177a601987b9a95d1aa9a43ce2fad8d78ea0ddb1b24b66ba6f5f011eea84bd9f3ce3ae7d5c6342276f67d407acb95e1bfb9ad4c65dec87aeb5caf SHA512 8894b992db9e4edbc35621384443f329df1d28be28576cb495d3877df6e9e307d220c33f5529db6dfb5bb43fc6a3f57a96dd164e825df6875070ba2866449183
 MISC metadata.xml 930 BLAKE2B d2cf4fae5cdcb660357ffe5566ad8d99eef6287f565a45f1824c810b3979e9d2930f458766ff524b231ef8dfd793062ff23cf4bfc2a78a36c5393a6c4224feea SHA512 d609a5cd8f8bbc7653e784d153757849eafb9c772355d0928325a6ecf673e8aa055623601d957f912709f9f16acfde5ca0b0480a1f2a17bfc24825895d861fc0
diff --git a/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch b/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch
index d55a464823b8..da6cc66c13be 100644
--- a/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch
+++ b/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch
@@ -31,3 +31,14 @@ diff -urN a/sane/handle.cpp b/sane/handle.cpp
  
  namespace sane {
  
+--- utsushi-0.62.0/gtkmm/pump.cpp.orig	2019-11-18 03:08:48.000000000 +0100
++++ utsushi-0.62.0/gtkmm/pump.cpp	2020-05-10 21:59:32.986379049 +0200
+@@ -31,6 +31,8 @@
+ namespace utsushi {
+ namespace gtkmm {
+ 
++using namespace boost::placeholders;
++
+ pump::pump (idevice::ptr idev)
+   : utsushi::pump (idev)
+   , idev_ptr_(idev)
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
index f01a67d24171..7f8e4fae37b8 100644
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ b/media-gfx/iscan/iscan-3.62.0.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 	rm -r upstream/boost || die
 	# Workaround for deprecation warnings:
 	# https://gitlab.com/utsushi/utsushi/issues/90
-	sed -e 's|-Werror||g' -i configure.ac || die
+	sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die
 	eautoreconf
 }
 
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index b657fda0c7f0..a4f29acf428f 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,8 +1,5 @@
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
-DIST krita-4.2.8.2-patchset.tar.xz 13848 BLAKE2B 86059e08833541b7d4dfda2c36cd1479809452171353b755ab3a264fa41fb99fc7ffacf064af3767aa095fda81aa9a2212b63c7242c72f94ca23a83b34c0502f SHA512 79532700c967f94479af22e2fbd33c0b6d8c4295c872316935800b99258dceaedbac2b1c6314251d4d621c25a328ea602f49d415cc9275095bc3cd2f29756a61
-DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4 SHA512 5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.2.9.tar.xz 170082028 BLAKE2B dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66 SHA512 66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
-EBUILD krita-4.2.8.2-r3.ebuild 3242 BLAKE2B 8ad5bb70d26d718cc9c13ba3b25654bdf85b704a465d4ea8f149916f2d32244d49a03eca45d4663fabbcb9ca6fcf7271706180144c6f30987d22483c0227a34b SHA512 2247dff1ca311cb68bb857bebb7765b961ccca3ac0fe3f3baf8734f216eaa462bb82ce638c252fb19df9cdae7b12630c5191789cf1fcf53ea5694690392a0358
-EBUILD krita-4.2.9.ebuild 3243 BLAKE2B 7cda73e49cdf70bf4af6daa32be633dd3d541f5b81b310a4b0344f34e9705c01bd3a5ec850c55d26439102002c2c1c10b35fe38e922186b3d71fb7c661fec7df SHA512 0b3b6d19b0c44a6f7cdc15a2470f22b284956ca97d15a2f5c2b967743e86a2d31782f1cd6742b00a3a95dc67a0a426581843613ca9acce39faae93becb4cc8f7
+EBUILD krita-4.2.9.ebuild 3242 BLAKE2B 8ad5bb70d26d718cc9c13ba3b25654bdf85b704a465d4ea8f149916f2d32244d49a03eca45d4663fabbcb9ca6fcf7271706180144c6f30987d22483c0227a34b SHA512 2247dff1ca311cb68bb857bebb7765b961ccca3ac0fe3f3baf8734f216eaa462bb82ce638c252fb19df9cdae7b12630c5191789cf1fcf53ea5694690392a0358
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.8.2-r3.ebuild b/media-gfx/krita/krita-4.2.8.2-r3.ebuild
deleted file mode 100644
index e23f6afea053..000000000000
--- a/media-gfx/krita/krita-4.2.8.2-r3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
-		https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
-	KEYWORDS="amd64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.4-tests-optional.patch
-	"${WORKDIR}"/${P}-patchset
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake_use_find_package color-management OCIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-4.2.9.ebuild b/media-gfx/krita/krita-4.2.9.ebuild
index e3e6c38ca03a..e23f6afea053 100644
--- a/media-gfx/krita/krita-4.2.9.ebuild
+++ b/media-gfx/krita/krita-4.2.9.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
 		https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index eebd1f41bd99..aa34257c0292 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,7 +1,8 @@
 AUX librecad-2.1.3-gcc-9.patch 8494 BLAKE2B 85f7cfd7822d27c4b76b6cc9b71f9667b912ef80229e2a70110155d4b52f0e203b186ffb6a0be160d6d2aadcaf241994d7f78d81a096d7540c46b946ed7cb892 SHA512 5adb8086244ec18e78f503b7522ea79213b629d297bb07fad0c21ae1e205731fd544aff7e979f1cc5709542a23311c771d61f13f4ba09f34baff9a24deae5eed
 AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25
+AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
 EBUILD librecad-2.1.3-r4.ebuild 1102 BLAKE2B 8f9a34ce4d164d741fd9c053a956eb28b289d2287f1a627ac11362b47799390753db65e32ace5b57bd2ad0c9f2b84223f86fd9fd77160c0f85a31915b7041c1b SHA512 907a94b6d98f6dfc49e33d2fcb1611b76cbb5f309b22c4ed5ae51ffaaefab146379b39e42849f7bcc97bb7a0f394e31b6df82bd720537ddc387aeaced110a40b
-EBUILD librecad-2.1.3-r5.ebuild 1132 BLAKE2B 1f2f4506ac904e51304f45ce788d4a1b610419297ea0666b481e6bb7f759777b6ad2dbaf777d17707ebe844fa525e76e2faad4e138883c917f5e1ab2688a7229 SHA512 dd4a522f66341db71ef068212781ce482d79220faa9e554c8f5c6e0ff4e95f754214d6e6e0e69ce0b0e151081750de164807d37d6c3d85a1d9602a50e7b87c98
-EBUILD librecad-9999.ebuild 997 BLAKE2B c2f46819e1188ac08ff278385f696c578dac20c707b666d5fe297c2ff19b3f8c37f048e8c3083acacf4f7165378ed5f5de37209b6eff50fd73b8970dd7377b18 SHA512 8e8633998807024c30de31be9eb996b5a6abb1ab416247258e35b1497ea9824b7035556201b3a9c8c546cb3402406344353cfca37ce5d2fbe268bfaafe693b77
+EBUILD librecad-2.1.3-r5.ebuild 1206 BLAKE2B 5934d1af4efa6668916303c85aed2654ab43458a23532167997a2f31bdcfd356c4914ab4ea75e3f77699abae115bdbf6555629038f3d4eb25b132e69f9147100 SHA512 56eae3cd2e47f5f45f496a581f454dff497b2b447afde848b57fae0fa145223191844a872620a012c0b489dc382213d61af8efa13e4baf72a5bc5b31690e0f48
+EBUILD librecad-9999.ebuild 1143 BLAKE2B 640a03b64ac56e00a3821dc9278efc0cfbb4eb7ca3ca83d428242aff78a0ab1d783b705cef0af939537a281b57db4d1ce640f3baa1eda7086b52a4fad481a77a SHA512 173a061d72db9ec980e13173d7d8caf7583d57a794cbb3c72a42553d4546cc28f45c5ae8ceab19ef71a838739c717a3c75e6506cada23a123c060fa89c04000c
 MISC metadata.xml 408 BLAKE2B 40e860453480281f8a148bfe527530c836bf21801a435f787c4d07ab1005dc9492a96c3dc0fc7dc4362fe35626f653052f0058eaef84336c59c8910256cfeaf5 SHA512 e08b9546617943ae66186e4b99c53c900a98a1950f429f84b525791c8030b1ec1786b4dfafe983537915ed597e3e9fe089bfc6f701a57af9c453293a2db2c2f6
diff --git a/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch b/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch
new file mode 100644
index 000000000000..a1cfe62408f9
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch
@@ -0,0 +1,37 @@
+From 81741a875847c806c05f0f3a4610e69b3c3002aa Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 20 May 2020 14:12:15 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+---
+ librecad/src/lib/engine/lc_splinepoints.cpp | 1 +
+ librecad/src/lib/gui/rs_painterqt.h         | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/librecad/src/lib/engine/lc_splinepoints.cpp b/librecad/src/lib/engine/lc_splinepoints.cpp
+index 5eaed81b..e6324ec1 100644
+--- a/librecad/src/lib/engine/lc_splinepoints.cpp
++++ b/librecad/src/lib/engine/lc_splinepoints.cpp
+@@ -21,6 +21,7 @@ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ **********************************************************************/
+ 
++#include <QPainterPath>
+ #include <QPolygonF>
+ #include "lc_splinepoints.h"
+ 
+diff --git a/librecad/src/lib/gui/rs_painterqt.h b/librecad/src/lib/gui/rs_painterqt.h
+index 878753cb..a0b432e0 100644
+--- a/librecad/src/lib/gui/rs_painterqt.h
++++ b/librecad/src/lib/gui/rs_painterqt.h
+@@ -29,6 +29,7 @@
+ #define RS_PAINTERQT_H
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include "rs_painter.h"
+ #include "rs_pen.h"
+-- 
+2.26.2
+
diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
index 5bb715ffa4ee..054af7f65e7a 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit desktop qmake-utils
 
@@ -11,10 +11,12 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 RDEPEND="
 	dev-cpp/muParser
 	dev-libs/boost:=
@@ -23,16 +25,20 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	media-libs/freetype:2"
+	media-libs/freetype:2
+"
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
 	dev-qt/qthelp:5
 	dev-qt/qtxml:5
 "
 
 S="${WORKDIR}/LibreCAD-${PV}"
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" "${FILESDIR}/${P}-gcc-9.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-gcc-9.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch" # pending upstream PR#1224
+)
 
 src_configure() {
 	eqmake5 -r
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 4c0e87ee95e3..04902b991e93 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -1,20 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop git-r3 qmake-utils
+inherit desktop qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
 HOMEPAGE="https://www.librecad.org/"
-EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/LibreCAD-${PV}"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-
 IUSE="3d debug doc tools"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 RDEPEND="
 	dev-cpp/muParser
 	dev-libs/boost:=
@@ -23,15 +32,13 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	media-libs/freetype:2"
+	media-libs/freetype:2
+"
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
 	dev-qt/qthelp:5
 	dev-qt/qtxml:5
 "
 
-S="${WORKDIR}/LibreCAD-${PV}"
-
 src_configure() {
 	eqmake5 -r
 }
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 0fdd039ce56b..469baec9341a 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,3 +1,5 @@
 DIST lximage-qt-0.14.1.tar.xz 78960 BLAKE2B c58e5c553e2803cd8d40d807cd1650b72e4de6297f29cdffce19cf3eb402d01735d869ed4e31e9c28ce03e09038628331cc547aebcb636c34dc936b349e33c9a SHA512 61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd
-EBUILD lximage-qt-0.14.1-r1.ebuild 874 BLAKE2B 3ec899086ab9c1be170ba8c7876cfb1fdcb2856cf7d5c45e5b419b644f29ad940f5c0287aacbb30cdb0687090af68bbbb0f13c95f55008d86a215f9de76ec47d SHA512 3347752c815b2528343f496695bd7ce7f883d864fcaa69d72d7e561fab82fe16ca6c3432a13fb6ec51862dbf7e65336df0a3e9f0110c51d2bbe4127373c4d76d
+DIST lximage-qt-0.15.0.tar.xz 91444 BLAKE2B a5ccd9afdd4ed1ec60a5da8ec3390e5d93f018209ce62a1fbf929c6984a056539751f576a15e0b81e4f1ba003d35379791066832f02a45de1a5d5e8e8eb8f0b2 SHA512 980fc401b31c5d937877ef35211892984def150a6db6072d9752fa78588ea8ca0827beb5880d46775092c42e93358d3e494e045a50756931129402ded4ecab23
+EBUILD lximage-qt-0.14.1-r1.ebuild 880 BLAKE2B 6e0b004d145d58c7911121792ca6aa753082f2e837bc69e843da0ffd79f181e373be0ee30af2f83aeb0da6b108052d0aaea19bbe085dc33d63d5ce5d03714df4 SHA512 f22a745bf069d539393f4f677311cf859c92d3514a5fefa24d660118e99d83aff97553337463df7e937a3812d02821c5d7496d3fe15741e362faccc81ad3b4d8
+EBUILD lximage-qt-0.15.0.ebuild 855 BLAKE2B 17b5d05670a5f5dfc0f240ef8923c17123351974f83a1128ab4616e0b59c5be29fb3e85fc863f990f8bfc943821e725be377e57eac02fe1055d183021d1383b3 SHA512 501623d4e58afa35f7049b64bc6aa19613b7ab74b5f5759fd549fe13cf93e74ef6e334da2e56817ed97fa5f45f4637bf6ff45044e15cdacb9b58d63755dc79b3
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
index 4d0f37e5e5a7..01f612776a8a 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="LXImage Image Viewer - GPicView replacement"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
diff --git a/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
new file mode 100644
index 000000000000..a0ad4a567157
--- /dev/null
+++ b/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt Image Viewer"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.7.0
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/libexif
+	>=x11-libs/libfm-qt-0.15.0:=
+	x11-libs/libX11
+	x11-libs/libXfixes
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index b619b1c39985..a48096f54c29 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,3 +1,3 @@
 DIST mandelbulber2-2.12-1.tar.gz 47092910 BLAKE2B 1e5ca64a4819052882bc7cdc047c6d755046f2ceebcf7b26db41511fde219aa523a3c6884f0667aed1365104c4502a6e6b1b2d7d40a4a024fdb5051d5ac13cd2 SHA512 5dc8dcaa45bc8747024ed16379cc4d622535099c925abf3c2aa01c0338fe8c1f272e6113b6bf28da6a4bb087e6d6e6a4c6634feca993d2c89f12b79582ff271c
-EBUILD mandelbulber-2.12-r1.ebuild 1697 BLAKE2B 85e269a30efbc6474644330d6391d2fadad82ca1f4121626c0b65f078da9190168ccc5afe52f6e8f336fc288d361a3cd1f5b5d1239b9c2ca74d9491e5ba9b44e SHA512 97d0c3b61054e5cfc65874cee87ac3a109c6440a01a9c93b88fbea06fc3d8e83c3189e30dcde732c1f25b75ebcc16962f31d1a51fb1b2b94a33a357e3140c2f5
+EBUILD mandelbulber-2.12-r1.ebuild 1698 BLAKE2B d0aa54f24759d1aee38d434d1e1fa73b36c6176ba917e5800bb28b871c2742c91bb2214070c58e44b69aa14a88383f90d7ea4356996cd44b30e2fdafbbd53bfe SHA512 17c92cd414b1dbbbfc371550bef8a3f4472805b40565e28563ac6fb11e336a02fa0c3ebe37a65a341540ca414086c616b2b537b43b62f022b36709a349093055
 MISC metadata.xml 699 BLAKE2B d9aa974727aa0bb7cf821cc6a982477aaf59d6e2cae666e4476196507a22233feac875347797799df4babd9dffbaa97f0d5fc5d190bcc11a03554f6755e6f458 SHA512 a6d7cfc42cf2bd56454f7834ff4aaa907772052d855f7a471c57ba18d21437af5ff0ec48f0ea1929d18aa2e0eed9073b903dc34b4de19d304d4839f2c267b535
diff --git a/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
index 31967ec72549..b50cfb100e6b 100644
--- a/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
+++ b/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_P="${PN}2-${PV}-1"
-inherit desktop gnome2-utils qmake-utils
+inherit desktop qmake-utils xdg-utils
 
 DESCRIPTION="Tool to render 3D fractals"
-HOMEPAGE="http://www.mandelbulber.com"
+HOMEPAGE="https://www.mandelbulber.com"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="CC-BY-4.0 GPL-3"
@@ -15,6 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="opencl openexr sndfile tiff"
 
+BDEPEND="
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-libs/lzo
 	dev-qt/qtcore:5
@@ -35,7 +38,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-qt/designer:5
-	virtual/pkgconfig
 "
 
 S=${WORKDIR}/${MY_P}
@@ -74,9 +76,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 13d3da01e5ae..bddb650f7cda 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 548 BLAKE2B 9642df2b15e35d491179abb9312327e2a2ea6d36fadc8287e9d9d6597c0be9b897b5ca40526d458a16f3b9bc983ec9fcb55ed7a68788569fd51e76c68ae04705 SHA512 72697d62253c3a30bd115cc423b539649194f9221e8135b6d325d39566f1ace38f7ba8b51aedb804d17fa635fdf352e61880ae59177d36286053ffa2a1e552ab
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 554 BLAKE2B c0cc90e2c42672b96cc734918fe5222a71e7973ab303e1d9794e7fea8d9355c8016774b165134d8cac95cf29f0d8389f608b9f4387c3304c03a8b7943e3ed949 SHA512 3649d53e9012acec908e2441bfc9b7e2c7a5b8c89a890ac6d38b6b1c418167dab459796a1f3f6482e8795606b1473759154f9fc5a7dbd37868ed709114de1f86
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 6b87f8055f3b..62c440f74456 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~alpha amd64 arm64 ~ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
diff --git a/media-gfx/panini/Manifest b/media-gfx/panini/Manifest
index be4234806c77..6335363186b3 100644
--- a/media-gfx/panini/Manifest
+++ b/media-gfx/panini/Manifest
@@ -1,6 +1,4 @@
 AUX panini.desktop 250 BLAKE2B 2fe866c696c3056ac914242fa14fd378517dc6fce02bdb9b7e2b6716e825ce9b2efe577132e3a1e71808aa7a17de57e9caa1121143e73d4007405b1ed6d7c666 SHA512 6e4cbf1d2a318d4e593e29d78668dd6cdaa37db82dcd7ed0aaee1b6e25a381c524708b404c9bec3902cd101c46c70e0546425eeed33c41c0deb17751df0f0f40
-DIST panini-0.72.0.tar.gz 328528 BLAKE2B b5053147d51f308395d2c3505bc0821947cd2c32955f86071cbbdd00c750793729be723c133ec7a619ff0fce5a0d9813580954597137a4e66780390b882bca7f SHA512 b859e723832d2d57de69dcbcd09615245e11d7fce124a55f7795608a8e9337427d9d1d10867ef9eecb16bd792313f5146ae19de553603bd70dedca69ba7c2de1
 DIST panini-0.73.0.tar.gz 329164 BLAKE2B 1cd592d7c5cf230398a6496a27f8389375a670b1de1a0f6acdb2027884bc5059798ad86ad4deb7795402654b3eb9edf112c3c177c7c716d55a186e48e1567f1c SHA512 4c12c0af5f94079f0da8f08dd19d99fd06c16c653b21532eba01022ed5b78afdcea2a042902fd50d0ea442483699cfdf9b10fd7f4592e3bae60abd5d2dabf657
-EBUILD panini-0.72.0.ebuild 935 BLAKE2B 31116ddc1112f80d223624e2f8b7e7406100b6534ef89f00d08221ada99be8ef5da641b33f06a6d046e2482d5b3af7fc64edd634ad97286a81cf2b0eb04ee876 SHA512 5609c28328e5092d24acf6bf6ba8b9f29de80edae9979b33731720842490ce0632196afb92eb4b3c9777c289378ccc2b0a3ae6e0c4eff9dea960ace9bdde7d56
 EBUILD panini-0.73.0.ebuild 932 BLAKE2B 5fbe549d028d54a41656c96ae48269a86a7da76074398e0ab8451f0c5736754ace52c2baaf2d912cc40fa65b01d1dfb7c160ff4815a38be2042ad8d0dd5d6cdf SHA512 43a9ce7559094d6115d4b133c4a67dc172924a61e8a2a10628dc540b4d0cb5811ddb2bf275efcd5c0b0d0e2f034cdfcb74ef06f10e9089c3d7d5105feac3690d
 MISC metadata.xml 343 BLAKE2B 0eb728b28f25aef454e224b14b8e26ee899664d5fd45fc59e7aca53b5df155120bccafbd3627db7fe2c7cac91943134879eef0161e17fd5d21aa433105087369 SHA512 1515628627be99d296db85501b7239e87368f24d0a238a190b1d330522d9fe371801b7ee90cccf4d48e09d12b53526549b2774b2603e599075cdf5b53bfc8a55
diff --git a/media-gfx/panini/panini-0.72.0.ebuild b/media-gfx/panini/panini-0.72.0.ebuild
deleted file mode 100644
index c552c99c816b..000000000000
--- a/media-gfx/panini/panini-0.72.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop qmake-utils xdg-utils
-
-MY_P="${P/p/P}-src"
-DESCRIPTION="OpenGL-based panoramic image viewer"
-HOMEPAGE="https://github.com/lazarus-pkgs/panini"
-SRC_URI="https://github.com/lazarus-pkgs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	virtual/glu
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-DOCS=( NEWS {BUILD,README,USAGE}.md )
-
-src_prepare() {
-	default
-	eqmake5 ${PN}.pro
-}
-
-src_install() {
-	einstalldocs
-	dobin panini
-	domenu "${FILESDIR}"/${PN}.desktop
-	newicon ui/panini-icon-blue.jpg ${PN}.jpg
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 0528e8d2e857..7fd14af266cf 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,5 +1,3 @@
-DIST pencil-0.6.1.1.tar.gz 2987266 BLAKE2B ae97364178e62535c17941c6c4a3ad507f5883628cbce59635a2c86cf3485ebd85a5815f28516315dabc30bd791c723805078d47f36b1409d545a769b78d90c4 SHA512 e84330da70091414a9fca8f0be8c8ca82272d89777cd0e5a33d30e4a53449eca20cfc175c84cbbe063dd1017be5b263ddf490f69771d9931c9d31261ebe46354
 DIST pencil-0.6.4.tar.gz 3397891 BLAKE2B cb3fc754cd9abc2944fd184ea61b057a784a5b9e3c42724ef50b117a933cad0b72456a32e849c2de3ae6a7eb8bc6bdeee3ed751e8a6c8c68a74130d03ba6f1de SHA512 da28bd6bcdb0336c81e0735bec261373cd1e5db06feb012d4bba098c9df2ebea6f5b763e9c5e5e17c1518efdd6b9cde634ecf2152b49c25cde6c93da63e6fde8
-EBUILD pencil-0.6.1.1.ebuild 1102 BLAKE2B 6b11aadcdc1646338e23f84fccc1517ba838ab35d27020d0be2688917cde88b7e7eec1952b8e10456ce047e20365460e7591bf047212f030b781417860adbfe1 SHA512 be9356d9632feca6719d60e8f848f95c02443e4cbe772c0d75c569803c8a1e0270ddfcb0135267dcfb4b2c34995a6459b5e8f748b08d95602c8d2e5f2b3645a4
 EBUILD pencil-0.6.4.ebuild 1179 BLAKE2B 0527c9a25c2a5ece6d99a9032d1e9760170a3d479d812cd1704946d28805baf6cac08aead03e211d2f583387081dcd911e92bf5719495044ecb460d72c5cfbf5 SHA512 38f900e8f322fe4b4dd20fc0e12e466f35824b52aa5e98577db97eb297c8afdfe9182cc8edec1b2b85ee478c43dbb5ea6e739985665be398402a37219c302a01
 MISC metadata.xml 328 BLAKE2B d37566524ba0b352bca868e5a9db91ac4faf995bc4f9fca49be83be786c8e7b3ba305a10fcc1aea71b610a1442fa1b398ca549b9fcfccf0275c958d99e9d1279 SHA512 4e393e069c386f40fd7f817af383e3ee77d2f4592059a2b3cb54f68eae45eb665db9873971a29d94612dea0c8022bc0a3c2a01bac19e62d774739d3b666aac3e
diff --git a/media-gfx/pencil/pencil-0.6.1.1.ebuild b/media-gfx/pencil/pencil-0.6.1.1.ebuild
deleted file mode 100644
index 69c4eb9be6d8..000000000000
--- a/media-gfx/pencil/pencil-0.6.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="2D animation and drawing program based on Qt5"
-HOMEPAGE="https://www.pencil2d.org/"
-SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
-	default
-	sed -e "/^QT/s/xmlpatterns //" \
-		-i core_lib/core_lib.pro tests/tests.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	einstalldocs
-
-	# install target not yet provided
-	# emake INSTALL_ROOT="${D}" install
-	newbin bin/pencil2d ${PN}
-
-	newicon app/data/icons/icon.png ${PN}.png
-	make_desktop_entry ${PN} pencil2d ${PN} Graphics
-
-	insinto /usr/share/mime/packages/
-	doins app/data/pencil2d.xml
-
-	# TODO: Install l10n files
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/qrencode-python/Manifest b/media-gfx/qrencode-python/Manifest
deleted file mode 100644
index d14b12fdd115..000000000000
--- a/media-gfx/qrencode-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qrencode-python-1.02_pre140921.tar.gz 2084 BLAKE2B 19cecad794718a56bb0ac756b322fbeb9a748792bc9683a3c0784c5d2e2638b100fe523b4ab34be5563bd10e5773cc6925dbfbabba48d9487ed2d8e4e86dae57 SHA512 231c61f98f064d282611d14194de7b3c0a18faff0ed856722e39a6cc25f744442d77bd43418aec117c6e39ddd78a6ea770edee8992aa4e3cfce50254ac6526aa
-EBUILD qrencode-python-1.02_pre140921.ebuild 682 BLAKE2B 8f48f36dd811c03ee194b28b892adedb2ae706add292af66ec1c54671132729c5706588b06d046dfb200a9e1f38b30003ec5d99cb0982fef3ef66c6d72c80ce7 SHA512 90cd6811c8ae45df2c7bed3387e544d8d74da905aa04f68c93eae9c1d7f6e6c66040deb8440abbeb33a343f8e7b60f89c353224954826d1c50d1b89b585788c4
-MISC metadata.xml 304 BLAKE2B eb11f9f35defdf53355add48e6b21809cbd85cbf1e12930d53ccf77f82a28b5fda23e5dbf0ac2c15c509f8a50997339ca2d43e0ea2c0fed45bf7e4b55f38c9ed SHA512 d36db02c7fa11ce34c655789975cdac826c259dfe778a27b28221c31bc6a5e99e3ce53f0b3c0a3abb8ad29b39e937cb02379a6c93310ccb1978c62511a4c6f1f
diff --git a/media-gfx/qrencode-python/metadata.xml b/media-gfx/qrencode-python/metadata.xml
deleted file mode 100644
index 8236bfa16a59..000000000000
--- a/media-gfx/qrencode-python/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">qrencode</remote-id>
-    <remote-id type="github">Arachnid/pyqrencode</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
deleted file mode 100644
index 84b7e240314d..000000000000
--- a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="A simple wrapper for the C qrencode library"
-HOMEPAGE="https://pypi.org/project/qrencode/ https://github.com/Arachnid/pyqrencode/"
-#SRC_URI="mirror://pypi/q/qrencode/qrencode-${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://github.com/Arachnid/pyqrencode/tarball/486bb7b64e3ce5483f65e375a67da0fa6d02ca92 -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="Apache-2.0"
-IUSE=""
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-gfx/qrencode"
-DEPEND="${RDEPEND}"
diff --git a/media-gfx/qvv/Manifest b/media-gfx/qvv/Manifest
index 6191832a1814..375167277c65 100644
--- a/media-gfx/qvv/Manifest
+++ b/media-gfx/qvv/Manifest
@@ -1,4 +1,3 @@
-AUX qvv-4.04-toLatin1.patch 1008 BLAKE2B bd7a9a6fb8b8051d8ea4e9a7a2c563969eeafbf8b87ae49691f669e8da2318bbad570a2fed917030cdbce644595f1f8b31c5c629291e2b04cdb10dbd20584656 SHA512 2f4f2b8265a6bb7b92fd4b993527877ff3961388088a281a68659f838d9ac57436f59a74b8fb37ec3a02b1eb7624bcb2ccb59c02a555cb91cfdbce41e45c46a9
-DIST qvv-4.04.tar.gz 4580207 BLAKE2B 0f73f455ca5f7446312043c53322668a7824fdbcadb0eff1e98698f14bfbaac7c57a1ac1e7e42164ed1071e319f90d1aa5d57cf865c31d3242bdfd954875c12a SHA512 102c51f7eb146d4ddcbfee16fcf93bc08f874268c2838c1358d314daf466639c5506adc2ba99231cb5f2f7074a980545c1640241396964012e9991b946d7839d
-EBUILD qvv-4.04.ebuild 743 BLAKE2B 174fdc70666b412dea1232376297e8951977c800d0fa8f94f59ffa159955c0448a61d34b2a18209fe5e3845cd0bcb18a287f151cc5b2ce4943ca2ad5d02ad812 SHA512 59f9d3ced5261208e113260714efad0ffe5f3b8552ce0c1a2a6f8905119587f24c21202e7ae2d74a463eb56f95e8624478907610f0c94275ddd131ea7948f8c4
+DIST qvv-4.04.2.tar.gz 4371030 BLAKE2B 960a96023ea968f299e803afe51887c99d2b37a14943772fa98d56c4b912b678c27e0822ed2e5b6675519c05bf04e9f02f3322a77e3e0f22b648796422cb7a8e SHA512 c678eedf945f88bc6d5ecaf8fecfef8ccb7ce741b2201c81b631be9069435552f523f1d2b370197df0230f7b11443b904b4dbe4b7bb0a71f0a164151a0a9ec90
+EBUILD qvv-4.04.2.ebuild 683 BLAKE2B e324e74a5a74802bddedb86b37e50219d229a66f1aa0b42cca79bffeb6b558d599014cb73810d08c6570d539da707e1dfa09b18c64b57008a6c9de8df58cc74b SHA512 90c73c86eb8f130bf311808d4e532cea581035e10e5e3bead04fd1df1a0c37d19b8d8a99ca1b47de4900542c687c7524704e34168a66e4e4a9a4f5d009e8d7c9
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/qvv/files/qvv-4.04-toLatin1.patch b/media-gfx/qvv/files/qvv-4.04-toLatin1.patch
deleted file mode 100644
index 3db2b32ad4bc..000000000000
--- a/media-gfx/qvv/files/qvv-4.04-toLatin1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 61b243ccc907f34115a00572e2d8f2bfa2682e6c Mon Sep 17 00:00:00 2001
-From: Vladi Belperchinov-Shabanski <cade@datamax.bg>
-Date: Thu, 26 Feb 2015 16:08:51 +0200
-Subject: [PATCH] toascii-tolatin1-fix
-
----
- src/qvv_main_win.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qvv_main_win.cpp b/src/qvv_main_win.cpp
-index 3516f87..0ade17c 100644
---- a/src/qvv_main_win.cpp
-+++ b/src/qvv_main_win.cpp
-@@ -783,7 +783,7 @@ int QvvMainWindow::deleteItems( int current_only )
- 
-     //qDebug() << "DELETE YES: " << file_name << " RESBUTTON: " << QVariant( confirm->activated_button ).toString();
- 
--    QString path_hash = QVariant( QCryptographicHash::hash( cdir.absolutePath().toAscii(), QCryptographicHash::Sha1 ).toHex() ).toString();
-+    QString path_hash = QVariant( QCryptographicHash::hash( cdir.absolutePath().toLatin1(), QCryptographicHash::Sha1 ).toHex() ).toString();
-     QString trash_file_name = trash_can + "/" + path_hash + "." + item->text( 1 );
- 
-     int moved_ok = 0;
diff --git a/media-gfx/qvv/qvv-4.04.ebuild b/media-gfx/qvv/qvv-4.04.2.ebuild
index 50d847492219..2f6fc115e1da 100644
--- a/media-gfx/qvv/qvv-4.04.ebuild
+++ b/media-gfx/qvv/qvv-4.04.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit desktop qmake-utils
 
-DESCRIPTION="QVV Image Viewer and Browser"
+DESCRIPTION="Qt-based compact image viewer and browser"
 HOMEPAGE="http://cade.datamax.bg/qvv/"
 SRC_URI="https://github.com/cade-vs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -23,8 +23,6 @@ RDEPEND="${DEPEND}"
 
 DOCS=( ANFSCD GPG_README HISTORY README todo.txt )
 
-PATCHES=( "${FILESDIR}"/${P}-toLatin1.patch )
-
 src_configure() {
 	eqmake5 src/${PN}.qt5.pro
 }
@@ -32,6 +30,6 @@ src_configure() {
 src_install() {
 	einstalldocs
 	dobin qvv
-	doicon images/qvv_icon_128x128.png || die "doicon failed"
+	doicon images/qvv_icon_128x128.png
 	make_desktop_entry qvv QVV qvv_icon_128x128
 }
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 8fbc8bd37d5c..1e9a9aa69b59 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,3 +1,5 @@
 DIST shotwell-0.30.8.tar.xz 6460512 BLAKE2B aecdfa8d90bcce19c38a55872671f6521d8808fa46decba4e9910392f9f8907dd99aaecc825f4e3f6ae747ab151bf5bfa3a807364d571db0fc2ddcaad9a492f5 SHA512 dccd496a083145283c79250329f88fdfe526a98ce84b6d1c52a9c48c9e52a4749bdf2449f3102474c994ef1e687e06767b9bcda03ea97d1168d3417743a6e866
+DIST shotwell-0.30.9.tar.xz 6465508 BLAKE2B 9b302d156b350d5cfa961afaa5d75e71db8b34a65a27de0d3b298841ca9be96d502dc98c85c681ca336965fce72db8034609f3f9c6c04fea1127db6c397e6499 SHA512 a232d717356d7e9f0a6b1ad825f4182dd9f6ee4cca9745717e3bd18ded03cdaba94c32256d055389ce2b0cda0c5828b25d1448c10598a474dc3ea0817fc303ee
 EBUILD shotwell-0.30.8-r1.ebuild 1783 BLAKE2B ea068d6335d7b5d4af0fef2bb571275f0218d384fb118706a948e79177814d6062cb2990ecb43fcf62352986d9f8fae0d02c0318c3481b1277d24524573f90d6 SHA512 c90464d3bd7749d57b3a36aa6352cea07ac47a487c0e7317d1717fb53cfc183dbcb438a22f0314b73d43a31b9555f08acad4eb27d73046d030ef6f3e041d6be4
+EBUILD shotwell-0.30.9.ebuild 1782 BLAKE2B 84211b71a3a4747a7cc42f7d8b2b5e873bdea2ef8abe7fd7b4ae1e3ac9cab0fdafe1de78a7ab09ae7b40d0591c78f715fb447ce3df86c7dbae80a2d758229bbf SHA512 02cb56548ebe4d6fe3efbedf31a5c6d02cb7f5424bc595f46dde6be8390bfb99dd58eb68b1b147bdb3d64cd893d083bbf877fa75ed2c9ec582b00865fe03fa9c
 MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
diff --git a/media-gfx/shotwell/shotwell-0.30.9.ebuild b/media-gfx/shotwell/shotwell-0.30.9.ebuild
new file mode 100644
index 000000000000..905397252718
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.30.9.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="opencv udev"
+
+DEPEND="
+	>=x11-libs/gtk+-3.22.0:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8.5:0.8
+	>=net-libs/webkit-gtk-2.4:4
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libxml2-2.6.32:2
+	x11-libs/gdk-pixbuf:2
+	>=dev-db/sqlite-3.5.9:3
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libgphoto2-2.5:=
+	udev? ( >=dev-libs/libgudev-145:= )
+	>=media-libs/gexiv2-0.10.4
+	>=media-libs/libraw-0.13.2:=
+	>=media-libs/libexif-0.6.16:=
+	dev-libs/libgdata
+	>=app-crypt/gcr-3:=[gtk]
+	x11-libs/cairo
+	opencv? ( >=media-libs/opencv-2.3.0:= )
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	net-libs/libsoup:2.4[vala]
+	media-libs/gexiv2[vala]
+	app-crypt/gcr[vala]
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dunity-support=false
+		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
+		-Dextra-plugins=true
+		#trace
+		#measure
+		-Ddupe-detection=true
+		$(meson_use udev)
+		-Dinstall-apport-hook=false
+		$(meson_use opencv face-detection)
+		-Dfatal_warnings=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
deleted file mode 100644
index 651fa39d5ddf..000000000000
--- a/media-gfx/svg2rlg/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX svg2rlg-issue-3.patch 507 BLAKE2B 801eb095c1e383a0e75c4f79e11e8063ae94290c997cebac33e55400934626dca338d9d03c5effd68e4f2fa79fb6be58b2eafbe589fe56c87ed465326d0b3e2a SHA512 aa7c02fe9afaebb8e56397bd2f609d83e772fa53f60088b12212eaa3934a10a1ea452f20f407a9134e87c0133dddd17c7bea8c6f03d7d3eef2bfaeb6430d2f8c
-AUX svg2rlg-issue-6.patch 1221 BLAKE2B c7440b817c14851b20d5a33712029bc3430a59b1376e0b7ca52d9aeed6a7c8e2cbb07e0c91b1342182e03c0646e86ef7d730062fe5539c4440094d4644675c47 SHA512 500b929de726cb728ea10f295c7e15845046d0d3d70067c2ef54cca1466f456cb682797ddf99e0ae62ec68ba125183900763e82a2889f8941b507490a197ed88
-AUX svg2rlg-issue-7.patch 473 BLAKE2B 625268097edb59bc3c71ad3ff486d293dbbcfb0789c2bd73c5848c4e0aab4ec6ba2f9e5a28b23aa12f141f92e893d4e779b871e2d5fd05960cb263d05b5bcf8b SHA512 42be68efd3aedb00d1461dfa99de7aebf9477a531a491676cc189a7299e206650df9a9bd51d27c3a2cf6e761f8892c5b61577eed1b232f5109374df32329d3e4
-DIST svg2rlg-0.3.tar.gz 490908 BLAKE2B a3383326d1d503965f93ff3b7b9f144835d5c7ba1613b0bf215ce31cc968eee76c826a170f62a5c4f173c8326dbe4a9f47a9f6f1a1345d2ed9ffd5350077e2e9 SHA512 44efebe7d978a46ab26b4bc332ad08db9236a86b160d73fc1fdc2b54c44bb2604147ae458eea1fe81c579c7f94e39869459567a6b6b3a551d6db6132816c4723
-EBUILD svg2rlg-0.3.ebuild 812 BLAKE2B f9e9170db5c8bb0e8f13bf78761f359ad616cc8c329427baec81a3f046f498e5a11be256de59fd7d3e211067709923721e838f6743cfc8f2d7438119f2f5829e SHA512 be8fca9e57a9b5deefe69363478c06e075517368ce25a8354bd6bbb19f587b40bdd2bea53235b72a6ccd9bd6d86ce92fab8ab6b7c4d47fef07ed63cac5e8a138
-MISC metadata.xml 363 BLAKE2B bab52a0cc6fbf81e6993b0ce74a89882a692bd008f0b193b3f30a665cbb8e6f6741f594bc6297a606c125bf2751c189142d500264e5d909b3715716c113b5ec9 SHA512 ab6cf1b5b4bb40fc26b110c6d34ea4d21e80c127549cb43cf262a43f771113494ef357c811d70523c07a3b9da0e3137a524364c997da4f3f25e9cddbdc125813
diff --git a/media-gfx/svg2rlg/files/svg2rlg-issue-3.patch b/media-gfx/svg2rlg/files/svg2rlg-issue-3.patch
deleted file mode 100644
index df70bf345aa8..000000000000
--- a/media-gfx/svg2rlg/files/svg2rlg-issue-3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e5aa6784a10717641bc5b6d9d77a5029f815654a
-Author: yac <yac@blesmrt.net>
-Date:   Wed May 8 04:59:17 2013 +0200
-
-    fix #3
-    
-    remove windows only function which is useless anyway
-
-diff --git a/svg2rlg.py b/svg2rlg.py
-index 1c5f80c..2b35c62 100644
---- a/svg2rlg.py
-+++ b/svg2rlg.py
-@@ -1574,5 +1574,3 @@ if __name__ == "__main__":
-         
-     drawing = svg2rlg(source)
-     drawing.save(formats=['pdf'],outDir='.',fnRoot=name)
--    
--    os.startfile(name + '.pdf')
-\ No newline at end of file
diff --git a/media-gfx/svg2rlg/files/svg2rlg-issue-6.patch b/media-gfx/svg2rlg/files/svg2rlg-issue-6.patch
deleted file mode 100644
index 6ca750e79193..000000000000
--- a/media-gfx/svg2rlg/files/svg2rlg-issue-6.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit e42661b9cd6d7b71ce5e7674ac8eff25c74db07a
-Author: yac <yac@blesmrt.net>
-Date:   Wed May 8 05:00:32 2013 +0200
-
-    use entry_point fixes #6
-
-diff --git a/setup.py b/setup.py
-index 9e00fba..512fa79 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,6 +1,6 @@
- #!/usr/bin/python
- # -*- coding: utf-8 -*-
--from distutils.core import setup
-+from setuptools import setup
- 
- setup(
-     name = 'svg2rlg',
-@@ -12,6 +12,8 @@ setup(
-     url = 'http://code.google.com/p/svg2rlg/',
-     download_url = 'http://pypi.python.org/pypi/svg2rlg/',
-     requires = ['reportlab'],
-+    entry_points = {
-+                'console_scripts': ['svg2rlg = svg2rlg:main']},
-     
-     classifiers=[
-           'Environment :: Console',
-@@ -30,4 +32,4 @@ The authors motivation was to have a more robust handling of
- SVG files in the **rst2pdf** tool. Specific to be able to handle
- the quirks needed to include SVG export from matplotlib.
- '''
--)
-\ No newline at end of file
-+)
-diff --git a/svg2rlg.py b/svg2rlg.py
-index 2b35c62..cc812b2 100644
---- a/svg2rlg.py
-+++ b/svg2rlg.py
-@@ -1562,7 +1562,7 @@ def svg2rlg(filename):
-     
-     return renderer.render(xml)
-     
--if __name__ == "__main__":
-+def main():
-     import sys
-     import os
-     
diff --git a/media-gfx/svg2rlg/files/svg2rlg-issue-7.patch b/media-gfx/svg2rlg/files/svg2rlg-issue-7.patch
deleted file mode 100644
index 8145f416f804..000000000000
--- a/media-gfx/svg2rlg/files/svg2rlg-issue-7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-commit c30b4f90cac69934761e44bf59a8ba8a3827d647
-Author: yac <yac@blesmrt.net>
-Date:   Wed May 8 05:44:00 2013 +0200
-
-    fix #7
-
-diff --git a/svg2rlg.py b/svg2rlg.py
-index cc812b2..80d72de 100644
---- a/svg2rlg.py
-+++ b/svg2rlg.py
-@@ -1573,4 +1573,4 @@ def main():
-     name, ext = os.path.splitext(filename)
-         
-     drawing = svg2rlg(source)
--    drawing.save(formats=['pdf'],outDir='.',fnRoot=name)
-+    drawing.save(formats=['pdf'],outDir=os.getcwd(),fnRoot=name)
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
deleted file mode 100644
index bba039ed4aed..000000000000
--- a/media-gfx/svg2rlg/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		The tool can be used as a console application to convert SVG to PDF files.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">svg2rlg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
deleted file mode 100644
index 45e19a443916..000000000000
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="python tool to convert SVG files to reportlab graphics"
-HOMEPAGE="https://code.google.com/p/svg2rlg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/reportlab[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-issue-3.patch"
-	"${FILESDIR}/${PN}-issue-6.patch"
-	"${FILESDIR}/${PN}-issue-7.patch"
-)
-
-python_test() {
-	${EPYTHON} test_svg2rlg.py
-}
-
-python_prepare_all() {
-	find -name '*.py' -exec sed -i 's:\r::' {} + || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest
index e075b81197aa..7d2c2146b404 100644
--- a/media-gfx/tachyon/Manifest
+++ b/media-gfx/tachyon/Manifest
@@ -1,5 +1,8 @@
 AUX tachyon-0.99_beta6-ldflags.patch 939 BLAKE2B e0c96b6e46fe53e58eba7077a76003d06543c6d95714b49977bc2eb130f327758e82c1b93bbc436baf1d467b5d870a1636483ec1db747692d27f052a270f3506 SHA512 a57a66fd72295b74de7ec94bf1a0b4c75fc61c1189bf0c4eb288a274915f72c97c869b60aad167a73d78c7242821e522de22e4de99ab13a3f61367568bfb5acd
+AUX tachyon-0.99_beta6-r2-ldflags.patch 856 BLAKE2B 5d8587eac987a66758f0314afb5bba620fbbb99b32d295e4deb649a929ac19afd52c835f375d72bd2284b3cd4d9185c272090d2a27d06ea0220d1c59b03bb995 SHA512 2807689e3bad156d3d54a0f4dce5e6aaf7555750c6650aa3957bd3ae51922ed3f8489534528de45c22d75db85450340d674a621e608668cde972df12c03a63b0
+AUX tachyon-0.99_beta6-r2-shared.patch 8043 BLAKE2B 6d559c22477de0e3148e374a8db2faa1e8249d0599409f9d8cfc843d06c1960639f74797414328c40a7fa46c9143cefb208ab68f4d47e3c0b8fd0dbde1ea951d SHA512 eb9c2e43c679030b410d5f9077e85969ee9ec3926f7c44eb9047c902f5834dd4734af3f07105f116b4dc23c0d420f87d67193a759d329810ca168ac4a28f95ad
 AUX tachyon-0.99_beta6-shared.patch 8065 BLAKE2B 7336cf23288d2a20df3ab8373508b3720b6ac2e381987a645aded0c5d189bbe73d8e12211f36ea4fc0256de662cd7b2b51eee03fdce6daa195f504eaa1e1cf5e SHA512 535a3e6524d6d788e1eabf73fb5cd1bbbb2cbc6fb32294895762cf2405360c40861b1813b3b15bea6f28577595bffd84607997a9964bd743722b003acc1dfd17
 DIST tachyon-0.99b6.tar.gz 2981568 BLAKE2B 69e96362d5914db7cfeaf36a7c0fc57ebe2bff07c6c2c4b13107edb17146577df73ad7dbf740d402e322f1fb2df9cde79e634170ecd9d49037beb678de42df83 SHA512 4d0d707bf46528b87bfe1a05f490f40bcbee8f21271c5212247d4fd25956a27ad8a40b4621817a3f1c03495f1ba9eeb99b152929fdcd92c7118a35ef116f3f33
 EBUILD tachyon-0.99_beta6-r1.ebuild 2784 BLAKE2B d6be9c093dbaf9916adcd0222bbfdc205d2530000fdad67aa2e7eabee6b166e20a8810b3916f7a3b1e9a4ee065b41868aaaa9c63db6c4635bd2360074cb5fb3e SHA512 ed925e8dcb650254e4c60f375850c89d16dbc6a75997b8360bad2fec0e645c5cc970a8cbfb7968e494a73cc5d781c65f3d073de830db8112c5e177058b0584e5
+EBUILD tachyon-0.99_beta6-r2.ebuild 2551 BLAKE2B 83de93fdbceb34e9433ba11bb7af2e6d86859030c38553a586078debdbb55d4df44bc6273019b93d7dfcde11a3e9ebc509b3b321cdd75399b1191df37fd4a562 SHA512 1bea42b5b7865fcf0db1659c1862858f56b3e4b7f31dabaa672300b99485c9faa70c3a0b9305f5c6b1836deeaee4843ed553bd2c0275d699b5773efdf43c3ca6
 MISC metadata.xml 339 BLAKE2B 342dd48842a409d4be459fcfd339f485ed05f838cf9dfe4d3f5695cee5ca0dc3f09623c4b4adddc1661b02ae5f066e11b97551ec0ef0771269fd89972ebda7ad SHA512 ceba0ae3ec140c4efe0d1708243954fb3bc9804109727610079712a5ce91f5133197e61a2c3bb4dcfd6f743dcfcbc829cc68f5def0b2aa023e3eeb5dfa09a68a
diff --git a/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-ldflags.patch b/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-ldflags.patch
new file mode 100644
index 000000000000..220589a8f548
--- /dev/null
+++ b/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -121,7 +121,7 @@ ${MGFLIB} : ../libmgf/Makefile
+ 	};
+ 
+ ${ARCHDIR}/tachyon : ${RAYLIB} ${PARSELIB} ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} 
+-	${CC} ${CFLAGS} ${DEMOINC} -o ${ARCHDIR}/tachyon ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} -L${RAYLIBDIR} ${PARSELIBS} ${LIBS}
++	${CC} ${CFLAGS} ${LDFLAGS} ${DEMOINC} -o ${ARCHDIR}/tachyon ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} -L${RAYLIBDIR} ${PARSELIBS} ${LIBS}
+ 	${STRIP} ${ARCHDIR}/tachyon
+ 
+ ${ARCHDIR}/animray : ${RAYLIB} ${OBJDIR}/mainanim.o
diff --git a/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-shared.patch b/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-shared.patch
new file mode 100644
index 000000000000..8bd37071a8dc
--- /dev/null
+++ b/media-gfx/tachyon/files/tachyon-0.99_beta6-r2-shared.patch
@@ -0,0 +1,179 @@
+diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile
+--- a/Makefile.shared	2011-02-07 16:14:38.000000000 +0100
++++ b/Makefile	2011-07-23 20:23:51.000000000 +0200
+@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon
+ #
+ # Name of raytracing library file to create
+ #
+-RAYLIB=${ARCHDIR}/libtachyon.a
++RAYLIB=${ARCHDIR}/libtachyon.so
+ RAYLIBDIR=${ARCHDIR}
+ 
+ #
+@@ -251,124 +251,125 @@ RAYOBJS= ${OBJDIR}/api.o \
+ 	${OBJDIR}/tgafile.o \
+ 	${OBJDIR}/winbmp.o
+ 
++VERSION=$(shell grep TACHYON_VERSION_STRING ../src/tachyon.h | cut -d\" -f 2)
++${RAYLIB} : DIRNAME=tachyon-${VERSION}
+ ${RAYLIB} : ${RAYOBJS}
+-	rm -f ${RAYLIB}
+-	${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS}
+-	${RANLIB} ${RAYLIB}
++	${CC} ${LDFLAGS} -shared -Wl,-soname,libtachyon.so.${VERSION} -o ${RAYLIBDIR}/libtachyon.so.${VERSION} ${CFLAGS} -fPIC ${RAYOBJS} ${PNGLIB} -lm -lpthread ${JPEGLIB}
++	ln -s libtachyon.so.${VERSION} ${RAYLIBDIR}/libtachyon.so
+ 
+ ${OBJDIR}/vol.o : ${SRCDIR}/vol.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o
+ 
+ ${OBJDIR}/extvol.o : ${SRCDIR}/extvol.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o
+ 
+ ${OBJDIR}/winbmp.o : ${SRCDIR}/winbmp.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o
+ 
+ ${OBJDIR}/vector.o : ${SRCDIR}/vector.c ${OBJDEPS} 
+-	${CC} ${CFLAGS} -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o
+ 
+ ${OBJDIR}/triangle.o : ${SRCDIR}/triangle.c ${OBJDEPS} ${SRCDIR}/triangle.h
+-	${CC} ${CFLAGS} -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o
+ 
+ ${OBJDIR}/trace.o : ${SRCDIR}/trace.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o
+ 
+ ${OBJDIR}/threads.o : ${SRCDIR}/threads.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o
+ 
+ ${OBJDIR}/tgafile.o : ${SRCDIR}/tgafile.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o
+ 
+ ${OBJDIR}/util.o : ${SRCDIR}/util.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o
+ 
+ ${OBJDIR}/ui.o : ${SRCDIR}/ui.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o
+ 
+ ${OBJDIR}/texture.o : ${SRCDIR}/texture.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o
+ 
+ ${OBJDIR}/sphere.o : ${SRCDIR}/sphere.c ${OBJDEPS} ${SRCDIR}/sphere.h
+-	${CC} ${CFLAGS} -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o
+ 
+ ${OBJDIR}/sgirgb.o : ${SRCDIR}/sgirgb.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o
+ 
+ ${OBJDIR}/shade.o : ${SRCDIR}/shade.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o
+ 
+ ${OBJDIR}/ring.o : ${SRCDIR}/ring.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o
+ 
+ ${OBJDIR}/render.o : ${SRCDIR}/render.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o
+ 
+ ${OBJDIR}/quadric.o : ${SRCDIR}/quadric.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o
+ 
+ ${OBJDIR}/jpeg.o : ${SRCDIR}/jpeg.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o
+ 
+ ${OBJDIR}/pngfile.o : ${SRCDIR}/pngfile.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o
+ 
+ ${OBJDIR}/ppm.o : ${SRCDIR}/ppm.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o
+ 
+ ${OBJDIR}/psd.o : ${SRCDIR}/psd.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o
+ 
+ ${OBJDIR}/plane.o : ${SRCDIR}/plane.c ${OBJDEPS} ${SRCDIR}/plane.h
+-	${CC} ${CFLAGS} -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o
+ 
+ ${OBJDIR}/parallel.o : ${SRCDIR}/parallel.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o
+ 
+ ${OBJDIR}/objbound.o : ${SRCDIR}/objbound.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o
+ 
+ ${OBJDIR}/light.o : ${SRCDIR}/light.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o
+ 
+ ${OBJDIR}/intersect.o : ${SRCDIR}/intersect.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o
+ 
+ ${OBJDIR}/imageio.o : ${SRCDIR}/imageio.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o
+ 
+ ${OBJDIR}/imap.o : ${SRCDIR}/imap.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o
+ 
+ ${OBJDIR}/grid.o : ${SRCDIR}/grid.c ${SRCDIR}/grid.h ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o
+ 
+ ${OBJDIR}/global.o : ${SRCDIR}/global.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o
+ 
+ ${OBJDIR}/hash.o : ${SRCDIR}/hash.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o
+ 
+ ${OBJDIR}/cylinder.o : ${SRCDIR}/cylinder.c ${OBJDEPS} ${SRCDIR}/cylinder.h
+-	${CC} ${CFLAGS} -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o
+ 
+ ${OBJDIR}/coordsys.o : ${SRCDIR}/coordsys.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o
+ 
+ ${OBJDIR}/camera.o : ${SRCDIR}/camera.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o
+ 
+ ${OBJDIR}/box.o : ${SRCDIR}/box.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o
+ 
+ ${OBJDIR}/bndbox.o : ${SRCDIR}/bndbox.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o
+ 
+ ${OBJDIR}/apigeom.o : ${SRCDIR}/apigeom.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o
+ 
+ ${OBJDIR}/api.o : ${SRCDIR}/api.c ${OBJDEPS} ${SRCDIR}/sphere.h ${SRCDIR}/plane.h ${SRCDIR}/triangle.h ${SRCDIR}/cylinder.h
+-	${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o
+ 
+ clean :
+ 	@echo "Cleaning object files, binaries etc."
diff --git a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
new file mode 100644
index 000000000000..98955dfa2200
--- /dev/null
+++ b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A portable, high performance parallel ray tracing system"
+HOMEPAGE="http://jedi.ks.uiuc.edu/~johns/raytracer/"
+SRC_URI="http://jedi.ks.uiuc.edu/~johns/raytracer/files/${MY_PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos ~x86-macos"
+IUSE="doc examples jpeg mpi +opengl openmp png threads"
+
+PATCHES=(	"${FILESDIR}/${PF}-ldflags.patch"
+		"${FILESDIR}/${PF}-shared.patch"  )
+
+CDEPEND="
+	jpeg? ( virtual/jpeg:0= )
+	mpi? ( virtual/mpi )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)
+	png? ( media-libs/libpng:0= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${PN}/unix"
+
+src_prepare() {
+	emakeconf=()
+	use jpeg && \
+		emakeconf+=(
+			USEJPEG=-DUSEJPEG
+			JPEGLIB=-ljpeg
+		)
+
+	use png && \
+		emakeconf+=(
+			USEPNG=-DUSEPNG
+			PNGINC="$($(tc-getPKG_CONFIG) --cflags libpng)"
+			PNGLIB="$($(tc-getPKG_CONFIG) --libs libpng)"
+			)
+
+	if use mpi ; then
+		sed \
+			-e "s:MPIDIR=:MPIDIR=/usr:g" \
+			-e "s:linux-lam:linux-mpi:g" \
+			-i Make-config || die "sed failed"
+	fi
+
+	LIBSLINE='"'
+	CFLAGSLINE='"'
+	use mpi || CCLINE="\"CC = $(tc-getCC)\""
+	use mpi && CCLINE="\"CC = mpicc\""
+	LIBSLINE+="LIBS = -L. -ltachyon \$(MISCLIB) -lm"
+	CFLAGSLINE+="CFLAGS = -DLinux \$(MISCFLAGS)"
+
+	use threads && CFLAGSLINE+=" \$(THREADSFLAGS) -D_REENTRANT"
+	use threads && LIBSLINE+=" -lpthread"
+	use openmp && CFLAGSLINE+=" -fopenmp -D_REENTRANT"
+	use opengl && CFLAGSLINE+=" -DUSEOPENGL \$(LINUX_GLX_INCS)"
+	use opengl && LIBSLINE+=" \$(LINUX_GLX_LIBS)"
+	use mpi && CFLAGSLINE+=" \$(MPIFLAGS)"
+
+	CFLAGSLINE+=" ${CFLAGS}"
+	CFLAGSLINE+='" \'
+	LIBSLINE+=" ${LDFLAGS}"
+	LIBSLINE+='" \'
+
+	export TACHYON_MAKE_TARGET="gentoo"
+
+	echo "gentoo:" >> Make-arch
+	echo "	\$(MAKE) all \\" >> Make-arch
+	echo '	"ARCH = gentoo" \' >> Make-arch
+	echo '	"STRIP = touch" \' >> Make-arch
+	echo "	${LIBSLINE}" >> Make-arch
+	echo "	${CFLAGSLINE}" >> Make-arch
+	echo "	${CCLINE}" >> Make-arch
+
+	default
+}
+
+src_compile() {
+	emake "${TACHYON_MAKE_TARGET}" "${emakeconf[@]}" VERSION="${PV}"
+}
+
+src_install() {
+	cd .. || die
+	dodoc Changes README
+
+	insinto "/usr/include/${PN}"
+	doins src/*.h
+
+	use doc && docinto html && dodoc -r docs/tachyon/.
+
+	cd "compile/${TACHYON_MAKE_TARGET}" || die
+
+	dobin "${PN}"
+	dolib.so lib${PN}.so*
+
+	if use examples; then
+		cd "${S}/../scenes" || die
+		insinto "/usr/share/${PN}/examples"
+		doins *
+	fi
+}
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 79054711f1a3..5a405504b736 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -2,5 +2,5 @@ AUX 0.17-Replace-calls-to-getenv-with-g_getenv.patch 1182 BLAKE2B 37a7f395e35a8a
 DIST viewnior-1.6.tar.gz 168966 BLAKE2B 1a04ec6ee4e05da8d0721115826d2550c7d24b4299c105eb6de7ec3fe74b350b49605dbe5246a5acd93562fd904923053ab99a5741b929abd99ace8b2ad148cc SHA512 4b150078573bfd3b8c5863d73087a51cd3b7ed5781e26c842fab44eec3e67ea9aea3feba064538578878df1ccb386525a6a84362dae7f92315fb7de735ace617
 DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5
 EBUILD viewnior-1.6.ebuild 932 BLAKE2B 421cec0425ef6008090cdea7df88f90c45641f0a26355fcedaaf86c9f11f797cdcdcded489c233ca128ed87dd0863f1965013899c6421584f44d6d7e1dbb5d18 SHA512 847f9cd4e8c24460e77df21e99899507f2adf634fdc605bf3884ba0ba317b84e468218ce5f0b46a6d96b8b6c94966c0dd0b170d330cd22ba2c4069bcd4529303
-EBUILD viewnior-1.7-r1.ebuild 1281 BLAKE2B 8511b12f5b8385a0bbe72487581e48bd07b8114bf5a1b9123eb52a9931548009c5890e224308a00b8b0ad903124e61bd9d2f0f56e724dd31d6f7ead393167f23 SHA512 26230d6decb78d12cea8cf2ee5d333622b7c02bcae848396b7fb7cceea76096617423e1b6d125c74281dd07fdc0d358fd0029fac0b0442292e06ef5868148224
+EBUILD viewnior-1.7-r1.ebuild 1279 BLAKE2B 4302bd5b94b27ff3e5b0f8db78a3f5e7fc092a7f861c3edec053f050368b136b44d19ae151331c4f4a7c915d56c5609fda2099c075fb2e3a944e7ecd598b7a35 SHA512 c974ab91c7110447b9d51a2e6a0481730452bfd8d3d0090ea6b631df0e890a3e0fbfb280e6836a28e01c1f26ecaf36b67ee848d9842bd1268e8f9e9949f3f2c9
 MISC metadata.xml 522 BLAKE2B 3f08e8b96d95c32bc0c2265afa2b580b92258060f4964c9f595da738fe96814406f8d8cc67965b985b714abded06d848df43bbd9fb72641b1123bbe1fd6f348a SHA512 94a9310a1eb358b2468caf0c21a5d799b81049483443b87e0fd4abe644295390f1703ec1b7a58562db89b353632f682f555cec64f41969e3a3e90017cb5913da
diff --git a/media-gfx/viewnior/viewnior-1.7-r1.ebuild b/media-gfx/viewnior/viewnior-1.7-r1.ebuild
index 57b9250ec62d..65dbbf38b891 100644
--- a/media-gfx/viewnior/viewnior-1.7-r1.ebuild
+++ b/media-gfx/viewnior/viewnior-1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hellosiyan/${MY_PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 581da18e0595..db111c5802d0 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -4,8 +4,10 @@ DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 10b14e8dd29daf74fd6af9229341296fa457df4
 DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244 SHA512 db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7
 DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235 SHA512 6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10
 DIST wings-2.2.5.tar.bz2 3211359 BLAKE2B d5aa7ea337894f18d6b45ff7e68bb35d587da47bf173045d80eb643d748fc64a511db305d1dc164789b06aa34ea47549a04a05564fa615bf01532da294768cd3 SHA512 343fd601a68cccff0151748f151c85635bf57acc01c25fd2ba770f255d65e73a49671c3a84c4433576c1ba3f9e98a2d098a47e3674d4617a07817973bee0136a
+DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208 SHA512 dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4
 EBUILD wings-2.1.5.ebuild 1227 BLAKE2B 99b1a96187c9ce18f06178f1de1d770553b49a6868df2cdf95fb094706b66ec7eeca4ff1b7bbe53d0d3808f4952fc839e5f6a1cc694bbf5b6ed701ae872e6f8d SHA512 f96956083b40c8dac25b07d5710b6585e83f4de755e872beb6066a821ccadfc4c561ecc0cad8b72b0c9fcbee2479f432533ed6355fbab7a91e6d515b8d62526c
 EBUILD wings-2.1.6.ebuild 1229 BLAKE2B dec57c2c9815bc5f7f1b0d406b04cfcd5b5c2796387fb3f9019b8f6b2c0cb1da375e8a3edb1df864bc3748e39c81c141bc2f6972df82bd3240e0a0cff9f24289 SHA512 dd36fec8555b57509ae7970c98dd644476364f439f798af652796e7edd73ec0fc001abd57f74c99944daa3503d67dc2cd6ed15dc6911702dac67fcfb33f3c091
 EBUILD wings-2.1.7.ebuild 1229 BLAKE2B dec57c2c9815bc5f7f1b0d406b04cfcd5b5c2796387fb3f9019b8f6b2c0cb1da375e8a3edb1df864bc3748e39c81c141bc2f6972df82bd3240e0a0cff9f24289 SHA512 dd36fec8555b57509ae7970c98dd644476364f439f798af652796e7edd73ec0fc001abd57f74c99944daa3503d67dc2cd6ed15dc6911702dac67fcfb33f3c091
 EBUILD wings-2.2.5.ebuild 1034 BLAKE2B 5ad8926041f33e1eaf6dacec8c12acfd5668a4ec9149cb964096e88e921b5e41bc41cee8a7a2c55ee0e5d2948d6fabf887c5483f2fdf46a3c640c894350494bd SHA512 1a2717be399c5ed478e2099a82b0953eac8b4675c2078b5bc7659023df0f6902f6e99c2136682a7faacadcf7dfaf01b74731c9cacbd31d1f69d46fb77ff6fd8f
+EBUILD wings-2.2.6.1.ebuild 1034 BLAKE2B f3216f917744465ace1882b970b6501a197059953cce001d72f525825bf44c7d01a5f0ebd3db5671c09be5e2a0a94fad30d331e4251590c9da8b2ae6e6e8eb5f SHA512 1cf1d639585abfe8237caec443b277ed112c454d94eb5ebdd0450b57ab7c7eedc7558e3b43b292b2fa1b8333c173ad9835a5a806ba93036dc7001071a3db7460
 MISC metadata.xml 730 BLAKE2B c74a1bbba0f4b98683e0d3d1d5045ffdfc7ea81b6180cd7ee967bb3846f446e5bda5528bec501e7941c076d6bc755cc0fb1b005506203d7ef57ccb15378724bd SHA512 7672ac58e0f7ba153b0a5939cf8e426e8c3f8c97366436340e1bbb65e85a785add4c6394e81e1aade634f58d8751a85ba75cbb1bb57fa822773a632736d96086
diff --git a/media-gfx/wings/wings-2.2.6.1.ebuild b/media-gfx/wings/wings-2.2.6.1.ebuild
new file mode 100644
index 000000000000..81caee71f2ed
--- /dev/null
+++ b/media-gfx/wings/wings-2.2.6.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/"
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| (
+		<dev-lang/erlang-21[smp,wxwidgets]
+		>dev-lang/erlang-21[wxwidgets]
+	)
+	dev-libs/cl
+	media-libs/glu
+	media-libs/libsdl[opengl]
+	virtual/opengl
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_compile() {
+	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+	# Work around parallel make issues
+	# Set ER_LIBS to the top source directory
+	emake vsn.mk
+	for subdir in intl_tools e3d src plugins_src icons; do
+		emake -C ${subdir} opt ERL_LIBS="${S}"
+	done
+	default
+}
+
+src_install() {
+	WINGS_PATH=${ERL_PATH}/${P}
+	dodir ${WINGS_PATH}
+
+	find -name 'Makefile*' -exec rm -f '{}' \;
+
+	insinto ${WINGS_PATH}
+	doins -r e3d ebin icons plugins priv psd shaders src textures tools
+
+	newbin "${FILESDIR}"/wings.sh-r1 wings
+	dodoc AUTHORS README
+}
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 6564c69ed3c4..8846fe4240e0 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -9,5 +9,5 @@ AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1
 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
 EBUILD zbar-0.23-r1.ebuild 5030 BLAKE2B 53eda120af7cfab90e0894f8e8e07a92f2a45b0c4e4187e161ba877d49bfa044f9c207c7f6123ef3605bca451aa8f56f5a4537eb29d96a4474f8e251d44c9991 SHA512 6968f47c8a701b8d97c4abecccad03c26ba9e52cd58247a89ad34a4c1817e7d46763757dc4e92647ea3dbf637496397c85842de141aa0261b62665824d6afe95
-EBUILD zbar-0.23.1.ebuild 5181 BLAKE2B 1747eab55152a9b46cb12f81be7c17d83b804c25a51231c6f78f08fe4791ba9e398f116d0e792437b993c83f26112f640fb7c436628c6baa38c955539dedad0f SHA512 dd167474e1b85eca3c9f8e624f25f27d4b6edbbfb69e8c56353371f6227a1257cc43879ea7dd81b7b4b6089cbda0ebed7d69c63b8e0fff9679f26ccc63f09f2a
+EBUILD zbar-0.23.1.ebuild 5234 BLAKE2B 5cd8187f7d4e8fd901faa4b2a19440961bc9b0006c7c99c7006df1eee938700d3de6484267435e93d1022fe6dddc33cd4ab138e26d3ee8b9150ae8196122ea98 SHA512 3af907e799c8f213358930af9740c8a66007863970246ac3103b5dadafc8f9e6a694a74f57a5c24dc415b9cbc965d45f7c90e6fe2282dccf3495e1b61ccec6f5
 MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
index c284e6b7e988..79c9d2c02b86 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -193,6 +193,8 @@ multilib_src_configure() {
 		use test && myeconfargs+=( --without-zbarimg-tests )
 	fi
 
+	# use bash (bug 721370)
+	CONFIG_SHELL='/bin/bash' \
 	ECONF_SOURCE="${S}" \
 		econf "${myeconfargs[@]}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /media-gfx
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)