gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /media-gfx
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
97 files changed, 326 insertions, 944 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index e3d7080d5d72..874b973e5a18 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/comix/Manifest b/media-gfx/comix/Manifest
index f418b4693869..9bfac7db4bd3 100644
--- a/media-gfx/comix/Manifest
+++ b/media-gfx/comix/Manifest
@@ -1,4 +1,4 @@
 AUX comix-4.0.4-pillow.patch 3658 BLAKE2B f8cbcb64737654dbbe1e4974680cca163b5788a42121e03691fd41bf564ac1c0d6e1d7ca2ef970b69d51c4e704ae37af1a0a57e65f49d5eaa6f41284a07f49ad SHA512 41a37c7f095b1a10182501f0ddd035d97e0b9b150fc5d34871241c5a512c808e5b59ebf1f340b8c41432f0fd8746de9cdc39e7022a54b2f3194a916afadf1e00
 DIST comix-4.0.4.tar.gz 481687 BLAKE2B adf73f63d260fa4171f4e85fe74e25e52253ea4c78eb3d2be8d9319ddeef537899415a582b8f33db76a8e30acf77c2d5bd1fc5b931302040d967bdd39b45e9ff SHA512 9cbc5b1cc100ee50b48b794ce9a7f08130fc7a79376533f0f55904be0e2e8cfe5f8b1deeff2f76e7038a3f81b0f709ce5eea88a709199e1584b73f5259df5f8e
-EBUILD comix-4.0.4-r1.ebuild 1849 BLAKE2B 120160870be13864b1c13595df5e7b9c34c985953e55f79e1c218b96f136e97058a654506262660e5548349cd2e562cd5827d216451bdbb0d762178bd0b817d5 SHA512 62709ffcfaeefe213c9a7be3bab29ec8e95e517d6807a19258a676b6010a1385a10584f86b012ca580ae15efd2941a068bb1d36ed7d4421d8cb8f7e4c3b153a4
+EBUILD comix-4.0.4-r1.ebuild 1839 BLAKE2B 40d8b1a3ec99a7d0157c2296bde6c6213452c7b81812ad2c7cc7baad10fb9656e225367f18af64d566b7f7d228b8e052877d55e31dd4216121134130dd249733 SHA512 f9809c0348b1d14ac07416e6f35969e82933997afc22cc9ce2f40cd27d469fcaaa091603cb3b85a5bf46cb0313097c702fab8028654da2f00ae8f2a579bb508a
 MISC metadata.xml 422 BLAKE2B 82b5a9d0e1e0e159549c4f88a3cd00635c93c972adbb6e2f784f2fbd9bf91d2aedb27264066051e73dcd953099e122b2e4d6dbb2a4f52ee6bee2f988843f6c8d SHA512 8a382830d5c7629ee140934a03d9b5b6f4759deae2a1114d16b70634316ff46aa6ceb823a5acca95de7974c25563f8b6e324f32128f61c6fbdb12eb180ec7b6b
diff --git a/media-gfx/comix/comix-4.0.4-r1.ebuild b/media-gfx/comix/comix-4.0.4-r1.ebuild
index d54bfcb0ae85..b77704f10cf0 100644
--- a/media-gfx/comix/comix-4.0.4-r1.ebuild
+++ b/media-gfx/comix/comix-4.0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE="rar"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 4f62ea364325..365220ac0454 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,10 +1,8 @@
 AUX darktable-2.6.2-exiv2-0.27.patch 598 BLAKE2B 724290bb5c1344c0113abde04688009b3db10f530684f3f53e0fcc935a9ebef4b3680a36cb5d005e8826ea1512f0ec505b06e404d144006848601699d33d1416 SHA512 77fc92bf8d373552fc82de1927a1708b989caf0b080c8ef279692c0b9f2e95526a70d2bf4af5f62abb68ccb733af08237f9e143773cc8a75d72dfb6ba434df6c
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
-DIST darktable-2.6.1.tar.xz 3473300 BLAKE2B e2194d9d967872b3dbc5dd608b3aa946424ff8a20a00b8cd8e1e9dd7ad3146acd791d2a7f20652d4673fdaac7bec86e405e055bab664c41b601b5788f0f15e72 SHA512 0d92fa35629ca02ca7cbb2910966b3fad57e536c967fd05381ad02dc9645106e6baaf1a93c1c186618624850c876f23305704e41d7151150e3367e21c415a967
 DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
-EBUILD darktable-2.6.1.ebuild 3763 BLAKE2B df499fa003b19a7f98fac89c5ba73209dd0922e733d596e9ceff9d5ec7034777eee8e57cf6418af3d37afb628bc7ce3bc616617034477be54c62b4d36ec454b9 SHA512 8a9504b625666b88ab790a250a725907d068fccd66cb2e70d17b0b7a55824eb3512fa320b4009f6300af242b8533a0a766c8ad5f10b3cd89c28b7d1f5a4a32f5
-EBUILD darktable-2.6.2.ebuild 3905 BLAKE2B c39ab5dba83d8392d42217b2b4ba1a4a2a7207361247fd0dcef8d7feef73608b4ce6a9a0544046c51f80576bd0ea175b416cd54e35540c1816ec89310fc10a54 SHA512 fd6d86928b84d443ad3e087dac9b115787ad2efdfeac42c360f9727294b225ece9861e1b21ebf5d7e8aa5b05623f3dc6c3d3db79b012b1737f10b1ec86b436b6
+EBUILD darktable-2.6.2.ebuild 3903 BLAKE2B fa5ea98fddb97b15bccf9ac959881ccdddbad882220f038d4aad2ac4cd9c1acd63cd5e84329788bdbe9f37f2ab82542450dd7c2e12594124ce42162881bcb51d SHA512 56eaae54bce4f882053bfaa3d93008e274b6766aa1983d48a6ef8f159eac092866c90e7886adaa386e7a92d8dbef4bed643086ed8ea01ac8b5481b3666943660
 EBUILD darktable-9999.ebuild 3159 BLAKE2B 3baf702f5ac1c0bbab2797e3ff2fdf63477b5f0050d2f23fe1bbf8090021ba30c68a491f34dffc18b5034d5d24fe3cc0625bc52a87062605e9e9dcdda55c7af8 SHA512 e5baeaa66d89d7a05b584a8d3b7d035b4a3c8f143a2d51cc800f7b3769ab9d71f85f171d362cb20ac64f79d538f1ef5bf428e216733928695ba3e0a0d4b87e3c
 MISC metadata.xml 784 BLAKE2B 7e7f55f709fa5d7da777b272232cece75e55e2754701f759630afe0857f971341fa0d4b2b1a6c96391b3de2bd94966ccb0ed6e8fb17089de71f34418ed397cba SHA512 ae9a9f28be76a93c0b5c90892489c0e8397ea84f043fa03787e6ad774b8c79c834059fd5e55d6f46e63bd9a9411218585e99e59acef7e21493ff4543bb0210c4
diff --git a/media-gfx/darktable/darktable-2.6.1.ebuild b/media-gfx/darktable/darktable-2.6.1.ebuild
deleted file mode 100644
index 6a8e3830f4d0..000000000000
--- a/media-gfx/darktable/darktable-2.6.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg
-
-DOC_PV="2.6.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-LANGS=" ca de es fi fr hu ja nb nl pl pt-BR ru sl"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	dev-libs/pugixml:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/pango
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_WEBP=$(usex webp)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-	if use nls ; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "when updating from the currently stable 1.6 series,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
-	echo
-	ewarn "It will not be possible to downgrade!"
-}
diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
index c098e19ec258..45b7d5db3eff 100644
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ b/media-gfx/darktable/darktable-2.6.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LANGS=" ca cs de es fi fr hu ja nb nl pl pt-BR ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index d07a110b30be..2afd4571d0b3 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -6,5 +6,5 @@ AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b1
 DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
 DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
 EBUILD digikam-6.2.0.ebuild 4166 BLAKE2B 7dda2079c57b887ba01a6243c6f5d4506baa4eb285b218d05c2ee6de84f1d1014154a621bcfc4c4980ec1dd5d4d1c2d3d6c80a33187b1e52638e9c67fb041ac5 SHA512 ee99c9c55687aa28283179c92e6e9fc1e19027206fe0ff3a51541da23bb024297c1d03c9ab59039f481820856ae44de03f4958db26333f3a9f0976c3729d8ea0
-EBUILD digikam-6.3.0.ebuild 4127 BLAKE2B dd3aadddedca2bb93412994ff869c486b9653eedeea4faffc4dc970886b80448a0d487cc36173ea93a93e617aebfec39f012910a18885ef1f468093dfbb165e8 SHA512 58c0c44f993dd4ed6088ca6697c9f2a00ea7c33b75f6c80877308cc17d0a292305b9c423d7eae7e4896571097d3025602714c4e8379732f66949f9fb0264d2fe
+EBUILD digikam-6.3.0-r1.ebuild 4222 BLAKE2B 82d92ebfce1947d6b7950e8089a905861ad0eaae570eb8a4aec01ee60469dfdebe289285766448fbc40adec244d9f39ddc1351746829a0ad7f0c80a575383d07 SHA512 5e7b5357bb0815157a02cc039df8d06ac0cdb754c62ba3315a8fa96790f5764851d37ac397144c76846c32b55e628bd14c54c5842302df5946c8fc01dcf32130
 MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
diff --git a/media-gfx/digikam/digikam-6.3.0.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
index 3324004430ee..df968b3029c2 100644
--- a/media-gfx/digikam/digikam-6.3.0.ebuild
+++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
@@ -61,10 +61,16 @@ COMMON_DEPEND="
 	media-libs/tiff:0
 	virtual/jpeg:0
 	addressbook? (
+		|| (
+			$(add_frameworks_dep kcontacts)
+			$(add_kdeapps_dep kcontacts)
+		)
 		$(add_kdeapps_dep akonadi-contacts)
-		$(add_kdeapps_dep kcontacts)
 	)
-	calendar? ( $(add_kdeapps_dep kcalcore) )
+	calendar? ( || (
+		$(add_frameworks_dep kcalendarcore)
+		$(add_kdeapps_dep kcalcore)
+	) )
 	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
 	gphoto2? ( media-libs/libgphoto2:= )
 	imagemagick? ( media-gfx/imagemagick:= )
diff --git a/media-gfx/dmtx-utils/Manifest b/media-gfx/dmtx-utils/Manifest
index 1e405c326f31..1da8e94491ae 100644
--- a/media-gfx/dmtx-utils/Manifest
+++ b/media-gfx/dmtx-utils/Manifest
@@ -1,3 +1,5 @@
 DIST dmtx-utils-0.7.5.tar.gz 54754 BLAKE2B 0eaaa75dd8f650492f790aa960a6df93509e2bf5b1d0dd4b335a418f1524ee633d8d5f087cfef8b8950fc736dbb8ff702561e48506fa1b85d5846cf87601a197 SHA512 915104150d1cc5877d3012cb3934163b4a8e93f8132082835e8d12a8844d29e4afa06d020f5bd79e4bcacb8c153baadf183885619b7c4eb235d8c8c7041d325a
+DIST dmtx-utils-0.7.6.tar.gz 54888 BLAKE2B 721d67f85e73d245595d189acf1f974b518b079d02b7c57fa786b15ed075bd08219a2720b5152341449d517eb93e238274b440388557a64056de6cf6db9fc392 SHA512 201f8f5bbe5a1edd23104883d03e09842252ad7d07dd416b67c11740275ebe32c26b7fde904fad8bf2b18f1b3f574dedde1cc85f0e987f93d293d030e4f8a79e
 EBUILD dmtx-utils-0.7.5.ebuild 546 BLAKE2B 8a699e4dd6ccbe4e208736e9f2b7c74858fc8f852b7a1b80865017d9c23828bbcd532e5510aeea65134e5a47a8a12b6c0af72c77ee64b0d4af1ef866e701957b SHA512 2c3ceb32ae801fc1d07f349078b6feb4c8dfd5bfd9b3ea81d6c429af54269b3da7203834bcf90982cb4b6add9b19ed32a4c13266e6377a68d65ba4156df79820
+EBUILD dmtx-utils-0.7.6.ebuild 588 BLAKE2B 0c2de7fe60aacd6af505a21a55e0fb7aa6766c04a0cc8d89af73a440d2478b93ee3b7919a442dbd29be5f0e0e2d32f85ebf01813f729b11143c0489b7e4a0630 SHA512 1a98592502070d1f3e4f808f47a2abcaab8fa1b1f235c2451f7b11f224d65ebb7169628067755963d734c0f30fcbe34ee819383f9ad7a05c411a579ad12141ae
 MISC metadata.xml 784 BLAKE2B 6d400f2933a256e39be8ef48286af7273c78d5ea67be927703c82471e0ad19720adc05dcc71e200cb0f373bec626690b38e4021a5d8f0f7509949001f84b87d4 SHA512 3ae4b194dffdc41978674a602861fabe327c9c9955583bb1ceda7910c4fb24563d2c5045c9f5e37a0d0b4f94951aa3b3c9dc7e5fec69a927f30cc180accabedf
diff --git a/media-gfx/dmtx-utils/dmtx-utils-0.7.6.ebuild b/media-gfx/dmtx-utils/dmtx-utils-0.7.6.ebuild
new file mode 100644
index 000000000000..c7e98713603f
--- /dev/null
+++ b/media-gfx/dmtx-utils/dmtx-utils-0.7.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools for reading and writing Data Matrix barcodes"
+HOMEPAGE="https://github.com/dmtx/dmtx-utils"
+SRC_URI="https://github.com/dmtx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# requires libdmtx-0.7.5 due to DmtxPropFnc1
+RDEPEND="
+	>=media-gfx/imagemagick-6.2.4:=
+	>=media-libs/libdmtx-0.7.5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest
index a8f4d9898b14..f068dc799fd8 100644
--- a/media-gfx/ebdftopcf/Manifest
+++ b/media-gfx/ebdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4
-EBUILD ebdftopcf-2.ebuild 663 BLAKE2B 84487b6bd50035b92098e9dc460712b809c52e1c2df6cfd6b01a43a88755861011b310d5ff1b69890be5406b4a9dc4f108bfd456ededb4ecd939eefcd6860d62 SHA512 5be8e2605bd2201bcefd2b746704d662cc6f84d078e5713635e35acc2b194335e41d7b8e127996e6039037161d053520a2643e3eee7fa7affdeb9422e2d8c4b8
+EBUILD ebdftopcf-2.ebuild 641 BLAKE2B e36c7f180d8291edd1ebf2dffca35e3a6e9a6ca3d424add47bc240048c9ea5fd8b2559f3a4fc4b72137d717c873d6e1d943b8c2f79201e10477ec7f5ea324180 SHA512 5ba3d43e653a0312d2ef6ccb06f2e14ee3d7fdd58b892efe69732d0c50fe753d9a2338556d24caed54902c8a7c2d40e42c89c3cd9a5f77f32220426c80845ce7
 MISC metadata.xml 310 BLAKE2B d6b0416573d232c5715df5dcb05139b22609ce8ffb46530c2fd7a0cecc87b37ce2ce286310a80244b1911d5750eb29b55eef6b8c01f6d62c8d007ad2a9b5aae2 SHA512 1923349dde66e8078b37566097a21ead2555a73fdfd97b89beb44a714958dc80f4387ceb642d238419ce0ec388c335ba5db1db5f23b380131f0fbbd51ecd8f22
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index 05f39e9d609e..4d53d74a61aa 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index c2aacde198fb..4c0c94bb35c7 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,5 @@
 DIST eog-3.28.4.tar.xz 5732396 BLAKE2B 9adf7e6793add9298dd879a0fe5ea7c736854d3a40473b2def84851a1e5a78ef84316b20b172c85c85f070278a51b06c1019aef1e5e9c5f31a87243c9229a579 SHA512 57ccb6269b2829a0606cbae08fc376bcd13028d3affe03d76c929a95faf9106dfd497872a12019158aeff5e8e101640d912cae0cece435121319820df7262c00
 DIST eog-3.32.2.tar.xz 4601712 BLAKE2B 84803acf2e2c2cb7451b357d18c7553854dd9a440ee8f951db479641ebf7fe49d8b8185124301c8b272db22d424c31197146e58d0907248cb87aa822441184d6 SHA512 c1093db4bce6bfde758a42fddc7ce7437d2adf3aa44a633b253ca3cb75c910e8862a323d182394696c617cb92114919dc576b992e7a65aa5fefb504062382d81
