gentoo resync : 18.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-18 10:15:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-18 10:15:03 +0000
commit: b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree: 16fe44748708acacd909d4e2e160a09a7f6d936a /media-gfx
parent: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)
60 files changed, 649 insertions, 1130 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b6ddb239a527..e8cb86c97a4d 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 951ad663870b..c426f2124028 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -19,9 +19,9 @@ DIST asymptote-2.47.src.tgz 3621676 BLAKE2B 575032093276b9df6b8d74897a4721dd0d54
 DIST asymptote-2.48.src.tgz 3729763 BLAKE2B 5820ddbbd27f6e7296501f50f25051d8417a0ab24d7c4c777013bf23601b5cbe34a69ba781e16e05141fda4e2e7a8bc527a41829f8d9e983aadc19bd05743122 SHA512 cd8b756185ae6627ea66bcaea224152f6644df633fe7ed40c1738f3b2ec31fbaa7ba97f2b1e290b073995779768ee3a264dd942f609b768cab7624d12807583d
 DIST asymptote-2.49.src.tgz 3730453 BLAKE2B b52c2fbac5ea9c6046f2bd2990c7f3792823ae0ecd749c58990bcee898b8af7d26c4b457bee6aa15fb11e3c63a7cdc6d7e4976418ee96fc4470a17f3202d79cd SHA512 08c20e45ab764281b480a97c5e2294cdfcc18b179cbdc85cf9956806b40fe305360d589077bd3ac429985503b0e7d17c889a37349d8c6fdf8ccbd8d822544226
 DIST asymptote-2.60.src.tgz 4650347 BLAKE2B d969e4716a2493ae926ea1f58d0b247986e49a6a1902fb94859a45177ece4f149f5875cf788eace1c27c968652c49b2ace7b98aba02380cf8e1e3d4231560476 SHA512 a0653b9647d8c2a77656ea82faf8b69d28a43cf5ac61cfa9c6c62e2c51b4939e83202b95056495d10bee86a81e48b765ed4604a4d882a47a36b1dd6d5f9ad96b
