gentoo resync : 25.08.2018

8 files changed, 191 insertions, 740 deletions

diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index c5f73964b29e..478128d4e2a1 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -10,15 +10,14 @@ AUX gegl-0.2.0-underlinking.patch 1638 BLAKE2B c8118a47b9d83d9737a2ec1deb25d23b9
 AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84
 AUX gegl-0.4.0-ffmpeg-4-0-compat-1.patch 2181 BLAKE2B 8bf1c46395ee4981fad7c5518c9091043374b54c9c4a684e6decc376e8b57e2a60b7ff5c5b21e07f24d7835f92f62a7aebf976122391d206450cc1d5a52bcb30 SHA512 1edf86549a0a91b7e66ad1b59373b141c20e7f63fff981aaa5a0ba535b38e89b593c60a4a4573cf6fa723181cb38a10c6ac4a0838fc947bb54713a3bde299e4f
 AUX gegl-0.4.0-ffmpeg-4-0-compat-2.patch 786 BLAKE2B c2ee0da954aa16c755f76058c54ca9d19ceb70667aff40e126d52bb10b7ecaa6e346667fa9cf7f96605b87a1d41e511d4787a33b004409708d8e3496de391745 SHA512 1084d1cd802eebdeacc536115d4808ce310a85063110bfc06627c8836b86e65396d175a4c3bc6b2083a9a486b7fb21d0210e42fcc8ef3c404b6b930797ecc83a
+AUX gegl-0.4.8-remove-imath-version.patch 1566 BLAKE2B eb841f3e3c7f66eb60d30519e9028a4e70bd5dcc43eca35ad8270d66a5b39a0a7bd68ab682c4488d8cde10ba9bc2f1ab03de404d4726bf224a956fc3590dccfd SHA512 32e3a7286e616079c1dbdb9f8907606d9335d31f720c8ab33719bf2cd23e349b1eee46f7666f56308ce93fa51c218ac474e5bea6cd359b2d5844c0377750bf9c
 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.3.8.tar.bz2 5876259 BLAKE2B 24199148ffbef6454ea460d126c29f1cc8581e5430bc3e341a8ab48fff701a0d63c4cf8864d04219455feaeb7e03808e8de06cc8ae0a500eb4154f2ec9ba25fe SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb
-DIST gegl-0.4.0.tar.bz2 6762190 BLAKE2B c138ee79806178f60eab2fae492fcf441dc49b54364abcf023f6ade0cb08d216200ae14a289af8b6da2f0eec97dc81d376469245d0aa6d6cabf269d42c0a83c0 SHA512 4e319e861f6a27f52d0d4920942abe3734e6015eaa76491ab55179d8c677ccf8eb7f4296ef43f55a5e77ae9e99bb2ba6f5bd20aa08f194e9d42a1159fae20c6e
-DIST gegl-0.4.2.tar.bz2 6781136 BLAKE2B 522d4e7b2ace519423a66b7e65faab49bd0740173be6a8e108ec95b65c0359937df7b142e0a68589a4d773b839689ad6cf2ee67c5ea5b89267d46199b23e3f15 SHA512 8d842f5e192d279529615e09da8a76b051baa9c257ac699eba5f8ce46b4511554949e35f494e99c190b1477a700e018e2243a9e84c3c79e331824ca364b6cefd
-DIST gegl-0.4.4.tar.bz2 6817195 BLAKE2B 928e91e61bfee8b9954992e1ad4dbc874a5f53ef5a8274a6805b2c7d9bb007e3ff9ab5e8fc0a767f7e7d05c327581231b42eebcc6f9781f9feb5abe17c22bbdf SHA512 6953bf7df225914ce9c8166f5a0490615664c69d5a66cf8ca805f75cfbe272186c7745d273fcde29c685e22a66d4483dbdf45064ec9c0007fd6d0b8aa3ebb164
 DIST gegl-0.4.6.tar.bz2 6931774 BLAKE2B c8fabc8efbcc21a3663c8a3a698e6bc072506a66a21b81e6696c37c81aec1458c695f773c554b6d98c2fd21a3d3ab7fcca4b2f6567ec9d4f94b1e925b9bc9ce5 SHA512 6df34b6e76318a375820bccac6efeb2792c737e47154902fcc08ef93cb45b978992ee263260c99f8e865964d80cd1fac6dc2d6c8e4453174df64a9044b57325e