-EBUILD eog-3.28.4.ebuild 1555 BLAKE2B e22cfc02eb83d4f8a33be1573f0976b0a4d0d7bc32d164d13f3aa147f20a66008747e98b43213c8b12103970d12fc5318d1d7d934ba9d216d1affa9456b5cba5 SHA512 eaa46f027cd9110e3243171dde0a0b94a9a1742700cdff0653fa90d20c8f7d1b2b238c94269faa2f40be4dc7b64a15c6e5ad2327281294c4c503593ff0aaa241
-EBUILD eog-3.32.2.ebuild 1568 BLAKE2B 4267e68439d079e3b0baf371af11a34a3d9a795ea63759f368e2d96220089a9a943a2f92a0f78b57be11b0f2fbf6ce7a6b9a638621fe215bdfe729e53187c6e0 SHA512 af7b4b6456d5a4e41ea850769d6e8a550757c0b987f5df64829c13725a727e1d221607c90463e754fc55e869072c85d222ea90ae6eae244997574129ea9d8e08
+EBUILD eog-3.28.4.ebuild 1545 BLAKE2B 99d8a1146eda116127f92d61fa32156f6b771de5d10882b3911a7a7e8ff975373bbfd7f12c705f5034a4de39fc3075a39f01480e5a4ab3ff435ca1fcf48f3b86 SHA512 2f1515802ca565104be4193276bff4f787072e08765feaed378cdeb91c5e911707a53ab61cca383770ead610477798e6d8f6ed1e09fbdf4cf5c33cf2bab143ca
+EBUILD eog-3.32.2.ebuild 1558 BLAKE2B 6b055c8daee8d02bee2a8f5e60ea3715801947c9a69e10e9c7e6532fe77085622d70e821fa98929706980b212d0f844cd2c7a53285eea4c8feaf6084dbf624a1 SHA512 d22a4803fb821cc1c4d20d55ed330282c2762b7f5cc24f5af0ae064f66593e992ba956040f59d2b18c30b0fedb2ac3223cf6936ba7f8e72b14a17cd13b61055a
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.28.4.ebuild b/media-gfx/eog/eog-3.28.4.ebuild
index df5e69ce3b14..cc1f6224d4e6 100644
--- a/media-gfx/eog/eog-3.28.4.ebuild
+++ b/media-gfx/eog/eog-3.28.4.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/eog/eog-3.32.2.ebuild b/media-gfx/eog/eog-3.32.2.ebuild
index 382b119f00e6..88760dd26209 100644
--- a/media-gfx/eog/eog-3.32.2.ebuild
+++ b/media-gfx/eog/eog-3.32.2.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index 1e1eae6d3032..8b89e9ef29df 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,3 +1,3 @@
 DIST exif-0.6.21.tar.bz2 387531 BLAKE2B 494d4910af2e8f740aeebdeeaf8dec5ae638d3e78339c55d5acc38879ab4837164d2ef407bd07a2e36a00df15d53b132bb027e2e97e79c229c589819af3b7f7b SHA512 73b5b7df08462a6a084a8fb973c39197f5d64ed753a97cb2f94a4acf815fdf0313214c2c8e44a46a24a1f6304fdaa68a579b4a2e246cc095f6e9588e93368cdc
-EBUILD exif-0.6.21.ebuild 587 BLAKE2B 32ebace4a269e01a25d75c336151c68d549adc7cf9aad0cf6664aa6d84daee763784585e87672d1ebf6c9796ce9f96e008e021cca1b80429b52033d69c584702 SHA512 020b833b68ba9883fab492d29ecdfdacf850aff5beb7fc9b10fb09629042cbfa76aa18f0971160dcb1319473b92b076c64a814d39cf46faa3c2a12f3784016bd
+EBUILD exif-0.6.21.ebuild 577 BLAKE2B 7f88826c39ba1f6bd16b46c84a7558798d7d29151a06ca132d96adfe8571616441d4c1c13ca2669912c937ef4d765391ee475c430817ce692b15121ee0840cf5 SHA512 f79011480d88d94ef72d5438515043d6247ab279932e9b84013e1f811ea45d38e50db7c17b75e0eba3a3d45bae2bab556a20624ea6702e61479b24e26fc146af
 MISC metadata.xml 346 BLAKE2B afa06166d278c5157eb097eb2d1c70fb929e86830868eddf353de6d8178f8966fc0ca06b52c95129555c3d0b4e15202f16135352bec3578cacbcaf7a9eceacb1 SHA512 195346710c3ead4bf9c050f5ebe548e0e7bb86bb1f9f61b2c1664cdda094c0523ee3c77769de7819b2d82cc4abd55e3b57c0827fdd0f97cc440f40b7519feec5
diff --git a/media-gfx/exif/exif-0.6.21.ebuild b/media-gfx/exif/exif-0.6.21.ebuild
index 9cff77dbbda3..d7a9d86207d1 100644
--- a/media-gfx/exif/exif-0.6.21.ebuild
+++ b/media-gfx/exif/exif-0.6.21.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libexif/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls"
 
 BDEPEND="
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index eb77944e401d..847d876be244 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,3 +1,3 @@
 DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
-EBUILD exiv2-0.27.2.ebuild 2441 BLAKE2B 9a856017ab543f6b2792ebb8bb1e633954c2db0197f19065999bf9b0dbbc1b8d845fe69845fa67e339662203e8dd53f9a1866d7b42262fe6f61629dd0c257f3a SHA512 4fcc8ae7c8ee1fa0359483d0ad3a701b519acbd8511bcd81af916bce9b6a68b3cb26900d52cd0ef87628aaa145091968746b0f08211f704b69bb871b3a12110a
+EBUILD exiv2-0.27.2.ebuild 2419 BLAKE2B 05cee3f28b9058ef70219b616cd6e346a133f661b3140f6d76a0f2d2dcfc45aca25e4d001ad302ebdf242525a59a1cb31d2cc8e718122ab0b2fc6f028e7b53e0 SHA512 a24fe4094ac0e0f0061b52dba4ded90fb6112e3e0c0bdde940b2f840be03e3b31c5a8375bc6dc6e2c11389c4b54ee45c7a84fc3eae7a2729ad0a1609ee65322b
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
index ce61026aa726..e70d4f902f15 100644
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://exiv2.org/builds/${P}-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-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index d2b3955c4007..28cb9712db9d 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -5,6 +5,6 @@ AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6
 AUX 20190317-gdk_init.patch 1391 BLAKE2B 6b4294e24d1bef0300344d2c11ef59d7d3f22d83ba7e8cc3e981db827dde7c30f234be35c017cc8c854ae090aa1f3e177af2c4bc511365fdbdb2e8c40402dda9 SHA512 3976f2a860f6c6aaec8e1532ede9fde7beff3ae98ca8e0cf87b33b7165f158ae676c751a7cb3e7897f1dff3f03c041d4ee6bd06e68904973b5bc5acdee5bede5
 DIST fontforge-20190317.tar.gz 22762120 BLAKE2B 5cb85d2fb9a2a08fe64548f2667c026e916dd0239d17d8f8d7d2fe8ecb51f2106cf3dc6e6298014c0deadffbfe91925327b483ed4750a171fb621aea8bdee60b SHA512 55f9b0f7cafb1aa5a1461dbf39b52ca6b69a2baa6b761c8c28f86a0bb99e090d9ecc981294f51dadd9297b5ebd3036f01cb4f17b9a97a737eb567b4ae6522f20
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-EBUILD fontforge-20170731-r4.ebuild 2842 BLAKE2B 6f39603b1bce78d27632e4cfb469f854e9970db77f68f4e48724b87993fb9174669f70a1e27872e9bba8e63a1cf8bc5abf60627421db211ad14be2a56190ef22 SHA512 e48df12792942616ac47ef585c6b89aefe5bfe876f638b1eb81dc14f2df2c1316d5f6b9decb4daca5c63ad74dd00b68cdeb7cf04d499a7cb788b11dc1a7f106c
-EBUILD fontforge-20190317-r2.ebuild 2762 BLAKE2B 4e0abd3354e71a91f4e6b3390820a1972ae219410dc09f9ca5d8e819e4817ab95c314a46f4afb1a02ad56d48b50af64cddbf34238a8b9b3dca039ca77a1d8020 SHA512 14633892a06c9a3da79f284bf61ce5ff58374f0768fe587c9dbf4737bb9cddbbf36b8d73ce9b2a38a3ed54eb1a8323851f8c4afe62cff17e70ad4001c06a5dcd
+EBUILD fontforge-20170731-r4.ebuild 2820 BLAKE2B 1a7579b71c5622bed288f345a328f8b01d6056a8cf2874415c82722e221e6300c3c97588040876d501ba818a7f9b368c2cb70592b1081d16291c52c9daaf2e8f SHA512 ed81344faca372bb074e2314a33cf6bd3d0ac1a997bc13f8150f9664d74fb6222c7024161cdd40bb0e5f0b604c1a4139d6792700d52eaf801810b65b5cc09236
+EBUILD fontforge-20190317-r2.ebuild 2740 BLAKE2B 087c06586fb423178fa736d4c1546876461a2cc996731f24449b9a7f4b275ea4727ec473a0ee5ae8a8e8a3c42516ac0ca90fd865090d3f4d0d7171ca895a5913 SHA512 13759b08a9d99c6442dfe21ea14e557d9d5f38793a8f03cc8898052eb10f2f3c06a661c9fd738493b63eb2979af1dc50b535bd500f0553a07cc93f6fadc86ff2
 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/fontforge-20170731-r4.ebuild b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
index 75d7faf5bb94..c0e1cbb97955 100644
--- a/media-gfx/fontforge/fontforge-20170731-r4.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
 
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/fontforge/fontforge-20190317-r2.ebuild b/media-gfx/fontforge/fontforge-20190317-r2.ebuild
index 4cc9f6d02dc8..6177f860fd33 100644
--- a/media-gfx/fontforge/fontforge-20190317-r2.ebuild
+++ b/media-gfx/fontforge/fontforge-20190317-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
 
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 361e31a3e839..33d26b6f58db 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-font-viewer-3.30.0.tar.xz 139076 BLAKE2B 0c84b4e8550df6689f69da1f8b968d436721ba3a9cd97fd7f8f71ad7316af8146d368b65b0702bb7c25c4fd210cf8fb9634620b129505cb3f4f78e3e450c3718 SHA512 9ba3dffdd0152c9a1380b39f4f96de7e7d0281c675c0821d4c0be27b7aab9f23d3ca7497b70dcf47807be5cc7fcf252877e5cd0009f6cf1ec231d429477fe600
-EBUILD gnome-font-viewer-3.30.0.ebuild 675 BLAKE2B f9c9253d13c10402e288e790a2eb4d47079d4e112ec05ebe8bbb9f746d0135a240acc8b6e5ae5f254f6c43de670cfdfb6537a0ef76e81f940d6b78ed52461f86 SHA512 bc995c5d6faf2f55932d38be8fd02fa7b25d10cad0df7728c930a324258936de8426594691228f61e94b9177cd1646f55ba4eafff6e80ca23fa0dbee29bb89e4
+DIST gnome-font-viewer-3.32.0.tar.xz 153852 BLAKE2B b79279e57b2ce4310acf3d1164da68b9408518456f72d28aae09092c53f9ab5cc6e1754b06c6ed147fdb842f76a3e0e4ad2bd7f5ddad5773091b28eae9811d78 SHA512 16b000b16b3e3e996dd83ef7f2a2f6877f6d367c6fd69f26f385dd13cc87a7690cd85e8895008fc7c5ca32ad4a15b763fe918ddc08aaf042f65087289b126681
+EBUILD gnome-font-viewer-3.30.0.ebuild 665 BLAKE2B c46f27c81e9599e0ce966258779ed13f9195a64debf1aacf2a415639968b09847ef95ad000ea81d4703e54517b6089518fd4d097e66318d5f41421768ca6b8a6 SHA512 d96e5a23228559ab472fece42eeca29e9d548b105e4714e409f88ebebf84bbb5e9c867fb02e3e97d88dc14df50bea908d9f9e7b230beddac1cdb7d13bae51fbe
+EBUILD gnome-font-viewer-3.32.0.ebuild 667 BLAKE2B 996241b7f0c165b72992f8583375114f6177c38eb5f34fe2af94b79335514bc30f6b72630b957c9b4f2e36676fef320563642affc358524ed39bbe056ea6a892 SHA512 58afc0cd707a75d82af327ec7f7ffb9cb45991f5ba31f19f75857be56191f4d6e128d8d6188fb60d9fa8755b5753e121123134cf311c6e22475d66f3764fa6b8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
index ffa6608c1d36..eb3984b87024 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.35.1:2
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
new file mode 100644
index 000000000000..7d298e54cbec
--- /dev/null
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org meson xdg
+
+DESCRIPTION="Font viewer utility for GNOME"
+HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/glib-2.35.1:2
+	>=x11-libs/gtk+-3.20:3
+	>=media-libs/harfbuzz-0.9.9
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	gnome-base/gnome-desktop:3=
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index a6f7fce9423b..928a81c7d55b 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-photos-3.30.1.tar.xz 1118728 BLAKE2B b3de35fb9c2ae7b731cf76a7b02b689997e3cf063037c49a51dbdf8bb37d9217c9bd5380bc872b984eca4e53c5996eb6370f3acc82a90e56dabe9d47999d5578 SHA512 4fa386c3d93f2b15468601e56bfcbdcc83a9e78ed5c4d0a1e51e9adf4ba313bb69e07aae52404026546dd68584e355c5e5100fc12f95fe078ccf2d6160a0a24b
+DIST gnome-photos-3.32.1.tar.xz 632688 BLAKE2B 9fa7307d1571f6c4e07d6c9700fd947e4a0ff26f8308f7b1871da817e5d80b19861d3c94a1b8ffe0daa820862ad064075641c8eb42ad66134e7c554696448932 SHA512 31a52b93c27ee603ddb314998d663d02c1cfdbc33214d2d9f977f7b66f4fc131a52cd17b274efcfb80f2fb17d7b469157e99a783cbfe76e0b872a2a75363b208
 EBUILD gnome-photos-3.30.1-r1.ebuild 1949 BLAKE2B 8f5589d46c9d807dd7855e65b04309cd9bcfd85d80fb2d203f7ea7ccabb83e0e9467037ad53fcead3adebd731fedc854325b146994e715ec3df4007ae69511ae SHA512 dbb23890e3d1e3f31cbbecc524322d5c7840fded647ce281d763a9af126aeecefb46d1890bdb262c26446aa44875fc08cef9b6ead727dacfe399633e3a7e7164
+EBUILD gnome-photos-3.32.1.ebuild 2278 BLAKE2B 3da565e8cc9df8ed03970a3d0770bc538da3e0ac6b76048004080b97fb4ca2ade1b3ae8eeb17fa5aeacaf8a80a47163b2339a1a0bcd7332c725acff165f4dc0a SHA512 fd188627c7fa8aa3c57787604e913e9e2276b4a3b3f831ed8e2e31e5a7fd4a658076f9f82feb70a75481d7478fbbaf37e929a5b9f479f062ddeaff85c33dcc99
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
new file mode 100644
index 000000000000..bf9760240045
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
+
+LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="flickr test upnp-av"
+
+DEPEND="
+	media-libs/babl
+	>=x11-libs/cairo-1.14.0
+	>=x11-libs/gdk-pixbuf-2.36.8:2
+	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
+	sci-geosciences/geocode-glib
+	>=media-libs/gexiv2-0.10.8
+	>=dev-libs/glib-2.57.2:2
+	>=net-libs/gnome-online-accounts-3.8.0:=
+	>=media-libs/grilo-0.3.5:0.3=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22.16:3
+	>=dev-libs/libdazzle-3.26.0
+	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
+	>=net-libs/libgfbgraph-0.2.1:0.2
+	virtual/jpeg:0
+	>=media-libs/libpng-1.6:0=
+	>=app-misc/tracker-2.0:0/2.0
+	sys-apps/dbus
+"
+# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
+# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
+# so don't pull it always, but only if either USE flag is enabled.
+# tracker-miners gschema used at runtime.
+RDEPEND="${DEPEND}
+	net-misc/gnome-online-miners[flickr?]
+	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+	>=app-misc/tracker-miners-2
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+DOCS=() # meson installs docs itself
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test dogtail)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 3d3ec18f3d3a..26942ec13d03 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-screenshot-3.30.0.tar.xz 225244 BLAKE2B 69c75bb8e3d18578317343b549d4ad837b6e58420c6b49efbc01338697bc2251032d9158e658c9f4ae4e086a1c117eac818c18b6ed95d031c2b60c2ba62a56b6 SHA512 a42ff4f14bbb3a3feb438ee64f1dff3d3a792a6585fef92fde8546b9c3fc07013e8bd2ef42ddc880f2529cbc4241a50d441d4de2a4b26923036f1724aabafdba
-EBUILD gnome-screenshot-3.30.0.ebuild 1246 BLAKE2B 68e9f5b62661e94eea246b85fffbe14e5695832af0f7cba59ebe08d6edccf39cc73234abac37c3585d0c68822d61eb0659b13364ee45d5c33fd50fdac34384a9 SHA512 f9cb864d02e8971ded0e22b9d1a937bb3486813fa3a1d93fb2616b4f05c023a36ae05e98999a605c9278345332266efd405752f7f8a8e393f4d88c7738392d36
+DIST gnome-screenshot-3.32.0.tar.xz 228876 BLAKE2B a7f742cf67815428da3013db23d36b34f52bf99c3d77002cac9243d2f5c5c5c1828cb92a34e0541d18c57f357d39f876a815d7caa432f92704c749a431faae95 SHA512 2747f3cc6ff6df6db6d64c9c13f7d7e3c0bf738cdace2850869c1158d23d02dd03b55e6704c9540f1e5b789626ea07741a0030ce3b06dd70c09f2fb2afa79c61
+EBUILD gnome-screenshot-3.30.0.ebuild 1236 BLAKE2B f051edbcf5eda8f5a730da5971708e5e19fd2fd3ba43529986c06e31e35f2563bb98f230318ecdfaee0606fd3287dfea7c86305c5ac587c7634a8b922e57cf41 SHA512 276749c60a4e8f84322fdb3100f6a499aaabc7f38f3c00a4b8ccba3894e246b125087856c3b2a6aea93c06736a3d5d670907491561d721d41753bbdfd9185dbf
+EBUILD gnome-screenshot-3.32.0.ebuild 1210 BLAKE2B 7432b6628559d1f970a4569fdd3c3db3dbc7caca7f86445c45e80244434625aa081ad112fed9e6fcb29dcd2a955271ba038b58e52e5cc433d3deebeba2a4957a SHA512 1cbe6d314fe58fce64bfc73a42a1a8172d530a5fe80111625f5d50a06bc547b4cf470bc36cbba942c89ba8f418e203bfb632a26eccf107f97473ac6a554bb4fb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
index 9147493f82aa..fdc92ad3410a 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 COMMON_DEPEND="
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
new file mode 100644
index 000000000000..151a81f1829c
--- /dev/null
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Screenshot utility for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# libcanberra 0.26-r2 is needed for gtk+:3 fixes
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	>=dev-libs/glib-2.35.1:2[dbus]
+	>=x11-libs/gtk+-3.12.0:3
+	>=media-libs/libcanberra-0.26-r2[gtk3]
+"
+RDEPEND="${DEPEND}
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
+	non-interactive mode when launched from a terminal. If you want to choose
+	where to save the screenshot, run 'gnome-screenshot --interactive'"
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 56d401164784..cc487335e7b6 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -2,7 +2,7 @@ AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
 DIST GraphicsMagick-1.3.30.tar.xz 5496116 BLAKE2B 408f68334b290ae30d06e4b0efa6e11e89ffa9c00781e2f0ceb25cd6fc308f1be86b5ed9bd52f594e1abd3351f1b7dbfb12e87117ba85f4b4c01d07d7480772a SHA512 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c
 DIST GraphicsMagick-1.3.32.tar.xz 5535224 BLAKE2B 96fd7bfe62b4b1b25f9ffc0ff8e2ac023f0528b9af857fc27a5a9cd1123eeb6533b868c7bad8dca5b58e114a674dda009a62904df64622d7b5f3c0d72156283d SHA512 f84cdb9318962aed1dc25d70db4d0ca102e4f88748f468f8a56b77d228fd315b772afa48e90a396d32e8226eba9105717bcb94166bbe43723afeec58ead53e09
-EBUILD graphicsmagick-1.3.30.ebuild 3199 BLAKE2B 597ef8d64f543bff9608fa6da4ddf4dce970f442f6d63379b852334034af8c77d31fd1c991d3a417f1c3d2cb85efde9d172855033d179efa63180ee16985ed3a SHA512 e0d56fe46e7db5d4edb6daba05f67d1b8195e9848853d18758f90c84b940f603a3dd7ab87cd551411463427c34a0e15d05a1ff689561ff61cdb6f2f0ef7e51f8
-EBUILD graphicsmagick-1.3.32.ebuild 3078 BLAKE2B 1cd7cb306fbf4d3baa486f7e67c04e90bcfa9f935eb575081a8bfc466ba9c765a9611dc11ac3934ba564acb219fdd99a6274a9121bec82833cbd576b3f16ce80 SHA512 b190ef3600306bcbf7f8b4f6ea9cbdf95df6a28006432e0ca64744235115ddff555b4bca0567e8f68a6052791a200c65dd9f1470caeb55a895016286ee7cc6f3
-EBUILD graphicsmagick-9999.ebuild 3086 BLAKE2B b35c96dce03fc5a79984dac377e06c6bb1d2e1296259e41f7950246477c37812844216213de7a1cd8acb93b09f4704b34861082e1b7bce368d0f596bb7541ef5 SHA512 cb157997a92053a7db43f06fa5577a00e0e552569e014e4d9e00be0bbf7c67863a01cef9038ced632881625defc468e954bc516a5c64cd52678c0576e89fb100
+EBUILD graphicsmagick-1.3.30.ebuild 3189 BLAKE2B c352fe587cce7000d3f533977e7ce3cf275e54cc65d2388dfa9394b69f222186bace9785b97bf5d230cbaa16caf675bf3569e26b77ea6b78de02a6f43a404a49 SHA512 5f10a7f6abd3a6f972bc628a604457b225e2a21d7518e986567390112062fcf597e397bcf07bcec201b49fbc9c1309f529972f86ebd451622a789d6eaa1896b1
+EBUILD graphicsmagick-1.3.32.ebuild 3068 BLAKE2B 97ee3150595a43fb4f44d4f256b353ae30d43576b2a24f217df31998c69f3a1d09546315ecf9b43374e862b75e72e6a8e751131454e8630db35663608e350d97 SHA512 f00e4612b5ed1728ad326694488e598112599ad4c106ebe2a3512558516b5241ea969808c081926bf0eec8c39c4366ecb2f767937dc8a8f3cf0e09004947034c
+EBUILD graphicsmagick-9999.ebuild 3076 BLAKE2B 8e54ac0ab1ad928cbabe6417580535f88f7cc3dff4149e3b6db8133a7c9eb053a3eed15553fa61c295c2629e4b1ec814a04edf2fe5d88895a5c3726a8d79345c SHA512 951d0a0a215b3523c396c089fe57090e37686eb97b3fed899e5ce66988b90e7ef73f58e57de87f2d8127d819b45bfb4bb53776340448e756176f15be57a4db41
 MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild
index b25de4573ef1..ed0736e0f226 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
index a6c6969f857d..1e56d5a96d92 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 4f5912885556..b7015389b707 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 20df8bfba0d7..d7f7075f948b 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,6 +1,6 @@
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 DIST graphite2-1.3.10.tgz 3889647 BLAKE2B c6db80950ed5f81d5ecf77003e23e6545c2824948bdc04aa3111747c0eb1ef074b09fe4c3ec20b68b00f75958ea39c5945a7fbe2fecde55ff32d22e517c91156 SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
 DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
-EBUILD graphite2-1.3.10.ebuild 2499 BLAKE2B cdfabfaeecaf58e032422d60adf6ee349ec2bdba70313138d4dd4e88e258ba9868a31a4f56109a043846e2aaf7dd242468bd49244ebf28c3b3a9cb0b2d085300 SHA512 43b767dbed5273118dd9cd42a505e659217989f4165dd41e971df02ce6042f1c8476e06eda60b66023f02df3a41b0bfe8b63df88b2035d70ccd2d5fe36a7e4ac
-EBUILD graphite2-1.3.13.ebuild 2664 BLAKE2B 523bff44957b4787413d88422a2f3b32b09c3ddf1dcc092b5ca3110845d881dd59a5f52755415fecfc25dcab87e6106494b923432ebca23fd7956ff557e6510a SHA512 a8fd81c61e19b15d90800f7e63c5cc9e9335b350cb6af829557c70cd6f98858d588677f7b86237ceab379a89652bdff8bf74930222c4cc13473a5071c2da78cb
+EBUILD graphite2-1.3.10.ebuild 2477 BLAKE2B 4539b2af04bce3abbc85227ad702f1088b5c11ada2dd32e8a13eb541ec59062cfbbd0b1f014f65e66633ec811bbf501143b283413df0950e379af5a5244e436c SHA512 1b7829629f0562da73bdc3e64c5fa6842360abaa4debd354ce34b267b663fe117da84fb527817a1fd0cef0d493fa95454f804e949b40858d320bd04321d65b1c
+EBUILD graphite2-1.3.13.ebuild 2642 BLAKE2B 74d67e6a6bc3325c73de363e4ad4d1fa212887a644108e4a16581edde6e28694404efc42d5056192a6a4ddba5bc40eb45620bc22b1c12caaf3ae73334630fada SHA512 0f239fd15ac3ad62802c635fcec387e2a059c72cdf47afb3f2647108ce84dc9685a83e2d8445c343f36c8cff3e4ea8216b1d3249ed456715efea192afc5b9fae
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.10.ebuild b/media-gfx/graphite2/graphite2-1.3.10.ebuild
index 8acb505e812a..a4a3816cea42 100644
--- a/media-gfx/graphite2/graphite2-1.3.10.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="perl test"
 
 RDEPEND="
diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
index 0fd46d437ad5..5508e2ba642a 100644
--- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 
 RDEPEND="
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 8d18f246c37a..b0348f2c435b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -4,6 +4,6 @@ AUX graphviz-2.42.1-libgv_python.patch 621 BLAKE2B fa1d3e0f37870c46d8e6266ac8126
 AUX graphviz-2.42.1-math.patch 843 BLAKE2B 3ceeeec968dd45478f4bb07d819cb5a4b5a215c36728dd9212db9a81841ad4ffcc1c02a56b850fb9cfde0de3689eb595eb1f73feb97c11e77d0fdfea5e708127 SHA512 17494f6795b4ed8cdef8652089132243808acd76fe970a6297cb93907cd15ad91460dbffd5ab3251d8c84a4e0ca0ec4cc96268682ef93f4b5f6b1dc88bb0b64d
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 DIST graphviz-2.42.1.tar.gz 25543401 BLAKE2B e64044923a823f6fbe91b498b04fffe3e5b6803c55c5ce29a60b16a38d97260061b013e8bd13bc99f360d035c840f18a01301b29ca1cb73c4be87843f18c45fc SHA512 ac263df086eea6faf682f493756b79a0af8bae3f515cd8c09238e89f295226baf743a3fd22d977ef6f223388769ef11241dfb2fdb6087305ce4fdd3fa8ed2f78
-EBUILD graphviz-2.40.1-r1.ebuild 7951 BLAKE2B d1347b10437cd629dd01329e925472ad3e419f0c0e8102f58aa0baa63ecf06fc0fdbe149bd10b4112261086517cd2a5def725aefd968d5c5161d8b534b5e3f56 SHA512 7397df7c9b0b269743cc7232897454f13329e4a75e0e815715464008b493391744e06ad4a0772bc1f0ba9c8d44c58dde3bd56605f41e1d2d90330b8501aa4759
-EBUILD graphviz-2.42.1.ebuild 7961 BLAKE2B 681731441e7af79f38760d2af6928fb06b8debcb9e9de3dfb88a84bddeeae48cc47f525d0c481de443008b473cc87faf3dbc71c894f35f94aecb8b5ef13efc35 SHA512 ddee7a2b441f8c23ba23d19ba98734e446560b9a6b8d125403a607523ffdfff8edc9de03acc3cacf37826a10f7ee39273d3c13dc5c6e8b1446a469327c44152a
+EBUILD graphviz-2.40.1-r1.ebuild 7929 BLAKE2B 954fb0e307df7e28ae4cf0806aa5b1969615c542416532d11930b3327075977be13b38eb127639fe153bac3819f28a7ef1c0be926391331d3f01e60a4ebdbba8 SHA512 c0cf4c8aa2954391a46b3698c445b2dc100db6c8194cd191c8ecc4ea3b2ac2616b47ec8117b180abae6c8dd9edbde9c2e8731af78bccd6364932447c6a289a72
+EBUILD graphviz-2.42.1.ebuild 7939 BLAKE2B 5cdfb438c292463ce91f68a94c5f698ac0e630132537ddcce901c9d3cf6e39eb422e9d3dda3a45789e86205b4ac5b9ec97adf506ee5f401e3f7b2dbfcb68cc58 SHA512 ed38830d9a1130a572879a44705c6598bfb1a77e9cd361c0266557f7ed0c178c7a6e2924a2c0ce802d244a5edb1a631027c5d2cd79876a958f6c6ae985f88e04
 MISC metadata.xml 2211 BLAKE2B 1c39235c1d8c2efce0596cda2d20bf1cf2e81643068f68215f31462b6320f7f31533877630aa3c2b2bc9a7f7856f7b27354a97bb2c61d7e63a6de86f569ed192 SHA512 f7689fe65e46905d48fb2e45c3ad2a1e8f4fcb572515fdd7dfa26cdd21ed1eaf52d8ecaab9c297f5e8df69a205337b8526e0304ddbdb8c4b3e82cb1e428a1e71
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
index b7b02df892c6..cb6f4538d330 100644
--- a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
diff --git a/media-gfx/graphviz/graphviz-2.42.1.ebuild b/media-gfx/graphviz/graphviz-2.42.1.ebuild
index d5d89c0ca97e..b980139601c6 100644
--- a/media-gfx/graphviz/graphviz-2.42.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
diff --git a/media-gfx/grub-splashes/Manifest b/media-gfx/grub-splashes/Manifest
index 82be4f1d2cfb..d54732442ae0 100644
--- a/media-gfx/grub-splashes/Manifest
+++ b/media-gfx/grub-splashes/Manifest
@@ -1,5 +1,5 @@
 DIST 49074-natural_gentoo-8.0.tar.gz 278632 BLAKE2B 3318f98c80cc9be652fae4e6f1152dc01692c40e5fd4144009407bca176266e408787f12f2f304873fb84c7c3522905cfcdafc8a3c3e9bd70174d3b1e8f714f0 SHA512 49ede8f41139e2b0e88e173ac9157566c71abec567275aa582db81b3455eddeb3c48b61a66a10ff93bd421c9b45527278debd03c1c93040aa74c81356f280870
 DIST 98478-gentoo-splash.xpm.gz 18681 BLAKE2B 65969e247cd7c348c4a1c3cd4de5e4d3c4e888eefa11166b1be75272c66b2c7d88beda3bd25581c52d3f7325dc4821f15350bd826f5974444b48ccca19424ea0 SHA512 ea3b6d284e5d41462dede7705a2aa5b6655c1f6aae630cd508dc653391c741cf0a3f487e5694e50769e23696c16279280f89325cfdb47994d8d7210eb447117d
 DIST grub-splashes-0.1.tar.gz 180413 BLAKE2B 4007da6ee3ce221ca6027354c611bdfe54645b484bedeaa84664a82fccadb46a4de2b3bd0b3c9a8eef4af2fce9df23481e9e2f9a18e1999be28245a4a50a3e37 SHA512 af96ff45778ccf062d26ac1fd0ea9cf47678faf9c0891040580e0563ef5591fc9b2c34d338568b77c0683d7c8814b89ff7d62dec582fb714ae503a86ff6b84be
-EBUILD grub-splashes-20091109.ebuild 1028 BLAKE2B 045188d60d869a2286920ab47748cbe802c482cb54cd135fc8873fe0406024421011d5efe66d9770372067917e639eaf06970704f60b0a0ebbb09e494d1164e3 SHA512 9c6c813677afd26763b5c254f6b7361c95e93f5e4d77981cb3a4cb31f8f9e06ecaee4d397b6ac45c61de0e3321075ff39387b430f72e2d5aa4c199e1d6ac6d31
+EBUILD grub-splashes-20091109.ebuild 1018 BLAKE2B d6de69050ad2bff9aadf8de3bda78be792428c4289bbf5666f3229a01f50307049bf45f1ceb3f9eff088fdabb6705ed7665f61efc1e045ed2ef75e01872d66d4 SHA512 ec9ab1f189473f71d65652a32aafdbee502203be6e1f359d5cb7a154eefa7163d9fb3b859091e6967df777a70410364e2a154d201cfc1cce54f26d314919abb6
 MISC metadata.xml 374 BLAKE2B 9019c81d0ecc6c5783e8d8ef129f4edce968b6b622c6acab24ec3481341bdf0da9479f3eadbfcf714c183b9ac2ba23c8060ee0052e931714702e8f95a6187e54 SHA512 3a7bde7a98a32b728bcc93ff3aca84b44649475559bd06845f6f1d0994c681ee91d42c72bceb5db1eb267a951b3101ce593d23ac477c21d4e68f073d0e6ef78a
diff --git a/media-gfx/grub-splashes/grub-splashes-20091109.ebuild b/media-gfx/grub-splashes/grub-splashes-20091109.ebuild
index 3c80c5241972..bfae4f9cf8e5 100644
--- a/media-gfx/grub-splashes/grub-splashes-20091109.ebuild
+++ b/media-gfx/grub-splashes/grub-splashes-20091109.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${PN}-0.1.tar.gz
 
 LICENSE="GPL-2 Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest
index ae6318933c9c..798a89c51896 100644
--- a/media-gfx/gtkimageview/Manifest
+++ b/media-gfx/gtkimageview/Manifest
@@ -1,3 +1,3 @@
 DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39
-EBUILD gtkimageview-1.6.4.ebuild 1239 BLAKE2B 2ffab934aa73c1231667cbc1114d84d8a64875a82222ce81780d1fdc8d36d4db142f42f116423f47eec67b684b48f6f94a2aa7aab9c2122ad3fcc3d855ff620e SHA512 bc61f7430b735786cb6358e7d8f2ac6c95b6f8b22a95d2bf522ddc199d419af1972581ece8a1c4c4b9527595a3465bde3d06d7cf9bfd7ea26c65c45ecb46f6b2
+EBUILD gtkimageview-1.6.4.ebuild 1217 BLAKE2B 4ce89fbe05b1461b618cbbaf8f8634908d29bf3fd65f6d02e046723c1ef88e5464a16988003cee973be34384c3be173122948043aa2a555682100a12a571447c SHA512 8fd20711c6ad30531ef488a152866d4744a1d661c0b8b30a4a5cde40009ccf0fa165905c2a1170bc56e597d0c4e04e0e01f57b578f28881a64267f5bcda1e529
 MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index 75cf22ae35f4..b19a09bf8fd3 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 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 sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 # tests are severely broken, bug #483952
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index c02325618d9c..d4ad4ca4474c 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-60.tar.xz 8939576 BLAKE2B a4b493838da9bfa183f55d19d9643dcd83fe533884b28d579b9586357af7d3ffba16f88e73ed42658a3b41ac47de9ebf7a7ddbefc0339bd90338a1f32dbd96a7 SHA512 cd34014322bd48b02d3680564756db58292fabd5487a187bb3913ec9f5ffd0b990a112a145a9be544cfc334cb917232683cdafc815baee85638a95a9a89f4604
-DIST ImageMagick-6.9.10-64.tar.xz 9060412 BLAKE2B 1c27abab10910f4013ff65dfdf32b4bcf8541b1a15195eefa7bd32a6a375abe6cfe3e5f243716c0e6aa7b82acf498fec142efa72b1bdf1696138c727be159113 SHA512 e4be41a7a47da479e2128791fa0cafdd6a1a369c0520e68b34049ba951590635aad956df58f52c84f676b0909689aabea6c9e3d7fdcb82040e78f368d4eb76b4
-DIST ImageMagick-7.0.8-60.tar.xz 9464992 BLAKE2B 26a75c0df77459582b9025612c0f70b30bedf9fee7bdfe5b0083ca9f5a7184d19e849c8a18d3781ed39d1788a17d6b1de608424193c24ec5e11ab9b50bd64874 SHA512 4db1c24942b522cab1ff80c3eb3df7a81cfd2ec7f7f91dcd00b2d4867b2afe5026ffbeacbed83ddb9178448f1ded3dacb34002fc65892704e863794338ba6436
-DIST ImageMagick-7.0.8-64.tar.xz 9463488 BLAKE2B db44b8d0a03f15c26d6912ada5900932bf393eefa6fe8ead03c668552810b06078fca4f9cef9f78e78049b61222ecb6abf2072a5719a0326aca357ff2f49eae0 SHA512 6ddd12a6b5e7870364575f6646e38ca49dc14c2857d8a41217d24e3dccf87cf8730d2aef692dc7b62616e54eb76f320c550e9f409376e22bfcf89e472f8dd0e6
-EBUILD imagemagick-6.9.10.60.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
-EBUILD imagemagick-6.9.10.64.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
-EBUILD imagemagick-7.0.8.60.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
-EBUILD imagemagick-7.0.8.64.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
-EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
+DIST ImageMagick-6.9.10-67.tar.xz 9068120 BLAKE2B ce7b3b37a65acb5433459bca242e6fdd3a35d8d5f10b8f21395cd085aed0c1b588835919cf43e8abb2f2d86a035fa5e663660b652029a07a7cf83006bd052320 SHA512 d413c4b7dfb7db5c7d61977d7444774ea7445b254746266261a5a91e47aa89ae566241e84135915102ea9a09d77cd89beeaed7a2f5974f6c9b0f4b505c5bfc42
+DIST ImageMagick-7.0.8-67.tar.xz 9470768 BLAKE2B c14f5536ab80720698a6d8df37724d2b0107a6f378a23f2f8f891be585dde59378ffed4fcb601794a5db4cf1d0008db40f33697b1c04ab3b0185a6a71a331a26 SHA512 ad4325df57769f9c4edf8ac71370cb9bb19e090e588d47eb0311e3f4895abd7a7edcbd2e7a495f21acd1daca97fa224bdf1fd978577588e45c11a7799c3d67f4
+EBUILD imagemagick-6.9.10.67.ebuild 6867 BLAKE2B 1cb8781a336ef0322df8e35d5bc6e6a3f6e70c3930e95f518160c677900d1aa51bb6d2ba4d2822f83f3aea40e57cfdda39bd808c1443cd874080492a003aef11 SHA512 b39325d583ea67a2b9e7a75e76dca7d29584f53c0e458249c44fc23007628f168b923d92aab6ee1329d6c13a804491c835664f5a5329ea05474b8cc72454a744
+EBUILD imagemagick-7.0.8.67.ebuild 7134 BLAKE2B aa5e04ab76be0e47eeabfa67852bb3907907f49844996f2d5bc875d880eda49506657758753ada9f5bfe9da159cc8d6f3b012d9aa061ea6bc5ae9d64f9caf91f SHA512 d5c4939be2fc6bca2b0e96b6dc02f35bbec8d9574495b0389155febee4fcf0e94fc41666860c1792eb2fadb77a9cd846d3bccc1df0f330c146efc95237dd67c1
+EBUILD imagemagick-9999.ebuild 7144 BLAKE2B 45892ff417e8a153ffcbc958d9ee0e594bb478bab88f24e207317c788b14b32c7ad0ad8c7bfc01a74c3ae70df2775f0187aa0ede2774873427194c134e4374e8 SHA512 b415fd35ad72b70c7985a798bc868291a78ac7d22769c8b1ff9b244473d8439a15cc624e06025854abe6c41b5dffda13290ed3aee7d60475b9829147ce4cdb7e
 MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild
deleted file mode 100644
index b09291336ccb..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local mesa_cards ati_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.67.ebuild
index b6bca9ea8b20..319fce98db62 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.67.ebuild
@@ -10,11 +10,11 @@ MY_P="ImageMagick-${MY_PV}"
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild
deleted file mode 100644
index 69c412db11b7..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild
index 59c2b130c53d..1fa89f6961ba 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild
@@ -12,8 +12,8 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 91e101eeefc0..1d5c3d2d7d7c 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -12,8 +12,8 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index d6e4a739db74..503df3e9bf28 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -3,7 +3,7 @@ AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416
 AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.6.tar.xz 164332440 BLAKE2B d60c87743de77d300b2c2c9d1f1b3a31b238e8ef434981d3762713094eeebbe5e51547987c981b9f50d82f2363881ec74ef488b35d27cd5271d568987607557e SHA512 c6c6bb0b2d46b421c6edd38427f7a71636c78267413a4265a61123509ebac8f24d981ce5b5540f0813e26b89e655d44c2cc32395694161eb925f2789b0e8119e
+DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48 SHA512 28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
 EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
-EBUILD krita-4.2.6.ebuild 3134 BLAKE2B 286e53a3758f23f90c0f972158d125779dc91d7d0ad2a552dacaf5447a14321dbaa81a59a6f5a2c263720641b9a146141f9571961db7ba7acc0a79c451f1f35d SHA512 e20075fb679c828347155280315f368faab8aafa5d25d35765ba2516fbcf868e1de54071c185cc7409806e3b39df08e969b0ff35743a8eb2887b3547bffeed26
+EBUILD krita-4.2.7.1.ebuild 3115 BLAKE2B bd8b791204aed7c36e0d3290177371389e8e9f3e60526f86db85a5c3213e694925b033291a2b67e37821220b9975ae4eb4d202aab482a6796ca975a29aa240be SHA512 a2e337bdb1fc79038570be6b4585c3b741013a3404e1ad4b90d7449167d0e9e67318160cd725d6c95c98829825484c6b29f08d222b62e8c1260692071d2bcb45
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.6.ebuild b/media-gfx/krita/krita-4.2.7.1.ebuild
index 0cb6e37c9883..30b6159d8dce 100644
--- a/media-gfx/krita/krita-4.2.6.ebuild
+++ b/media-gfx/krita/krita-4.2.7.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
@@ -58,7 +58,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	sys-libs/zlib
 	virtual/opengl
 	x11-libs/libX11
