gentoo resync : 10.02.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
commit: 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree: cee0a97398040001220ece3cd48c3d568bcddb4a /media-gfx
parent: 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)
54 files changed, 369 insertions, 323 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 7164bb37e34e..548bf9cb46d2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/aview/Manifest b/media-gfx/aview/Manifest
index eaefc5122ac2..3b80b6f4c546 100644
--- a/media-gfx/aview/Manifest
+++ b/media-gfx/aview/Manifest
@@ -4,5 +4,5 @@ AUX aview-1.3.0_rc1-includes.patch 281 BLAKE2B 768cd3d142a119910e88b0cd219ec1a43
 AUX aview-1.3.0_rc1-tmp_creation.patch 1142 BLAKE2B 6042d5b39f2a0f9a4be0207b8d57ff55ef203ed9d6d80ccb593770cc2864262dcc7850bb17ad0414702cad1fc7d17c6ad95d3580dd4ad5639c59d9c719c6aedc SHA512 7fdc336cd2c595754f46948031722f87bb40b0e159950f84ed0959ccdacd01840c0d24dfeac6a9937ab456b8ed66e5c9b8d49a4e98ee45ec64295f8234249d06
 DIST aview-1.3.0rc1.tar.gz 54317 BLAKE2B 3a47dab51763f7c5cd9d4d5950437f3e0b86b46a9bf498c93e88258daefb511c82789b1d4bb1288844dbc70aae033fd0ffd9ffab4b28eb553effa7a2c777ef69 SHA512 941f2a92aaf3852b403daf688cda4ca2eb82ec32ee6566cd2aef3d121f259f1bb0214f872c4d5020c658bd81adba0577313acc5972d2f44b295f21905e107144
 EBUILD aview-1.3.0_rc1-r1.ebuild 714 BLAKE2B c73e2364234b5b75fab250963c43ef13924c6dcab5333a9e405701e1b7adc35d7830f71645e707a6562d145240ecfe5720a46179e875d1b4dae23387944b0ecf SHA512 4ac6bfc8e11ba1e4d1b6dc8764e963f736a6735a0a1cd6ae817cc17f7050899cd5919f11866f1a97c5cf1ee71f3ed0f023b9e547d9765bf5594f1478f5686449
-EBUILD aview-1.3.0_rc1-r3.ebuild 801 BLAKE2B cd393727833b6b67b51e5ccb7874849eecd8d827189823dfbff7866d033d03baba88e899774dc28e517796d47c5a36e21faf2a90b0111cbddd99ca6cfec27ca5 SHA512 af951ac253755a996f8eee02a8edeac2bffd7f8e53a3a1b92f24a794cfe41ca7057c8a915ee7089250c4471f63ddd41c7f453fd9c417dc349c254c42017cd6fc
+EBUILD aview-1.3.0_rc1-r3.ebuild 797 BLAKE2B 92753bfee226b1ab02f967b79630d7b50414d1287fe6240bf2ded478602d53c4c04363ef5051bbb8c0ce08774028475d1bb49357c867ec502d3c6ef51f9bc5fb SHA512 ebf8304bed3b79d21e214501f43ebe095124b5af606c826f4de0cf0479db3da8a47e7d96fe14eaa717f251dcc0000c88d056de2e08cca33cceb14234c32ef7bd
 MISC metadata.xml 252 BLAKE2B e7a66be557802d7ca467631d022e882e2985f5d724603ca154106cc8ac13a6c13bb9d2c9d69cfc68871ec9473dc93e883e62d6463496d5ce8987546dfe2afeb3 SHA512 bd3eef9d63a167ed485cb156ca81b53649a9ed2bd4fbaf3f58328cadb09f5b4b65b2343a6f032b7540c445a98bb6c3abb3084f91dc1cf78ecfe9a067732e4385
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
index 218cb86e9ff3..938ed7cb773a 100644
--- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
+++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -13,7 +13,7 @@ HOMEPAGE="http://aa-project.sourceforge.net/aview/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE=""
 
 DEPEND=">=media-libs/aalib-1.4_rc4"
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 5b2a1a5123d4..00bb77e43470 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,9 +1,7 @@
-DIST DisplayCAL-3.6.2.0.tar.gz 10437261 BLAKE2B c476c7834e2c723c48fb9ad9d2ea7f4919c2636814078d8f1a83a6af0e91586e0762ea3787c90f8625cba672ac72ef5e1d2dd6906fd3fd7f3b67637a180b81e3 SHA512 e66a20edf46d460caf5d2f7ddbc93cfe7c37937cd4933d2a2b7d141676696c6f22aadc07d229fbaefe0ced62066fc99d3290352c3e8fc9db4b95a8d0541f0be7
-DIST DisplayCAL-3.7.1.1.tar.gz 10472440 BLAKE2B 2e53537a7570c37120a462102269b5c042299df3de0926b0221bef8b5c29d75e7983b359d9ad162e2d9df2819c624d5f0c00c65fa181cce3fa831f1791d7a1fd SHA512 d5d18b25dd4ce6a2b328db6adb55c43ffcb3e3a495be38004d9e6a6e5c8d576b9477dc895668f82210ce955e7854a578218cb8c9ca2c206f58c47a011ad99c09
 DIST DisplayCAL-3.7.1.2.tar.gz 10472879 BLAKE2B a0722af9c8a6df8af57c0a66e792886b6aecb78bec79d0bed22567bd6ce540793ed6dd51437cbf1974b9070b9adb3708f841cf8cfae0e482056d90783be6ddbd SHA512 d708110e0528ffada5fd4a0ca7da9cf02a54964bc7d5af2b98738aa3e34079c0a4890f2cf6086750045915e06d6c943fc954e0f03653d25c080522a4b24795bd
 DIST DisplayCAL-3.7.1.3.tar.gz 10474328 BLAKE2B 9c305809a9f46f3ad76eec728026b2abbd1dec3bee46db92bfe9fe4e7c31f24d61eafaca0bda12f510002d3c5d51bfba4c6d4b1bae5e1ce105a8b75d84672ef8 SHA512 9718f589ee1842f6247ea110c4c6defaf767313fb2fd9ce9fb1b35775141774ce9084c2cbf00d9c432162e8b32c8d789e5a52ca385976c4772bf644738257926
-EBUILD displaycal-3.6.2.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
-EBUILD displaycal-3.7.1.1.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
+DIST DisplayCAL-3.7.1.4.tar.gz 10478572 BLAKE2B 9f646caea40a22804877f168c2a88a2b3069b8d0e4688c9676bd4d6d873a3528797dd3aadde26da40a4945e224504b2f8673f0c176ced687747ef23d8ca20044 SHA512 d60a240714cf32f1f8084caf74cbccc613263612b7192ad766216ec8253c5682079f32d9cf501e91bf7795ddcce4d9f2f0b023117719d0cc05f203d51dc3ef42
 EBUILD displaycal-3.7.1.2.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
 EBUILD displaycal-3.7.1.3.ebuild 1518 BLAKE2B fcfb6bce3ff0c5270cff1b0c2c6f2de246c44087fef7d59fecffcf36afe87e21b1cf4b5c560a4363ead2e26f418c2413b1365efe4aa6b901198ab5cac4ae8d76 SHA512 70f7398a8221c504bbe9fa48ed041ba3bf207baf96e5f8e0ff4ab2ea65611921033ba04fac82cfd648e09b7b07b47d289569242a1513150a62ff89cb1b26f1b7
+EBUILD displaycal-3.7.1.4.ebuild 1518 BLAKE2B 665a66c4563a6f6ec0516841e063eb0f79278e8b11a82b6d9598305a0fbdaa577f77c18dce7b81a6ed6deb257591e241b1ba308ee1c0d0c5d51a17600a9f8ee9 SHA512 c2e00107271a3a724a07ae901343800da4dfa4d33fc96651149cf9c99cc301be744da73f445641dfd129e9848f07009d95c04055d146fdc84bd2c79aaa71ef87
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.6.2.0.ebuild b/media-gfx/displaycal/displaycal-3.6.2.0.ebuild
deleted file mode 100644
index 72a722b64356..000000000000
--- a/media-gfx/displaycal/displaycal-3.6.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	>=dev-python/numpy-1.2.1
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.7.1.1.ebuild b/media-gfx/displaycal/displaycal-3.7.1.4.ebuild
index 02f4e0b4a7e5..d6063154f815 100644
--- a/media-gfx/displaycal/displaycal-3.7.1.1.ebuild
+++ b/media-gfx/displaycal/displaycal-3.7.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 8c1455d8c01a..317a1c92cc1e 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -6,5 +6,5 @@ AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a
 DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780
 DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c
 EBUILD exiv2-0.26_p20180811-r3.ebuild 2954 BLAKE2B 06ad8b544150e1f5d4f1a305d78ab3ff7772b7c797e67e47ce01a233d0afee514d7660921c33b43634da60883b2adba119a80830c2493ad01800bd9b05b34072 SHA512 172e65b6210cb383afee4f344d585fae40dc7af1b7bb5d8dd2e5acbd7fcb4086b4caca998ce3627aefb4be3f8e4cebcaef24ccfb67d61d580b674fee50b24627