+DIST gegl-0.4.8.tar.bz2 7017022 BLAKE2B ec934fe6faa0c9328ae8c6476e19e175a8e8082e3d1f59052fb83fad766030ede9dd3464a215d332238277492151d988b17c6d3ac87f3d9cec01797acd259fae SHA512 20d2700cc74bce02e3e1b477f5e4dbd6546bb74625de235baaaa31e24f506930927af53de3d0880c0b16f93a10cec993c58a12adba59dec7dda0e389261799aa
 EBUILD gegl-0.2.0-r2.ebuild 4788 BLAKE2B 25850756b366f53d563d098b21036d84f7790dc0dbc1e0640f10b590d1d43be11f2b05d0cf1301e87da2522cc49dfbca09d4cc8854e02494a796f5ca60e1538b SHA512 022f22d1ed529d6061b179b4edb89cd022be4de213a2f0048fb89b760fdbe5fe2ba0b3682874577556ec92869a28683431967b73f3b6fa5369ee423e078067b7
 EBUILD gegl-0.2.0-r5.ebuild 4995 BLAKE2B 20da1cb203ef3ede096fb3a945bf563278dceb0192dae4870556d593e8e00ed02e8d146a0a5c10943376b9e00f7737d1ff465388bb536fd6076ca4be52dfc9c1 SHA512 54409f06ece1431191c2c6ecb77d8d536e8d87e78da3324e201796efa0f6dcd24ce7e0f4288f5ed419559ede5d2f8a35f4cb84b7f3bdbea36c59ca67d5e0d215
 EBUILD gegl-0.3.0-r1.ebuild 5379 BLAKE2B 5bf00dfd8c77e110bd708267604b187d1997046fe9f70a1590caaee8e98e09086480136ebb3ab1bd901489585ade5222e661acbca12139d86a3355529bc73cc2 SHA512 c0dc2b5848b79c1eebcf067f37baddc0f4f7bdbe3b10ec4a97981e5392b4200fb2d5f4a3cb6b347fe881113f3e6ce3b0cd7198b61bc3c5a5ff1789d43d064efb
@@ -27,10 +26,7 @@ EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 75a2a7992767c1d4c21603b18155d2f1612b93d5c
 EBUILD gegl-0.3.34.ebuild 5373 BLAKE2B d04cbe6d8adcf849ff3e93f58037cfbdc7bc417dcc7c4c8ced5c5ab6d2a6dd74213b6564765fb381aa17d6c2c7f3bae5ecf8afa491710d5b1bd2b9cde12a2e95 SHA512 c6420fa6883a2c8ae6c4f5b0ae7782c9fa32fbd5e9727d9dd97c25decbc3700f0596751da8e7433ef04a232c2f6c33b98d2e75502523c3f7f5d5dfdd2884f3c8
 EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501
 EBUILD gegl-0.3.8.ebuild 5217 BLAKE2B bad2de922c96941e6d305e0f8e7bacf1e5a86a4608627556879778390d2cd8f481ca5b3d55953da9a571425dd0f46b204dd571ec83143fad55ba622ef6437324 SHA512 5ae507d1c3ac447e85fdd3f27b189440c13961df72ca72d6e9f2099a02d57705fb18c734cce6037a8f86e1895b5cc72f8fe2350c14b7a8c155648210b9563f06