-EBUILD asymptote-2.41-r1.ebuild 4672 BLAKE2B 3b0b7c2f37727b801dba23f9d08b6725f76aa8ce6e5bcd18997bb15e730499eb7e4e92c54fb141ce4edc6d447f35f0870274df6900e3b03cea4fbb6bc9ed8b00 SHA512 aacd5ffff6ff44e5d0a7c645e4cba18d8d0c8b70474a7d9472e8965aa7fb3a4336bed7af0bd22505f719354d8bb30f92aa2fb6b4f1ee976e2217820248aed523
-EBUILD asymptote-2.47.ebuild 4615 BLAKE2B 1924537e78957d575bc63607d9c09ba6c0e08ea52bdf778525418f307c1f7b20f038a82451bcfc8f939ecf3d01c8f7bd92a2c89363367aa31ce75860d5fa873f SHA512 60ae4850de58fec996d69a86fc223c4fa4f503df9195a0e0d0cfed3298e7722fcd0fcd9224ffe55971938ff4c99ca6f8fa2dbfdf45660125b54576d1c222fb32
-EBUILD asymptote-2.48-r1.ebuild 4661 BLAKE2B 2afb63bfb99ea550aedc51380ac4175237dfc91ec54cb49aaf4fe0fc46df5d9aea5a65afb46d275f84d2bcb22cbc120e56c62dd0eeb08ced9c9aa8067143bf0d SHA512 967212f30e642bc17a1255dc6db91fd719efa0d651f969821207136532b1ee2932d1585d9e4869a60c1241b0bdabfbd1fd473e0dfa51cafec405304712157cad
-EBUILD asymptote-2.49.ebuild 4602 BLAKE2B e00d8b2cd0ea10e7a2b127e9f82bc21d1553c2d105580aac7b8cf9ed6e9870262c0441bb316c1078ed17f6da02192599e7afd2f2b8e6e65e69e3452de570c305 SHA512 15b12de5d134c9584d55725b27b6c3822ec9f696e5503398d860db9c54fc25962e893c8e6fead9712742a01f9b7b1c392f372937edc8b90d4d37ec63d59c001d
-EBUILD asymptote-2.60.ebuild 4602 BLAKE2B e00d8b2cd0ea10e7a2b127e9f82bc21d1553c2d105580aac7b8cf9ed6e9870262c0441bb316c1078ed17f6da02192599e7afd2f2b8e6e65e69e3452de570c305 SHA512 15b12de5d134c9584d55725b27b6c3822ec9f696e5503398d860db9c54fc25962e893c8e6fead9712742a01f9b7b1c392f372937edc8b90d4d37ec63d59c001d
+EBUILD asymptote-2.41-r1.ebuild 4699 BLAKE2B 59a57de3618882d0d6068980358ad0a6477eee4359e9284051a94d3a045a8853292f21cf299869035ca329120fea658494f8189e9871c1fd5af45959d7f520c8 SHA512 08918fb1af35f5d3729257fc274ef19c8c37518c65b3dbe5833c0039fa8b751bb86613a4c7b93f48d78e695195645c5623f940a91505a4ba8fc21e272d769448
+EBUILD asymptote-2.47.ebuild 4642 BLAKE2B 2a1074a1e15004e007aa5677d1b28f4691a34437a2b2ad00aa7bb3274e0c074436011f0fe61f18fa04ccf75ebc8f639a226249304ed9cc281fbeb9448ad4ea72 SHA512 673eae19940ac799f9e997c7c199b84aa0daea590ceddf92d580bad25dc74506e4890901ec86f5cf1c4160f26243f31455cd686717d9b91d63381b0c501f9dc3
+EBUILD asymptote-2.48-r1.ebuild 4688 BLAKE2B a7ee10f84a9d9e1288813f986ca555f9ab597b1849a87cf89e8ed267bc57db2ecb13ae19c29db62884b6a1841d8b0f2ca111bc18a21af194d57c176033bf3ad3 SHA512 b2484d43cdc0a9d70cbf4bbdf137059e2330c86d625b2c02b50254dff966a39762f53e83e63dda5e76d2d2ecca33d4dc5dab667baa450314beeb4d77ad304800
+EBUILD asymptote-2.49.ebuild 4629 BLAKE2B 374f0d52308a20a93dd2d87ef49d6a1b3df60a41f8581277611905d4521a1b137b4fd45fbaa4f9cd0c45f52bc1d777d0c1db4dcbac986d4c0dae939056de4fb5 SHA512 74f2ca8df36bcdc97ad7ad1127e714839830d4b812bfae2dc125b59b7a26f4dbaa0cd406d20c71327363a41d305e6d5a15caa274d94ed0aa505cbd73da848bee
+EBUILD asymptote-2.60.ebuild 4560 BLAKE2B e051d01f655a987b8d95a7e8ecaeb531504d2294a3f1c896e4a8956f4df2efec3e1f48d2d9016b308e50dc3737a1b8c554f6e7612da4339a9cef6128df2b9d62 SHA512 15855d03cbd9510b6bcf72cf1edf1b8e5d5f514169fcadc21e76f4d0f81c8bed00f2062ccfb854f302d6213548864b5b013a706276e6d779001a3d380b142ff2
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.41-r1.ebuild b/media-gfx/asymptote/asymptote-2.41-r1.ebuild
index 217c37ad1255..a9cac4411335 100644
--- a/media-gfx/asymptote/asymptote-2.41-r1.ebuild
+++ b/media-gfx/asymptote/asymptote-2.41-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/media-gfx/asymptote/asymptote-2.47.ebuild b/media-gfx/asymptote/asymptote-2.47.ebuild
index a22f78842577..77448ad65450 100644
--- a/media-gfx/asymptote/asymptote-2.47.ebuild
+++ b/media-gfx/asymptote/asymptote-2.47.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/media-gfx/asymptote/asymptote-2.48-r1.ebuild b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
index 24ae7be985c2..2c4a4f4d8894 100644
--- a/media-gfx/asymptote/asymptote-2.48-r1.ebuild
+++ b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/media-gfx/asymptote/asymptote-2.49.ebuild b/media-gfx/asymptote/asymptote-2.49.ebuild
index d424b071ff4c..22a6d01b693b 100644
--- a/media-gfx/asymptote/asymptote-2.49.ebuild
+++ b/media-gfx/asymptote/asymptote-2.49.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/media-gfx/asymptote/asymptote-2.60.ebuild b/media-gfx/asymptote/asymptote-2.60.ebuild
index d424b071ff4c..bef7be52b544 100644
--- a/media-gfx/asymptote/asymptote-2.60.ebuild
+++ b/media-gfx/asymptote/asymptote-2.60.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -133,7 +134,7 @@ src_install() {
 		insinto /usr/share/${PN}
 		doins -r GUI
 		chmod +x "${D}"usr/share/${PN}/GUI/xasy.py
-		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
+		dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy
 		doman doc/xasy.1x
 	fi
 
@@ -186,14 +187,12 @@ src_install() {
 	if use doc; then
 		cd doc || die
 		doinfo ${PN}.info*
+		dodoc ${PN}.pdf CAD.pdf
 		cd FAQ || die
 		dodoc asy-faq.ascii
 		doinfo asy-faq.info
-		insinto /usr/share/doc/${PF}/html/FAQ
-		doins asy-faq.html/*
-		cd .. || die
-		insinto /usr/share/doc/${PF}
-		doins ${PN}.pdf CAD.pdf
+		docinto html/FAQ
+		dodoc asy-faq.html/*
 	fi
 }
 
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 543a04b20dd4..41b4bee28cd7 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,6 +1,7 @@
 AUX blender-2.79b-ffmpeg-4-compat.patch 2052 BLAKE2B 3e9f341416a3dc629d950623cc54da4c2984c7f73b6565cb7cb0aa00bf86eec725f0fdc503a517b29282596669de108d1dbe2c9783c8a0da412a6d14834d5cdf SHA512 afd90ee52a2a7d955417450e92642e2169c1f0e6d20d96a1f08521db718bc224941c15d23152eb3fcde1b4dc84ffb52162d77b23252ef8250a6b5ddbcd8ca67d
+AUX blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch 1265 BLAKE2B bff3ae55e61e7ad3b14d190b28b2a3ec932be020c9cc15365142bd8c9fb23d9b559209690fb2554bb82c0221a51329a2056d50c0876d2f91ea5c047dd4d00762 SHA512 295daedff4cce243d47133116443d4e0e91a263d56a9303aeec214984faa83bc54a7736848a684120cb8a397f95b1d8c5caa74c9369368723d8d6facf6888618
 AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316a95e67a76ecdeb303fadeeca14338ba823d6780a50b62bf4686477a962030b42b15ceae12d48ab21034b0358cc1 SHA512 df0a6a0543a7feac22e6082652792e59ce675dcea99a821c480d5c13e42e9df4d7ab43c71d296a22dd195771714e630757b1e220177d3713f409ea21e9251504
 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec
 DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
-EBUILD blender-2.79b-r1.ebuild 8140 BLAKE2B 4378e2bb61c8a9c6627d6eb67664c383b4a75eca548c2c007d58680b543c3d17b593b2c1da52326a2347b1f5f7f6efb6a6a4e880d005417a19f82f91c1f2cfd3 SHA512 1d6a6391d2497217e0c9661fdb7f42e5f2442061568c70274e699068623d810800064e0892a08e22e1465b0b23cb860bf82e8c8cb6250c75d0944b2c0227e14d
+EBUILD blender-2.79b-r1.ebuild 8230 BLAKE2B 120ef289db6200c4eb72213d2bd898b505ad3c505d89a6b0141090121916d11a88abda9ded45be0cb84473cf4aa5ba6b8b448f9cf287830db05b9cbdfca32896 SHA512 416525de3c2d9f3e0a815f209a44acd962e8ae1f2f9bec5ffa082d81ceadd21c98dc62b698973e5328ac5f5066c5fc67b60eaf620ff58ff7fdbfce10ebd1ed03
 MISC metadata.xml 2628 BLAKE2B b6ac04e033bd54bf3b6918737289e0a12ece3f87543b033ff85748934b6cecdb0cf8084a3c0e7fd766965b6defa4a402980244bec1a0ed2772ffbd12bfe96a8f SHA512 a47e7a85cc98bf0befad9b5ef5ad75276a6649bb5949367294177f19ae763a3dd0eae1ce8d179463c18c33533c37c283c7beabe08fe27d861bd54eb761675e35
diff --git a/media-gfx/blender/blender-2.79b-r1.ebuild b/media-gfx/blender/blender-2.79b-r1.ebuild
index 147bcd56b0d9..a84c696b9b17 100644
--- a/media-gfx/blender/blender-2.79b-r1.ebuild
+++ b/media-gfx/blender/blender-2.79b-r1.ebuild
@@ -24,6 +24,7 @@ IUSE="+bullet +dds +elbeem +game-engine +openexr collada color-management \
 	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
 	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
 	osl player sdl sndfile test tiff valgrind"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	cuda? ( cycles )
@@ -98,6 +99,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-fix-install-rules.patch"
 	"${FILESDIR}/${P}-gcc-8.patch"
 	"${FILESDIR}/${P}-ffmpeg-4-compat.patch"
+	"${FILESDIR}/${P}-fix-for-gcc9-new-openmp-data-sharing.patch"
 )
 
 blender_check_requirements() {
diff --git a/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch b/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch
new file mode 100644
index 000000000000..0ecc960d28e1
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch
@@ -0,0 +1,31 @@
+diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp
+index 68f7c04..514087b 100644
+--- a/intern/elbeem/intern/solver_main.cpp
++++ b/intern/elbeem/intern/solver_main.cpp
+@@ -381,7 +381,7 @@ LbmFsgrSolver::mainLoop(const int lev)
+ 	GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
+@@ -1126,7 +1126,7 @@ LbmFsgrSolver::preinitGrids()
+ 		GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
+@@ -1164,7 +1164,7 @@ LbmFsgrSolver::standingFluidPreinit()
+ 	GRID_REGION_INIT();
+ #if PARALLEL==1
+ 	const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel num_threads(mNumOMPThreads) \
+   reduction(+: \
+ 	  calcCurrentMass,calcCurrentVolume, \
+ 		calcCellsFilled,calcCellsEmptied, \
diff --git a/media-gfx/cptutils/Manifest b/media-gfx/cptutils/Manifest
index 83c0f686ec3a..2d066b46aa70 100644
--- a/media-gfx/cptutils/Manifest
+++ b/media-gfx/cptutils/Manifest
@@ -1,6 +1,3 @@
-AUX cptutils-1.68-parallel-make.patch 533 BLAKE2B 9c10239e962b8fbf850c61d1db47e76b174a3ff962809234af9a10491bf9277dea71aeff537a3c972c3c2e51e1fae523ac7d150bfed35588ab412068353edacc SHA512 d33473ae062c204b50e3167dba06f943f15e41578b64f5e73038aa173398ff0a324fbeb19b689e9e4900b7b4bce1e66b90e84692170bb0bda1f810176adbe8db
-DIST cptutils-1.68.tar.gz 623381 BLAKE2B 403d8ab3878c14b278d0e006fdd3f3f7223ae106c4b95fa10cebc9ffceb5a3164771a452996038d06e714b07dbeaafde33954f1428d20817fd02a991dcec3121 SHA512 e618ea4463a026c56c95e8e4a9bfb0f5d47825568e7f64885bcf3872d4411af4e1ff480f192c61d9d8c946a46100d148c849fd3768f3acd54b070aacdd8dc1cc
-DIST cptutils-1.71.tar.gz 626215 BLAKE2B 88d0166616d00df13011e8cea88d0cbe183e512f94ca2540ef135e8f77535087694f9aafe43b0e10307e513ba3c305881314bbd0890a3f9fd3f5b22da152a1a0 SHA512 65214a50f3741cc89ac4d3d92973f307c3030926e496a5cecf26dd7457d683296daf44ed0df7b1ddf96c657cebe7087193e410c109f6a6dd2fb6ae987158e778
-EBUILD cptutils-1.68.ebuild 878 BLAKE2B 7ab39b60998d54d11d668c1b63c55aa15421551e353cd218a2ec41fe6a4317635c27c201f90982eca0af94a2d1ba5c6e38600ee8731b93e5ab2bf089c0161b8f SHA512 c7acc7376ca5aab230afbe146e69ace064335dbc5b9d64f0cafb97d398e5ea3525ea90c1c74c4a3fdcf085ff2c4b66fa75d73956b15aa750fafa70ab2225fd48
-EBUILD cptutils-1.71.ebuild 839 BLAKE2B b970ab9b0e62ad3082773234a269397b025236af3fce97c334228f71108d17c32b5cc7de8269c3638185f6d06668389ecdc5d679d64a3cb7949debe21ba29bd2 SHA512 6bd753a9ac65d2442ffc8f285013a91361d48f592bf53f9b7820fdc39735b43778ac47e53df45b710e572a93698f662b1cb68a91edf0080cb10703674590b390
+DIST cptutils-1.72.tar.gz 629672 BLAKE2B b7acd86962830b49982e53df28fb11595445fa203ff6b852666e87c88cf211726157cbe8fd83e4d79d287b294cf05ec91f1b4d9f6894fb2f60fe7a26f8e85e6a SHA512 521aacb52a181b8e108356b294d2ee6e5068fc6e2d93a37783be1e99ca1e9209e016ea5eb3e2205b8c3d94661197adb314abe1e494e2ce6ca1b07d6517492bbc
+EBUILD cptutils-1.72.ebuild 867 BLAKE2B d3b093846d31230bd6651f26c3aa98671469920e408116490d11f5359a460056f582a3b03aced4df6f61260ff1b1a7c6c07bb13343d16ddd25ab57b72f49354e SHA512 36bbc702827c6e3fe31025176d1f90214c4c396b3106422da4cf0996b15d43e27e63942a82cc0b2a5e645cd4690e684df1f84400e8aefb032c3a1dc4126c2a3f
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/cptutils/cptutils-1.68.ebuild b/media-gfx/cptutils/cptutils-1.68.ebuild
deleted file mode 100644
index 023f25c568ee..000000000000
--- a/media-gfx/cptutils/cptutils-1.68.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A number of utilities for the manipulation of color gradient files"
-HOMEPAGE="http://soliton.vm.bytemark.co.uk/pub/jjg/en/code/cptutils/"
-SRC_URI="http://soliton.vm.bytemark.co.uk/pub/jjg/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="dev-libs/libxml2:2
-	media-libs/libpng:0="
-RDEPEND="${CDEPEND}
-	${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
-	test? (
-		app-text/xmlstarlet
-		>=dev-util/cunit-2.1_p3
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-parallel-make.patch )
-
-src_prepare() {
-	default
-	python_fix_shebang src/gradient-convert/gradient-convert.py
-}
-
-src_configure() {
-	econf $(use_enable test tests)
-}
-
-src_test() {
-	emake unit
-}
diff --git a/media-gfx/cptutils/cptutils-1.71.ebuild b/media-gfx/cptutils/cptutils-1.72.ebuild
index 9ad0b07f6f4b..6a9a8de47197 100644
--- a/media-gfx/cptutils/cptutils-1.71.ebuild
+++ b/media-gfx/cptutils/cptutils-1.72.ebuild
@@ -27,6 +27,8 @@ DEPEND="${CDEPEND}
 		>=dev-util/cunit-2.1_p3
 	)"
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	default
 	python_fix_shebang src/gradient-convert/gradient-convert.py
diff --git a/media-gfx/cptutils/files/cptutils-1.68-parallel-make.patch b/media-gfx/cptutils/files/cptutils-1.68-parallel-make.patch
deleted file mode 100644
index 14bf506314e5..000000000000
--- a/media-gfx/cptutils/files/cptutils-1.68-parallel-make.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- cptutils-1.68/Makefile.in
-+++ cptutils-1.68/Makefile.in
-@@ -8,23 +8,22 @@
- RUBBISH   = *~
- CONFFILES = config.cache config.log config.status configure Makefile
- DIST      = cptutils-$(VERSION)
--MAKE_SRC  = $(MAKE) -C src
- 
- # targets
- 
- default : all
- 
- all :
--	$(MAKE_SRC) all
-+	$(MAKE) -C src all
- 
- install :
--	$(MAKE_SRC) install
-+	$(MAKE) -C src install
- 
- test check :
--	$(MAKE_SRC) --quiet test
-+	$(MAKE) -C src --quiet test
- 
- unit :
--	$(MAKE_SRC) --quiet unit
-+	$(MAKE) -C src --quiet unit
- 
- clean :
- 	$(RM) $(RUBBISH)
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index f48d826f2b24..c466bbc4f161 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,5 +1,7 @@
 DIST DisplayCAL-3.8.7.0.tar.gz 10619677 BLAKE2B 9b697d3548bd3a2a7a5f2bb38589bdd7e67ff964b613371a83ae11ec1a114874283d67a442f4336a1d50e86fe127ae755ea68865de112ea83520def404a6e715 SHA512 f47cda64648ef59c211aa54993ee423e80caf26f8942de88672e430bec7976d83f15c58fe9df8217217be48a1b36e8c3342fc3baf862077fe229da214fd38400
 DIST DisplayCAL-3.8.7.1.tar.gz 10621039 BLAKE2B be4e350a63efb615a363aea36e4e92bc837d0021088ab28f78e92ba0743af5e3930812c1154d32ff06d301461d44b50b483ea15e6954943204974cc264918057 SHA512 67f49b3ae85620f9e9c7e9d4162538f78ab160a590e6cb95f78203045e0d2d8d604abe3ab533030e9359d70292a8b7dd02174c99b3143fabd7ca27a3b07a5626
+DIST DisplayCAL-3.8.8.1.tar.gz 10625317 BLAKE2B 3e988221ee7d75d5a34b1cd69ab80737017c7e7a0fa16c3bc1587210b6b1108e623a3ccada3be8b99fae4c0a70f2cf45293222232f87f0ac13fedf2a1f22fcbd SHA512 e16cdc4590274f10fc122e18a5d94a1d326c43bc132e7af97c6f28c5a656f02203cfb7c73b92fa98d3ee2a8bbf560514615bc9b34c881d2758a5a6f2867092b3
 EBUILD displaycal-3.8.7.0.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 EBUILD displaycal-3.8.7.1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
+EBUILD displaycal-3.8.8.1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.8.8.1.ebuild b/media-gfx/displaycal/displaycal-3.8.8.1.ebuild
new file mode 100644
index 000000000000..6d9baac97b2a
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.8.8.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	dev-python/faulthandler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Do not generate udev/hotplug files
+	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+		-i DisplayCAL/setup.py || die
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+		-i DisplayCAL/postinstall.py || die
+
+	# Remove deprecated Encoding key from .desktop file
+	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+	# Remove x-world Media Type
+	sed -e 's/x\-world\/x\-vrml\;//g' \
+		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 847d876be244..efe7c4f86e19 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,3 +1,4 @@
+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
-EBUILD exiv2-0.27.2.ebuild 2419 BLAKE2B 05cee3f28b9058ef70219b616cd6e346a133f661b3140f6d76a0f2d2dcfc45aca25e4d001ad302ebdf242525a59a1cb31d2cc8e718122ab0b2fc6f028e7b53e0 SHA512 a24fe4094ac0e0f0061b52dba4ded90fb6112e3e0c0bdde940b2f840be03e3b31c5a8375bc6dc6e2c11389c4b54ee45c7a84fc3eae7a2729ad0a1609ee65322b
+EBUILD exiv2-0.27.2.ebuild 2470 BLAKE2B 4d36580d8a6b1704243b8e6170d1cc3b4fee7dc467ab0c91b61ba05081f9aabe43d1a3541e06dce226f952b39703037a071c6f2a44ec9f0ae779baa04cf220df SHA512 a551131d8b386c74367bdcb681bd998202e69a89c1a58fc67980dc8976cc22aca27b77b6358b68c5f9f35795f26100bc6459aa24c4cbb088356c6f7278dff274
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
index e70d4f902f15..3d6060c5535e 100644
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild
@@ -45,6 +45,8 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 
+PATCHES=( "${FILESDIR}/${P}-libssh-0.9.2.patch" )
+
 S="${S}-Source"
 
 pkg_setup() {
diff --git a/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch b/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch
new file mode 100644
index 000000000000..abf165b83f47
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch
@@ -0,0 +1,56 @@
+From c59eb810728572fde84492d43a932dcac89746d6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 14 Nov 2019 15:06:38 +0100
+Subject: [PATCH] EXIV2_ENABLE_SSH: Fix compatibility with >=libssh-0.9.2
+
+0.9.1 remains broken regardless and is beyond fixing in this place.
+
+Build-tested with both libssh 0.9.0 and 0.9.2.
+
+Solution copied from KDE's kio-extras commit 24506c2af8d1904a99538543804306c6c2b81ca2
+---
+ cmake/findDependencies.cmake | 13 +++++++++++--
+ src/CMakeLists.txt           |  3 +--
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
+index a458a0c9..ec3a43f5 100644
+--- a/cmake/findDependencies.cmake
++++ b/cmake/findDependencies.cmake
+@@ -26,8 +26,17 @@ if( EXIV2_ENABLE_WEBREADY )
+ 
+     if( EXIV2_ENABLE_SSH )
+         find_package(libssh CONFIG REQUIRED)
+-    endif( )
+-endif( )
++        # Define an imported target to have compatibility with <=libssh-0.9.0
++        # libssh-0.9.1 is broken regardless.
++        if(NOT TARGET ssh)
++            add_library(ssh SHARED IMPORTED)
++            set_target_properties(ssh PROPERTIES
++                IMPORTED_LOCATION "${LIBSSH_LIBRARIES}"
++                INTERFACE_INCLUDE_DIRECTORIES "${LIBSSH_INCLUDE_DIR}"
++            )
++        endif()
++    endif()
++endif()
+ 
+ if (EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP)
+     message(FATAL_ERROR "EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP are mutually exclusive.  You can only choose one of them")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 27f8dbb1..bdd83fa0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -173,8 +173,7 @@ target_include_directories(exiv2lib_int PUBLIC
+ if (EXIV2_ENABLE_WEBREADY)
+ 
+     if( EXIV2_ENABLE_SSH )
+-        target_include_directories(exiv2lib SYSTEM PUBLIC ${LIBSSH_INCLUDE_DIR})
+-        target_link_libraries(exiv2lib PUBLIC ${LIBSSH_LIBRARIES})
++        target_link_libraries(exiv2lib PUBLIC ssh)
+     endif()
+ 
+     if( EXIV2_ENABLE_CURL )
+-- 
+2.24.0
+
diff --git a/media-gfx/flam3/Manifest b/media-gfx/flam3/Manifest
index a3261a28030e..aebde316cb4a 100644
--- a/media-gfx/flam3/Manifest
+++ b/media-gfx/flam3/Manifest
@@ -1,6 +1,4 @@
 AUX flam3-3.0.1-libpng15.patch 2446 BLAKE2B 2fceeba5e87af7242e88cd9844aa6ccbd0e3aff989c9dcd3b3a22d65f3e3c28d9437d9ef48b46f74c1992d4575549a5238875d4e43d76865b7651e16df42f803 SHA512 e14120be47dbeef0d7790385f3202dee2014f6cc48631b6a14a3cc8b759771a32b4ef2a3cdfd5048d0286ef173c95d017b4c3c997bab3f909fb777a95832df28
-DIST flam3-3.0.1.tar.gz 1238703 BLAKE2B a6e73fe563bcccc59e8f48a06105a086233afeab2d345defde361ac4736e4a1c2a9b507754432b0025129ebca0141ac1a2900420084d21a5befefba04abe6ecc SHA512 c91a21a0e1ca9f4d2ba929bf91c2ef95275dec6d892dafb0da3cc169cd1777326a2dff98b58d55352dfae6347574cceec234f99d06f117f832f39b089bac2f9d
 DIST flam3-3.1.1.tar.gz 1181954 BLAKE2B 9691647704e96052f04f79b59b55b47285940ada3486ef6828d1e95934c5741915bf0e4f11c3ff39da7b5534b5c6c9ec16a88bc0568ac65c8a4b5d4aff9c8d29 SHA512 8a84840d9cb91d63dd0ba5c8a6725f703f6315a7add0c091502c0dac5c77eb0495054bb4b601f72454dea0def99131ca679095da65eeebaae9b01dc59cf75e7e
-EBUILD flam3-3.0.1.ebuild 838 BLAKE2B 0fb248706d41558ef13909089f18111a3eee7a82d347f233f58a2ff71165213e9e3994f613d36e803528b41a8181bbd7ddb65da33f93138866be99dc8a272ea7 SHA512 c839de2a09adb48a5b266f346e3ffd0ab4cbb52fe30a5a6cf4de2ced4ed4b813a1f71b5fd990b309a948d1be1d259f65bd3455b9c1b6b624526a84e86b757883
-EBUILD flam3-3.1.1.ebuild 757 BLAKE2B d76c859ee5ba517326e772753f6ee3c98ee02d2069e24d5ea89777e884b3ee086da83f5ddeadb0c19fd7c91914423be69d50106a5faee879ebc7873a554e415d SHA512 ef1970ca8b61621036da8149d131e7f70680d9e72eba2d6d0b0a53cbada7556313c5c298025ed25f079c12c0a837b25e7dfb68c37003e0a942b7e34deb8899ff
+EBUILD flam3-3.1.1.ebuild 752 BLAKE2B a3610475d5b8ca2838ff1e63e8762f6abb33c81300eb1b347f808e1d9f73c883f91303130d6b7dccdb3f7cfe8ce12f7b3c22d41fcbb3262c27d970820e6c7fc3 SHA512 040bd665e40d14196122a32bdc39b60f9d120bdbf7c93e0b4134879fd1d57c6dd9ad0aac4b0c0ca5d4ef9090a54f93e3ba826eba1a3325aa75272fa5cfc518fd
 MISC metadata.xml 322 BLAKE2B 8fa31c5e84e310169a863d1d66a77d73cff819cf595acfd7fc8f23c90a2271348899e8a5a5a5a184ea7de9428aebf7d841ab0a035fdc28f0ecd312396dcf3def SHA512 98b61c299f8cfa8c42a5f4b5b51b9eecbdffe3632ef8fd687afab26454fa8fccb71348a42cca69fbae7d154f69814feac61c4109ba671dd2fa413bf75e0445ca
diff --git a/media-gfx/flam3/flam3-3.0.1.ebuild b/media-gfx/flam3/flam3-3.0.1.ebuild
deleted file mode 100644
index 58aa8956f8bf..000000000000
--- a/media-gfx/flam3/flam3-3.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Tools and a library for creating flame fractal images"
-HOMEPAGE="http://flam3.com/"
-SRC_URI="https://flam3.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/libxml2
-	media-libs/libpng
-	virtual/jpeg
-	!<=x11-misc/electricsheep-2.6.8-r2"
-DEPEND="${RDEPEND}"
-
-S=${S}/src
-
-DOCS=( README.txt )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	rm -f "${D}"usr/lib*/libflam3.la
-
-	docinto examples
-	dodoc *.flam3
-}
diff --git a/media-gfx/flam3/flam3-3.1.1.ebuild b/media-gfx/flam3/flam3-3.1.1.ebuild
index fe84e0f3b1cc..4ac1899f81dc 100644
--- a/media-gfx/flam3/flam3-3.1.1.ebuild
+++ b/media-gfx/flam3/flam3-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/scottdraves/flam3/archive/v$PV.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/libxml2
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index d7f7075f948b..86654f0d1154 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.10.tgz 3889647 BLAKE2B c6db80950ed5f81d5ecf77003e23e6545c2824948bdc04aa3111747c0eb1ef074b09fe4c3ec20b68b00f75958ea39c5945a7fbe2fecde55ff32d22e517c91156 SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
 DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
 EBUILD graphite2-1.3.10.ebuild 2477 BLAKE2B 4539b2af04bce3abbc85227ad702f1088b5c11ada2dd32e8a13eb541ec59062cfbbd0b1f014f65e66633ec811bbf501143b283413df0950e379af5a5244e436c SHA512 1b7829629f0562da73bdc3e64c5fa6842360abaa4debd354ce34b267b663fe117da84fb527817a1fd0cef0d493fa95454f804e949b40858d320bd04321d65b1c
-EBUILD graphite2-1.3.13.ebuild 2642 BLAKE2B 74d67e6a6bc3325c73de363e4ad4d1fa212887a644108e4a16581edde6e28694404efc42d5056192a6a4ddba5bc40eb45620bc22b1c12caaf3ae73334630fada SHA512 0f239fd15ac3ad62802c635fcec387e2a059c72cdf47afb3f2647108ce84dc9685a83e2d8445c343f36c8cff3e4ea8216b1d3249ed456715efea192afc5b9fae
+EBUILD graphite2-1.3.13.ebuild 2644 BLAKE2B a0811c823d4468c8c00130455295bb29cc8ae1e915f87ca2a810e00b3278cfbb57beb5660d6447f4e7ff3c591a74857c0c8c55189e20d84c276dacd73b6bb2fa SHA512 2cd4c28a43605d30ea0c1af133d40b1e2b98142dd0335295d6d40e0ac57124f3df1f5b40018cc9ad5b25410e90c0690fdcddf2798c3a3751e0864253de08b0b8
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
index 5508e2ba642a..1af96ad4ff90 100644
--- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
@@ -22,8 +22,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	perl? (
-		dev-perl/Module-Build
 		dev-perl/Locale-Maketext-Lexicon
+		dev-perl/Module-Build
 	)
 	test? (
 		${PYTHON_DEPS}
@@ -87,7 +87,7 @@ multilib_src_test() {
 	if multilib_is_native_abi; then
 		cmake-utils_src_test
 	else
-		einfo Cannot test since python is not multilib.
+		einfo "Cannot test since python is not multilib."
 	fi
 }
 
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 21577bd626fa..93db8be007be 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -5,5 +5,5 @@ AUX graphviz-2.42.1-math.patch 843 BLAKE2B 3ceeeec968dd45478f4bb07d819cb5a4b5a21
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 DIST graphviz-2.42.1.tar.gz 25543401 BLAKE2B e64044923a823f6fbe91b498b04fffe3e5b6803c55c5ce29a60b16a38d97260061b013e8bd13bc99f360d035c840f18a01301b29ca1cb73c4be87843f18c45fc SHA512 ac263df086eea6faf682f493756b79a0af8bae3f515cd8c09238e89f295226baf743a3fd22d977ef6f223388769ef11241dfb2fdb6087305ce4fdd3fa8ed2f78
 EBUILD graphviz-2.40.1-r1.ebuild 7929 BLAKE2B 954fb0e307df7e28ae4cf0806aa5b1969615c542416532d11930b3327075977be13b38eb127639fe153bac3819f28a7ef1c0be926391331d3f01e60a4ebdbba8 SHA512 c0cf4c8aa2954391a46b3698c445b2dc100db6c8194cd191c8ecc4ea3b2ac2616b47ec8117b180abae6c8dd9edbde9c2e8731af78bccd6364932447c6a289a72
-EBUILD graphviz-2.42.1.ebuild 7933 BLAKE2B 88a9594acb41f89003e5912982b2c017699442e2ceb2f84b460cfcd6144fc312c57752611fb0c76e789c9e6528564e4f501b596a2b5beb17e448c03c92a10187 SHA512 5734073afd21443fab279bcc176d8a26b77cf3e7ad755475236cb77062c006bf6bd031021024e9d26427b82c001d97399fb1962551466c86e28da48217c8350c
+EBUILD graphviz-2.42.1.ebuild 7928 BLAKE2B 56671e7d38854644335c6d16e86fac6ac03631e1a42ad71359f6450f0d8e95faef2f2f3854161d26bcdd1c343b7cbe5d78540aad50bae5a744fe2f6201b032fd SHA512 666ddedd9ebb69072f67644332fb0b88aa0369fa54c33ea6cce605e29c9f3d406c3feebd865cc93e31e7deb2511492c3bab8046afda4605b190e91c1308e87b3
 MISC metadata.xml 2211 BLAKE2B 1c39235c1d8c2efce0596cda2d20bf1cf2e81643068f68215f31462b6320f7f31533877630aa3c2b2bc9a7f7856f7b27354a97bb2c61d7e63a6de86f569ed192 SHA512 f7689fe65e46905d48fb2e45c3ad2a1e8f4fcb572515fdd7dfa26cdd21ed1eaf52d8ecaab9c297f5e8df69a205337b8526e0304ddbdb8c4b3e82cb1e428a1e71
diff --git a/media-gfx/graphviz/graphviz-2.42.1.ebuild b/media-gfx/graphviz/graphviz-2.42.1.ebuild
index 18f66264ed84..a87a88648f07 100644
--- a/media-gfx/graphviz/graphviz-2.42.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.1.ebuild
@@ -12,7 +12,7 @@ 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 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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="
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index c858b48d8c57..7245cf913363 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,5 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.5.5.tar.xz 450016 BLAKE2B b5f4da6d4c5076f67a45312d5ec2ee0ac1c5420a97df963c3e03e9651f853e7423ffcc5d7fa22b18398c54cca1e8164e73989b52fac0e628898c2ef4271452c7 SHA512 924987a852fceeb04823cf70af08fa0652b436ebe108e5fba4379e7879277c891f4132e27df72e9ac5edbb5e7e105efc18923df1a80d5a44df48e293765b69c4
-DIST gscan2pdf-2.5.6.tar.xz 450940 BLAKE2B 497442bfd09bc5869c599486e03155fe37a6a3f28dbd78aea2b77a5c11db665fb61023f471a47ffc6d15b7ee0509d6a2b6e3034a32279538321c73e544a3190d SHA512 c202b98ba3a1ce5b1cea6541c4dcae88595d46525e87238326d1d53396d3af6f552d601b057fa460db9eb5419505d4ac332f3eb81ff7ff1d28e1aa71700c434a
+DIST gscan2pdf-2.6.1.tar.xz 457976 BLAKE2B ae7fb7164c1270ff049dde87eb3bc7bc54f4c7d67a12a36f3b22831f6b77117645d5491c41f97879c428ce28d48271be8aee93e1ac96e3c3d9c064a7963abaaa SHA512 694f1d24b96a60960084e3963073e39fcd01461e9e5f2dc2e71d6821f0a3985dc04810c0404b5a21cb11aaa4adbf5747a3c942d07d259bb9028f078f3147cc85
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
-EBUILD gscan2pdf-2.5.5.ebuild 2240 BLAKE2B 1e7091ea3be2653e55f1dcc27f5303ee63d6054e74b02b1257c85a6b2bdc3ab6e9250a78245f53b987397b3c4dd854cfe0519d4916321199d26c1278992025dc SHA512 1a6ae1f8dc0f7752161b08e5cf1e407a8c7b598263c7f256be160a21aa757d904fbab90ae9280b6ad846a932580a453489c3d0ab9fbfa0f2a777861b8fbf6a98
-EBUILD gscan2pdf-2.5.6.ebuild 2289 BLAKE2B 72a06ee2f6f32bec3df79337cefb946e446ef81e00b9c711c64f44056497fa5a08d4d279ca5a56cb8ecd56a80527b1f85cc66e027427dffccaca2f15c2ab20e3 SHA512 efc58c3648f93766b9f433788db64cdf3658b8c7e2d19e3178e7c0478532ffa0b666923d46da145de842e96f5ad193a67628631d0ae3f5f0b0f1044fe1118ef8
+EBUILD gscan2pdf-2.6.1.ebuild 2318 BLAKE2B cb72ecd97b6eec1ca9b2a0be67aa0a9cbf20c1367791b65b57d22f3568d4632e5ef1285cb72d8cc30e5a2e438d4134cdd16cf9ce65f47bca0a0f0d1e34e9c6d0 SHA512 1a80ea580d566d981c28fb9f2fba632a964b01be736b9a68cf253ec96781f98bc0e11f5555018d50bbb65023f51bebf5c33b350bae5bf3974e4d007fc344871a
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.5.5.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.5.5.ebuild
deleted file mode 100644
index 9c77f58fad76..000000000000
--- a/media-gfx/gscan2pdf/gscan2pdf-2.5.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_TEST="do"
-
-inherit eutils perl-module virtualx
-
-DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
-HOMEPAGE="http://gscan2pdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Config-General
-	dev-perl/Data-UUID
-	dev-perl/Date-Calc
-	dev-perl/Filesys-Df
-	dev-perl/glib-perl
-	dev-perl/GooCanvas2
-	dev-perl/Gtk3
-	dev-perl/Gtk3-SimpleList
-	dev-perl/HTML-Parser
-	dev-perl/Image-Sane
-	dev-perl/List-MoreUtils
-	dev-perl/Locale-gettext
-	dev-perl/Log-Log4perl
-	dev-perl/PDF-API2
-	dev-perl/Proc-ProcessTable
-	dev-perl/Readonly
-	dev-perl/Set-IntSpan
-	dev-perl/Try-Tiny
-	virtual/perl-Archive-Tar
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	virtual/perl-threads
-	virtual/perl-threads-shared
-	media-gfx/imagemagick[png,tiff,perl]
-	media-gfx/sane-backends
-	media-libs/tiff"
-
-DEPEND="test? (
-		${RDEPEND}
-		dev-perl/Sub-Override
-		media-libs/fontconfig
-
-		app-text/djvu[tiff]
-		app-text/poppler[utils]
-		app-text/tesseract[-opencl,osd,tiff]
-		app-text/unpaper
-		media-gfx/imagemagick[djvu,png,tiff,perl]
-		media-gfx/sane-backends[sane_backends_test]
-		media-gfx/sane-frontends
-	)"
-
-PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t )
-
-mydoc="History"
-
-pkg_postinst() {
-	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
-	optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
-	optfeature "adding to an existing PDF" app-text/poppler[utils]
-	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
-	optfeature "scan post-processing" app-text/unpaper
-	optfeature "automatic document feeder support" media-gfx/sane-frontends
-	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
-}
-
-src_test(){
-	local confdir="${HOME}/.config/ImageMagick"
-	mkdir -p "${confdir}" || die
-	cat > "${confdir}/policy.xml" <<-EOT || die
-		<policymap>
-			<policy domain="coder" rights="read|write" pattern="PDF" />
-			<policy domain="coder" rights="read" pattern="PS" />
-		</policymap>
-	EOT
-	virtx perl-module_src_test
-}
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.5.6.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.6.1.ebuild
index 8a9a2d1d40f9..2c4c4ca4eca1 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.5.6.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.6.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/Config-General
@@ -46,7 +47,8 @@ RDEPEND="
 	media-gfx/sane-backends
 	media-libs/tiff"
 