-EBUILD exiv2-0.27.0-r2.ebuild 2548 BLAKE2B 47101f43464f15bebc06c7fd3ac244f1ea7ecc4715741ea0c806573735edc71408f0222eed67cc62ffe6079858129e7a3bbe7d8e8f18ec235afbc09ef839967b SHA512 df5bac7f9ff377ea7a98dc02b18ae43bebd3ba240cb7173bae3dcb042c552178b243e93bf5722bd25967be653c2ec0015b2daa4d83900bbe4e184bf151ddf46c
+EBUILD exiv2-0.27.0-r2.ebuild 2546 BLAKE2B c9df6fb158888f6679752a53c879286826b1909cc379a11dce9afeff79996f6058dc4e4c09ca41aa039e3f9216991cd7f25d40e5133082dd5f98b8fac82c0afb SHA512 82cffc6d9ef156235d9cecca24ba40ac70db2469cbb0bae7553859f5b148e07d25cf71be23a472921b4e4476c5a84d05ddd4078603bacdcf4922128fc7566f25
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
index 80de16822e2c..6d90c6320e98 100644
--- a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="http://exiv2.dyndns.org/builds/${P}a-Source.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 328ca4757e68..fb1b7a9b0260 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -18,8 +18,8 @@ DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26
 EBUILD gimp-2.10.2.ebuild 5274 BLAKE2B b2ad4c07c37503dd243731b809995d063ec237a63ece2d84a9e84f39171d03a718cb262ad8520b9cc8a976a3a426877c28f7401773f4ff26baf36c1ea1ccee76 SHA512 7a5fb5056250cac3fe0842fd869701e6fb91af8ae99f97d4fdba13ae2fd3ed6b7a37acb5988258a61548bc720867357d5593c147d01997d7da3dd8e789fae281
 EBUILD gimp-2.10.4.ebuild 5274 BLAKE2B 3b3da266805208b6a2931ee06a9c0a4fab9de812283e799b0e76f12a2b7bf02b058dbb5a13654919b7514f4464ddb068e2c1b65280fa9bebb32d3814a10ebb5b SHA512 f9d7a30c93cc898bfc5c6a402cabe95d449315566f28644b5835849d49cfff39ac690a726ccf5a21ea98deba648a66f652eb93273d08baa9add5d6c4cff23c04
 EBUILD gimp-2.10.6-r1.ebuild 5964 BLAKE2B 4f834599caa6b9a2823dce38a8770d2383f2a63e3844e29b8a22e20485e7b9d6f8031eecd7820933b595f920905664aa878fa86d70c8aae942e4b766407ed151 SHA512 70f741ee3c68006d2488b8064b4e176e260c21a67517a3d6ebed8e2daa13ab1e87f1caa76d2b15d12fed6939bea32ada8e662865ff385508899d8299d74de05d
-EBUILD gimp-2.10.8-r1.ebuild 6056 BLAKE2B c691f2b1cdb3de92c4efa498b6a280732b4e151b0f5a56eb287a640a0eae291cf872c8f502fa37be75f4b66549d6e791a6242498ac74d5f4c5acd63f91d769c9 SHA512 cfd15d25c1154d00e551860256dc0c9566116342d587a95524e26b7ddfb24bc987733cb1888b9ae18fac5ab4f46f00bd360a733af91739a8db865d1a10d787da
+EBUILD gimp-2.10.8-r1.ebuild 6043 BLAKE2B 3ca970fa7633422f2dbb2d97760ae362ba42f68a79050383a929112900ed8e36e76fc9863fd251108c1698ad339ffb664c7e5ab2db33240bf2fca5ecf37ae6d0 SHA512 e59e9dce2257dbe0fceeb2f449ac7625846e1d47026807451dff920f5489d5979312b6b5daab67d46480becf83786aac2c3ba17bd53b1e2b5b78ab2990f6308c
 EBUILD gimp-2.8.22-r1.ebuild 5175 BLAKE2B 01d76aae6190f14fdc12ad47a22109610a6622b0ee45e2d00ad352ff2a5e1f5b37ee36f15e6bf270cb842ce7f87ec13e92ce386ac908628115a8453706e95bc2 SHA512 f34e4a3d1e7ae474e07b985e5a0c9162bbdb6beec2e65473e0bb421d188e5fae37fe5a2618b9479511b625e3798f29e500f82d0e392b0b820257ebc542cf281c
 EBUILD gimp-2.9.8-r1.ebuild 5712 BLAKE2B f09f553f5d7eb8e8df0af0a316d2d98e9b0a32a204bb43c563927eae5a6dcb3bb4f5ff882bc05ce6ef3f8914939be6296683c382af45bcab877889042c96bc66 SHA512 7474ecdd5a1c785684b79c0007d77f45e475d7220f74960c48e686e7f6b15d82145b154caa802e2774eb34b46b03c5c4a1fc43a8ebc3716fb5f836be4d412886
-EBUILD gimp-9999.ebuild 5939 BLAKE2B 62e09bef788cd8e41f9c6a45b5f15ca74d5969c75c51854e768709fb5732bd2e55bc28c0f94ddcb5c2d392092369e4c1e7dfa81a38fcab205a5d98c0734a0441 SHA512 45ca4fc66b0c0edfc24a65fb928d560fd82c08ea8593c5b62f3b31d2f565dbef096cbc230f95be0c437114db469d9a46f1a54a58a286ce8a681836ca49e75a48
+EBUILD gimp-9999.ebuild 5926 BLAKE2B 7cb98417de8c6d8763e267dbaf5ff957dfb28433a9bd4ba80ca02354ce9520abc719c261d3d300d5cb4ce18e7e25a6f62862bf551a75ce06d5b60b3a0603ee05 SHA512 6a302141451c735e63d6343b52c58088fc93574a467b5f221150115af6d5260c53e65ab634d3466c4bcd01c6dd6bffcb0fa8f4594f592a7fb1e429275f92dec7
 MISC metadata.xml 474 BLAKE2B 7beaaa52a35415b9460b23f5031f71464008417e589105db607f0f86519cb7f19c9621dc77acea9aa9e67a1bf8f5887415761a69a29eb77aa205a89cc8b586ac SHA512 f1a58ab4fc0c7a4257648f35027d0860ee7b088ebd61703dde7622078bcc345168f3b747e79d71206ae36c479334925aac137e96c0d2134413f9e62aa27cee53
diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
index 887d43c208e8..f4e16cd1bf9b 100644
--- a/media-gfx/gimp/gimp-2.10.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="2"
 KEYWORDS="~amd64 ~x86"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=dev-libs/atk-2.2.0
@@ -128,7 +128,7 @@ src_configure() {
 		$(use_with webp)
 		$(use_with heif libheif)
 		$(use_enable python)
-		$(use_enable smp mp)
+		--enable-mp
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_with udev gudev)
 		$(use_with unwind libunwind)
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index b4f7112177ad..726f300ada28 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -16,7 +16,7 @@ SLOT="2"
 KEYWORDS=""
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=dev-libs/atk-2.2.0
@@ -126,7 +126,7 @@ src_configure() {
 		$(use_with webp)
 		$(use_with heif libheif)
 		$(use_enable python)
-		$(use_enable smp mp)
+		--enable-mp
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_with udev gudev)
 		$(use_with unwind)
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 089bcdbd0b1f..8fb6cd2bb0eb 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,5 +1,7 @@
 DIST gscan2pdf-1.8.10.tar.xz 406128 BLAKE2B 328c05f377e12742bbf8ebf92f327afddc4556533e4f7500b237d968fa07b6505f0a3be2c02f42318740e9d185611c094cf96c66804af02197097eebd16b880c SHA512 334979b10238d510da8c5807290920b50e3a06ddda99dad41ced96d33e1ca8467cafe1f3112fb81b6705f80bc232eb6f041d588a57e04d5eecd09a201f007a49
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
+DIST gscan2pdf-2.3.0.tar.xz 432604 BLAKE2B e411e3a58f6c1a9e9c6df7057711377a70676d7ab718d5e4a19ea2690a26bda0b99def3cc04099bd0392bef0060b6d60328cf36450bd18d7c64100d553a4c627 SHA512 c9f08ce9c4f9c14c78d0b821d8c4381eccdc5a741a4b54e817dab33e67b7eeb705d48a02109c97913149b4839a713340aa6947a548eef3acd6a7bcabfa4116e1
 EBUILD gscan2pdf-1.8.10.ebuild 1733 BLAKE2B 34eb1f1882a31569fe2dec3549a037986dd50c024aed983e2b96762507cfcee70e9428103be4a862e76c8cadee6f92fb0a597000d4b9a4a4082d38f88f60fc80 SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
+EBUILD gscan2pdf-2.3.0.ebuild 1609 BLAKE2B 0804b57945439bc55cc55d2b73b56cc4a892f9f72555ee74c0f1fe5203e0ac452659e1988dd55e59eee4f1791fd05e2d408b8f4b0ac7a2e77aea3f353ef0ee19 SHA512 7173ce075f21c158db8d964144073028275e6cea2346bf6275c4ca4a34a6e6a59f7da110f71ce988a5e033e92c5f0eedbb4661f2539613111891abd363845bb4
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.3.0.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.3.0.ebuild
new file mode 100644
index 000000000000..d19c0627489d
--- /dev/null
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
+HOMEPAGE="http://gscan2pdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# OCR tests fail with tesseract[opencl], not fixed by addpredict
+RESTRICT="test"
+
+RDEPEND="
+	dev-perl/Config-General
+	dev-perl/Data-UUID
+	dev-perl/Date-Calc
+	dev-perl/Filesys-Df
+	dev-perl/glib-perl
+	dev-perl/GooCanvas2
+	dev-perl/Gtk3
+	dev-perl/Gtk3-SimpleList
+	dev-perl/HTML-Parser
+	dev-perl/Image-Sane
+	dev-perl/List-MoreUtils
+	dev-perl/Locale-gettext
+	dev-perl/Log-Log4perl
+	dev-perl/PDF-API2
+	dev-perl/Proc-ProcessTable
+	dev-perl/Readonly
+	dev-perl/Set-IntSpan
+	dev-perl/Try-Tiny
+	virtual/perl-Archive-Tar
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+	virtual/perl-threads
+	virtual/perl-threads-shared
+	media-gfx/imagemagick[png,tiff,perl]
+	media-gfx/sane-backends
+	media-libs/tiff"
+
+mydoc="History"
+
+pkg_postinst() {
+	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
+	optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
+	optfeature "adding to an existing PDF" app-text/poppler[utils]
+	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
+	optfeature "scan post-processing" app-text/unpaper
+	optfeature "automatic document feeder support" media-gfx/sane-frontends
+	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
+}
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 39649d65ef7c..80b1db018823 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -2,5 +2,5 @@ AUX gthumb-3.6.2-exiv2-0.27.patch 1004 BLAKE2B e351a67d8fbbfd0c13b26ca575a34528e
 DIST gthumb-3.6.1.tar.xz 3415564 BLAKE2B 363c1c927557f69a4dc0980174b31dd414267c0110205b4406f7fbf02953fd9ad00255d327363c6dcab663e10401b42a7aa23bc33796e944540ad21e778db67d SHA512 8b545626b041f91b8a3ad9caa5930aa431529f660c5a705efff667c78ddccd25683e598f7b1fc08f8e73553cedec00f0187387833e6081f504fc67ebd86f7a42
 DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
 EBUILD gthumb-3.6.1.ebuild 2595 BLAKE2B 64912212a1e032ee927272bd77fee83367a678569d7ef58b67e27629404019b5fd101445973a81a870563c756f49de3ee290a9ae50a50abc0b61e913bc02f4ce SHA512 4f7ab17a2331dc0b592a267254d70e7f80d3ecd66aa069200500acf8488f0bdbbfdd1874829468556e25d71c38a0e7d6ead8d894e5085ee68100abe9bfd4c424
-EBUILD gthumb-3.6.2.ebuild 2655 BLAKE2B 78eb08b445b907ac1cdfec8eee7c2b0768938ec6172077231c6deac7a68a34920634942635110164d807299e46564c2ac389d883967d47cf77f7663c3c3dc541 SHA512 6cb326752e081bf0ff06fceac7bf3ff298ad99c07be11eb05f090ecd3435e6e55219a568d67a12fa12a600b91b58464610b285395faf4f40729c0cf29296e813
+EBUILD gthumb-3.6.2.ebuild 2654 BLAKE2B 3f89993297e713e9b50875763ed9623bfbf740ffcfb43562ff119e494394d3f91443d1b5aae47d2c35148bd33a28ea1c7f8dfcc909c2d822f4ef43899477386f SHA512 003160b92864d1410cdc813d825e2ef32e496fccd8692494fd7bf53e48aaaedc2ccf3762236b29f2c7c31bec095b73ba6f7c4179005701eff2b923a2feea38da
 MISC metadata.xml 573 BLAKE2B 889924db658e5280c09c581c76fe0d90d7306a454f0ad462131d87164cc4791a0002f17a2eb191c11f61959d93539d4ea5dd22b66d8879ceee259f30e0a268c8 SHA512 e9daac77f6276d354005dc123ba92053139c264a19dedbf4b79b6d3df7aea00e95330bb182b960d2606a65f6c8d68e19e82cb699999b9ede4fad1dd8cbaab16e
diff --git a/media-gfx/gthumb/gthumb-3.6.2.ebuild b/media-gfx/gthumb/gthumb-3.6.2.ebuild
index 26d6763e6c15..b8cf22ade78b 100644
--- a/media-gfx/gthumb/gthumb-3.6.2.ebuild
+++ b/media-gfx/gthumb/gthumb-3.6.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
 
 RDEPEND="
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index d698340ae13d..0a5b67c30d28 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-23.tar.xz 8941044 BLAKE2B 7fd7dc8dcff32d87eb02b6590600813e8c7359b3e8e36fdf4eae9abdaf39941c1f5b4fef398cbf271777c630f7f4d1b149a1685ce34af3607c839facde89cc09 SHA512 b46405916b6beb7048fd0a82426bd890d56584f910092753dd788124006687167321757b3c9a469bcfba7d38e7162ddcd977918f605e6e87c28895eadecc0063
-DIST ImageMagick-7.0.8-23.tar.xz 8636148 BLAKE2B 6db61c1fa8481fe27311211371f626e8f0fbb544cb5bddb51dc62e0ca70aa72faa942a43cea173a1a86980d2798baee50130982bf67ba9b6cf2892935b36d66c SHA512 8063903d9992d89db302f9f95acdf112d3d38609289af5fcef66acf7f684b3223fea64829a0f6dd15f71f6b6b52f74d3c716c2217ffd83558c5b8a4b7a4aec3f
-EBUILD imagemagick-6.9.10.23.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
-EBUILD imagemagick-7.0.8.23.ebuild 7151 BLAKE2B 2a45d3c2bf28fa0c18a7d7b2b81f9b41a208bf74e84a8bd0fd9630380f432e4a2ee27911b83a7a2ebd86c828105754d6b092a6205b4fc2d22ac79824c62e9069 SHA512 49dec8a319fef02989b7ad27a3553688f720391f670525f5d89dc34722eaab3fb2dbadf7e5ebd0565193020e54e0509fd171a2505f79a99b1eaa263daddd405b
+DIST ImageMagick-6.9.10-25.tar.xz 8938560 BLAKE2B 26d00bee1a0a70596afd670c010b4a103ef97c930b4cb34db688615d88ff9f6d026b7dc5b4c647b0a5aca2846ed25affef1ab29eaaa253168b807cc175aa56ad SHA512 6444ef305d36e515d94ee1d65a26049f7b7bcefea595796b7f01a27b10c474d9f35f585731c4d2e5e6f0034aea3d3db6c70bd6a40e88efbb2400fe285f20f776
+DIST ImageMagick-7.0.8-25.tar.xz 9429456 BLAKE2B 9b5781bbc91059462e6f4356735ce49503b9fcdbbdd52acaba314d5736ef7b59a4b7b17500899728d9f735fd34f001d830ac6d59501602c394d207139918af37 SHA512 7fb3ebd3c77492a49d4b9d047d853de6eb1abea1614fed1f21b6b6c7de37093b53ade3f319fd74f87d76954392a5ec6ab5cf0df05db1fa73dbd73aee310edbf4
+EBUILD imagemagick-6.9.10.25.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-7.0.8.25.ebuild 7151 BLAKE2B 2a45d3c2bf28fa0c18a7d7b2b81f9b41a208bf74e84a8bd0fd9630380f432e4a2ee27911b83a7a2ebd86c828105754d6b092a6205b4fc2d22ac79824c62e9069 SHA512 49dec8a319fef02989b7ad27a3553688f720391f670525f5d89dc34722eaab3fb2dbadf7e5ebd0565193020e54e0509fd171a2505f79a99b1eaa263daddd405b
 EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
 MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.23.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.25.ebuild
index b6bca9ea8b20..b6bca9ea8b20 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.23.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.25.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.23.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.25.ebuild
index 3b3fc7c8d30d..3b3fc7c8d30d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.23.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.25.ebuild
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index a110880dd994..eb92146ebd3d 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,5 +1,5 @@
-DIST img2pdf-0.2.4.tar.gz 54426 BLAKE2B c645d61ee8eb950bfb15337a2d2be724efe9fdf40ba7b211c9882ea14ec34aa977358e0550a732bf770d9539e7b8f8f0dfe045fa7fe8ce0cd0c1311be570cc23 SHA512 c2d99da7076411cf4acabe8929fc8af4005ef1f3e3d9edc953f2731b8d41159c9e4637a803765e1405c595daebfb3d519d4c7903003ce0118d8b0c6e88f11860
 DIST img2pdf-0.3.1.tar.gz 67954 BLAKE2B d0d6a9927e9b3e7087e562a108157677a46a17a896beddcc424dd2c234fd7c4f1376b824dbf814b42d9a314a8495b149bc9df65ab2864405b9dde0054e7bafdf SHA512 25f788f78e93ed336ed8e31e88350d89263b82477c8d9c36103dfa522a5e661922fc09b59e1d5104161fe1be15114f843172555efa942722d8b093900d38bae1
-EBUILD img2pdf-0.2.4.ebuild 576 BLAKE2B e6c242e6ffa46a84701e5b93959026235885e7a67541aa99d3cd9489ee466b101d3456a5fc90eaade8eee57c5a14d3ea2591556167168d4bab0df69a85c224ca SHA512 b3239673b80292319b7f5e9286d6b9ecf20a0e478e3fc685f3dd448dbbb9d598b28bfb086bf8a3cd5dbb7431e3a2d89f1dc975f87aca56d7bf45897535dd0002
+DIST img2pdf-0.3.3.tar.gz 80523 BLAKE2B 39e372f1ab82d9f521cf2c512b173680afe6463dd041283b336af49c41b12d12261fe5947ad9f03d489b7898d3c8d161faedb2b3366cb75bd1bc0666f905f60c SHA512 234e0031d75727d2f5d2b82603bb447d9101ace81e604b6d5eb358d0b4681e209dbd737775b90b44096cf84239aac9e87e2369e0c6112a17f24ccbf10a20cdd5
 EBUILD img2pdf-0.3.1.ebuild 573 BLAKE2B 96ddbfb40bb0c5ea8e237f6c8b4e6f005d4583e49340273b7a9fcd7f0c631632931d1ebb3ee0b39de5886db281761552b0bdd64c6509ff1206eeffd17074adfe SHA512 baff293bf9770cbfb004908fbd9d0afee0d25248cbf3fccb92a2cca228675d3784021e50227dfdc2f28edcead9ccc40bba62e5e0916c98dc24f4d520f00ce32f
