gentoo resync : 05.02.2020

9 files changed, 176 insertions, 531 deletions

diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 19e3d90484ad..acf8ec8ac95f 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -16,17 +16,14 @@ AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773
 AUX gegl-0.4.18-meson_cpu_detection.patch 1506 BLAKE2B ad1038c71b3d2b735fe20010710a94c9460990d9bfb965731c732945d00f992d27f9168fd3fdda3b88ac913c984ad4ad7f231f1d5cd7bae8a8312e91d37cfdf2 SHA512 d9e96e57db0821c5510bb3d8faee3850ab4083e2f1697b5acda75e719ca778cd48ae86cffbc66b621de65dbf5096d125e612af329c7a7ef11f586d24be52a3dc
 AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417
 DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e52931ee66356ca9c3c4cec7cdc0668330aa25756d0baf531d0b90c4830c1f244e8327b238a63d68cb74d486e961 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8
-DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6cdf39dae4374d2749823f3a1af62995382a1247427dde1921e0b11304adb800a2157ca6e7e773fdd97fee47f5 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6
 DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
-DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b
 DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
 DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
-EBUILD gegl-0.2.0-r2.ebuild 4703 BLAKE2B e9dcbc55e332b3484435f1739b305f672f1af489c2b7bae9801529b765c8f12feabef63d64f828c059bc3510b792a6f5a2561c1517e79c6819860dfd7ec3a87d SHA512 443632d54bb065e465e9ff2b3b693cac33c49d4c6c9d14dbb4c45b1fade07adf79cac3841d1b63120912e6cc863e5f7eae9403c71bac3c973e4fca980fb1bbf9
-EBUILD gegl-0.2.0-r6.ebuild 4965 BLAKE2B 12066b7a2edc729653570a433bad8993d30dc24cd820ae24c6b3bc4f734f79a1206f29f3a1190883f094ed46c5516e6d976005cde91ff6050c90dcb90ede0216 SHA512 72bf6368f6e046a591956f65d249331d539902e6cba90c12e2f8939ec6910c869d1638f918820c68d92bbc8e0d1b7e72543a908cf4dbc6626cf78c7556f69285
-EBUILD gegl-0.3.0.ebuild 5255 BLAKE2B ba5de53a099d96b637bcbcfee75b7b387cb391101c9bee621fa54b60b6911f752e56b452f8019bf19c7ceb3ed08cf373f6bd9a68ac30e0282e57216781e6b514 SHA512 bf0f727d0e64493b267d69cc3021943bfcf25d0c61ab484377eee8631fa9110d9c8277c0520e9a8ea8d201e917bd678ca4140a4652f614869bc0a9219dd0b047
-EBUILD gegl-0.3.34.ebuild 5322 BLAKE2B f9446f59e9a0d1b5a796d74ab1629bbce550b8303aa9dcbe346f0b982f42acc672a166be05bce83f4732ae93380bd11ad5c99b3c51b32d57310cd02f7ba148d7 SHA512 f228fda2bb264a091afa38e490fe4865ab3d5cac57e0cd10577e10db1c8a25ac32082f8ec69625dc65b848ef511c348d39291864303249a9d0b20c7a3ff23c96
-EBUILD gegl-0.4.14.ebuild 4990 BLAKE2B 402cee7dc2c3c3537faa945bd2633df1e40925764bf5b350068ed3db413ab573b8b6a9c80320690e51f4b6cba42ace54aeffe47a8122518f940db1fe46f9ca15 SHA512 c56a418e491a617b1d058f99fcf6f447b89be5f1fb222a4d7c52043a29614eee9d81509300272afe570eff06ce83bf44d5e07e6fd57da8d985183da510e8cb21
+DIST gegl-0.4.20.tar.xz 4826340 BLAKE2B 0d1087ea983d7fbeb7ea1edb572bea97e9b4e01aaabd5225ba07ab5cee3b369f42fe39691209f38d4d2a87d56997d9756449cafdb6288eb0864b49fb13a6a8ef SHA512 140ac1543aa24a23aa685dbd7335f21bcbf3d95c41c1451b2383f6d278842bd9f0c8c980ed27c70c67b2fefe9ba01f2d4bd4b77a1cee38ec1332c12ab3fd718d
+EBUILD gegl-0.2.0-r6.ebuild 4966 BLAKE2B 90aa2bd833a192cb3f29e3575679af54c44a3476b9c6c1cab0a33d1be9e6d814b4b36fe213bf3c3b09b2dd8ec98bb26837516b7a0eebf4c4a6c89709620c1581 SHA512 80165722f20fa6834b5756f4a20f1fc4bfeed22b4748dd76336ca5f1fad837c25096254e9cb073078f537ff5db79999d622c92a5c052ef0ea7c2a668e4177862
+EBUILD gegl-0.3.34.ebuild 5323 BLAKE2B dc0f672e62994020b85c6f2e9affefaac7d4dca6ab0da46d4f6ef9e14ecae08495bb849024ce77d9e7c7f52eb982ea11d7755e8730136d33ab4576e737d3d4a6 SHA512 9de42db2c3fe569b9524b513408751fa8ffcf2845db5f001b9f914c9549e6b48393c9a4927aea74d9bbbce8c06fa3b257b10b895197af38849ea6b685819aa43
 EBUILD gegl-0.4.16.ebuild 4872 BLAKE2B 5126609563c9d39b6d4d6c691e9c1418859461a936805238f493b53d2766a5240a5cd9252e4659bdb99f9a72df068c601170885243fabb000210223c6dd651bc SHA512 c86beb3fe1024a23ad1ce8307e05c985124b2c74d03d0d2a0abebfbe6749ea76437107a15eefb7e4e5da00cd45d1d485f38c5ce5d34052f9f811839f2837740f
-EBUILD gegl-0.4.18.ebuild 4886 BLAKE2B 996a864c23be8fa479d9de0ba53110142c65e84655ea52a5821b1b30ab22e9bf978b3b02d2a547f595ef2a7f8a9ceb311152542d6974c52aaf9e4501ee172a59 SHA512 fb336ce8bb8b90ccc1644065953233e3d9c0d4b5c0b6590bdca1672a3546de8a4c9270aa278682bac26c204ca98b22f7f53fd4e9cd9554752cc538a6de1fa7a5
-EBUILD gegl-9999.ebuild 4466 BLAKE2B d8ce86a2625434508d004bd54139d9a5baeb53c860ca13e9244c9b9da31958c0870cfcd6a451336047a15170bfcf9a169040618a6184162fee517bc9dfed0360 SHA512 2ac085cfc1232a9d68aada6227487ec5f11112ccd9a48ab519c5d8b602aa6ca7e743cbcc29201c8ef5db9055750ffa98bd9b4cb25de114819789ce9f4aa5f88c
+EBUILD gegl-0.4.18.ebuild 4884 BLAKE2B a87f35e02d29f55b1c6ec473466aad8092dd897455b6164d3ac484a1cabdb24b650798a9e0e4d324bb4f7ab5f5e3f1b4d4096be7f009581a3c2bb1c14d38e5ce SHA512 ecf8d3ff39b8f1d668405ef58b81ab8efdd8de4d62a55765cd4a572ba4e0bd1e65181cca9208d2a4f0600eaf5a84822585b903edc0c1d62038c1b1a4ee9ea774
+EBUILD gegl-0.4.20.ebuild 4863 BLAKE2B 83245542db2dbf9e2b63d9fe909996777de6bf8bb718298a21de6a7ede5e09941a5bb6ecb26b0a1320fae11146a556b37bfd38723b4d667fd15fdf2bc379a550 SHA512 8a5bc3f806ad80b7a3bc83163af7aecd5fba7a2b8e5253644b0112ebf8a6039f4906044ade1339859eb791625bd7be7a6ddc2b165d54608f923060c66a300d33
+EBUILD gegl-9999.ebuild 4471 BLAKE2B aa1aa47a315427f9c374f6ae60c90d320102e0ebf96023324a86885f13af9917c482f3369b0e4777829fa0546b5b013106784a22efb2e2bd5466772fe15fef9c SHA512 2156e13dfc325de26e5624ed563fad372f0c674e33308d60f62fd6eaabbd003b5dc0c9c8f650979d0443a4c2bfbdb0e23f584714d388339d79c62954f99b4cd6
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
deleted file mode 100644
index 47fa7ae928dd..000000000000
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE=1.11  # see bug 471990, comment 3
-# vala and introspection support is broken, bug #468208
-#VALA_MIN_API_VERSION=0.14
-#VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools #vala
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-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"
-
-IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
-
-RDEPEND="
-	>=media-libs/babl-0.1.10
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gdk-pixbuf-2.18:2
-	x11-libs/pango
-	sys-libs/zlib
-	cairo? ( x11-libs/cairo )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	jpeg? ( virtual/jpeg:0 )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng:0= )
-	raw? ( =media-libs/libopenraw-0.0.9 )
-	sdl? ( media-libs/libsdl )
-	svg? ( >=gnome-base/librsvg-2.14:2 )
-	umfpack? ( sci-libs/umfpack )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-"
-#	>=media-libs/babl-0.1.10[introspection?]
-#	introspection? ( >=dev-libs/gobject-introspection-0.10
-#			>=dev-python/pygobject-2.26:2 )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.1
-	dev-lang/perl
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-"
-#	vala? ( $(vala_depend) )"
-
-DOCS=( ChangeLog INSTALL README NEWS )
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=442016
-	epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
-	epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=416587
-	epatch "${FILESDIR}/${P}-introspection-version.patch"
-
-	epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	epatch "${FILESDIR}"/${P}-g_log_domain.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=605216
-	# https://bugs.gentoo.org/show_bug.cgi?id=617430
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	eautoreconf
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=468248
-	local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
-	[[ -f "${deps_file}" ]] || touch "${deps_file}"
-
-#	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# never enable altering of CFLAGS via profile option
-	# libspiro: not in portage main tree
-	# disable documentation as the generating is bit automagic
-	#    if anyone wants to work on it just create bug with patch
-
-	# Also please note that:
-	#
-	#  - Some auto-detections are not patched away since the docs are
-	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
-	#    tools affect re-generation of docs, only
-	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
-	#
-	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-	#
-	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	#
-	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-	#
-	#  - There are two checks for dot, one controllable by --with(out)-graphviz
-	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-	#
-	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
-	# https://bugs.gentoo.org/show_bug.cgi?id=451136
-	#
-	econf \
-		--disable-silent-rules \
-		--disable-profile \
-		--without-libspiro \
-		--disable-docs --disable-workshop \
-		--with-pango --with-gdk-pixbuf \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		--without-exiv2 \
-		$(use_with ffmpeg libavformat) \
-		--without-graphviz \
-		$(use_with jpeg libjpeg) \
-		--without-jasper \
-		--without-lua \
-		$(use_with openexr) \
-		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_with umfpack) \
-		--without-libv4l \
-		$(use_with lensfun) \
-		--disable-introspection \
-		--without-vala
-#		$(use_enable introspection) \
-#		$(use_with vala)
-}
-
-src_test() {
-	gnome2_environment_reset  # sandbox issues
-	default
-}
-
-src_compile() {
-	gnome2_environment_reset  # sandbox issues (bug #396687)
-	default
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
index 434a0bcd099c..332fcd2b6b5b 100644
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-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"
+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"
 
 IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gegl/gegl-0.3.0.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild
deleted file mode 100644
index 02a01d4a9de5..000000000000
--- a/media-libs/gegl/gegl-0.3.0.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_MIN_API_VERSION=0.20
-VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	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"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0.3"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.12
-	sys-libs/zlib
-	>=x11-libs/gdk-pixbuf-2.18:2
-	x11-libs/pango
-
-	cairo? ( x11-libs/cairo )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )
-	jpeg? ( virtual/jpeg:0= )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng:0= )
-	raw? ( =media-libs/libopenraw-0.0.9 )
-	sdl? ( media-libs/libsdl )
-	svg? ( >=gnome-base/librsvg-2.14:2 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( media-libs/libwebp )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40.1
-	dev-lang/perl
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-	test? ( introspection? (
-		$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	#epatch "${FILESDIR}"/${P}-g_log_domain.patch
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
-
-	# commit 11a283ab : test-image-compare needs >=babl-0.1.13 (not released yet)
-	# for the new CIE conversions
-	sed -e '/test-image-compare/d' \
-		-i tests/simple/Makefile.am || die
-
-	# Skip broken test with >=dev-python/pygobject-3.14
-	sed -e '/test_buffer/ i\    @unittest.skip("broken")\' \
-		-i tests/python/test-gegl-format.py || die
-
-	epatch_user
-	eautoreconf
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# never enable altering of CFLAGS via profile option
-	# libspiro: not in portage main tree
-	# disable documentation as the generating is bit automagic
-	#    if anyone wants to work on it just create bug with patch
-
-	# Also please note that:
-	#
-	#  - Some auto-detections are not patched away since the docs are
-	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
-	#    tools affect re-generation of docs, only
-	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
-	#
-	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-	#
-	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	#
-	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-	#
-	#  - There are two checks for dot, one controllable by --with(out)-graphviz
-	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-	#
-	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
-	# https://bugs.gentoo.org/show_bug.cgi?id=451136
-	#
-	econf \
-		--disable-docs \
-		--disable-profile \
-		--disable-silent-rules \
-		--disable-workshop \
-		--program-suffix=-${SLOT} \
-		--with-gdk-pixbuf \
-		--with-pango \
-		--without-libspiro \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		--without-exiv2 \
-		$(use_with ffmpeg libavformat) \
-		--without-graphviz \
-		$(use_with jpeg libjpeg) \
-		--without-jasper \
-		$(use_with lcms) \
-		$(use_with lensfun) \
-		--without-lua \
-		$(use_with openexr) \
-		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_with umfpack) \
-		$(use_with v4l libv4l) \
-		$(use_with v4l libv4l2) \
-		$(use_enable introspection) \
-		$(use_with vala) \
-		$(use_with webp)
-}
-
-src_test() {
-	gnome2_environment_reset  # sandbox issues
-	default
-}
-
-src_compile() {
-	gnome2_environment_reset  # sandbox issues (bug #396687)
-	default
-
-	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index fead3e3c8ecf..6b49f39642bb 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	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"
+	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"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.14.ebuild b/media-libs/gegl/gegl-0.4.14.ebuild
deleted file mode 100644
index 2e18c9d64d78..000000000000
--- a/media-libs/gegl/gegl-0.4.14.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit autotools gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
-	SRC_URI=""
-else
-	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	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"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	svg? ( cairo )
-	vala? ( introspection )
-"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-#       so there is no chance to support libav right now (Gentoo bug #567638)
-#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=media-libs/babl-0.1.62
-	>=media-libs/libpng-1.6.0:0=
-	virtual/jpeg:0=
-	>=x11-libs/gdk-pixbuf-2.32:2
-	x11-libs/pango
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-2.2.0:= )
-	pdf? ( >=app-text/poppler-0.71.0[cairo] )
-	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svg? ( >=gnome-base/librsvg-2.40.6:2 )
-	tiff? ( >=media-libs/tiff-4:0 )
-	umfpack? ( sci-libs/umfpack )
-	v4l? ( >=media-libs/libv4l-1.0.1 )
-	webp? ( >=media-libs/libwebp-0.5.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0 )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2
-	test? ( ffmpeg? ( media-libs/gexiv2 )
-		introspection? (
-			$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
-		)
-	)
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
-)
-
-pkg_setup() {
-	use test && use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# FIXME: the following should be proper patch sent to upstream
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	# don't require Apple's OpenCL on versions of OSX that don't have it
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
-		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
-	fi
-
-	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
-	sed -e '/clones.xml/d' \
-		-e '/composite-transform.xml/d' \
-		-i tests/compositions/Makefile.am || die
-
-	eautoreconf
-
-	gnome2_environment_reset
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		# disable documentation as the generating is bit automagic
-		#    if anyone wants to work on it just create bug with patch
-		--disable-docs
-		# never enable altering of CFLAGS via profile option
-		--disable-profile
-		--disable-silent-rules
-		#  - Parameter --disable-workshop disables any use of Lua, effectivly
-		--disable-workshop
-		--program-suffix=-${SLOT}
-		--with-gdk-pixbuf
-		--with-pango
-		#  - Parameter --with-exiv2 compiles a noinst-app only, no use
-		#    but needed during testing
-		--without-exiv2
-		#  - There are two checks for dot, one controllable by --with(out)-graphviz
-		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
-		--without-graphviz
-		# libspiro: not in portage main tree
-		--without-libspiro
-		--without-lua
-		--without-mrg
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable debug)
-		$(use_enable introspection)
-		$(use_with cairo)
-		$(use_with cairo pangocairo)
-		$(use_with ffmpeg libavformat)
-		--without-jasper
-		$(use_with lcms)
-		$(use_with lensfun)
-		$(use_with openexr)
-		$(use_with pdf popplerglib)
-		$(use_with raw libraw)
-		$(use_with sdl)
-		$(use_with svg librsvg)
-		$(use_with tiff libtiff)
-		$(use_with umfpack)
-		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
-		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
-		$(use_with v4l libv4l)
-		$(use_with v4l libv4l2)
-		$(use_with vala)
-		$(use_with webp)
-		$(use_with zlib)
-	)
-
-	if use test; then
-		myeconfargs+=( $(use_with ffmpeg gexiv2) )
-	else
-		myeconfargs+=( --without-gexiv2 )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index 56b18bcd87a7..df5feb8b8690 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.20.ebuild b/media-libs/gegl/gegl-0.4.20.ebuild
new file mode 100644
index 000000000000..5623528869a2
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.20.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.74[introspection?]
+	media-libs/libnsgif
+	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
+	virtual/jpeg:0=
+	>=x11-libs/gdk-pixbuf-2.32:2
+	>=x11-libs/pango-1.38.0
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	pdf? ( >=app-text/poppler-0.71.0[cairo] )
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:0 )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+	vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
+	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+	"${FILESDIR}"/${PN}-0.4.18-cltostring_force_utf8.patch
+)
+
+python_check_deps() {
+	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/meson.build || die
+
+	# fix skipping mipmap tests due to executable not found
+	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
+		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
+		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
+	done
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		#  - Disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		-Ddocs=false
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Dgexiv2=disabled
+		#  - There are two checks for dot, one controllable by --with(out)-graphviz
+		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+		-Dgraphviz=disabled
+		-Djasper=disabled
+		-Dlibjpeg=enabled
+		-Dlibpng=enabled
+		#  - libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		-Dlua=disabled
+		-Dmrg=disabled
+		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
+		$(meson_feature cairo pangocairo)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature raw libraw)
+		$(meson_feature sdl sdl1)
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
+		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 98a250798f67..25f257ba42c8 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
@@ -39,7 +39,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-libs/glib-2.44:2
 	>=dev-libs/json-glib-1.2.6
-	>=media-libs/babl-0.1.72[introspection?]
+	>=media-libs/babl-0.1.74[introspection?]
 	media-libs/libnsgif
 	>=media-libs/libpng-1.6.0:0=
 	>=sys-libs/zlib-1.2.0
@@ -65,9 +65,7 @@ RDEPEND="
 	webp? ( >=media-libs/libwebp-0.5.0:= )
 "
 
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
 BDEPEND="
 	dev-lang/perl