gentoo resync 31.01.2019

21 files changed, 17 insertions, 236 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 474758874097..7164bb37e34e 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 4976f3a8c6fe..ed172c4d3d7a 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -5,5 +5,5 @@ DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
 EBUILD dcraw-9.27.0.ebuild 2961 BLAKE2B 7b8e95853e118b6262bb7996745c6ce375c6e7f56b6d5b957073966c3558b85a2ccf276dcff83b45df8232791b95ba41a2e3b946d25e0931215cf89d97532ace SHA512 30abf4256100ead2e7ca525cf365fb18e5d46afa6fe3bc0012f272ed3bc715349602d05a8b26d44c401138517848fa2a1796094efaff9df8244fd715d9a5f5c2
-EBUILD dcraw-9.28.0.ebuild 2964 BLAKE2B a538ea284ef09c2d544fc87281cf2ea2f76ff16fe9d99877830f805f54f43ae302b2b4b552c7313851fc5074c11c31fcf6d4e8e2baead14b38bfb97abafb4a35 SHA512 af6eeb8898d9c35472d382139816aa4a62afaad0ceb62d4ae70a7933701631d5026af8f381b69d09136e92c8ad2c28d41c9672e43cd6594f254fda2c2e4df653
+EBUILD dcraw-9.28.0.ebuild 2963 BLAKE2B 7ba95ebd63edcf718d263183ec26860ee7e7a2d9a835a01028a5b7cc29ee6ca8a9af3f2c0f411eebcf88c168a2891b87cedcbd7517ff415cb674f1121f2c7194 SHA512 f2082082748c6006cf81fd7888d9ed0a9b9373aaf1855ae8f699d7c51eb79cde748b3a702792f0bcd0a40b6c8eb4e8c0e8e838847c70a6841997b01d40a844e4
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.28.0.ebuild b/media-gfx/dcraw/dcraw-9.28.0.ebuild
index cbd814dae666..78f643559b3c 100644
--- a/media-gfx/dcraw/dcraw-9.28.0.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
 IUSE="nls gimp jpeg jpeg2k lcms"
 
diff --git a/media-gfx/mkgallery/Manifest b/media-gfx/mkgallery/Manifest
index 3ea42f6cc482..6d2ab8fae8a2 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 512 BLAKE2B 2ac706c6420d4fffadd0d150342b1cfeec1216ad730212eeb8ceb16861647e19c63862e6b8eb46c2e8ab51d2aa12879de0be2236ce7120b00063dde50e106387 SHA512 24a12dec85a61730c93cc93febb87e1dca2b62412c00ab6e7e7e180de74ed879681f292f7bcca27f676e462bda197636d4c3cc3ad15d52bad8cdba6d767d4068
+EBUILD mkgallery-1.1-r1.ebuild 511 BLAKE2B 8d4610fa40b9bd30c9bf13a78819dab355fb07d1f5df23fc3985c5e1734f1ee5a1ce0fabb10f44c955b48fc9896e31146aa0be8d072592b1478fce016152ef96 SHA512 24e19a2b32a691851bff5babd4ea57f8a3fe0a4a8ce84f7d1530038994f32e1a7083e213f9abd14df8ef35a72ad5dde0a3b4db0d19ac409970a8652a06c5c94c
 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 3795844f753b..11a3d4b39d3f 100644
--- a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
+++ b/media-gfx/mkgallery/mkgallery-1.1-r1.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
@@ -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/openscad/Manifest b/media-gfx/openscad/Manifest
index 6a47cd0d80ed..7dfcf9e72d4f 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,8 +1,6 @@
 AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e
 AUX openscad-2015.03_p2_uic_tr_fix.patch 345 BLAKE2B 46f19ba25f9a19b2b6841493877d14a0c6c3c8dcf7d8e5ec65d4d0d8fc5c79b15467b71dd29bfeb38decd4f100d06e9fe185c1670f336672998ef02e9e59794c SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2
-DIST openscad-2015.03-2.src.tar.gz 13307974 BLAKE2B f3532d77db15250abba444949cbaee012bef02410b6c66cf2abfb6aa2a174f6438c2469b8db9ee043d5d77799ccb1f82c608015df14924670d843a6807eb7fe2 SHA512 66e93715987a5211ce15c10ea39a9fec3296b606ace0aba1cda019635d5b26021457c8e49f389daa90a0da02e41007eab662e1ed6608cb51c24de00253b9783f
 DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee
-EBUILD openscad-2015.03_p2-r3.ebuild 1572 BLAKE2B 747dcdacc2a08772b1d64d2908978fe16a6a04496e7ad2d053d622c733835f0055edbae1d3a400a0a3293168ee5935b7ab17b4379ee80531df0654ea49559833 SHA512 c7cbef11976633ccad4f0f947a07fffb1a7974220f46af1a2bb81ca577236126ce14d642bff0d5a182cb2c5519bbe669fcbe4806678294795cc0afe71aeca589
 EBUILD openscad-2015.03_p3.ebuild 1584 BLAKE2B b283c7b93ac0797ec7a7884047568e07773c6714ca0ea787ad8c4003fe85cfc7219bcca0dbcb1149063580109d2e6c419ce4a9a6f2ef0cbbb8a87d33907637e5 SHA512 e5ce533fce3fe8bdcdcd86b62a7aa77073a2acf572f1c386e4fded6d023bc3571757f8513c1ab538d59f70ee1e3a11c63b951e93224abbfd2baf09dec7430419
 EBUILD openscad-9999.ebuild 1463 BLAKE2B afe4a5aa2b53e6667626605fe869a76318d9f74933cb0e1f6f8e1ad7d7e17e42bdd93cb306689fac49622fb8f62659911512cacc762406e488068fd738ec3a97 SHA512 04900830eef04f18fcb64ad35a7e60ef00247acfcdfbe63f3a685ddd39bc699198f4addf2a47141018c5c4cf551f01f60d7b3ee48088f9aaf9cbe4ae216d987b
 MISC metadata.xml 754 BLAKE2B d8247b4210f8e5470a0e2bbbb21c4b0755b7aa0beac0f75845bdda5135eb86a9214888cca436a02b7e566520865aae7714a9942bb5871c8e8fd54240b933abb4 SHA512 23905b2fb9ff937bdaee469086c9eefc3404de22e72be73f470ee51b9d078da20c856918d320c7156221708c11855a7e12ff6f277f4d5cfad671dcb4d9911c40
diff --git a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
deleted file mode 100644
index 815a2c46da75..000000000000
--- a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common qmake-utils xdg-utils
-
-MY_PV="2015.03-2"
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-DEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtopengl:5
-	media-gfx/opencsg
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=media-libs/glew-2.0.0:*
-	media-libs/harfbuzz
-	sci-mathematics/cgal:=
-	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
-	emacs? ( virtual/emacs )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}_uic_tr_fix.patch" )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5 "${PN}.pro"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/recoverjpeg/Manifest b/media-gfx/recoverjpeg/Manifest
index 7c4224c17569..a170126cf245 100644
--- a/media-gfx/recoverjpeg/Manifest
+++ b/media-gfx/recoverjpeg/Manifest
@@ -1,11 +1,3 @@
-DIST recoverjpeg-2.0.tar.gz 83762 BLAKE2B f854c2c82179551fcd96a17c89e110bd32adaa2af728f74ee164344e146d094f7b773bbec586a553ca83a93b032dc4ffa60095f384862ae9ac668f138db798fc SHA512 c736a95011ea124eb4792c7d182b1da43b675323fbdeed06d15abc2586bd4010204bdf4529a8bc2c5f2d95c33a7963b8a6115c33f5e65495290ddb69ec4b600c
-DIST recoverjpeg-2.1.1.tar.gz 87445 BLAKE2B 2d8b317b819556a177342096dfc1c07b8980d09340aca3dbe968e00b3549c011bba3600311ba34cb1d40e6f82b06e3ce3261b3341e90a2ec673a6fd8dba57dc1 SHA512 aca4a9cf5403db8c56f357c5f6f12b17e5be428e4846af65add19bfacc990e3e2e2afc27cfaac1635cf4edb9289ab8353a239d32053c570bb8976992d30e721f
-DIST recoverjpeg-2.2.1.tar.gz 88391 BLAKE2B 587350bbe74122b9e08130579cfcc65829c3a1ff958e43945f86494d0a16a62683692983981997b6cee75cc5132fe510ed6d8b46fd577aa09fda533d5b156de1 SHA512 1308542c25cccb0daefa9248f7a41451f59374e33c3ad4a82ad2195aafb66548b98bbc57c56436902a6c5732a5b20f69658567378f0a211a61f258cd62d699b1
-DIST recoverjpeg-2.2.2.tar.gz 91440 BLAKE2B 16a84d7bc43ac63e8633f6ed08504861906add7e734af5f6eb289ba175dea33f64eb5c10a14a0080bb0d4b03c249742abd690bd87089d1a13f828b6b2c002aa4 SHA512 fc609aa47a96b44e10aef4137b92f7b8e99d9f40ab559870225042acd85a97bc745a494cabb29fe21b3b374243c4589eeae8da7ec09a3bacbf9462762782ffc6
 DIST recoverjpeg-2.2.3.tar.gz 91672 BLAKE2B bb324b7810b5aa3103ad0a9a67df9f855ea1a479b9b9651cb4b7d1a4c511a87e8fd891664d76049b450b5077355fb718489904d3d7daaca3865a451b41980f4f SHA512 67f923193c9b012302ad4e374141803992bfa4e4ac4c2384c8d44df29927c06a5224caefc936e30cef3fe1ca6dcf9f3544fc5171e4f76d17a83df974d0253c23