+EBUILD img2pdf-0.3.3.ebuild 624 BLAKE2B 653a184f56981b19da846b22dce97623dbf8aa3894e8b58a790b8dfa8d745320c9fb4d9be2452fd7ccf94bb6f7eb0a93f2345ef806c36fc68a60cee4aa9d2c47 SHA512 e5b7b816d032d0a5a093c1bc407bacd8361cd523a515b9aca0f9749d60d6b17bbe4fd2e71c1f01e4d235f01ff880eed59ab203c3922f125af1755c60483ad43d
 MISC metadata.xml 1096 BLAKE2B 18befc3c4c34d0210ad594ba46749dd304d673ecd697d30b3c60a951787a7ac9e8d7371d0c853c8a4cfce896b18dd36a29f15dd12aa4fb6190635e20d2b201e0 SHA512 c4f5e02479a3ca0d6a2a52c58c25197cae533855500327c84c694b82e2ad625e149124c555b8822f79ec8000a4f926b6e21dd59db92b0989a316687d56775531
diff --git a/media-gfx/img2pdf/img2pdf-0.2.4.ebuild b/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
index c392f9e3c04d..9436b9466ccc 100644
--- a/media-gfx/img2pdf/img2pdf-0.2.4.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pdfrw[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/pdfrw[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff,zlib]
+	)"
 RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
 
 python_test() {
diff --git a/media-gfx/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest
index 01f5fd19c890..9f40682c24fe 100644
--- a/media-gfx/jpeginfo/Manifest
+++ b/media-gfx/jpeginfo/Manifest
@@ -1,4 +1,5 @@
-AUX jpeginfo-1.6.0-parallel_install.patch 330 BLAKE2B 357207cc9044eb55a26841a4093ece2d1637b2b35df1d62e8ae3b018a54d6576a16790c51ec4a01167804b07d10bb4b7ed892a524e279d9ce5386d8ce3016d0a SHA512 1e403edabb6e8379d55922b2ae8247d7b18d86b93fed9fe51998d9e7b0cbb41be7ee7fc58a27c012fd56ee9aa9cea3c73c9f758042f2abb3bdb027e7202f3410
+AUX jpeginfo-1.6.0-parallel_install.patch 334 BLAKE2B 01d3e16d44789c5c1d1346f6c3067496daad051e60c9a39c69641fcec1766bb69e872f5259b4edd2d7b5fe5c793bc25e47c7329aa49b625ac80954a444562f92 SHA512 5dd86f4172caacb8d43952274b3a0a86df5d346839d29eb7e80e6f7ae8be4b73a70dbaccc1732703d45cc966b8fd762a0a4c5e02a3701718ebcc6ff646f1e676
 DIST jpeginfo-1.6.1.tar.gz 64856 BLAKE2B 5d9748a4af26087e45f2ae3fa709bb2099547f22aaeaf1fde529d92d633b1bc665dfde301a9ecaf4a8e4fa190ef637126d6f4ee43118bb31f5782a402d4a08d1 SHA512 9cc9367b8b3e38ba46bff9477b8f61e63b55bd41a67ea2895cca9c097abba2a7a3ae068c235ecfea72c99af52bba91cbb1eb92feb019ba4eb08e826a7083c68b
-EBUILD jpeginfo-1.6.1.ebuild 670 BLAKE2B 0c2d87f256eed30e3d4c14cba934fd43e4b71821113459f21aa4bf11dd2b0b14b7899d59a7f271a6d2ed036430621f579550d8d84df8b5990f304db137ff2505 SHA512 97309858d4d1129fadef84c351f1862c246074edbe4a1f4252bb2523cbdd0f99eba87155a5fae085beb1403462ebc7f9f510f24ada74f1542af12e92f8204927
+EBUILD jpeginfo-1.6.1-r1.ebuild 649 BLAKE2B 0e5ffefeb11501f245fb943c2e42fe45e26e7f89e8918440c8200607421bc450e33f55ade47206ce5e26cc77b338b52c67c4c3ccd8a538abc1a8bcc73ccaa837 SHA512 13e0a0cf8d896684de7e3165a1d5c2c1d57ab199c1a381517661dff2978de5c9ad8ae3e03f19d029c0219dea016a979e38e72fca7a1f1c1c7f9a8b2726a3ede5
+EBUILD jpeginfo-1.6.1.ebuild 670 BLAKE2B 3c03a10d42865a06ca72ce8c0fe765dc2d978ec9b53f0f6f7cc1e19c13bce7ddcb969e37975240788699e33e4bbc4d5a826444148f7950932fbfd8e4467af4fa SHA512 099f7b21978f8df38d027d11af7222ecb539ef42b573d93c4a343e710934bb4fc3c127c9f406c5a9c8859bc7ab0e52d5629918f1cd23079f8c32b7dba0484ae2
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jpeginfo/files/jpeginfo-1.6.0-parallel_install.patch b/media-gfx/jpeginfo/files/jpeginfo-1.6.0-parallel_install.patch
index 379e200fd90f..84de25bafca6 100644
--- a/media-gfx/jpeginfo/files/jpeginfo-1.6.0-parallel_install.patch
+++ b/media-gfx/jpeginfo/files/jpeginfo-1.6.0-parallel_install.patch
@@ -1,5 +1,5 @@
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -79,7 +79,7 @@
  	groff -Tps -mandoc ./$(PKGNAME).1 >$(PKGNAME).ps
  	groff -Tascii -mandoc ./$(PKGNAME).1 | tee $(PKGNAME).prn | sed 's/.//g' >$(PKGNAME).txt
diff --git a/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild b/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..fb764fd99d88
--- /dev/null
+++ b/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Prints information and tests integrity of JPEG/JFIF files"
+HOMEPAGE="https://www.kokkonen.net/tjko/projects.html"
+SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="virtual/jpeg:0"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.6.0-parallel_install.patch )
+
+src_configure() {
+	tc-export CC
+	econf
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README
+}
diff --git a/media-gfx/jpeginfo/jpeginfo-1.6.1.ebuild b/media-gfx/jpeginfo/jpeginfo-1.6.1.ebuild
index 94655602da5d..59414dd9e88d 100644
--- a/media-gfx/jpeginfo/jpeginfo-1.6.1.ebuild
+++ b/media-gfx/jpeginfo/jpeginfo-1.6.1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Prints information and tests integrity of JPEG/JFIF files"
-HOMEPAGE="http://www.kokkonen.net/tjko/projects.html"
-SRC_URI="http://www.kokkonen.net/tjko/src/${P}.tar.gz"
+HOMEPAGE="https://www.kokkonen.net/tjko/projects.html"
+SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-gfx/jpegoptim/Manifest b/media-gfx/jpegoptim/Manifest
index 96efb695b3b9..379a66aad2cc 100644
--- a/media-gfx/jpegoptim/Manifest
+++ b/media-gfx/jpegoptim/Manifest
@@ -1,5 +1,7 @@
 DIST jpegoptim-1.4.3.tar.gz 98151 BLAKE2B 6faf7097fbd72302707ca7f7b7f6bb02841d5f6433c6624254c09fcf389da99cc117eddddf1e58de941394e84b22d6cef06d54568de26558c8c9cb90b0c77595 SHA512 4495e9cf5af9ba41273bf23a4abea724adb19ddac373d5985c29fe65b227c0b23bf14baaa28fa8f8617370e9b9fe41b0d365ad19da67f34d32fa857232c7b09e
 DIST jpegoptim-1.4.4.tar.gz 98794 BLAKE2B 32cc9a64b832ed994453f6f87c20c29ab23423cd94ecfa8894ad7ab3fd7aca2f7f54cc0eeb7148f768bf9378e79934c9c2ea6837f9348da6b8fad04b9be01dc1 SHA512 67879b5709a97c7b097e5eae6fe4047d330da8a445eab6e9528cb5f54d76db1bba058eff5c7342b68653e7d25e50ad923d5ce04799e1b3f1815d8b70affd46a3