-	x11-libs/libxcb
 	x11-libs/libXi
 	color-management? ( media-libs/opencolorio )
 	fftw? ( sci-libs/fftw:3.0= )
diff --git a/media-gfx/kuickshow/Manifest b/media-gfx/kuickshow/Manifest
index 922e58e693c7..2c8aac12b729 100644
--- a/media-gfx/kuickshow/Manifest
+++ b/media-gfx/kuickshow/Manifest
@@ -1,4 +1,3 @@
-AUX kuickshow-0.10.0-handbook-fix.patch 331 BLAKE2B f3ec13cfa1d64906be0d468cac32c240edb06b9d33213decbf046c361ccfbbbe450099445c62054bd2414e5625349d65a612935738420ea4fdb59085eddde5a3 SHA512 e7101a76a597494378f354e110e3c8d660b825174e5fab14b480ac19ff46cd29e3bf3e2f34718530efa5280dade0e6641062ea3a523b535cc841f31486c0f4f9
-DIST kuickshow-0.10.0-r1.tar.xz 879364 BLAKE2B 43ef0306988a4154bfdf33e1b5858d3985cdb9134adf5a657854ac14ad0a12ec13265e287b479baa5096f5eaa1b35515cb6d44a51a83eaf1c19f3401541f2c42 SHA512 d65082959d784884fb4411c3e3f6145606bc3f02d7a8c63421d216e8ae6da89dcb5e57ba0ab88b5a1cd31368ff111700cc58f98b74a1e481e6109173d253fd29
-EBUILD kuickshow-0.10.0-r2.ebuild 1024 BLAKE2B cd9df9f23b5ecd1a963304c9975d29b39d5eae57eac71be0852bc7f38d2e724be835db0092e79be4daff9c07ec5dc7b80146fe1e7c33ca7ac90f5ccbd2149ecf SHA512 d8573433c56b53857fbf8457070613d7c6ee3ee986c8c196f2ba0d5283cb8039d42da3d1fb09f6f4df74efc7cb591a00a88aa5a782604a44f5f3540e9469125c
+DIST kuickshow-0.10.1.tar.xz 896900 BLAKE2B 50e6bf055a76d0668fe6f92d411610908e9098b5cb14df89403d7e6462941e137390e14a6828c790c1b7067b9f596e70c40d40e2a64c6a0887b1f11251911219 SHA512 c2d812a0e97be1b5b0db1f6c90dc1347be2ffccd48403b46e637549b608a395cdcdb6b36e842b1c5039d18861cfbafd4dc7283bb69f530548a3b5193a586d4dc
+EBUILD kuickshow-0.10.1.ebuild 955 BLAKE2B 4ca535d95e0afe5870dc7827c21025608b15a8935e45eee7b8d704a1946b08311d265ef56ec3e16509ee5165e8b34f3c62b538e6ff309c24f87529ab8dcf7815 SHA512 9359569334f0a26a16426aec540e4d091627b64cdf45dcca18650e9887a6f7f70a13e48ac583a1eb25f6a6d026d5a064c1540001b1ef2feae82d8a113b726617
 MISC metadata.xml 368 BLAKE2B 2e35a817f35b6cd1371efcbc8c9f178d378d9951a7f72068020fb27e5aeb7de5e903e20c65355780ab66ba08c0655b16fdbf48aa8f02cba8a66cf706c813b730 SHA512 9396698295f746c83f4fe1cc56396093feedb617a0a8cd1fa750b9f3099d9db014329d021af1021b0a22e73a3a8190b10ba5b80c0e753ea526094382e7495d20
diff --git a/media-gfx/kuickshow/files/kuickshow-0.10.0-handbook-fix.patch b/media-gfx/kuickshow/files/kuickshow-0.10.0-handbook-fix.patch
deleted file mode 100644
index 99058078755d..000000000000
--- a/media-gfx/kuickshow/files/kuickshow-0.10.0-handbook-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bfd4d40..fa2337c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,6 +30,7 @@ add_subdirectory( src )
- add_subdirectory( misc ) 
- add_subdirectory( pics ) 
- add_subdirectory( icons )
-+add_subdirectory( doc )
- 
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
diff --git a/media-gfx/kuickshow/kuickshow-0.10.0-r2.ebuild b/media-gfx/kuickshow/kuickshow-0.10.1.ebuild
index bc642ba5f883..b75ef6343d8e 100644
--- a/media-gfx/kuickshow/kuickshow-0.10.0-r2.ebuild
+++ b/media-gfx/kuickshow/kuickshow-0.10.1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Image viewer based on KDE Frameworks"
 HOMEPAGE="https://userbase.kde.org/KuickShow"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz -> ${P}-r1.tar.xz"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -37,5 +37,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!media-gfx/kuickshow:4
 "
-
-PATCHES=( "${FILESDIR}/${P}-handbook-fix.patch" )
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 8d7958356c13..a3fbaf7036f3 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -10,5 +10,5 @@ AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622
 DIST luminance-hdr-2.5.1.tar.bz2 10238826 BLAKE2B 02cc275e2433281e9305e07efb6f77a611ca8e8167ca478a0c4a4c16feab260203aeef501b24b52b54ff9ad92923fd52b2c6925d81e60b492f0ac2465e65b604 SHA512 5d2165ca69080b67426cbc7e30c3ad5545f1a9dacf09e76684c619633cd40b03ed2d0e32181a5dce9463addf20dce1afb58cbf4c0710688e143112687448be2c
 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
 EBUILD luminance-hdr-2.5.1-r1.ebuild 2163 BLAKE2B ca1aea6abad91acadef5b7d729ef87d750dd81c48db728bb31a4c62b3daa051b2d745ad0bf019c7096fcc757c43c7801816d1f23b39403c0858e3f23924ce80b SHA512 814852444ee4f41218a20e4b7eb9e29bd61ec9bac8f0cd5cc6ccb4183ad0d265ea8cce05baa649e1fdc3efceb1ce8e9440e641d2e97aaa650f89e9f10944883b
-EBUILD luminance-hdr-2.6.0.ebuild 1836 BLAKE2B 8a4a05b6da97aed587749d8b092f81a8c3c6218c9cc4a8c406bbae3e6ea61eaf1ea698ac1d89662abebc1d3c872041542141686966e919d05240d12b0f60d4e5 SHA512 a2a4763c155f6fc87ab5848f2bc4e84b5881ec82fc430535e3cab2e32ec8e77b1d33af08149b43fc42ac1d7e9f75317484a256f0a9e208abcfc1d0deeb6db8d2
+EBUILD luminance-hdr-2.6.0.ebuild 1835 BLAKE2B 1b03d602459cceeb2b78a93cb89142ecaad7fd6c9b4392da66e8e3bf0fa394683243229da1e78351deb39998bbefc4e5a92db3dadf833620282a764ff5b62fcc SHA512 ac7d21ee788f40dfc7fcae217d311c27ee096ad522ee7a9d00ca0cacfbbe816ed9cbe0d23ee398ae5d8d72961cba4e06ba4dbb9599891c960bbf95ed59be2cd8
 MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
index e81c86dd57d8..7ac7a23ce19b 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtpfsgui/${P/_/.}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cpu_flags_x86_sse2 fits openmp test"
 
 BDEPEND="
diff --git a/media-gfx/mirage/Manifest b/media-gfx/mirage/Manifest
index 4edf25884be6..e1f54b6debc5 100644
--- a/media-gfx/mirage/Manifest
+++ b/media-gfx/mirage/Manifest
@@ -1,4 +1,4 @@
 AUX mirage-0.9.3-stop_cleaning_up.patch 679 BLAKE2B a13a62d07cc23e2cf9fdac0edfb3a438ab9a3b3dd6d22157a7930a86bc2a3d027de15293621fcd1ef166fdfc279e8b23dcacfd7551d9a18848f0601ec878466a SHA512 3269a11d970b0e21fff211a7d324d5d51054a8dfb547b15345e1fb252f3c311e42f01d59849a9bbd7e19a39cd5f918231e118aa65673d91bd08ca5312db3ec67
 DIST mirage-0.9.5.2.tar.bz2 114991 BLAKE2B 7c2494ed799b0034b81e65d4fffc5c30823ffef5be9e4f5240109d5979b4fbcceae2ed4ca4804406aea33d069ffcbc032018307af7434da6ac1b1ec3bf8fe19e SHA512 c754c7c74523f060cf5c120750de3a5d9935eff2b04a30b4f266939528c1b01f26a27294765dbed47adeef88301cb3d7ff8f7464e6504ba5e8ff734ec0685c76
-EBUILD mirage-0.9.5.2-r1.ebuild 826 BLAKE2B ad6d371e148fc075291086b61b1752c64497d9cdd4fff7db71a58f503a472f1849b2738b4684de298702cd60c31eede2b93c7a894dfb237ab7b79fbb40b98d24 SHA512 67f6e7a34feee2b673e14dc7f03e71f3365d472f854366da690788b20fb79e7e07c88144cbb270cc87f97613e7e04b4c2ff5d544f5510b6b8a07529d3e03f651
+EBUILD mirage-0.9.5.2-r1.ebuild 816 BLAKE2B df0f65e0cba852178407b456ef153c8b51e7753d12b45c406ce70c3d3db4f815f8f85f4489b796c16e17fab0957ed4ca0618f9358895bd3235855e6636a7888a SHA512 3decb13ceddec5f84f53e6e139c85ce3d8828b366b7225f7d70ecaa41fabc9dab1787d4a9986c36f26fa4a8902f4de0339d4de4762e7acfc83b1cfb6a963d4fb
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/mirage/mirage-0.9.5.2-r1.ebuild b/media-gfx/mirage/mirage-0.9.5.2-r1.ebuild
index 8fdb3e7bbd00..71ed3e1b089d 100644
--- a/media-gfx/mirage/mirage-0.9.5.2-r1.ebuild
+++ b/media-gfx/mirage/mirage-0.9.5.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index 2f1587d312cf..db114eaaa1fc 100644
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -4,6 +4,5 @@ AUX nvidia-cg-toolkit-gl.pc.in 278 BLAKE2B ef0bfb9b76386c078e36b700166069fd961b0
 AUX nvidia-cg-toolkit.pc.in 242 BLAKE2B 45f19a2791310975169f8a31bf65d77a86b4e4487502c40101622070a28e316ae3bb910e7bb3d8af0073ac281ab4ca0786a081e1c1ff8955c125bd3fe1b5403b SHA512 601505a228eb4f70813d3ab6346a51c1552751278549c81b7721273dd58c053639cad49cfe82982455b1399d8b494f8351a0a479efbdb33171d28c3dd0b69073
 DIST Cg-3.1_April2012_x86.tgz 23332348 BLAKE2B e8253cfd1b569e1eb083ca394ae969ca43677641763eb77c24381198914cb1508bd41489224d8cc1afefca2affb485320022bd35e7ffaa48aaadafcf42f89183 SHA512 7b2addad157e151eb42b320aea31ccddfd53ec5640cb97bc86a3d461c1b08a2dff280bfc3f7859d124c311e1710e39d40405c387e5724ebc82d95303b250837a
 DIST Cg-3.1_April2012_x86_64.tgz 24829131 BLAKE2B f1425f391022aa57fe2b23581786576ab8762a48e9ffc875853d55399d3a996ac85debb099d0b906dcce6c95989a06c3980bfb59dc69edc16d1378ba5dc89c73 SHA512 591b51195193e7e3bbb9f1c2579336d24a179b0a88b955a01f4661bda55543fbccd73cac53033912f2eea8a1068e4c1394c6d286f195963cfb33a0d8b4428e27
-EBUILD nvidia-cg-toolkit-3.1.0013-r3.ebuild 3276 BLAKE2B f220bfe2757030965ecb976888741e4b45e63092adef1295dfd2a7d1ce5e55b1c602986ee68d9c8d9752278eccde873ab959fd419fa67cd724a985ff7df43fe4 SHA512 0728caa22289a34db3f4ddc60f9ef8df8213e0d07d71e94f1bbe707c109a3a5fc493220d4db007c3a6c7aa7854dae216a3e1c3ddd4d89a1180182e77c1002a64
 EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 3177 BLAKE2B 75152e6051dbe1fbb6c9c1f176b1733a7a7910fc47f4998e2e14ef109dd89cca1f21e20afd74b092078bd87154defb9a7269f9d1af51dbffce265ba1fe66a21b SHA512 194f642e56728a90c69115281ec7fdd0d346b50755ed337f8c1f31d4e877b1b6942cbf0ff562d3c05d478a8c20b32fdda9b82b6a25aa17b6d486ad7c18732dae
 MISC metadata.xml 652 BLAKE2B 8bb1f448a07402e9de7b8265b50318595c3b7de92b8b444b92dce29ac428682ab856f6d4ed668579a8fcda48b8d17f975b69d08154a54cefe7dce8916db0e0a3 SHA512 cde9ca3c2c16c3a83593c4fbdd1b05f5b79596f42d77df5f20470d7e2cbca2e445fcac254dcc7f31e41938f756d1bd5b314c7aa1a2dc6a7bc19f170a4d7e1656
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
deleted file mode 100644
index 93cd75d8d7ac..000000000000
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit multilib multilib-minimal prefix versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-MY_DATE="April2012"
-
-DESCRIPTION="NVIDIA's C graphics compiler toolkit"
-HOMEPAGE="http://developer.nvidia.com/cg_toolkit"
-SRC_URI="
-	abi_x86_32? (
-		http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz
-	)
-	abi_x86_64? (
-		http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz
-	)"
-
-LICENSE="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RESTRICT="strip"
-
-RDEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	media-libs/glu
-	media-libs/mesa[X(+)]
-	media-libs/freeglut
-	amd64? ( abi_x86_32? (
-		>=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
-		>=media-libs/mesa-9.1.6[abi_x86_32(-)]
-		>=media-libs/freeglut-2.8.1[abi_x86_32(-)]
-		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-		>=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)]
-		>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
-	) )
-	x86? ( virtual/libstdc++:3.3 )"
-DEPEND=""
-
-S=${WORKDIR}
-
-DEST=/opt/${PN}
-
-QA_PREBUILT="${DEST}/*"
-
-src_unpack() {
-	multilib_src_unpack() {
-		mkdir -p "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local i
-		for i in ${A}; do
-			if [[ ${i} == *x86_64* && ${ABI} == amd64 ]]; then
-				unpack "${i}"
-			elif [[ ${i} != *x86_64* && ${ABI} != amd64 ]]; then
-				unpack "${i}"
-			fi
-		done
-	}
-
-	multilib_foreach_abi multilib_src_unpack
-}
-
-install_pkgconfig() {
-	# One arg: .pc file
-	insinto /usr/$(get_libdir)/pkgconfig
-	sed \
-		-e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-		-e "s:DESCRIPTION:${DESCRIPTION}:g" \
-		-e "s:VERSION:${PV}:g" \
-		-e "s|HOMEPAGE|${HOMEPAGE}|g" \
-		-e "s:SUFFIX::g" \
-		"${FILESDIR}/${1}.in" > "${T}/${1}" || die
-		eprefixify "${T}/${1}"
-	doins "${T}/${1}"
-}
-
-src_install() {
-	local LDPATH=()
-
-	multilib-minimal_src_install
-}
-
-multilib_src_install() {
-	LDPATH+=( "${EPREFIX}${DEST}/$(get_libdir)" )
-	into ${DEST}
-
-	if [[ ${ABI} == amd64 ]]; then
-		dolib usr/lib64/*
-	else
-		dolib usr/lib/*
-	fi
-	install_pkgconfig nvidia-cg-toolkit.pc
-	install_pkgconfig nvidia-cg-toolkit-gl.pc
-
-	insinto ${DEST}/include
-	doins -r usr/include/Cg
-
-	if multilib_is_native_abi; then
-		dobin usr/bin/{cgc,cgfxcat,cginfo}
-
-		insinto ${DEST}
-		dodoc usr/local/Cg/README
-		if use doc; then
-			dodoc usr/local/Cg/docs/*.{txt,pdf}
-			dohtml -r usr/local/Cg/docs/html/*
-		fi
-		if use examples; then
-			insinto /usr/share/${PN}
-			doins -r usr/local/Cg/examples
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	local ldpath=${LDPATH[*]}
-
-	sed \
-		-e "s|ELDPATH|${ldpath// /:}|g" \
-		"${FILESDIR}"/80cgc-opt-2 > "${T}"/80cgc-opt || die
-	eprefixify "${T}"/80cgc-opt
-	doenvd "${T}"/80cgc-opt
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 2.1.0016 ]]; then
-		einfo "Starting with ${CATEGORY}/${PN}-2.1.0016, ${PN} is installed in"
-		einfo "${DEST}. Packages might have to add something like:"
-		einfo "  append-cppflags -I${DEST}/include"
-	fi
-}
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index d4d877ea25c8..eee6d2f98f92 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -1,5 +1,5 @@
 AUX openexr_viewers-2.3.0--with-cg-libdir.patch 811 BLAKE2B 0f2789e55efd1cd25308abfde02bb67fe77a099a509a4bac78eca078de6b18e326705718db061338b4881414e688fa307d70d132a0ba0ff72eaade127234b732 SHA512 02f579d246936f1ebb8e6afa36e21c10cc6fc7eb1a24e168b75c27aafc6a6abccead8e9879d1128a1d6f22ddab4162c97c2df5940c6b71cc6d6fc2cb89527bda
 AUX openexr_viewers-2.3.0-fix-configure.patch 2449 BLAKE2B 226728e4183784337ab684b9245f74110772156fea1b4be8441c7bb14fe2887484691c200e05604f9308204c9221d5b7e7f3c343e5db3cdf0a8896fb13fc5590 SHA512 29a22fee7f88ce1359e74185f8baffa9e734f20555943cced71c198f5c716ab8f8aa5686f11f40e5ebc10911cb82453b784eeac06632f6700d8f4fd3a9ec5e1a
 DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d
-EBUILD openexr_viewers-2.3.0.ebuild 1307 BLAKE2B 6486e650eb12a71f9525542f37052da5c9e5888f0bee7dba5bd1d192cc9c0d25995d35b0675b2d2abc467f302a595fcb28d6709be78780939ef21d5c8d78fc1e SHA512 b86ba68608e36b3b67384cfb62f7e51c7d190799fdb9d624833749634ed917c646add678eef1eac5746a775a61cee2df4e005e35f98c4e98f96daa44b813c794
+EBUILD openexr_viewers-2.3.0.ebuild 1297 BLAKE2B 366ce7f6a04d538af8f576c772ca75a4ec358472fe6afa247b51a778d5a924a5f23a80daae9ea4b5a04e8eb418b63d38fee8692c4f6e2c68faf848e2e7fa1f94 SHA512 142b637cc0daf7dcefc6eee6afe2e3d347dfea66be64b9cd1d05e63618d47309d88e130e7516844b3e0386c52b07aa0c07908122713bdf6fdcd4c03f437deaff
 MISC metadata.xml 379 BLAKE2B 3f58950f3fccc797478abbd2b60325904cc3288586e4a180a366e0b99bb7ffa4a08022138c658b3e0db861a720232b44b7bf4bb2b2bdb7f59856272961e1c6c8 SHA512 97d3ed7e0ee8f419d36df6b6ccc3b3e704445935b76fab412b4287ac1b88688591f775927e1cc333a85a64818cbe1c9c3e760d2ab734215c0f558639ca033b6a
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
index a1981cf42cdd..89816e0f3c15 100644
--- a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
+++ b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cg"
 
 RDEPEND="
diff --git a/media-gfx/pngtoico/Manifest b/media-gfx/pngtoico/Manifest
index 6d3dead4cdc9..1b0ead29b9b9 100644
--- a/media-gfx/pngtoico/Manifest
+++ b/media-gfx/pngtoico/Manifest
@@ -1,5 +1,5 @@
 AUX pngtoico-1.0.1-Makefile.patch 467 BLAKE2B 7f8e68c8f2469b86da5396da2bffbb9bbe23419660b0ba05df6b2eb6892ed4559fa3a976f2071753074ef7c1197119767e4ea450b8831f11ca0c2784cc796b2b SHA512 e8658146be6b61046a4154a4282897df0bf9336ca5c536a383ca5d80487a849ef972fb02dc003f0228c59bf8f1c17783f72e3191055d0cb3b4582ce98af087ed
 AUX pngtoico-1.0.1-libpng15.patch 231 BLAKE2B e2c360809f356e50bc1319210b55a2aa9adabcb4edb84ab9a871286f065dae81525b67738e1ee12f44265f079cf5e415c4a8ee33cce1410e93a560729ebd830c SHA512 a32a89b248d712b776384d30ff76b9e4b119acf292f62b5e82b36387e1a4113e8926209543859509cfcd00b85ad4a8f95223a66fa1fbd4771b5a7779ed66caf1
 DIST pngtoico-1.0.1.tar.bz2 4355 BLAKE2B 47f35525b261e0c9261e2da5d16eb5068f151dfd6e36da6595884946836e1051312c610aacd5760ecc1c7b49f8df6b507b799f80a08b014b4cf136d9ab366668 SHA512 240d387b6d83cf9243d003d3233b642d1ae3f29f12ba5c97a4e0aa17f6a0d48ea035fb3f7cd4d44dd3d1056e713c6f5a3a4ae9b9bee8e191a564ed162bdebf7d
-EBUILD pngtoico-1.0.1-r1.ebuild 679 BLAKE2B 66802ee32e0ad10f15cab81fe1160acbb5436f0933f41ecec7caf4e097ad659d36d1ec35dc4ef513c35075538b87e13d44b43f403312f9d9dc1ffd01e1372243 SHA512 f07058701788c4f48e1a9d107610ad2b2f172a49abbfb8bcd3536dda6599e2e157432401e63f952382b30c91aa917c2bd8b42ed1f84102b7484dfdacecd42a35
+EBUILD pngtoico-1.0.1-r1.ebuild 690 BLAKE2B f464cf5611b85131619fba99f28e29f3aed848f13e7f9ba5c98ed53d65806fa5e55ddf383cd8f9e2566080e6bf0ee0f0ae920c07299969af7b23aedd4cd3f5d5 SHA512 10a16c3bc36874abc8ceafaf08fef2c5d2b96f3ac6675cd1c621f12157bd82e21698d8d9e4c3d65b0c4051b4923ddf4890822f28b0f9651386a5201de2ad5d7c
 MISC metadata.xml 241 BLAKE2B d11260008412b27ed0c22e21420a082065b8ce13021a7800ef00ade71a7746d834686a3685dad6250e10ab8b6eee8747a3b0bff3d6f488cc05fd9c769194f8a9 SHA512 3e1af4796a9c6a176936843173357f35ff94281769b8f35e0678fa403a294a0bb0eb98f371d129cd19b74e1cc8e84cfa8db71e9ecebfb67394a51d55e6d90642
diff --git a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
index 2224bdcc6630..2c6647ac4bd3 100644
--- a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
+++ b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
@@ -6,7 +6,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="Convert png images to MS ico format"
 HOMEPAGE="https://www.kernel.org/pub/software/graphics/pngtoico/"
-SRC_URI="mirror://kernel/software/graphics/pngtoico/${P}.tar.bz2"
+SRC_URI="https://www.kernel.org/pub/software/graphics/pngtoico/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index 8dc90dba8857..c5fd10431532 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,3 +1,3 @@
 DIST potrace-1.15.tar.gz 650840 BLAKE2B 1a2074ff0ff958e1c9cbcd35a6267ef7f4bdfa5ba9b511413fa2c5db16a7263ed27291a0bf7c76feb25abd59db099e1096b736eab28a6397accfce88f42fdeff SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02
-EBUILD potrace-1.15.ebuild 824 BLAKE2B 8aa9054b5b6e84790321458424dc6f37feee08c147a5a221bffeefe48e3cf6b221389ebad32ade8f750bf8a6b9e55abb265986b67a438e642630b6614d7d43ff SHA512 24897e05bcb3d3e079124bd63f9012fbb18842f695d2ed8befe2798fe72d72a23b1c99ba85f732740a7e9a97a021f8e813a3438eb18322d5506d98b4ed338c1a
+EBUILD potrace-1.15.ebuild 802 BLAKE2B 90ab4ca18a92cad6e0249210767b3b47925f2dc1a307ab1bb93533647b8d000ccddb8d311b8057f09d30f124abdca51f1cea335396c6186d758d34ddc0360bd1 SHA512 e8079aae16749a380bea1278dfd0c521d55615be793a885d26389e8ea31d9f278ff1f607b1a0c196473652031f28f8ad8e74095456e4dcdafbe53bc69a2c354a
 MISC metadata.xml 534 BLAKE2B 04a21e1af300190548959fc595c0f0ca4918bcc949bb6f5ac6747f79806b3c2f3e57ecf25076e8d8a876ff1ee45b8b816e89c957f8ca4e05292ef390c5de32e0 SHA512 00f7a8a90caa7e7d9920929733f084d41baf72c45dc998255c54964eb50f6ec70d6af8666463fdefca27f95156834f1c4e9676f115bbb86538e979967a73b6c3
diff --git a/media-gfx/potrace/potrace-1.15.ebuild b/media-gfx/potrace/potrace-1.15.ebuild
index 23edc0c46832..00f83d8c4f1d 100644
--- a/media-gfx/potrace/potrace-1.15.ebuild
+++ b/media-gfx/potrace/potrace-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric static-libs"
 
 RDEPEND="sys-libs/zlib"
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 7233e28df9f8..596b1719701e 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -6,6 +6,6 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4610 BLAKE2B d685d139c0a68deb3079a7b573f4086d6fd53383ff08bf7ba8044149aaae799245ed8b2a72386949f0bb853228d0dbd3879e185e5ec1683de633b5d712908f37 SHA512 b4fc9a89a08f471dfeb5692e10644f38b4a305f14b77cb53e307e8d5cffc38afea0c4b09079236e08f6752761ad5d45be6450794fa7cc30ef7dee62596e95105
-EBUILD povray-3.7.0.0.ebuild 4392 BLAKE2B 7889135b1482356090f1073d4680e17905335c7586f20d47d8dc29c375e802c3440786ede36715e3f873c70d2ff61f30fff0ab2125024aaa12dfe36b99b871d1 SHA512 c74582d9f9534c9b1c3976e2c7bb5d61a4e24afcdf4ffe08ea2626125e96a5549805d0ab5fca60410da4842e446932dcacea2d628391282f8c6dc06980c56a5c
+EBUILD povray-3.7.0.0-r1.ebuild 4600 BLAKE2B 4de36a7661c6c6e6acb59982b490f8f4aa73c3b06d34fa56f589a29ddb827b3e2f500804baadba82393a167b8fcef1949bfe608512e0a2ab19a7f1dba6817486 SHA512 260c687db531dc2d70b699264768eea74022ca3af33c05b0c755d752b303f5348763ec2eee9443a6731dc0bc4e06c23fb2748f99628c0336edc206605d744fb5
+EBUILD povray-3.7.0.0.ebuild 4382 BLAKE2B 70ff0cbe6d4cd48cea00743eff20a2fbe77a552ae347665fbd389878a3ad1830344e6432250b2018e222c3164d316c27fc2d22ba87982bb7352994d173501c64 SHA512 ccd2db035aff782d0d8a05456525243f70ac38c99d6437225c9d56b81dd18e96b8732627982cc2930371648f7cbe6f7aca4d10180004e3daec856699f40ec13a
 MISC metadata.xml 504 BLAKE2B f0b8ba895e8949a452dc4ddac0f3e78513b3c91107131d288e9e4ea7d1dd406622ac8a3ddeacd0b3df039ce95ab6f3dd339b80bf91f48ea99ab6d5c74a6cb4d8 SHA512 e2146892acd26bd3fc03fe1733f67073a1db1106f568ac886548b7c3e4fef508d1f3a619d74b8573696f007ae764d26e1f8556c3dbb03b9434b71258f0bcbb00
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index 25d38e4a1bca..235c82274deb 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug +io-restrictions openexr static-libs tiff X"
 
 DEPEND="
diff --git a/media-gfx/povray/povray-3.7.0.0.ebuild b/media-gfx/povray/povray-3.7.0.0.ebuild
index ca52087701ed..6908555adbf9 100644
--- a/media-gfx/povray/povray-3.7.0.0.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug +io-restrictions mkl openexr static-libs tiff X"
 
 DEPEND="
diff --git a/media-gfx/psftools/Manifest b/media-gfx/psftools/Manifest
index ab329b0c8d4e..b88e85b32049 100644
--- a/media-gfx/psftools/Manifest
+++ b/media-gfx/psftools/Manifest
@@ -1,5 +1,3 @@
 DIST psftools-1.0.10.tar.gz 764867 BLAKE2B bd92ba1b65772dd5a7393fdd6e6350c0faa0bfc43d7fa3ce1018e464a9c1729bb0977a10094253947f6e1cac97ac4d120e0f60c85c7f15b13a47194a3527d1d1 SHA512 83759e0282af8dee26839561bac0987bba74e3173eb5091e70031849a67b189c5c10dfb64241fedf1513b319554238d4147acdd6ed3d0f15eafac3e7fc4a26b1
-DIST psftools-1.0.7.tar.gz 547537 BLAKE2B e3f3acc79efbfdf42a804f665553d7cbeb6c431cd36f3d26b3af37251197fb697d28127ed94ec2f409d4793272b7a5c293b1ba12ec8b94206790aadcfee4a509 SHA512 9135f4aa8ea4a4cfdaebc7764db0409b304dc34310ebe84d6fc786d42a392c79da4f097b6b3526edaf862305edf8794ef62f6bf48a3de5dac22c8e0c0c77aa14
 EBUILD psftools-1.0.10.ebuild 553 BLAKE2B 6efdb4c116339a2a058f127ad36896e61c0e358bf012c537baac7754a252bc96317f4504047861f36718d8cdf7be7bcb8a06a6584f3a8d37967ee374fdd6772c SHA512 be96d4a5caf040c23a8fa59ae93bf2c7d69ecdbeba1bad587303c6c5ccdbe9f2b5ff790b68233966e8319cb63c15b2f0f1f41397ebc2494ae0ccc0d335bfc2aa
-EBUILD psftools-1.0.7.ebuild 451 BLAKE2B a90833253dd9858128716ee954d6290e3befdb4473f527a953210ccf01c89c6c7f33eb838b51d359bdd305c05c1adc7c3d45588431e1073ebf6b2219f0c042d6 SHA512 b4cd1316903e27803bf9de32adfae88fb74c79574a537d6a3a342b123facf4ee9d4e0c49872fbc6078936d3fc7560382f58ce19631c7a9c8d5f482b99f201fb9
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-gfx/psftools/psftools-1.0.7.ebuild b/media-gfx/psftools/psftools-1.0.7.ebuild
deleted file mode 100644
index e9e8e4bbf30c..000000000000
--- a/media-gfx/psftools/psftools-1.0.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Utilities for manipulation of console fonts in PSF format"
-HOMEPAGE="http://www.seasip.info/Unix/PSF/"
-SRC_URI="http://www.seasip.info/Unix/PSF/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS TODO doc/*.txt
-}
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index ca0a2cadef20..53f7fbbdd5e0 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,5 +1,5 @@
 AUX pstoedit-3.60-libdl.patch 428 BLAKE2B 8ed39e1a13da74ccecaa2aeec57447fc75b682c9ea5a8fe6586052fd766bc9ab23cb76bdc56bb613cb43672f6d10a05cfaa8bc860865d2586673ab4a9c8642aa SHA512 dc29caf4b1bf1e6ce7cc73fd5ae1682f0aba8a798f632d29cca450bf3883afe54142ea06fbe6d9aa07f2580450780afe1c671cb1c37f1dd800582b2036797f73
 AUX pstoedit-3.70-pkgconfig.patch 627 BLAKE2B 00412e11239e49f12babc35f2225c7ac2a25ce62e59d8b3088c0d7284b867c8919dc70c61bc60cea06e75dee84698eaf223861ad8db09cd36dfdf5ee813aee9c SHA512 8edfc9f0c0db6371405ff16641294c8aebb7dc09e9bc8b9114c7506f4fd494f0361b90abceddad68c351baa2d2917b6212056ed69c0a6dde0d914a2c801888ec
 DIST pstoedit-3.70.tar.gz 1013949 BLAKE2B ec459dc56851d942076adf4352ef974188b0b8273a6f9150c8767c1d63c3c9b6d993ea8c0b1a0b59663b31652eb7a4b8697e4c38c23d5aa0572d554120a5e900 SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
-EBUILD pstoedit-3.70-r1.ebuild 1317 BLAKE2B 8e248d3c928eae018461d37c1c3117e8e41cf95b7c545f1710f80b2922ac8580ffa39de8479b44b0aae9781ab05316db051c47775006bd052effeaadaaf121d6 SHA512 024d93c122e689f185e015c0dc5ec44ac119e59bf74d7cbfeb81ebec73253965dd80a5ad62846de3a9851a031ad199b8f21f82cf847351a26167b6c772f4a4a5
+EBUILD pstoedit-3.70-r1.ebuild 1295 BLAKE2B e8bf30e99080f8e2e6a9a3618013ae6d95f790e4470d141a42f1193c19c5ded2b23bd475d6cf534654021dd75c39d02ff721120822d610d8daa7a51040046714 SHA512 7023242000af96db657c915d6307d8a56f48108112698a74285291197adea3d6cbb1455bdbfe6d7f733fa1414dec5c7fd49c0e26f46687eab8daceaae3e8dc89
 MISC metadata.xml 633 BLAKE2B 3a142022d38aaf0e5bd5d6df58b8a6e2f94589992eba8a48d875138af60bb44d8893ed91a7dcb169246ff2d2405940c406d5d37f84bfc9c621b8771b96678f05 SHA512 6d62633c23d2b45c5bdf75e8e09e3f58def09a2512e540699857809ea79ddc41c823cc382a9a412b6dc061e02c3b5574c8addc7bebd6e7bb10caa2c2408162a6
diff --git a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
index b42c1daabf47..76f9250a7c8c 100644
--- a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="emf imagemagick plotutils pptx static-libs"
 
 RDEPEND="
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index c73a7f1c4a63..5d77755b75c5 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,4 +1,4 @@
-DIST qimgv-0.8.2.tar.gz 237098 BLAKE2B da71da019e87041cfa9f21592827e5a5623b2088e1349e534c437b0d5e50377980279fe99b7a18fb447c99ddb643a15c418fcfa2f261d3a559c639f560add0c4 SHA512 e80caa356cd2c7607a1d92a4ef4a79486ed504adb8ae454557e6a94d1d3ca5c023b78921e49777b1a06ca82556255d51357948281aae6a671ec01c597492a2cf
-EBUILD qimgv-0.8.2.ebuild 1112 BLAKE2B e05f594b38b95380bbeed1494820efcdd67dd02d9d8ba33d445075a6dc3067364e6b54c73de2b21e511a312cad28225c72e773f3664209fe522a19df5a5144e6 SHA512 205f9d0cd702077c0c37b481eb783a22836af40bc2ae46196ab5d567108b69983391ca9b7824c484ca81920dceff0428189bbb8d4cfbb1988e47e46c7ac7734b
+DIST qimgv-0.8.5.tar.gz 242650 BLAKE2B 25ac2854b0c35e2288b0e770559bac5ac0152df1e73b025fe99609e3f7126ad0c5342a6f87dd34b0847b22031ca77db7b98b1ef8b9c278fcbebb395454d426a4 SHA512 f4c3df7db433eca04ed0827039a02fcbb6e0d5b2f696010351dc6238c39b7a08784780ad8d56f3701d13506dd6c64671ce361817928d7fb2bb25b88c3f3d32ce
+EBUILD qimgv-0.8.5.ebuild 1142 BLAKE2B cc9ef55fe3dc53342df720bf25d4dd6af93d43143a6d1ac70ff409ad2488d6ed76e7ead64bb4e525abc95511d81cd2b0863a4ab811107989743752281e77be91 SHA512 abd4d018e39c311d4a84f78737370bbda9a55a44479377adc08928689c225c28f944ba6b041a520bd7b0ce042983cb4665778a35fdf886e5cc4fbaeeddcac27a
 EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670
-MISC metadata.xml 365 BLAKE2B 84ac26390de8ab8b943b77f3922629d2b687fc15dd8a983480375c854fea4001b0772e52263a0883a5e0d8b32db7eaf3432c763cf54d0bfb0358b3ffc0fd0e69 SHA512 974bc950ab7ff01bc784247efbf1c5090974d5af3afc668554050bd0f0ae76254245c008175db0161896bf176049c574e421c1173774cb4e89e4ff9bd00db358
+MISC metadata.xml 453 BLAKE2B ca83aa2e239dbd9bfca29a20d99b8d352392db1f17fd77497d6eb6266e19e300a30c5544508a479ee6832a6ef1211ff5df08787b726839e5ad39fdd21f8ab5d7 SHA512 ca30cade161d874f67a0aa2fdc6084bce465920bbbca9cde599f6b879dfd6801426d6603e02bb9f34f1ac1f00acba896279f231b49bcc9cd3f0355ff4bb310d9
diff --git a/media-gfx/qimgv/metadata.xml b/media-gfx/qimgv/metadata.xml
index ccef191fae16..840ab55fbe94 100644
--- a/media-gfx/qimgv/metadata.xml
+++ b/media-gfx/qimgv/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="video">Add support for gif/webm playback via libmpv</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/qimgv/qimgv-0.8.2.ebuild b/media-gfx/qimgv/qimgv-0.8.5.ebuild
index 52a5b418e7b7..81ac18fca861 100644
--- a/media-gfx/qimgv/qimgv-0.8.2.ebuild
+++ b/media-gfx/qimgv/qimgv-0.8.5.ebuild
@@ -12,10 +12,9 @@ SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="exif kde"
+IUSE="exif kde video"
 
 BDEPEND="
-	dev-util/cmake
 	virtual/pkgconfig
 "
 DEPEND="
@@ -23,9 +22,9 @@ DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	media-video/mpv[libmpv]
-	exif? ( media-libs/libexif )
+	exif? ( media-gfx/exiv2 )
 	kde? ( kde-frameworks/kwindowsystem:5 )
+	video? ( media-video/mpv[libmpv] )
 "
 RDEPEND="
 	${DEPEND}
@@ -41,6 +40,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DEXIV2=$(usex exif)
 		-DKDE_SUPPORT=$(usex kde)
+		-DVIDEO_SUPPORT=$(usex video)
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index c9b0bc50cf69..2905b8dae638 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
-EBUILD qrencode-4.0.2.ebuild 772 BLAKE2B 11ca1bc4a0623c5103a97ffffe14d95fe2ac5fe2c9eb8e42e50c6a53d6a9d631ce3db5e3bcccbebd82e91c88cba4913038749ebf176de0244ad20d5d74a85f6e SHA512 bbb9c68a38ec47d9c3c638cc761fefc5b315aeecaf3e408902fef4e998baeb5ad2edc561200c0f5a6445b26aba3d2e73902112aaa45df4890019ae91a3998d1b
+EBUILD qrencode-4.0.2.ebuild 762 BLAKE2B 8a2c329585741b7ef23870eac8d34a3c236e7a9d69b895e718cc67ae8504e0d0644f3f9ba176c4f489ef882748eb4baf973a201b2febf7e75fd88d7ac67201bc SHA512 34973be8c02b8668bfb8de801b3dc34c82063bb521e0135f1c695d9b326f03d93e24dc0fb6d169d46cb0191cccf0bc13ae9306679d9dfac93573ad0f8f5632c7
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
index 973d1bda8962..4e8725288441 100644
--- a/media-gfx/qrencode/qrencode-4.0.2.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="media-libs/libpng:0="
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 23792288e8b8..58edaad9be46 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,8 +1,5 @@
 DIST rawtherapee-5.6.tar.xz 12083264 BLAKE2B a0eb09e98e1041b393ad3aa671641a2a4855379cef6245ca3cca2588ff5f50fedf8becd88bad1ab70f63dfb575f5f22c141040defa10b47268947415999d8e79 SHA512 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f
-<<<<<<< HEAD
-=======
 DIST rawtherapee-5.7.tar.xz 12092496 BLAKE2B 40d97d09106d7d2b843376b4c58daac87f99315604bd8e704e1f231c17d01896cd732da2449f84a59ed221fbf6a929a5db8e728977431fdcc07f3d30120b633a SHA512 8101ec66d9be4cab0c0b91336a3f83a32a6220a2f342f1c74d604c15686ee08bc7dbc090232916f13d5436957d800b64b284a8a9d3352f2f721266b07e005162
->>>>>>> next
 EBUILD rawtherapee-5.6.ebuild 1621 BLAKE2B 9f963fabf47cc479f8b840648b227058c232cfaeefc8904fe2ae2ee38e4b219b427633b8575ffd27172bc49c0fc4c99973e55e193883bc1f6fb35f0176d19e2e SHA512 557b60056ab12fb8b9dea4702e7fae0d2438abc89a5f414d75cdd353ee7a99ea6cbafc4df118ad7272c880dfc0f1a107a4ffff190e9a317b75de68471c15a336
 EBUILD rawtherapee-5.7.ebuild 1623 BLAKE2B bf3e2d94b876c48aeedcbb2030d282753a78da2a4c905b5565446ede991e854277fb2ccd99f409d52ccdb5df986f50525cccaf42e0b1124f68a22c0ca7311865 SHA512 4aeee80c36f123d97d55ff343dc326428f597f74d282f1186cbb9255d0ef2f29dab7ad56cb886e7b20dcbe1353a1988ff205b7d2cc3fc2c1580bbf18b8c6d8c4
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 5de6198adac0..cba76a72a173 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,7 +1,7 @@
 DIST ristretto-0.10.0.tar.bz2 586447 BLAKE2B 73e4be551879d58e0c43b7a039b3173e96df8a7c367bb1696dd27a6b20fc675465e6a78019e11498f0dc55286b605c7ab9545dd7d13e2607bc0fc05527947568 SHA512 1727025bbc056a71475d91505cc141661b011c3944cf4ca4d96b48a9ad7e1b28b8f4b0c856fa789cd2c877c1faa27aa57441e35e06f38fd2b81ddcd3284dc2b6
 DIST ristretto-0.8.4.tar.bz2 581374 BLAKE2B 8d4dc91daa1aebf7d8193d8a48c3be29ad6fed86b7fbea68effb63f6a56d2d39898b5ab0c93933adf9d65cce327109dca5ecff96855c4311494de7cc4182213f SHA512 c5479cde66e4f0903b9b8d9b1b8f4c7cde35ebfa334e414c8202e783c332bd4bfec650f85d308c7151d31fe84b27a13bb4048290b0a82ce7b8ba4baf3e4088b8
 DIST ristretto-0.8.5.tar.bz2 583736 BLAKE2B b2c0582eb7930eb3bdf9941dc086befd6a81f0d3aa8ea5ecdbedb00f7914287937e520c5257853d080dca4ebee08f1c40f8e8386a6de90856721a804462e9cab SHA512 48d2a68cd13e58c0f450fc674b031a4fc4495ece0ae00805f0564a5bd9cc2ac19c1c009726dd343bdfeffa59509f0ecc9cd069986af5a2ff2c2566c4490b5fbf
-EBUILD ristretto-0.10.0.ebuild 876 BLAKE2B 7b6130fd29611418ddb9a4b1a2231fdf16e1adc52f1a3897a5b4b24a7ac7b9b34ed7a41f44a306e99c584dba0cb5896bc5706c0fc8d807ef485ddcaea8d69ab3 SHA512 cd7c28b2514bb4f1c1972b682bce0ae9ef1e85f5f631849fd9643c2b3cdbd569aa88e8d47517e3545a2079b7996086b7500d4a1f56dcbec6fd82a17dce23c2cd
+EBUILD ristretto-0.10.0.ebuild 874 BLAKE2B e07b94b57833859413826556f0b18150b2fada428c24b6fa33a57c1f0b4188bd2bc29ec1a3b2ead30d5b9c68192b4d29f62c11582e94322dcf8d0d5be8e40f92 SHA512 9d8917e11a0d27ba3f975c007b6e8661ce5cd2727b82990b80436495d34209df5d0e7f47581d1f53493524fd3898592f5322f829a4a634d0fe4b1c269acfcb1a
 EBUILD ristretto-0.8.4.ebuild 876 BLAKE2B c950d825ab3ba23f9a0660a45c18874d591271a86e03c32d77be2908af0628cd1936290505f03a3b523ffd8932a453a8467d5c37062b6e19800635b8835c812f SHA512 42a4b7741c85d52878adc859fe4b9c9a7c5680c59be2c9c52bc9768371c2f39b89da1f01130c63aa4e66420b7d637531355c9eaea418d761b80024bfceb8c337
 EBUILD ristretto-0.8.5.ebuild 859 BLAKE2B f78523b7231cc1539b258c3fefa5087702c85859c456d7bd3200c5edbb194deda98d7ba0fa3e5bed4ee37461f5990a7f77db5e68b6cc86724fc298317e6a302e SHA512 0a9dcd229aebc553cf39dc4b349b737eea6d30941e60b05c4c8236cba84de6af4532f26a9bd1f77b39d7dafdb25f7a7b6b596226f0191e2ab73eb684f6495e70
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.10.0.ebuild b/media-gfx/ristretto/ristretto-0.10.0.ebuild
index 4fc93d04e8e5..4377e583baec 100644
--- a/media-gfx/ristretto/ristretto-0.10.0.ebuild
+++ b/media-gfx/ristretto/ristretto-0.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42:2
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 8e41e70164d4..4df0fbb39db5 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -7,7 +7,7 @@ AUX sam2p-0.49.3-perl526.patch 648 BLAKE2B 0fa1d54116325cfbf1720c8465ddf5d8bc6a3
 DIST sam2p-0.49.1.tar.gz 562304 BLAKE2B 57d14c9cc4f68e118a96a17420a3aaaa41351b301144eee7786b41443d0f6e0eba93cd31ed10491fe04371a6c51d70eee9ce55d53df2fa10c05ef6445aac9286 SHA512 58565fdcb7c450ad23c2971b70f0362dbf4ecfd8c4dedf19c25b56fc98c8799696c6ecf75d47650bc3b21f88b8454d7c4e6b206f7c0ae0e5de35d608262c1220
 DIST sam2p-0.49.2.tar.gz 562733 BLAKE2B 607264776db1d735ba09d2cebe0b569a2d2f837de9647eca1b495057b366d91d3ed0df6e219beecee7bc0da2805c659e73055ddc5842970914728ababdd14e40 SHA512 8e4d629df192381bddf8468687c6a41d459b70788a5e9defc68d5497f855cbae838f2f6f924237b17e4a8e6fbf982fb2709615c8fb1d9c8cec5ec7ecf91ec6ce
 DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B 47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674 SHA512 9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
-EBUILD sam2p-0.49.1.ebuild 939 BLAKE2B de9ff08b864a4e9e388ccca38d28f13e2491796f3575c2a5edf187415884cbad7545588045aea254323709c4c2bf55766bf1ca447d76dbcb560bd8b56570f0d2 SHA512 515e7575cda3c19eb95e96f1fdf0e3b641121f8ad8a887e6e5bf20ea6a691b44fdbf081652ff7186a3a2b05a0568c62117aa329ce739cb634796a5e8a686be3d
-EBUILD sam2p-0.49.2.ebuild 926 BLAKE2B 8e9995d93ac3878ca21ce24a5d17ef59fe9bb15c0490eb891b697c345feba4198554931cdafa31e96ef5445f00c2732612093e678355fa9385b529af47f82d46 SHA512 949af7483481b3b2c74ae762ef28d91c7084eba99f3f89482fa07961043d0390688974847824ec7d00be7566681d9131c52094609a2611dbc6c625c1ad8a3540
-EBUILD sam2p-0.49.3.ebuild 1004 BLAKE2B d4bb6392fcfd2816c9a3943fb419997b1b691edd76db05027916cb1fa3b2f9bf1eba488aef6cde01eba3943de3254bf8db86096dfbc56ec5f8781aababebd9ee SHA512 21f474cd209f851d935db6d6c8e6b18764d264f7918319ddf87054922fcf959d0c4d1bd293ef69fe26c071867c89f8f6326aa14525d9870ff532bc67e907d73d
+EBUILD sam2p-0.49.1.ebuild 917 BLAKE2B 98fa8a74ee87b63a67331c44def395444179e9ee1ad2ab20e41c06a2313764ef9317259ec45bfce7670057ca534f1b3667e66a0efc62bc8928ed2528123f324f SHA512 33571523b734845d5ced227f75a94121e92333dd8374c16554f3f8db70bcb1a572a76d581b4d926a755a9c7da097b61d93460b39648b91f3bdeb61f451c7da27
+EBUILD sam2p-0.49.2.ebuild 904 BLAKE2B aeef9a549c6e069ee33566a0df93526808bf7bb507383d5ed2473aafbbff4ad531e6199d31b2a8f244b55f08bfd7d53eca31cf29c139a65ab682c492d742aca3 SHA512 26b967b15092e2e091db93371e003fdedbf180eaa4f951c78b9b50a0282f19af66c2f2e6c483af44ad083befc8973c2acc2556b332586940728c427ecf88405d
+EBUILD sam2p-0.49.3.ebuild 982 BLAKE2B e24499cf5f551bb8ffdb47b4ff661acc9d349eaf2b765a0aa871ed27e9b3a8793ba7790749924179e774a1d99ae172a7ad1525392d3bd69546ea73bbc403a8b7 SHA512 ea06a40f4e0206412585655330984e1de43eccfc25428852d2419e0d056a2aad4f27fbd3b93c92e37386252a0c9af01faac77a5d02ff732049195adadad1cbdf
 MISC metadata.xml 373 BLAKE2B a0a62fca7fbcd916d83a6d7fa8f020c333b529ed06492cd8f52a8e04d228714bd53d1283e0b43f5a0c399aafdaf99b5caa5534a0ba54e1bff4958b4f28e899f7 SHA512 2bac0bb931232d7b994f24551d0fedccfcaf69932e4900264857e9ba09a9c32495ab743c1fe930e63adca3b7bc11efdea526982e6e27869033bc17731fa5c7fa
diff --git a/media-gfx/sam2p/sam2p-0.49.1.ebuild b/media-gfx/sam2p/sam2p-0.49.1.ebuild
index 37e7d4e26df4..033f7e062888 100644
--- a/media-gfx/sam2p/sam2p-0.49.1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://sam2p.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="examples gif"
 
 RDEPEND=""
diff --git a/media-gfx/sam2p/sam2p-0.49.2.ebuild b/media-gfx/sam2p/sam2p-0.49.2.ebuild
index 4b9f1601d965..b8d4582c1bd8 100644
--- a/media-gfx/sam2p/sam2p-0.49.2.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/pts/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="examples gif"
 
 RDEPEND=""
diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index cc4e1cdb5b0b..0380fdef2d0a 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-macos"
 IUSE="examples gif"
 
 DEPEND="dev-lang/perl"
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index edc632c106aa..015a1059fa17 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,5 +10,5 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 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-r3.ebuild 8133 BLAKE2B f7854db7ed404b086ed600e0435c9bc53227b5b34d237f3b883363bd938cce12893f90432e76446249ff3ba00fad67eed9dd2282b01142439e0c6c6ba8d0483b SHA512 70890882acefc387de8988f51a2d09fc1b90794032016bea46ab0f6c624e7161dfa4fa6904bcbb22748a8c7a368058fd319d9058d37b1c1290672a177b86091d
+EBUILD sane-backends-1.0.27-r3.ebuild 8123 BLAKE2B 7abe22b6a5af2d4e11d054bf538a1595215018ee4b6b6bf55d86443213c925504d5c43222214ae184a7001dc9ca6c53b5c18f759b618990ac8ce30e4c5905c7c SHA512 c35348ef4b4536a47113f38301695459299a92d3cb0d23a689eec282c883ee462810ae97c9b2c47beeb15bf6454b6bbc09511b51c6e331985a64963266ada185
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index ee30f55eb01a..ec01ac6e3c37 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.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 ~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 b44f4f2f8485..b65ddd111c00 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,5 +1,5 @@
 AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b5bbf03584fec395a3b0c60262bf3f4fc0ddc1a35c17996a8986107ae3bad053a8974da7c456bdfe7410b424 SHA512 ce8df63bb5b10dbf19f465f2629ebe7045d84105f3da70a49f2bde6a0a416a8f14a02ba3e7d3a8aeba144a592b45a770929b56f6ae7ac867222213ac8f923a0f
 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_p13-r1.ebuild 1000 BLAKE2B 213b2de3ccfeabb1567be94edcf681f7562a51bb00b065e6d593a4cc83dd7921fbbba796b35506a8e6ab0538290e9a9a6353fa9371ee78e32f0e7cf9be74d322 SHA512 cee4e837e4f64ec495c34409ad7f23bc54422fda88f89fa61f5a6931e0a18faff7290b43a1705faa0b66abc8b0d663b85d14adfad16acc817a8f7122183419ea
+EBUILD scrot-0.8_p13-r1.ebuild 978 BLAKE2B 83e527067dc2dbaca246df7e3520c3658143767a02ddea54786e95fa8922774116f693f5fce4e71583d2aa77f8c326f4441f9c09eaf6be0f318923621408f179 SHA512 4f9c553a74c665adc7f355440b51b15d9488b93f5d6a8fb3ee29e560e396662949e24a88d5f1e8a9aceab0b6e99472562e2a25a7926c14703a240f0eba186260
 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 2cc010f584c7..a14632141579 100644
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 9d0401086fe7..bef1fe6ccdb3 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -9,6 +9,6 @@ AUX ufraw-0.22-gcc9.patch 3569 BLAKE2B ce417eb79994190666b842f6017f18eadead284bb
 AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4
 AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
 DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
-EBUILD ufraw-0.22-r2.ebuild 1951 BLAKE2B bedb97bbc87eb73770146b8fa6f27689cf000aa3b29611222e2f73ae1bd5de6b3dbedcb807c683c26f1c1aff52abf160ad78ff2d45e280b8e64ca5de771ae6bf SHA512 8f720c4a740dfa8b3df0f0868f5d2a03a22ac08765308eb2ca79f9e70686e800ef636062c277eef21bf21d34ade891037a8c5879739183dfe2d7aa66646d3d6a
-EBUILD ufraw-0.22-r3.ebuild 2094 BLAKE2B 413c318609901fa6eacdf7c239da47f9aedb32e5d973667588f8d50e1bf9dda9570c787752764d51cf4575afddb48c15ac47106e003539b0ec160e6d81c4d0dc SHA512 4547d4b12fb3b66891870122254680ba6f71fb0a3cbfa75d1ca59b96da52e2b0d34234a52ee1fbdf4ba4450b9fbfb3b185b05dacc5f13743dc0a0c2b80f2654f
+EBUILD ufraw-0.22-r2.ebuild 1939 BLAKE2B 7262c313dbcc14685c90969a9c88ebadadf9b721a86bc309c5f667b17230c73b7e7d9d72acc9b8af8727e3e5cb27c8769a26146e554796a67b0c59f26d4405c1 SHA512 c8eb3ea3142f28efefe2f16c771af54f2834a39600b8f64428cfab01774ae67f344489aac415f0816b14065ea0ab17b9ca7a34126bffc0d91a8eaa18f25e1c9e
+EBUILD ufraw-0.22-r3.ebuild 2076 BLAKE2B 37b67ff3a94eb222a3d61d368d3013919f4eb57de0da6943439bec39437494570f8024c1b4ff1eabcd7398935c5903b00340f04d5c694cce4855a5826cb2ee91 SHA512 9ade02ae32b3b0cdbf2aa52579781dfa77f3424421ef32c5f1e56e370b921a2101474d81688573355145cd5f8bb27559e88e55e9f1ceb10649674bea9473d832
 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index f791b1bfa2d8..0b2b7c889c2a 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"
diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
index f31268404678..165cf72d2144 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 527983e084a9..ee2c432606bd 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -8,5 +8,5 @@ AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 BLAKE2B 1c960ba7ae4da62eedcdfc2
 AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d3cae3f5ab0db5c76661acb7c67a20115f4069bc2769b6d9f54acf4adea27e27b79495d74a77644db5281beba8 SHA512 8eba3107d81f0dc6caf749e9a9889f1662e5d1004e480a9a170533f3ee00c6f9f11d3c2008655322242ab61f31b676406fd44b97d83e4ce93b8f68a12397830b
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
-EBUILD xloadimage-4.1-r12.ebuild 2515 BLAKE2B 09e734559fef97a8371a2c4c303b38880dc43196eb3919cbef586d4f298c32364ff878d097f1465b44a9925b02379e1f0d320b0e601a5378892d8fc477f7a2d9 SHA512 562f89276c0ebdce52af5ddc39af7fb2514e766b2c88a12ae3b87604700e4a080414a569bf46f2c5874bf5ba047e18f994a8fe91e6a2f0d2aa3aa64cdd57df31
+EBUILD xloadimage-4.1-r12.ebuild 2505 BLAKE2B c97aea4b87d8b9dd4eec3f73fc42d5fb5cf23e0da705661b5d635fbd38721065d7425ac8bc78bc4d2c0acb5e8e8d186cdafbb703b94557715cdbca6ee754acd7 SHA512 6fcd3145050f6f5948725f5a34e394829caca68ab4da59439978da208e6a55cdc732480217d7d641485f6751b301e2261a21b6872659ab741fdcdc3588e7b9aa
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index 8e6085e9cb7e..89c8ad348394 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index bd8bc1e3abca..77bb6fc49049 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -8,5 +8,5 @@ AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1
 DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75
 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-r19.ebuild 2444 BLAKE2B 5049bef53eb5c3d080e102e97295b75cdba90c3fe770790f1b6018e9bf34088ed5fa79e0c21e52cffd9c0c54c47f7dbc91846aadcd5198869e10b9ae45c492fe SHA512 bd8e3dd3104f235ed516fb4e3b98cc778acdc787fe37841328d2f384262d39f6efbf10b278c4939c205fc420bafbd2d996d3402bf069b8950bb633471ccdb723
+EBUILD xv-3.10a-r19.ebuild 2434 BLAKE2B cce0e3c145bb9f3fa07837d156b2aa0d3760e24700b77dea1ee4bb68f585fdc1fa729ff189371e8148a5ad6b4c7894d550eefb3453caa40d53c92fe997eedc0e SHA512 6a835d1d99705524e589779819bb340bcea73df699263d3b1a5d98608f23ec701cfb3a7441fa7e17f6d21bd5e0ef1e6811d80138095886bc4275d6597b716b27
 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 f824a67e122e..2ce5b1529cd4 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 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="x11-libs/libXt
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /media-gfx
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)