gentoo resync 08.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
commit: 3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree: a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /media-gfx
parent: 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)
41 files changed, 977 insertions, 693 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index e40a7d982872..18b0c8c51990 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index e7ab440716ca..185c30d20026 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -11,11 +11,13 @@ AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f0
 AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
 DIST gimp-2.10.2.tar.bz2 30863771 BLAKE2B a3525f7266ffe35be1daf973bee4ea107d9e7384e0c85a792f2fc69bd29fa8ee3d19409586b9b1e1bf36a1be4e30719c7ed945e5de9b7cb4be4f81be06ea1468 SHA512 6e351294e018a9f879993700355bdf5f10bccc6862604ae1950c4d235d32cdfcd6a0195b37377819adeef53ab3d24f32ed1de60cba6bafe58608ed0906a6fbcf
 DIST gimp-2.10.4.tar.bz2 31064613 BLAKE2B 66d815c830696923759146dce68049131078ddf4f67242c78a7755db34c1b7e31b1b25bfe52e8e47a7fb81e24e60e4161261043484242c4682ca6cf362d55816 SHA512 9d0cc8d97b82423687b579907edaab6044f19a8207426edf4f7428de23fa82481112bb0a53b06bb7037b68d92336517b1eddef4600519707e7feedb64e5414f7
+DIST gimp-2.10.6.tar.bz2 31447973 BLAKE2B 96df16c1d774726580ad09317cba31f36bac341aa53178bdb04444c87406465b2c56d508ba0b8c012ad8abc85136f8c635b6e9875e4da57c97e6a6832edbc296 SHA512 1330ec756ec5f57243435e66aeb5f6214a9783e26763be6679714010a631e47dbb8b5f610195587af29261d2183332a4a4c6202acafc3f2837ae7a6b7f9a30c2
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
 EBUILD gimp-2.10.2.ebuild 5296 BLAKE2B 2ab4fe7a79d779f93d62f95a83fb754dca40dd6f8490e660766b722e216cc956a03ff73f118c24bd8d356925a9a688f093da23b81cf0a9de62d4ca3b209715a3 SHA512 c9c70bc7f093dbe9cad2d9324c0ce2269cb0aaa6c022590cb01538fb14ada2a1885151e4d610596b39ea5fa556abb4872a68a389fa0496c0186ae906c5c22e2c
 EBUILD gimp-2.10.4.ebuild 5296 BLAKE2B fa52f60a44fbaa0a08569177ba247d746270a73475f32e2cbf802687bad283ed84fa59b97545eafb1116f1663d9d12b6dec64d0f2dbcea092b391becf8294240 SHA512 2236f5ce2d1e2098f6a5460ce0e28e00543e6549a8e23992955746ba8fa125236bd7e673a1a6827356f2c397906e0c27eb8490df3544f7a261be9a9522a7895d
-EBUILD gimp-2.8.22-r1.ebuild 5186 BLAKE2B 10a8d7c1074b14a4a7b79ec2e157a189597d16caaa1c225704f3c1c7a348cfaa53e711e7e8977f5eb21bf36d5bb2e465e4218e17402858484592c5c10a3b699b SHA512 ccfc14a7e358d66e100a5a4d2d47818a049eb93f64c01ec67f431e7113c4b23355420524413981d68ea4fd53545c9f126867201f0bebe57abfdf7ab3ee337d56
+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 5152 BLAKE2B a11db288f69ce0bab6f10b7e8ab7a0f9ac7c2325f1333a1b9ed3be0d91917d6731aab0e9136443013a94f96bf3028def7245d4386151bdf0f497d54e25470e19 SHA512 ad9110037a965c98437733bec46eadc9d7f7a7197c749c37e8f2d95e4fb437b9c5477e404ef6148648dc1f5280ab4fe3e1fe990da331dbc3c9d480c0abe9f40f
+EBUILD gimp-9999.ebuild 5164 BLAKE2B f12dcedce0eafcade33b9f01f259e7e542f1c4af69668e9cb78264a541be2105f2ab6768aedc76a4a68cbf0cc1d0b1bb6ebb745e260072f2acc8777bd5043842 SHA512 f2e2c117f775b2e046b5343fabef05232af97363fc0dbb506e445de30f5eebc1f8c83d96acf4601ca13d0bdefc723b91873dd1397ad3c256edc0d1e7d3d7796c
 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
diff --git a/media-gfx/gimp/gimp-2.10.6.ebuild b/media-gfx/gimp/gimp-2.10.6.ebuild
new file mode 100644
index 000000000000..54c3e36e5452
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.6.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+
+inherit versionator virtualx autotools gnome2 multilib python-single-r1 ltprune
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+
+RDEPEND=">=dev-libs/glib-2.54.2:2
+	>=dev-libs/atk-2.2.0
+	>=x11-libs/gtk+-2.24.10:2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/pango-1.29.4
+	xpm? ( x11-libs/libXpm )
+	>=media-libs/freetype-2.1.7
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/libmypaint-1.3.0[gegl]
+	>=media-gfx/mypaint-brushes-1.3.0
+	>=media-libs/fontconfig-2.12.4
+	sys-libs/zlib
+	dev-libs/libxml2
+	dev-libs/libxslt
+	x11-themes/hicolor-icon-theme
+	>=media-libs/babl-0.1.56
+	>=media-libs/gegl-0.4.8:0.4[cairo]
+	>=dev-libs/glib-2.43
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	aqua? ( x11-libs/gtk-mac-integration )
+	gnome? ( gnome-base/gvfs )
+	virtual/jpeg:0
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	>=media-libs/lcms-2.8:2
+	mng? ( media-libs/libmng )
+	openexr? ( >=media-libs/openexr-1.6.1 )
+	>=app-text/poppler-0.44[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=media-libs/libpng-1.6.25:0=
+	python?	(
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+	)
+	>=media-libs/tiff-3.5.7:0
+	>=gnome-base/librsvg-2.40.6:2
+	webp? ( >=media-libs/libwebp-0.6.0 )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	net-libs/glib-networking[ssl]
+	x11-libs/libXcursor
+	sys-libs/zlib
+	app-arch/bzip2
+	>=app-arch/xz-utils-5.0.0
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	sys-apps/findutils
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.19
+	doc? ( >=dev-util/gtk-doc-1 )
+	>=sys-devel/libtool-2.2
+	>=sys-devel/automake-1.11
+	dev-util/gtk-doc-am"
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+}
+
+src_configure() {
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+		--disable-silent-rules
+
+		$(use_with !aqua x)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_enable altivec)
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--without-webkit
+		$(use_with jpeg2k jpeg2000)
+		$(use_with postscript gs)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with webp)
+		--without-libheif
+		$(use_enable python)
+		$(use_enable smp mp)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_with udev gudev)
+		$(use_with wmf)
+		--with-xmc
+		$(use_with xpm libxpm)
+		$(use_enable vector-icons)
+		--without-xvfb-run
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+	addwrite /dev/dri/  # bug #574038
+	addwrite /dev/ati/  # bug 589198
+	addwrite /proc/mtrr  # bug 589198
+
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+_clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
+	einfo "Cleaning up locales..."
+	for lang in ${LANGS}; do
+		has ${lang} ${LINGUAS} && {
+			einfo "- keeping ${lang}"
+			continue
+		}
+		rm -Rf "${ED%/}"/usr/share/locale/"${lang}"
+	done
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_optimize
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	prune_libtool_files --all
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(get_version_component_range 1-2)
+	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	_clean_up_locales
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
index 1a41cc78f453..e81e1b0f1e14 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 9122fd25c7e1..aed499a51a21 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -35,8 +35,8 @@ RDEPEND=">=dev-libs/glib-2.54.2:2
 	dev-libs/libxml2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.50
-	>=media-libs/gegl-0.4.2:0.4[cairo]
+	>=media-libs/babl-0.1.56
+	>=media-libs/gegl-0.4.8:0.4[cairo]
 	>=dev-libs/glib-2.43
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
@@ -103,7 +103,7 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
 
 		--enable-default-binary
 		--disable-silent-rules
diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest
index 1c5f9783ea82..a0fb7d7f0065 100644
--- a/media-gfx/gpicview/Manifest
+++ b/media-gfx/gpicview/Manifest
@@ -1,6 +1,6 @@
 DIST gpicview-0.2.4.tar.gz 488510 BLAKE2B 2a674c35cb849531923afde826bdf3f10eeb61f09b2bcb92166532918bd286a886ab52fdfb0b8b00e4e3c4b63aa9f473fd938d81b14409854ec1ccb3421da605 SHA512 60aeae5100ceafc5131cf61d600be5e5fd21c7d0fa62b8124b6f5bc917666b80908ba9e540010867c6d3eab485d9735dfa72f16095be468a718c55eeb65cef34
 DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd
-EBUILD gpicview-0.2.4.ebuild 557 BLAKE2B e1257ea8f8246c5c7c11795cd49542cc2ca8dc452f3af771aeca3986a908aadca3b8703d55ea277bfd654bf73b88bb14aa78094651f4b25bac71da3e689c1a6f SHA512 e828f13b60422bb346cec11a7f517627da4b7c3c723c158ec526c1f55790a0d141f24c1745154ab99480af33a73d546820a5b3f8ec671f3d7b7e5fad2c20fe85
-EBUILD gpicview-0.2.5-r1.ebuild 671 BLAKE2B 0a9c0b073b55b0a75ef6d22531ded3f761e49a1fa79e1519b48a4a9d65e7fc642ab570eada6ee26ddfd1f88b1b7d725e2195b7c32a1f2e27c1db20292eece70d SHA512 dc32f5adc040c2384019edb07a09e4c196e6cc210834defe77a104a91e83e9dbc238e94c586bfb3fc13523c3cd40263a03e57760ae46a370c21737081cc98d56
-EBUILD gpicview-0.2.5.ebuild 559 BLAKE2B 6c5df41b9beeeca66042fc906b7de613cd1254624066856864ab61d2c4986b8625ccd48254084dbc89b3c03de69ba9e5a7adcbbaf7752bcdecb09df6cad19071 SHA512 93b64543846b23886439429a96f9ba7e743818dd5e705582a5395de2afa6851b924d2f7318814c08920f98294cb5f170c29242fa95371e280a943ed64ab62992
+EBUILD gpicview-0.2.4.ebuild 546 BLAKE2B 6aaf09a08fcd8b0d67008c147a92ad1a00d83595e483878e73d959c4b40a55bbeefaa858604a98ce825b665f0ae9693824cce55f95e28871e66e1e6fa859eeea SHA512 ecb21137ae587b179168db328b8e8591acd7ee14cbd412d8353f2ab4105ec9838f7934ebf95c239013b4b85ea1e24990c1391d4bc88df2d0cdd030a33b2f36d9
+EBUILD gpicview-0.2.5-r1.ebuild 660 BLAKE2B 55a05808f30bb011ca9639a1de19dce8fbe24bd0d7959320e44eb6a6e826880d2565ab2a18bdd2cdde2dde6715c332d44f12e1e235a0df435d91ba7c04305418 SHA512 17932b706615451551334540794cc21b5b091443f07c2e4671c80dd0c441c57342f9ef46fef6b1d0f3d00f385bf849969933ff76fd705fbf8452f403333d899e
+EBUILD gpicview-0.2.5.ebuild 548 BLAKE2B 7402a49ee6252fdc380528d96b8fb251da0f2f10c21c87867f8376630bceeaf025c26a2cf9b926be879184849c5786d752a4f42570e7f9b1a5de6feffd86ed5d SHA512 c65d2217ad28d00169b53997497ed000d0fd90d42c121071a69e7c7ff5d4305d8169c3b749409afa0aaa1fd3a3bea76a2ab33ad5e92e45940a7f93d24f6e00b0
 MISC metadata.xml 445 BLAKE2B d91e39bbfe204c70cc479af04d21d643a48077eef9940f4a2cab081ee8f5921291074d0c68c207798b9ec1400e27ba6092068a98e15ca80d2c0e45d5e02f33aa SHA512 bbc64e2e70d381c829c9ef28d202be2b2418b5d387d99f281db5f666a45bd67cbde4c161c99a2e39f4bdd2a3a276574aab878c0a7e0a861f2483aee0bdca55b5
diff --git a/media-gfx/gpicview/gpicview-0.2.4.ebuild b/media-gfx/gpicview/gpicview-0.2.4.ebuild
index 66ef13b04816..2e1c27f296de 100644
--- a/media-gfx/gpicview/gpicview-0.2.4.ebuild
+++ b/media-gfx/gpicview/gpicview-0.2.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="virtual/jpeg
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
index c78b2b2ba9e4..7dc7d1cddc39 100644
--- a/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
+++ b/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
 
 RDEPEND="virtual/jpeg:0
 	>=x11-libs/gtk+-2.6:2"
diff --git a/media-gfx/gpicview/gpicview-0.2.5.ebuild b/media-gfx/gpicview/gpicview-0.2.5.ebuild
index 0457519406ae..129a3c80b690 100644
--- a/media-gfx/gpicview/gpicview-0.2.5.ebuild
+++ b/media-gfx/gpicview/gpicview-0.2.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="virtual/jpeg:0
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 8300a1dfa33f..ba7d6fa40969 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,6 +1,8 @@
 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.11.tgz 4236760 BLAKE2B d02c98cb387eec1d7b238de550554384f25c873e84d6e2a14dbe352c3f1f8420fa06130c5fd9083e442994b88c483a1a9ca8dcaa0a2c632314f1847e432a7f3b SHA512 fd5e997a30492a7668ad7afd78889e40cb37195cb8e11f42817ee00901b699d6a591e8230bf7a40abd1b218ae26588948a92b23e48c9fd03164fd5e2f4031afe
-EBUILD graphite2-1.3.10.ebuild 2510 BLAKE2B 6116568754ea8d6017ddcfeb4b1b91040a22ab46a70a4d5e4225d535674f9ae73fee7d072e660ad35ccb5b2485031d5e9b2e706fe8432d54ec494a5757036158 SHA512 1e26e281abe31cd6efb25dd600563fff689c050a9698bdd687419eb53bdccedb2f2164bf1c2f8b5fa63d7c4f9b039c74e02d34fa89d617195b3e2f9f0b67c776
-EBUILD graphite2-1.3.11.ebuild 2550 BLAKE2B 2c304d16bee69f57d33f65ac9bc0a4aedbcbe7704e0658383f51d4396c488cb1f15ffafaea4e36da60d3385a3ff4faa46be479787d33d4305b34d6c6f48868cd SHA512 ac4fbfb4e99fbd49c76a0f36c8b1fd30182877be68c6996e387d1d71782a5e6e56baebe246e77aa225f5693faf4d35eeef43a68f5befa5b6ba83b37e9bdeb433
+DIST graphite2-1.3.12.tgz 6667293 BLAKE2B 5008cdc6336af6d846b7d14640b1b8987eb46ff8ff25ee518f2b5cd0576dff2430fb6c83527a6ead6759e73d26fb706b98488aadacefc01f3d6138a91c32b541 SHA512 fdb5a08a64dba1bc6e830e6b7a079daaa7ee009571d159ff0edf6bcfb7dd668f60773b872f1c8636bc70e6559e1a870e1649008b4764b02e12dad0add504e664
+EBUILD graphite2-1.3.10.ebuild 2499 BLAKE2B cdfabfaeecaf58e032422d60adf6ee349ec2bdba70313138d4dd4e88e258ba9868a31a4f56109a043846e2aaf7dd242468bd49244ebf28c3b3a9cb0b2d085300 SHA512 43b767dbed5273118dd9cd42a505e659217989f4165dd41e971df02ce6042f1c8476e06eda60b66023f02df3a41b0bfe8b63df88b2035d70ccd2d5fe36a7e4ac
+EBUILD graphite2-1.3.11-r1.ebuild 2590 BLAKE2B 424e04dc5162f49de943d7d500b4c25af8accca0b1a2ebacdab2708947c156ec4141a34bc8bf67d49579641430f42c57080eb70788f6a898b0381ae23fd3fd5e SHA512 047e6ef24a8afbcf3a80f7d73480f6cb0a6e9a6aaa26039beef9bacde59105b23137c6933f2fd26150628571121f9c67df1a3d908ac7593bfdcc39a2e417b050
+EBUILD graphite2-1.3.12-r1.ebuild 2590 BLAKE2B 424e04dc5162f49de943d7d500b4c25af8accca0b1a2ebacdab2708947c156ec4141a34bc8bf67d49579641430f42c57080eb70788f6a898b0381ae23fd3fd5e SHA512 047e6ef24a8afbcf3a80f7d73480f6cb0a6e9a6aaa26039beef9bacde59105b23137c6933f2fd26150628571121f9c67df1a3d908ac7593bfdcc39a2e417b050
 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 795bd3f9566e..8acb505e812a 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 ~arm-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-fbsd ~x86-fbsd ~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.11.ebuild b/media-gfx/graphite2/graphite2-1.3.11-r1.ebuild
index 38ff5695b59f..64d56a70455a 100644
--- a/media-gfx/graphite2/graphite2-1.3.11.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.11-r1.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 ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="perl test"
 
 RDEPEND="
@@ -62,7 +62,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		"-DVM_MACHINE_TYPE=direct"
+		# Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+		"-DGRAPHITE2_VM_TYPE=direct"
 		# https://sourceforge.net/p/silgraphite/bugs/49/
 		$([[ ${CHOST} == powerpc*-apple* ]] && \
 			echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
diff --git a/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
new file mode 100644
index 000000000000..64d56a70455a
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+GENTOO_DEPEND_ON_PERL="no"
+inherit perl-module python-any-r1 cmake-multilib
+
+DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE="http://graphite.sil.org/"
+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"
+IUSE="perl test"
+
+RDEPEND="
+	perl? ( dev-lang/perl:= )
+"
+DEPEND="${RDEPEND}
+	perl? (
+		dev-perl/Module-Build
+		dev-perl/Locale-Maketext-Lexicon
+		)
+	test? (
+		dev-libs/glib:2
+		media-libs/fontconfig
+		$(python_gen_any_dep '
+			dev-python/fonttools[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+		perl? ( virtual/perl-Test-Simple )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
+)
+
+pkg_setup() {
+	use perl && perl_set_version
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# make tests optional
+	if ! use test; then
+		sed -i \
+			-e '/tests/d' \
+			CMakeLists.txt || die
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+		"-DGRAPHITE2_VM_TYPE=direct"
+		# https://sourceforge.net/p/silgraphite/bugs/49/
+		$([[ ${CHOST} == powerpc*-apple* ]] && \
+			echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
+	)
+
+	cmake-utils_src_configure
+
+	# fix perl linking
+	if multilib_is_native_abi && use perl; then
+		# we rely on the fact that cmake-utils_src_configure sets BUILD_DIR
+		sed -i \
+			-e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
+			"${S}"/contrib/perl/Build.PL || die
+	fi
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_configure
+		perl-module_src_compile
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cmake-utils_src_test
+	else
+		einfo Cannot test since python is not multilib.
+	fi
+}
+
+src_test() {
+	cmake-multilib_src_test
+	if use perl; then
+		# Perl tests fail due to missing POD coverage...
+		perl_rm_files "contrib/perl/t/pod.t" "contrib/perl/t/pod-coverage.t"
+		cd contrib/perl || die
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	cmake-multilib_src_install
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_install
+		perl_delete_localpod
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 279765cd6c44..c723d8a5c7c0 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,5 +1,5 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad1aab5182ec410dfd527732fefdf335cda392f1036409ac3a6b86be15794b80546ff9cbfd47454bd01266d861945 SHA512 bd1d51ae10d17ef321bba7dfa619054642debbb02ea1458b0597e6c62471e7750bf5d2cfc68ccb6fd2964b0fbe072b2e7642dd8b097c7e046f8877a2e36d3f44
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
-EBUILD graphviz-2.40.1-r1.ebuild 7962 BLAKE2B 4aa432d484183dff51c64ecc1ce40535bf0e35009956971452fa0907862a8b8f9c62a234d3881549253a6e8cfff2b557e8accff803349d00a977233b0c72be86 SHA512 c20e654abfc7cc404730dc1d73551c54303bd4d11980dc2a02a87ec984ed4a5393582935aa21ec316887bfc8e04d54343f5e943fcb72e4d24d451cedbcd2153b
+EBUILD graphviz-2.40.1-r1.ebuild 7951 BLAKE2B d1347b10437cd629dd01329e925472ad3e419f0c0e8102f58aa0baa63ecf06fc0fdbe149bd10b4112261086517cd2a5def725aefd968d5c5161d8b534b5e3f56 SHA512 7397df7c9b0b269743cc7232897454f13329e4a75e0e815715464008b493391744e06ad4a0772bc1f0ba9c8d44c58dde3bd56605f41e1d2d90330b8501aa4759
 MISC metadata.xml 2154 BLAKE2B 6d4f465488af95c9b49dc6997bc1ea91f87ed83661eab81bf6287afde99ae75c0cdef1a0ee1b1d99269b7fa484aacdbed13e13bb4a79b196564e04872aea0832 SHA512 1063c868fd3d0b6ad636e24d5eb00be84b19ea23266e0cffdc8c1c8da86bfcf05d3f48f29540b6452a2d7485463108e0e91f8546c24e13f95da4ebfb3283cb43
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
index 5bb2f1fce95c..b7b02df892c6 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 ~arm-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-fbsd ~x86-fbsd ~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/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 12ea63d01132..9bff94d077af 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,8 +2,12 @@ AUX imagemagick-7.0.8.10-quantum-private-compile-fix.patch 778 BLAKE2B c770f89f8
 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
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
new file mode 100644
index 000000000000..894bc214df1b
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.11.ebuild
@@ -0,0 +1,235 @@
+# 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-7.0.8.11.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild
new file mode 100644
index 000000000000..25c4681ac138
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.11.ebuild
@@ -0,0 +1,241 @@
+# 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"
+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/krita/Manifest b/media-gfx/krita/Manifest
index 5943882ddf0c..b45dd847682a 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,10 +1,7 @@
-AUX krita-3.2.0-tests-optional.patch 8806 BLAKE2B 90355102edb82e69539dbbedae83a9bb51f98a34fdfd85758e4b4427ed5ec058cfe28931fb6a1c604a9631ff1b3b5c86651a7d6fde80d2002d7e7a2ef6f6aa69 SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34
 AUX krita-4.0.3-libraw-0.19.patch 3124 BLAKE2B c84c94b2e0032b4f1f78f1ca944940688775c91a48a0a6449343af36d03f5a754a48749e67365a028314757c0b822db7bda5e9b4e7c7c58796b032306abcd19b SHA512 90e2d40a6d30990b7de7365c06a769e500d2df75281767f3d724b7e5288e131b4cfcfff989a75e66642e374f624bdb8da2e6afe8c12de0ba3282ebd362189140
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
-DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693 SHA512 b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0
 DIST krita-4.0.3.tar.gz 241332929 BLAKE2B 222a3425f64c98d964f421c84f48295d5cb72e622631e9b1cb5a2ac9980a6f59cbf12b0815df68a09daf138efc2d4e2e83cb46034c8e12ddd621cb49f1117b72 SHA512 13b3263a09dbb955dea435e97bf12b6f0670fce68c4c2c9e97e7b45b480301119f317e72fac63eec07caff295885b7d62ac7c6255545a139e1e5f4b1106989e8
 DIST krita-4.0.4.tar.gz 241431012 BLAKE2B c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601 SHA512 a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45
-EBUILD krita-3.3.3.ebuild 2559 BLAKE2B a8cff6bd75d240ab4f4b63ac7f58d3d329c7c830cd5c62b0846d3b8b9f5ccbc0cb3a4405daad513a4d3ed3db3de9d9c9f81696d204cbc1779721312a171fe6d8 SHA512 43163beb98c83de02b28da41e8172546cf9993280d395387ed471b0c35568a7e6393610cc53da64d55830c0460b00d0fabb5431d14a6a360bba17f8ad54d1f14
-EBUILD krita-4.0.3.ebuild 3210 BLAKE2B f1a506c7cc4955e6429743d0be8ed2201c7a6c54cabaa06fcfc913869c3afafb5b75022cf4f6651af517ac1a1a1e285221a44ca46450702fdfaf0ccc7f14a0f8 SHA512 af446dc81bfc14f76d0cd131e0eb6bb9a5f2e2ceb3d84d0a05a9eafe24cb722083a5574341833884b314221f4c7df07a3bb3a790893ecf25948ada4787e85f75
+EBUILD krita-4.0.3.ebuild 3209 BLAKE2B 969d1fed2d60fe9e3dc7a648d3e1fdad7c405e4af03bc339edd8016c0f0fce7dc63c5839286c9f42f02dcb0426fd6bc273909e13e87a47dee6c5e2bda42578a0 SHA512 d4e5d1a9603c6c660f3c0cb03ecefe2707f7c2c05f9664b4702373166e97ca0d953d9b33425d7bfcb145ad91bc75bfc6ee08fc3f4fdd12447e7dbfca35bbddba
 EBUILD krita-4.0.4.ebuild 3096 BLAKE2B 4d54402c4fe4ab7b6802b88338bf436b4d74410191d38e037df4ecb15c101a4a1c9c3b88a36a6c1731ea6df864e45f042bc1c84ed91b4d34c5c3e9a6ff559b21 SHA512 a8a288bd685a1b8f86078d398e35462dadffdb8d2ebb7ca4d967dfed80b1261bebc565e54bb51385e9bdd60e043d129188c147faaba276c39e66bec3d8859f52
 MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27
diff --git a/media-gfx/krita/files/krita-3.2.0-tests-optional.patch b/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
deleted file mode 100644
index 0f143ff1cc51..000000000000
--- a/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-Autogenerated by KDE_TEST=forceoptional-recursive and edited.
-
---- a/plugins/paintops/libpaintop/CMakeLists.txt	2017-08-19 23:45:06.235796211 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt	2017-08-19 23:45:06.241796045 +0200
-@@ -95,4 +95,6 @@
- install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2017-08-19 23:45:06.250795797 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2017-08-19 23:45:06.258795576 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
- 
- include_directories(brush)
- include_directories(duplicate)
---- a/plugins/impex/exr/CMakeLists.txt	2017-08-19 23:45:06.266795355 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt	2017-08-19 23:45:06.274795134 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
- 
---- a/plugins/impex/jpeg/CMakeLists.txt	2017-08-19 23:45:06.282794913 +0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt	2017-08-19 23:45:06.289794720 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
- 
---- a/plugins/impex/psd/CMakeLists.txt	2017-08-19 23:45:06.297794499 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt	2017-08-19 23:45:06.304794306 +0200
-@@ -1,5 +1,7 @@
- if (NOT MSVC AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+        add_subdirectory(tests)
-+    endif()
- endif()
- 
- configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
---- a/plugins/impex/ppm/CMakeLists.txt	2017-08-19 23:45:06.313794058 +0200
-+++ b/plugins/impex/ppm/CMakeLists.txt	2017-08-19 23:45:06.319793892 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
---- a/plugins/impex/png/CMakeLists.txt	2017-08-19 23:45:06.327793672 +0200
-+++ b/plugins/impex/png/CMakeLists.txt	2017-08-19 23:45:06.334793478 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritapngimport_SOURCES
-     kis_png_import.cc
---- a/plugins/impex/csv/CMakeLists.txt	2017-08-19 23:45:06.343793230 +0200
-+++ b/plugins/impex/csv/CMakeLists.txt	2017-08-19 23:45:06.349793064 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${Boost_INCLUDE_DIRS}
---- a/plugins/impex/xcf/CMakeLists.txt	2017-08-19 23:45:06.357792843 +0200
-+++ b/plugins/impex/xcf/CMakeLists.txt	2017-08-19 23:45:06.364792650 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
- 
---- a/plugins/impex/tiff/CMakeLists.txt	2017-08-19 23:45:06.372792429 +0200
-+++ b/plugins/impex/tiff/CMakeLists.txt	2017-08-19 23:45:06.379792236 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(libkritatiffconverter_LIB_SRCS
-     kis_tiff_converter.cc
---- a/plugins/extensions/qmic/CMakeLists.txt	2017-08-19 23:45:06.387792016 +0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt	2017-08-19 23:45:06.393791850 +0200
-@@ -20,4 +20,6 @@
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/filters/CMakeLists.txt	2017-08-19 23:45:06.401791629 +0200
-+++ b/plugins/filters/CMakeLists.txt	2017-08-19 23:45:06.408791436 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
---- a/plugins/filters/unsharp/CMakeLists.txt	2017-08-19 23:45:06.416791215 +0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt	2017-08-19 23:45:06.422791049 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaunsharpfilter_SOURCES
-     unsharp.cpp
---- a/plugins/tools/basictools/CMakeLists.txt	2017-08-19 23:45:06.430790829 +0200
-+++ b/plugins/tools/basictools/CMakeLists.txt	2017-08-19 23:45:06.437790636 +0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+        add_subdirectory(tests)
-+    endif()
- endif ()
- 
- include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
---- a/plugins/tools/tool_transform2/CMakeLists.txt	2017-08-19 23:45:06.446790387 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt	2017-08-19 23:45:06.453790194 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+        add_subdirectory(tests)
-+    endif()
- endif()
- 
- include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
---- a/plugins/color/lcms2engine/CMakeLists.txt	2017-08-19 23:45:06.461789973 +0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt	2017-08-19 23:45:06.468789780 +0200
-@@ -1,6 +1,8 @@
- project( lcmsengine )
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${LCMS2_INCLUDE_DIR} 
---- a/plugins/dockers/defaultdockers/CMakeLists.txt	2017-08-19 23:45:06.476789559 +0200
-+++ b/plugins/dockers/defaultdockers/CMakeLists.txt	2017-08-19 23:45:06.483789366 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritadefaultdockers_SOURCES 
-   kis_layer_box.cpp
---- a/plugins/dockers/animation/CMakeLists.txt	2017-08-19 23:45:06.491789145 +0200
-+++ b/plugins/dockers/animation/CMakeLists.txt	2017-08-19 23:45:06.497788980 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+        add_subdirectory(tests)
-+    endif()
- endif()    
- 
- include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
---- a/plugins/dockers/lut/CMakeLists.txt	2017-08-19 23:45:06.506788731 +0200
-+++ b/plugins/dockers/lut/CMakeLists.txt	2017-08-19 23:45:06.512788565 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+        add_subdirectory(tests)
-+    endif()
- endif()
- 
- include_directories(SYSTEM
---- a/libs/store/CMakeLists.txt	2017-08-19 23:45:06.520788345 +0200
-+++ b/libs/store/CMakeLists.txt	2017-08-19 23:45:06.527788151 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritastore_LIB_SRCS
-     KoDirectoryStore.cpp
---- a/libs/flake/CMakeLists.txt	2017-08-19 23:45:06.536787903 +0200
-+++ b/libs/flake/CMakeLists.txt	2017-08-19 23:45:06.542787737 +0200
-@@ -8,7 +8,9 @@
- )
- 
- add_subdirectory(styles)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritaflake_SRCS
-     KoGradientHelper.cpp
---- a/libs/widgetutils/CMakeLists.txt	2017-08-19 23:45:06.550787517 +0200
-+++ b/libs/widgetutils/CMakeLists.txt	2017-08-19 23:45:06.557787323 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
- 
---- a/libs/odf/CMakeLists.txt	2017-08-19 23:45:06.565787103 +0200
-+++ b/libs/odf/CMakeLists.txt	2017-08-19 23:45:06.572786910 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaodf_LIB_SRCS
-     KoOdf.cpp
---- a/libs/pigment/CMakeLists.txt	2017-08-19 23:45:06.580786689 +0200
-+++ b/libs/pigment/CMakeLists.txt	2017-08-19 23:45:06.587786495 +0200
-@@ -34,7 +34,9 @@
-     message(${__per_arch_factory_objs})
- endif()
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- add_subdirectory(benchmarks)
- 
- set(kritapigment_SRCS
---- a/libs/widgets/CMakeLists.txt	2017-08-19 23:45:06.595786275 +0200
-+++ b/libs/widgets/CMakeLists.txt	2017-08-19 23:45:06.601786109 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
---- a/libs/ui/CMakeLists.txt	2017-08-19 23:45:06.610785861 +0200
-+++ b/libs/ui/CMakeLists.txt	2017-08-19 23:45:06.617785667 +0200
-@@ -9,7 +9,9 @@
-     ${Boost_INCLUDE_DIRS}
- )
- 
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- if (APPLE)
-     find_library(FOUNDATION_LIBRARY Foundation)
---- a/libs/image/CMakeLists.txt	2017-08-19 23:45:06.626785419 +0200
-+++ b/libs/image/CMakeLists.txt	2017-08-19 23:45:06.632785254 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- add_subdirectory( tiles3 )
- 
---- a/libs/image/tiles3/CMakeLists.txt	2017-08-19 23:45:06.641785005 +0200
-+++ b/libs/image/tiles3/CMakeLists.txt	2017-08-19 23:45:06.647784839 +0200
-@@ -1,2 +1,4 @@
- include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/brush/CMakeLists.txt	2017-08-19 23:45:06.658784536 +0200
-+++ b/libs/brush/CMakeLists.txt	2017-08-19 23:45:06.665784343 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(SYSTEM
-     ${EIGEN3_INCLUDE_DIR}
diff --git a/media-gfx/krita/krita-3.3.3.ebuild b/media-gfx/krita/krita-3.3.3.ebuild
deleted file mode 100644
index b99c804b692b..000000000000
--- a/media-gfx/krita/krita-3.3.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~x86"
-IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	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= )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( <media-libs/libraw-0.19:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-4.0.3.ebuild b/media-gfx/krita/krita-4.0.3.ebuild
index adfd8b17fc23..839c3b054f8d 100644
--- a/media-gfx/krita/krita-4.0.3.ebuild
+++ b/media-gfx/krita/krita-4.0.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 9b03748d7835..121a9d1ff3a3 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,3 +1,4 @@
+AUX kxstitch-2.1.1-qt-5.11.patch 992 BLAKE2B f0be157270ddd27e1f997f57afbb8e3d80c31816334664a7a2804c4c9971a81c11ecd775820b7fe0db36dff7ea00d046c7f005a0bf715e9336f4f238a36c2b18 SHA512 93d6a5ddc2fa928369b09637ee6b856ba60d35d02e5e93f16fc08c4fdbc2ebead44224d2ad98fa2ffe6efcea8b93a0211eb00ad83c9cd91b8ddc30edff17602e
 DIST kxstitch-2.1.1.tar.xz 1726364 BLAKE2B 47257408f31ca7db4bddf984150baac6cd850206cedb95c73b0d62ee9f966028afd97bb3653b385104a1c679512c35f41aa25c5b703c715e565d48cfda59da36 SHA512 d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3
-EBUILD kxstitch-2.1.1.ebuild 950 BLAKE2B b736baf0b1c971d9ad3e65334442a0fd7aa4a32937d544a52005031e682ac34a4e115c310cb68c38640769b3df07872893a0e872345335a28c2cc3f2b9d093b8 SHA512 8ed768f44f342c9d45875fe6045c51d4ab934d6d3c6bb3eef8d73e8d585eac80804d13f751972834319b097fc7046d7fb5df2fad7d928749bf6920d2d3522cd7
+EBUILD kxstitch-2.1.1.ebuild 996 BLAKE2B c4501fe2dd6f65972f32638ce780bdae756963aea4ae91c16a5963d6009345b61cb20449d9633928afe045efc4c260e044cf5b6507aba48cca4d30f6a0554cc5 SHA512 707d79a84adfcb6c17a7d2a9cfdaba94eccf10d4de2c2cf43f6759a638978f6f9e52a312445c1c12089a996d7da311c754faaa2bf7038ca6326e2fdbd42cbcb6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch b/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch
new file mode 100644
index 000000000000..70022fe9c8fa
--- /dev/null
+++ b/media-gfx/kxstitch/files/kxstitch-2.1.1-qt-5.11.patch
@@ -0,0 +1,37 @@
+From 9db3fcf9cd367681c0864238dc5009a604f3896c Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Wed, 27 Jun 2018 16:45:16 +0100
+Subject: fix build with Qt 5.11
+
+---
+ src/LibraryPatternPropertiesDlg.cpp | 2 ++
+ src/TextElementDlg.cpp              | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/LibraryPatternPropertiesDlg.cpp b/src/LibraryPatternPropertiesDlg.cpp
+index 8d2e24c..c10da3f 100644
+--- a/src/LibraryPatternPropertiesDlg.cpp
++++ b/src/LibraryPatternPropertiesDlg.cpp
+@@ -11,6 +11,8 @@
+ 
+ #include "LibraryPatternPropertiesDlg.h"
+ 
++#include <QIcon>
++
+ #include <KConfigGroup>
+ #include <KHelpClient>
+ #include <KLocalizedString>
+diff --git a/src/TextElementDlg.cpp b/src/TextElementDlg.cpp
+index 4d88b1e..fb545d1 100644
+--- a/src/TextElementDlg.cpp
++++ b/src/TextElementDlg.cpp
+@@ -16,6 +16,7 @@
+ #include "TextElementDlg.h"
+ 
+ #include <QColorDialog>
++#include <QButtonGroup>
+ 
+ #include <KHelpClient>
+ #include <KLocalizedString>
+-- 
+cgit v0.11.2
diff --git a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
index 3e24a1c98c3e..e9ec0691e3f9 100644
--- a/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild
@@ -39,3 +39,5 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!media-gfx/kxstitch:4
 "
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 2c63e3bcc7a5..a0ce1b673433 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 1100 BLAKE2B 3c195be010dcd423a20493626dddba6f0fd8cb384b5fe0fe5c327ecd044735a1bdd5903440aa5596baea9a96f05c8c1dd1b81fc8626b842c8cf15168b62765e1 SHA512 2f3f4d7130ff2c20c5f1cadfa5eff37c90bc13cefb7e812adaf6c9e2bdc4eeb93f355f0a09e64d172e195994ee5c7a74970f07ec2bdb7d5330aa4b8645c73842
+EBUILD librecad-2.1.3-r4.ebuild 1099 BLAKE2B 1abbb13466b5dd223ce89d84d5c109b13ea9f1db147368d4afeffa1c0c72ded1b10a39c93073bae692ff0faa0df604aba38f32989132c4279ef428cc7ccab7c1 SHA512 d1f13e1ee1c60c4906c960803a2afa309be48284b939d2ddb33ce4e4bf0c8d5ac1e0a09dc8f515dc9cd5e1b60846fd56b150670e1f3c9fac1660da6b3485d4a2
 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 f7542aac6ff3..5e3ef74458b4 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/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 46dbb4bd732f..1f14baebbeb0 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -14,13 +14,13 @@ AUX 2016.12/0001-use-external-muParser.patch 1574 BLAKE2B 0114f8b5f45c93117dda73
 AUX 2016.12/0001-use-external-openctm.patch 1841 BLAKE2B 8cd4c14c846df052a44d54386948deb161ee8459750e1fe551e79295c56f93eb7d7e678533e0077a071ea4bc95362dec89d02d20c75b943d188ce457b83ca6e9 SHA512 48532da795602ac867bade00e6a649758f7c6d0c26412c8a4486e23239d3d55220ba22ea5b9ca5e11f97ea224626ebb95bbf89cbb707876575a11be891aabcaa
 AUX 2016.12/meshlab-2016.12-align1.patch 766 BLAKE2B 4a226e853d8c236ff07d408093bd1e197df202a732e8c6cf429f479c2d9101260d33834e877896ea4570d690fc03c0d60d883b88e9591c9c7781fd0117fc3543 SHA512 4f8684a4fe8fdec286672c330e9c489028518bf121ec561221d3108af44ed4afd3cb3d21113b1b5b110afc127c25d9bc5fb6999be4fd815eddfe3aa406b0f7a7
 AUX 2016.12/meshlab-2016.12-align2.patch 624 BLAKE2B 342231146ef2efc52ae4295d9094e07818d0ce6265a02426d43648d070e0f7b939e4323a820721450ef7c240dc6f0a8459e3608fb74519eeb7e1efea510e2e76 SHA512 cfa90271bd671244ecc4ad92318f2aad31223990843fb3e185e66b51c8b975c5ed3fec73834e379c1498ce35de1a9e217aa28ff2fdea6233abcbdba09896cc19
+AUX 2016.12/meshlab-2016.12-asString.patch 2309 BLAKE2B 8ff58d9a247e530e7965d186dfffc2e88bd4594a366439f9a8433269e3f20e33825673447a5ebac39929f02927a20cfa8d3dad0fae5787d6855de5653023ff31 SHA512 3ad05b637ad12a88a6e32f437cf6105b09c50eef16e815f11f3a1fbd6afdb3b01d9a0d31f08eaba26d075f6f2cba6c4694ca1afa2cc1e3973350294bc41f815b
 AUX 2016.12/meshlab-2016.12-fix-plugins-path.patch 509 BLAKE2B 3a4327b41743704255039f2c06713975c2d842a3af5077385d982107289d33a5a04473f68e21769ca97e45514ca1119244c2b66b5709b99a0b772324e1b0884f SHA512 613b3cec1c50c3d4d6fd3006b80fd4cb3b66a97c1493872d76f95c5ed16ee9c2a9aba5c1a5d021a302114e8e0e172619c4d344306004f109a1f211ee6a14e102
 AUX 2016.12/meshlab-2016.12-remove-header.patch 1481 BLAKE2B c52f2eb980ebec98a534d2f5f6eadb9b89719e1d28d6fdc2912348fbe715103f2ca67684e29d1fa77b9b305cf552c12eb667634bfa22a0fad0312012e9b7b99d SHA512 ea0e24aa94d2595ed340c91c7a17e4028b2792bf316dfea0d8062324583dde62c03bb2d6af74317b9e448c657e5418100f40b18b172344697fe53e36657a45fc
 AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f95118e00159457b91d04820166efae55d27eb19006af9ae92555b46adcd817646fcfcef82937221d59fef41899f94df1925a237 SHA512 03b4907fc484941d17d208d028b63cc0a1d1740fbdac8a6dd2b9ac8161efc5899d820cd0ec59b28ba1c39562ecd93c5e11e7b7af5564ee9aa429cb8745a4a5b9
 AUX 2016.12/remove-io_TXT.patch 416 BLAKE2B 60aa9c033a4902c4a9acb76b1ac130076cfdef314ac57a144c0a83d59e1d7f2aa5e55c01c41ba671661cdeef249aa09e021085440214910c8153fa6303833c2f SHA512 2ff0391e5c0bd171bb06fc61cbe84112f5e480667f7a7caacbb3b3a0e566c6c2f31f443d8c6026298c3a86bf2979db534989b4eab368baaee67491b95e76723a
 DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
-EBUILD meshlab-2016.12-r1.ebuild 3403 BLAKE2B d805907e57a5425ca2e6e249b27ab1581f69e645b9445d590f9f2836e498e10915d25b0ea51430614b7f370d9006d9430a5a17c0d5cb24184b4c60dff5f873eb SHA512 6b875e92f7787fb4f81f0ff7c866835a44d2f0626f6462e761b64701abf6583853fe2cf8974a1e041d5cf563fd1a0060e0d97a61d7cb715eb941104b34db1dff
 EBUILD meshlab-2016.12-r2.ebuild 3499 BLAKE2B 091b524a914ae4e97ddeb36d280e00cfcfe73562528f701dc979bbe8b48d993ee542c3e62f02e21093c678d7c99918f18705f011db51fc376c64a384d4534123 SHA512 ca7e94c0b96acaedcbce13456e4cba2e58d8f98bbd1b0fe860703776c9c31d30658b05ad81c172a79fb1dadd06f5eb51156ff4bc44f4ac97e8f4159e162e11f0
-EBUILD meshlab-2016.12.ebuild 3339 BLAKE2B a583514e9bb2bab3e887be08a62ce64aeef3730716ea73874f100e6afa1cf05aa5bbfb1b0922562a1a567fb31b9b390e1ec2a4456105c48c14ce519161ea7f36 SHA512 358b291e3b255b5a1542b7f0d6668c2696b39cc2c4d30e1fd34b7860c01840f8a49607d1a80b4a33305b7f5cb2d50526b0ead56e597e3792a8575411fd24a3c6
+EBUILD meshlab-2016.12-r3.ebuild 3541 BLAKE2B fa43f8db5d083a4ff06cf5ed7063916c0c751db887b6c1dc99fd22c788c05460a4caa6f3ee9c846e6812a5ccc2b537f05a4b9655e7282ca9fdf18db3d1039d44 SHA512 c821471fc31987425988cc65112b8945f2b22f159ba43ad4a1028b52bfeba346e268f4209b6a032c01192180db10e3154497f5658442be1e01c29f768cb63e99
 MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch
new file mode 100644
index 000000000000..7e58790590a8
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch
@@ -0,0 +1,62 @@
+From e1410053455a497d32b1e896eb7e99a7224b6832 Mon Sep 17 00:00:00 2001
+From: Miro Hrončok <miro@hroncok.cz>
+Date: Aug 29 2018 20:40:58 +0000
+Subject: Fix FTBFS (#1604819)
+
+
+---
+
+diff --git a/meshlab-2016.12-qprintable.patch b/meshlab-2016.12-qprintable.patch
+new file mode 100644
+index 0000000..9a916f6
+--- /dev/null
++++ b/meshlab-2016.12-qprintable.patch
+@@ -0,0 +1,20 @@
++--- a/src/meshlabserver/mainserver.cpp	2016-12-23 11:24:59.000000000 +0100
+++++ b/src/meshlabserver/mainserver.cpp.a	2018-08-29 20:32:03.009295180 +0200
++@@ -897,7 +897,7 @@
++     }
++ 
++ 	if (meshDocument.size() < outmeshlist.size())
++-		fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", qPrintable(outmeshlist.size()), qPrintable(meshDocument.size()));
+++		fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", outmeshlist.size(), meshDocument.size());
++ 	else
++ 	{
++ 		for (int ii = 0; ii < outmeshlist.size(); ++ii)
++@@ -911,7 +911,7 @@
++ 					fprintf(logfp, "Output mesh %s has NOT been saved\n", qPrintable(outmeshlist[ii].filename));
++ 			}
++ 			else
++-				fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", qPrintable(ii), qPrintable(outmeshlist[ii].filename));
+++				fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", ii, qPrintable(outmeshlist[ii].filename));
++ 		}
++ 
++ 	}
+diff --git a/meshlab-2016.12-qt-includes.patch b/meshlab-2016.12-qt-includes.patch
+new file mode 100644
+index 0000000..66e4f67
+--- /dev/null
++++ b/meshlab-2016.12-qt-includes.patch
+@@ -0,0 +1,21 @@
++--- a/src/meshlabplugins/render_gdp/shaderDialog.h	2016-12-23 11:24:59.000000000 +0100
+++++ b/src/meshlabplugins/render_gdp/shaderDialog.h.a	2018-08-29 20:55:01.414996789 +0200
++@@ -32,6 +32,8 @@
++ #include "shaderStructs.h"
++ #include "ui_shaderDialog.h"
++ #include <QMap>
+++#include <QLineEdit>
+++#include <QSlider>
++ 
++ class QGLWidget;
++ 
++--- ./meshlab-2016.12/src/meshlabplugins/edit_paint/paintbox.cpp	2016-12-23 11:24:59.000000000 +0100
+++++ ./meshlab-2016.12/src/meshlabplugins/edit_paint/paintbox.cpp.a	2018-08-29 21:19:42.411581082 +0200
++@@ -23,6 +23,7 @@
++ 
++ #include "paintbox.h"
++ #include <QFileDialog>
+++#include <QAction>
++ 
++ Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags)
++ {
+
diff --git a/media-gfx/meshlab/meshlab-2016.12-r1.ebuild b/media-gfx/meshlab/meshlab-2016.12-r3.ebuild
index 92057cb311ab..4fc8458b15a7 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r1.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r3.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
 		"${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
 		"${FILESDIR}/${PV}/${P}-align1.patch"
 		"${FILESDIR}/${PV}/${P}-align2.patch"
+		"${FILESDIR}/${PV}/${P}-asString.patch"
 	)
 
 src_prepare(){
@@ -77,6 +78,10 @@ src_prepare(){
 	#rm -r "external"
 	rm -r "distrib/plugins/U3D_W32" || die
 	rm -r "distrib/plugins/U3D_OSX" || die
+
+	# Fix bug 638796
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}/${PV}/${P}-remove-header.patch"
 }
 
 src_configure() {
diff --git a/media-gfx/meshlab/meshlab-2016.12.ebuild b/media-gfx/meshlab/meshlab-2016.12.ebuild
deleted file mode 100644
index 6d45ceecb02e..000000000000
--- a/media-gfx/meshlab/meshlab-2016.12.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="the open source system for processing and editing 3D triangular meshes"
-HOMEPAGE="http://www.meshlab.net"
-VCG_VERSION="1.0.1"
-SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	 https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-minimal"
-DEPEND="dev-cpp/eigen:3
-	dev-cpp/muParser
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5
-	dev-qt/qtxmlpatterns:5
-	>=media-gfx/jhead-3.00-r2
-	media-libs/glew:0
-	media-libs/qhull
-	=media-libs/lib3ds-1*
-	media-libs/openctm
-	sci-libs/levmar
-	sci-libs/mpir"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/meshlab-${PV}/src"
-
-PATCHES=(
-		"${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
-		"${FILESDIR}/${PV}/0001-update-1.3.3-pluginmanager.patch.patch"
-		#remove ot working plugins
-		"${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
-		"${FILESDIR}/${PV}/remove-io_TXT.patch"
-		#since structure synth doesn't seem to be compiling
-		"${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
-		#this has been fixed in the tree
-		"${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
-		#this causes segfaults
-		"${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
-		#for when we use minimal
-		"${FILESDIR}/${PV}/0001-compile-server.patch"
-		"${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
-		"${FILESDIR}/${PV}/0001-use-external-openctm.patch"
-		"${FILESDIR}/${PV}/0001-use-external-muParser.patch"
-		"${FILESDIR}/${PV}/0001-use-external-bzip.patch"
-		"${FILESDIR}/${PV}/0001-use-external-jhead.patch"
-		"${FILESDIR}/${PV}/0001-use-external-glew.patch"
-		#cause gnu stack quickstart related qa
-		"${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
-	)
-
-src_prepare(){
-	mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed"
-	default
-	#proof of patchset
-	#remove libs that are being used from the system
-	rm -r "external/lib3ds-1.3.0" || die "rm failed"
-	rm -r "external/OpenCTM-1.0.3" || die "rm failed"
-	rm -r "external/muparser_v132" || die "rm failed"
-	rm -r "external/muparser_v225" || die "rm failed"
-	rm -r "external/bzip2-1.0.5" || die "rm failed"
-	rm -r "external/jhead-2.95" || die "rm failed"
-	rm -r "external/glew-1.5.1" || die "rm failed"
-	rm -r "external/glew-1.7.0" || die "rm failed"
-	#we still depend on lm.h
-	#rm -r "external"
-	rm -r "distrib/plugins/U3D_W32" || die
-	rm -r "distrib/plugins/U3D_OSX" || die
-}
-
-src_configure() {
-	use minimal || eqmake5 -r meshlab_full.pro
-	use minimal && eqmake5 -r meshlab_mini.pro
-}
-
-src_install() {
-	dobin distrib/{meshlab,meshlabserver}
-	dolib distrib/libcommon.so.1.0.0
-	dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1
-	dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so
-	exeinto /usr/$(get_libdir)/meshlab/plugins
-	doexe distrib/plugins/*.so
-	insinto /usr/share/meshlab/shaders
-	doins -r distrib/shaders/*
-	insinto /usr/share/meshlab/plugins
-	doins -r distrib/plugins/*
-	insinto /usr/share/meshlab/textures
-	doins -r distrib/textures/*
-	insinto /usr/share/meshlab/sample
-	doins -r distrib/sample/*
-	newicon "${S}"/meshlab/images/eye512.png "${PN}".png
-	make_desktop_entry meshlab "Meshlab" "${PN}" Graphics
-}
diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest
index c5e6602cd211..c1bce3b55c10 100644
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@@ -1,5 +1,3 @@
-DIST OpenMesh-4.1.tar.bz2 24728164 BLAKE2B 6be9876fccc8dbf53b6dddbaac09a3f241b2cffbcd98473f0f7caca23b634bdb0a0a8af808a178531c61e5d533597a4fd467b8b2928d9947a7f126990a4ee42a SHA512 064a4d5cb467589869baf4a302e6c620bd84de874b24019252b97ef863b59e83f2fe23ea45e4a5162a7765847da19f75f563f084cf2b3ae77c7e704b4c859b71
 DIST OpenMesh-7.1.tar.bz2 22855582 BLAKE2B 778b3a40c2e476cdb2f50b5b4a90f8b6ae7852f166087426ff1db25c829cb4172cd7ed14db1a22229f7b4447e7ebeb0d6116647d929b7dab43d565192a8ac48e SHA512 bca0f937e08fe512efb436f5b96b83a1ff7945640e18fb1bb083956f04609560e29b1c1f7e058840791df77df6859fdd20ff6f49d80b908e8c1c5542b8615e6d
-EBUILD openmesh-4.1-r1.ebuild 1626 BLAKE2B 990da5a6c25fba6128088b29f7aa91e86c5e71a7c9765a9a58289995981134c45ad0d3f0064c02614284f639caaa45bdc0fa4f17010c4950087c39680f5d6d41 SHA512 ebf1e6ae7690859c09871da00e0a6fba8492baf6af3cda654ef2032bab705185d33bb617c60b2ef28d798d95246f5f2e870c66e68e247b1ba2b6a4241185b30a
 EBUILD openmesh-7.1.ebuild 1440 BLAKE2B f4e59b2cbf50699f594dc958d9b02f5123c1aad2928807197dfe654faa0e76afb4208ddc42a89897f27c46c93e6a3eeb19606d196af70dd6ee9998afcc832e84 SHA512 2e0f3e49e0129f749260b4fc163cdc5d1b193d35b04976cf7d911e72de91b3a5927877fdafb563abe2859a4aad22b88819ae7d957c75550ed24dd3adfc456788
 MISC metadata.xml 648 BLAKE2B 12598229d6cae71dae7cb87eac84679289994134848466d94c81d241db642f880c386a3ae65b0a5da939ae96cdd01eb19052ccf887f4df87edd3806526a3e225 SHA512 24e414a301d38d43961c5de285fc2fe2638a5a7c1d606d3f89efb5f701399d743382a0761f72f4aaf1d143755349a5a0f0cd49171a36137f65c1b7b8d3ccdcef
diff --git a/media-gfx/openmesh/openmesh-4.1-r1.ebuild b/media-gfx/openmesh/openmesh-4.1-r1.ebuild
deleted file mode 100644
index b72c8c6a8d1a..000000000000
--- a/media-gfx/openmesh/openmesh-4.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN="OpenMesh"
-MY_PV="${PV/_rc/-RC}"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A generic data structure to represent and manipulate polygonal meshes"
-HOMEPAGE="https://www.openmesh.org/"
-SRC_URI="https://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="qt5 static-libs test"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-		media-libs/freeglut
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-DOCS=( LICENSE/{LICENSE,README.txt} README CHANGELOG )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Fix libdir and remove rpath.
-	sed -i \
-		-e "s|\(set (ACG_PROJECT_LIBDIR \"\).*|\1$(get_libdir)/\")|" \
-		-e "s|\(BUILD_WITH_INSTALL_RPATH \)1|\1 0|" \
-		-e "s|\(SKIP_BUILD_RPATH\) 0|\1 1|" \
-		-e '/^ *INSTALL_RPATH/d' \
-		cmake/ACGCommon.cmake || die
-
-	if ! use static-libs; then
-		sed -i "s|\(SHARED\)ANDSTATIC|\1|" \
-			src/${MY_PN}/{Core,Tools}/CMakeLists.txt || die
-		sed -i '/OpenMeshCoreStatic/d' \
-			src/${MY_PN}/Tools/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOPENMESH_BUILD_UNIT_TESTS=TRUE
-		# Disable python bindings until someone wants them.
-		-DOPENMESH_BUILD_PYTHON_BINDINGS=FALSE
-		-DOPENMESH_BUILD_PYTHON_UNIT_TESTS=FALSE
-		-DBUILD_APPS=$(usex qt5)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${BUILD_DIR}/Build/$(get_libdir) ctest --verbose
-}
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 7702508cd94b..e7e99fcbc174 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,5 +1,4 @@
 AUX opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e44bee9c4da81b6f50bfcd68c1566149d089fefddb9d90ed76cb3ae9f33b063bc3834e69da008660f689eb56b9597bd1702b40df761006b170c079 SHA512 c11194c06df6dc2e2ce18f3c6863c19191793512672779a2b5d4df2e2b59348dd4c71c7ab887546b96943e97e0257b3aa152f45aa53a3e5ed95008fa3d6b59d5
-AUX opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e44bee9c4da81b6f50bfcd68c1566149d089fefddb9d90ed76cb3ae9f33b063bc3834e69da008660f689eb56b9597bd1702b40df761006b170c079 SHA512 c11194c06df6dc2e2ce18f3c6863c19191793512672779a2b5d4df2e2b59348dd4c71c7ab887546b96943e97e0257b3aa152f45aa53a3e5ed95008fa3d6b59d5
 DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08 SHA512 800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
 DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
 EBUILD opentoonz-1.1.2.ebuild 2152 BLAKE2B bbad89bf0799119e05e7ec8e900e786f28e51d4609874e7b676922ab8cc8ecb4506652f836e40778d3963eaea2cf9ec58c8da8fde68393455e60f82868ae3913 SHA512 62ca55a27d0e4ca42f274747b530221e003e67774fb822969f1b7e4e77eb80b961894a6362c45633c642dcbb1e35572ca77056d7cf43fede9f632789bb53aa35
diff --git a/media-gfx/opentoonz/files/opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch b/media-gfx/opentoonz/files/opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch
deleted file mode 100644
index ad0e5a2758ea..000000000000
--- a/media-gfx/opentoonz/files/opentoonz-1.2.1-gcc6-no-throw-in-destructors.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=612938
-
-From ae91dbad8c33b35ea564d235c8eba63adfcc0fef Mon Sep 17 00:00:00 2001
-From: Peter-Levine <plevine457@gmail.com>
-Date: Wed, 31 May 2017 04:49:36 -0400
-Subject: [PATCH] Don't allow throw() in destructors (#1182)
-
----
- toonz/sources/image/3gp/tiio_3gp_proxy.cpp | 2 --
- toonz/sources/image/mov/tiio_mov_proxy.cpp | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
-index d1bd79717..03140f695 100644
---- a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
-+++ b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
-@@ -138,8 +138,6 @@ TLevelWriter3gp::~TLevelWriter3gp() {
-   QString res;
- 
-   stream << (msg << QString("$closeLW3gp") << m_id);
--  if (tipc::readMessage(stream, msg) != "ok")
--    throw TException("Unable to write file");
- }
- 
- //------------------------------------------------------------------
-diff --git a/toonz/sources/image/mov/tiio_mov_proxy.cpp b/toonz/sources/image/mov/tiio_mov_proxy.cpp
-index 260bbb196..6be067c01 100644
---- a/toonz/sources/image/mov/tiio_mov_proxy.cpp
-+++ b/toonz/sources/image/mov/tiio_mov_proxy.cpp
-@@ -206,8 +206,6 @@ TLevelWriterMov::~TLevelWriterMov() {
-   QString res;
- 
-   stream << (msg << QString("$closeLWMov") << m_id);
--  if (tipc::readMessage(stream, msg) != "ok")
--    throw TException("Unable to write file");
- }
- 
- //------------------------------------------------------------------
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 90da6afcf067..f85ccf15fb75 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,8 +1,5 @@
-AUX qrencode-3.2.0-pngregenfix.patch 1339 BLAKE2B e4ae15f573ac9d00ae5286c41aa57fb2029f49f581d9e15dc6bd36a8f9364be83eae551d7db4995da5975e2dc5c0b984e5bec38b4839aaa2b6c710876021e3db SHA512 3155814da1abcbf0ad3c144e3470b5b2ae9e93d9d1b1df2437dfdf16b31aaa9efb3642ceedb6facdc640685ddc41cfddf2e7266994d6ad5f1fa0f24e1473a89a
-DIST qrencode-3.4.4.tar.bz2 369136 BLAKE2B 19e9a2089c6c22284da61dda57d1150573b72833c3e9d96d1aa8742a69cb7495b3c39b8162b0dd268e94412bbc618d1358dcfd969f12c0b3e9701414955aed46 SHA512 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d
 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-3.4.4-r1.ebuild 577 BLAKE2B 19577c82a04b248a08201344b226a236bf73b58540f0fb5c8e4d55493dfeade02cc1f0d22d096dda91a82b52f1c532f8068b755dc47be06e138e4b4a30516f7a SHA512 af41d0ff230fe92fdc21d7ee0ab93820187f1973f633dc7cc5b32140504c48729c30a9d35488cf59e90010a5852fd72111275118053789c6e5e4ccefeab35288
 EBUILD qrencode-4.0.0.ebuild 875 BLAKE2B deccce06b32c442852c73cba09f97d3c59518d49ae63008d1ac46ebc0940da20cbb42ceb502f30942af6392d47796bd91d413fdd68bf634d262ca8411af23f33 SHA512 b59b6c37c8fd489e98a8fc1e14989418a8292a739a74e0422b18ed64e48611c1846d2f6bee15e85d27a1142da2901b668973437955722c19425ee4939eb5a16d
-EBUILD qrencode-4.0.2.ebuild 785 BLAKE2B b223dac0308d17648761f32b45339aa12074113f81f9c35f37f806198f2922239efe9634135a68fab44b7ffd4f7d2e29a6f14940e5911e765c51f2aa91a3a2d9 SHA512 a4d2e49119d9365f75f2d7c740496d6e302ad66dfefb1894925f6323c105ca3f3d0a5788afbafbeee85015ce4380626c8948f175ddf54d567086493c3eabb14c
+EBUILD qrencode-4.0.2.ebuild 779 BLAKE2B cd9c91203d9f5aca1897e1454a3580622737d139886b5c46a6ea4e0347acc764ed23499893f3176adbbbe7e6e24ee7bb5fff55cd7eb3bd39f637d548bd86a53f SHA512 e0470b7b3ab7395d035914f0298a75e0541c2d8e8bb98294cb8edeb0b31e3abf3d02b564d7c43d0d0edfd98c30a08e66b6f428f1dfb9272f6fda9e1ed979fb28
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/files/qrencode-3.2.0-pngregenfix.patch b/media-gfx/qrencode/files/qrencode-3.2.0-pngregenfix.patch
deleted file mode 100644
index 09c15eedfbe6..000000000000
--- a/media-gfx/qrencode/files/qrencode-3.2.0-pngregenfix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
- Makefile.am  |    2 +-
- configure.ac |    9 +--------
- 2 files changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 55659c5..a065514 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -27,7 +27,7 @@ pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libqrencode.pc
- 
- EXTRA_DIST = libqrencode.pc.in autogen.sh configure.ac acinclude.m4 \
--			 Makefile.am tests/Makefile.am qrencode.spec.in qrencode.spec \
-+			 Makefile.am qrencode.spec.in qrencode.spec \
- 			 qrencode.1.in Doxyfile tests/test_all.sh
- 
- if BUILD_TOOLS
-diff --git a/configure.ac b/configure.ac
-index 6fb1409..ca30225 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,7 @@ AC_PROG_LIBTOOL
- AC_PROG_RANLIB
- PKG_PROG_PKG_CONFIG
- 
--AC_CONFIG_FILES([Makefile libqrencode.pc tests/Makefile qrencode.spec qrencode.1])
-+AC_CONFIG_FILES([Makefile libqrencode.pc qrencode.spec qrencode.1])
- 
- AC_CHECK_FUNCS([strdup])
- 
-@@ -71,13 +71,6 @@ echo "#define __STATIC static" >>confdefs.h
- echo "/* #undef WITH_TESTS */" >>confdefs.h
- fi
- 
--if test x$build_tests = xyes ; then
--	SDL_REQUIRED_VERSION=1.2.0
--	AM_PATH_SDL($SDL_REQUIRED_VERSION,,AC_MSG_WARN([*** SDL $SDL_REQUIRED_VERSION or better is required.]))
--	AC_MSG_NOTICE([SDL check done.])
--	AM_ICONV_LINK
--fi
--AM_CONDITIONAL(HAVE_SDL, [test "x$SDL_CFLAGS" != "x" ])
- 
- 
- dnl --enable-gprof
diff --git a/media-gfx/qrencode/qrencode-3.4.4-r1.ebuild b/media-gfx/qrencode/qrencode-3.4.4-r1.ebuild
deleted file mode 100644
index d08b8dbfe7e9..000000000000
--- a/media-gfx/qrencode/qrencode-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="C library for encoding data in a QR Code symbol"
-HOMEPAGE="https://fukuchi.org/works/qrencode/"
-SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-3.2.0-pngregenfix.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
index a12c5fe02c0a..82528744c84c 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/xdot/Manifest b/media-gfx/xdot/Manifest
index 8666b07dfabe..da3c5b448238 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,8 +1,10 @@
 DIST xdot-0.5.tar.gz 24555 BLAKE2B 81621369e3e2604d5f86da8edee1af440b3bf6811ad9aad67334f8a61a0100cae0da223d7f8b3def29c2fc9a647f9ac6b55f8ccfdcedae5cd431c143c21938f3 SHA512 f466ee0af2270c66218b67bf371c972d0ffefe977059eeeeb3c4a2ca29807c3ca419020286ed9c031853f79afb55222884c942bd14d8365b64ce2a0ed5f6d1d0
 DIST xdot-0.6.tar.gz 27710 BLAKE2B 414a6fd422a2d4e08d20c28841cb91215f16a89ba6dd03406219bd2dc9f63fb5250f19f3e48a3535cd2a5daa08aa2b3c702b06ef17e252e34c24c40459e29566 SHA512 25dcb35aacdd58fb13519346d1d8cf500eeeeb3cc40dee85e967d23c52c0c37ba092a023aec6cd72a35b74e3ea6a2168e1691ad218e4a6af17ea6d56d824f05b
 DIST xdot-0.7.tar.gz 126406 BLAKE2B 4451992c0bc3808fe9de64601baea7af8f08fc10475bcf266f6ffc2d70b96566b77d1ae03f9dd57a42ae54f23d2e7f8b2e258239a891818a404fc2b2cd5e5df9 SHA512 793be28fbd0ee6c2b9dd97532ef8742d598f84055ef67e688593d7c1f689f04593dd89a490f4f48866b18ac595252d03b9cc6d8d8e2d6c0ac1ef1ad28789c512
+DIST xdot-0.8.tar.gz 131659 BLAKE2B e8bfa034cd106054ef070b5c1cfe641b7fb3ce37f60c747c5ccb339f2b4bbbeb58b54f6f1f9cf57544c53a81d0bf61e4e787a6a78c18b6db90b5cceee3720e70 SHA512 76eea4054ed5b9b3fa25c53dcbceed6671ee622ed6d841ee30cb1005beaf35a74c4e36e4b577b69ef12e39f6e8fcb8f38d1bb024bb9abe92df8c672f0c114ab3
 EBUILD xdot-0.5.ebuild 660 BLAKE2B b8c58cec2463254447e58c0282517e06b52d54e51b49d940747008e4de0adf55675b43690c04591b71d91598828d7f0c22cec81dc52cf8e13df1f8d6d1703fc6 SHA512 2752cc87cd87c1c4f5b7e5d4be3859cf3e8f2121aaa4310036eadce9c0cf428d9ada1180b784ccfcba302a4c6ab6a58d70f36db5d2db9190696be51c45d0cc6f
 EBUILD xdot-0.6.ebuild 660 BLAKE2B b8c58cec2463254447e58c0282517e06b52d54e51b49d940747008e4de0adf55675b43690c04591b71d91598828d7f0c22cec81dc52cf8e13df1f8d6d1703fc6 SHA512 2752cc87cd87c1c4f5b7e5d4be3859cf3e8f2121aaa4310036eadce9c0cf428d9ada1180b784ccfcba302a4c6ab6a58d70f36db5d2db9190696be51c45d0cc6f
 EBUILD xdot-0.7.ebuild 660 BLAKE2B b8c58cec2463254447e58c0282517e06b52d54e51b49d940747008e4de0adf55675b43690c04591b71d91598828d7f0c22cec81dc52cf8e13df1f8d6d1703fc6 SHA512 2752cc87cd87c1c4f5b7e5d4be3859cf3e8f2121aaa4310036eadce9c0cf428d9ada1180b784ccfcba302a4c6ab6a58d70f36db5d2db9190696be51c45d0cc6f
+EBUILD xdot-0.8.ebuild 912 BLAKE2B bcef6b54fa4ce563e10a87be6bd484b3436b7e5709953f1ae22b9dd243766b2d0bc05641e313988811209f79eff6d86cbbaecd91a2ad45bd19330108c0a3252b SHA512 8618c4ff7bd02870f569fcd7c24baf46caaa858cbc7c68be1fd6ec7a72945510950aceb409d7a5ed486eca663506721ce77d99553fbbefda93c8b93f08ffc375
 EBUILD xdot-9999.ebuild 568 BLAKE2B 70f735fac2a628414c77a347307260fa439d106b07ebd0338118b0db16d4a883ab3d641abc570676d40a45a09f9ab09ab365faea80acaf355d20675669e3c041 SHA512 5b82f55937820a526ae13e93be38aff2f631e912efa6cf860724ac963b7c62412ade25f732db4d20dd5512804c9e49e18323fa0bc8f5310c090bd72cbc0b431e
 MISC metadata.xml 428 BLAKE2B f4638a5657c09d221d2139a8600502f51d02fc7f4bdf302706cfb75c1bff8980882bfd01a0dfb716bceb624dc0fa32f5f5adb6f259e5a657bd6b579b1612513e SHA512 5a6cf462a35470509a7b38baea1b95220527d20652e185cc280f3e85be2043c502089c012abdcd841c4cd9114b8058d7afd2874ff5b9e3f17eb218c914d09501
diff --git a/media-gfx/xdot/xdot-0.8.ebuild b/media-gfx/xdot/xdot-0.8.ebuild
new file mode 100644
index 000000000000..e8716f71acdb
--- /dev/null
+++ b/media-gfx/xdot/xdot-0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+MY_PN=xdot.py
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Interactive viewer for Graphviz dot files"
+HOMEPAGE="https://github.com/jrfonseca/xdot.py"
+SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-gfx/graphviz
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	eapply_user
+
+	# Don't require graphviz python(2) supprt, which xdot doesn't use. This allows xdot to support python3.
+	# For more info, see https://bugs.gentoo.org/643126
+	sed -i "/install_requires=\['graphviz'\],/d" setup.py || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
commit	3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree	a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /media-gfx
parent	12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)