-EBUILD recoverjpeg-2.0-r2.ebuild 464 BLAKE2B 1518232bba21a32d0bd5cea332475c552682b54a8e35b632e84a297b2eb2cf9a4b41060138f06b87129e9eddaac763c759dbbbe456b39381fa9e4ae45a956760 SHA512 996544863a00c0f747d548f021cd8225383e92d788ac29c92f4f4903393cc3902020a9ec3a7dc29faedaa22e5c322984b6c05e71bd6fa46dbe3fd892679228aa
-EBUILD recoverjpeg-2.1.1-r1.ebuild 469 BLAKE2B d5ef888436ad280508b95fad54220f5982aba84f9cd41fe0ad221227422f2394b4fd11586563a023367b55eade5d09dba5972e279880a20baa5d8334f1174ffc SHA512 ccebb94370c5c9ed496ccf7eba0f6e992d11d5c2d680517fa5f5273be0e6b2a827b51b7495bc24ba229f8fe1881c2cf0a097cfa3e40aee876a1b35e532d51d5a
-EBUILD recoverjpeg-2.2.1-r1.ebuild 467 BLAKE2B 4fbad01e2a807f0c1cc25f65e5f889d3c159d655490c78c339d7d6a3b21f11a999a12c35009e0e039562eed1a4e83b1747da74cb128dac19fa94f339a4bff4fa SHA512 25003f0d99a2ae64b2f4103d4e77bc33fb4ddbc4614549ae6f5f2f8d26bd35253c746c699ce5b12667c1502f8720fcc3cc5c58ed8b71a1b7ff8aa4b8dc7142b3
-EBUILD recoverjpeg-2.2.2-r1.ebuild 469 BLAKE2B d5ef888436ad280508b95fad54220f5982aba84f9cd41fe0ad221227422f2394b4fd11586563a023367b55eade5d09dba5972e279880a20baa5d8334f1174ffc SHA512 ccebb94370c5c9ed496ccf7eba0f6e992d11d5c2d680517fa5f5273be0e6b2a827b51b7495bc24ba229f8fe1881c2cf0a097cfa3e40aee876a1b35e532d51d5a
 EBUILD recoverjpeg-2.2.3-r1.ebuild 467 BLAKE2B 4fbad01e2a807f0c1cc25f65e5f889d3c159d655490c78c339d7d6a3b21f11a999a12c35009e0e039562eed1a4e83b1747da74cb128dac19fa94f339a4bff4fa SHA512 25003f0d99a2ae64b2f4103d4e77bc33fb4ddbc4614549ae6f5f2f8d26bd35253c746c699ce5b12667c1502f8720fcc3cc5c58ed8b71a1b7ff8aa4b8dc7142b3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/recoverjpeg/recoverjpeg-2.0-r2.ebuild b/media-gfx/recoverjpeg/recoverjpeg-2.0-r2.ebuild
deleted file mode 100644
index 0d7e2b17aa45..000000000000
--- a/media-gfx/recoverjpeg/recoverjpeg-2.0-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
-HOMEPAGE="http://www.rfc1149.net/devel/recoverjpeg.html"
-SRC_URI="http://www.rfc1149.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-gfx/exif
-	virtual/imagemagick-tools"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
diff --git a/media-gfx/recoverjpeg/recoverjpeg-2.1.1-r1.ebuild b/media-gfx/recoverjpeg/recoverjpeg-2.1.1-r1.ebuild
deleted file mode 100644
index 1cefa1795ef4..000000000000
--- a/media-gfx/recoverjpeg/recoverjpeg-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
-HOMEPAGE="http://www.rfc1149.net/devel/recoverjpeg.html"
-SRC_URI="http://www.rfc1149.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-gfx/exif
-	virtual/imagemagick-tools"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog )
diff --git a/media-gfx/recoverjpeg/recoverjpeg-2.2.1-r1.ebuild b/media-gfx/recoverjpeg/recoverjpeg-2.2.1-r1.ebuild
deleted file mode 100644
index 2ecd6e8acb5c..000000000000
--- a/media-gfx/recoverjpeg/recoverjpeg-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
-HOMEPAGE="http://www.rfc1149.net/devel/recoverjpeg.html"
-SRC_URI="http://www.rfc1149.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-gfx/exif
-	virtual/imagemagick-tools"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog )
diff --git a/media-gfx/recoverjpeg/recoverjpeg-2.2.2-r1.ebuild b/media-gfx/recoverjpeg/recoverjpeg-2.2.2-r1.ebuild
deleted file mode 100644
index 1cefa1795ef4..000000000000
--- a/media-gfx/recoverjpeg/recoverjpeg-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
-HOMEPAGE="http://www.rfc1149.net/devel/recoverjpeg.html"
-SRC_URI="http://www.rfc1149.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-gfx/exif
-	virtual/imagemagick-tools"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog )
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index ce26a44de0d9..8ef1455ac893 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 8140 BLAKE2B 8637061b459d53e5ea2c46815ffa2ded960825a2b134e52da6063eb8869a577c9fd4b5dfd6d9e000d4a9978ed2d148dfe755355f1eb10d247ce21d54d1ad50cf SHA512 507035bcab7598e62fba58c2323c9ed61c773a3af4b080fe2a9f65db5a89711027ce9881b0f38c8e903e1d577af57b4d9759f9e6007b6f7687e94cb06dcdb5de
+EBUILD sane-backends-1.0.27-r2.ebuild 8136 BLAKE2B 7f5569990041d9a169e4fd3f2f75c8664e7f6689db297d40dcd2c9d6d4bc68c9f458310d388e2ed8c89792d8e0b0df3f92a2e19315ba96bb4930cb032cc04a4e SHA512 5b58ad63b8dd093a2a5e68a72f1afbb3e8691de2c050f96a660efeb9e84cc3e64bc9e8b6998798f409e67ad51c0dc40e2dcf6fb011592bf4d6d6360c4882b3ed
 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 4ce3733007d1..d6fd1790ccab 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
@@ -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
@@ -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/scrot/Manifest b/media-gfx/scrot/Manifest
index c46e98dbefdf..e543b9d11425 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -3,6 +3,6 @@ DIST scrot-0.8.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d
 DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
 DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
 EBUILD scrot-0.8-r1.ebuild 662 BLAKE2B b4b30806cfb63597a748b4924687259224dd09c0d2eb8a698786681595ec0124434621cf11de7d16b0c8a25188a6bdf230d9117f76bb6a5da4965e21652f379f SHA512 edd9a48e946ea4e3cbaedf277c1d80f9bd8c5a727da72ce1e6167fe1d23bbe9103b804197e4e46ef0a47500c54221d2299bae5abfd709eb5deeceae6ba10c66a
