gentoo resync : 13.10.2019

11 files changed, 14 insertions, 544 deletions

diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 7409183ed7c8..2dcfeaa977e5 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -13,18 +13,14 @@ AUX gegl-0.4.0-ffmpeg-4-0-compat-1.patch 2181 BLAKE2B 8bf1c46395ee4981fad7c5518c
 AUX gegl-0.4.0-ffmpeg-4-0-compat-2.patch 786 BLAKE2B c2ee0da954aa16c755f76058c54ca9d19ceb70667aff40e126d52bb10b7ecaa6e346667fa9cf7f96605b87a1d41e511d4787a33b004409708d8e3496de391745 SHA512 1084d1cd802eebdeacc536115d4808ce310a85063110bfc06627c8836b86e65396d175a4c3bc6b2083a9a486b7fb21d0210e42fcc8ef3c404b6b930797ecc83a
 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.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa481d0e234f89b7e8bd9b05b3e515454bf768a66e64c88f61a57c83d51eecad9aab4450502dd3e02ce4f012df7a5 SHA512 1fafd6bb70b539bd31c052d2acfcb332fac92caf2a67e07a8c827db31b877aa373a184475952b6fc4dae455dcceccfd3943d782e9fe50f166323f698faf60957
 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
-EBUILD gegl-0.2.0-r2.ebuild 4715 BLAKE2B 4c6e8445587cff6ad1c44eee4b40bcbf57e5d573242e8794aedeba19b6065a58d02c72a1951f2b31a5601c6b124e30ebb207a06f5aadc5e4b846294f717ec906 SHA512 16048b6ac471d9af936df2285380303012fd538d57b35c67b073ff54ad952417260cbea51403c11844547a4f69c16e65eb460fbfb43ef05bbb9e8dd338102b00
-EBUILD gegl-0.2.0-r5.ebuild 4922 BLAKE2B ede5b2bd0934ab7a5c82ce33532925f8c0b10b30bbc8cb89744cd9603c066398a787a99b308635760315aa231dae4eb35da1db25adb17ccf93c11f0c00b9e79e SHA512 d493f0217dc590c8b1df84fe43b08f44c6f55d6e720edf7a091b36cf7ea6c36ad06b4df2c930d6a7ff9595d15d220c8cf1d4256db2fef90d5bdf1b3ac8bf5a3d
-EBUILD gegl-0.2.0-r6.ebuild 4968 BLAKE2B c60c32f5b1ef68a1908de781b50e39d14dea65a3b01af8f9c63b7ac9ebd08aba7c92dbe55d1d7680a5f76ab44581c425c61eb220b8923c61ceefbecb9255c992 SHA512 93bed4a3686d8b242fc1c6ad7d3f1437e40636be0b450d942cd41a24b4db94ba78a4a376780e4f88df06777a3b7ac074e8f790fe35ffb971ec1d7e35807398f3
-EBUILD gegl-0.3.0-r1.ebuild 5321 BLAKE2B 917874f80c58690d7053366b5cbf11ebe10fca3d775515d9255b4d966c2d894617d75dc2134af61f497c5d09c4fe05c7b9bb156e3783fbab628ff89adb947257 SHA512 c01caae58f8008909e131ee03fcd92d225703d13a442df9371e77d0dafb3245778a244930b6827c714d66beb297e8829d220ed2a51bd02416ec010bd726aa35a
-EBUILD gegl-0.3.0.ebuild 5240 BLAKE2B 46019ac823a517365f33f28231b6f77b93c4b10eb9378e511a453b795eb5ba9ef08391e6a2687e724357befead82bce42cd4bf3c71962774f0e128c668191782 SHA512 31a7619e95d995f6fc4ae46bd404cd1a526970c4e49869c4b78623528588b708da6c8db60c2bbe010bae0601e3ca387bee520adcd3eea42c21cb02bf290ac9d3
-EBUILD gegl-0.3.26.ebuild 5174 BLAKE2B c7808b15a796bedce4067ab5ba961edad3f370119aedf81b17faf7d70a5a5f3da2f58acbe2f3c41edf59859a822cb07f7684d56db0bbec25f32b39854a4b4f6a SHA512 ff10de4870e4393e38036cd0dc81e2dfafd2ad713ba98f8c3847b96e5aac4e9ea842232f8c2dffe134eb08975dfd8063fc4dc7ec513e80d113916f84411977c6
-EBUILD gegl-0.3.34.ebuild 5307 BLAKE2B 6c03b2f9499b47e8b1986b0196cf4fa7ea8fb0df2c6e82e8508bda61591660e213269bf604d059718f7f9581c2e7661722521ce83c2f88e63bbef68c06966479 SHA512 b1b5c080f80c981b0a5ea2d40567ff283f181e08983401abfad5ec4449ed8509766a509f17b46eb5ddd00566a031d6371139b57c330ef978b6c57d8ce88261cf
-EBUILD gegl-0.4.14.ebuild 4975 BLAKE2B 7b035e9b96710d3dcb30b7d88d18deea3722ac491cdefce7c9b7d3d1611ba7ef30f700202f44d8a558b8f7b7116c6f7b9622e18e6b7df29b4baa8a9155533a5c SHA512 587511473e344d4b4e7b5b78c0830aa2982a1537f8e089a05775aa0b09d299b13e64b0b00fb4fe3ad9fce626442d9c12172eb8ea0705657e6767a844503ad0b0
-EBUILD gegl-0.4.16.ebuild 4862 BLAKE2B 14985dd5ed6c6979bdc62eb0920485b5d71a551c30485836db6996c74de00f215c6a5db1a6f672d127d28495fe69c7e8638f736d3a68c63421a7232016bd6e78 SHA512 10bb8071022ace6d447a5854d142527daf72763cf954a92dcb02a634e39e0fd9b3baadf1f472b50e0eb02706e98bcfebf88fae03e6f2af37a905a11b9c142678
-EBUILD gegl-9999.ebuild 4801 BLAKE2B a503b8a5be5862b6f574a794b77d160780982cae9e70d9a832888a97dc51e954193726e74ee9fa468fcc2fb2376614defb2f8c21766b35cf233c342fa88baf84 SHA512 63d36d57ae51e86b9ad9aca49af8616b4a1b2fd86c5b554aa12ad335a9c077aa32295c5fec0c6fd189744bd4bb8a9a74f4158c3ca96b416cf6041e7bab522ff2
+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 5228 BLAKE2B 04a228c189e9fdf2619cfc1467eae37ecd01ef35ad8c9a1a87c0e7a93a9e493c0aad4dbf2a7a8053bb47dbd6965f41c3ab032171c013ebca6405f543abcb0f12 SHA512 7cac050e006f38082e3093b3553774d70837ed632bfed6a5f2f1dd97297e8dc603256ec967e8fd898a0dfd0108ea23773e1f0d516c08f4b371b16b3a02cd427d
+EBUILD gegl-0.3.34.ebuild 5295 BLAKE2B f468df5f492a5cb4079ab021d10833a6d75ab97c28bb03a8091df0bb80f284171fe04476e522632264a795ae4f198d7a69d412eb378d25225b7f345a5bfd013b SHA512 376186430d951aced6ef210eee6f7ff7dc8f7f1fb7087083bb86ee6b12d46170df6293db136acfb3f696348b33e84c2657d0679f968b1dbca79291a232d6e1b0
+EBUILD gegl-0.4.14.ebuild 4963 BLAKE2B 155fd64e71878d62960a1beaf50b8e2b4fec41a8884b916319b498adc6393449d41f6a2fbff128e68eebcf688046bcca540c9e10382f805e8df536d28fa04244 SHA512 ed2796b93ef55352f51a8eace6ccb97e5352a203d6fa33d178307c0f215279d337efabd9aa2c0d41faa6757c5a0f34dda1f1907eced0712979413d03980b9de0
+EBUILD gegl-0.4.16.ebuild 4850 BLAKE2B 66b4108f521bc2e40f1789802ea618eab0dab0addae3dfdddd39b1b5b1d9fd845bd28df7e1d9d1bce7c45773a9e93b695cdaf6dd9b456da3e47de6f63278998c SHA512 c4bb2821ffcdddd8d8a42b11018e25873b622719eb94c0e8f12a949d1836d4921bc63817a6431f4a51655485021bdfaa24b09f0993c37feff954d3d961c4aca6
+EBUILD gegl-9999.ebuild 4789 BLAKE2B cdff77d21246229c50e307138c9de6883cdc801625fa65eeb57cbae2ea911c8b98c339f580e7dcc7787bb132b935a536b100399712bd392e0d3be6b14b2371e6 SHA512 948cf9c4eb70b506d6990f30d4c4a6aef8c030be937dfd4adc9c12ebb6f3ae42896d53d75415c4bb3d921543d016c850bf40da6c06d66e9fc7e60281ab0aaa1b
 MISC metadata.xml 396 BLAKE2B aeb29a940e3747b4ea2418e3723c549291cbfd49d8152c75fcc9116b46892eac29338b36875b32c7f3968deecf142296b0f9725d02a80a0380dfba6fba17d810 SHA512 7530e0bc7d86a57334d1dc6fc75b6acc1eb3512c2618d1ed47bbc025aa95f72fa1d41b78765ae53721ea794538d22df1be22189dd54e30fa4bf94e7f0cdced1a
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index aad4c1cd8862..47fa7ae928dd 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.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-fbsd ~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.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild
deleted file mode 100644
index 6f8434819a09..000000000000
--- a/media-libs/gegl/gegl-0.2.0-r5.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-fbsd ~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-11.3:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	jpeg? ( virtual/jpeg:0 )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng:0= )
-	raw? ( >=media-libs/libopenraw-0.1:0= )
-	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 )
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=636780
-	"${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=442016
-	"${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
-	"${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=416587
-	"${FILESDIR}/${P}-introspection-version.patch"
-
-	"${FILESDIR}/${P}-ffmpeg-0.11.diff"
-	"${FILESDIR}"/${P}-g_log_domain.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=605216
-	# https://bugs.gentoo.org/show_bug.cgi?id=617430
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
-	"${FILESDIR}"/${P}-fix-without-exiv2.patch  # bug 641872
-
-)
-
-src_prepare() {
-	default
-	# 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
-
-	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 a7573fa095ca..434a0bcd099c 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-r1.ebuild b/media-libs/gegl/gegl-0.3.0-r1.ebuild
deleted file mode 100644
index ce9b36b0372a..000000000000
--- a/media-libs/gegl/gegl-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,182 +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-fbsd ~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"
-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 "${FILESDIR}"/${PN}-0.2.0-fix-without-exiv2.patch  # bug 641872
-
-	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.0.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild
index b86bd58c0880..a35131dde0e1 100644
--- a/media-libs/gegl/gegl-0.3.0.ebuild
+++ b/media-libs/gegl/gegl-0.3.0.ebuild
@@ -17,7 +17,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-fbsd ~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.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
deleted file mode 100644
index 2efd65a82028..000000000000
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-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-fbsd ~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 lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-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.38
-	sys-libs/zlib
-	>=x11-libs/gdk-pixbuf-2.32:2
-	x11-libs/pango
-
-	cairo? ( >=x11-libs/cairo-1.12.2 )
-	ffmpeg? (
-		>=media-video/ffmpeg-2.8:0=
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	virtual/jpeg:0=
-	lcms? ( >=media-libs/lcms-2.8:2 )
-	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	>=media-libs/libpng-1.6.0:0=
-	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}
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	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
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-)
-
-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() {
-	# 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.
-	#
-	#  - mrg is not in tree and gexiv2 support only has effect when mrg support
-	#    is enabled
-	#
-	# 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-gexiv2 \
-		--without-graphviz \
-		--without-jasper \
-		$(use_with lcms) \
-		$(use_with lensfun) \
-		--without-lua \
-		--without-mrg \
-		$(use_with openexr) \
-		$(use_with raw libraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with umfpack) \
-		$(use_with v4l libv4l) \
-		$(use_with v4l libv4l2) \
-		$(use_enable introspection) \
-		$(use_with vala) \
-		$(use_with webp)
-}
-
-src_compile() {
-	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 5c8d5871daa0..730b532886d1 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-fbsd ~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
index aa1e3dfdf967..b46050046a84 100644
--- a/media-libs/gegl/gegl-0.4.14.ebuild
+++ b/media-libs/gegl/gegl-0.4.14.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-fbsd ~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.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
index 53a84339c68b..12651446e600 100644
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ b/media-libs/gegl/gegl-0.4.16.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-fbsd ~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-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 9655bb544e66..ec1e63cf3a00 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.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-fbsd ~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"