-EBUILD jpegoptim-1.4.3.ebuild 489 BLAKE2B adae913f3ae2cc0b530c84bec1e263850f15146806a927da2814642e45db2718a1e39fd81bdf5916fdf1de6dd5e53473705f1a4b0efae5cde3e3af25990eec9a SHA512 ebe582928af7143d4da9fab67685bd40d2a202948ae38d8ee3a2f313d4bdaaef92606c8c8a9492609d287c0b77e0870985fbb15dca6c25cabf29b4fbfe8bb87a
-EBUILD jpegoptim-1.4.4.ebuild 525 BLAKE2B e79edf64902e64355bcac94c23032ce1b75b90cb804cb610fca29b35ee1544a63f702dabf61e1e27cbb85e638c051e63670a2b0bad99f2e93c3057e5e1d55e44 SHA512 e73b2036d80520c38a91768f9f269bfb3b556efaae455c5502bb1f4fb9fcb32afa57012bab427216c18492524c1ba717f37f1bb18fce7462ad53050c0aabd294
+DIST jpegoptim-1.4.6.tar.gz 99004 BLAKE2B efe8d4155e6a111ef7f810ddfa9d2ddc2b58d2a54728b81698c47444eebde864662ecc397cd935af47070b84daf36b33815e87a2909fc8b6ba7ca2421eff9687 SHA512 1ebd4986cbfeae19c1e01521862c15de25e078ccb6483c29f0d89b9c8e308c93d8dca7a200a57dd5da793e481ca5dc9c4f0d84b252f5b9408b4e719c35d7e90f
+EBUILD jpegoptim-1.4.3.ebuild 488 BLAKE2B d4364cde3661544ee3c1d4d83198b77e16ae727399504c7e46aa1e208cab2066a06d9c37b7d28967849a2af92ec84c3661c8f9dabf256ba0174ef3b691df7b05 SHA512 a4479e23dec2ece4e69321550a8dfed1f84418ea450d85a7d64797a742660d98c3eada87b629d6e72229fc115d5814c0b7095c3a9c28dfba0610c375633e161b
+EBUILD jpegoptim-1.4.4.ebuild 524 BLAKE2B 26f3af75056797ded89c4cfa99ebccfefa1f6b1f8f48831a25a963cd94e328f783d9f16657460edfc01225ed59bada345bd3365b0be84a01fcca407ede7eb6af SHA512 b5ab4152ff514f537d8b88851ef44e6ee8b676a89e2e76eff432430ec89ca2764721f0cd7134c53cac2cbb6a5bd51a0f63c2219210ade9ff620f9cab4f4bafba
+EBUILD jpegoptim-1.4.6.ebuild 523 BLAKE2B c6d50118ff2add50b96f1dcdd741008bca97d6e772c64fbe1382f12b3bf60e44ac5ad70cb9a0458d4f7ade1524457a5c9fc0d6dce8d75dd6154a7165c9d6025a SHA512 05098febb77385f833410f5b1fab543cb9836d978dc3bfac8140353ef16522e72dbd958939a31e2ec27d0f860c9c5a2d52a836d1d64671d3e0a2a792ae2fe941
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jpegoptim/jpegoptim-1.4.3.ebuild b/media-gfx/jpegoptim/jpegoptim-1.4.3.ebuild
index 979f943e00e0..e6b750048b8b 100644
--- a/media-gfx/jpegoptim/jpegoptim-1.4.3.ebuild
+++ b/media-gfx/jpegoptim/jpegoptim-1.4.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Utility to optimize JPEG files"
-HOMEPAGE="http://www.kokkonen.net/tjko/projects.html"
-SRC_URI="http://www.kokkonen.net/tjko/src/${P}.tar.gz"
+HOMEPAGE="https://www.kokkonen.net/tjko/projects.html"
+SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
 
 LICENSE="GPL-2+" # While COPYING is plain GPL-2, COPYRIGHT is clarifying it to be 'any later version'
 SLOT="0"
diff --git a/media-gfx/jpegoptim/jpegoptim-1.4.4.ebuild b/media-gfx/jpegoptim/jpegoptim-1.4.4.ebuild
index 2bcd4f24bbf0..1fd5345af524 100644
--- a/media-gfx/jpegoptim/jpegoptim-1.4.4.ebuild
+++ b/media-gfx/jpegoptim/jpegoptim-1.4.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Utility to optimize JPEG files"
-HOMEPAGE="http://www.kokkonen.net/tjko/projects.html https://github.com/tjko/jpegoptim"
-SRC_URI="http://www.kokkonen.net/tjko/src/${P}.tar.gz"
+HOMEPAGE="https://www.kokkonen.net/tjko/projects.html https://github.com/tjko/jpegoptim"
+SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
 
 LICENSE="GPL-2+" # While COPYING is plain GPL-2, COPYRIGHT is clarifying it to be 'any later version'
 SLOT="0"
diff --git a/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild b/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild
new file mode 100644
index 000000000000..dab1c63d5ae2
--- /dev/null
+++ b/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utility to optimize JPEG files"
+HOMEPAGE="https://www.kokkonen.net/tjko/projects.html https://github.com/tjko/jpegoptim"
+SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
+
+LICENSE="GPL-2+" # While COPYING is plain GPL-2, COPYRIGHT is clarifying it to be 'any later version'
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="virtual/jpeg:0"
+RDEPEND="${DEPEND}"
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 0145e8d61f4f..a472c708dbfc 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,4 +1,6 @@
 AUX kphotoalbum-5.4-exiv2-0.27.patch 1687 BLAKE2B b1d94b96200dc3e750e76c1e8567061ee6fa693478aa82556f24ef805365653eb90d72252b0a26d24b9b8a224f767ca56710e0d52701a71d82e41d3651e86d17 SHA512 768e7c1e31e4472dc304eae85bf8ba73bc590cd7817c486ae9051f0a25eb333f9054dea81187230b816381c6299e6bf374e1d6455db9b7d2532490b6f1f934f7
+DIST kphotoalbum-5.4.2.tar.xz 11807452 BLAKE2B 45ecdb4fbe3d66770394751911201737b698d2d497bb387871755113d153ef2c01a9b7e4a101f2b465d79801d0f88f084a0d0832550591012b44c70e5b28ff7f SHA512 9a4548141c56dd6426244e646a0d2bfb2eac28797c63ae478a56d6b1c0484ce5e607abcb079e50fcbc0643f7e9a94844a9af6600748ce465b8f66781aa5e3038
 DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc SHA512 d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba
+EBUILD kphotoalbum-5.4.2.ebuild 1578 BLAKE2B bfbc876f30b3abeb8cc7d569714cf3b3c905b5fa19eea79d1ebc1ac7ef53b3027a125e4adf80ffe301a3842d6a1be1ba3a17053e0b480b8f0f62e88c4f10e0c8 SHA512 3c3e0c853cba71da9b4f38f6ea846cceb83b00e069c87d7cefddeb2214905592b18b18877208cce53ed2108e202a069b762b060a0be3118b6d0a434b099c145b
 EBUILD kphotoalbum-5.4.ebuild 1571 BLAKE2B 7699730f48c3f1d037a0349c444c3876eaf3accd0001954812778f18efa03de768753f8bb0c095ebe5ee6e09d302d5baec993b10ca0d18de2a7f1cfdccaf5b91 SHA512 7441a62ee268bab25149cc26b46fe9d636c2720c0fc56696181557e46813c7d30b921d48922bc4bed1d36b385f6109de92bb8e0894c94624104a6b66af8e10fa
 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