-EBUILD scrot-0.8_p13-r1.ebuild 1002 BLAKE2B 6043785eb7f737503e59c6835f054600e357374cd1b73e33d009dddbc4fa6996a37cf28ecdd735b21330a7fad42740142aaf0636a941b3ae59f0cf2bc4db8ffc SHA512 dd5bbb9672729f53fee54b7d2fde70d0c15f8459f27df3dd47c3d612f876c9bf96f240798501afc3563577da4ffe57c9d20fc17ce100c74f109f8172252dad6f
+EBUILD scrot-0.8_p13-r1.ebuild 1000 BLAKE2B a0c67967afffa40e9b16768dbf78090899ed5304fa2f4d8103c52898179d1816eb1b483792776e0c9b657c34a9e5d876df1ba98bb65c4aeb961617da8e7315c8 SHA512 2155cf6a25f10636fb11053434b1256d29040e891590fcdbc8e1119fb451a3ed9e7966f2b57be46ba865156e74737b7e36b5213d23b427c88a3cda971b5e0578
 EBUILD scrot-0.8_p13.ebuild 909 BLAKE2B b7848136b4b9c6bebc4ca18f6d562dbf0e2bdd164a92aeb60adee4b75352e08977dc9ca2938fc235b06761e7057f72f3de4e03547bd738f1f757b1703b31ffeb SHA512 98b9ef9f2a381fb4f33a87d51b0115ea38edea097bba1a5c71f96be1da04e6182e3e2586deee1e64962d2ed14ef2ec57458a1ffd842952cb8981bab8122224fa
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
index 46e7b729c2cc..f3270d6118dc 100644
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -31,7 +31,7 @@ src_prepare() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	rm -r "${D}"/usr/doc || die
+	rm -r "${ED}"/usr/doc || die
 	dodoc AUTHORS ChangeLog
 
 	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
diff --git a/media-gfx/videorbits/Manifest b/media-gfx/videorbits/Manifest
index fb2176fbdc3e..0cb873b92fac 100644
--- a/media-gfx/videorbits/Manifest
+++ b/media-gfx/videorbits/Manifest
@@ -2,8 +2,6 @@ AUX videorbits-2.201-libpng15.patch 826 BLAKE2B e3051587a3198b2d3df970e01b4a38ec
 AUX videorbits-2.205-fix-buildsystem.patch 635 BLAKE2B 89499ec57ce08722b0e8fcaa0bfc37cabf11627fe867e905b0cb329323453052cbe92ccd00f06d26beef11a134d5430163ac158b40fb398bdf448087f9709b6f SHA512 46462bdf437424f3af86526c1f2dfef68884f504646357ff3e5779f4629fdf22742a26e2dcf9df9b03a20da8125e87cb3b4772600d7590428d6d0a31f711ae9a
 AUX videorbits-2.205-qa-implicit-declarations.patch 712 BLAKE2B 5b24e38dc2951659f2c45ad50e853796d91338e59b1c55e6ffc396c4d3c221e80a559dc0aceb999a3e594ca9b61beeffcd0177d98c5daa6758582af2a25e314a SHA512 cfcab0079719ca2595b83e65ded05b8154a139304c23184823f0c957bb06af09465d486f8763a83baf8cc298b16f9e3b0b53f6218977972555bf2142ab3e43f8
 AUX videorbits-2.205-remove-bits-nan.patch 969 BLAKE2B bae9ba484c80c25c5eeb6e2bd1f9de5a49e3f5cf552e74bd9953985cbea5bff6002bd34c90cae057cd8a41272232760310f510418c0fef5c1ae9fbe3a93b1fb5 SHA512 cca1aa22cab689537248b9c0026acbf33114b359c1ab7b66cf23ac6f038dfb7653c48229b0b581552b23ced35ccdeae00b3676059745775aeac91ee7f5fe8d7e
-DIST videorbits-2.201.tgz 648187 BLAKE2B c279c6bb045412d3a2fbecc7a0955694b761c929ea3f0c73b6e64b1ff9a14e69a168b37eadeb8f99e6e1a2daf4863be87a268b74a619f16efaaeacc4e708ebb3 SHA512 eeb233487ac33702ff58f9434ff1850aac5ede9ecfebe4b1d313f07451c1cbb911ba6adca013136639bc0d01480acd71e5cffddcbf48af5aef58d40f48d6655a
 DIST videorbits-2.205.tgz 672377 BLAKE2B e111d48c3a7e8c3fc1bf878249a07c799879fa3c68e8555c539fd4089800fd7695f1758188295f65aa62fababfc6cc3c534abae384eb820f80bb1bbe0eb4b92d SHA512 faad5a7ab98167d67b7748b4b9aca1ced0e802ed85cba55ba9966d08c48045daa8fef8d387c576dcfa50ace8c4962bb0043bb83e3ba741844ede67d331e4fbf8
