gentoo resync : 15.09.2018

28 files changed, 76 insertions, 610 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 18b0c8c51990..8f892ababf85 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 9d64219f75fc..99589c7dc721 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -6,5 +6,5 @@ DIST eom-1.18.3.tar.xz 2198324 BLAKE2B efdee3c56fec54342184ae75f7ecb3ebda0227ab0
 EBUILD eom-1.12.2-r3.ebuild 1897 BLAKE2B acdf2fa81bae0814e7f9891810b146b58f77a959ae5fab53349868499d58c971c3af040fae0e49500a47253f65638d10beecd11fc84885eec1059f6da357356b SHA512 41e360632bd653ef941714e45bca87f8ff940729070ab1a31046f87726e92ba2c73b71eb092ffc258f7674a3cf420c0bad5726442d35fbd49fbaf354f067e795
 EBUILD eom-1.14.2.ebuild 1892 BLAKE2B 0298f92977d6368dfe624a78cbde84291db5a7f06774f2935b60ed33432dd06ab996661d8fdcc88525b2027d21627c4c7e9f46e30e8d857b1725a8147de4c4d6 SHA512 4d7e22033498bff1cad886de6d850977e913dce452f46d71c580c263103bb66cca9f4ee6ff3331d9b68e294fd52978bbda39df583be7472072957c0db4f56955
 EBUILD eom-1.16.1.ebuild 1892 BLAKE2B ce4075caa97a575077a77657abc68539a5e6076f04dda697cec172dd168bc564698f9853aa88a09175ea238a9ee40107074136d4b56e38dc26d505996ca59759 SHA512 88eb94a745dc8bf09867dbd0671dfb89a931d274a2eb9c95d900b6a7c25d3a79a4afef4c066e18bed09609969d6e1b1f72b2dbd86d6d83fcda1542f57129d713
-EBUILD eom-1.18.3.ebuild 1480 BLAKE2B 1b7cbb148fb9ffb72d91219a880f13461353715d48c81614b416dbe32d16c109e57b4ec4a6e99df909a3868cc79d1ee773b482af6395259cd8154df9c948c430 SHA512 1120a5126289d462ce1b8737ac8ec51abfe297f5cb686cc29c73cf1698b94ebd152159f5f68f7c8c5813ca9bd18c3abb55835c74aead4f47ee0eed7e5dda689a
+EBUILD eom-1.18.3.ebuild 1478 BLAKE2B 648972bae8be6e4e4b564569d2abd953f8bfd5fdf82e1509f89787a7234afb3815067796d9f6fd1a310a5b2b6dd127708476625c01a59748261890b6a9c5648d SHA512 0f9daa87cd84f89ddb0175de079f29acc000161abb2eec166f68a004e1083240e6a791df58099f29532ef1bfd72eed5013190e58402b4a6fefdf6c0e9f5f81ce
 MISC metadata.xml 408 BLAKE2B 3aa045b7f75c60605aead480120e080ce799255190b0ffddb3a204b9fdaad92451bd42717fa70232056dc073a29fca96c96b01cdce2125f9e357c06aaf874880 SHA512 948981426d592856f20cfcf6cfc8d0505acc76144ca32211ed1a5c9d6106aa71e2d7987c1a0ab6373903b5a413da6e22f5fd9d10894bc89eefbac12d48cd7b30
diff --git a/media-gfx/eom/eom-1.18.3.ebuild b/media-gfx/eom/eom-1.18.3.ebuild
index ed91e1376aa2..8b4d2d8201bc 100644
--- a/media-gfx/eom/eom-1.18.3.ebuild
+++ b/media-gfx/eom/eom-1.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE image viewer"
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 6b9e8dbcacbe..ff91e8c6defb 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,7 +1,4 @@
-AUX fotoxx-13.11.1.patch 1791 BLAKE2B 4630767fb8a348923a6f8b71b37ee05a1fa7230a75dd284329294aaa8ddd50e681a40ebb469049817ffa72fdf4d87d22cbb76b01a7d7521fe6bf5380e06a0711 SHA512 e3543c861fb8e5f5de547b8976d15d86fac20ffc83285d2d9c46d805eb6b0e3fe20de07c4644c9272c7cd44c1a6d43360cb82fc92abc15ca34997353e4cbdf2b
 AUX fotoxx-15.05.patch 460 BLAKE2B 95f19579fecaa13dacf5249cae1e05561070f2ac9cf8856d17d0bbf0e4b4c55ea476960f5e49580200e190d0f84daa3c29862a1414848a14b6d72a058b694767 SHA512 e4d2ddd827de492ac4890c8c8b34719b9dcc6acd555de60c7d5bef35d8c0dca032635fac9b989c92594ea92d5bd47c0300acca9074696058321bd401fdbb7b0b
-DIST fotoxx-13.11.1.tar.gz 2473330 BLAKE2B 838772cfd6939dafdc58e52a264f86027e9a5dc65ab9ffc82afc11c114ffa71c60e11f1eb54c182696c1ea9231acbd8eb293d1bba485960f26c0ffe8df5b0323 SHA512 c880f5f1a67f12ab081820d4a897912e20985dbad0096d2f4ef1f37d0b2b626dd66c69a593e57b31432a67f79eadd4ea8022dcde01bec865f71ecbfec456caa2
 DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