-EBUILD gegl-0.4.0-r1.ebuild 5535 BLAKE2B 33a1e64317e6ae916e7e7d3a9e4e19120687e7937d6bf6285214925ebb2b293806342a6e0bab0f5c90245da8af9fdbb837cf63338acdc327aefad9353ad6cf80 SHA512 080e0c73d960e5b29e51547c0efd1d42dd08f57cf5d3c6af2344868c6da2084c19bdebbe7512e075f51086092a148b932133c5c586ff5d25324ab8f57f4e28df
-EBUILD gegl-0.4.0.ebuild 5239 BLAKE2B 56fd645cd66deff5f3f391d403b0bea597f5ccd13ec9f5e055c5e5305b5dfd07cc05fced5b3bd8ec4e06441ee9d9c21a47723283b8f81094ba2b5a259e763d92 SHA512 de1a8ef63af7352bc3d4a3f84024dccc47877b9609fa835f6d6313bc7858f4c4f241f9028141ea72bd805af95a47a5491911a2bfbbde5e15c4f276d0c01dc191
-EBUILD gegl-0.4.2.ebuild 5415 BLAKE2B 6c91dfb8dd056f84306ad4097ea1e303eee6538a0a3f9bea534d6cae6da33d66ebd07a6cd69c95ee49e2813d2edc62050e1ef26c66d4b68fada3d0fe3ba84194 SHA512 7f8b307e3be7b1a05460acee0cf70a539971f0c1e1c252cd5c2de4c05aee1f5d76f01935e95b9dbe60e322d20ed44df2dbaeb5c3ccbef55c900cf632125b7522
-EBUILD gegl-0.4.4.ebuild 5415 BLAKE2B 46ddb004dfad7540a9508f6c0e05471f50e7901d752ad44ca23d74a20e0489471c69889867a99575ee5820be2efdc03e5d896aced1e9bbc056e6a9da605aa3cf SHA512 649ef096fad3a913ba9b2bd71fa5f04e075ee91506a1612fd2ad05ced31b1b89c84457744e71b2a4fe05a7da082f14d13deb8536ad5d6440b0c7c7d76d2e6846
-EBUILD gegl-0.4.6.ebuild 5415 BLAKE2B 987767309a875d69dbc397a989453c56d2fb8efcca563707ca173af797439ac4a1440b4e773c812630105f4963bec1517b1e64b8921b43631927f54dee76ac87 SHA512 d6c8064a883afef40978df210da8fd44f945596eac0d12dc78cd31df41f6f59bc5ebfdf3687a59c7aeff7e46aff77ba0c30ef2f66f62c19cc466376bb314f3cb
-EBUILD gegl-9999.ebuild 4921 BLAKE2B ae0b77a07f047281531c0698f3c830a0906f7938025733daa73f54fd4dcedecfb357c05d7a660991423d685d555e34eddb80c67573cfb60c9744417473b14a1c SHA512 bc4243e9921eefdb4211d44e962a571ca55897dac69fb22460a045eed3cef5089c9d3f2e01a23e1d824837e4ac850adee6b53c1382da444c55082163857de2c0
+EBUILD gegl-0.4.6-r1.ebuild 5385 BLAKE2B a36ba7463824e32a65c7421cf4b438d73f38f0433f2b7875b33689b00410528982d21965c3526da55e69a38b2b1b99a52bb7dc0667d698893c2a3ef1bf7c799b SHA512 15500c5f6450ff6fd4621b96e11b60443452f7983809b3272f74954d2652340b141be57ed74353bcce9353e90d33b54a73691dbb98296d2af9068ab9ee91c9d9
+EBUILD gegl-0.4.8.ebuild 4952 BLAKE2B a72e1dafb44fb9540e6451ec3eb783aa13244a2210857f6ac2ac3ae715d4eb4e97bc37593275164cc155cad1ed96c43aba05309b3a625e18d9223e39bade87ad SHA512 29e24ad559e5ed46f80d7afa52243e9d6df69c4671a6bf085d06713afb58090df645fae48a9f90c489b1e431a4119d87a5b11606ce2f8f5ae4da69ab4b355e15
+EBUILD gegl-9999.ebuild 4873 BLAKE2B a529d3a58c04f36d5f2213e9eb52616f8c7db5268d6e93ad58a6b484a0533f27f3fa05e343863215e6c20b2947064b9d3e8a2b085672c37f510f80eb0a08a545 SHA512 f4f550e0f27929818bea3760ece0f6a8206192d86615d864c2b3b91a4aa42fbce195408631b2693423cca98f3664f1ac1dbc173288a349697c53c17e8edaa03d
 MISC metadata.xml 472 BLAKE2B e5dbc6beb699846057be74ff6c05e1273bdc2f19910be0ff73c1397b48173526e0c6eda649e7178a9858aaf055628df0285792107cfd49bf5ba4dc9c56f8c835 SHA512 3d4b87f67a5665c0520996c36297afbbbaa1410bfbe244db215286b044a57c030b2a24d4dd9370fba6a7bd148a71b0bf8e2ff85c49ca321441da831ce47b9faf