-BDEPEND="test? (
+BDEPEND="
+	test? (
 		${RDEPEND}
 		dev-perl/Sub-Override
 		media-libs/fontconfig
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index d4ad4ca4474c..f572e70d227f 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-67.tar.xz 9068120 BLAKE2B ce7b3b37a65acb5433459bca242e6fdd3a35d8d5f10b8f21395cd085aed0c1b588835919cf43e8abb2f2d86a035fa5e663660b652029a07a7cf83006bd052320 SHA512 d413c4b7dfb7db5c7d61977d7444774ea7445b254746266261a5a91e47aa89ae566241e84135915102ea9a09d77cd89beeaed7a2f5974f6c9b0f4b505c5bfc42
-DIST ImageMagick-7.0.8-67.tar.xz 9470768 BLAKE2B c14f5536ab80720698a6d8df37724d2b0107a6f378a23f2f8f891be585dde59378ffed4fcb601794a5db4cf1d0008db40f33697b1c04ab3b0185a6a71a331a26 SHA512 ad4325df57769f9c4edf8ac71370cb9bb19e090e588d47eb0311e3f4895abd7a7edcbd2e7a495f21acd1daca97fa224bdf1fd978577588e45c11a7799c3d67f4
-EBUILD imagemagick-6.9.10.67.ebuild 6867 BLAKE2B 1cb8781a336ef0322df8e35d5bc6e6a3f6e70c3930e95f518160c677900d1aa51bb6d2ba4d2822f83f3aea40e57cfdda39bd808c1443cd874080492a003aef11 SHA512 b39325d583ea67a2b9e7a75e76dca7d29584f53c0e458249c44fc23007628f168b923d92aab6ee1329d6c13a804491c835664f5a5329ea05474b8cc72454a744
-EBUILD imagemagick-7.0.8.67.ebuild 7134 BLAKE2B aa5e04ab76be0e47eeabfa67852bb3907907f49844996f2d5bc875d880eda49506657758753ada9f5bfe9da159cc8d6f3b012d9aa061ea6bc5ae9d64f9caf91f SHA512 d5c4939be2fc6bca2b0e96b6dc02f35bbec8d9574495b0389155febee4fcf0e94fc41666860c1792eb2fadb77a9cd846d3bccc1df0f330c146efc95237dd67c1
-EBUILD imagemagick-9999.ebuild 7144 BLAKE2B 45892ff417e8a153ffcbc958d9ee0e594bb478bab88f24e207317c788b14b32c7ad0ad8c7bfc01a74c3ae70df2775f0187aa0ede2774873427194c134e4374e8 SHA512 b415fd35ad72b70c7985a798bc868291a78ac7d22769c8b1ff9b244473d8439a15cc624e06025854abe6c41b5dffda13290ed3aee7d60475b9829147ce4cdb7e
+DIST ImageMagick-6.9.10-73.tar.xz 9065360 BLAKE2B 7d29c08d9bb0b93b5ea214307203530cb8822cc7f8bc7fb39016b6eac2fc2ad6be40e3a71af7fe09d6bb0b05d669701b05949a7f20df2dcc014fbf8983c8dc36 SHA512 b05d8b4334f054c1b0ee9ef106d70c7bcbe3671ccd097320f648084d9b5ef9c4fc0b9d68267a62e69b64313e64a97343630feadf20e672e64ab2deac518b84b7
+DIST ImageMagick-7.0.9-4.tar.xz 9479288 BLAKE2B 2638f193fb14f3f10f2b3927275777916f5234cd6aa515cae778471169ad74fab447b5dc620b5b630282cd00e4218922baf5fca066778d517c92de41216bcf9f SHA512 75c34a9aad62f7a102873e2b3fcda7c032bc40bfa0c0d5b524001f4c45a93943072009b717e2a90ca1637bc7df3806408a3a3c2c1356de835e3a8bbce20cddb0
+EBUILD imagemagick-6.9.10.73.ebuild 6884 BLAKE2B 24b1413689469e54ed6c4bbd3bac31ae6df01aeb325880fe9a6345d8055bad2432a33bc447f113b9abccc9fff107f93fde9e1bc7401d29d6ea54eafe49de1536 SHA512 9c446953e81687e0b14614ce615ef2292a5a16cfe662852f8cb708899f9e85d9532d66b9fa57d83770f38b6d723ca20a8dbd31ce7830b75942a23c10927db080
+EBUILD imagemagick-7.0.9.4.ebuild 7197 BLAKE2B 64c354e2595638045ee19576ae55065283a7ccb1a19268ecddeeeb04e4c777403d815f53a4cc0dee849ad9262a2861e697fbb1eea8aa86af33fd926a945e1924 SHA512 61305f69a4841e10fd4f715ce51611604beb926f765480839a391bbfabe79cb0824428165c519ee938bce306414970bbd621665015c72c4d0c50ac8d79b37e8e
+EBUILD imagemagick-9999.ebuild 7207 BLAKE2B 4fc6e4d61f5e851d55546614830dbc3d9a23003033f55ac521bbe990d845aa2b7b7623c66da431f896df16ee71d6539bac7fdf0204c61f00d010c9013b92fef5 SHA512 97ebbef19227007aa32140de833e25d49c9a8f648fda30a9a0abe8073329b0df5a79a74968d5056b3d342e87d435072d64d360ec4270aca53491938c4cfb7f42
 MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.67.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.73.ebuild
index 319fce98db62..104ec59adc77 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.67.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.73.ebuild
@@ -17,7 +17,11 @@ SLOT="0/${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
 
-RESTRICT="perl? ( userpriv )"
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+RESTRICT="perl? ( userpriv )
+	!test? ( test )"
 
 RDEPEND="
 	dev-libs/libltdl:0
@@ -63,9 +67,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	X? ( x11-base/xorg-proto )"
 
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.4.ebuild
index 1fa89f6961ba..8287ed2ffd50 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
@@ -20,8 +20,16 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
-SLOT="0/${PV}"
+SLOT="0/7.0.9"
 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
@@ -62,14 +70,11 @@ RDEPEND="
 	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 )"
 
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
@@ -150,6 +155,7 @@ src_configure() {
 		$(use_with jbig)
 		$(use_with jpeg)
 		$(use_with jpeg2k openjp2)
+		--without-jxl
 		$(use_with lcms)
 		$(use_with lqr)
 		$(use_with lzma)
@@ -200,7 +206,7 @@ src_install() {
 		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
 		install
 
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
 	dodoc {AUTHORS,README}.txt ChangeLog
 
 	if use perl; then
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 1d5c3d2d7d7c..8d8ee8a769b2 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
@@ -20,8 +20,16 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
-SLOT="0/${PV}"
+SLOT="0/7.0.9"
 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
@@ -62,14 +70,11 @@ RDEPEND="
 	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 )"
 
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
@@ -150,6 +155,7 @@ src_configure() {
 		$(use_with jbig)
 		$(use_with jpeg)
 		$(use_with jpeg2k openjp2)
+		--without-jxl
 		$(use_with lcms)
 		$(use_with lqr)
 		$(use_with lzma)
@@ -200,7 +206,7 @@ src_install() {
 		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
 		install
 
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
 	dodoc {AUTHORS,README}.txt ChangeLog
 
 	if use perl; then
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 07c2661eaa6b..80e24805e9e8 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -5,11 +5,14 @@ AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4
 AUX inkscape-0.92.1-automagic.patch 5416 BLAKE2B 3b17fd7a4cd305b6e683fd6a3f6bd6b81559be5097603f80bb438467f63594dea353acdf92ed5410399b641b6a5a92950e5c6bea582807717891073fe2877b5b SHA512 48f5d20cc32bcaa5fbbd7b9177ef1c68f2c6d2d0c39553bfc9f8e37fa7e74c63129a9ad94d93f26265dd2492359c983c50539286b86830783e001bb5dc3fa4c5
 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2
 AUX inkscape-0.92.4-poppler-0.76.0.patch 1579 BLAKE2B c8c578dc3c6f0d79403bc0716bb6875544fbf19c98e721294cf9e5f58d9c89c1b8414dd58975846100c4ae5c21eba8e7e4797c037300ce05d741d9245a0dc59c SHA512 2f45e16aba67f4d1498cf012ac6198ec2bb977b9e39b3d4e2d14a216d86b1d407ff7ea5a889b58b5e800c129c0f99ec8bbc0a42dd7d41578d94ae1ab59208698
+AUX inkscape-0.92.4-poppler-0.82.0.patch 3223 BLAKE2B 6e530a2d2602d61c9f97f61813fad837536ccd3dc25405cf79ebda6563c56ff09e4a98b99c83aced6e8995473b27c7942c5774abafc7c33a2dbe45df58f419e4 SHA512 4a5f2e3ec9f16abe76786945e3085e405bbe7a4c57dfa0e6e7d4ddd4aadd17463766c7392846db08fa41419e05ef8c688d989ded8905755c010db6b08afa2feb
+AUX inkscape-1.0_beta1-avoid-reordering-cmake-cxx-flags.patch 4720 BLAKE2B 561623ee56ebc933b4997fd3b53f761ff5fdbf212e72e09ffd79539bde74d88b46959340012381396b761dad81712c7101c5dc94887bb96f973428d969dc8034 SHA512 a4252e9e1b19b63356c9b4af09f511e544da825b29edadf5352f0e4eb14fd150732ab6eb1abc1e0d814b37bd644179bc2f35c8a13e82c589975c01ca3d8838be
 AUX inkscape-1.0_beta1-detect-imagemagick.patch 653 BLAKE2B 1e217306b083550d1f4628dc8385c78336c4c9019f8b35fe474c18c1f917105f423d3a958491432109eea22ef04b63ad5c5d23c03ae36ed7663ed86de3e295ed SHA512 5ee7080d5134b970a7b70b6b5052523e98860d66ee42897b5a84c5e70676359c918ea0d5e603a83b27d0e4656d49f711ae76d2dad47083c8ade223cc7da9e123
 AUX inkscape-1.0_beta1-do-not-compress-man.patch 454 BLAKE2B d680993be80d9069c7986f110d512643849f97fae81a8fdf1ab020a418dfbe44cc2bce3d71c8a79e8acac5170dfc01d084420a439d83f6f0e85706acdc8a0399 SHA512 3fc7ac0750a67b9d90d4ec0eed404ffdaa6910397849fa916eeacf5fb1e77cb0cb17f3f1ba99ad39f16610f2b3d7df387e35d36a0404fbd1fd0f857fa8be822b
 AUX inkscape-1.0_beta1-poppler-0.82.patch 3030 BLAKE2B 746111982b19f2bd17a91ae0049c7615914b5b5b8eb052810f6d45642da84fdec85d41ddd419289b9b556ff1cb98c424b9b9f79dffe9d0b73d26c8af9fdf24db SHA512 26caa1a35a5e3243cf3ffeb9cc12e981237006a9540b8316d4c4d2ddbdcce1aaf64fc34ee1c09bd7264b33faa115e1c096837a3171b22d3c0ccdff916b73d9c7
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
 DIST inkscape-1.0beta1.tar.bz2 31096177 BLAKE2B 72769d0e15f20fcc5cdf81987896e7d354c2c71fc31feaa18dfff12df2791d2ed85be4451e76e8191c5f469b2e70fd03f4888270e67628c50978a3fd30c41264 SHA512 35b3ba46d76b55eb268209631ea652b3512d3aaf07f577543081c311acff13b0a667ecf069e9f1c2f47dc16525df952cfb9ca29e9a3078f9096ee7865b917245
-EBUILD inkscape-0.92.4.ebuild 3708 BLAKE2B dde8a2b0339cf7dbb0683b36f2f69038b2cb4b5e48f2bd8bb908a75b6127cd9eb14848c0b2ed44906e7d326a2fdf51cbbedad2ec882368b27fa38f399a754f77 SHA512 2b35ccbbde4610bb403b58c5a1185676e3a8c6bfa6497eda89f1aa524f0cb08e35aada5a7f94e09209b2df6f8318263a0849b0cfab8a85fa9c2f7f0dc023f7ad
-EBUILD inkscape-1.0_beta1.ebuild 3882 BLAKE2B f1f9a2a3460b42172a114af17ffbd0dc6451acab9673088cb53e2458f2581ab6303ef420dd2a1d912bf6a90c32f6b1704a5b2bb42d51f9dda3f4c6bf7134c7f2 SHA512 cce2b68fa16faa85b9223d2dbbb53ef85fc3c0d727d4b2fa8b2875bd888dac56a2501b766a2dd028f893ffeb60c0f26a2b74dc328ac58b6e99bfa95183849046
+EBUILD inkscape-0.92.4.ebuild 3757 BLAKE2B af42502189a61742629d1b016d5f8efdf4b96358aba951eeba3a591b1e6ca5f4ecc75a0e80b39416903e2b60b26ca7c7490628b7a23df2b96365b3aa3b6b4600 SHA512 6c6ad92323f157922fdea7f31c497b120b2b21bffadcf3bafeedb75b72da351071b7b04c081a5c0fb46b8e10497dd0168d8dfa6349bb63b2db9093a40fc422d9
+EBUILD inkscape-1.0_beta1.ebuild 4055 BLAKE2B d991c2c28be04ee7c8d4299ddf70b6e751fd2917d8cfb9d83da8c10a8eb7ab9a95c1c71f57f8d744b2de85d11882d7916ba3c3c4afa365356639d8d5f4e0d4cf SHA512 2d4007c77938ad2c72bb9b5fe5ba807162e26e114c60ae5ba3dc752d3ae1ae6fed060cacb1add17722ac4e234375cf823cd65a7906a59c1af51d4209d8460fa8
+EBUILD inkscape-9999.ebuild 3864 BLAKE2B ab5f9f44bc42c703734e4f9782c38c2b97b1b92e1816866e051005ff94ad8b14e7793c89f755e9bf068f99f56f98d8e97d3ca0cc7bcd13e3bfa5717b847e678b SHA512 5d839456b149ac5971a894ab02c2c7d9579fe81921135eeb4773514dfad550c5324a9f9042f9d41ee65e9b9ab2e27ea6d442538c379f7e6ff607460cef83add5
 MISC metadata.xml 951 BLAKE2B 5610cce03a912f378f4bbb997bb9acc028f2f02c1ec40034ed523b7f7cee2cc980f1f24fb8fbd26b40d494a514769b722ca64e93078c82ad75c9db94a9f19ca4 SHA512 f62078fa96c501f4d8e01d4e539b74b91cbf90997392e903e30db9c3a117c2ccc7f2d3e1c2e62c85362cd0a2d504dd565cfd70f92e5b947d416f8a3f2cd88f8e
diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch
new file mode 100644
index 000000000000..73cc4f97c37b
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch
@@ -0,0 +1,76 @@
+From 9b2f1a99bd8a411926925ac0c91f50289c7db8ee Mon Sep 17 00:00:00 2001
+From: Thomas Holder <thomas@thomas-holder.de>
+Date: Sat, 16 Nov 2019 14:12:24 +0100
+Subject: [PATCH] fix poppler 0.82.0 build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Backport of 324c7903d9fd62e74c042c31477299be3b980fd2 from master by
+Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
+ src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ src/extension/internal/pdfinput/svg-builder.cpp          | 2 +-
+ src/extension/internal/pdfinput/svg-builder.h            | 2 +-
+ 4 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index ddbff7671f..e71bb79381 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) {
+   int wMode;
+   double riseX, riseY;
+   CharCode code;
+-  Unicode *u = NULL;
++  Unicode _POPPLER_CONST_82 *u = NULL;
+   double x, y, dx, dy, tdx, tdy;
+   double originX, originY, tOriginX, tOriginY;
+   double oldCTM[6], newCTM[6];
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 21a60702fa..93c0f99ba1 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -3,6 +3,12 @@
+ 
+ #include <glib/poppler-features.h>
+ 
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++#define _POPPLER_CONST_82 const
++#else
++#define _POPPLER_CONST_82
++#endif
++
+ #if POPPLER_CHECK_VERSION(0, 76, 0)
+ #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
+ #else
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index 1cefb92abd..ea2940ffe1 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *state) {
+ void SvgBuilder::addChar(GfxState *state, double x, double y,
+                          double dx, double dy,
+                          double originX, double originY,
+-                         CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) {
++                         CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) {
+ 
+ 
+     bool is_space = ( uLen == 1 && u[0] == 32 );
+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
+index 34b42e17b8..78e302081f 100644
+--- a/src/extension/internal/pdfinput/svg-builder.h
++++ b/src/extension/internal/pdfinput/svg-builder.h
+@@ -141,7 +141,7 @@ public:
+     void addChar(GfxState *state, double x, double y,
+                  double dx, double dy,
+                  double originX, double originY,
+-                 CharCode code, int nBytes, Unicode *u, int uLen);
++                 CharCode code, int nBytes, Unicode const *u, int uLen);
+     void beginTextObject(GfxState *state);
+     void endTextObject(GfxState *state);
+ 
+-- 
+2.24.0
+
diff --git a/media-gfx/inkscape/files/inkscape-1.0_beta1-avoid-reordering-cmake-cxx-flags.patch b/media-gfx/inkscape/files/inkscape-1.0_beta1-avoid-reordering-cmake-cxx-flags.patch
new file mode 100644
index 000000000000..bd78bc582325
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.0_beta1-avoid-reordering-cmake-cxx-flags.patch
@@ -0,0 +1,130 @@
+From 09319f688e10d47f9fc9be2b6feb831fb132660a Mon Sep 17 00:00:00 2001
+From: Patrick Storz <eduard.braun2@gmx.de>
+Date: Sat, 12 Oct 2019 15:56:14 +0200
+Subject: [PATCH] CMake: Avoid reordering CMAKE_CXX_FLAGS
+
+Order matters; the reordering caused the _FORTIFY_SOURCE flag to be
+always undefined (as we flipped a "-U" and "-D")
+
+Also skip removing duplicates to avoid similar pitfalls (we kept
+only the first occurrence but should've kept the last)
+It did not work properly anyway (we still had duplicates in the end)
+and was only required as we wrote the final CMAKE_CXX_FLAGS back to
+cache and consequently appended new flags with every run of CMAKE.
+---
+ CMakeLists.txt                           | 13 -----------
+ CMakeScripts/CanonicalizeFlagsVar.cmake  | 11 ----------
+ CMakeScripts/DefineDependsandFlags.cmake | 28 ++++++++++++++----------
+ 3 files changed, 17 insertions(+), 35 deletions(-)
+ delete mode 100644 CMakeScripts/CanonicalizeFlagsVar.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b30f013f38..aa14e13e01 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -207,19 +207,6 @@ if(GMOCK_PRESENT)
+     endif()
+ endif()
+ 
+-# -----------------------------------------------------------------------------
+-# Canonicalize the flags to speed up recompilation using ccache/etc.
+-# This should be the last thing we do:
+-# -----------------------------------------------------------------------------
+-include(CMakeScripts/CanonicalizeFlagsVar.cmake)
+-canonicalize_flags_var("${CMAKE_CXX_FLAGS}" _new_cxx)
+-set(CMAKE_CXX_FLAGS "${_new_cxx}" CACHE STRING "" FORCE)
+-canonicalize_flags_var("${CMAKE_CXX_FLAGS_DEBUG}" _new_cxx)
+-set(CMAKE_CXX_FLAGS_DEBUG "${_new_cxx}" CACHE STRING "" FORCE)
+-# message(FATAL_ERROR "CMAKE_CXX_FLAGS = <${CMAKE_CXX_FLAGS}>")
+-
+-
+-
+ 
+ # -----------------------------------------------------------------------------
+ # Clean Targets
+diff --git a/CMakeScripts/CanonicalizeFlagsVar.cmake b/CMakeScripts/CanonicalizeFlagsVar.cmake
+deleted file mode 100644
+index ddc5b7b5d3..0000000000
+--- a/CMakeScripts/CanonicalizeFlagsVar.cmake
++++ /dev/null
+@@ -1,11 +0,0 @@
+-# This file is copyright by Shlomi Fish, 2016.
+-#
+-# This file is licensed under the MIT/X11 license:
+-# https://opensource.org/licenses/mit-license.php
+-
+-macro (canonicalize_flags_var in_val out_var)
+-    string(REPLACE " " ";" _c "${in_val}")
+-    list(REMOVE_DUPLICATES _c)
+-    list(SORT _c)
+-    string(REPLACE ";" " " "${out_var}" "${_c}")
+-endmacro()
+diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
+index 996100b4d7..9dd7f7785f 100644
+--- a/CMakeScripts/DefineDependsandFlags.cmake
++++ b/CMakeScripts/DefineDependsandFlags.cmake
+@@ -2,6 +2,7 @@ set(INKSCAPE_LIBS "")
+ set(INKSCAPE_INCS "")
+ set(INKSCAPE_INCS_SYS "")
+ set(INKSCAPE_CXX_FLAGS "")
++set(INKSCAPE_CXX_FLAGS_DEBUG "")
+ 
+ list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR}
+     ${PROJECT_SOURCE_DIR}/src
+@@ -98,7 +99,7 @@ list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS})
+ add_definitions(${INKSCAPE_DEP_CFLAGS_OTHER})
+ 
+ find_package(DoubleConversion REQUIRED)  # lib2geom dependency
+-        
++
+ if(WITH_JEMALLOC)
+     find_package(JeMalloc)
+     if (JEMALLOC_FOUND)
+@@ -369,14 +370,6 @@ sanitize_ldflags_for_libs(SIGC++_LDFLAGS)
+ list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS})
+ list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER})
+ 
+-list(REMOVE_DUPLICATES INKSCAPE_CXX_FLAGS)
+-foreach(flag ${INKSCAPE_CXX_FLAGS})
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" CACHE STRING "" FORCE)
+-endforeach()
+-foreach(flag ${INKSCAPE_CXX_FLAGS_DEBUG})
+-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${flag}" CACHE STRING "" FORCE)
+-endforeach()
+-
+ # Some linkers, like gold, don't find symbols recursively. So we have to link against X11 explicitly
+ find_package(X11)
+ if(X11_FOUND)
+@@ -386,14 +379,27 @@ endif(X11_FOUND)
+ 
+ # end Dependencies
+ 
++
++
++# Set include directories and CXX flags
++# (INKSCAPE_LIBS are set as target_link_libraries for inkscape_base in src/CMakeLists.txt)
++
++foreach(flag ${INKSCAPE_CXX_FLAGS})
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
++endforeach()
++foreach(flag ${INKSCAPE_CXX_FLAGS_DEBUG})
++    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${flag}")
++endforeach()
++
+ list(REMOVE_DUPLICATES INKSCAPE_LIBS)
+ list(REMOVE_DUPLICATES INKSCAPE_INCS_SYS)
+ 
+-# C/C++ Flags
+ include_directories(${INKSCAPE_INCS})
+ include_directories(SYSTEM ${INKSCAPE_INCS_SYS})
+ 
+-include(${CMAKE_CURRENT_LIST_DIR}/ConfigChecks.cmake)
++include(${CMAKE_CURRENT_LIST_DIR}/ConfigChecks.cmake) # TODO: Check if this needs to be "hidden" here
+ 
+ unset(INKSCAPE_INCS)
+ unset(INKSCAPE_INCS_SYS)
++unset(INKSCAPE_CXX_FLAGS)
++unset(INKSCAPE_CXX_FLAGS_DEBUG)
+-- 
+2.22.0
+
diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index c38fe42d1a66..87203911632c 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
 	"${FILESDIR}/${PN}-0.48.4-epython.patch"
 	"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