-EBUILD fotoxx-13.11.1.ebuild 1164 BLAKE2B f08e5c31562fe3d86b21205a0f0b268227c2d97da587f1aa921084f1be8a2b3a47d407a470ffb1b9cbc54164727e127ff8df3a37f646b35117234db843217315 SHA512 4b33c9b0ab25e83ec19b099779c50a2f3748d1b0fbb5183c1ec700f26347809f3a82dac11ef0b8937567514a5fb2e41ac5079cce3b6f36245e2673f2e17557b1
-EBUILD fotoxx-15.05.ebuild 1148 BLAKE2B 7323dfa8337f28cc7dd55fe7d0eb8fdac3fd1d93ab9eb0779b2035d6fc0c8ade7eedc66f3e5f65e27c125e1f81b5f20c67c3c7af0d41c910224045b8c8541c8e SHA512 677e2151018f939e31882592b189d0173003520e16ce15c1ad9059831e3b2b53ff855338efa7a20fdff839838bad62b322b0e42606554eb9b3e9aea74e016656
+EBUILD fotoxx-15.05.ebuild 1146 BLAKE2B f1a7701b0fe1d9e23a3e644aa05c7683b55fbaaa048757d88104c843c9864e45eb5e9d8489ec5c275463f09e01742da9275f044a3c1986550812655a1bf4d994 SHA512 aa6838cf7d5461c9b5526641979b50e1d742247dca5703ccad0e161d43ea4765cc2c90b422e8bdb5680eb022407afbfb343286a9a29dc00f0f14e478945e387e
 MISC metadata.xml 773 BLAKE2B 75c03d8cf914e9aeb25db837d5e945908082d8711b19fbeb8694371ebb8c2ff6c69088dd4c887ce4f29eb456e2f412f6d992ac04c447a31e814838dbf5932aa1 SHA512 1fbf87c22810a242a8d7f0e91e6ee6bcb6b1a08cb39c3e827171e110bdcc5468a2440c42d56f1630860555a54fee0133483d8551dac164492bb630fcb45c7cc8