diff --git a/media-libs/gegl/files/gegl-0.4.8-remove-imath-version.patch b/media-libs/gegl/files/gegl-0.4.8-remove-imath-version.patch
new file mode 100644
index 000000000000..54ee791a68ec
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.8-remove-imath-version.patch
@@ -0,0 +1,33 @@
+diff -urN a/operations/external/exr-save.cc b/operations/external/exr-save.cc
+--- a/operations/external/exr-save.cc	2018-07-11 23:15:19.000000000 +0100
++++ b/operations/external/exr-save.cc	2018-08-22 19:13:26.241432231 +0100
+@@ -145,10 +145,10 @@
+                           &blue[0], &blue[1],
+                           NULL, NULL, NULL);
+     {
+-    Imf::Chromaticities c1 (Imath_2_2::V2f(red[0],red[1]),
+-                            Imath_2_2::V2f(green[0],green[1]),
+-                            Imath_2_2::V2f(blue[0],blue[1]),
+-                            Imath_2_2::V2f(wp[0],wp[1]));
++    Imf::Chromaticities c1 (Imath::V2f(red[0],red[1]),
++                            Imath::V2f(green[0],green[1]),
++                            Imath::V2f(blue[0],blue[1]),
++                            Imath::V2f(wp[0],wp[1]));
+     Imf::addChromaticities (header, c1);
+     }
+   }
+@@ -184,10 +184,10 @@
+                            &green[0], &green[1],
+                            &blue[0], &blue[1],
+                            NULL, NULL, NULL);
+-    Imf::Chromaticities c1 (Imath_2_2::V2f(red[0],red[1]),
+-                            Imath_2_2::V2f(green[0],green[1]),
+-                            Imath_2_2::V2f(blue[0],blue[1]),
+-                            Imath_2_2::V2f(wp[0],wp[1]));
++    Imf::Chromaticities c1 (Imath::V2f(red[0],red[1]),
++                            Imath::V2f(green[0],green[1]),
++                            Imath::V2f(blue[0],blue[1]),
++                            Imath::V2f(wp[0],wp[1]));
+     Imf::addChromaticities (header, c1);
+   }
+ 
diff --git a/media-libs/gegl/gegl-0.4.0-r1.ebuild b/media-libs/gegl/gegl-0.4.0-r1.ebuild
deleted file mode 100644
index 36f2afb95aaa..000000000000
--- a/media-libs/gegl/gegl-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="git://git.gnome.org/gegl"
-	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 ~arm-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 jpeg2k 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.46
-	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=
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
-	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? ( ffmpeg? ( media-libs/gexiv2 )
-		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
-	"${FILESDIR}"/${P}-ffmpeg-4-0-compat-1.patch  # bug 654172
-	"${FILESDIR}"/${P}-ffmpeg-4-0-compat-2.patch  # bug 654172
-)
-
-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
-}
-
-_use_with_both() {
-	if use "$1" && use "$2"; then
-		echo "--with-$3"
-	else
-		echo "--without-$3"
-	fi
-}
-
-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
-	#    but needed during testing
-	#
-	#  - 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) \
-		$(_use_with_both ffmpeg test gexiv2) \
-		--without-graphviz \
-		$(use_with jpeg2k 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.4.0.ebuild b/media-libs/gegl/gegl-0.4.0.ebuild
deleted file mode 100644
index a247b71cd607..000000000000
--- a/media-libs/gegl/gegl-0.4.0.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="git://git.gnome.org/gegl"
-	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 ~arm-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 jpeg2k 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.46
-	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=
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
-	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 \
-		$(use_with jpeg2k 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.4.4.ebuild b/media-libs/gegl/gegl-0.4.4.ebuild
deleted file mode 100644
index 47d42fbe9e69..000000000000
--- a/media-libs/gegl/gegl-0.4.4.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="git://git.gnome.org/gegl"
-	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 ~arm-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 jpeg2k 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.52
-	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=
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
-	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? ( ffmpeg? ( media-libs/gexiv2 )
-		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
-}
-
-_use_with_both() {
-	if use "$1" && use "$2"; then
-		echo "--with-$3"
-	else
-		echo "--without-$3"
-	fi
-}
-
-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
-	#    but needed during testing
-	#
-	#  - 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) \
-		$(_use_with_both ffmpeg test gexiv2) \
-		--without-graphviz \
-		$(use_with jpeg2k 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.4.6.ebuild b/media-libs/gegl/gegl-0.4.6-r1.ebuild
index c4ca39c3b74a..0334bc1b3cd5 100644
--- a/media-libs/gegl/gegl-0.4.6.ebuild
+++ b/media-libs/gegl/gegl-0.4.6-r1.ebuild
@@ -7,10 +7,10 @@ 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
+inherit autotools gnome2-utils python-any-r1 vala
 
 if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="git://git.gnome.org/gegl"
 	SRC_URI=""
 else
@@ -21,7 +21,7 @@ fi
 DESCRIPTION="A graph based image processing framework"
 HOMEPAGE="http://www.gegl.org/"
 
-LICENSE="|| ( GPL-3 LGPL-3 )"
+LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
 IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
@@ -50,7 +50,7 @@ RDEPEND="
 	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
+	openexr? ( =media-libs/openexr-2.2*:= )
 	>=media-libs/libpng-1.6.0:0=
 	raw? ( >=media-libs/libraw-0.15.4:0= )
 	sdl? ( >=media-libs/libsdl-1.2.0 )
diff --git a/media-libs/gegl/gegl-0.4.2.ebuild b/media-libs/gegl/gegl-0.4.8.ebuild
index da819d25b88a..92178abdfdf8 100644
--- a/media-libs/gegl/gegl-0.4.2.ebuild
+++ b/media-libs/gegl/gegl-0.4.8.ebuild
@@ -7,10 +7,10 @@ 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
+inherit autotools gnome2-utils python-any-r1 vala
 
 if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="git://git.gnome.org/gegl"
 	SRC_URI=""
 else
@@ -21,10 +21,10 @@ fi
 DESCRIPTION="A graph based image processing framework"
 HOMEPAGE="http://www.gegl.org/"
 
-LICENSE="|| ( GPL-3 LGPL-3 )"
+LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
@@ -36,22 +36,22 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/glib-2.44:2
 	dev-libs/json-glib
-	>=media-libs/babl-0.1.48
+	>=media-libs/babl-0.1.54
+	>=media-libs/libpng-1.6.0:0=
 	sys-libs/zlib
+	virtual/jpeg:0=
 	>=x11-libs/gdk-pixbuf-2.32:2
 	x11-libs/pango
-
 	cairo? ( >=x11-libs/cairo-1.12.2 )
 	ffmpeg? (
-		>=media-video/ffmpeg-2.8:0=
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
 	)
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	virtual/jpeg:0=
 	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	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=
+	openexr? ( >=media-libs/openexr-2.2.0:= )
 	raw? ( >=media-libs/libraw-0.15.4:0= )
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	svg? ( >=gnome-base/librsvg-2.40.6:2 )
@@ -61,25 +61,28 @@ RDEPEND="
 	webp? ( >=media-libs/libwebp-0.5.0:= )
 "
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	>=dev-util/gtk-doc-am-1
 	>=sys-devel/gettext-0.19.8
-	dev-lang/perl
 	virtual/pkgconfig
 	>=sys-devel/libtool-2.2
 	test? ( ffmpeg? ( media-libs/gexiv2 )
 		introspection? (
-		$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
+			$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
+		)
+	)
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
+	"${FILESDIR}/${P}-remove-imath-version.patch"
+)
+
 pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-)
-
 src_prepare() {
 	default
 
@@ -103,78 +106,60 @@ src_prepare() {
 	use vala && vala_src_prepare
 }
 
-_use_with_both() {
-	if use "$1" && use "$2"; then
-		echo "--with-$3"
+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)
+		$(use_with jpeg2k jasper)
+		$(use_with lcms)
+		$(use_with lensfun)
+		$(use_with openexr)
+		$(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)
+	)
+
+	if use test; then
+		myeconfargs+=( $(use_with ffmpeg gexiv2) )
 	else
-		echo "--without-$3"
+		myeconfargs+=( --without-gexiv2 )
 	fi
-}
 