+	"${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index 759c5313e039..da91d92ffc50 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -102,6 +102,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-detect-imagemagick.patch
 	"${FILESDIR}"/${P}-do-not-compress-man.patch
 	"${FILESDIR}"/${P}-poppler-0.82.patch
+	"${FILESDIR}"/${P}-avoid-reordering-cmake-cxx-flags.patch
 )
 
 pkg_pretend() {
@@ -126,8 +127,8 @@ src_configure() {
 		-DWITH_PROFILING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick) # requires ImageMagick 6
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=$(usex lcms)
 		-DWITH_NLS=$(usex nls)
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
new file mode 100644
index 000000000000..bb14d85592ec
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="xml"
+MY_P="${P/_/}"
+inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="cdr dbus dia exif gnome graphicsmagick imagemagick inkjar jemalloc jpeg
+lcms nls openmp postscript spell static-libs svg2 visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12
+	>=dev-cpp/glibmm-2.54.1
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	media-gfx/potrace
+	media-gfx/scour[${PYTHON_USEDEP}]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	net-libs/libsoup
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	imagemagick? (
+		!graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:3
+	)
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.65
+"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0_beta1-detect-imagemagick.patch
+	"${FILESDIR}"/${PN}-1.0_beta1-do-not-compress-man.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=$(usex lcms)
+		-DWITH_NLS=$(usex nls)
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	# No extensions are present in beta1
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+}
diff --git a/media-gfx/jpeg2ps/Manifest b/media-gfx/jpeg2ps/Manifest
index 061de44677b0..3378e2584088 100644
--- a/media-gfx/jpeg2ps/Manifest
+++ b/media-gfx/jpeg2ps/Manifest
@@ -1,5 +1,4 @@
 AUX jpeg2ps-1.9-include.diff 226 BLAKE2B c290c4810d6cdb5c5ac577e1e55f15bf7a07c74198ee56cc05b43fa70a8d574b02c0fe476b94e079c93529140e6854136070031705a3cf92f3757badd21aee38 SHA512 fe60dfb3c79f3a513d07e3af17c7050cdbe0983e1887317f5ef2d2c7eb3c54431d6d9fec1469b918ac3461ca09cb4c73373b9affa00b43fb8412f464f4d5c3f4
 DIST jpeg2ps-1.9.tar.gz 67105 BLAKE2B 68df39df75525db872c683de7b0ed3e64317ea18a54d51fb478c3e51b26522a97081e6953e5ad92f7a6023829dc5fbc5e1e288f2041e76bdecf0b6ef035d1234 SHA512 babc6183db2c95d0bcfba3d34f924bd2a37d0a566bf684f3af3955b8b3978cd4b94b10e94f366aec641988258476f84ce730e4da43f2bb0a836e81da4892ad3c
-EBUILD jpeg2ps-1.9-r1.ebuild 1371 BLAKE2B cf5a6c2e0d106844be4eb85075dc0c250e3336300cacb1fe4be2d4778f22dcfa7b319f80fb8803a785b5b1ffe21cce378ca7b726aaf504aa24757d31030c1b2f SHA512 498ffae9f9fb9af19a6656709aa8fb088d21b4753d1de48f038ff9bd859ceec7a312552b8c6913368d1d0b1be63fde81f3a1257a6d6a70017bdfdf51b3c9aeb8
-EBUILD jpeg2ps-1.9-r2.ebuild 1270 BLAKE2B 16ef322c56cbd88b33ccb6e0e8ebd40167bf60789fb263bb569dfb703e7e9ab9f5c51d4e118719d85a490e019e4f9cdbfeb769c6d2a90e351a21286b98c20573 SHA512 be5f40adcd68a8fe8032b6a8d6142a08fc5a68004a9b3d55631aae8e18be1a6089757ee1bcda4a28323a939f827f590bd05d9c9f9c98f6e5c6e11fe84a87251b
+EBUILD jpeg2ps-1.9-r2.ebuild 1266 BLAKE2B c4db33c2e4545c6bfcf895230bceb9de3c3fd73be366900d9eed4d329433bdc8db36100b6a526b0c75060104f333d3a42d621310e236b23aceca4befa768066d SHA512 dccd7d490226819202ab3afbe763ca2f1b05e9e7eb760a46747de2b32394fc319a63c377c580eecbc0b60ab79a096b08f6878411c8aeb1a24b847d7e57fe3e60
 MISC metadata.xml 403 BLAKE2B 2b703ab8fef1b40bd3dcff805110fcb23498cb8c6e6d1909333f376ea0eef4fc77d3f23851bad95be5c1da9b410c9db93c710c6da393d56ab3b5d58acd32b7a6 SHA512 b832dc6fefb1d77e7003de986274b9a1292f301379ddc1cbb6a3d23d44e5a8b8e0489bb812da9379f4dbf8ff13d79c404665427c7c1e21bee0657ea22e3e72aa
diff --git a/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild b/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild
deleted file mode 100644
index d3601094ce6f..000000000000
--- a/media-gfx/jpeg2ps/jpeg2ps-1.9-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Converts JPEG images to Postscript using a wrapper"
-HOMEPAGE="http://www.pdflib.com/download/free-software/jpeg2ps/"
-SRC_URI="http://www.pdflib.com/products/more/jpeg2ps/${P}.tar.gz"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="metric"
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	#bug 105561
-	epatch "${FILESDIR}"/${P}-include.diff
-}
-
-src_compile() {
-	pagesize=""
-	use metric && pagesize="-DA4"
-	emake CFLAGS="-c ${CFLAGS} ${pagesize}" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	# The Makefile is hard-coded to install to /usr/local/ so we
-	# simply copy the files manually
-	dobin jpeg2ps || die "dobin failed"
-	doman jpeg2ps.1 || die "doman failed"
-	dodoc jpeg2ps.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog
-	if [ -z ${pagesize} ]; then
-		elog "By default, this installation of jpeg2ps will generate"
-		elog "letter size output.  You can force A4 output with"
-		elog "    jpeg2ps -p a4 file.jpg > file.ps"
-	else
-		elog "By default, this installation of jpeg2ps will generate"
-		elog "A4 size output.  You can force letter output with"
-		elog "    jpeg2ps -p letter file.jpg > file.ps"
-	fi
-	elog
-}
diff --git a/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild b/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild
index 7d2bc418a0d0..9a25a5e30b7d 100644
--- a/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild
+++ b/media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://web.archive.org/web/20131003165952/http://www.pdflib.com/filead
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="metric"
 
 PATCHES=("${FILESDIR}"/${P}-include.diff)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 503df3e9bf28..ac8cd7935a7d 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,9 +1,4 @@
-AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
-AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416abf1150a4b25f81b5befb8ffb254daf0c25b4b189ba0aefe9a3256eb83013d80919e21f77f7880fa7856a05ef5c995dfc73d079753e2c38 SHA512 c4048d8fe560508f04df785a012db99a5e6a2d4ca5b1d8e774a307cdb99f62de4969b04a58586c771a174dadf6dedafaa70568e8b6342612fbe52be32db257cb
-AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
-DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48 SHA512 28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
-EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
-EBUILD krita-4.2.7.1.ebuild 3115 BLAKE2B bd8b791204aed7c36e0d3290177371389e8e9f3e60526f86db85a5c3213e694925b033291a2b67e37821220b9975ae4eb4d202aab482a6796ca975a29aa240be SHA512 a2e337bdb1fc79038570be6b4585c3b741013a3404e1ad4b90d7449167d0e9e67318160cd725d6c95c98829825484c6b29f08d222b62e8c1260692071d2bcb45
+EBUILD krita-4.2.7.1.ebuild 3114 BLAKE2B 5cae86dc90f5a657ffaadcefd3c6c3cb595f96bc3a48aeb45982f2d55f99546c9c4cec6412ccfa4631000764591ebcc27ed5f782d29535aa6d245fbc13e6557f SHA512 7e8fa9982d82509f0efa6edc5826793493fc11348db464ef998cdf0789d914fb185894b66b8ce5ffd053f3e08c23be68b0c4a76cb10455e63e0b9ae2fe041e7c
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch b/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
deleted file mode 100644
index c9e3ddc2aea3..000000000000
--- a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-Autogenerated by KDE_TEST=forceoptional-recursive and edited.
-
---- a/plugins/paintops/libpaintop/CMakeLists.txt	2018-08-29 18:17:38.843385842 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt	2018-08-29 18:17:38.846385865 +0200
-@@ -104,4 +104,6 @@
- install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2018-08-29 18:17:38.851385903 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2018-08-29 18:17:38.854385926 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
- 
- include_directories(brush
-                     duplicate
---- a/plugins/impex/libkra/CMakeLists.txt	2018-08-29 18:17:38.858385956 +0200
-+++ b/plugins/impex/libkra/CMakeLists.txt	2018-08-29 18:17:38.861385978 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritalibkra_LIB_SRCS
-     kis_colorize_dom_utils.cpp
---- a/plugins/impex/exr/CMakeLists.txt	2018-08-29 18:17:38.866386016 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt	2018-08-29 18:17:38.869386039 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
- 
---- a/plugins/impex/svg/CMakeLists.txt	2018-08-29 18:17:38.874386077 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt	2018-08-29 18:17:38.878386107 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritasvgimport_SOURCES
-     kis_svg_import.cc
---- a/plugins/impex/jpeg/CMakeLists.txt	2018-08-29 18:17:38.883386145 +0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt	2018-08-29 18:17:38.887386175 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
- 
---- a/plugins/impex/heightmap/CMakeLists.txt	2018-08-29 18:17:38.892386213 +0200
-+++ b/plugins/impex/heightmap/CMakeLists.txt	2018-08-29 18:17:38.896386243 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
---- a/plugins/impex/psd/CMakeLists.txt	2018-08-29 18:17:38.901386281 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt	2018-08-29 18:17:38.904386304 +0200
-@@ -1,5 +1,7 @@
- if (NOT MSVC AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+        add_subdirectory(tests)
-+    endif()
- endif()
- 
- configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
---- a/plugins/impex/ppm/CMakeLists.txt	2018-08-29 18:17:38.909386342 +0200
-+++ b/plugins/impex/ppm/CMakeLists.txt	2018-08-29 18:17:38.913386372 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
---- a/plugins/impex/png/CMakeLists.txt	2018-08-29 18:17:38.918386410 +0200
-+++ b/plugins/impex/png/CMakeLists.txt	2018-08-29 18:17:38.922386440 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritapngimport_SOURCES
-     kis_png_import.cc
---- a/plugins/impex/csv/CMakeLists.txt	2018-08-29 18:17:38.927386478 +0200
-+++ b/plugins/impex/csv/CMakeLists.txt	2018-08-29 18:17:38.931386508 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- # import
- 
---- a/plugins/impex/xcf/CMakeLists.txt	2018-08-29 18:17:38.936386546 +0200
-+++ b/plugins/impex/xcf/CMakeLists.txt	2018-08-29 18:17:38.940386576 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
- 
---- a/plugins/impex/tiff/CMakeLists.txt	2018-08-29 18:17:38.944386606 +0200
-+++ b/plugins/impex/tiff/CMakeLists.txt	2018-08-29 18:17:38.947386630 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(libkritatiffconverter_LIB_SRCS
-     kis_tiff_converter.cc
---- a/plugins/extensions/qmic/CMakeLists.txt	2018-08-29 18:17:38.952386667 +0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt	2018-08-29 18:17:38.955386690 +0200
-@@ -20,4 +20,6 @@
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/filters/CMakeLists.txt	2018-08-29 18:17:38.959386720 +0200
-+++ b/plugins/filters/CMakeLists.txt	2018-08-29 18:17:38.963386750 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
---- a/plugins/filters/unsharp/CMakeLists.txt	2018-08-29 18:17:38.968386788 +0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt	2018-08-29 18:17:38.971386811 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaunsharpfilter_SOURCES
-     unsharp.cpp
---- a/plugins/tools/basictools/CMakeLists.txt	2018-08-29 18:17:38.976386849 +0200
-+++ b/plugins/tools/basictools/CMakeLists.txt	2018-08-29 18:17:38.980386879 +0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+        add_subdirectory(tests)
-+    endif()
- endif ()
- 
- set(kritadefaulttools_SOURCES
---- a/plugins/tools/tool_transform2/CMakeLists.txt	2018-08-29 18:17:38.985386917 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt	2018-08-29 18:17:38.989386947 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+        add_subdirectory(tests)
-+    endif()
- endif()
- 
- set(kritatooltransform_SOURCES
---- a/plugins/color/lcms2engine/CMakeLists.txt	2018-08-29 18:17:38.994386985 +0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt	2018-08-29 18:17:38.998387015 +0200
-@@ -1,6 +1,8 @@
- project( lcmsengine )
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${LCMS2_INCLUDE_DIR}
---- a/plugins/dockers/defaultdockers/CMakeLists.txt	2018-08-29 18:17:39.003387053 +0200
-+++ b/plugins/dockers/defaultdockers/CMakeLists.txt	2018-08-29 18:17:39.007387084 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritadefaultdockers_SOURCES 
-   kis_layer_box.cpp
---- a/plugins/dockers/animation/CMakeLists.txt	2018-08-29 18:17:39.012387121 +0200
-+++ b/plugins/dockers/animation/CMakeLists.txt	2018-08-29 18:17:39.016387151 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+        add_subdirectory(tests)
-+    endif()
- endif()
- 
- set(KRITA_ANIMATIONDOCKER_SOURCES
---- a/plugins/dockers/lut/CMakeLists.txt	2018-08-29 18:17:39.021387189 +0200
-+++ b/plugins/dockers/lut/CMakeLists.txt	2018-08-29 18:17:39.025387220 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${OCIO_INCLUDE_DIR}
---- a/libs/store/CMakeLists.txt	2018-08-29 18:17:39.030387258 +0200
-+++ b/libs/store/CMakeLists.txt	2018-08-29 18:17:39.033387280 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritastore_LIB_SRCS
-     KoDirectoryStore.cpp
---- a/libs/flake/CMakeLists.txt	2018-08-29 18:17:39.038387318 +0200
-+++ b/libs/flake/CMakeLists.txt	2018-08-29 18:17:39.042387349 +0200
-@@ -9,7 +9,9 @@
- )
- 
- add_subdirectory(styles)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritaflake_SRCS
-     KoGradientHelper.cpp
---- a/libs/widgetutils/CMakeLists.txt	2018-08-29 18:17:39.046387379 +0200
-+++ b/libs/widgetutils/CMakeLists.txt	2018-08-29 18:17:39.049387401 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
- 
---- a/libs/odf/CMakeLists.txt	2018-08-29 18:17:39.054387439 +0200
-+++ b/libs/odf/CMakeLists.txt	2018-08-29 18:17:39.058387469 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaodf_LIB_SRCS
-     KoOdf.cpp
---- a/libs/pigment/CMakeLists.txt	2018-08-29 18:17:39.062387500 +0200
-+++ b/libs/pigment/CMakeLists.txt	2018-08-29 18:17:39.067387538 +0200
-@@ -31,7 +31,9 @@
-     message("${__per_arch_factory_objs}")
- endif()
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- add_subdirectory(benchmarks)
- 
- set(kritapigment_SRCS
---- a/libs/widgets/CMakeLists.txt	2018-08-29 18:17:39.073387583 +0200
-+++ b/libs/widgets/CMakeLists.txt	2018-08-29 18:17:39.078387621 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
---- a/libs/ui/CMakeLists.txt	2018-08-29 18:17:39.084387666 +0200
-+++ b/libs/ui/CMakeLists.txt	2018-08-29 18:17:39.088387697 +0200
-@@ -8,7 +8,9 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- if (APPLE)
-     find_library(FOUNDATION_LIBRARY Foundation)
---- a/libs/image/CMakeLists.txt	2018-08-29 18:17:39.092387727 +0200
-+++ b/libs/image/CMakeLists.txt	2018-08-29 18:17:39.096387757 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- add_subdirectory( tiles3 )
- 
---- a/libs/image/tiles3/CMakeLists.txt	2018-08-29 18:17:39.101387795 +0200
-+++ b/libs/image/tiles3/CMakeLists.txt	2018-08-29 18:17:39.105387825 +0200
-@@ -1 +1,3 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/global/CMakeLists.txt	2018-08-29 18:17:39.110387863 +0200
-+++ b/libs/global/CMakeLists.txt	2018-08-29 18:17:39.113387886 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
---- a/libs/brush/CMakeLists.txt	2018-08-29 18:17:39.117387916 +0200
-+++ b/libs/brush/CMakeLists.txt	2018-08-29 18:17:39.121387946 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(SYSTEM
-     ${EIGEN3_INCLUDE_DIR}
---- a/libs/libkis/CMakeLists.txt	2018-08-29 18:17:39.126387984 +0200
-+++ b/libs/libkis/CMakeLists.txt	2018-08-29 18:17:39.131388022 +0200
-@@ -46,4 +46,6 @@
- install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
diff --git a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
deleted file mode 100644
index 2928247e57a0..000000000000
--- a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0218025b1725aa810f108d08802b590ce62f1044 Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73@gmail.com>
-Date: Mon, 25 Mar 2019 21:16:41 +0300
-Subject: Add a workaround for Qt 5.9...5.11.X to fix tablet support
-
-Basically, the patch mimics this Qt's patch that has been
-added in Qt 5.12.0 only:
-https://codereview.qt-project.org/#/c/239918/
-
-BUG:399696
----
- libs/ui/input/kis_input_manager_p.cpp | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/libs/ui/input/kis_input_manager_p.cpp b/libs/ui/input/kis_input_manager_p.cpp
-index 4f5a58f..0a26655 100644
---- a/libs/ui/input/kis_input_manager_p.cpp
-+++ b/libs/ui/input/kis_input_manager_p.cpp
-@@ -333,6 +333,28 @@ KisInputManager::Private::ProximityNotifier::ProximityNotifier(KisInputManager::
- 
- bool KisInputManager::Private::ProximityNotifier::eventFilter(QObject* object, QEvent* event )
- {
-+    /**
-+     * All Qt builds in range 5.7.0...5.11.X on X11 had a problem that made all
-+     * the tablet events be accepted by default. It meant that no mouse
-+     * events were synthesized, and, therefore, no Enter/Leave were generated.
-+     *
-+     * The fix for this bug has been added only in Qt 5.12.0:
-+     * https://codereview.qt-project.org/#/c/239918/
-+     *
-+     * To avoid this problem we should explicitly ignore all the tablet events.
-+     */
-+#if defined Q_OS_LINUX && \
-+    QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && \
-+    QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
-+
-+    if (event->type() == QEvent::TabletMove ||
-+        event->type() == QEvent::TabletPress ||
-+        event->type() == QEvent::TabletRelease) {
-+
-+        event->ignore();
-+    }
-+#endif
-+
-     switch (event->type()) {
-     case QEvent::TabletEnterProximity:
-         d->debugEvent<QEvent, false>(event);
--- 
-cgit v1.1
diff --git a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
deleted file mode 100644
index dc65b1c49d23..000000000000
--- a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9347112a77b3b628af8c0b8d4d7cbc0929eede9e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Wolthera=20van=20H=C3=B6vell=20tot=20Westerflier?=
- <griffinvalley@gmail.com>
-Date: Sat, 30 Mar 2019 21:47:37 +0100
-Subject: BUG:406032 Fix crash caused by unsupported composition mode in QT
- 5.12
-
-Qt 5.12 doesn't support QPainter::RasterOp_SourceXorDestination anymore.
-
-Trying to paint with a painter that uses this while opengl is enabled
-will lead to a crash. The only relevant place this enum value is still used
-is in kis_tool.cc, where it is only painted on the regular non-accelerated canvas.
-
-Anyhow, told the smartpatch to use this function instead of doing something itself.
-
-The whole thing is a little bizar.
----
- plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
-index 656ba38..32577a3 100644
---- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
-+++ b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
-@@ -245,9 +245,8 @@ void KisToolSmartPatch::paint(QPainter &painter, const KoViewConverter &converte
-     Q_UNUSED(converter);
- 
-     painter.save();
--    painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
--    painter.setPen(QColor(128, 255, 128));
--    painter.drawPath(pixelToView(m_d->brushOutline));
-+    QPainterPath path = pixelToView(m_d->brushOutline);
-+    paintToolOutline(&painter, path);
-     painter.restore();
- 
-     painter.save();
--- 
-cgit v1.1
diff --git a/media-gfx/krita/krita-4.1.8-r1.ebuild b/media-gfx/krita/krita-4.1.8-r1.ebuild
deleted file mode 100644
index dae8437cd874..000000000000
--- a/media-gfx/krita/krita-4.1.8-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.11.3"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: drop qtgui subslot operator when QTBUG is fixed or QT_MINIMAL >= 5.12.0:
-# https://bugreports.qt.io/browse/QTBUG-72488
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui '-gles2' '' '5=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	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? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
-	"${FILESDIR}/${P}-qt-5.12-fix-unsupported-composition-mode.patch"
-	"${FILESDIR}/${P}-fix-pre-5.12-tablet-support.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gif GIF)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package heif HEIF)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-4.2.7.1.ebuild b/media-gfx/krita/krita-4.2.7.1.ebuild
index 30b6159d8dce..4f1797aa0064 100644
--- a/media-gfx/krita/krita-4.2.7.1.ebuild
+++ b/media-gfx/krita/krita-4.2.7.1.ebuild
@@ -10,7 +10,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 644794e97688..79611ece9f37 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -1,14 +1,7 @@
-AUX luminance-hdr-2.5.1-docs.patch 908 BLAKE2B de7c675599a74ef7622c037eeec85546d99f2b3341c6df09f7f8880c7515468295b84962163f147bcf093adbce8425de8f8d86517c81b5c57a3b2dd3afe15ef0 SHA512 d675e6ec2b47c604002a1fa54578fd6d363c0f55079f519e0da3e3b06993b4a77024bd0e35101d22b06c2e7d5fa87bde52b1cbe6c9726ad6e6c02ebe1753bee2
-AUX luminance-hdr-2.5.1-exiv2-0.27.1.patch 670 BLAKE2B a836d2d9f408660e1b6b1f7de144e9ea176bc519f331463ded4210ce59b710dcef47a87915053fd9997ac70c907058ff233da8d20e6526a944614300fee7feb3 SHA512 a3fe2d9ce85286c093fe3d9d3cec7744f4884703e3b9da27620ff3099a5f4811b0bd48c405ec7223d06931d320355604a33746b4fbe48630f51784594a35b73d
-AUX luminance-hdr-2.5.1-exiv2-0.27.patch 878 BLAKE2B f8c1cfc71deabab465f0f427413dbf5dc47aa69833445e564a7e95ec8cc95a137af122f762d8a7af0a8db5ec0e954034a54336a773f9aaf3b0341ac36a10288d SHA512 60fcc806963ce4ffc8b7ebef8ddfc1bfef08a4a45b311ab7b5080327f058c5f0ebc4e680fdd4b7d114b4ee4e31643166bbc2bb0de70bfbd2330e6c04a2e8b2e1
-AUX luminance-hdr-2.5.1-fits-automagic.patch 518 BLAKE2B 47af51ffa1b521d8dd949e2b89c6990896e1b82e64c3cb9f93342bd4343b12ed2824d1b05fe378bb52cd9027fd86848d5a558a787545e86423ebf6da2d402e18 SHA512 49b127165c22864b0910a2cf0ebf694e74b0a8343577f06b752f3d4cdf50ae5990f1fa88b83d78565f16ddcddd0f7f87664a34602ebb1d11efafd0ab979e53ce
-AUX luminance-hdr-2.5.1-no-git.patch 513 BLAKE2B b9a2a460538b709cf76fa3713b26709455bc604e1d30ef355db254b3b6dab7420d81d83e77f6aba7f0f62a8c1b4dfcb3c503004e0235b65ef15d81e461f8a14a SHA512 96e5096a5b1a482f4604e6a6067836268e4988f32907f67ceeee25978d4dd1c1b1e394102145e5241e663595156dddc9c69ab9b22e0e1710e1a0507016b10108
 AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea99baa54bdf76e6345b652071a8e37b2a8ab35d98dd006973f266c8d008ccc70330fa8e9f9082261eee9d08756b1d59a4575714c5d6a8 SHA512 6ccfbf8d75bdc27beb10b3632bd07d8679f9ae8bdd78588ff0bbad59b75c43a4ad3b443a42183541cbf5b53d426b4ac19f43f54e296542d3a1b4235ba302acaa
 AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab710b6c2b16f5ae006ab07c06d8898fe2c0048222b80714d0343f105a623acbd535119853831e2d207a50e6407e1de33aff SHA512 694106851d29a97485e7e438db206c5d08d37dc5d7a2c9a3f207f31c2b673d42b4c539429a658390d31f5f985bd8f330d9387f3eb19964aa4e5683f2031b0a33
 AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
 AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
-DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
-EBUILD luminance-hdr-2.5.1-r1.ebuild 2163 BLAKE2B ca1aea6abad91acadef5b7d729ef87d750dd81c48db728bb31a4c62b3daa051b2d745ad0bf019c7096fcc757c43c7801816d1f23b39403c0858e3f23924ce80b SHA512 814852444ee4f41218a20e4b7eb9e29bd61ec9bac8f0cd5cc6ccb4183ad0d265ea8cce05baa649e1fdc3efceb1ce8e9440e641d2e97aaa650f89e9f10944883b
 EBUILD luminance-hdr-2.6.0.ebuild 1834 BLAKE2B 9244091ac7adeb579930597cee3681b65858b1edf58c00949ccc4a61ce020046b0a27dbdca99401abeda47eb16a83ac1b6eff9e7e14ae6a00e7080ab569ba604 SHA512 878d4b5d5a0700449257362e022a84c03c3a30d37dcc45f79bc3a7e2305751a5ecf4cc87659c2b5592dcd20f35ae0fe97765501a7e331810249ce7bf339aa6c5
 MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch
deleted file mode 100644
index 48c156a382e3..000000000000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-docs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Don't install extra docs and fix install dir.
-
---- luminance-hdr-2.3.1/CMakeLists.txt
-+++ luminance-hdr-2.3.1/CMakeLists.txt
-@@ -281,12 +281,6 @@
-     INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon
-     INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.desktop DESTINATION share/applications) #desktop entry
-     INSTALL(FILES ${CMAKE_SOURCE_DIR}/luminance-hdr.appdata.xml DESTINATION share/appdata) #appstream 
--    INSTALL(FILES
--    ${CMAKE_SOURCE_DIR}/AUTHORS
--    ${CMAKE_SOURCE_DIR}/README.md
--    ${CMAKE_SOURCE_DIR}/LICENSE
--    ${CMAKE_SOURCE_DIR}/Changelog
--    DESTINATION share/luminance-hdr) #info files
-     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory
-     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION share/luminance-hdr) # hdrhtml directory
- # Microsoft Windows
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch
deleted file mode 100644
index 16b5256e935d..000000000000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8c3f1571bfa7bb702228bb283e37e58c8b322d5b Mon Sep 17 00:00:00 2001
-From: Benitoite <kd6kxr@gmail.com>
-Date: Fri, 26 Apr 2019 18:07:52 -0700
-Subject: [PATCH] ExifOperations: include exiv2/exiv2.hpp
-
-Because type `AnyError` requires definition in the exiv2 namespace.
----
- src/Exif/ExifOperations.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Exif/ExifOperations.cpp b/src/Exif/ExifOperations.cpp
-index 07ca742c..dd3d22a6 100644
---- a/src/Exif/ExifOperations.cpp
-+++ b/src/Exif/ExifOperations.cpp
-@@ -35,6 +35,7 @@
- #include <boost/assign/list_of.hpp>
- 
- #include <exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <image.hpp>
- 
- #include "Common/config.h"
-\ No newline at end of file
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
deleted file mode 100644
index 7b52c883e40b..000000000000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-exiv2-0.27.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e733c24baf0c87e0b3c45351ff916c5f3a652826 Mon Sep 17 00:00:00 2001
-From: Benitoite <kd6kxr@gmail.com>
-Date: Sun, 16 Dec 2018 22:18:37 -0800
-Subject: [PATCH] Define EXIV2_TEST_VERSION by including exiv2.hpp
-
-AppleClang 10 did not allow compilation without exiv2/exiv2.hpp or exiv2/version.hpp
-Also, version.hpp says use exiv2.hpp
-
-* 2018-12-29 asturm@gentoo.org: Backported to 2.5.1
----
- src/TransplantExif/TransplantExifDialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/TransplantExif/TransplantExifDialog.cpp b/src/TransplantExif/TransplantExifDialog.cpp
-index c38a51e4..1fac2e0f 100644
---- a/src/TransplantExif/TransplantExifDialog.cpp
-+++ b/src/TransplantExif/TransplantExifDialog.cpp
-@@ -26,6 +26,7 @@
- #include <QFileInfo>
- #include <image.hpp>
- #include <exif.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- #include "Common/global.h"
- #include "Common/config.h"
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch
deleted file mode 100644
index c3b57861671b..000000000000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-fits-automagic.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 36cf008..1b75700 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -132,7 +132,11 @@ INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIR} ${GSLCBLAS_INCLUDE_DIR})
- FIND_PACKAGE(JPEG REQUIRED)
- INCLUDE_DIRECTORIES(${JPEGLIB_INCLUDE_DIR})
- 
--FIND_PACKAGE(CFITSIO)
-+OPTION(USE_FITS "Enable FITS support." ON)
-+IF(USE_FITS)
-+    FIND_PACKAGE(CFITSIO REQUIRED)
-+ENDIF()
-+
- IF(CFITSIO_FOUND)
-     INCLUDE_DIRECTORIES(${CFITSIO_INCLUDE_DIR})
-     SET(LIBS ${LIBS} ${CFITSIO_LIBRARIES})
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch
deleted file mode 100644
index 8665785736ee..000000000000
--- a/media-gfx/luminance-hdr/files/luminance-hdr-2.5.1-no-git.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7e8975f..2e5ea5b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,11 +59,7 @@ set(LIBS ${LIBS}
-     ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES}
-     ${QT_QTWEBENGINE_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES})
- 
--FIND_PACKAGE(Git)
--IF(GIT_FOUND)
--    include(GetGitRevisionDescription)
--    get_git_head_revision(GIT_REFSPEC GIT_SHA1)
--ENDIF()
-+SET(GIT_SHA1 "-- gentoo build --")
- 
- IF(WIN32)
-     # Windows Section
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
deleted file mode 100644
index 33c04975b7fb..000000000000
--- a/media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs flag-o-matic xdg-utils
-
-MY_P=${P/_/.}
-DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging"
-HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
-SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
-IUSE="cpu_flags_x86_sse2 fits openmp test ${LANGS// / l10n_}"
-
-RDEPEND="
-	dev-libs/boost:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebengine:5[widgets]
-	>=media-gfx/exiv2-0.14:0=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	>=media-libs/libraw-0.13.4:=
-	media-libs/ilmbase:=
-	>=media-libs/openexr-1.2.2-r2:=
-	>=media-libs/tiff-3.8.2-r2:0
-	sci-libs/fftw:3.0=[threads]
-	fits? ( sci-libs/cfitsio:= )
-	sci-libs/gsl
-	virtual/jpeg:0
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-cpp/gtest )
-"
-
-DOCS=( AUTHORS BUGS Changelog README.md TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.1-no-git.patch
-	"${FILESDIR}"/${PN}-2.5.1-docs.patch
-	"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
-	"${FILESDIR}"/${PN}-2.5.1-fits-automagic.patch
-	"${FILESDIR}"/${PN}-2.5.1-exiv2-0.27{,.1}.patch
-)
-
-pkg_pretend() {
-	if use cpu_flags_x86_sse2 ; then
-		append-flags -msse2
-	else
-		eerror "This package requires a CPU supporting the SSE2 instruction set."
-		die "SSE2 support missing"
-	fi
-
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_OPENMP="$(usex openmp)"
-		-DUSE_FITS="$(usex fits)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	for lang in ${LANGS} ; do
-		if ! use l10n_${lang} ; then
-			rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die
-		fi
-	done
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 7715a2fd3ba9..2b3088c8972c 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,6 +1,7 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
+AUX simple-scan-3.32.2-unasigned-variable.patch 1294 BLAKE2B 7e513d96237872f5afc8c5a942d40f0f98632129eb9a2476099d8d28b1eb3660c0f5831d161c1c58f989327ff9eaeb4c5d426c3812fd1fe57270176b5dd37d29 SHA512 f3bcde7dd03ff9ade43f10b14124390aa08e0f2c00b7dc3b1cf08c5870c280a1e21dbdce7029a1f4c3372f72bac5f596026e7f70c7ee36c219d0c3f4df7e31a1
 DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706f6c0a1a88948e9cdfe30a2e9e548125b31e6a00684a8a0db8e4c37c9d0930765b74e2ba9e1d540e4ae705cfd404349 SHA512 3a4d19bd36a88124ba43d388807afd1d6a51fc691ed83570a095e3b9719b5db5f3eb457a41bc8e36f2f1bf25ff4ab83edc150d4cdddd0d528e9280ea2da6cdb6
 DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14
 EBUILD simple-scan-3.30.2.ebuild 1411 BLAKE2B 336efc46f57cc33f3522ea53a381a40aae08389ab0902d93b23ed5055bd648bf68d1b747e1d8df525f34da59fde2973e2a87f3aef8d4449c4e1d51b6036fc967 SHA512 c45ea9e8396fd2f216e0c7479691f43d6a8aad37a23ce260ec9974a991e30bc4d7d8a781970948fc87047e317f01a952a5fe4e5506562012b71d5e209479724f
-EBUILD simple-scan-3.32.2.ebuild 1385 BLAKE2B 0f406f83606d4203dd0d7785b5330db5a0cf7d5a6c00d7a86b8d5768388d8de0016100184ce6afbd95e0e4ab9e598b8d635a8abbcad00024bf7dabe491dc9799 SHA512 6176fa51739f6975a17a0e7147a152464566d3192bc7414e6239351189674768a5d83bb80575f38968e8cc57266a028947c1e10a38c16697736853023e1449b0
+EBUILD simple-scan-3.32.2.ebuild 1528 BLAKE2B 3ace2c7fbe21c9c24f9937942613d7cafc23c2027bba6f5a25bfe2bd6aef100a3739e49aea0d35cf7a00f44b7f0c709571581ceeeda216d6f4f3938c5fd35c3d SHA512 be19bd803d7e3eb315212c2bf4ae7cffd8f4f714e670c7099a56ba0689497eacfd011b498e655ad6ee4e3e729def0e5cb4c5de4ac14bd1e3c27cbabebaaac3a6
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch b/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch
new file mode 100644
index 000000000000..9ba4aa721349
--- /dev/null
+++ b/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch
@@ -0,0 +1,39 @@
+From 47d3532459863e3b0bc1c7fd3a200f612863c814 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 14 Sep 2019 20:03:47 +0200
+Subject: [PATCH] libwepmix: Fix use of possibly unassigned local variable
+ 'data'
+
+---
+ src/libwebpmux.vapi | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/libwebpmux.vapi b/src/libwebpmux.vapi
+index f2461a2..42d2886 100644
+--- a/src/libwebpmux.vapi
++++ b/src/libwebpmux.vapi
+@@ -61,9 +61,7 @@ namespace WebP
+         [CCode (cname = "vala_set_image")]
+         public MuxError set_image (uint8[] bitstream, bool copy_data)
+         {
+-                Data data;
+-                data.bytes = bitstream;
+-                data.size = bitstream.length;
++                Data data = { bitstream, bitstream.length };
+                 return _set_image (data, copy_data);
+         }
+ 
+@@ -89,9 +87,7 @@ namespace WebP
+         public MuxError set_chunk (string fourcc, uint8[] chunk_data, bool copy_data)
+         requires (fourcc.length == 4)
+         {
+-            Data data;
+-            data.bytes = chunk_data;
+-            data.size = chunk_data.length;
++            Data data = { chunk_data ,chunk_data.length };
+             return _set_chunk ((uchar[]) fourcc, data, copy_data);
+         }
+ 
+-- 
+2.22.0
+
diff --git a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
index c3f42c9f23b3..2c9045ad83f2 100644
--- a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 VALA_MIN_API_VERSION="0.34"
+
 inherit gnome.org gnome2-utils meson vala xdg
 
 DESCRIPTION="Simple document scanning utility"
@@ -43,6 +44,9 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# Add control for optional dependencies
 	"${FILESDIR}"/3.26-add-control-optional-deps.patch
+	# libwepmix: Fix use of possibly unassigned local variable 'data'
+	# (from 3.34 branch)
+	"${FILESDIR}"/${PN}-3.32.2-unasigned-variable.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index b94ac21e043c..8cafab9859cc 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,7 +1,5 @@
 AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f75e7c4e6e8f994ec2881f173919c34625d80357882b28157f72ea6d0bbd6331473c6b213857c3e8a5db92bad SHA512 8e7b30bb73b87981b2d2c4e9bff8f62b5e59d341410dee0d4ecb889a0f39cfb38539a8d6ef2a738517ab5034c035e6588a4d2b7220bd408a2dd040f6cb8d7088
-DIST sxiv-24.tar.gz 47148 BLAKE2B 69d70d64ea6cf6ae7a044d06df78a2e1e53941ef281d6445f54a28c4368112674461bc4e71a0226946588e604de33dd0972960cb072a00efd64512e5273cef09 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b
 DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
-EBUILD sxiv-24.ebuild 1219 BLAKE2B da05f3f295ee8c8afb247ff3e31609ddf0b8c0fe8fb0db47f7e108b4253aa6565ff9dae5fe8b1c6875d5177705a2260fcf2be2a20e0d56374d31761537f30f65 SHA512 62ba4b36f941fc709a8e83a0be2bd581493041f1f93c21acd43753f8d7d368c9a6d6b8d9d3560dd78c9ebe0c4a15fc09cc48cb8a60fe77c4691b1663d0f8a370
 EBUILD sxiv-25.ebuild 1286 BLAKE2B ea500e8d7ced602d4616efed270173499204332fe6bb665d6c52e33833a1745423aa15ce417fb3502c5471b3746bf73c438533d9010b193b728154c0fe6a3c5f SHA512 9bade847c07cf76abd4131e6ced11c3dba85d8522b4b441b1556f9f20eef69907221dfcec4b7492c782de17f93a6a39453ae66a24223367145002509e979e35f
 EBUILD sxiv-9999.ebuild 1241 BLAKE2B 4881e1503bf20cb06434fbb1cf4c540ecd2d724fb845c00eae2e349b96fc4440ed54359113f72a710a39564b7d4d2f015465b8754e1e6a6fb94abc1d6702e53f SHA512 1f8b2885556990c7de6b572cfc0f54d94d2fc804a73da9953d7f36511d73256c8318855ac32f578acb8bbb286eb0b70c411581a5cdaac2424239c866bab9d441
 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
diff --git a/media-gfx/sxiv/sxiv-24.ebuild b/media-gfx/sxiv/sxiv-24.ebuild
deleted file mode 100644
index 67f72a7ea320..000000000000
--- a/media-gfx/sxiv/sxiv-24.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils xdg-utils gnome2-utils savedconfig toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="exif gif"
-
-RDEPEND="
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib:0= )
-	media-libs/imlib2[X,gif?]
-	x11-libs/libX11
-	x11-libs/libXft
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	restore_config config.h
-	default
-}
-
-src_compile() {
-	emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX=/usr install
-	emake -C icon DESTDIR="${ED}" PREFIX=/usr install
-	dodoc README.md
-	domenu sxiv.desktop
-
-	save_config config.h
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-18 10:15:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-18 10:15:03 +0000
commit	b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree	16fe44748708acacd909d4e2e160a09a7f6d936a /media-gfx
parent	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)