diff --git a/media-gfx/fotoxx/files/fotoxx-13.11.1.patch b/media-gfx/fotoxx/files/fotoxx-13.11.1.patch
deleted file mode 100644
index c37df02558b5..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-13.11.1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -r -U1 fotoxx-13.08.1.orig/Makefile fotoxx-13.08.1/Makefile
---- fotoxx-13.08.1.orig/Makefile	2013-08-13 15:53:00.000000000 +0700
-+++ fotoxx-13.08.1/Makefile	2013-08-16 04:37:03.009099149 +0700
-@@ -5,4 +5,4 @@
- # defaults for parameters that may be pre-defined
--CXXFLAGS ?= -O2 -Wall -ggdb
--LDFLAGS ?= -rdynamic 
-+CXXFLAGS += -Wall -Wno-deprecated-declarations
-+LDFLAGS += -rdynamic
- PREFIX ?= /usr
-@@ -15,3 +15,3 @@
- LOCALESDIR = $(SHAREDIR)/locales
--DOCDIR = $(PREFIX)/share/doc/fotoxx
-+DOCDIR = $(PREFIX)/share/doc/$(PF)
- MANDIR = $(PREFIX)/share/man/man1
-@@ -19,4 +19,4 @@
- 
--CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
--LIBS = `pkg-config --libs gtk+-3.0`
-+CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0`
-+LIBS = `pkg-config --libs gtk+-3.0` -lpthread
- 
-@@ -78,3 +78,2 @@
- 	rm -f  $(DESTDIR)$(MANDIR)/fotoxx.1.gz
--	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
- 	rm -f  $(DESTDIR)$(MENUFILE)
-@@ -97,5 +96,2 @@
- 	rm -f fotoxx.1.gz
--	# menu (desktop) file
--	cp -f desktop $(DESTDIR)$(MENUFILE)
--	xdg-desktop-menu install --novendor $(DESTDIR)$(MENUFILE)
- 
-@@ -106,3 +102,2 @@
- 	rm -f  $(DESTDIR)$(MANDIR)/fotoxx.1.gz
--	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
- 	rm -f  $(DESTDIR)$(MENUFILE)
-diff -r -U1 fotoxx-13.08.1.orig/zfuncs.cc fotoxx-13.08.1/zfuncs.cc
---- fotoxx-13.08.1.orig/zfuncs.cc	2013-08-13 15:53:00.000000000 +0700
-+++ fotoxx-13.08.1/zfuncs.cc	2013-08-16 04:31:58.882119673 +0700
-@@ -3947,3 +3947,3 @@
-    strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /prefix/share/appname/locales
--   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /prefix/share/doc/appname
-+   strncatv(zdocdir,199,work,"/share/doc/",PF,null);                       //  /prefix/share/doc/$(PF)
-    
diff --git a/media-gfx/fotoxx/fotoxx-13.11.1.ebuild b/media-gfx/fotoxx/fotoxx-13.11.1.ebuild
deleted file mode 100644
index 67684ae938d2..000000000000
--- a/media-gfx/fotoxx/fotoxx-13.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs fdo-mime
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="http://www.kornelix.com/fotoxx.html"
-SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	x11-libs/gtk+:3
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/lcms:2"
-RDEPEND="${DEPEND}
-	media-libs/exiftool
-	media-gfx/ufraw[gtk]
-	media-gfx/dcraw
-	x11-misc/xdg-utils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}.patch
-}
-
-src_compile() {
-	tc-export CXX
-	emake
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, translations, edit-menus, KB-shortcuts must not be compressed
-	emake DESTDIR="${D}" install
-	newmenu desktop ${PN}.desktop
-	rm -f "${D}"/usr/share/doc/${PF}/*.man
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
index 5ef117c20f77..0a425e4da1d4 100644
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ b/media-gfx/fotoxx/fotoxx-15.05.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-gfx/gimp-arrow-brushes/Manifest b/media-gfx/gimp-arrow-brushes/Manifest
index 3875719d1005..fc6186c08cd3 100644
--- a/media-gfx/gimp-arrow-brushes/Manifest
+++ b/media-gfx/gimp-arrow-brushes/Manifest
@@ -7,5 +7,5 @@ DIST arrow_brushes_color_2.tar.bz2 33699 BLAKE2B 9af6c053394a05cbe2536890f513a3a
 DIST button_arrow_brushes.tar.bz2 35320 BLAKE2B fac53441cba1f11691ab88ecc29598ab62d65f73d13a2865c81abf388d1ed4fb7e2c38dc5c3c35e6cb5c85796bbe0ef6166e20d943167c5222808db363bb66ec SHA512 54e36152f169240d5caeb6e5230c3398465b96522399044e39db2d204983decc48e0e6043d65c7647b4e46abeec24e8ac3470110541d2d38ae4e4ba44a023b21
 DIST cursor_brushes-1.0.tar.bz2 18272 BLAKE2B 23dd380173e8962efd43367f7f0c61fec72d3208463423a834e4c4b9612dad46baa715635a509d4737bc40b491375b0b95847a062170fd389c1e7318ac327459 SHA512 e9fa944f9c210518c96929b6860c4234e9c7e69cada7fe85304043d5ef3118d40b3f90696057e28ab98cd4587d4aef8b150171863b5c1c1b51255b6cd23ad3ff
 DIST hand_pointer_brushes.tar.bz2 19068 BLAKE2B b662c0b1ef8a0639c1ce9e6d8d05637f4fa8db837c2ce5191c1cb4eb83a5388324afa02473f9235770f4978406ef9cdd38303acde0d6b2174b5fff0dcd5d84d5 SHA512 b072b58f7219057b682459b5b73d60e5cf26943436c1116dc4fb73076a32b02d0164f2f0506cb0cae4378c54bdfd2a66281c7fd42a7a6919afb19896e2193c34
-EBUILD gimp-arrow-brushes-20120122.ebuild 960 BLAKE2B ac6be7da8f277527c335989f4b61e72c9f568bdf074404a7af7fd5f68a55909554b0ed606a2ffb5cfef746535e52811a010eaa628773a1c987889af950b17c97 SHA512 212edce797dcfa94dc8177ac4ad722a2aaabe2e42fa923e56f7dcd3419cf34943d8f699754496f306fbdae732fec6fa377744a85f6f06e898fa216d7b69b0dfa
+EBUILD gimp-arrow-brushes-20120122.ebuild 960 BLAKE2B c9484599480189bafd11e56c18e06f7499bc9e9bda323db4a1bb1084d4b58bcec403d9219467d339a0aa017e98bdb8404625ae01cb058252a70e7695ad2f51ed SHA512 acb763419c8b6eb7ff51977ec18572b9206da18e99c0cd2ca7a410a522a87aeee0744b44500237dd3514507e027d794553f53575cfa9eb3a6c91f521aff8b55f
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20120122.ebuild b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20120122.ebuild
index 12fc7fdf8774..186be49c8c20 100644
--- a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20120122.ebuild
+++ b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20120122.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Brushes for GIMP with the styles arrow, handpointer, button arrow and cursor"
 HOMEPAGE="http://www.gimphelp.org/index.html"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 185c30d20026..d3ce4e0720be 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -19,5 +19,5 @@ EBUILD gimp-2.10.4.ebuild 5296 BLAKE2B fa52f60a44fbaa0a08569177ba247d746270a7347
 EBUILD gimp-2.10.6.ebuild 5296 BLAKE2B 54d186cd88d83cb1d7c9934a1c06e603eed94fd33f0615062cd9c19014cb080403ae8b1ed85351a9adc5a9b036fc3cd2d254a8db9f2277d0f79a86763b5a5ab5 SHA512 c38a73accbace98fefc26f2269d61b8ce79f077f51a88117cd7c8c5aadade7f773bbd14c44cfd4e92470158c3653abc19373a8a81ce8bfb0eb5d409fbe4ea901
 EBUILD gimp-2.8.22-r1.ebuild 5175 BLAKE2B 01d76aae6190f14fdc12ad47a22109610a6622b0ee45e2d00ad352ff2a5e1f5b37ee36f15e6bf270cb842ce7f87ec13e92ce386ac908628115a8453706e95bc2 SHA512 f34e4a3d1e7ae474e07b985e5a0c9162bbdb6beec2e65473e0bb421d188e5fae37fe5a2618b9479511b625e3798f29e500f82d0e392b0b820257ebc542cf281c
 EBUILD gimp-2.9.8-r1.ebuild 5734 BLAKE2B a176bcbabc8298b9e29b755f7d3dbdc26c3e6a77335e826762c6ce0273aeea38341378bc719df8e617a69bd6f8570442e46f92116119fd40043669201ecdcf50 SHA512 2778c83c74d87fd8492a1107b1b64aab8114ea167aaf8d7ca2290cec314ed9640d60096a04c7834b718159f242cf3e2a2c46c6293a03927d8084d834bc415ff5
-EBUILD gimp-9999.ebuild 5164 BLAKE2B f12dcedce0eafcade33b9f01f259e7e542f1c4af69668e9cb78264a541be2105f2ab6768aedc76a4a68cbf0cc1d0b1bb6ebb745e260072f2acc8777bd5043842 SHA512 f2e2c117f775b2e046b5343fabef05232af97363fc0dbb506e445de30f5eebc1f8c83d96acf4601ca13d0bdefc723b91873dd1397ad3c256edc0d1e7d3d7796c
+EBUILD gimp-9999.ebuild 5188 BLAKE2B 00471a359fa4b4e31d181aee1dfdb3ca860b719166e4d9e4a7974920d14af252a3c4b3d92665d4dbdc8da48428af9217f2988ca87b827b2945b1e4986425054e SHA512 0a725258eb1f9704a30d897d1fba14dc79e03d5afa68dbe383486ba3fffe60eb9bfec3b180c10f95680883170b9d6c442dc2730a0b9ca2e671c67d4c8cb0f225
 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index aed499a51a21..82186f49ec6f 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -69,6 +69,7 @@ RDEPEND=">=dev-libs/glib-2.54.2:2
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
 	dev-util/gtk-update-icon-cache
 	sys-apps/findutils
 	virtual/pkgconfig
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 86fbc3defa52..550e33216e8c 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -6,6 +6,6 @@ DIST GraphicsMagick-1.3.28.tar.xz 5416660 BLAKE2B 874e1e2669db46c458b0e7aa68b24e
 DIST GraphicsMagick-1.3.30.tar.xz 5496116 BLAKE2B 408f68334b290ae30d06e4b0efa6e11e89ffa9c00781e2f0ceb25cd6fc308f1be86b5ed9bd52f594e1abd3351f1b7dbfb12e87117ba85f4b4c01d07d7480772a SHA512 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c
 EBUILD graphicsmagick-1.3.27.ebuild 3324 BLAKE2B 309ac3fb37a14f5aef75015135b678a79165b5f915a1954595e15321992856474703efb49fdbce07c06f41a53ac9381e52356de171a204d456d1883428c5ed69 SHA512 1db593b2b9df429e57b33346c1b3fe83fee14d6902a1175b38e8e62aa58018ab6c3ad1fe58ec9b662324fe57b9163f0c55098d98724fd656dd159c5635559498
 EBUILD graphicsmagick-1.3.28.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
-EBUILD graphicsmagick-1.3.30.ebuild 3252 BLAKE2B 345d46eed9b7649596ad80ffb92dbef8e98a0bc19985a9056771bcc7db2991c322d20e150ea541f9e2c70ee474e55b6e734e105508c58c9fcbe81a7db3ecee98 SHA512 6c7e4e77f6a10e0629a69aa2c1456348ad52bf3a5489906f78b1c3934fb3dc49a84cb1f879e45ab459e5ebb71a692a0ae8292e93a93f331c47a973583d554b47
+EBUILD graphicsmagick-1.3.30.ebuild 3251 BLAKE2B 78eecba484d87f81e0ee12d119a84fabc3c052ab7b63b92acff37c0b9b751a4e99fde3c1bd14c6e8dc20a97ecbd94c0f0c558d28a13e4b1523b29c75d61899cd SHA512 165fc7bad883df3be55c9b5714d6a284d9c97e5c06f0e13a08ac783fd946e39b6b929bd9ea17b4284c312830f46edfb536131bf730eec52bd2249c5420569519
 EBUILD graphicsmagick-9999.ebuild 3259 BLAKE2B 7927af4d017f754b4079e4ee77c1360cf8045b124503733f4ef008997672ed85aa9c8700826165f49c542277d61e3ff9dc68683cbea4bea197f8e08271fc0766 SHA512 e05fdb1ac96e74bd0c29e3d60704bfa621f930d86eca3e490a2dd021ca076fd21150fe7bb9f65fa5dbf7d27269cf4bd2c4606ec2b81aa17f2fb912f946f0a3c5
 MISC metadata.xml 1220 BLAKE2B 991045c4a8f2fa2c7d71b585b88af2a0e0d4d260ca64b67131a096f9948272365e2d7303a7fbd5faf6da2bf952645061462ec8d643f14f301d0a12c37dd5f849 SHA512 1bb5a109f05ee51df889358ceb97669aaaa75356390ff85b7ad2ea7659fcc4cf7ad811b2795121ff9957ad58f27fd47dfaf792e0d5afbe31d84cf755158c66fd
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild
index d0b79c406bf9..c2e602abf0f9 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 9bff94d077af..1db7fe60be32 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,13 +1,9 @@
 AUX imagemagick-7.0.8.10-quantum-private-compile-fix.patch 778 BLAKE2B c770f89f8b3b0f0505d32ce9c44b1ceac4f6ac817f85e756802c69cc394c3a6001a598bea88e081a461a1f775a7b5ebc4e5a27397186bc940a080ce780580bcf SHA512 cb18f10ebabc1af7065a3df50afcea500c908051fc91946f65b400df138c941c3576671cfa200d7f36ad62baae75198e3d5e4d2e206968da7d641d3de1c95a7f
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-10.tar.xz 8929904 BLAKE2B 937a480554d881da9d477724ed7ff23c185a531778514397a6d46195963eb1449150c4d94fdbaf0798efc509d687a70b9dd999d2d9571ff478643cf754dde822 SHA512 8255db18d1b3ea727be320a643f67c8c27a729738de798c2b64570f9f8a96c74d59922ef85fae88b550e336f640d7d12b079ea354039dc08c4e75643b7e3a38c
 DIST ImageMagick-6.9.10-11.tar.xz 8918436 BLAKE2B f7846b21a68d0e8e462cc7a86322f73ec0df7cfd10fb35e97f6adb375c9291b9571c07da901636bbc933330ec0f4c2ee27b3af673c6af28d30090e78a81b2bbc SHA512 b272eee7c74c3d2e6cdc7b5ba088bf87d7fad87c8828c9d2660986acb05c0ee06566c4b2b82913be9086a51e9b7c64ceb9ecc2bf28691d183b8e478a15384ead
-DIST ImageMagick-7.0.8-10.tar.xz 8635496 BLAKE2B c9df902b5d582b278b3343c9889b01b921f505bf5686312c30fe55e0b023601ea8a51385a97d92f39d248bb8d57f0e91d163a983cda16f528ab234d53f35118a SHA512 a4869e0a9be5e04c04fcd1fce5c4141d63968ee7f1dd78d84724921f2f088bdcea8c3b3799e1ff555a2a04dec32a1fb7c4a1e6053a6185e9a36c6ae0f1b9c6ed
 DIST ImageMagick-7.0.8-11.tar.xz 8638236 BLAKE2B 927b9d467635f80d65b53e4d4d5c55e2ca4f8073b110881950d6bd9205a6da3b6ead91c624d1cccabb6c37f5bb841f9584c7c6d65714736898d17a22d9075a50 SHA512 b6f7493095097d3c551c70acd2181fb8e252750916534602646c7c765d756b5483c1bdd08b00d59f8b0bc3963729a2b64bf8cb467e3f23e26a4d35515b6d3b18
-EBUILD imagemagick-6.9.10.10-r2.ebuild 6484 BLAKE2B 10c1e828767548c122c6d4c57ba5530473a1661debe7a122ff2d05a414c9bdd247f41851e9960c54e97779a9dd33f16e3716f0a64c6c35a490faf8c875e0cadc SHA512 96774194e1d6b17ce3a936dd8a488d6d30c13cdad7097134fb2170b8295d8238e2847cc2bc8169bfecc397aba174575a292c14edfabf2dc1797a069fbc4dab20
-EBUILD imagemagick-6.9.10.11.ebuild 6495 BLAKE2B bd27b42eaeb554ba1cea81c94565e34c92f002675d28d54c750b5d8332cce09668fc8cb65767cab893bec4d5b630af1b9a1dc09602664bd29310bc904c96ea14 SHA512 de8b10519f4000a2dcdfd14b770e5864451c63ee400e78e726dfb7c8cdcb16e8f596661ed27e257f93bd0049225091896447caa2be621013dee1f9fb20c47985
-EBUILD imagemagick-7.0.8.10-r2.ebuild 6714 BLAKE2B cae1616f7d5c7f72fb81fc722f75b944d63d5f013a85455c67b0db8ef7d0d3cabb522f077bcb7b6aebd3e98d13201352fa332ade89449ac905cc740ba100e996 SHA512 4d8590bfcf9ae38303cdc402cd3681e0a340301fd78bbd31a7d46e22041979b64a4f829090ab3a4e2a28cf6bdde0c2c3ca4fbccea098b6ad3eb9601c4585fa9e
-EBUILD imagemagick-7.0.8.11.ebuild 6648 BLAKE2B 856d9396231a685d7b17105d69eda477759c1b19229ed787699d76da2c583b9842068dcbee54e5a7449b0a8538c99244f6db0ae22c71a07129193447c414d6b2 SHA512 9203ed62e7f61de14af243d7e38d2e9d8ab87be557467ffb50923f266629c367d923d6525c4939a33466a26b218ac3f35e24fc7f7d6943f27da92f5bf524c5cd
-EBUILD imagemagick-9999.ebuild 6648 BLAKE2B 856d9396231a685d7b17105d69eda477759c1b19229ed787699d76da2c583b9842068dcbee54e5a7449b0a8538c99244f6db0ae22c71a07129193447c414d6b2 SHA512 9203ed62e7f61de14af243d7e38d2e9d8ab87be557467ffb50923f266629c367d923d6525c4939a33466a26b218ac3f35e24fc7f7d6943f27da92f5bf524c5cd
-MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
+EBUILD imagemagick-6.9.10.11.ebuild 6486 BLAKE2B e898f396578c2fe7b877de1b37e5698e0d982c1d168db9cbcc998d5bf7096175fe770d3f0ee49d72c2cc4b64d863fc63d4fba411a6e24d7931cf14421de33381 SHA512 54e1711e72cdf1c5080cf2b28eceaae64fa6b4c6db819bd1077a898bf182129bab2864ced2f9927970b69d8a1890fb2cd052da748b45e1aaeb0354c30d7b2fec
+EBUILD imagemagick-7.0.8.11.ebuild 6639 BLAKE2B bcd16d664b5976253c312714299974e712c8342be9f0fb4cb933944a46d20ac31bffff721ee3f53a2259bc15c3a3da218c188f7938dea8116bfb7f1693648bff SHA512 24ae4050a06bb6c06c1a5a1be43da47155158d7eec8823cb3f1fb67250e428c04fa961498d9217787197908db62f6e30dd15c1bc7d458079edb091c4e5d18b6a
+EBUILD imagemagick-9999.ebuild 6722 BLAKE2B 387644c8c74c286dd2b3036646c621737e838dc02686f9def8c40f4e0bcaadfab7a5f7aa91dbab946fc4e73f4440ffe5d01583f7cf41bcc4d8196ccd8ee65fdc SHA512 c885e27422ec79fcba24e1fe6608bb949f4fa1c8e16eeb7779c91896f6ea61ecf063198918f62d461b96b43e0f817d7cec0106880235f378f419cb1f56e47b31
+MISC metadata.xml 1113 BLAKE2B 91aa4c24ab2b2917097f4910aaee88380f11c3a21015e1e094863d8dc4f92a3fec54e811ed72a3896221f12de01ee7e49496a28933eaae0d644e5a77e0d9b9fb SHA512 0d659fe8780e85796901f7369f9d695ad0bd52474626c023d8bba13d244ebda19cbdc7260ed36f655a5d85b5849af730bba7a599aa10fb307a426015647cd190
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.10-r2.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.10-r2.ebuild
deleted file mode 100644
index 970ff4c9a5a9..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.10-r2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs
-
-MY_P=ImageMagick-$(ver_rs 3 '-')
-
-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 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 )
-	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"
-
-	# 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}'"
-
-	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; }
-
-	[[ ${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 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() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-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.11.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
index 894bc214df1b..7c00fe4af0df 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
@@ -13,7 +13,7 @@ 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"
+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 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.10-r2.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.10-r2.ebuild
deleted file mode 100644
index 63922969bc3b..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.10-r2.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_P=ImageMagick-$(ver_rs 3 '-')
-	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"
-
-	PATCHES=( "${FILESDIR}"/${P}-quantum-private-compile-fix.patch ) #664226
-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 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 )
-	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"
-
-	# 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}'"
-
-	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; }
-
-	[[ ${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 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() {
-	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
-	emake check
-}
-
-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.11.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild
index 25c4681ac138..9730724f1a11 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=ImageMagick-$(ver_rs 3 '-')
 	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"
+	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"
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 25c4681ac138..6f0dd75e82cd 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs
+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"
@@ -20,9 +20,7 @@ HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri 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 )"
+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
@@ -33,6 +31,7 @@ RDEPEND="
 	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 )
@@ -125,6 +124,8 @@ src_configure() {
 	local openmp=disable
 	use openmp && { tc-has-openmp && openmp=enable; }
 
+	use perl && perl_check_env
+
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
 
 	local myeconfargs=(
@@ -151,6 +152,7 @@ src_configure() {
 		$(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)
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index c0cb28c0d869..1b7f7eecf944 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -8,7 +8,8 @@
   <use>
     <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag>
     <flag name="fpx">Enable <pkg>media-libs/libfpx</pkg> support</flag>
-    <flag name="hdri">enable High Dynamic Range Images formats</flag>
+    <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
+    <flag name="hdri">Enable High Dynamic Range Images formats</flag>
     <flag name="lqr">Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag>
     <flag name="opencl">Enable OpenCL support</flag>
     <flag name="pango">Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index a0ce1b673433..d213c74d91b7 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -2,6 +2,6 @@ AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a232
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
 DIST librecad-2.1.3.zip 26086377 BLAKE2B 7f137c1f6c80f10b803ffbe8a739c230664d81003e47dc0f7b82509fdf0534e5fe046cbc6efaa75149daeaf6f0fa217c1fd08e4de83c74361c99108b6b8fd53a SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009
 EBUILD librecad-2.1.3-r2.ebuild 1239 BLAKE2B 39a94d6a4804a225549c5e4b7f74ebf79578bcff2a1189347694fd39673c2c73a5513a35fbe6cf5214b5a26d5b729d404dc6a46c98ac6aeb33ffe8b05cb6eef4 SHA512 05095a8861c0c884afe82a5637ad0218ff0ac6a2d68a7610c8a4e49dbed73e2845d7b33e93549cdd039f12fe2364b7fac8e0f0dd497c246f49230d67030812bb
-EBUILD librecad-2.1.3-r4.ebuild 1099 BLAKE2B 1abbb13466b5dd223ce89d84d5c109b13ea9f1db147368d4afeffa1c0c72ded1b10a39c93073bae692ff0faa0df604aba38f32989132c4279ef428cc7ccab7c1 SHA512 d1f13e1ee1c60c4906c960803a2afa309be48284b939d2ddb33ce4e4bf0c8d5ac1e0a09dc8f515dc9cd5e1b60846fd56b150670e1f3c9fac1660da6b3485d4a2
+EBUILD librecad-2.1.3-r4.ebuild 1098 BLAKE2B 16890e1fe27531314e8951cea944308cec88f3bd0d3824a4cc3739e5a92b43f840da0abeb2fb21af4f9fb9c69f4c78265a7e551cbb326a58472da6f611025c41 SHA512 139d713066a0507d9dfb056a1954d822afa3096e8da56342c143fcdbb203cc601d987834883f4bb0fd72bc67c8300b1ecf46a7400c2478e31b503da3dd05e0b2
 EBUILD librecad-9999.ebuild 997 BLAKE2B c2f46819e1188ac08ff278385f696c578dac20c707b666d5fe297c2ff19b3f8c37f048e8c3083acacf4f7165378ed5f5de37209b6eff50fd73b8970dd7377b18 SHA512 8e8633998807024c30de31be9eb996b5a6abb1ab416247258e35b1497ea9824b7035556201b3a9c8c546cb3402406344353cfca37ce5d2fbe268bfaafe693b77
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/librecad-2.1.3-r4.ebuild b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
index 5e3ef74458b4..874bb483159d 100644
--- a/media-gfx/librecad/librecad-2.1.3-r4.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools"
 
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index f85ccf15fb75..60022ec46f3d 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,5 +1,5 @@
 DIST qrencode-4.0.0.tar.bz2 429244 BLAKE2B 45fe8afe602e7ff20b750b5a0de8a3b52b61340ebf0bbcad2ae00e4a0ff2976077b5add4e2c1358d4ca852f79f4cdb27d9dab8c726bf72ff53964661335b5a0a SHA512 d4140d77fce3a1c39735cc3e98e3a19018daaa08c870644f71727d27ffb17711e76b4ed4e51718d90d812e78df75fe575617580ea9b1bf210438f8fd1734204e
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
 EBUILD qrencode-4.0.0.ebuild 875 BLAKE2B deccce06b32c442852c73cba09f97d3c59518d49ae63008d1ac46ebc0940da20cbb42ceb502f30942af6392d47796bd91d413fdd68bf634d262ca8411af23f33 SHA512 b59b6c37c8fd489e98a8fc1e14989418a8292a739a74e0422b18ed64e48611c1846d2f6bee15e85d27a1142da2901b668973437955722c19425ee4939eb5a16d
-EBUILD qrencode-4.0.2.ebuild 779 BLAKE2B cd9c91203d9f5aca1897e1454a3580622737d139886b5c46a6ea4e0347acc764ed23499893f3176adbbbe7e6e24ee7bb5fff55cd7eb3bd39f637d548bd86a53f SHA512 e0470b7b3ab7395d035914f0298a75e0541c2d8e8bb98294cb8edeb0b31e3abf3d02b564d7c43d0d0edfd98c30a08e66b6f428f1dfb9272f6fda9e1ed979fb28
+EBUILD qrencode-4.0.2.ebuild 777 BLAKE2B b75707486a92e5c08a93f0d0dcc1d05a6116243394ed051ee265977a1cb0ec166d1319cff293b03d3f7768900b55e94484a7b484918664335885d30b928baed4 SHA512 cef00008591be4590ab26842079cb771be8f686ac485f3dc6c4eefa58af954e47f2cad1e79da1a0974bd0f0319ac5cd61fb4d571b7a11ef3ed2fb34d873aeaca
 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 82528744c84c..7209fbbdad1c 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 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="media-libs/libpng:0="
diff --git a/media-gfx/videorbits/Manifest b/media-gfx/videorbits/Manifest
index 871b695f7e36..b02ec34794d1 100644
--- a/media-gfx/videorbits/Manifest
+++ b/media-gfx/videorbits/Manifest
@@ -5,5 +5,5 @@ AUX videorbits-2.205-remove-bits-nan.patch 969 BLAKE2B bae9ba484c80c25c5eeb6e2bd
 DIST videorbits-2.201.tgz 648187 BLAKE2B c279c6bb045412d3a2fbecc7a0955694b761c929ea3f0c73b6e64b1ff9a14e69a168b37eadeb8f99e6e1a2daf4863be87a268b74a619f16efaaeacc4e708ebb3 SHA512 eeb233487ac33702ff58f9434ff1850aac5ede9ecfebe4b1d313f07451c1cbb911ba6adca013136639bc0d01480acd71e5cffddcbf48af5aef58d40f48d6655a
 DIST videorbits-2.205.tgz 672377 BLAKE2B e111d48c3a7e8c3fc1bf878249a07c799879fa3c68e8555c539fd4089800fd7695f1758188295f65aa62fababfc6cc3c534abae384eb820f80bb1bbe0eb4b92d SHA512 faad5a7ab98167d67b7748b4b9aca1ced0e802ed85cba55ba9966d08c48045daa8fef8d387c576dcfa50ace8c4962bb0043bb83e3ba741844ede67d331e4fbf8
 EBUILD videorbits-2.201.ebuild 839 BLAKE2B 0723c77e35508dd0fb030c4b082fced02ade44190c57428870da4788c78da86b030bdfbdc0fba7c7298bb6385540d971a3a12b6e6b9c6fc26abbc9395b9ffa2b SHA512 03e5513d9354c81464e54f3718653bd5e726d507b0eed2089e4ee7f8f57e239a6804f48167fb756ad11a606370b83d0cfb552e2b4caaa18ef740a230004443a5
-EBUILD videorbits-2.205.ebuild 812 BLAKE2B c114fa756c9324dd891f52f4241fe7f9ce58120b79b5baf776f83c73eecc86bda8f6c8e4cf4c53d2b22f0df8b3bc35cefde510afd7fc8bc41f902fbbc1883e12 SHA512 602a97746d18fcb6648d66c1e28e46e29b1eea1aff97358094b96ea681653b9bc015b6400cecd180f436293f07fdb9638940d2d20f7c89366d540c6aa0485d3f
+EBUILD videorbits-2.205.ebuild 811 BLAKE2B d8dcf68348d3214f8e8ec983163e81b2c7fb4c0f81312129c887f83fa032e61e5df848201db582f9490123b1672ebec0b10eba35c0c9fe019f2db336c2f880be SHA512 8ef229ec2a3bae079272f84ec1703469d2f48efb03257d2674a6b9356b6df69b45aa8e5604cfc061e973f0ddc4375bd7a1f83b4099a26c49944a6d8e50accc45
 MISC metadata.xml 250 BLAKE2B 50ea93eb13d7a17cbaaa68accbae08e643330655c4af46a99440edbec4d7ef50111c45d91dfa2490de8cc9c77fb8be16e9f4b285f67c91522cbee316db6a860d SHA512 c18112cc613181bf7e1d339de4f2283d8d4f1c8a6492025a9c0e4c54dedeeed696713e844edd437eb1bd3e9659e4eb33cc49132450ff3ec7efa109a0238b3596
diff --git a/media-gfx/videorbits/videorbits-2.205.ebuild b/media-gfx/videorbits/videorbits-2.205.ebuild
index 52a423416d45..47fed8b74ea7 100644
--- a/media-gfx/videorbits/videorbits-2.205.ebuild
+++ b/media-gfx/videorbits/videorbits-2.205.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/comparametric/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/media-gfx/wkhtmltopdf/Manifest b/media-gfx/wkhtmltopdf/Manifest
index f56c458d9020..5067c62fcdea 100644
--- a/media-gfx/wkhtmltopdf/Manifest
+++ b/media-gfx/wkhtmltopdf/Manifest
@@ -1,5 +1,7 @@
 AUX wkhtmltopdf-0.12.4-build.patch 883 BLAKE2B 42a078df1eae5abe887ed80deaaa42c7a40b7abd140217cbc639f89e1cd78e188f6b13a4b75cbd20a9711003bba9a351d195dc9762b7cb71ee6876f0b78e076c SHA512 679196b89343bade3b8846bc7913c5ebf9d9badb63ffb3de6797a9bdb14e83806cdc0771354bfa9e633bda9c6934d65cbcc7b4f585a31499565a8c6777e1370e
 AUX wkhtmltopdf-0.12.4-gcc6-warn.patch 1271 BLAKE2B fc81541b57da3ce5342026a0d9b4c7017e417cdd6c2546f6a699061e4d8307023611ec7166d0bd27ee092ade0aa73776804f798c007c9fb2e99fcd14879c32e1 SHA512 af4282d023e2da3ab5ba2e7475b3bfa476fc1c9507e2af2db407ff99312cbae60b41846e13564c3b55b670caecd072f6c996348dbbc68528e6a798b3068f6058
 DIST wkhtmltopdf-0.12.4.tar.gz 128695 BLAKE2B 4bd65b8c0b424973524d9307ff329f05702a9ba3206b91abd8252a4127781a502cf40314669b35b395bb0b3712f9fbcf8ba2537164a7fcf8b3276c3262283eb3 SHA512 6ec27453efdf32b97f6434a3eb5dd3d3470bbdccdbb4f997ff4234441c79960932e51d963e5d0d2d98bbf8b4f7ab2ed8835dbc1a35407a63815691b59217caa2
+DIST wkhtmltopdf-0.12.5.tar.gz 511181 BLAKE2B f52d56fd932dfa514cc2711d22f99ea29960a3c4da2522be9f58f3197cb12494f1cdc8856399e328cfc39956282b8174886ee8edfc7417ba5c5d65ea353f6046 SHA512 3f982a6964085b36f62988b618d88d4339f03ad8d2e733c1fcba5e2e7cb545ccc99313ce35474605df818f91c289a87ddd952f21974fdbe846f990bf03fc2fdb
 EBUILD wkhtmltopdf-0.12.4-r1.ebuild 1011 BLAKE2B 870938f9f9c8b32e998a1e746bd4d93233c0f2fa6caeb069ba1090a766f2c602ef7818e3eec14a0a4242eb707a727df8dc48ee4e9123c58f9dc9834e0fc55d14 SHA512 ac76c9b09621fb465a8d6caa05c4406259dd81373541bf9b80a4b8b90d72ef95dc61fb58af5953918923b055bdccee398fa878e95e1511c0d11d5111f33e3bcb
+EBUILD wkhtmltopdf-0.12.5.ebuild 894 BLAKE2B 9fb89715477e0fc29ef9a8043a5a330c133c4cb3820a02de0a89f34df189b0eff715adac588fbb981cb9affaf89cc6a9871c2870f9429a9c67cf17a16fcd89fd SHA512 2cf388f46e5f220b7498bc007240c3735ff094b069200fac34a0c1c892a0faf62bf008cc800b536330948518273a817ba741f20e4015fd8b16cb3c352e8ebb9f
 MISC metadata.xml 347 BLAKE2B d7124ab4db60733f87dcb83d4d12ae47352d5b672a82a949426c3f0c8498c7178fb04ec91ddaf9639b3f1f897f623f7d1e76a10c46af4a0c2a94b8b15efc196e SHA512 b642c6b896856dca084c706f397b6fed8537b126105356365ec0eb14fc6bd51229fece832800f2ab18d8d64a1f22c4015d2fa6467d067ffc58c001af6e216828
diff --git a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild b/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild
new file mode 100644
index 000000000000..3fb400e2f185
--- /dev/null
+++ b/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Convert html to pdf (and various image formats) using webkit"
+HOMEPAGE="https://wkhtmltopdf.org/ https://github.com/wkhtmltopdf/wkhtmltopdf/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5[printsupport]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtxmlpatterns:5
+"
+
+src_prepare() {
+	default
+	sed -i "s:\(INSTALLBASE/\)lib:\1$(get_libdir):" src/lib/lib.pro || die
+}
+
+src_configure() {
+	eqmake5 INSTALLBASE=/usr
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	use examples && dodoc -r examples
+	einstalldocs
+}