-EBUILD videorbits-2.201.ebuild 839 BLAKE2B 0723c77e35508dd0fb030c4b082fced02ade44190c57428870da4788c78da86b030bdfbdc0fba7c7298bb6385540d971a3a12b6e6b9c6fc26abbc9395b9ffa2b SHA512 03e5513d9354c81464e54f3718653bd5e726d507b0eed2089e4ee7f8f57e239a6804f48167fb756ad11a606370b83d0cfb552e2b4caaa18ef740a230004443a5
-EBUILD videorbits-2.205.ebuild 810 BLAKE2B cfc2af76fea850ff5aaeeae9b75ff3df34708bfebc17b10534e62039b0bdc303b94f5bdf2b590838fa9bed3c8a4446839f2ed612989a754ba421b471b215a043 SHA512 ec9919b1745701dcb0f0a265bd394fa0a50eadff84d6a16b5d1ff795937085866e4233dd8915c609aa82117fa8faf84b6faa3dbf59752211d7b5f0a975caff6f
+EBUILD videorbits-2.205.ebuild 806 BLAKE2B fbd4d3fa5da3be4bc15684e792b9a951c7ddbab5db83ada4c7be8c35438248f221934cb415f23863aaea2408a65f8a348fd612eb214347a89fdeea69d0042883 SHA512 2c92add8732840b7de77f6341a83d14b060ff09cde893070c43b212419d4653edaad6e9a9ea970713fad4d75de235bd12b2c7f85d19dce50603085aa56064323
 MISC metadata.xml 250 BLAKE2B 50ea93eb13d7a17cbaaa68accbae08e643330655c4af46a99440edbec4d7ef50111c45d91dfa2490de8cc9c77fb8be16e9f4b285f67c91522cbee316db6a860d SHA512 c18112cc613181bf7e1d339de4f2283d8d4f1c8a6492025a9c0e4c54dedeeed696713e844edd437eb1bd3e9659e4eb33cc49132450ff3ec7efa109a0238b3596
diff --git a/media-gfx/videorbits/videorbits-2.201.ebuild b/media-gfx/videorbits/videorbits-2.201.ebuild
deleted file mode 100644
index db5db4dd3924..000000000000
--- a/media-gfx/videorbits/videorbits-2.201.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a collection of programs for creating high dynamic range images"
-HOMEPAGE="http://comparametric.sourceforge.net/"
-SRC_URI="mirror://sourceforge/comparametric/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	sys-libs/zlib
-	media-libs/libpng
-	virtual/jpeg"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README README.MORE )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-
-	sed -i \
-		-e "s:\$(prefix)/images:\$(prefix)/share/${PN}/images:" \
-		images/Makefile.in || die
-
-	sed -i \
-		-e "s:\$(prefix)/lookuptables:\$(prefix)/share/${PN}/lookuptables:" \
-		lookuptables/Makefile.in || die
-}
-
-src_configure() {
-	tc-export CC
-	econf
-}
diff --git a/media-gfx/videorbits/videorbits-2.205.ebuild b/media-gfx/videorbits/videorbits-2.205.ebuild
index 0f066360aafc..6628294ba749 100644
--- a/media-gfx/videorbits/videorbits-2.205.ebuild
+++ b/media-gfx/videorbits/videorbits-2.205.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="mirror://sourceforge/comparametric/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index a773f9bf08d9..3dd415d5b0ef 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 2455 BLAKE2B 121aad34e034f9ea8a2366f5179b24e5378f963ec8401e48a8fd64719ba9fc74a0c94f2f0089d0cafca501e3bf6b9194ebe3199865c9a29b516b0800a0b0dc80 SHA512 580e634dc26b86c8b5ad6cc8076d9ef3d76777b1725a37dd46c0fa1ff8e5528ed5d5a81cf8474549263e77c657726330805cf963a98367af5c2cef7860df587c
+EBUILD xv-3.10a-r19.ebuild 2451 BLAKE2B e381a13d824fc74a19f93f676e7375ed7ece8cb82aff2fd76780eb1f7880a58f501ccdaf99e2d8901eb3091531c7572dc573149fbfbd431b1473f1e12ee1dcd9 SHA512 5f76112e4c9b8f06c22ca4919a0cc0e63f4c6b47b427edc9af166968040e3d7ccc84523c04b153213785bd466e050820fece2597814d9b5d2434fb28747f054e
 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 1b021ad5df62..9adb4d4493f1 100644
--- a/media-gfx/xv/xv-3.10a-r19.ebuild
+++ b/media-gfx/xv/xv-3.10a-r19.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
@@ -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