-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
-	#    but needed during testing
-	#
-	#  - 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) \
-		$(_use_with_both ffmpeg test gexiv2) \
-		--without-graphviz \
-		$(use_with jpeg2k 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)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -185,5 +170,5 @@ src_compile() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 5fe47759f341..07ea6ab51464 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,21 +7,21 @@ 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
+inherit autotools gnome2-utils python-any-r1 vala
 
 if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://git.gnome.org/gegl"
+	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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~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-fbsd ~amd64-linux ~arm-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 )"
+LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
 IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr raw sdl svg test tiff umfpack vala v4l webp"
@@ -30,42 +30,47 @@ REQUIRED_USE="
 	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.30
+	>=media-libs/babl-0.1.54
+	>=media-libs/libpng-1.6.0:0=
 	sys-libs/zlib
+	virtual/jpeg:0=
 	>=x11-libs/gdk-pixbuf-2.32:2
 	x11-libs/pango
-
-	cairo? ( x11-libs/cairo )
+	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:= )
-	virtual/jpeg:0=
 	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
-	lcms? ( >=media-libs/lcms-2.2:2 )
+	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
-	openexr? ( media-libs/openexr:= )
-	media-libs/libpng:0=
+	openexr? ( >=media-libs/openexr-2.2.0:= )
 	raw? ( >=media-libs/libraw-0.15.4:0= )
-	sdl? ( media-libs/libsdl )
-	svg? ( >=gnome-base/librsvg-2.14:2 )
+	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 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40.1
 	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	>=sys-devel/libtool-2.2
-	test? ( introspection? (
-		$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
+	test? ( ffmpeg? ( media-libs/gexiv2 )
+		introspection? (
+			$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
+		)
+	)
 	vala? ( $(vala_depend) )
 "
 
@@ -97,68 +102,59 @@ 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 \
-		$(use_with jpeg2k 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) \
+	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)
+		$(use_with jpeg2k jasper)
+		$(use_with lcms)
+		$(use_with lensfun)
+		$(use_with openexr)
+		$(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)
+	)
+
+	if use test; then
+		myeconfargs+=( $(use_with ffmpeg gexiv2) )
+	else
+		myeconfargs+=( "--without-gexiv2" )
+	fi
+
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -169,5 +165,5 @@ src_compile() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }