gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /media-gfx
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
67 files changed, 1040 insertions, 1219 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 7c77f52aa31e..b7e8b8583d63 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 6cb06018cdf7..0c170cd66799 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -4,5 +4,5 @@ DIST CairoSVG-2.5.0.tar.gz 40481 BLAKE2B d177570710f54a7d64446de81a700a6ebe5dd47
 DIST CairoSVG-2.5.1.tar.gz 8397716 BLAKE2B f5d307f3019df3b8e19a86c4f185bb6c95ff5f450705a06506f03447f7a4e97091fed4dbbdad7220da0b04c6bed3eb252f3f3e8d91bff55ab6432d0df7f62d70 SHA512 5f6732758ed8024b58173bc920a44fcafa65a2daf301ee07e088d542f1e82d0093bd853e58da2484c392d1b625fd27c0634d07ad58cf00e674741aa413013605
 EBUILD cairosvg-2.4.2.ebuild 872 BLAKE2B 4f326bdcaa5571e152cd438654fa0ffe4f9aa9465f0e88dce89f00c683506e932fd58fcd075d75f94f634e33d152c8b14a8dbdd8b467e087a6eb2c38d654a0fd SHA512 8bb35201de54b9f633516fa768925ac9b77245a8f8a89ddfea5ed12f01cf0ce57bb39deb24d3b3c11d8c0a59ace7fee30292b2ea175c29f88476e777b43935cf
 EBUILD cairosvg-2.5.0.ebuild 871 BLAKE2B 6e87fe608e0f1b9e86b72004b826338948762f087cc57042212e75f9e7f0d3928f7be13f071bfffebaa8a3b01236d067376244593359425c2759df888bfa2d87 SHA512 4d009897e43100a958ee7ffade1b4df3f2cf9a658228ba8931deb136f14d3bd1e09d3db690e05b538e0b6fae4fa22d63b0a0284366b8a930c58b4e0e7baf3262
-EBUILD cairosvg-2.5.1.ebuild 1088 BLAKE2B 609604ef5f275888acc27c53a6ab673c75665affa08635d71773288ddc67eb163edecb961cd40cd6d802c85ab7225c3255a2e25ae24abd87a887beb3e104482f SHA512 5598e74649805bdc31067abfc830ca0825a46a1ca7aa63e707cfda527f2df5c0804fd94a99bdcf39872ae8fd0e954a2d761f40b20b68ffa1cbaaf675ad80e09a
+EBUILD cairosvg-2.5.1.ebuild 1087 BLAKE2B 66f0018bd5b785e25b410cb6d7fa1b5e221165b279ed2e50e78cf03ad4614eef73435df677b9814e273f4d560321f62225958f35568422f5d2f3e884d37f3e24 SHA512 b70dc5fbf78579b81d6ac336b843d3560be264410c4647d5c01860b7d36b177dda90f7cbd9102a0e6f1deb2e8dd39db1c1aac55b7aab4261d5373c20e3c46315
 MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0
diff --git a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
index f4c46a474540..4b84e379a4fe 100644
--- a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 76d26d3aa987..ac8bf1e741cd 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,4 +1,4 @@
 AUX converseen-0.9.6.2-gnuinstalldirs.patch 4784 BLAKE2B 245c5ddeff91bf4e1c74471cd8a9f3c93bf786e5c44c48b62560cdc34913aeb97b5392355421ba19e42074547a81f0a471899e19dab7294434b37b9f6ab8e0df SHA512 9e5abc254e1a1d1b2a92d5ba04f24640b90ea49f79222ed81c83fedb0f007adcffb371952db6074c18b3d1d853f81de21f45a3803df2b7fc4b18dc93ee7ab5e8
 DIST converseen-0.9.6.2.tar.gz 276879 BLAKE2B 3f41c8a85d275b2a2fb1c2c8971f92e447b0c7b236d5b90a07629400925b8627e1e9e837239e2114cd2e6f755941b4ef28adfbecf9813963d01b925af4e348e0 SHA512 897bcb4554ca05d92dc939837f74022fcc21e05273cb40445c0d02ce3e10e87f9e74eeccee69e4ed1bdf63ca3bd759d4d51769daee5ea34df7997114c7937f7c
 EBUILD converseen-0.9.6.2.ebuild 798 BLAKE2B ccac8901c9e063b0191e94083bf0299a67bd04d8389c73f30ab8b497f78148b68518f3d4b2c55dcef8f70e5eee4d7aed093eefafe05d4a1de8f3fb18a977cbee SHA512 da05e793225b69d19d98ab25556292d80219b5373a5961eb4ce441f0a6a4761cf94896b750550de2a046595ad9fceb8e53e19cdc754d32e5851b3c8eb3d8a817
-MISC metadata.xml 334 BLAKE2B 75ac31ec358abda09eefe2bea57dcadff35302bfcfbd7685ce32a9992681ded21a660629c355360453dbc14fea71dbc0cb8b714e3657133a10735b5c5c3b6194 SHA512 a3e94bb442843d6f05bfb03940d4c9fcc5b8e8d81d2f413ee60bf88e2e893d1cb00ea7c625289e1e12690d2fa9e2d1a1c9b6509665bb4a46c3b5121673381546
+MISC metadata.xml 252 BLAKE2B 85d312e9856476325a3b52f7e18559dc488db547c2a07da42e5e35921c22d893dd5b665fe34d18a391fc74ace49af2be8b60f59df208b83ae25a8ee1b36647dc SHA512 155ed9dbb0dd8e884779b634a9661de44f25cca743fd1b4e81164a1fa7bccf95b122f7492475a6648ac34230e1a4933d9d873204440f9d9ebce162aa0a707caa
diff --git a/media-gfx/converseen/metadata.xml b/media-gfx/converseen/metadata.xml
index 4716a6592192..c9088408f034 100644
--- a/media-gfx/converseen/metadata.xml
+++ b/media-gfx/converseen/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Faster3ck/Converseen</remote-id>
 	</upstream>
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 7c39e6d03cd8..8429c8bd6468 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,4 +1,4 @@
 AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
 EBUILD engauge-10.6.ebuild 2116 BLAKE2B d7879884824581dd5f3d481b2a8760659986708ad802cb6841380ca55164fe63e9899c8fc8a774260a9f01646d3b9f971113b36583da59300feb92b363d19b82 SHA512 51840f63f8f56984d549051b88dde704f150d122f316cda1277900d4f18da8b1da45b0ed5bca4c9dfd7cf6ddc9efd5926b8e84dbf4e234971275db17bb4a555c
-MISC metadata.xml 337 BLAKE2B 8c46cdaadb388ccd12d29c41a075ec60130482855d0735cd468a174e631129964fec7c2e7649994e8f958def8ceb8f4ad0ecb60ab69ce37171c9945696825369 SHA512 41201e69d211283450ef6ff45a23e0978934044e170da84de7e7978360bd5ce1e3b277df4a90e00221cca3f987cd6839ee90fceea232c70cebeb69b5bc7c1c6d
+MISC metadata.xml 251 BLAKE2B 278d9c0c00f53a3c9ce230c748c38f879e6e6ef6cd3a7e8979be3202bf047c790c94ed94875d24c1b4c2726a199ba50fd6a93b6f7b7d7cddbac47b6a9f261f83 SHA512 a8f496154037503d0368c14170261e70e348512612f133e3323a73c450e27af0cf266db2d2d76f61db30e1dcd979823b9ff730cb7ac43a28e24ccbf2c6768b07
diff --git a/media-gfx/engauge/metadata.xml b/media-gfx/engauge/metadata.xml
index f716ecb660cd..fa3fced03f31 100644
--- a/media-gfx/engauge/metadata.xml
+++ b/media-gfx/engauge/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>calchan@gentoo.org</email>
-    <name>Denis Dupeyron</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">digitizer</remote-id>
   </upstream>
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index ce75dbb444a6..a12bacc8dee6 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,5 +1,3 @@
-DIST exif-0.6.21.tar.bz2 387531 BLAKE2B 494d4910af2e8f740aeebdeeaf8dec5ae638d3e78339c55d5acc38879ab4837164d2ef407bd07a2e36a00df15d53b132bb027e2e97e79c229c589819af3b7f7b SHA512 73b5b7df08462a6a084a8fb973c39197f5d64ed753a97cb2f94a4acf815fdf0313214c2c8e44a46a24a1f6304fdaa68a579b4a2e246cc095f6e9588e93368cdc
 DIST exif-0.6.22.tar.gz 569665 BLAKE2B 556927fca99416ff174c0c4403337f2f8b85cb14472d920a48a9598d8b7e3be6b800b0b37a764cd89fb45b62376a05ef1f0ae6b260a076f0949aadf8a441a2eb SHA512 b194bacb28ff2b910014edce732f97a875852abd486ce62bcf9274eb0ed668a0ee9c954cf60455191969aacb48d3d4d3172958a183b29f050c0bf8d55de14e7d
-EBUILD exif-0.6.21.ebuild 580 BLAKE2B a08bd474a0ddba7e01b4ae9f6197c2690bf9a0a8cc9c2d64e84f083639d0b5d7826a00c891ea35dcc4afac01a60eedbd3d3371ee9ef15e320dc6967439d106da SHA512 aa147df8a0baeca94b88497e9fe801e56b5e4a42c2e8940a7ae8a8d03af90af760b7bfc19726f771d6bed3a3875cec226ead12876098b6e8556c3f3770eb4a33
-EBUILD exif-0.6.22.ebuild 664 BLAKE2B e05e46c2e4798e33e925117645eca0dbc5fba82b712a1cf2a4b5ccc7cf53726bc5ffabf307610b85d65412411593c1373e90cad855dffaa1858422a712115e30 SHA512 dcfa1e2466e9a829556cbe3aed6dfbdb20be87d3257c14918213fc067096f6c426dffcc303cb6350456134ad99163a267f214de72aee4c0a4cb82a4ce8c17102
+EBUILD exif-0.6.22.ebuild 661 BLAKE2B 8bd9f5447a59f623dfdd84523c165a930bb574e065542e61eb1829442d294b2397228ca307b55e610d02c6055fd5df4f00fe16dc8a8f1013ef86a0f065e3a341 SHA512 5659604e4c43e7301487d4f5a0d66311cffa3d5a2b5ee205c3236b31726bef926aa7c3ef37bca4670c3910c7192e412ff76813e125748aa122f4022c6eb936ef
 MISC metadata.xml 249 BLAKE2B d224cb8e5d2c5fce97a3b2e5ddd58eaf63652fbd198148263043184bb34e3ecfa58af4a54fcb3e8c388ba4a8c71f6882b9ff214f3f366d5333093e1e6b0d8394 SHA512 7721d48e6ecfe8212f06808ec8cb7cc6f9d3db63c71a3c348f9f1d7db9cc18d74ad70c474861631c08df354c7a57d37bd0cee1e4a0ee62e83296a35c90af0b7f
diff --git a/media-gfx/exif/exif-0.6.21.ebuild b/media-gfx/exif/exif-0.6.21.ebuild
deleted file mode 100644
index 379dfe2fbe3d..000000000000
--- a/media-gfx/exif/exif-0.6.21.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Small CLI util to show EXIF infos hidden in JPEG files"
-HOMEPAGE="https://libexif.github.io/"
-SRC_URI="mirror://sourceforge/libexif/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-DEPEND="
-	dev-libs/popt
-	>=media-libs/libexif-${PV}
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/media-gfx/exif/exif-0.6.22.ebuild b/media-gfx/exif/exif-0.6.22.ebuild
index fb55fcd86ca5..fb8a673b2a4f 100644
--- a/media-gfx/exif/exif-0.6.22.ebuild
+++ b/media-gfx/exif/exif-0.6.22.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-re
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls"
 
 BDEPEND="
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index 44462842f887..f266188717c1 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,5 +1,3 @@
-DIST gifsicle-1.91.tar.gz 571588 BLAKE2B be3973141e57618d50efb5205f79e485a4450ceed02d6c718e49305250941656f0d220c91d2056554348d14348ed1ddf03f0aa9c47e22589994c5e80046422f6 SHA512 49b89e6f99bffd0dd732c920b936c2430a2f4f595d46e41654e5f39f180acaf9b0a4aec6cf52597c470d7c60265f16b730f6ce82e08701a2054fc3d08754c6da
 DIST gifsicle-1.92.tar.gz 575199 BLAKE2B 53716621846b14c0727e05893cb1876572ab80aa4d444c2b75499b541a19a5e45738b817c203b3926301378b2211a3263311c424cd8dd53e71d2b60f28ecdfb3 SHA512 5d9539eb5a6a8b87aed49ff3ca3d62e337845edbd05459b002369d571f74878c99740c34f50b4c86e5b8787ff189d4c21230e4f9019cd96a09db603afd7563dc
-EBUILD gifsicle-1.91.ebuild 650 BLAKE2B 431ed53decdfa20d6fe7dec3f2887aae80aa7f985ed43e0a5e2b9548d970b07ab235e19d34e4031d518c76b56b1206f7afad87a8134dac6052e27e99ab2aff88 SHA512 0dce46bc91fc0562521ad84757198ca54355a4b56b0ec147c20c292bda2641a5eb4768ea73b96283507cda7605ee2e7d225ab07d1928786063185b1bddf2b80c
-EBUILD gifsicle-1.92.ebuild 651 BLAKE2B 603188960d9cdece5dbcbfb843a7342c71fb27ec910e1c28a80ba4101c12e7cad827179d92b2761825a65b7ee64f60aa5187b1c3f26e168dc0df11a0fca480e9 SHA512 b334803c53350bda3aa9037c50b77e2d511cde4144583eb0e18ece8d4f002b4a181f304c5b829ebed000bef2a9bf40411347f91d7ccb6586b1f7e09d5d3e0807
+EBUILD gifsicle-1.92.ebuild 650 BLAKE2B 0d9ff8115ef3c7b970fce293ebe3c7ac2d59064885e8aa4f5289652d02234c4772406a0e650305c783aa408926db6fe37a1c3c3cf3f221d6e7d88a7a30cf28f3 SHA512 eb99c7394bf33c104412f73c9e3c2b08564c0ad9164e26484c8f8530064d0a2780ef7c4690e764bef942be600118b605f8d5890c16fd9708fec23499c567666c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/gifsicle/gifsicle-1.91.ebuild b/media-gfx/gifsicle/gifsicle-1.91.ebuild
deleted file mode 100644
index 10d25e73ee9b..000000000000
--- a/media-gfx/gifsicle/gifsicle-1.91.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Create, manipulate, and optimize GIF images and animations"
-HOMEPAGE="https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle"
-SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="X"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-DOCS=(
-	NEWS.md
-	README.md
-)
-
-src_configure() {
-	econf $(usex X "" "--disable-gifview")
-}
diff --git a/media-gfx/gifsicle/gifsicle-1.92.ebuild b/media-gfx/gifsicle/gifsicle-1.92.ebuild
index 53ac7895adcf..6b7dc995375a 100644
--- a/media-gfx/gifsicle/gifsicle-1.92.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.92.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index e18165260bc8..7db9733484e4 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -6,6 +6,7 @@ DIST gimp-2.99.2.tar.bz2 32375596 BLAKE2B 3dc5af7935e3503106cf2020798974d68fe86e
 DIST gimp-2.99.4.tar.bz2 30355676 BLAKE2B b982139e36809b7e149c1c055d7cf0506c0c00beda2745904c62f4b56f1f1605378358f29ab427f7df6c68251ce367e00d79a1b9b7b3d0fde22526895eb5ce27 SHA512 1abb6851f4c6af440d75d09c55dcb6bf6485739de1960fb536035935729331221265beef589386da685ad8ffbe83e0f0699cf2db55589953deae4d82aa99154b
 EBUILD gimp-2.10.20-r3.ebuild 5681 BLAKE2B b23d61ef44ec157981c4656bc9a8ee3fc0cbe34e208f27793f9295c952d1df329da2544718c8a1440e7e685339697c7e4110e292a3b2f1222b6ede6c0400c593 SHA512 7469fabcfa82c7fc513fe361ea03514ce142c3252123d5c9905c9d9aeb61099d47dc7dbb833d3fe7b3a2479261d6026121d43e100fdec21ffda8266c6e9153ef
 EBUILD gimp-2.10.22-r1.ebuild 5616 BLAKE2B d470f34e37338e55343ce471e51603c4ef779b04c47bc10fd364c4ff8a8f91d57421707ac87f22f8ac486b595b7a76fd5d7acb760d05542b8f3c3b3668cccc4e SHA512 9ba67887ea7b9fb6af3a382015c3c8cce5ea2cf84f04e52e8e39e3b840792a229cfd4679ab22cb70d12e7e8d4a825c0a2f532d3ae52812554c542325acfd7a8a
+EBUILD gimp-2.10.22-r2.ebuild 5640 BLAKE2B dc9ee64aa55e230e1aaee8f874ed9f2bbcbffdebaf1804831131107212be1f1ca094a6f480dc7f8309d88ed7c0dadb3c6da8ab96753ca229d3c78a1de4cd2926 SHA512 287e5789074d54415a6efafcaee1ef32eefa0decf9dbd10c9429ae1c99a0949b32136b909d63304a3c0a3ba330cd46d2c7678aedfdef087a81758054cebb7e2e
 EBUILD gimp-2.99.2-r100.ebuild 6734 BLAKE2B ec479165a988f22cdcaff9073627c84f9410a3adc557f17c35d9949fc4b15ce4cb862b048118dfdec203e791ecdcd51f2f762c3440d58a9c5dc3fe281c209593 SHA512 ac12d541eb64f5fa31fe8b11f1016fda791842575216073c12cec85e822238dd82712eda2d0a3b36657defab460010b34651d13ca2c3ade565a8ce18e3400d9c
 EBUILD gimp-2.99.2.ebuild 6514 BLAKE2B 413ca26220cf55f1e7c87a4b79a87ed3cbde37a5978683f2d7cbad6e3af0399491dd648b7fe4b9c5f33d45dbf266491e46134d5b7830f75b3ecf224a1c1fb9d1 SHA512 6c1d356d751d641c0dedb7373d62ddfa90679c4b3f90077e4ecfb8a92408e13cab1e58ac03e3deee5918777d71fe38d57d9bc48f708412d97eb114b82711cf54
 EBUILD gimp-2.99.4.ebuild 6555 BLAKE2B d0457e2f35b7d38d273650fbf1cddd7903a3aaf96330cc117ad800c46d85818c2e69b17cb1eaef2e6d7b866e8abe22e735720f08c1e47769ee313ab77108c71b SHA512 fd01d40c7283f154874bf93dde1c303bcf42918c96249786618468c62d214add14db645803c6bbe4e1b9e020903cbd5c09872d858529222e229f351baada6608
diff --git a/media-gfx/gimp/gimp-2.10.22-r2.ebuild b/media-gfx/gimp/gimp-2.10.22-r2.ebuild
new file mode 100644
index 000000000000..786ca884d747
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.22-r2.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/atk-2.2.0
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.78
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.26:0.4[cairo]
+	<media-libs/gegl-0.4.28:0.4
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.3.2:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+	"${FILESDIR}/${PN}-2.99.2_fix_autoconf-2.70.patch"
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || die
+			mv {,${prepend}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 48d044136a91..165e86e83c50 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-screenshot-3.36.0.tar.xz 231420 BLAKE2B ce916d4d221252f47c84ebdec52ddcc2e25c2481df848cb6199842857c7ba537f56c22bdcb2a8e5b988d767fbc242d0c727119bc1ae9d569644eae15688aebf5 SHA512 fda599e7c50b37d8356352085b2f45f3b8c868af897352810998e127bd7333d5a1383369ec1cb980064f7e0aafa0e01bc5cdb31563ea56b1a7e4099fc18cc6b4
+DIST gnome-screenshot-3.38.0.tar.xz 356716 BLAKE2B 31f2a0cdf16a9f967c789ec1f698140f78a5c4d66489bc8a47b8b61b5e536e6b67fd60b9cb241221262eef5b3117ce3e1a59fa162a7f193de440f7de9db0afc3 SHA512 183f81b9b481d1afb4a3c8e37b25a78652e599d4c5a4f1a2cc9449cd1efdf3b613018c17de9ab61304ba19ad7152d696aeed475c0184a4728ea1359ca2be2ecf
 EBUILD gnome-screenshot-3.36.0.ebuild 1204 BLAKE2B 7e2465f20e33696123deb1156db4e4a1356bb48b8613824be9d418b7f31c2a41ddf4fb25b0c422007e703ec7a68b8872b760f080988538b94c7a8bd2d5c52dc2 SHA512 1115c12624ba4bd0a218347775c8810c916f862e0155471a55e84ae38e214c9de19992d025a52b5ba685a506022a0091a307c8b14c61973f33edb9d8b44ef90a
+EBUILD gnome-screenshot-3.38.0.ebuild 1334 BLAKE2B 21bf86e77105af2d607e1e4e580283fe2ea5c5cc0d3d15b1356dc00b9355c272eb788a0fc4a0083f03e944dbfe5e45c491cb27998d4e77d37d3ce8fae1ff3590 SHA512 ccd7fee789f0158203b893362227b6fe0b3eb743ec74f9b4136229d50dfedc089638d849ead9cbae54886f4c65080ed22799f08d64f7f62f73a5367596863348
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
new file mode 100644
index 000000000000..9b96935da73f
--- /dev/null
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Screenshot utility for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# libcanberra 0.26-r2 is needed for gtk+:3 fixes
+DEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	>=dev-libs/glib-2.35.1:2[dbus]
+	>=x11-libs/gtk+-3.12.0:3
+	>=media-libs/libcanberra-0.26-r2[gtk3]
+	>=gui-libs/libhandy-1:1=
+"
+RDEPEND="${DEPEND}
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
+	non-interactive mode when launched from a terminal. If you want to choose
+	where to save the screenshot, run 'gnome-screenshot --interactive'"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature X x11)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index aca351238fad..90abf3f6dc40 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.11-46.tar.xz 9165256 BLAKE2B 5fb2c7ef90c165388bf9c9b42d752823e62b94a631f8dd8161d8c71b718154b5f577474a7074f42644e994af1aec99f28c4d69913be3045865cbc87533c05fca SHA512 63022225e694dccbfb52eec3793332bc92ff2d6a51a6ed161d63e044a33c8d13f0a2630afc1935cb139ca2d0e141d99a9bec23f5eac82a488a461ed30baf85f5
 DIST ImageMagick-6.9.11-52.tar.xz 9152084 BLAKE2B bc50767e3eacc06ccf6168d9cac5666a2836e3b2085ee834594da419c2912cafce7dee84573f1a2062e051afb066529ae79b7bea25242fb055fdd11e734ee0d7 SHA512 79e6ab62722060601283f4c172f7a27b7d3c00f5dbdfaea4c1f5c1940a681ab3fd53e4ea4b736adc3e0662ecccba13f7f86baada3d319733191eda37abee38a1
-DIST ImageMagick-7.0.10-46.tar.xz 9649132 BLAKE2B 8083aa4fa26d59c4bea4bd9a45ab5b1a46d3fe0ecdbb0090588d16bcc31ad044171a59dc7e8681c878e885d83c7b34a4bbfa21273d5711181bbefdee457ac895 SHA512 7008286a05a1794a3061bd598bf6acc70dcfe1aec3a6b5632dce9dd87bb6c28385af0d469b47996d5576c4b39c5d48a4fcd7752b9353ec28b7f7d8160f4c5023
+DIST ImageMagick-6.9.11-58.tar.xz 9167216 BLAKE2B 48fa4d6ced002a08268bb607bcf5988bb9fdb27c6c5fc20e5c73c06b9e48837c972b884e73d8a57d16dc0a1d9ba0cb4cf6aaee144a7193caa3d9fbd5ec6839a8 SHA512 b116596bb737cf78b9ec27ae4cc8aa3163f4201e68c3bbc9666421766859d2a2d7521697a4fdd94c6276d190667161816d0ee31dde3e06303bf09ffe79409885
 DIST ImageMagick-7.0.10-52.tar.xz 9642352 BLAKE2B c1a86214978da88d66ef90b91516482fe67ee5e215fd5d76c79dbbcd9e33cc2d417d8f5d8e29056743737dd2275fe7a8d891b6ad2f3c8d7d5ab0adfd83f60dd1 SHA512 da1a8d53af0dc8f0dc8f71a7d41c5277c1e17f81e03a3c54852ced65d5d379577989e274bac66926c8a10f4d2f2834f7456b79635007252308ca593e98ef6d43
-EBUILD imagemagick-6.9.11.46.ebuild 7027 BLAKE2B 86b4d7cff818d7528e3c73998a3ab7c4637df1891cd877bd5cd05711f367848f77ccc601cae4026245b7b8e178ce1fc8f2f4f6d5eca4c84abacd2eb9baa09f7d SHA512 86cc4771514ce326102f7d9a6189a875e9195f8ab682a136cec94e739ce9981175559505a84395973af18f909c8f0acafd814efa78699b464ad3cacf474638c9
-EBUILD imagemagick-6.9.11.52.ebuild 7034 BLAKE2B 41bc3bf174a47d092ce5f21e044eef416e80a46cdcf7a72412e43d7ed962e07ae5b4962a7a76da4b5fc8ed58d79acee9fe2fbf46252fadf95564ddbe1da68466 SHA512 b6f314ac6ce9fc39851668c3ac14ca6541acedf973612f03a93dfc26865f11b15d6b871481b5a99563b9eadfb206fd6eaa986140d493bc931cd9b63ae008962f
-EBUILD imagemagick-7.0.10.46.ebuild 7336 BLAKE2B 6da2a0d1f45ccf002d9ef542dee22c43211035a0ee6e1eab6a4895b26a15832168f8293fda9f2ff918bcabdd407f4815964c070df4c100cb4e196a722d807d68 SHA512 816d1559730011b20cb0b68c93937e9ef92ba861fbe8699e3584ac5b4d21d5c684922c334c545b0cce188f0d2c86d82c07e96afe36cad36c2b1cd8f15f49029e
-EBUILD imagemagick-7.0.10.52.ebuild 7344 BLAKE2B 717b9fd4e01bd0acb08fda48b89f9c061b01aaf493e2765ab0a053f1905907d2a01d66e6c79b199351d2f8b0625030369c674324b4b2ed5e95751fc6ac5cee60 SHA512 53988544b8b7beb7986274144b66ea220a7f2e53c2d1a98597e3a3d2efc10736b3c1b23b598829bb2cae5acd3292b18eff12cd298444b295bdc4aa0dffe67276
+DIST ImageMagick-7.0.10-58.tar.xz 9655792 BLAKE2B b16db99046427bc0c764588fbf7d10f9f7cdf665d8662b03103ec69c75d44aea80575ae1b8381b15e33dc6a393216918cecbdbd93ea61639b4b09ec15d1588c8 SHA512 ec58eba8a35d78e481d98ae6e13daddc81a8e28904b1524735ce54a7d1557b4ec22d314ecdfcb199685ba55604e6fcdc3cbf9193775627dbd42bf61983c98593
+EBUILD imagemagick-6.9.11.52.ebuild 7027 BLAKE2B 86b4d7cff818d7528e3c73998a3ab7c4637df1891cd877bd5cd05711f367848f77ccc601cae4026245b7b8e178ce1fc8f2f4f6d5eca4c84abacd2eb9baa09f7d SHA512 86cc4771514ce326102f7d9a6189a875e9195f8ab682a136cec94e739ce9981175559505a84395973af18f909c8f0acafd814efa78699b464ad3cacf474638c9
+EBUILD imagemagick-6.9.11.58.ebuild 7034 BLAKE2B 41bc3bf174a47d092ce5f21e044eef416e80a46cdcf7a72412e43d7ed962e07ae5b4962a7a76da4b5fc8ed58d79acee9fe2fbf46252fadf95564ddbe1da68466 SHA512 b6f314ac6ce9fc39851668c3ac14ca6541acedf973612f03a93dfc26865f11b15d6b871481b5a99563b9eadfb206fd6eaa986140d493bc931cd9b63ae008962f
+EBUILD imagemagick-7.0.10.52.ebuild 7336 BLAKE2B 6da2a0d1f45ccf002d9ef542dee22c43211035a0ee6e1eab6a4895b26a15832168f8293fda9f2ff918bcabdd407f4815964c070df4c100cb4e196a722d807d68 SHA512 816d1559730011b20cb0b68c93937e9ef92ba861fbe8699e3584ac5b4d21d5c684922c334c545b0cce188f0d2c86d82c07e96afe36cad36c2b1cd8f15f49029e
+EBUILD imagemagick-7.0.10.58.ebuild 7344 BLAKE2B 717b9fd4e01bd0acb08fda48b89f9c061b01aaf493e2765ab0a053f1905907d2a01d66e6c79b199351d2f8b0625030369c674324b4b2ed5e95751fc6ac5cee60 SHA512 53988544b8b7beb7986274144b66ea220a7f2e53c2d1a98597e3a3d2efc10736b3c1b23b598829bb2cae5acd3292b18eff12cd298444b295bdc4aa0dffe67276
 EBUILD imagemagick-9999.ebuild 7344 BLAKE2B 717b9fd4e01bd0acb08fda48b89f9c061b01aaf493e2765ab0a053f1905907d2a01d66e6c79b199351d2f8b0625030369c674324b4b2ed5e95751fc6ac5cee60 SHA512 53988544b8b7beb7986274144b66ea220a7f2e53c2d1a98597e3a3d2efc10736b3c1b23b598829bb2cae5acd3292b18eff12cd298444b295bdc4aa0dffe67276
 MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
index 1ad14695c634..203c905e1c68 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-37"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild
index 203c905e1c68..1ad14695c634 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.58.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-37"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
index e5a1d02609e0..88889b42904e 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild
index 88889b42904e..e5a1d02609e0 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.58.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index f62082adbe3b..51d9e08839a1 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,7 +1,7 @@
 AUX missing_atomic_include.patch 319 BLAKE2B 8b122e0f1b61cbe98413b21f90c97826fc75b64c4c12f70b2a3048d4c14151f9f790e5c55fbea6eed518f9bdae57e2620b2be15351d86ae339fd4e38925aa57b SHA512 05f3f392f115d918aae78bb6c82b7461212a26bab826e02b686ad03f8c3f8e4fe0b1c1b89e2982e8912922ef987596501ef4145474e2745bf89487e9ba6134db
 DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
-DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0
-EBUILD inkscape-1.0-r1.ebuild 3989 BLAKE2B ff43d507d1449c91a185b1f5dd05f5dc7ff1598f4056a8dec9211efc5325b3a18774874d6d5d1de3dfb145663dfcb7cb955bf47c146b3c8c51ede525be68f01d SHA512 04b37cb020dddc1e7eadaac23942a554b4eed376dacaeef4c71566753777d86a46ffcb3e3d4f2cb71f17e2a1cfb46e8cf94f028f6d6bef590bcbc24a3b26ac0f
-EBUILD inkscape-1.0.1.ebuild 4135 BLAKE2B 17ba7be899418b0802a142db3352ff523dc38dd368672950eac23fee784203e82ae97f9739f4069fd67cd54a290768df32bddeb283f0c1a66bccbe5f090e7631 SHA512 a9cd26ffc148f05b02a6662c0aa25e346eda064e790abf8a240589a1f4bf64f25dbdec2ec76c62feb7c95a2f25d25f00636fe197a53ba73e87e3de59af5b51d0
+DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
+EBUILD inkscape-1.0.1.ebuild 4131 BLAKE2B 7f0f16514898019220b8e924cc773a27ee870d80f396000999f943ba51ebe06ca79865ffdb6b6893e24d048234dfca72f8cfafd28825997c3cfe746583e47763 SHA512 57b7272b22d9f6f5719415b1570d46839a4635693d043316b0ad53d20165f399da9d905478fa62fa2970e0afafdeba28962b3fa3e8141928a08fee62cd0ca230
+EBUILD inkscape-1.0.2.ebuild 4098 BLAKE2B 93e7513b2661039ef925503dc3bce84c4a28646b981d5d7f10329c494975a11d57c7800b78cc46ee3e36720b8576770e75066cdc48efebad1e856e35b57febe7 SHA512 6135c8c41600e97c25773b322e33db9851100e064105461f83be958893311e0fb8365aa6a5eca7bda2083e27898496567e334d32dd5fbcba44c035742c0406f1
 EBUILD inkscape-9999.ebuild 4052 BLAKE2B 3381b7768c38b2015cdbce053cf58ba0ddf6ae11ff942e41ac892cb26a0fac21f6afa1e6a189a95782250b300e009f466ebe81ed3e7944a9bcff7c179ddef33b SHA512 e3aac077bba4efd085083d8c55b62e5b501270091ad20ca688509c66fde8e6e48a415d083eb40cc936532c108d43c3231de0ebb5070e05c289de452d9fe307a4
 MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e
diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1.ebuild
index ebd89f20c15d..01a5f16bfc2d 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://inkscape.org/gallery/item/21571/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2.ebuild
index 53bd4516401d..ed4d6019f5e0 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,20 +10,16 @@ inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.org/gallery/item/18460/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-PATCHES=(
-	"${FILESDIR}/missing_atomic_include.patch"
-)
-
 BDEPEND="
 	dev-util/glib-utils
 	>=dev-util/intltool-0.40
@@ -102,7 +98,7 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="test"
 
-S="${WORKDIR}"/${P}_2020-05-01_4035a4fb49
+S="${WORKDIR}"/${P}_2021-01-15_e86c870879
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
@@ -155,4 +151,7 @@ src_install() {
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
 }
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 373a8e317dab..4e13a3d5a52a 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -4,6 +4,7 @@ AUX iscan-2.29.1-png-libs.patch 1309 BLAKE2B debdebb6753d3f71ec5af8a16082dcb8b9f
 AUX iscan-2.30.1-fix-g++-test.patch 1394 BLAKE2B 6ff018b0be888d4415a40f0d94ab3482590a4b3f627b00f6f1fdd17cbf2aea57b52715eebda678833ec2ea9543470a4b7a5c9f07fced84808b337edd43c11c5e SHA512 b11667e6698955b482c9cffd88413180d77b700ca040bf70969ce10be652cfa38fe2fb3de930519bdfe098f18ce258f24859ab79a93032dbe5052e0e1059ce63
 AUX iscan-2.30.1.1-gcc6.patch 564 BLAKE2B a80e24742c9d142ea88c2884c061efda09391aaa75885ac53de85594c5fa0c5f4b3b8f008165b647647658bbd420bcfb9a631deae3211b01f4848e3d7e22a390 SHA512 4c0ef22323f26282596d5705b0a3982bc8bca17e84f54ad9b1a23290cadbc617ae55492fd3d25e9edd283509e0a8ea1de047b18fd98fdfaf8bb22fd90c096e32
 AUX iscan-2.30.3.1-fix-x86-unknown-types.patch 362 BLAKE2B c791249488661dbe3fcf3301cfd46c04cda85ad95f8e21bae8e8f87e63e787ea69d494d7ae152dbce368ccb9fda44781201d1630e1c487cb9ad0d5d2a33e6d77 SHA512 723c3d5b6522da913ed93abaa1797f661e7eecc3974faa2bf730ced27c6a4adb3ffc87bfb38d42c4929b5afafb3cfe3e9111870aa796ea4872a053302b29ec6f
+AUX iscan-2.30.4.2-c99.patch 443 BLAKE2B 0a9349cbe5f71169a716ea87847d2a1a3bb7f96458939014a1ac557588c194a0b03970b6d71e753d9487a60249c7b25532013f5280098cc6e1ed7b15c3ab7b3a SHA512 c1b0bf2456e34fc0e7025b6207ee2fee429f2771b11ffdaf4e3263a857119c1c827ed008c2576d6fd9d36bf8a45d3934aed71ea738fbe5aae5d6c80dc0c5d807
 AUX iscan-2.30.4.2-sscanf.patch 779 BLAKE2B 8e8255c0558e225b3c1bcb5faaf42f0d794177e463119595b53fd0e194b7918703d3b9ac3c8d8fa1939cc86799deda4605764f99b2aa666f3c2047ed21333f31 SHA512 345ac7ae1c75b6da24f16f9abd5f7f4352cfd3497d24229db8a15d26d767e62c8273220a7f40f18c452ab90094b56774eaf738c880c613f0463db04b6d5d9f3d
 AUX iscan-3.61.0-ijg-libjpeg.patch 1145 BLAKE2B 781c0c9a40848f9c10ddb3418c55b6c4a145f1590c5ec41e22e371830d3d7d63c4e013d8fa69a1f15f24d4883d569c0645df66b3c6120eb724f3a1f9643e3813 SHA512 b570bc0e6aa73f74750aaab4d3ca84838864c8723b14fbf5a45fe9163be3e7819035a12bd058587a4b4964325ba4af99673e78647b11d2a7b1bcf96039522191
 AUX iscan-3.61.0-imagemagick-7.patch 1965 BLAKE2B 14685cc9540ccfda87587b5ff2df7b8c4755dd08bb428f33ce853c32baaf6ab7e6b2d3368df9153fa5f5b39d9ef17b8e468ea59530ac89098107542db2638f05 SHA512 d5545570865370229f2b132aef7131cbbfabd7e929795bee6ce1e0d791c2c623eefabdd0ec265c6cadcc41072049d61e07d5fca46a1f51c621323a38112dc316
@@ -18,6 +19,6 @@ DIST imagescan_3.63.0.orig.tar.gz 12776113 BLAKE2B d1a9f1d60ba4a2239c6ed74f7f9e0
 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
-EBUILD iscan-2.30.4.2-r1.ebuild 3960 BLAKE2B ae1797ba1ca4f7bb8c5b0c6397425965f651dfb63f45cd8c350e93c0a99c854ca12065fb8d5da10f9ea1ec5e9b52d362a4306de9b3d125558380752b95e939e2 SHA512 081a5d83837300553c17ac16b09e0c8f0ffd2d8686df67023f5bd77e6b095612428331f7354d151eaf90943708b5efb9e80d8914d1c95998a6edb5c609a42ab5
+EBUILD iscan-2.30.4.2-r1.ebuild 4000 BLAKE2B 9d315f3c51ba848fda0feea5a22d004cb6010112cba8dda3372bac5a9b9ecb6ee7aec3d9cee254ba0e77305eee99be1bb342180c71a6a8048c0625cbe1b10aa6 SHA512 b42e39b888418f016a2a147aba40a3241a75d7930132a8290163d2ea4e57ee7bf57125d6382229440cf3078482f3a7f2158575d28353ae1d7d9a69bb5f389043
 EBUILD iscan-3.63.0.ebuild 2899 BLAKE2B fa560b7857120e9180165b2d72161cdd3705fa8002b93022ef675a2df1ed22852453a72199e67e2bbe3ec08402860700eff9c76f6d0bd406441dfd64a57ea150 SHA512 72991e80c75e6d86362adedf76c63827b0752da2815ccdbbe72ecd84c621a5f733f3a8491b07a0452ac09f236fd24c866f52a03d46dca5b72e200c29bfe3ed30
 MISC metadata.xml 930 BLAKE2B d2cf4fae5cdcb660357ffe5566ad8d99eef6287f565a45f1824c810b3979e9d2930f458766ff524b231ef8dfd793062ff23cf4bfc2a78a36c5393a6c4224feea SHA512 d609a5cd8f8bbc7653e784d153757849eafb9c772355d0928325a6ecf673e8aa055623601d957f912709f9f16acfde5ca0b0480a1f2a17bfc24825895d861fc0
diff --git a/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch b/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch
new file mode 100644
index 000000000000..93683c2887b4
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-2.30.4.2-c99.patch
@@ -0,0 +1,24 @@
+--- a/backend/defines.h	2021-01-04 08:13:48.995137756 -0000
++++ b/backend/defines.h	2021-01-04 08:16:00.524563361 -0000
+@@ -31,6 +31,13 @@
+ 
+ 
+ #ifndef __cplusplus
++
++/*  Use the C99 bool type if available
++ */
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#else
++
+ /*! A C++ Boolean type and corresponding keywords for our C code.
+  */
+ typedef enum {
+@@ -38,6 +45,7 @@
+   true
+ } bool;
+ #endif
++#endif
+ 
+ 
+ /*  Run-time contract validation.
diff --git a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
index 333d41b9b1c7..c1eb390986e3 100644
--- a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -70,6 +70,7 @@ PATCHES=(
 	"${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
 	"${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch
 	"${FILESDIR}"/iscan-2.30.4.2-sscanf.patch
+	"${FILESDIR}"/iscan-2.30.4.2-c99.patch
 )
 
 QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2d7aef44ad56..4a444f688213 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,5 +1,7 @@
 AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.1.tar.xz 169788052 BLAKE2B fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190 SHA512 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe
+DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660 SHA512 a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef
 EBUILD krita-4.4.1.ebuild 3385 BLAKE2B 63a617f770915621fb9550298de444c0973ecf7acfa65c2b15e0e974ef8781c250499ca7fbae02a19987cf03c3d90638f0289e9ab3029e127dac01a3d55cea21 SHA512 3c29c5e00b87e0c4f256c8d26407e42832d72643ff287799667df673bf6dc6936415e1146f65341e28c00e939635654aef53d97d1199bda0e414377cc2c6eab9
+EBUILD krita-4.4.2.ebuild 3386 BLAKE2B 83911adce657ba9679f25f811d2383651cff66e02c1b00b844622ed8d2c763d841662f18c9af58722a2bb59e90c0fdb878872f44e32a1b21c130deb7b4014279 SHA512 9adcebbc9b7abae5418b1a9711cd4a8ef984b924af27fe3747e1367ec513c54a48e3a495465c47a1faa8c533b581c5ace5b9f314e4e1a3bd8da3db01329b0de1
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.4.2.ebuild b/media-gfx/krita/krita-4.4.2.ebuild
new file mode 100644
index 000000000000..3a09834e46d1
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/quazip
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
+		$(cmake_use_find_package color-management OCIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package vc Vc)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 2ca25277e4a2..ba923e0bab8f 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,5 @@
 DIST lximage-qt-0.15.0.tar.xz 91444 BLAKE2B a5ccd9afdd4ed1ec60a5da8ec3390e5d93f018209ce62a1fbf929c6984a056539751f576a15e0b81e4f1ba003d35379791066832f02a45de1a5d5e8e8eb8f0b2 SHA512 980fc401b31c5d937877ef35211892984def150a6db6072d9752fa78588ea8ca0827beb5880d46775092c42e93358d3e494e045a50756931129402ded4ecab23
 DIST lximage-qt-0.16.0.tar.xz 100920 BLAKE2B 17a41013b7d7e599662a698fa24b6b15a550b2211dd818fbfda19b0fb9439bf77b63b2d8248ad8a65605fee8fc73c78d294ae86401d5660f6d798aa775273709 SHA512 2da46d23567cff7044a884e14b30de36b3a19d802768585b7c3332897b0af2fc42993ed9bb9d062db7988a0526cc7357a09fbac5f283a615b109ea8dfbf474b5
 EBUILD lximage-qt-0.15.0.ebuild 959 BLAKE2B 4c3c897be70d6fc8742774536ce838d2d06860530bcf15ee893892aebdad64a90d13d16f2ca259113539233996041ff9d2b86bdf3c6fb88f67c9f9766054bc95 SHA512 9353543981a42e1574c82b146c6bbed904bb2fd57cff2e251ad347c8ce8d2a7e6964dd2bc745f09e7f5107833464bf82c11d81bf4452f5430efd87289672a630
-EBUILD lximage-qt-0.16.0.ebuild 961 BLAKE2B 5b87008492d6624580dc409dea5a14295f940a2ccc5c2d65667aeba29cd43c4a744779278c63b9ef441736893d6d12abdd2ef34c304d3073e1046a99355ea2c4 SHA512 23afd5ce3049f2c562dd490459a7f847fd144f34c14bf84ee2e58d752d0facc2459f5bb33bd58669f687a12ad2a62b5cc68d580d7b442354237628057a087ec9
+EBUILD lximage-qt-0.16.0.ebuild 960 BLAKE2B ca15fcb74bf4457a1bd3f67e723a101989c22d3d2f4e1a9c50ffd757082e31f3106602904d15ff748dae63ea33b6d81bf5604b694b741d011493c681124f243f SHA512 e94aa07c174b07d338a601a745425a1e215479fa5718c7c7ae05e9e74c9d3d92e9f6281f290eceb068e73081a392d02ce78ed80a5a8c9dd76350aaaaf82239e4
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
index 9fc843665a0f..3ae75554c3f4 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index e611c6ef97bd..0ca031d9e1a2 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,4 +1,4 @@
 DIST maim-5.6.3.tar.gz 40217 BLAKE2B 90f6854d8e54b92f8c6e8d5b597ea287e85e622ad689f1b72361aa919d0ce57bf4f28f289fd0da51b30c1195977b70982837d8b4b81ec5597361bc6ed5f1ad0a SHA512 8e19bd4e89db117bcb74a9b9e35f3232cdd0ef3836a536d170f803d7159fbc4be415d20695e5e61942ff7714d990d027149cee20a689f797d25d01610cc1c3be
-EBUILD maim-5.6.3.ebuild 845 BLAKE2B 03ba5512384fbc25c4c0680a1399d63fd4e349affcfd0d104c020fed460aefb423d83ce44d7ab9aa94ae8fef5d9341bbf42ff67d0aad668ae8ebbf90f6569e1e SHA512 cb4184187848233f19288a9c0438492ff8abc700440888eeec8baac081ac4191875ddc3f9d8cb659b477d9012821b01440c03e3544ea36931d069dd89e1813a5
+EBUILD maim-5.6.3.ebuild 844 BLAKE2B 0e019af36b1e1f2adf777956adc6ebcb0bda15142d7b4a7c7f75bb78354e4d3955785a35befdeb516fd2dbc473ad49bd636e7f1168b2c8d40306298ad8694629 SHA512 a83b722419f9d67eae72e87c2da50a154873ba1cebab3f8795649d93315f3f8adf1798b729282b0ca8497eb66350bd98928f6eb6a3b4883844ba9f74427b530d
 EBUILD maim-9999.ebuild 845 BLAKE2B 03ba5512384fbc25c4c0680a1399d63fd4e349affcfd0d104c020fed460aefb423d83ce44d7ab9aa94ae8fef5d9341bbf42ff67d0aad668ae8ebbf90f6569e1e SHA512 cb4184187848233f19288a9c0438492ff8abc700440888eeec8baac081ac4191875ddc3f9d8cb659b477d9012821b01440c03e3544ea36931d069dd89e1813a5
 MISC metadata.xml 245 BLAKE2B d0f0419f8a7ceef258bb5d6499438203206131b3dd86d5e5f15abd9567155a7b93fc33c277ee7d95440674757244a9edd429977cd48aefe146d8284bce340164 SHA512 67d8f26574827a11a25ccae725ff3ea2d4eb69cdfe78fb7f1ce3f081c7ed65bf6c53518151ad540e2d790ba69bbbc390d26602b66d34de8ac2ae27f96a15e5bf
diff --git a/media-gfx/maim/maim-5.6.3.ebuild b/media-gfx/maim/maim-5.6.3.ebuild
index 561201c54d12..1e8914586a32 100644
--- a/media-gfx/maim/maim-5.6.3.ebuild
+++ b/media-gfx/maim/maim-5.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/naelstrof/maim.git"
 else
 	SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 27fd7e493d29..e1899abc7efa 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -1,33 +1,6 @@
-AUX 2016.12/0001-compile-server.patch 658 BLAKE2B 22d470db842e5da0c8419b22f67c5c31ef79613bde7f0cb30958ab96196217120aced6d76bb45a4e59fad89c93ef0fddc322ba7612a27585f659f4c94ad91a1f SHA512 32eba22818686094a070142314e3aa3efabc6615032927d6c4420c6698dd38a783d7be54548ac9f4e0d415f3d07bba0d8fb231284f2e9afca9e644007551782e
-AUX 2016.12/0001-depend-on-system-glew.patch 1935 BLAKE2B 3f30cb756749e727c43b049eed4febd4165ebf2be4447252aeb692dcac621996249dfbe83718a92a008defae5258c8606baa1c1146397a823c630ad9ea30699a SHA512 32cd48eb927f8674ab887f2fdf37fee2464e8a9e03a738e7c045bea789c9ae6afcb53f764e621976baf551bac713810110e4e62d4bcb184603000f1cd263b8df
-AUX 2016.12/0001-disable-edit-quality.patch 821 BLAKE2B b181a297c37b6de9a7054337b644f36131ccec10edbd00b27e7853b126745e14fb06d2052c2ab01fc0d428e3e77324ce7b4444c6b69343804ea87222a711d19a SHA512 9a2a5976e41823b9ddc8524044ef9d2dfd1779e0a1545513d638c897a4ab396e0ba5a72e9a457ccab6a107f1d77e5fdff768da4e897b6bcc90efc542c007b3d2
-AUX 2016.12/0001-disable-filter-layer.patch 886 BLAKE2B c29b6810474bddadad766170dd93bd633f448a11cc769ef42f0a628d776649f43a7ef74fb52d5ce42ad3030c52fe37892f12e5c0e6c617ab246dc95c447ef1b9 SHA512 74a0d2f0d66100b2db28804ca2bb67a07258b62e72a3d1475a0d4194f04149abe9a059726ea623176d365065e767a60c31b226462ef362993be34c2e9df9da17
-AUX 2016.12/0001-disable-filter-ssynth.patch 869 BLAKE2B 0c432b59f1fcc13f7e916b2177b6cf8ef0748d806b99f26d648ce5125ed39986c88a10490b01ae978ad7f7e12779108ed7df8f391977ca50b6a095c5271d865b SHA512 cd455c67827521b0530219d32aa3b26fa3ff6edc7badd5064d89f2b447ce1ce04e77c50fb3fb7f603566edf167c9adc8e092e21b452629d3636f321ac2727dba
-AUX 2016.12/0001-remove-not-sane-plugins.patch 846 BLAKE2B 934aa2fe9cec6104070b809971f658f3576d1382913430d25b89d4c1accc1914c123bd524ea45e7ecc97a0970008c4f2ed286fc8b4a16d1214465cfd81710daf SHA512 3b9363bd24a708370154b493a71953a9190e1f1faf882a2a89b212638acbd638f5b8d50d025a25bbcbfbf3575a0bf8314040788e73f8cd2f953beef6c35d057e
-AUX 2016.12/0001-set-shader-and-texture-paths.patch 6868 BLAKE2B 29c777601773ca6d87351b7bd5b35bdf1f96a387578b18302140838b3180e27242b92774e206832a6a79d26ae0f95e07f480d7f530f44ae9725515c6f65130d1 SHA512 17f6fe9148d8494055480cdd8022e2f1a90b770e80ad18ba09c8c7b4abe928be6084d50f1ecfc387fdd2061efd99e386c2730929e226afc901dc811a9424b574
-AUX 2016.12/0001-update-1.3.3-pluginmanager.patch.patch 871 BLAKE2B 1368a754f9901d7cbe772817202b5dd262b9202a73a923b9b1e8c9df7fd7098cf039263207a4bd7e9ae4216b0ec086e58b008aaf7f4d2e10e729da4aebc19432 SHA512 7cc66ba6e399fa9bb0539dc72916abec882266119f41ffa3574b48aaf152bb289efa8cea1d6cd79bc1a194d5b1a72737860f0faf07d0f0a04a4e628c5a370181
-AUX 2016.12/0001-use-external-bzip.patch 2149 BLAKE2B bc0940c07fbb2f9fe05cf6daf0e6471f268241a41d4bc77c172b3cd6a3c1d85426b4d2f47a411d83a578a6717acc69bd3f6a41f4f3bed042fdb498d80642eecc SHA512 194bd427c62b29e9004505a5de79632de9135458295c64088dbdb4608d105a52449560b5d02c975bf2258009bda1422948128370e2fdd0f66dcd009c744e5729
-AUX 2016.12/0001-use-external-glew.patch 3530 BLAKE2B 8b7c4203ddb96150b869393dc60ca7ee59e4fd9b7f717c30bcb0574d230df78d6ea93ebb4bb6e74eedef16911dc1aa670dca2dfd9d3258cda2c7211fe3af4481 SHA512 a2a032d249062b342a3875f90f2e3d55e10f75fe2dd22e7ffdb6785c738c4ed1ebaa42787cdf33f886bd9309e2c25faa77ce2137ff1a40f8519b3a0abaec04f1
-AUX 2016.12/0001-use-external-jhead.patch 1405 BLAKE2B 6e0560dc807065bf635612ce8ba2e502689190127aa1980c494ebc71313887dea5481ffdf57d87792bdba5952e2b7a46c219500c26b8912b3b8d1ead31d1c7d1 SHA512 5b10fb613625ee9c0d63965b20b64841d7626211738b4a4dbdeed00d63dae62ad1c046df934e39fd8800dd0f03a6c85e80f4eedc2bcd843889dc1b4f3ea4834a
-AUX 2016.12/0001-use-external-lib3ds.patch 1728 BLAKE2B 143e7b64c6a6d859cebab4c4da348b1eaa655d065d42d50edd7e0830f597cefcff004355f81be6b483ee379af6a7c84c26f6d44149e8cfa2192a602c6fbcd7af SHA512 5c5f7c2153912239faf103dd6b54fe0056a1471c825c19ba3a174f336c0c744fa384ae21615e8e38543ef2a85bbfd8e5f9c0e3d5b8c974086ae6ca745b584d98
-AUX 2016.12/0001-use-external-muParser.patch 1574 BLAKE2B 0114f8b5f45c93117dda73f16c6f81f6ee21e81fcc995504e772f5ccd1d8ef0659f4e6458921d4b3434b6be6f56636c573921dfa47c302e0989ab6f4fb0465ef SHA512 ecf91a15b4ea3f50ddc927cc259ad57a063e7aab0b034d2228decb797117763fc78760a217321e949e0a783caefed99a2a3a8b4e756e42b0d6941fc04395f292
-AUX 2016.12/0001-use-external-openctm.patch 1841 BLAKE2B 8cd4c14c846df052a44d54386948deb161ee8459750e1fe551e79295c56f93eb7d7e678533e0077a071ea4bc95362dec89d02d20c75b943d188ce457b83ca6e9 SHA512 48532da795602ac867bade00e6a649758f7c6d0c26412c8a4486e23239d3d55220ba22ea5b9ca5e11f97ea224626ebb95bbf89cbb707876575a11be891aabcaa
-AUX 2016.12/meshlab-2016.12-align1.patch 766 BLAKE2B 4a226e853d8c236ff07d408093bd1e197df202a732e8c6cf429f479c2d9101260d33834e877896ea4570d690fc03c0d60d883b88e9591c9c7781fd0117fc3543 SHA512 4f8684a4fe8fdec286672c330e9c489028518bf121ec561221d3108af44ed4afd3cb3d21113b1b5b110afc127c25d9bc5fb6999be4fd815eddfe3aa406b0f7a7
-AUX 2016.12/meshlab-2016.12-align2.patch 624 BLAKE2B 342231146ef2efc52ae4295d9094e07818d0ce6265a02426d43648d070e0f7b939e4323a820721450ef7c240dc6f0a8459e3608fb74519eeb7e1efea510e2e76 SHA512 cfa90271bd671244ecc4ad92318f2aad31223990843fb3e185e66b51c8b975c5ed3fec73834e379c1498ce35de1a9e217aa28ff2fdea6233abcbdba09896cc19
-AUX 2016.12/meshlab-2016.12-asString.patch 2309 BLAKE2B 8ff58d9a247e530e7965d186dfffc2e88bd4594a366439f9a8433269e3f20e33825673447a5ebac39929f02927a20cfa8d3dad0fae5787d6855de5653023ff31 SHA512 3ad05b637ad12a88a6e32f437cf6105b09c50eef16e815f11f3a1fbd6afdb3b01d9a0d31f08eaba26d075f6f2cba6c4694ca1afa2cc1e3973350294bc41f815b
-AUX 2016.12/meshlab-2016.12-fix-plugins-path.patch 509 BLAKE2B 3a4327b41743704255039f2c06713975c2d842a3af5077385d982107289d33a5a04473f68e21769ca97e45514ca1119244c2b66b5709b99a0b772324e1b0884f SHA512 613b3cec1c50c3d4d6fd3006b80fd4cb3b66a97c1493872d76f95c5ed16ee9c2a9aba5c1a5d021a302114e8e0e172619c4d344306004f109a1f211ee6a14e102
-AUX 2016.12/meshlab-2016.12-qprintable.patch 898 BLAKE2B 1a4802e758f8c7d29839eae49d5450b4d199011544223da7d7791045d44f2b2d71f7189d0cb655204d77736e63988079eeb64876411c62f09646887dae30aff8 SHA512 12836928f1848048afe769188285cc5a0a4e23b7d63f9c12ebae0298296607167d8e6198ea779cc475ca2cd39903c4a37dc77b20c928c49cddae1b4ee2fe2a7f
-AUX 2016.12/meshlab-2016.12-qt-5.15.patch 930 BLAKE2B d9bc0073c309006206411bcc48b3db65496aed4b32e5b8d30d582174f46038d34cac669e754516be4e07f51d448d92358666dded59a0ecc38cbbc78701a57a38 SHA512 c5c529c262d036346730247735c19f15eb11bf55dc2b876b230d81e3968941019b6dc6d8a64458b3da398b8ce4cb48a7bbfada375bac06ef73df9a25d827d820
-AUX 2016.12/meshlab-2016.12-qt-includes.patch 521 BLAKE2B 44d8cd045180d25810beb74da2a916fb6a8a01354be819d43fd960913f96863d8d3696a23440e8857081560326b78538446426d676f6d0c52b42fe3bc20ae1ca SHA512 ad9613bdafa1f812f4fd6b36a215b78416b2143af6ae96bc6c40d81eee47e16c0d2e62a7b292367333ff99b09f84630f1a9b5ba59d9a1ef3209a3caa28f1f5f6
-AUX 2016.12/meshlab-2016.12-remove-header.patch 1481 BLAKE2B c52f2eb980ebec98a534d2f5f6eadb9b89719e1d28d6fdc2912348fbe715103f2ca67684e29d1fa77b9b305cf552c12eb667634bfa22a0fad0312012e9b7b99d SHA512 ea0e24aa94d2595ed340c91c7a17e4028b2792bf316dfea0d8062324583dde62c03bb2d6af74317b9e448c657e5418100f40b18b172344697fe53e36657a45fc
-AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f95118e00159457b91d04820166efae55d27eb19006af9ae92555b46adcd817646fcfcef82937221d59fef41899f94df1925a237 SHA512 03b4907fc484941d17d208d028b63cc0a1d1740fbdac8a6dd2b9ac8161efc5899d820cd0ec59b28ba1c39562ecd93c5e11e7b7af5564ee9aa429cb8745a4a5b9
-AUX 2016.12/remove-io_TXT.patch 416 BLAKE2B 60aa9c033a4902c4a9acb76b1ac130076cfdef314ac57a144c0a83d59e1d7f2aa5e55c01c41ba671661cdeef249aa09e021085440214910c8153fa6303833c2f SHA512 2ff0391e5c0bd171bb06fc61cbe84112f5e480667f7a7caacbb3b3a0e566c6c2f31f443d8c6026298c3a86bf2979db534989b4eab368baaee67491b95e76723a
 AUX meshlab-2020.12-disable-updates.patch 1005 BLAKE2B 61fe405555be9a1170f0044ad0e851b2c19e25545883f07c9094e39773f2774c14c4f7b95f8a079ca782378399313ba53ac94d87f7587a6b707b9fd70560fa59 SHA512 142ab31b1874f54a371ce79e6da9f017548448cb7d3d502408a0541c26b89aafe154a42bff45965288b945cc9f65b0280fb57ed8f90f11736fb247f50129de26
 AUX meshlab-2020.12-find-plugins.patch 1117 BLAKE2B 0c17b35288543cc3b84040851f5bfb30977677254a60cb3410c2ef65d10febe648541828a1b16ac6ba4db6ac92cc087a6256923d936ffe2f069edbdb29decd14 SHA512 b57ebd412475f22624b1f211000a020dd00628f2d197ba25942874324a34d6ed14ddcbd28f9819adc523657352ac024f23852ba83d4663e4dce794e0be96340f
-DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
 DIST meshlab-2020.12.tar.gz 111438055 BLAKE2B 4969c1f8f60be6ff55effd710c0bceb290ad6ac01153c233fd6a943f15e86189c04c06aa474ea89899d31b77d6960ffabbda6a12c3107d750469945e0c73c335 SHA512 0a00493f3e622a7bb0b70ddf0e1710376b47bd844aa785782a62f31a46ae1ee4b493c1e4ae0184f51f30be263f84efc0073e266d50748adc10ef229f107e4c87
-DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
 DIST vcglib-2020.12.tar.gz 6777201 BLAKE2B 9e2e3eb4ae7b930a8a334d58ee4bdadaf43e9a031d523471d17ca39d241c0dd66ec846a360cbcccd53d8728a2c7a6b6fa7d7a3efc04c01515ac3366b10f01aa8 SHA512 d7eec0c9c847e6ade7a3bee9aa1cddbb6855c388b15e2b35889ce998ea9a1c7afb0034ec31c38de3cbc2d867c8d8a474b13e4e2e3218e636926967abe4e54924
-EBUILD meshlab-2016.12-r4.ebuild 3659 BLAKE2B 12397c2ceacc8904b2bf1f0bcc96afe4520d31c5030dad92f020234bd4bce8a8e2f96256c73672c18f9e2112e031fe2f5f54f49654b1128a1138fe25f6851e4b SHA512 a09a4f60cdc9579dddc44411313978d262e59569e9724157055633a37c2dffec105be466e4e0c15ac2d31e7135320c9589970c9243c2825f7502888b65363e52
 EBUILD meshlab-2020.12.ebuild 1362 BLAKE2B d0d008d4a3b99f2a6313491211e592b2f1ccd4d1d49245ed3d56491b5e2ab8d8018bd28c2ebb505cf35d2fec04f92353965e95ed0c23a9c60e2099e4057274c5 SHA512 2073981431d6defc5017b1670354e843f9f7af7b80806a1af2a9e48190e851a4f5162fc1952e2ed2a80b297149bb41b44919ca2254bc697d5a16373c74c65525
 MISC metadata.xml 996 BLAKE2B 87e7bef17518f533f64493c8eed41dc3c5817ea14cd301945e3efee70712cef35267b39d2d7b0fea41e9f848cf3f140f454e474adee6747b366c843fc62e9455 SHA512 0fe24a2782373ff75e17d359c6db5aafc489f6bb6a3ad079a484e7b32177a4b613f4c8b8bee2bf6480271c7ead24cbcbae4052b6f6ccec8713cd87991e042448
diff --git a/media-gfx/meshlab/files/2016.12/0001-compile-server.patch b/media-gfx/meshlab/files/2016.12/0001-compile-server.patch
deleted file mode 100644
index 6e2e31af9bd2..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-compile-server.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 188c3465b9cc5be7c72b21e012a89b9d07e6e2c4 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <mohammadpour.sobhan@gmail.com>
-Date: Mon, 20 Nov 2017 14:40:02 +0330
-Subject: [PATCH] compile server
-
----
- meshlab_mini.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab_mini.pro b/meshlab_mini.pro
-index abe0259..b18771e 100644
---- a/meshlab_mini.pro
-+++ b/meshlab_mini.pro
-@@ -34,4 +34,4 @@ SUBDIRS       = common \
- #                meshlabplugins/filter_unsharp \
- #                meshlabplugins/io_collada \
- #                meshlabplugins/io_x3d \
--#                meshlabserver
-+                meshlabserver
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch b/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch
deleted file mode 100644
index d8c5bb1f5aaa..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 58a86b4c48ef89faa5d4d16c502d5350fb1c5df3 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 00:57:42 +0330
-Subject: [PATCH] depend-on-system-glew
-
----
- common/common.pro   | 7 +------
- meshlab/meshlab.pro | 2 --
- 2 files changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/common/common.pro b/common/common.pro
-index 51cdcb5..85849dc 100644
---- a/common/common.pro
-+++ b/common/common.pro
-@@ -1,7 +1,6 @@
- include (../general.pri)
- EXIF_DIR = ../external/jhead-2.95
- 
--GLEWCODE = $$GLEWDIR/src/glew.c
- 
- win32-msvc2005:DESTDIR = ../distrib
- win32-msvc2008:DESTDIR = ../distrib
-@@ -53,9 +52,7 @@ ln -s ../../../meshlab/src/distrib/shaders ../distrib/shaders ;\
- echo "linked shader dir"; \
- fi;\
- "
--INCLUDEPATH *= ../.. \
--    $$VCGDIR \
--    $$GLEWDIR/include
-+
- TEMPLATE = lib
- linux-g++:CONFIG += dll
- linux-g++:DESTDIR = ../distrib
-@@ -80,7 +77,6 @@ QT += script
- TARGET = common
- DEPENDPATH += .
- INCLUDEPATH += . $$EXIF_DIR
--DEFINES += GLEW_STATIC
- win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS
-@@ -117,7 +113,6 @@ SOURCES += 	filterparameter.cpp \
- 			mlapplication.cpp \
- 			scriptsyntax.cpp \
- 			searcher.cpp \
--			$$GLEWCODE \
- 			meshlabdocumentxml.cpp \
- 			meshlabdocumentbundler.cpp \
- 			ml_shared_data_context.cpp 
-diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
-index 0e50581..37d44ba 100644
---- a/meshlab/meshlab.pro
-+++ b/meshlab/meshlab.pro
-@@ -9,7 +9,6 @@ INCLUDEPATH *= . \
- 	.. \
- 	../.. \
-     $$VCGDIR \
--    $$GLEWDIR/include \
- 	$$EXIF_DIR
- DEPENDPATH += $$VCGDIR \
-     $$VCGDIR/vcg \
-@@ -64,7 +63,6 @@ SOURCES = main.cpp \
- 	$$VCGDIR/wrap/gui/trackball.cpp \
-     $$VCGDIR/wrap/gui/trackmode.cpp \
- 	$$VCGDIR/wrap/gui/coordinateframe.cpp \
--	#$$GLEWDIR/src/glew.c \
-     glarea_setting.cpp \
- 	filterthread.cpp 
- 
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch b/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch
deleted file mode 100644
index ed58bc0cb97e..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-disable-edit-quality.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 59588b3198e0ca6cd97265a65ea87b40897d3bd9 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 00:41:15 +0330
-Subject: [PATCH] disable-edit-quality
-
----
- meshlab_full.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab_full.pro b/meshlab_full.pro
-index 143e226..9939225 100644
---- a/meshlab_full.pro
-+++ b/meshlab_full.pro
-@@ -69,7 +69,7 @@ SUBDIRS       = common \
-                 meshlabplugins/edit_pickpoints \
-                 meshlabplugins/edit_point\
-                 plugins_experimental/edit_referencing \
--                meshlabplugins/edit_quality \
-+#                meshlabplugins/edit_quality \
-                 meshlabplugins/edit_select \
- # Sample Plugins
-                 sampleplugins/sampleedit \
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch b/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch
deleted file mode 100644
index 407d7775f9f1..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-disable-filter-layer.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 90862a887b923984e17343447c30251f2d6fc541 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 12:37:14 +0330
-Subject: [PATCH] disable filter layer
-
----
- meshlab_full.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab_full.pro b/meshlab_full.pro
-index 9939225..1691d31 100644
---- a/meshlab_full.pro
-+++ b/meshlab_full.pro
-@@ -34,7 +34,7 @@ SUBDIRS       = common \
-                 sampleplugins/filter_geodesic \
-                 meshlabplugins/filter_img_patch_param \
-                 meshlabplugins/filter_isoparametrization \
--                meshlabplugins/filter_layer \
-+#                meshlabplugins/filter_layer \
-                 meshlabplugins/filter_measure \
-                 meshlabplugins/filter_meshing \
-                 plugins_experimental/filter_mutualglobal \
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch b/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch
deleted file mode 100644
index c5f84998a627..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-disable-filter-ssynth.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 22f946dece8e56683a197204ac05292045a3dda1 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Wed, 22 Nov 2017 23:20:57 +0330
-Subject: [PATCH] disable-filter-ssynth
-
----
- meshlab_full.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab_full.pro b/meshlab_full.pro
-index 4a256a1..143e226 100644
---- a/meshlab_full.pro
-+++ b/meshlab_full.pro
-@@ -49,7 +49,7 @@ SUBDIRS       = common \
-                 meshlabplugins/filter_sdfgpu \
-                 meshlabplugins/filter_select \
-                 plugins_experimental/filter_sketchfab \
--                meshlabplugins/filter_ssynth \
-+#                meshlabplugins/filter_ssynth \
-                 meshlabplugins/filter_texture \
-                 meshlabplugins/filter_trioptimize \
-                 meshlabplugins/filter_unsharp \
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch b/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch
deleted file mode 100644
index 320912c40ed3..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-remove-not-sane-plugins.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0358aad037efc55701622884bf0ed1249a08387f Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 02:23:03 +0330
-Subject: [PATCH] remove not sane plugins
-
----
- meshlab_full.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab_full.pro b/meshlab_full.pro
-index 9939225..b8a6bce 100644
---- a/meshlab_full.pro
-+++ b/meshlab_full.pro
-@@ -27,7 +27,7 @@ SUBDIRS       = common \
-                 meshlabplugins/filter_color_projection \
-                 meshlabplugins/filter_create \
- 				sampleplugins/filter_createiso \
--                meshlabplugins/filter_csg \
-+#                meshlabplugins/filter_csg \
-                 meshlabplugins/filter_dirt \
-                 meshlabplugins/filter_fractal \
-                 meshlabplugins/filter_func \
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch b/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch
deleted file mode 100644
index a1a4f3f860ab..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-set-shader-and-texture-paths.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 4780d519177021364427b44567fd9a67879435aa Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Fri, 24 Nov 2017 18:20:11 +0330
-Subject: [PATCH] set shader and texture paths
-
----
- meshlabplugins/render_gdp/meshrender.cpp                  |  6 +++++-
- meshlabplugins/render_gdp/shaderDialog.cpp                |  6 +++++-
- plugins_experimental/render_splatpyramid/dialog.cpp       |  7 +++++--
- plugins_experimental/render_splatpyramid/splat_pyramid.cc |  6 +++++-
- plugins_unsupported/render_rm/glstateholder.cpp           | 12 ++++++++++--
- plugins_unsupported/render_rm/rmmeshrender.cpp            |  6 +++++-
- plugins_unsupported/render_rm/rmshaderdialog.cpp          | 10 +++++++++-
- 7 files changed, 44 insertions(+), 9 deletions(-)
-
-diff --git a/meshlabplugins/render_gdp/meshrender.cpp b/meshlabplugins/render_gdp/meshrender.cpp
-index 5841ce6..28e66b3 100644
---- a/meshlabplugins/render_gdp/meshrender.cpp
-+++ b/meshlabplugins/render_gdp/meshrender.cpp
-@@ -38,7 +38,11 @@ void MeshShaderRenderPlugin::initActionList() {
- 	qaNone->setCheckable(false);
- 	actionList << qaNone;*/
- 
--	QDir shadersDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+	    QDir shadersDir("/usr/share/meshlab");
-+#else
-+			QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- 	if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins")
- 		shadersDir.cdUp();
-diff --git a/meshlabplugins/render_gdp/shaderDialog.cpp b/meshlabplugins/render_gdp/shaderDialog.cpp
-index 1315757..168c0f8 100644
---- a/meshlabplugins/render_gdp/shaderDialog.cpp
-+++ b/meshlabplugins/render_gdp/shaderDialog.cpp
-@@ -317,7 +317,11 @@ void ShaderDialog::changeTexturePath(int i) {
- void ShaderDialog::browseTexturePath(int i) {
- 	QFileDialog fd(0,"Choose new texture");
- 
--	QDir shadersDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+	    QDir shadersDir("/usr/share/meshlab");
-+#else
-+			QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- 	if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release")
- 		shadersDir.cdUp();
-diff --git a/plugins_experimental/render_splatpyramid/dialog.cpp b/plugins_experimental/render_splatpyramid/dialog.cpp
-index 589ba48..11cf3fe 100644
---- a/plugins_experimental/render_splatpyramid/dialog.cpp
-+++ b/plugins_experimental/render_splatpyramid/dialog.cpp
-@@ -122,8 +122,11 @@ void Dialog::changeTexturePath(int i) {
- 
- void Dialog::browseTexturePath(int i) {
-   QFileDialog fd(0,"Choose new texture");
--
--  QDir shadersDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+	    QDir shadersDir("/usr/share/meshlab");
-+#else
-+			QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
-   if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release")
- 	shadersDir.cdUp();
-diff --git a/plugins_experimental/render_splatpyramid/splat_pyramid.cc b/plugins_experimental/render_splatpyramid/splat_pyramid.cc
-index a4915d1..75074a6 100644
---- a/plugins_experimental/render_splatpyramid/splat_pyramid.cc
-+++ b/plugins_experimental/render_splatpyramid/splat_pyramid.cc
-@@ -85,7 +85,11 @@ void PyramidPointRendererPlugin::Init(QAction *, MeshDocument &md, RenderMode &,
- 		objects[i].setRendererType( render_mode );
- 
-   	/// Sets the path to the meshlab's shaders directory
--  	QDir shadersDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+	    QDir shadersDir("/usr/share/meshlab");
-+#else
-+			QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- 	if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins"  )
- 		shadersDir.cdUp();
-diff --git a/plugins_unsupported/render_rm/glstateholder.cpp b/plugins_unsupported/render_rm/glstateholder.cpp
-index fa7cdd9..544c6b3 100644
---- a/plugins_unsupported/render_rm/glstateholder.cpp
-+++ b/plugins_unsupported/render_rm/glstateholder.cpp
-@@ -75,8 +75,12 @@ UniformValue::UniformValue(UniformVar &v)
- 
- 	// if it's a texture, try to load it from the standard path
- 	if (!textureFilename.isEmpty())	{
-+#if defined(Q_OS_LINUX)
-+    QDir textureDir("/usr/share/meshlab");
-+#else
- 		QDir textureDir = QDir(qApp->applicationDirPath());
--
-+#endif
-+	
- #if defined(Q_OS_WIN)
- 		if (textureDir.dirName() == "debug" ||
- 		    textureDir.dirName() == "release" ||
-@@ -158,7 +162,11 @@ void UniformValue::updateUniformVariableValuesFromDialog(int rowIdx, int colIdx,
- 			// * choose the filename with a dialog (55 by convention)
- 			if (rowIdx == 5 && colIdx == 5) {
- 				QFileDialog fd(0, "Choose new texture");
--				QDir texturesDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+	    QDir textureDir("/usr/share/meshlab");
-+#else
-+			QDir textureDir = QDir(qApp->applicationDirPath());
-+#endif
- 
- #if defined(Q_OS_WIN)
- 				if (texturesDir.dirName() == "debug" ||
-diff --git a/plugins_unsupported/render_rm/rmmeshrender.cpp b/plugins_unsupported/render_rm/rmmeshrender.cpp
-index 9e516d2..f367842 100644
---- a/plugins_unsupported/render_rm/rmmeshrender.cpp
-+++ b/plugins_unsupported/render_rm/rmmeshrender.cpp
-@@ -63,7 +63,11 @@ QList<QAction*> RmMeshShaderRenderPlugin::actions()
- 
- void RmMeshShaderRenderPlugin::initActionList() {
- 
--	QDir shadersDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+	    QDir shadersDir("/usr/share/meshlab/shaders");
-+#else
-+			QDir shadersDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- 	if (shadersDir.dirName() == "debug" ||
- 	    shadersDir.dirName() == "release" ||
-diff --git a/plugins_unsupported/render_rm/rmshaderdialog.cpp b/plugins_unsupported/render_rm/rmshaderdialog.cpp
-index 1f6c02b..6c8af80 100644
---- a/plugins_unsupported/render_rm/rmshaderdialog.cpp
-+++ b/plugins_unsupported/render_rm/rmshaderdialog.cpp
-@@ -332,7 +332,11 @@ void RmShaderDialog::fillTabsWithPass(int index)
- 
- 			QFileInfo finfo(v.textureFilename);
- 
-+			#if defined(Q_OS_LINUX)
-+	    QDir textureDir("/usr/share/meshlab");
-+			#else
- 			QDir textureDir = QDir(qApp->applicationDirPath());
-+			#endif
- #if defined(Q_OS_WIN)
- 			if (textureDir.dirName() == "debug" || textureDir.dirName() == "release" || textureDir.dirName() == "plugins"  ) textureDir.cdUp();
- #elif defined(Q_OS_MAC)
-@@ -444,7 +448,11 @@ void RmShaderDialog::valuesChanged(const QString & varNameAndIndex )
- 				// choose the filename with a dialog
- 				QFileDialog fd(0,"Choose new texture");
- 
--				QDir texturesDir = QDir(qApp->applicationDirPath());
-+#if defined(Q_OS_LINUX)
-+	    QDir textureDir("/usr/share/meshlab");
-+#else
-+			QDir textureDir = QDir(qApp->applicationDirPath());
-+#endif
- #if defined(Q_OS_WIN)
- 				if (texturesDir.dirName() == "debug" || texturesDir.dirName() == "release") texturesDir.cdUp();
- #elif defined(Q_OS_MAC)
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch b/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch
deleted file mode 100644
index 9f6d7487817f..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-update-1.3.3-pluginmanager.patch.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6310a419f2a0e0f11f59a60fee850a1b64c2f41e Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Fri, 24 Nov 2017 17:47:43 +0330
-Subject: [PATCH] update 1.3.3/pluginmanager.patch
-
----
- common/pluginmanager.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/common/pluginmanager.cpp b/common/pluginmanager.cpp
-index 5354055..551e73f 100644
---- a/common/pluginmanager.cpp
-+++ b/common/pluginmanager.cpp
-@@ -189,8 +189,11 @@ QString PluginManager::osDependentFileBaseName(const QString &plname)
- 
- QString PluginManager::getBaseDirPath()
- {
-+  #if defined(Q_OS_LINUX)
-+	QDir baseDir("/usr/lib/meshlab");
-+	#else
-   QDir baseDir(qApp->applicationDirPath());
--
-+	#endif
- #if defined(Q_OS_WIN)
-   // Windows:
-   // during development with visual studio binary could be in the debug/release subdir.
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch
deleted file mode 100644
index e01d5ebae851..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-bzip.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 731519b5573ab503b78f2c892e2d5c4bcabef1ea Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Wed, 22 Nov 2017 23:33:11 +0330
-Subject: [PATCH] use-external-bzip
-
----
- meshlabplugins/edit_arc3D/edit_arc3D.pro | 31 -------------------------------
- 1 file changed, 31 deletions(-)
-
-diff --git a/meshlabplugins/edit_arc3D/edit_arc3D.pro b/meshlabplugins/edit_arc3D/edit_arc3D.pro
-index 08b5860..75db42c 100644
---- a/meshlabplugins/edit_arc3D/edit_arc3D.pro
-+++ b/meshlabplugins/edit_arc3D/edit_arc3D.pro
-@@ -28,34 +28,3 @@ SOURCES       += edit_arc3D.cpp   \
- TARGET        = edit_arc3D
- RESOURCES     = edit_arc3D.qrc
- 
--win32-msvc2005:LIBS	   += ../../external/lib/win32-msvc2005/bz2.lib
--win32-msvc2008:LIBS	   += ../../external/lib/win32-msvc2008/bz2.lib
--win32-msvc2010:LIBS	   += ../../external/lib/win32-msvc2010/bz2.lib
--win32-msvc2012:LIBS	   += ../../external/lib/win32-msvc2012/bz2.lib
--win32-msvc2013:LIBS	   += ../../external/lib/win32-msvc2013/bz2.lib
--win32-msvc2015:LIBS	   += ../../external/lib/win32-msvc2015/bz2.lib
--win32-g++:LIBS	+= ../../external/lib/win32-gcc/libbz2.a
--linux-g++:LIBS	+= ../../external/lib/linux-g++/libbz2.a
--linux-g++-32:LIBS	+= ../../external/lib/linux-g++-32/libbz2.a
--linux-g++-64:LIBS	+= ../../external/lib/linux-g++-64/libbz2.a
--mac:LIBS   += -lbz2
--
--win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
--win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5
--win32-msvc2010:INCLUDEPATH += ../../external/bzip2-1.0.5
--win32-msvc2012:INCLUDEPATH += ../../external/bzip2-1.0.5
--win32-msvc2013:INCLUDEPATH += ../../external/bzip2-1.0.5
--win32-msvc2015:INCLUDEPATH += ../../external/bzip2-1.0.5
--
--win32-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5
--linux-g++:INCLUDEPATH	+= ../../external/bzip2-1.0.5
--linux-g++-32:INCLUDEPATH	+= ../../external/bzip2-1.0.5
--linux-g++-64:INCLUDEPATH	+= ../../external/bzip2-1.0.5
--
--
--CONFIG(release, debug|release) {
--	win32-g++:release:QMAKE_CXXFLAGS -= -O2
--	win32-g++:release:QMAKE_CFLAGS -= -O2
--	win32-g++:release:QMAKE_CXXFLAGS += -O3 -mtune=pentium3 -ffast-math
--}
--
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch
deleted file mode 100644
index 58d760499920..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 3b698bccccaeeee03c4bf454971b9c4bc00f2450 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 01:22:19 +0330
-Subject: [PATCH] use-external-glew
-
----
- common/common.pro               | 7 ++++---
- meshlab/meshlab.pro             | 8 ++++----
- meshlabserver/meshlabserver.pro | 8 ++++----
- 3 files changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/common/common.pro b/common/common.pro
-index 8bdf6a5..0edc245 100644
---- a/common/common.pro
-+++ b/common/common.pro
-@@ -1,7 +1,7 @@
- include (../general.pri)
- #EXIF_DIR = ../external/jhead-2.95
- 
--GLEWCODE = $$GLEWDIR/src/glew.c
-+#GLEWCODE = $$GLEWDIR/src/glew.c
- 
- win32-msvc2005:DESTDIR = ../distrib
- win32-msvc2008:DESTDIR = ../distrib
-@@ -55,7 +55,8 @@ fi;\
- "
- INCLUDEPATH *= ../.. \
-     $$VCGDIR \
--    $$GLEWDIR/include
-+#    $$GLEWDIR/include
-+
- TEMPLATE = lib
- linux-g++:CONFIG += dll
- linux-g++:DESTDIR = ../distrib
-@@ -80,7 +81,7 @@ QT += script
- TARGET = common
- DEPENDPATH += .
- #INCLUDEPATH += . $$EXIF_DIR
--DEFINES += GLEW_STATIC
-+#DEFINES += GLEW_STATIC
- win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS
-diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
-index 5456342..9d45834 100644
---- a/meshlab/meshlab.pro
-+++ b/meshlab/meshlab.pro
-@@ -9,7 +9,7 @@ INCLUDEPATH *= . \
- 	.. \
- 	../.. \
-     $$VCGDIR \
--    $$GLEWDIR/include \
-+#    $$GLEWDIR/include \
- #	$$EXIF_DIR
- 
- DEPENDPATH += $$VCGDIR \
-@@ -151,11 +151,11 @@ win32-g++:LIBS        	+= -L../external/lib/win32-gcc -ljhead -L../distrib -lcom
- #	win32-g++:release:LIBS 			+= -L../common/release -lcommon
- #}
- 
--linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
-+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW
- linux-g++:QMAKE_RPATHDIR += ../distrib
--linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU
-+linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU -lGLEW
- linux-g++-32:QMAKE_RPATHDIR += ../distrib
--linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU
-+linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU -lGLEW
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
- 
- # uncomment in your local copy only in emergency cases.
-diff --git a/meshlabserver/meshlabserver.pro b/meshlabserver/meshlabserver.pro
-index c9f5d0e..2b96033 100644
---- a/meshlabserver/meshlabserver.pro
-+++ b/meshlabserver/meshlabserver.pro
-@@ -28,12 +28,12 @@ win32-msvc2008:  LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
- win32-msvc2010:  LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
- win32-msvc2012:  LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
- win32-msvc2015:  LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
--win32-g++:  LIBS += -L../distrib -lcommon      
--linux-g++:  LIBS += -L../distrib -lcommon
-+win32-g++:  LIBS += -L../distrib -lcommon 
-+linux-g++:  LIBS += -L../distrib -lcommon -lGLEW
- linux-g++:QMAKE_RPATHDIR += ../distrib
--linux-g++-32:  LIBS += -L../distrib -lcommon
-+linux-g++-32:  LIBS += -L../distrib -lcommon -lGLEW
- linux-g++-32:QMAKE_RPATHDIR += ../distrib
--linux-g++-64:  LIBS += -L../distrib -lcommon
-+linux-g++-64:  LIBS += -L../distrib -lcommon -lGLEW
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
- #CONFIG (release,debug | release) {
- #	win32-msvc2005:release:  LIBS += -L../common/release -lcommon
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch
deleted file mode 100644
index 002c2dc3bdf9..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-jhead.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 68d92b2de5d598d4d85e2cdbddec5219ba317796 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 01:21:10 +0330
-Subject: [PATCH] use-external-jhead
-
----
- common/common.pro   | 4 ++--
- meshlab/meshlab.pro | 5 +++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/common/common.pro b/common/common.pro
-index 51cdcb5..8bdf6a5 100644
---- a/common/common.pro
-+++ b/common/common.pro
-@@ -1,5 +1,5 @@
- include (../general.pri)
--EXIF_DIR = ../external/jhead-2.95
-+#EXIF_DIR = ../external/jhead-2.95
- 
- GLEWCODE = $$GLEWDIR/src/glew.c
- 
-@@ -79,7 +79,7 @@ QT += script
- 
- TARGET = common
- DEPENDPATH += .
--INCLUDEPATH += . $$EXIF_DIR
-+#INCLUDEPATH += . $$EXIF_DIR
- DEFINES += GLEW_STATIC
- win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
-diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
-index 0e50581..5456342 100644
---- a/meshlab/meshlab.pro
-+++ b/meshlab/meshlab.pro
-@@ -1,7 +1,7 @@
- include (../general.pri)
- #CONFIG += debug_and_release
- DESTDIR = ../distrib
--EXIF_DIR = ../external/jhead-2.95
-+#EXIF_DIR = ../external/jhead-2.95
- 
- DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x000000
- 
-@@ -10,7 +10,8 @@ INCLUDEPATH *= . \
- 	../.. \
-     $$VCGDIR \
-     $$GLEWDIR/include \
--	$$EXIF_DIR
-+#	$$EXIF_DIR
-+
- DEPENDPATH += $$VCGDIR \
-     $$VCGDIR/vcg \
-     $$VCGDIR/wrap
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch
deleted file mode 100644
index acbd8f4b5fed..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-lib3ds.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 911bc805f89c464540fdce4c16e15f64476cf161 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Wed, 22 Nov 2017 19:25:35 +0330
-Subject: [PATCH] use-external-lib3ds
-
----
- meshlabplugins/io_3ds/io_3ds.pro | 24 ------------------------
- 1 file changed, 24 deletions(-)
-
-diff --git a/meshlabplugins/io_3ds/io_3ds.pro b/meshlabplugins/io_3ds/io_3ds.pro
-index 601f5da..5a19589 100644
---- a/meshlabplugins/io_3ds/io_3ds.pro
-+++ b/meshlabplugins/io_3ds/io_3ds.pro
-@@ -9,31 +9,7 @@ HEADERS		= meshio.h \
- 			io_3ds.h 
- 				
- SOURCES       += 	meshio.cpp \
--			
--DEFINES += LIB3DS_STATIC
- 
- TARGET        = io_3ds
- 
--INCLUDEPATH += ../../external/lib3ds-1.3.0/
--
--# Notes on the paths of lib3ds files.
--# Once you have compiled the library put the lib files in a dir named lib/XXX/ 
--# where XXX is the name of your system according to the QT naming style.
--# Linux users can rely on their own package managers and hope that it is installing the last version of lib3ds
--
--win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/3ds.lib
--win32-msvc.net:LIBS	+= ../../external/lib/win32-msvc.net/3ds.lib
--win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/3ds.lib
--win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/3ds.lib
--win32-g++:LIBS		+= ../../external/lib/win32-gcc/lib3ds.a
--linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
--linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
--linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
--
--# unix:LIBS		+= -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
--
--# mac:LIBS -= -l3ds 
--# mac:LIBS += ../../../../code/lib/lib3ds-1.3.0/lib/mac/lib3ds.a
--
--macx:LIBS += $$MACLIBDIR/lib3ds.a
- 
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch
deleted file mode 100644
index f107d5bc69e0..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-muParser.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0928f85bc8fb8215a98c5a115d85269f51f65b5e Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Wed, 22 Nov 2017 22:49:16 +0330
-Subject: [PATCH] use-external-muParser
-
----
- meshlabplugins/filter_func/filter_func.pro | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/meshlabplugins/filter_func/filter_func.pro b/meshlabplugins/filter_func/filter_func.pro
-index a7cc17a..23d5578 100644
---- a/meshlabplugins/filter_func/filter_func.pro
-+++ b/meshlabplugins/filter_func/filter_func.pro
-@@ -6,20 +6,3 @@ SOURCES       += filter_func.cpp
- 
- TARGET        = filter_func
- 
--INCLUDEPATH += ../../external/muparser_v225/include
--
--# Note: we need static libs so when building muparser lib use 
--# ./configure --enable-shared=no
--
--win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib
--win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib
--win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/muparser.lib
--win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/muparser.lib
--win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/muparser.lib
--win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/muparser.lib
--
--macx:LIBS            += $$MACLIBDIR/libmuparser.a
--linux-g++:LIBS       += ../../external/lib/linux-g++/libmuparser.a
--linux-g++-32:LIBS       += ../../external/lib/linux-g++-32/libmuparser.a
--linux-g++-64:LIBS       += ../../external/lib/linux-g++-64/libmuparser.a
--win32-g++:LIBS		 += ../../external/lib/win32-gcc/libmuparser.a
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch
deleted file mode 100644
index 7c48aa14a747..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-openctm.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7af5fa63c7577d4da060a2a8442b2f453023be86 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Wed, 22 Nov 2017 22:41:39 +0330
-Subject: [PATCH] use-external-openctm
-
----
- meshlabplugins/io_ctm/io_ctm.pro | 20 --------------------
- 1 file changed, 20 deletions(-)
-
-diff --git a/meshlabplugins/io_ctm/io_ctm.pro b/meshlabplugins/io_ctm/io_ctm.pro
-index 479b64e..434e6ad 100644
---- a/meshlabplugins/io_ctm/io_ctm.pro
-+++ b/meshlabplugins/io_ctm/io_ctm.pro
-@@ -3,26 +3,6 @@ HEADERS += io_ctm.h \
-     $$VCGDIR/wrap/io_trimesh/import_ctm.h \
-     $$VCGDIR/wrap/io_trimesh/export_ctm.h
- SOURCES += io_ctm.cpp
--INCLUDEPATH += ../../external/OpenCTM-1.0.3/lib
- TARGET = io_ctm
- 
--win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-msvc2005:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-msvc2008:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-msvc2010:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-msvc2012:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-msvc2015:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
--win32-g++:DEFINES += OPENCTM_STATIC
- 
--win32-msvc.net:LIBS	+= ../../external/lib/win32-msvc.net/openctm.lib
--win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/openctm.lib
--win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/openctm.lib
--win32-msvc2010:LIBS	+= ../../external/lib/win32-msvc2010/openctm.lib
--win32-msvc2012:LIBS	+= ../../external/lib/win32-msvc2012/openctm.lib
--win32-msvc2015:LIBS	+= ../../external/lib/win32-msvc2015/openctm.lib
--win32-g++:LIBS		+= ../../external/lib/win32-gcc/libopenctm.a
--linux-g++:LIBS		+= ../../external/lib/linux-g++/libopenctm.a
--linux-g++-32:LIBS	+= ../../external/lib/linux-g++-32/libopenctm.a
--linux-g++-64:LIBS	+= ../../external/lib/linux-g++-64/libopenctm.a
--#macx:LIBS += ../../external/lib/macx/libopenctm.a
--macx:LIBS += $$MACLIBDIR/libopenctm.a
--- 
-2.15.0
-
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch
deleted file mode 100644
index cdba89c0ac36..000000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/meshlabplugins/edit_align/align/AlignGlobal.cpp	2016-12-23 13:24:59.000000000 +0300
-+++ b/meshlabplugins/edit_align/align/AlignGlobal.cpp	2017-11-26 03:05:11.010113483 +0300
-@@ -429,11 +429,11 @@
- 
- ******************************/
- 
--bool AlignGlobal::GlobalAlign(const std::map<int,string> &Names, 	const double epsilon, int maxiter, bool Rigid, FILE *elfp, CallBack* cb )
-+bool AlignGlobal::GlobalAlign(const std::map<int,string> &Names, 	const double epsilon, int maxiter, bool Rigid, FILE *elfp, CallBackPos* cb )
- {
-   double change;
-   int step, localmaxiter;
--  cb("Global Alignment...");
-+  cb(0,"Global Alignment...");
-   LOG(elfp,"----------------\n----------------\nGlobalAlignment (target eps %7.3f)\n",epsilon);
- 
-   queue<AlignGlobal::Node *>	Q;
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch
deleted file mode 100644
index 455eec096c83..000000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/meshlabplugins/edit_align/align/AlignGlobal.h	2016-12-23 13:24:59.000000000 +0300
-+++ b/meshlabplugins/edit_align/align/AlignGlobal.h	2017-11-26 03:10:09.210116792 +0300
-@@ -115,7 +115,7 @@
- 	Node *ChooseDormantWithMostActiveLink  ();
-   void MakeAllDormant();
-   void Clear();
--  bool GlobalAlign(const std::map<int,std::string> &Names, 	const double epsilon, int maxiter, bool Rigid, FILE *elfp=0, CallBack * cb=DummyCallBack );
-+  bool GlobalAlign(const std::map<int,std::string> &Names, 	const double epsilon, int maxiter, bool Rigid, FILE *elfp=0, CallBackPos * cb=DummyCallBackPos );
- 
-     bool CheckGraph();
- 
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch
deleted file mode 100644
index 7e58790590a8..000000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From e1410053455a497d32b1e896eb7e99a7224b6832 Mon Sep 17 00:00:00 2001
-From: Miro Hrončok <miro@hroncok.cz>
-Date: Aug 29 2018 20:40:58 +0000
-Subject: Fix FTBFS (#1604819)
-
-
----
-
-diff --git a/meshlab-2016.12-qprintable.patch b/meshlab-2016.12-qprintable.patch
-new file mode 100644
-index 0000000..9a916f6
---- /dev/null
-+++ b/meshlab-2016.12-qprintable.patch
-@@ -0,0 +1,20 @@
-+--- a/src/meshlabserver/mainserver.cpp	2016-12-23 11:24:59.000000000 +0100
-++++ b/src/meshlabserver/mainserver.cpp.a	2018-08-29 20:32:03.009295180 +0200
-+@@ -897,7 +897,7 @@
-+     }
-+ 
-+ 	if (meshDocument.size() < outmeshlist.size())
-+-		fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", qPrintable(outmeshlist.size()), qPrintable(meshDocument.size()));
-++		fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", outmeshlist.size(), meshDocument.size());
-+ 	else
-+ 	{
-+ 		for (int ii = 0; ii < outmeshlist.size(); ++ii)
-+@@ -911,7 +911,7 @@
-+ 					fprintf(logfp, "Output mesh %s has NOT been saved\n", qPrintable(outmeshlist[ii].filename));
-+ 			}
-+ 			else
-+-				fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", qPrintable(ii), qPrintable(outmeshlist[ii].filename));
-++				fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", ii, qPrintable(outmeshlist[ii].filename));
-+ 		}
-+ 
-+ 	}
-diff --git a/meshlab-2016.12-qt-includes.patch b/meshlab-2016.12-qt-includes.patch
-new file mode 100644
-index 0000000..66e4f67
---- /dev/null
-+++ b/meshlab-2016.12-qt-includes.patch
-@@ -0,0 +1,21 @@
-+--- a/src/meshlabplugins/render_gdp/shaderDialog.h	2016-12-23 11:24:59.000000000 +0100
-++++ b/src/meshlabplugins/render_gdp/shaderDialog.h.a	2018-08-29 20:55:01.414996789 +0200
-+@@ -32,6 +32,8 @@
-+ #include "shaderStructs.h"
-+ #include "ui_shaderDialog.h"
-+ #include <QMap>
-++#include <QLineEdit>
-++#include <QSlider>
-+ 
-+ class QGLWidget;
-+ 
-+--- ./meshlab-2016.12/src/meshlabplugins/edit_paint/paintbox.cpp	2016-12-23 11:24:59.000000000 +0100
-++++ ./meshlab-2016.12/src/meshlabplugins/edit_paint/paintbox.cpp.a	2018-08-29 21:19:42.411581082 +0200
-+@@ -23,6 +23,7 @@
-+ 
-+ #include "paintbox.h"
-+ #include <QFileDialog>
-++#include <QAction>
-+ 
-+ Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags)
-+ {
-
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch
deleted file mode 100644
index d7b17fe904bc..000000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/common/pluginmanager.cpp b/common/pluginmanager.cpp
-index 5354055..9a523d4 100644
---- a/common/pluginmanager.cpp
-+++ b/common/pluginmanager.cpp
-@@ -189,7 +189,11 @@ QString PluginManager::osDependentFileBaseName(const QString &plname)
- 
- QString PluginManager::getBaseDirPath()
- {
--  QDir baseDir(qApp->applicationDirPath());
-+  #if defined(Q_OS_LINUX)
-+  	QDir baseDir("/usr/share/meshlab");
-+  #else
-+	QDir baseDir(qApp->applicationDirPath());
-+  #endif
- 
- #if defined(Q_OS_WIN)
-   // Windows:
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch
deleted file mode 100644
index 61965baa9a9a..000000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/meshlabserver/mainserver.cpp
-+++ b/meshlabserver/mainserver.cpp
-@@ -897,7 +897,7 @@
-     }
- 
- 	if (meshDocument.size() < outmeshlist.size())
--		fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", qPrintable(outmeshlist.size()), qPrintable(meshDocument.size()));
-+		fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", outmeshlist.size(), meshDocument.size());
- 	else
- 	{
- 		for (int ii = 0; ii < outmeshlist.size(); ++ii)
-@@ -911,7 +911,7 @@
- 					fprintf(logfp, "Output mesh %s has NOT been saved\n", qPrintable(outmeshlist[ii].filename));
- 			}
- 			else
--				fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", qPrintable(ii), qPrintable(outmeshlist[ii].filename));
-+				fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", ii, qPrintable(outmeshlist[ii].filename));
- 		}
- 
- 	}
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
deleted file mode 100644
index ab052cd69eb9..000000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c57222e79f1c7840e1ed01a4abd17d089f5e5185 Mon Sep 17 00:00:00 2001
-From: alemuntoni <muntoni.alessandro@gmail.com>
-Date: Tue, 26 May 2020 12:35:03 +0200
-Subject: [PATCH] missing include
-
----
- meshlab/glarea.cpp  | 1 +
- meshlab/meshlab.pro | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/meshlab/glarea.cpp b/meshlab/glarea.cpp
-index 6c0421062..dfd7af229 100644
---- a/meshlab/glarea.cpp
-+++ b/meshlab/glarea.cpp
-@@ -34,6 +34,7 @@
- #include <QFileDialog>
- #include <QClipboard>
- #include <QLocale>
-+#include <QPainterPath>
- 
- #include <wrap/gl/picking.h>
- #include <wrap/qt/trackball.h>
-diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
-index 26ef88d00..842eb5ea5 100644
---- a/meshlab/meshlab.pro
-+++ b/meshlab/meshlab.pro
-@@ -1,5 +1,6 @@
- # You have to copy the file by hand into the meshlab.app/Contents/Resources directory.
- # ICON += images/meshlab_obj.icns
-+QT += gui
- QT += opengl
- QT += xml
- QT += xmlpatterns
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch
deleted file mode 100644
index 0991bfc71e15..000000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/meshlabplugins/render_gdp/shaderDialog.h
-+++ b/meshlabplugins/render_gdp/shaderDialog.h
-@@ -32,6 +32,8 @@
- #include "shaderStructs.h"
- #include "ui_shaderDialog.h"
- #include <QMap>
-+#include <QLineEdit>
-+#include <QSlider>
- 
- class QGLWidget;
- 
---- a/meshlabplugins/edit_paint/paintbox.cpp
-+++ b/meshlabplugins/edit_paint/paintbox.cpp
-@@ -23,6 +23,7 @@
- 
- #include "paintbox.h"
- #include <QFileDialog>
-+#include <QAction>
- 
- Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags)
- {
- 
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch
deleted file mode 100644
index 8aeace8546a1..000000000000
--- a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru vcglib/wrap/io_trimesh/import_nvm.h vcglib/wrap/io_trimesh/import_nvm.h
---- a/vcglib/wrap/io_trimesh/import_nvm.h	2016-12-29 12:54:58.000000000 +0300
-+++ b/vcglib/wrap/io_trimesh/import_nvm.h	2017-12-28 12:20:14.591670159 +0300
-@@ -85,15 +85,6 @@
-     return true;
- }
- 
--static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){
--    FILE *fp = fopen(filename, "r");
--    if(!fp) return false;
--    ReadHeader(fp);
--    fclose(fp);
--    return true;
--}
--
--
- static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> >  & shots,
-                  std::vector<std::string > & image_filenames,
-                  const char * filename, CallBackPos *cb=0)
-diff -ru vcglib/wrap/io_trimesh/import_out.h vcglib/wrap/io_trimesh/import_out.h
---- a/vcglib/wrap/io_trimesh/import_out.h	2016-12-29 12:54:58.000000000 +0300
-+++ b/vcglib/wrap/io_trimesh/import_out.h	2017-12-28 12:20:48.434017234 +0300
-@@ -85,15 +85,6 @@
-     return true;
- }
- 
--static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){
--    FILE *fp = fopen(filename, "r");
--    if(!fp) return false;
--    ReadHeader(fp);
--    fclose(fp);
--    return true;
--}
--
--
- static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> >  & shots,
-                  std::vector<std::string > & image_filenames,
-                  const char * filename,const char * filename_images, CallBackPos *cb=0)
diff --git a/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch b/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch
deleted file mode 100644
index b372c7baf5e5..000000000000
--- a/media-gfx/meshlab/files/2016.12/remove-edit_mutualcorrs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/meshlab_full.pro	2017-10-25 21:39:01.438252054 +0200
-+++ b/meshlab_full.pro	2017-10-25 21:39:25.417251424 +0200
-@@ -66,7 +66,6 @@
-                 meshlabplugins/edit_arc3D \
-                 meshlabplugins/edit_manipulators \
-                 meshlabplugins/edit_measure \
--                plugins_experimental/edit_mutualcorrs \
-                 meshlabplugins/edit_paint\
-                 meshlabplugins/edit_pickpoints \
-                 meshlabplugins/edit_point\
diff --git a/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch b/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch
deleted file mode 100644
index 3d0eb74429b6..000000000000
--- a/media-gfx/meshlab/files/2016.12/remove-io_TXT.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/meshlab_full.pro	2017-10-25 21:41:57.178247439 +0200
-+++ b/meshlab_full.pro	2017-10-25 21:42:11.629247060 +0200
-@@ -16,7 +16,6 @@
-                 meshlabplugins/io_x3d \
-                 meshlabplugins/io_expe \
-                 meshlabplugins/io_pdb \
--                plugins_experimental/io_TXT \
- # Filter plugins
-                 meshlabplugins/filter_aging \
-                 meshlabplugins/filter_ao \
diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
deleted file mode 100644
index 07d45d2ba909..000000000000
--- a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-
-DESCRIPTION="The open source system for processing and editing 3D triangular meshes"
-HOMEPAGE="http://www.meshlab.net"
-VCG_VERSION="1.0.1"
-SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-minimal"
-
-DEPEND="dev-cpp/eigen:3
-	dev-cpp/muParser
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5
-	dev-qt/qtxmlpatterns:5
-	>=media-gfx/jhead-3.00-r2
-	media-libs/glew:0=
-	media-libs/qhull:=
-	=media-libs/lib3ds-1*
-	media-libs/openctm:=
-	sci-libs/levmar
-	sci-libs/mpir:="
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/meshlab-${PV}/src"
-
-PATCHES=(
-	"${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
-	#remove ot working plugins
-	"${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
-	"${FILESDIR}/${PV}/remove-io_TXT.patch"
-	#since structure synth doesn't seem to be compiling
-	"${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
-	#this has been fixed in the tree
-	"${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
-	#this causes segfaults
-	"${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
-	#for when we use minimal
-	"${FILESDIR}/${PV}/0001-compile-server.patch"
-	"${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
-	"${FILESDIR}/${PV}/0001-use-external-openctm.patch"
-	"${FILESDIR}/${PV}/0001-use-external-muParser.patch"
-	"${FILESDIR}/${PV}/0001-use-external-bzip.patch"
-	"${FILESDIR}/${PV}/0001-use-external-jhead.patch"
-	"${FILESDIR}/${PV}/0001-use-external-glew.patch"
-	#cause gnu stack quickstart related qa
-	"${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
-	"${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
-	"${FILESDIR}/${PV}/${P}-align1.patch"
-	"${FILESDIR}/${PV}/${P}-align2.patch"
-	"${FILESDIR}/${PV}/${P}-asString.patch"
-	"${FILESDIR}/${PV}/${P}-qprintable.patch"
-	"${FILESDIR}/${PV}/${P}-qt-includes.patch"
-	"${FILESDIR}/${PV}/${P}-qt-5.15.patch"
-)
-
-src_prepare() {
-	mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed"
-	default
-	#proof of patchset
-	#remove libs that are being used from the system
-	rm -r "external/lib3ds-1.3.0" || die "rm failed"
-	rm -r "external/OpenCTM-1.0.3" || die "rm failed"
-	rm -r "external/muparser_v132" || die "rm failed"
-	rm -r "external/muparser_v225" || die "rm failed"
-	rm -r "external/bzip2-1.0.5" || die "rm failed"
-	rm -r "external/jhead-2.95" || die "rm failed"
-	rm -r "external/glew-1.5.1" || die "rm failed"
-	rm -r "external/glew-1.7.0" || die "rm failed"
-	#we still depend on lm.h
-	#rm -r "external"
-	rm -r "distrib/plugins/U3D_W32" || die
-	rm -r "distrib/plugins/U3D_OSX" || die
-
-	# Fix bug 638796
-	cd "${WORKDIR}" || die
-	eapply "${FILESDIR}/${PV}/${P}-remove-header.patch"
-}
-
-src_configure() {
-	use minimal || eqmake5 -r meshlab_full.pro
-	use minimal && eqmake5 -r meshlab_mini.pro
-}
-
-src_install() {
-	dobin distrib/{meshlab,meshlabserver}
-	dolib.so distrib/libcommon.so.1.0.0
-	dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1
-	dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so
-	exeinto /usr/$(get_libdir)/meshlab/plugins
-	doexe distrib/plugins/*.so
-	insinto /usr/share/meshlab/shaders
-	doins -r distrib/shaders/*
-	insinto /usr/share/meshlab/plugins
-	doins -r distrib/plugins/*
-	insinto /usr/share/meshlab/textures
-	doins -r distrib/textures/*
-	insinto /usr/share/meshlab/sample
-	doins -r distrib/sample/*
-	newicon "${S}"/meshlab/images/eye512.png "${PN}".png
-	make_desktop_entry meshlab "Meshlab" "${PN}" Graphics
-}
diff --git a/media-gfx/quat/Manifest b/media-gfx/quat/Manifest
index 489b038afaca..18204fc5f8e1 100644
--- a/media-gfx/quat/Manifest
+++ b/media-gfx/quat/Manifest
@@ -1,3 +1,3 @@
 DIST quat-1.20.tar.gz 474448 BLAKE2B 52a06460be261c622f0c30f8991762e91688da53ba2a9854cc5c94a6de7fa9c7d8028fc3f36608bf11f56c7bee8ca192a37c91ac993b3866ad7b630da3bee5ad SHA512 eb77d628ea0e329e8bda11124bfa57e4005f06ad4d54d8bdc31eaab09fc0cf7ebf1873e7dd47624781e8ee75c7644bfc75819ce5aeb5c150644f8b7a7c81e85b
-EBUILD quat-1.20-r1.ebuild 780 BLAKE2B 43711ac29ab670bf397c0f56a1c1ef0225d42bcb014b2dfbd5d66c30b785dcec6d6670e2c29cc7adb238e34f09e0337175d2031b45125fe232bfa68f775815d8 SHA512 329a196367104144f28bda71483531655bd59a7f13f93c0e308e8c5212c7dd34fc6f57af7deb105cfaec84ae14a2d9888ce1b651a21d889eb182784450022b5b
+EBUILD quat-1.20-r2.ebuild 785 BLAKE2B da0d6ab813115a0279ae46dcd0fb1e7d1edde4fdd3ea01c83d5abcd836ee0d4e73f60ecaa0a82f5b4a36d0ffadc0c405548c681499fc0c1fb44b562ad33b4d2e SHA512 32568d76deca41238afbdf13049582467e6b09dc31535c65dcaf49bb4a427c67560ae9c7573f40436c29e69e7f78fd8e5fdad75e2eb7c2b9b582fffe4630d44c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/quat/quat-1.20-r1.ebuild b/media-gfx/quat/quat-1.20-r2.ebuild
index 8c1256dbdd07..17e06e1566e8 100644
--- a/media-gfx/quat/quat-1.20-r1.ebuild
+++ b/media-gfx/quat/quat-1.20-r2.ebuild
@@ -1,31 +1,34 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A 3D quaternionic fractal generator"
 HOMEPAGE="http://www.physcip.uni-stuttgart.de/phy11733/quat_e.html"
-SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/quat-1.20.tar.gz"
+SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="X debug"
 
-DEPEND="X? ( =x11-libs/fltk-1*
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXft
-		)
-	>=sys-libs/zlib-1.1.4"
-RDEPEND=""
+DEPEND="
+	>=sys-libs/zlib-1.1.4
+	X? (
+		=x11-libs/fltk-1*
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXft
+	)
+"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	export FLUID="/usr/bin/fluid" # needed because configure tries an invalid option
 	econf \
-		`use_enable X gui` \
-		`use_enable debug` \
-		`use_enable debug prof`
+		$(use_enable X gui) \
+		$(use_enable debug) \
+		$(use_enable debug prof)
 }
 
 src_install() {
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index e79fc0d75970..fd1d311a3bf7 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -3,11 +3,16 @@ AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515
 AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3
 AUX sane-backends-1.0.30-bigendian-depth.patch 372 BLAKE2B f93f510496f1234c586f57b4814ad45ea3dd0bf78a934edd6ab951c5423be235560e54d871d8f9edef6fe51b4d9e18ecf33367635cefa1e500f8ed29a722e0bd SHA512 0cfe593471be5a89666ad9bb112999368d9195f0bf3aa13597251b3a5ebf645eeb776b29df04291f4fda6e330f2bdfbbbc04865588d9af54c5f610b9e923d9fb
 AUX sane-backends-1.0.30-missing-stdint-include.patch 374 BLAKE2B e20005c96096a228126b7e1d414ae2c127bf7ad16894defc8e3c65230380449e61f75b3cd63bd80b16bf8b1ebc08e5f974eb621d16f9c6b994105bb9d95e1a89 SHA512 521a3275879e84f6727ebc3b8e5ae4fbbb1495d2c41cb6880e170c62f684da2af7ea47b0a89d0806687f8a48791f2562959158a31a30dd240880757b6c81a321
+AUX sane-backends-1.0.31-autoconf-2.70.patch 2629 BLAKE2B 30579b5075b850fc5b3f421880f8545def8dac69e274fb7bb756c3dcf0f0b93b91c4aa231bc74ee923721a832c7b5d187e3b074a926224cad99291139bff2a6f SHA512 7c4395d715ef699788f3cede0b89540dc53c1aa8e771efebf59b1e7a978f96506d2f3b4df72990967fd254dfc076c092674ef6d2019ca8426593474c8e033d26
+AUX sane-backends-1.0.31-backend_pot_input.patch 1155 BLAKE2B 0882b8291db5eab404abad4ec2c6332f77405ffc39ba3639bd279d8cc5857888ff13d87bb1d37d4ce1cd6272d3f0f1cc0ffddd6ba4d2780b47717ee0a5905ae4 SHA512 4447a39892aef52dad3ede292973a444675b2eb0f6086fb1ab45106a32aa4474e3970582b831efaf7474abbf78d5ce694f1e751c229101140ffda8800bfd5210
+AUX sane-backends-1.0.31-udev_rules_update.patch 2537 BLAKE2B 37ae4b905f331e9b024e712010a6e2dde19d3d0a700267fac4e5b11648f851253759ca4d58b200501816c7352d12427b8584b75e405ae7a7509b1771e3417e3f SHA512 55536f477ed67a73c0d5414b5018f1ebe47301ec4fa8613a50a1105d96eadb3fb2809f784a340f29ca37894b8f0b9bc10e8f2eedda3fa15fa4111af5dc57c095
 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
+DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
 EBUILD sane-backends-1.0.30-r2.ebuild 8229 BLAKE2B d7f2e41ea54e06aaabd9a0abd47210c45ecc891e34f9563aabf19b11df0e3d250741f1a557465d5fb2f1e5de99f18d292212b160bc52224c5026544f7bd17f0f SHA512 08ba6b7bd2b5a28a8be809794b5b720075d1b3ba383d2b8bdbb763322f9b01838374ac3c152feafe9d49edd9d135cf184e8ccd8f5adfc4b7a4b546f5a1e194ea
+EBUILD sane-backends-1.0.31.ebuild 8564 BLAKE2B 3e1238d0720b75ce26da8e2526052661969f6cb58adc7c8462d9fa6c3cfb91276f62af045f730cd7b3d2947873df78d6a6bbd4c2cb3f3cbe4b479326a4f865f8 SHA512 98d4fd0e1b1f64197f2a5f4111750991fca180d2854d00a3a18f0333b8572926e613d6487d4627e5b45a1b6ba76dbaa7453d2e7b8418ed9b071c6657ac5035e1
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch b/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch
new file mode 100644
index 000000000000..f1fe4765bdd5
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch
@@ -0,0 +1,93 @@
+From 445b5bd7e19245c08de6a0e669dd9211d2597bfa Mon Sep 17 00:00:00 2001
+From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date: Fri, 1 Jan 2021 15:53:11 +0900
+Subject: [PATCH] Drop use of obsoleted autoconf AC_HEADER_STDC macro.  Fixes
+ #409
+
+Use of the STDC_HEADER pre-processor macro that the autoconf macro
+used to define has been removed.  Conditionalized code is now used
+unconditionally.  This should be fine as the macro checks for ANSI
+C, i.e. C89 (ISO C90), compliant headers.  We already require C99.
+---
+ acinclude.m4        |  3 ---
+ lib/md5.c           | 10 ++--------
+ sanei/sanei_pa4s2.c |  8 +++-----
+ sanei/sanei_pp.c    |  8 +++-----
+ 4 files changed, 8 insertions(+), 21 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index e10f8ceb2..9393278c2 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -73,9 +73,6 @@ AC_DEFUN([SANE_CHECK_MISSING_HEADERS],
+   if test "${ac_cv_header_unistd_h}" != "yes" ; then
+     MISSING_HEADERS="${MISSING_HEADERS}\"unistd.h\" "
+   fi
+-  if test "${ac_cv_header_stdc}" != "yes" ; then
+-    MISSING_HEADERS="${MISSING_HEADERS}\"ANSI C headers\" "
+-  fi
+   if test "${MISSING_HEADERS}" != "" ; then
+     echo "*** The following essential header files couldn't be found:"
+     echo "*** ${MISSING_HEADERS}"
+diff --git a/lib/md5.c b/lib/md5.c
+index 923a17c78..009c6d9a0 100644
+--- a/lib/md5.c
++++ b/lib/md5.c
+@@ -26,14 +26,8 @@
+ 
+ #include <sys/types.h>
+ 
+-#if STDC_HEADERS || defined _LIBC
+-# include <stdlib.h>
+-# include <string.h>
+-#else
+-# ifndef HAVE_MEMCPY
+-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+-# endif
+-#endif
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "md5.h"
+ 
+diff --git a/sanei/sanei_pa4s2.c b/sanei/sanei_pa4s2.c
+index b1d95fe02..5365151fd 100644
+--- a/sanei/sanei_pa4s2.c
++++ b/sanei/sanei_pa4s2.c
+@@ -150,11 +150,9 @@ static int sanei_pa4s2_dbg_init_called = SANE_FALSE;
+ 
+ #endif /* NDEBUG */
+ 
+-#if defined(STDC_HEADERS)
+-# include <errno.h>
+-# include <stdio.h>
+-# include <stdlib.h>
+-#endif
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
+ #if defined(HAVE_STRING_H)
+ # include <string.h>
+ #elif defined(HAVE_STRINGS_H)
+diff --git a/sanei/sanei_pp.c b/sanei/sanei_pp.c
+index 3077342e4..752945a89 100644
+--- a/sanei/sanei_pp.c
++++ b/sanei/sanei_pp.c
+@@ -135,11 +135,9 @@ inb( u_long port )
+ #include "../include/sane/sanei_debug.h"
+ #include "../include/sane/sanei_pp.h"
+ 
+-#if defined(STDC_HEADERS)
+-# include <errno.h>
+-# include <stdio.h>
+-# include <stdlib.h>
+-#endif
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
+ #if defined(HAVE_STRING_H)
+ # include <string.h>
+ #elif defined(HAVE_STRINGS_H)
+-- 
+GitLab
+
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.31-backend_pot_input.patch b/media-gfx/sane-backends/files/sane-backends-1.0.31-backend_pot_input.patch
new file mode 100644
index 000000000000..69585784c252
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.31-backend_pot_input.patch
@@ -0,0 +1,33 @@
+From 4846d36ad1e9ca709cb3a2eaa839c8c79effe34b Mon Sep 17 00:00:00 2001
+From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date: Sun, 13 Sep 2020 17:56:40 +0900
+Subject: [PATCH] po: Make sure all sane-backends.pot input are available
+
+---
+ po/Makevars | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/po/Makevars b/po/Makevars
+index ebff23f90..86f423ef3 100644
+--- a/po/Makevars
++++ b/po/Makevars
+@@ -1,5 +1,6 @@
+ #  Makevars -- snippet for inclusion in po/ -*- Makefile -*-
+-#  Copyright (C) 2016, 2019  Olaf Meeuwissen and the SANE developers
++#  Copyright (C) 2016, 2019, 2020  Olaf Meeuwissen
++#    and the SANE developers
+ #
+ #  This file is part of the SANE build infra-structure.  See the
+ #  included LICENSE file for license information.
+@@ -47,3 +48,8 @@ width_options     = --width=75
+ #  Locale categories, in addition to LC_MESSAGES, for which message
+ #  catalogs are to be used.
+ EXTRA_LOCALE_CATEGORIES =
++
++#  Selected files in POTFILES.in are generated.  Make sure they are
++#  available when needed.
++$(top_srcdir)/backend/pixma/pixma_sane_options.c:
++	cd ../backend; make pixma/pixma_sane_options.c
+-- 
+GitLab
+
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.31-udev_rules_update.patch b/media-gfx/sane-backends/files/sane-backends-1.0.31-udev_rules_update.patch
new file mode 100644
index 000000000000..17ccb60755e0
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.31-udev_rules_update.patch
@@ -0,0 +1,55 @@
+https://gitlab.com/sane-project/backends/-/merge_requests/541
+
+--- sane-backends-1.0.31/testsuite/tools/data/udev+acl.ref
++++ sane-backends-1.0.31/testsuite/tools/data/udev+acl.ref
+@@ -23,7 +23,7 @@
+ # If the scanner is supported by sane-backends, please mail the entry to
+ # the sane-devel mailing list (sane-devel@alioth-lists.debian.net).
+ #
+-ACTION!="add", GOTO="libsane_rules_end"
++ACTION=="remove", GOTO="libsane_rules_end"
+ ENV{DEVTYPE}=="usb_device", GOTO="libsane_create_usb_dev"
+ SUBSYSTEMS=="scsi", GOTO="libsane_scsi_rules_begin"
+ SUBSYSTEM=="usb_device", GOTO="libsane_usb_rules_begin"
+--- sane-backends-1.0.31/testsuite/tools/data/udev+hwdb.ref
++++ sane-backends-1.0.31/testsuite/tools/data/udev+hwdb.ref
+@@ -20,7 +20,7 @@
+ # If the scanner is supported by sane-backends, please mail the entry to
+ # the sane-devel mailing list (sane-devel@alioth-lists.debian.net).
+ #
+-ACTION!="add", GOTO="libsane_rules_end"
++ACTION=="remove", GOTO="libsane_rules_end"
+ 
+ # The following rule will disable USB autosuspend for the device
+ ENV{DEVTYPE}=="usb_device", ENV{libsane_matched}=="yes", TEST=="power/control", ATTR{power/control}="on"
+--- sane-backends-1.0.31/testsuite/tools/data/udev.ref
++++ sane-backends-1.0.31/testsuite/tools/data/udev.ref
+@@ -23,7 +23,7 @@
+ # If the scanner is supported by sane-backends, please mail the entry to
+ # the sane-devel mailing list (sane-devel@alioth-lists.debian.net).
+ #
+-ACTION!="add", GOTO="libsane_rules_end"
++ACTION=="remove", GOTO="libsane_rules_end"
+ ENV{DEVTYPE}=="usb_device", GOTO="libsane_create_usb_dev"
+ SUBSYSTEMS=="scsi", GOTO="libsane_scsi_rules_begin"
+ SUBSYSTEM=="usb_device", GOTO="libsane_usb_rules_begin"
+--- sane-backends-1.0.31/tools/sane-desc.c
++++ sane-backends-1.0.31/tools/sane-desc.c
+@@ -3496,7 +3496,7 @@
+   int i;
+ 
+   print_udev_header ();
+-  printf("ACTION!=\"add\", GOTO=\"libsane_rules_end\"\n"
++  printf("ACTION==\"remove\", GOTO=\"libsane_rules_end\"\n"
+ 	 "ENV{DEVTYPE}==\"usb_device\", GOTO=\"libsane_create_usb_dev\"\n"
+ 	 "SUBSYSTEMS==\"scsi\", GOTO=\"libsane_scsi_rules_begin\"\n"
+ 	 "SUBSYSTEM==\"usb_device\", GOTO=\"libsane_usb_rules_begin\"\n"
+@@ -3679,7 +3679,7 @@
+   int i;
+ 
+   print_udevhwdb_header ();
+-  printf("ACTION!=\"add\", GOTO=\"libsane_rules_end\"\n\n");
++  printf("ACTION==\"remove\", GOTO=\"libsane_rules_end\"\n\n");
+ 
+   printf("# The following rule will disable USB autosuspend for the device\n");
+   printf("ENV{DEVTYPE}==\"usb_device\", ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n\n");
diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
new file mode 100644
index 000000000000..acb6d8ba149c
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev user
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_lide70
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc210
+	dc240
+	dc25
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	escl
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpljm1005
+	hpsj5s
+	hs2p
+	ibm
+	kodak
+	kodakaio
+	kvs1025
+	kvs20xx
+	kvs40xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	p5
+	pie
+	pieusb
+	pixma
+	plustek
+	plustek_pp
+	pnm
+	qcam
+	ricoh
+	ricoh2
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax1220u
+	umax_pp
+	xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+	case ${GBACKEND} in
+	# Disable backends that require parallel ports as no one has those anymore.
+	canon_pp|hpsj5s|mustek_pp|\
+	pnm|mustek_usb2|kvs40xx)
+		IUSE+=" sane_backends_${GBACKEND}"
+		;;
+	*)
+		IUSE+=" +sane_backends_${GBACKEND}"
+	esac
+done
+
+REQUIRED_USE="
+	sane_backends_escl? ( zeroconf )
+	sane_backends_kvs40xx? ( threads )
+	sane_backends_mustek_usb2? ( threads )
+"
+
+MY_PN="${PN//sane-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+	gphoto2? (
+		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? (
+		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_escl? (
+		app-text/poppler[cairo]
+		|| (
+			net-dns/avahi[dbus]
+			net-dns/avahi[gtk]
+			net-dns/avahi[gtk2]
+		)
+		net-dns/avahi[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	snmp? ( net-analyzer/net-snmp:0= )
+	systemd? ( sys-apps/systemd:0= )
+	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
+	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
+	"${FILESDIR}"/${P}-autoconf-2.70.patch #750374
+	"${FILESDIR}"/${P}-udev_rules_update.patch
+	"${FILESDIR}"/${P}-backend_pot_input.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/sane-config
+)
+
+pkg_setup() {
+	enewgroup scanner
+	enewuser saned -1 -1 -1 scanner
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Patch out the git reference so we can run eautoreconf
+	sed \
+		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
+		-e '/^AM_MAINTAINER_MODE/d' \
+		-i configure.ac || die
+	eautoreconf
+
+	# Fix for "make check".  Upstream sometimes forgets to update this.
+	local ver=$(./configure --version | awk '{print $NF; exit 0}')
+	sed -i \
+		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+		testsuite/tools/data/html* || die
+
+	# don't bleed user LDFLAGS into pkgconfig files
+	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
+}
+
+src_configure() {
+	# From Fedora
+	append-flags -fno-strict-aliasing
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# the blank is intended - an empty string would result in building ALL backends.
+	local lbackends=" "
+
+	use gphoto2 && lbackends="gphoto2"
+	use v4l && lbackends+=" v4l"
+	local backend
+	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
+		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] ; then
+			lbackends+=" ${backend}"
+		fi
+	done
+
+	local myconf=(
+		$(use_with usb)
+		$(multilib_native_use_with snmp)
+
+		$(multilib_native_use_with sane_backends_escl poppler-glib)
+		# you can only enable this backend, not disable it...
+		$(usex sane_backends_pnm --enable-pnm-backend '')
+		$(usex sane_backends_mustek_pp --enable-parport-directio '')
+	)
+
+	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
+		myconf+=( sane_cv_use_libieee1284=no )
+	fi
+
+	# relative path must be used for tests to work properly
+	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+	# that break in many ways, bug #636202, #668232, #668350
+	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+	myconf+=(
+		--disable-locking
+		$(use_with gphoto2)
+		$(multilib_native_use_with systemd)
+		$(use_with v4l)
+		$(use_enable ipv6)
+		$(use_enable threads pthread)
+		$(use_with zeroconf avahi)
+	)
+	ECONF_SOURCE="${S}" \
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${lbackends}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake VARTEXFONTS="${T}/fonts"
+
+	if tc-is-cross-compiler ; then
+		pushd "${BUILD_DIR}"/tools >/dev/null || die
+
+		# The build system sucks and doesn't handle this properly.
+		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+			-I. -I../include -I"${S}"/include \
+			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
+			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
+		local dirs=( hal hotplug hotplug-ng udev )
+		local targets=(
+			hal/libsane.fdi
+			hotplug/libsane.usermap
+			hotplug-ng/libsane.db
+			udev/libsane.rules
+		)
+		mkdir -p "${dirs[@]}" || die
+		emake "${targets[@]}"
+
+		popd >/dev/null || die
+	fi
+
+	if use usb ; then
+		sed -i -e '/^$/d' \
+			tools/hotplug/libsane.usermap || die
+	fi
+}
+
+multilib_src_install() {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+	if multilib_is_native_abi ; then
+		if use usb ; then
+			insinto /etc/hotplug/usb
+			doins tools/hotplug/libsane.usermap
+		fi
+
+		udev_newrules tools/udev/libsane.rules 41-libsane.rules
+		insinto "/usr/share/pkgconfig"
+		doins tools/sane-backends.pc
+	fi
+}
+
+multilib_src_install_all() {
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	dodir /etc/env.d
+
+	if use systemd ; then
+		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
+	fi
+
+	if use usb ; then
+		exeinto /etc/hotplug/usb
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README README.hotplug
+	fi
+
+	dodoc NEWS AUTHORS PROBLEMS README README.linux
+	find "${ED}" -name '*.la' -delete || die
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}"/saned
+	fi
+
+	newinitd "${FILESDIR}"/saned.initd saned
+	newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+	elog "Optional backends:"
+	optfeature "Epson-specific backend" media-gfx/iscan
+	optfeature "HP-specific backend" net-print/hplip
+
+	if use xinetd ; then
+		elog "If you want remote clients to connect, edit"
+		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+	fi
+
+	if ! use systemd ; then
+		elog "If you are using a USB scanner, add all users who want"
+		elog "to access your scanner to the \"scanner\" group."
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /media-gfx
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)