new file mode 100644
index 000000000000..4fe6263916b8
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+kipi map +raw"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-gfx/exiv2:=
+	media-libs/phonon[qt5(+)]
+	virtual/jpeg:0
+	kipi? ( $(add_kdeapps_dep libkipi) )
+	map? ( $(add_kdeapps_dep libkgeomap) )
+	raw? ( $(add_kdeapps_dep libkdcraw) )
+"
+RDEPEND="${DEPEND}
+	|| ( media-video/ffmpeg media-video/mplayer )
+	kipi? ( media-plugins/kipi-plugins:5 )
+	!media-gfx/kphotoalbum:4
+"
+
+DOCS=( ChangeLog README )
+
+PATCHES=( "${FILESDIR}/${PN}-5.4-exiv2-0.27.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package map KF5KGeoMap)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index a93032133d4b..5ceaa2897606 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,5 +1,5 @@
 AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
-EBUILD librecad-2.1.3-r4.ebuild 1098 BLAKE2B 16890e1fe27531314e8951cea944308cec88f3bd0d3824a4cc3739e5a92b43f840da0abeb2fb21af4f9fb9c69f4c78265a7e551cbb326a58472da6f611025c41 SHA512 139d713066a0507d9dfb056a1954d822afa3096e8da56342c143fcdbb203cc601d987834883f4bb0fd72bc67c8300b1ecf46a7400c2478e31b503da3dd05e0b2
+EBUILD librecad-2.1.3-r4.ebuild 1102 BLAKE2B 8f9a34ce4d164d741fd9c053a956eb28b289d2287f1a627ac11362b47799390753db65e32ace5b57bd2ad0c9f2b84223f86fd9fd77160c0f85a31915b7041c1b SHA512 907a94b6d98f6dfc49e33d2fcb1611b76cbb5f309b22c4ed5ae51ffaaefab146379b39e42849f7bcc97bb7a0f394e31b6df82bd720537ddc387aeaced110a40b
 EBUILD librecad-9999.ebuild 997 BLAKE2B c2f46819e1188ac08ff278385f696c578dac20c707b666d5fe297c2ff19b3f8c37f048e8c3083acacf4f7165378ed5f5de37209b6eff50fd73b8970dd7377b18 SHA512 8e8633998807024c30de31be9eb996b5a6abb1ab416247258e35b1497ea9824b7035556201b3a9c8c546cb3402406344353cfca37ce5d2fbe268bfaafe693b77
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/librecad-2.1.3-r4.ebuild b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
index 874bb483159d..f5656b761208 100644
--- a/media-gfx/librecad/librecad-2.1.3-r4.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools"
 
diff --git a/media-gfx/mkgallery/Manifest b/media-gfx/mkgallery/Manifest
index 6d2ab8fae8a2..1e38483b21fa 100644
--- a/media-gfx/mkgallery/Manifest
+++ b/media-gfx/mkgallery/Manifest
@@ -1,4 +1,4 @@
 DIST mkgallery-1.1.tgz 6514 BLAKE2B 3ac077de99e2c8e05424425eb640a6684eb199c99d0eca879aab23645b392d3b19184d0a93e7dd4a92cd643d261c22a0677919e26b1866507c35d782ee6ec390 SHA512 6d3cbe6bbf3673c26bedde0eef1b03409766324836296205b6dab0a32eb23c7f8cbd27db2778bf710c7d3641e01eb57dbac5493ab97862cd501b3858f1db6a4d
-EBUILD mkgallery-1.1-r1.ebuild 511 BLAKE2B 8d4610fa40b9bd30c9bf13a78819dab355fb07d1f5df23fc3985c5e1734f1ee5a1ce0fabb10f44c955b48fc9896e31146aa0be8d072592b1478fce016152ef96 SHA512 24e19a2b32a691851bff5babd4ea57f8a3fe0a4a8ce84f7d1530038994f32e1a7083e213f9abd14df8ef35a72ad5dde0a3b4db0d19ac409970a8652a06c5c94c
+EBUILD mkgallery-1.1-r1.ebuild 510 BLAKE2B 2852d3c8cc358c2eb4890a5ed412759e5755d5f88f1f81b587df3cbd4743fd516409f5ef049a317f082140e3475ca54551881fd6140ecb78e9575c03da51e4d8 SHA512 6fb0de5cfaf0f6eca6ad6d0d08f7ea64910b56b4925873164721a5414ac4093d51191e715d0b5ee76696d8890239faa0505f9505624408b2a808b73488bf2e87
 EBUILD mkgallery-1.1.ebuild 528 BLAKE2B a114ec974e314ca71f0a107eb040697874432358989f66fb947ace0efed2d7a33edd3917ed229d9f9bdb36673d498521f516db2226bc50105396c3c093f08235 SHA512 a4e141929b498c0de8dc896ae94797a8eaf72b4a2744aca6105030b479af7b31e7093541d9090054e057d1282780430c6fab7ec8575903748cbdbf3aa7dc3e82
 MISC metadata.xml 246 BLAKE2B ae3650aa087620727ede47f5c455bcaf1c88078b720cc601aa399305760d957ab0ce54674ef2f3c0afc4e832637acd1f0758926c14ecbe22eb7c1c693235e46e SHA512 06b51a14b7a00428ccf8399b124bdf7ad7909af339489562a36e3e470da8c8cbdf09324fd01c14dd515ee0fb8d4849ef25f4117c56076a4590fd31b7f76b8651
diff --git a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild b/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
index 11a3d4b39d3f..07ba89fd748e 100644
--- a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
+++ b/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://mkgallery.sourceforge.net/"
 SRC_URI="http://mkgallery.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 SLOT="0"
 
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 6f9472019be4..79c7818a79fc 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,6 +1,3 @@
-AUX nomacs-3.10.2_fix_move_crop_area_tooltip.patch 1254 BLAKE2B 5dec4f07fc0cdcd1316a61c179da94bdeaf01d56bb8c2d5327261280d176a976dc406c851f2f2b84d6ac5c62df5646ac8be64de1561edf8ad3220a353a95b887 SHA512 2866be24f07534bb34f15374145240580552fcfd3c33c0193236f597d9edaa256809b5a0da88cb58230d7d0efc19ae56bbf5247b789d5b82ae3ae89c489828ed
-DIST nomacs-3.10.2.tar.gz 32302506 BLAKE2B 14f9eb9188f74c91cf088bac757a4023f6590bc05687b4809794a70bdd1e2dbcc2b58ad65062db14cfec9f4c639ceb21e64df19f1c1584256ee9586ab588d8af SHA512 977dbe24e09b00001dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
 DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
-EBUILD nomacs-3.10.2.ebuild 1748 BLAKE2B 52611e005972dab2c3b70605c59e5a9d02f2bfad1a214aa80c9cd3043cbb43317b475cba69fcccf58b50c010d68da8fb328002d423bff85b0c20ebfc1aa6fbde SHA512 4275890d496f26f7de207c986cfb7b8d8c37f0db992111e3b9f4c34980f0c76124bba71ddabf44e578aeb491099a4790ae79f855008ec00cb9f1ec6f33203489
-EBUILD nomacs-3.12.ebuild 1341 BLAKE2B 66c969a82102d950b72e0b2fdce39d4970bf4fe8b3d36ac2e751f6e31616f551f2bb6615c4586236de9fd7b0ce374f9da2e2c3eb4af6f28783ccc87a7b3c9af5 SHA512 7edc9b02d4721c46be37d77aad4912a65081098c50084753ab501974033dc3bc383860b7a4a7667eeacbd12a0c60a41a9c5a511b2ba1eae692dfd71ad44cc6f0
+EBUILD nomacs-3.12.ebuild 1339 BLAKE2B 0f6501b09d0efb5881a3f64120e75e512c224e190d17f210f4b4ec7e925f6490c39f238f7be8935ef88434c445c0709819ca455a464e56ed3dfc629303abf636 SHA512 ef0c676c97d0e0615cf2f24117d16734bf7ab9958f547414abe39e2b27cc7b470dbac96cd9a4d4eb0ca8b04db6c31e2150989c03593963659e0c7513a41a077b
 MISC metadata.xml 658 BLAKE2B 72c4850c61d0aa0c068870eb15f33471279182f0b4fb09a18f24b4a497df4f0928492a2cb24d6f47bd6adc54f3e8be95d937c65f95db01dfc5a4bda83830e3ea SHA512 7388bf834b7483835054cf4550984916a6ccd56902d7992b24f83affd39e2aac8a50599b81370f85683882425c93bfd081fffa5f7e693b6d1683b5429be1cae0
diff --git a/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch b/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch
deleted file mode 100644
index ace6f3d51527..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e963ab5870945b40055b8fc7eb2708ee11f8d4fd Mon Sep 17 00:00:00 2001
-From: Markus Diem <diemmarkus@gmail.com>
-Date: Fri, 7 Sep 2018 15:11:18 +0200
-Subject: [PATCH] show crop info when moving
-
-- fixes #253
----
- ImageLounge/src/DkGui/DkWidgets.cpp | 6 +++---
- ImageLounge/src/nomacs.rc           | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/ImageLounge/src/DkGui/DkWidgets.cpp b/ImageLounge/src/DkGui/DkWidgets.cpp
-index 61c0c05e..b6a5eadb 100644
---- a/src/DkGui/DkWidgets.cpp
-+++ b/src/DkGui/DkWidgets.cpp
-@@ -1820,7 +1820,7 @@ void DkEditableRect::mouseMoveEvent(QMouseEvent *event) {
- 		setAngle(angle, false);
- 	}
- 
--	if (event->buttons() == Qt::LeftButton && mState != moving) {
-+	if (event->buttons() == Qt::LeftButton) {
- 
- 		QPolygonF p = mRect.getPoly();
- 
-@@ -1833,11 +1833,11 @@ void DkEditableRect::mouseMoveEvent(QMouseEvent *event) {
- 		QPoint tl;
- 
- 		if (sAngle == 0.0f || fabs(sAngle) == 90.0f) {
--			tl = mRect.getTopLeft().toPoint();
-+			tl = mRtform.map(mRect.getTopLeft()).toPoint();
- 			info += "x: ";
- 		}
- 		else {
--			tl = mRect.getCenter().toPoint();
-+			tl = mRtform.map(mRect.getCenter()).toPoint();
- 			info += "center x: ";
- 		}
- 		info += QString::number(tl.x()) + ", y: ";
diff --git a/media-gfx/nomacs/nomacs-3.10.2.ebuild b/media-gfx/nomacs/nomacs-3.10.2.ebuild
deleted file mode 100644
index 8e7356daf996..000000000000
--- a/media-gfx/nomacs/nomacs-3.10.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="+jpeg +opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff:0
-	)
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-DOCS=( src/changelog.txt )
-
-PATCHES=( "${FILESDIR}/${P}_fix_move_crop_area_tooltip.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-	sed -i -e "/setup_target_for_coverage/s/^/#/" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-		-DENABLE_TRANSLATIONS=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.12.ebuild
index cd9011453890..ed18ddad7616 100644
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ b/media-gfx/nomacs/nomacs-3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="heif +jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 2cee6538d6e6..e261ae891b32 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -4,5 +4,5 @@ DIST pngquant-2.11.7-src.tar.gz 141959 BLAKE2B 00e36a818a2150aeb3c927daeb8621baf
 DIST pngquant-2.12.2-src.tar.gz 143404 BLAKE2B b06b1185fdeb1990e6b6f0cb77e33051729731fc2c2f4b1f618bd9077057354eabc21405872c938dbdf5395040860b4a884e9780bbd439da36f2af61d53e82a9 SHA512 ed82e0a57d9f4f3ee40258c4cbbf7ed086177dee1e2afdcb7d308f779c83fb2be9c7226c0713b9c72e6b6c22161dbaca3d14f2bdc2f0468daa608be80e9ef1c9
 EBUILD pngquant-2.11.4.ebuild 1003 BLAKE2B 6e56ca1685dbbd7bf9f5e6d45a02770e59b392ffb1494e819d74afd59e54b05532ab2925fab620a19bee90291e66e8cca9ab22ccb4b6a1d81f16e29330e1f5f3 SHA512 c7540c0565652abf15efaeef55b929577265e30df9759b00d53bff81002cbbcc42bc9b27873ab76b9869d776e6ff53ef75b53729c60d3e5399141cbc44d93507
 EBUILD pngquant-2.11.7.ebuild 1003 BLAKE2B 6e56ca1685dbbd7bf9f5e6d45a02770e59b392ffb1494e819d74afd59e54b05532ab2925fab620a19bee90291e66e8cca9ab22ccb4b6a1d81f16e29330e1f5f3 SHA512 c7540c0565652abf15efaeef55b929577265e30df9759b00d53bff81002cbbcc42bc9b27873ab76b9869d776e6ff53ef75b53729c60d3e5399141cbc44d93507
-EBUILD pngquant-2.12.2.ebuild 1170 BLAKE2B 64b37bdd0875cb2b856925b6223fb79adbf426b5cda1c821e715ad198ecaa8e9e8392e870d22985574834e0c1235c70207ae0bf63b666ebd5b8a49155a126e07 SHA512 c44a4060fb2f3aa56d9077b1cd15df78fb283c3fbddbf85e383b6289f94f6fc0aa1ad7e02a9babf2d9ccfa1fc9fefb32cd61dac90311734450871fa07072d1cc
+EBUILD pngquant-2.12.2.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/pngquant/pngquant-2.12.2.ebuild b/media-gfx/pngquant/pngquant-2.12.2.ebuild
index 5bc16502eb65..fddd03b24f41 100644
--- a/media-gfx/pngquant/pngquant-2.12.2.ebuild
+++ b/media-gfx/pngquant/pngquant-2.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://pngquant.org/${P}-src.tar.gz"
 
 LICENSE="GPL-3 HPND rwpng"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug lcms openmp cpu_flags_x86_sse2"
 
 RDEPEND="media-libs/libpng:0=
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 8ef1455ac893..9aed5bf5cab9 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -11,5 +11,5 @@ AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
 EBUILD sane-backends-1.0.27-r1.ebuild 7729 BLAKE2B 99a75ac0aae614e4168b1216ed22c071acc4d1a448eeeee1a6c36991df23bf8e68dfb558d3047e144f8fd32cd4ad766a41238be5a991b4039172872011eed501 SHA512 42689dd5189e9bfba21f016dc63897b0fec6adb18fda2485c64c35764caceff307b18759aa359d7b56fb69aee86ceb769d1c5f5162d30cc9e8576dc3140f70aa
-EBUILD sane-backends-1.0.27-r2.ebuild 8136 BLAKE2B 7f5569990041d9a169e4fd3f2f75c8664e7f6689db297d40dcd2c9d6d4bc68c9f458310d388e2ed8c89792d8e0b0df3f92a2e19315ba96bb4930cb032cc04a4e SHA512 5b58ad63b8dd093a2a5e68a72f1afbb3e8691de2c050f96a660efeb9e84cc3e64bc9e8b6998798f409e67ad51c0dc40e2dcf6fb011592bf4d6d6360c4882b3ed
+EBUILD sane-backends-1.0.27-r2.ebuild 8132 BLAKE2B f5ce6815024209c13bbcde6238408a00a9a09934c01f4e7bcf56b91b84d123a70b924fdf6158f026f0a23745fff1a427d9177c3628b26ecefa3b960175879118 SHA512 ffc7fd40e943a84a6fa44fe1d2ad9f4099b7b67a02a87f8851ac0ccb8507785ffad4134bf78c6392c2abb102da2a060a0be444ee61c7a589ca1807edefe41cf6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
index d6fd1790ccab..e05d94fee84b 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild
@@ -122,7 +122,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index a3092ddd5b78..47726079a726 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -1,4 +1,6 @@
 AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef
 DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710
+DIST sane-frontends-upstream-1.0.14.tar.gz 233587 BLAKE2B 69e34ed783cff68879b92d478195fe8c67f29d8904e22bdc62deb7310e8ac73d1ce6fc89ee0eafe3e2460f54cec257dbfe28843aec679cfe8669be6c5fc0e2bd SHA512 ffb854f4f4fd08a98395f325c22aa81924ac1e0827e795107bf01f3c42c2cd64bc204c79bc5ec8fd570746d039eae87a2da9cdf30b7f4640442a33c6495d35f8
 EBUILD sane-frontends-1.0.14-r3.ebuild 1327 BLAKE2B 15e8425ed7db7301ded095f2652f8214a40f8381f67f90077835dcb9d03c6e024be07de4eb85279a6b8d728865d989c66d238a17d00d685546f05775ef1af251 SHA512 0e7c3cfcd8df0bba6fec4ece1188b3907d33fa57878a0d38265dda4d29c3b295c7128ce84507b55ca21a373926d15bf66d82f91a49a4fea0009c4c9e4d1305ca
+EBUILD sane-frontends-1.0.14-r4.ebuild 1477 BLAKE2B 51ac9358562198a79a391efec2f00b120b1a36f9d0e8fe39305bf6943449365bec1606f414cb0853f00a633ae1a4e439cb92f6d9d4ede4c01196936e4ee5b6fd SHA512 fb36d5fb3e1ceec7d226ce4d18e32822fc0e68d1aa55a86b517b05b1726a3be807456e5fd8a211e1991a32c724d786d782bc21262c2be1951eaaf2514923c6a3
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
new file mode 100644
index 000000000000..8f9b6030f8cd
--- /dev/null
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Scanner Access Now Easy"
+HOMEPAGE="http://www.sane-project.org"
+SRC_URI="https://salsa.debian.org/debian/sane-frontends/-/archive/upstream/${PV}/${PN}-upstream-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gimp gtk"
+
+REQUIRED_USE="gimp? ( gtk )"
+
+DEPEND="
+	media-gfx/sane-backends
+	gimp? ( media-gfx/gimp:2 )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS Changelog NEWS PROBLEMS README )
+
+PATCHES=( "${FILESDIR}/MissingCapsFlag.patch" )
+
+S="${WORKDIR}"/"${PN}"-upstream-"${PV}"
+
+src_configure() {
+	local myeconfargs=(
+		--datadir=/usr/share/misc
+		$(use_enable gimp)
+		$(use_enable gtk gtk2)
+		$(use_enable gtk guis)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# link xscanimage so it is seen as a plugin in gimp
+	if use gimp; then
+		local plugindir
+		if type gimptool &>/dev/null; then
+			plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif type gimptool-2.0 &>/dev/null; then
+			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		elif type gimptool-2.99 &>/dev/null; then
+			plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
+		else
+			die "Can't find GIMP plugin directory."
+		fi
+		dodir "${plugindir#${EPREFIX}}"
+		dosym "${EPREFIX}"/usr/bin/xscanimage "${plugindir#${EPREFIX}}"/xscanimage
+	fi
+
+	einstalldocs
+}
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index 85105bdf6713..688824e44d3e 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,4 +1,6 @@
 DIST sxiv-24.tar.gz 47148 BLAKE2B 69d70d64ea6cf6ae7a044d06df78a2e1e53941ef281d6445f54a28c4368112674461bc4e71a0226946588e604de33dd0972960cb072a00efd64512e5273cef09 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b
+DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
 EBUILD sxiv-24.ebuild 1219 BLAKE2B da05f3f295ee8c8afb247ff3e31609ddf0b8c0fe8fb0db47f7e108b4253aa6565ff9dae5fe8b1c6875d5177705a2260fcf2be2a20e0d56374d31761537f30f65 SHA512 62ba4b36f941fc709a8e83a0be2bd581493041f1f93c21acd43753f8d7d368c9a6d6b8d9d3560dd78c9ebe0c4a15fc09cc48cb8a60fe77c4691b1663d0f8a370
-EBUILD sxiv-9999.ebuild 1221 BLAKE2B 6d8f507998cb308c26051e953e975380220aecca848a6bafa492a9853186986f8916ccfc43690085aec04904b3ab701b36cac6f1852f1d92186618f07339305a SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20
+EBUILD sxiv-25.ebuild 1241 BLAKE2B 4881e1503bf20cb06434fbb1cf4c540ecd2d724fb845c00eae2e349b96fc4440ed54359113f72a710a39564b7d4d2f015465b8754e1e6a6fb94abc1d6702e53f SHA512 1f8b2885556990c7de6b572cfc0f54d94d2fc804a73da9953d7f36511d73256c8318855ac32f578acb8bbb286eb0b70c411581a5cdaac2424239c866bab9d441
+EBUILD sxiv-9999.ebuild 1241 BLAKE2B 4881e1503bf20cb06434fbb1cf4c540ecd2d724fb845c00eae2e349b96fc4440ed54359113f72a710a39564b7d4d2f015465b8754e1e6a6fb94abc1d6702e53f SHA512 1f8b2885556990c7de6b572cfc0f54d94d2fc804a73da9953d7f36511d73256c8318855ac32f578acb8bbb286eb0b70c411581a5cdaac2424239c866bab9d441
 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
diff --git a/media-gfx/sxiv/sxiv-25.ebuild b/media-gfx/sxiv/sxiv-25.ebuild
new file mode 100644
index 000000000000..3b3917053a8f
--- /dev/null
+++ b/media-gfx/sxiv/sxiv-25.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop xdg-utils gnome2-utils savedconfig toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simple (or small or suckless) X Image Viewer"
+HOMEPAGE="https://github.com/muennich/sxiv/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="exif gif +jpeg +png"
+
+RDEPEND="
+	exif? ( media-libs/libexif )
+	gif? ( media-libs/giflib:0= )
+	media-libs/imlib2[X,gif?,jpeg?,png?]
+	x11-libs/libX11
+	x11-libs/libXft
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	restore_config config.h
+	default
+}
+
+src_compile() {
+	emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX=/usr install
+	emake -C icon DESTDIR="${ED}" PREFIX=/usr install
+	dodoc README.md
+	domenu sxiv.desktop
+
+	save_config config.h
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 778e21dde204..3b3917053a8f 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils xdg-utils gnome2-utils savedconfig toolchain-funcs
+inherit desktop xdg-utils gnome2-utils savedconfig toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
@@ -18,12 +18,12 @@ HOMEPAGE="https://github.com/muennich/sxiv/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="exif gif"
+IUSE="exif gif +jpeg +png"
 
 RDEPEND="
 	exif? ( media-libs/libexif )
 	gif? ( media-libs/giflib:0= )
-	media-libs/imlib2[X,gif?]
+	media-libs/imlib2[X,gif?,jpeg?,png?]
 	x11-libs/libX11
 	x11-libs/libXft
 "
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index affcbbc65408..78ebcef8676c 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -2,5 +2,5 @@ AUX xsane-0.999-lcms2.patch 11790 BLAKE2B 0fd549512d56635e9a41620ba097d4db8f103b
 DIST xsane-0.998-patches-2.tar.xz 54804 BLAKE2B d5eb339f5d5d9eb61d213ca37e31e8b36df03f271f86a0c5f924286b39c9d2f47416512243ff3ad07e2f9d0ac4e3f0a73346ced1ce74ac17dbb0c9aaf6ae3c89 SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f
 DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
 DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5
-EBUILD xsane-0.999-r2.ebuild 2269 BLAKE2B 13276b55cbfa545cacfd1c30bd8e3a10ce803be95e87c6664c8fe87415ab306bb418c890f4e3e1591a1c0a8f3a540316e85dbdfe60980a46c2155916b237a246 SHA512 b814129dc647509ab35c300d9794aec66589c6b9f986319d3fbc16812b70368f722b10a97f85b795db30eb41d4530ec847856936b88895ce906053d244500ad1
+EBUILD xsane-0.999-r2.ebuild 2208 BLAKE2B 663433e738fdb5445010cf840c6867ca4dced99206f65ad02af5764333a5dbcbe6ee2936554ab36aff166bf7593bf037f96068be60bcaea7d8dee5ab200d4998 SHA512 c0ac54f725188f25d0f6792a15c89084ccc252843f2a83c59e05eacbbe47a215022ce3e5bc3ca78b5b57873307f01592b4cced510c387e6001122d64a8592ed9
 MISC metadata.xml 500 BLAKE2B 9eec3d7fa81661bc2035035649e602539db5c45451576a452562a9980811424e93999d34cdb64a0eb8fabf7c4408bc47d402654abb53d26b0e4779c8c501b318 SHA512 1f304a2fd92fe512a70e104c02fb72c9518e4f9e6eed795aa6462eb06a26f314673b9964b8c576a07f11e64eea0031ad607070bc1c167d5058d5ef34f867e383
diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild b/media-gfx/xsane/xsane-0.999-r2.ebuild
index 65a365cff251..c45649a3a835 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -76,10 +76,9 @@ src_install() {
 	# link xsane so it is seen as a plugin in gimp
 	if use gimp; then
 		local plugindir
-		if [ -x "${EPREFIX}"/usr/bin/gimptool ]; then
-			plugindir="$(gimptool --gimpplugindir)/plug-ins"
-		elif [ -x "${EPREFIX}"/usr/bin/gimptool-2.0 ]; then
-			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		local gimptool=$(ls "${EPREFIX}"/usr/bin/gimptool* | head -n1)
+		if [ -n "${gimptool}" ]; then
+			plugindir="$(${gimptool} --gimpplugindir)/plug-ins"
 		else
 			die "Can't find GIMP plugin directory."
 		fi
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 3dd415d5b0ef..997f770a039a 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -9,5 +9,5 @@ DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa86
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
 EBUILD xv-3.10a-r17.ebuild 2598 BLAKE2B 035bf28413f30b3a615f59d3266c59b4e9833f8d26ec84b2351e0a9ec3a1da90dcf12f2ae3e8afae1d79369bb5258fb6532ef76dca72c0c0539f4e981f4aef61 SHA512 6f56e5bc72b1912a8901355ed6847bbaea44bc4c11f05e5537e1921bb1b177537604116683e2f80d523675d778ca182fb474eb2070ee3c9d002ea621b467dd24
-EBUILD xv-3.10a-r19.ebuild 2451 BLAKE2B e381a13d824fc74a19f93f676e7375ed7ece8cb82aff2fd76780eb1f7880a58f501ccdaf99e2d8901eb3091531c7572dc573149fbfbd431b1473f1e12ee1dcd9 SHA512 5f76112e4c9b8f06c22ca4919a0cc0e63f4c6b47b427edc9af166968040e3d7ccc84523c04b153213785bd466e050820fece2597814d9b5d2434fb28747f054e
+EBUILD xv-3.10a-r19.ebuild 2445 BLAKE2B 1a0f47df51caa4ae24cd2ea802783a4d7801b9354fca6bb956fae26a32fd655b7f10272f226b759771e9250e72f022873e3b0d9fac9ba32464084c30c16166df SHA512 4b95123a458431e73b62dcd8c38cfeb8151e4922a3736e7d808905f5a089dee9dbf3a3d5c6e70657ca53007c9dfc0645891ce90144f8c56ca04187fff976e2d3
 MISC metadata.xml 249 BLAKE2B a10cceeac3a30f80ec870c8976e45bd2e0326e472b03cdfbe85b639f95dc7cdc8f372e5efafa5c9c8e679e77a24d5507f3a8f0dc97f2207252e280b3bb936662 SHA512 2250a3bff9eebe0962c70d89aed4f7e95dd3d33b5c3171f02bcf99d972d5242ec04b25d73b3ffd99ce96a641cf8eb78befb41941a352f4ff754702712b4e937d
diff --git a/media-gfx/xv/xv-3.10a-r19.ebuild b/media-gfx/xv/xv-3.10a-r19.ebuild
index 9adb4d4493f1..1b06f5a96590 100644
--- a/media-gfx/xv/xv-3.10a-r19.ebuild
+++ b/media-gfx/xv/xv-3.10a-r19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="x11-libs/libXt
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 6fd205fa64d8..ad74f040f13b 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,6 +1,4 @@
 AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
-AUX zbar-0.10-python-crash.patch 604 BLAKE2B 463f23b6338455b0029fce845fcbb02168c86b9ddc116f34f15668459d8ac86d77dabe388cd61af9182c02be37475363ff832d7c8c705d29bf1829f7ccb167b3 SHA512 56e1848466b2178fb25a1f88f1a35113c01d370927b5778af96f1b96bcdaa8349308ac7ef14fb247bc5ec4165b2f7daa717159f3f7786ced9c043428afd641ba
-AUX zbar-0.10-v4l2-uvcvideo.patch 1487 BLAKE2B 61486465183a50ee0e515d6232923c63819e707d4a429a653f94ea6b7f404e8a5ab54602e074df0fab3f0188c50e8f4fc12a6ac5a63509484d7cd24925bb1957 SHA512 6a53eb54ed3ad83cacb9a09d0b119550d364e586990725f0a423a180fab790e18c2c6d8201d185a51bd26ea3955018416b2993fbdb5e5a555e13183b3bce7b1a
 AUX zbar-0.10_p20121015-ImageMagick-7.patch 1135 BLAKE2B 103cfe85d547cd3087a08676abdfd5966b9b4dd32de4c35e1aee144247af8562e6425d65d170fcb98bcb43e0bc18dcd39d4cf3baf46eea4a1c81814a14946bb0 SHA512 c67dee821338d0bbb54b3c4b22a75616e876ad56e5bbcaad856fe16b39ef3e07b7b80dcb6c25023857ebd561c55ac4faab144fa4ead05424df24d5af7c2509dc
 DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
 EBUILD zbar-0.20.1-r1.ebuild 3725 BLAKE2B afedede5b3120e473e3d72d15f386a4931d318c096d338f070b65d7dbf9f722d6d292b5759b5a7d9f13e040ff7f54ff444e9c1d3603f0aa23333b770ab18fdd1 SHA512 182b93701cc615df4db4aa83e8ff8fe38ecafb2aa376ae69d3ee89f9fd86e0036e6f2bc8ce20c2ef9c52808bf815831b4e7ae3a7b8608c093fe92ce61dd4b4e4
diff --git a/media-gfx/zbar/files/zbar-0.10-python-crash.patch b/media-gfx/zbar/files/zbar-0.10-python-crash.patch
deleted file mode 100644
index a6f7a96e34db..000000000000
--- a/media-gfx/zbar/files/zbar-0.10-python-crash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://sourceforge.net/p/zbar/patches/37/
-
-fix from Debian for crashes when importing the python module.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702499
-
-this doesn't happen on some arches as the data naturally ends up with zero
-data after the structure, but on some (like arm), it isn't so we crash when
-python walks the list.
-
---- a/python/imagescanner.c
-+++ b/python/imagescanner.c
-@@ -68,6 +68,7 @@ imagescanner_get_results (zbarImageScanner *self,
- 
- static PyGetSetDef imagescanner_getset[] = {
-     { "results", (getter)imagescanner_get_results, },
-+    { NULL },
- };
- 
- static PyObject*
diff --git a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
deleted file mode 100644
index 4fde95e2b563..000000000000
--- a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- zbar-0.10/zbar/video/v4l2.c	2009-10-23 18:16:44.000000000 +0000
-+++ zbar-0.10/zbar/video/v4l2.c	2015-03-07 05:46:36.000000000 +0000
-@@ -241,6 +241,21 @@
-     return(0);
- }
- 
-+static int v4l2_request_buffers (zbar_video_t *vdo)
-+{
-+    struct v4l2_requestbuffers rb;
-+    memset(&rb, 0, sizeof(rb));
-+    rb.count = vdo->num_images;
-+    rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+    rb.memory = V4L2_MEMORY_USERPTR;
-+    if(ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-+        return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+                           "requesting video frame buffers (VIDIOC_REQBUFS)"));
-+    if(rb.count) 
-+        vdo->num_images = rb.count;
-+    return(0);
-+}
-+
- static int v4l2_set_format (zbar_video_t *vdo,
-                             uint32_t fmt)
- {
-@@ -308,6 +323,8 @@
-         return(-1);
-     if(vdo->iomode == VIDEO_MMAP)
-         return(v4l2_mmap_buffers(vdo));
-+    if(vdo->iomode == VIDEO_USERPTR)
-+        return(v4l2_request_buffers(vdo));
-     return(0);
- }
- 
-@@ -337,8 +354,13 @@
-     else {
-         if(!vdo->iomode)
-             vdo->iomode = VIDEO_USERPTR;
--        if(rb.count)
--            vdo->num_images = rb.count;
-+        /* releasing buffers 
-+         * lest the driver may later refuse to change format
-+         */
-+        rb.count = 0;
-+        if (ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-+            zprintf(0, "WARNING: releasing video buffers failed: error %d\n",
-+                errno);
-     }
-     return(0);
- }
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
commit	6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree	cee0a97398040001220ece3cd48c3d568bcddb4a /media-gfx
parent	1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)