gentoo resync : 22.04.2018

10 files changed, 249 insertions, 52 deletions

diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index e8745207896c..6325593cdd08 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -10,23 +10,25 @@ AUX gegl-0.2.0-underlinking.patch 1638 BLAKE2B c8118a47b9d83d9737a2ec1deb25d23b9
 AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84
 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.20.tar.bz2 5816967 BLAKE2B 4d1dea5b479dc56599d884c43dd8042f6c1c836fe3b5acdadc9b1a909ab4c4be549322767293cfbc065a5f9386b22a579c9c9d78fbad58a4eb6771eccf3a3b45 SHA512 9067467e3d4bbfe00594a8459c9ea15047c1331764dd3aa2331da7d842a77c98894e3a0e19a7c0b1cb59189ffe03561e9bd12f92bdb8fdf1799afc6a575962f7
+DIST gegl-0.3.20.tar.bz2 5816967 BLAKE2B dceb6fab65e121e7d01f89e8ca44ed057590fe07892cf1a5a498d8b83fdb3eb9bded512942a3fb13363adbfa3a2f1c1620351e322901bee4d886d854e67b2984 SHA512 d49142972b3b685b46f451f6ec5fb85b40023e82b0016c8309dc0b35cea66489b9f43740e8c8bb31fa76530c8f655028d36e8b3dc7273c8816d5f007fa546057
 DIST gegl-0.3.24.tar.bz2 6519831 BLAKE2B b6f9375de34b17270b92b7aeb0199f9c842813bc74175845ee8e8de8b48bc4d81d973282a1e398a39432c73c485cfb158b368989ecb40361f61f22620d53659a SHA512 c84950a4d2fddcb0fdcce77030841f862b1eeda72b31f115fb3604a52553414873923a321c48ed11a135113f40d026cf65425742663f23af79bfca2392eba9c5
 DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa481d0e234f89b7e8bd9b05b3e515454bf768a66e64c88f61a57c83d51eecad9aab4450502dd3e02ce4f012df7a5 SHA512 1fafd6bb70b539bd31c052d2acfcb332fac92caf2a67e07a8c827db31b877aa373a184475952b6fc4dae455dcceccfd3943d782e9fe50f166323f698faf60957
 DIST gegl-0.3.28.tar.bz2 6530569 BLAKE2B ac802c312a0fa44bec8ec4c41454fc9aabebdb1d968a8f532be7dfcff58480f778e3d21cb6557c221e1206860818618fcfe06f2bb25bfb2e08a76f013ea4f256 SHA512 a515108ea4a65fa1ecc60ed18cd288a85877a5b69e573b8c3de04a2c11a3b2b50cdb5897df3f28c84842e6bd553adbd81053502a1ac8ed1d356332a56c58ce1b
 DIST gegl-0.3.30.tar.bz2 6675564 BLAKE2B 177db85f8225f9cbb04774d270e0d71db598099be814157ad46ca7a9ceee2d60efde2e02ec2f81ef5c8bcc14e06c5d1d03718f6cc0005c576aa47a1f233a07c2 SHA512 4506eed9980e2a455b43b643d50b3a89d12b605ee4584fc7dd5c63be60acae64eda88f580ecb82891a4b0d69af10730a0d1525de7cc468afccdf2cf78f85b2eb
+DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
 DIST gegl-0.3.8.tar.bz2 5876259 BLAKE2B 24199148ffbef6454ea460d126c29f1cc8581e5430bc3e341a8ab48fff701a0d63c4cf8864d04219455feaeb7e03808e8de06cc8ae0a500eb4154f2ec9ba25fe SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb
 EBUILD gegl-0.2.0-r2.ebuild 4787 BLAKE2B 0ff214b8275e0cfb2c7cfe1aa5b9b8d663006cf858e3ba856a2b057c7268f15888082f3fe8363a47655435bce6583b9e701a1729dbc25ff617410c5d1f26e1e2 SHA512 7f0f22ae44c2a3529e22f9ffd09bfdd047486c8241c0a051997a8e2f674014d64a25fa763744a9092551fcda9721a92e430fb470ef364209de628368f6cecd83
-EBUILD gegl-0.2.0-r4.ebuild 4938 BLAKE2B 02651ef3a8c02bf2ab5e60d57890c0e8eb552817991e5a9be36341623dce836a5f8d85a736042624db3205a93ebf68a8559a4374e033cffddd968d81b28a9617 SHA512 e84ca9a32cb7e2c55537e9a094ea7eff0e714a8399b0b3d3d55ff5c29692a7bf82ed4fc07ba33e00432fbc2e1601f4b991b397f8283311f04ea8638636548eb8
-EBUILD gegl-0.2.0-r5.ebuild 5049 BLAKE2B 867da1d3b4cb0511bb7c03246d8aead3cd9099c707bf87220d7fd6d245780cf2978e7e6629ede8fb419a68146076695dc1825ba2396a68e02fa15bcbff4d751f SHA512 84e07dd2b5161ca4b24b5058abaac7979ae49898b2012a4f6a9a1cbac0272097f420073a3ac359db5083a63788a3b8fc6e76411e72a01369380e93bc5133c6cb
+EBUILD gegl-0.2.0-r4.ebuild 4890 BLAKE2B be5910d450489b3e83d88b578cc79b7bb091bd11afe44bfe38267b74ef93320332a2e360965a4d856cb7305bc68afb4553904ecbc6461f1b7c3d7b379890fa5a SHA512 f21c8c77daf4dbb6315fe45d69b98dc75c0c678fdca7ff46c1e5f6ec4fc594ff4ae1040738175e8207d0c9948718a60dd6b9db46870b5f2391b9976deb0f71e5
+EBUILD gegl-0.2.0-r5.ebuild 4995 BLAKE2B 20da1cb203ef3ede096fb3a945bf563278dceb0192dae4870556d593e8e00ed02e8d146a0a5c10943376b9e00f7737d1ff465388bb536fd6076ca4be52dfc9c1 SHA512 54409f06ece1431191c2c6ecb77d8d536e8d87e78da3324e201796efa0f6dcd24ce7e0f4288f5ed419559ede5d2f8a35f4cb84b7f3bdbea36c59ca67d5e0d215
 EBUILD gegl-0.3.0-r1.ebuild 5379 BLAKE2B 5bf00dfd8c77e110bd708267604b187d1997046fe9f70a1590caaee8e98e09086480136ebb3ab1bd901489585ade5222e661acbca12139d86a3355529bc73cc2 SHA512 c0dc2b5848b79c1eebcf067f37baddc0f4f7bdbe3b10ec4a97981e5392b4200fb2d5f4a3cb6b347fe881113f3e6ce3b0cd7198b61bc3c5a5ff1789d43d064efb
 EBUILD gegl-0.3.0.ebuild 5297 BLAKE2B 6f6ebfcee8dc76a7d9b5b9e7cf22b4f3e8ebee1cf2f2683d6960d6632ff7ed21b60dc9a92b6052c2cd89f2ebfa0d979aeee9d432c35ba532afa6825694d2b571 SHA512 17b071d9f98be37c8bb33cf5de11a64dd0d6a13bcf067172c6517b25b8ae633f94c3d5f116c68dec36c6e1340ad5a777cb3da21243b5eb59a2c9ed70b5a88c06
-EBUILD gegl-0.3.20.ebuild 5189 BLAKE2B 5b0a80a0f3ce5a202275eceb7362449dc546f8dc14c502c385151bdf124088e527c7a3220dc7b925988d16daa3ae2698180d9c3475cde09f8fc8de2a399d714e SHA512 32bec067a123ddac0780abac33cf78f9713e9dc9a8a614da43d4d32a8616fef90f83113a3f1090e81ce553a607fe7cfa88207fde27b56f583b8dc950448bc1b0
-EBUILD gegl-0.3.24.ebuild 5234 BLAKE2B 6b8993fb540777446151d6e2c97adaa9b2835dd4c202d8ea22e4762ff41d528b644d6fb6cffb789f6d1fcbc823317b42549e3610bc326ea7d54427f1c07f5f20 SHA512 fbe0d19a04a6ac627e6cc9d7c68962f46b8f98a5ea19ef41f4a49d34d03c59bc0ede2c94e9ac124315d3f48959e7b478afd4285d182c128102b265bb2aed8460
-EBUILD gegl-0.3.26.ebuild 5228 BLAKE2B 9dac0b022aee1a76cc5fbaed866a63f7b80fe997a0f9a8fb5c16d2074acf3f67cbd1406a76c14fd2a9d823ed40d114e7ec02bba4664f24b8e15566ec23a9e888 SHA512 d151ad57e962e5db68f964c17d838d38102532360e5ad5442026e94e8ac34f04bd520817bd321e8a357a55c3ddbf697e5d095dc7c10aed1e83a654b1754a4081
-EBUILD gegl-0.3.28.ebuild 5234 BLAKE2B e28749d83e522aeb521c67f94cb1bc42dcff3c0c2a9d0297635443cc6e1558f7d89f2cc03a8ce23b62f7b90cc58e5ade73a2bfa54578b3998b48efb4f4af87fa SHA512 08d25f2872c3e5672dfcb621d3d07900134164f86103ee54c8d824326db1ad1bc454f9f6ae8d7eef3affcf386b7d573bf4586f0635bab6e4bc9ca089b45d9314
-EBUILD gegl-0.3.30.ebuild 5234 BLAKE2B 1d7937f2791fb0ae1379cfe93aecda7cb9ad2cc61371fad81d127521dd9aafedc3cbfdaf8efa58acb199e1de66caff9b0a1dbc5b3d8f775a0146432127a4f96b SHA512 f6a0869bc2528d5327d8f6203137ce0140ee7d33e2bbfb8b7c42ab462e31e4fc838e274ef6110c9ce4ec40fbfdfbe485157569cde8f007c33a35bca1ef6beba6
+EBUILD gegl-0.3.20.ebuild 5194 BLAKE2B 88e5e24c14cc51c816a404b7318db36251935d208f717a0b740bb749cd4fb6d0182dcd77f5168b41a307b9c39e3829b1558c56e635bc14dc9e74d61bc5958ef2 SHA512 7fb5b122ee1d641b195ab404af094987bdb5f1d5606bbc2d4ec9628eff57effae4c5820927723bc2ab5dfbb60069c926b79348e3c46998a3df83ada4d501ee1f
+EBUILD gegl-0.3.24.ebuild 5239 BLAKE2B c0eea83e35236fbefbc5ac4973a2802a5d1638a6e2ec8f56e248a7c6c0c8d5c98b1d02f79dd502d7174f1846e181b13ce793ae73f0359c39a3e5423b04d2b3e3 SHA512 f244159bb57ed4ce1e8104b57efe8a569e69f7c704e92bf0074fc222a22787612dde2c8718f4d843d429f80510ecc47b7870fd758c97184430ccdc842c951ca5
+EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 75a2a7992767c1d4c21603b18155d2f1612b93d5c5e97a71ad805fce20db32e2669dafde41c2a39a969227a574f576c6b724e3bb7a4edd49384104dc6104a960 SHA512 de35606c5f30e3f1ea6a9e6dd7dd96cb55e3ce9a83eced15c1ba8866a7f6ab6ee489b5413dc50a659e7459d0cd3ba6d8e06da7ce2ea165c4863afcd36e228c2a
+EBUILD gegl-0.3.28.ebuild 5239 BLAKE2B f8fb97390c5b35d87be213add1ad80ccd274dc8cb6acfd98c9ee51def29ef94986b24499a520f1e489b459ccb5bc44d5e7950e0af98940adaaa5b348364dfdca SHA512 9750369edcc711f799890881c1a08e574c5c8ad4df92f447c90fbbee88a2aebfb8d78fe9d87d04a916c2387d0d29347eb68b6e7f4ce660609b12e2a5ec2d8784
+EBUILD gegl-0.3.30.ebuild 5239 BLAKE2B 3a5ae4a26db21d974fb17b9697ec0b114d63ac3a6d25623c14a7360d2804613f7b9d139916e0defbc9e2403a4215a53f49c80b757bc862e4e0f9d86c4235012d SHA512 40cb4123594f2ecef227c72324332f76b267d8b9ed2c57fb121cfb1538ad79c38b776c977a7720c2cfdd182575f2b75a7f6aaffb7fdd771f5182915a3f2f4339
+EBUILD gegl-0.3.34.ebuild 5239 BLAKE2B 5ac20b0e841256591bb38f6b4a2e03f3f37525b4c716e5a14f1315d03a66484732c13bac74f1731f4c2d46bdd99536c4b55d779e1535de18303c14ac4eaaf6c6 SHA512 5422d262f5da7f66b5bea47cd3f32a7bcee63c89cf67a5cbc05da070f03648564e542a4352fd8f30a2fdda95c29353ea1bd322a15542679aa795b7de0959983c
 EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501
-EBUILD gegl-0.3.8.ebuild 5219 BLAKE2B bdb69e806b1baa77fa605cd96f1805e93eefb066930a529e10baa5991456939bd398265cc2a96419f18a1901d526c3cf273193b8a5f3c1f513c17227118476f9 SHA512 5ad6972332c41cd232a868c930588240077663a4ec8cbd0f19a05852509c284a95b7fa78b6ccd5fa132b137ebeb6247ad7314ed87c617e804238a7b58ea81f2a
+EBUILD gegl-0.3.8.ebuild 5216 BLAKE2B eb91252d7d87e0102817b756d8b16c7839ba68ac9b104d2d683e1a59c24d1a183520f0d40ee62767aa0601dc2d636eae37a20a0075ffcc809ea9e2732d96be12 SHA512 a6407382b1cfe1b27922f0b77887353e5649d3203caea9a04bf685b0be66d5a4cba8fb582fc8d62555bec9ff583f6d4067983ff6ead816d27105370382094f30
 EBUILD gegl-9999.ebuild 4921 BLAKE2B c5e2f1513eb418db2b725759bee29b5c97cd3be89b020d7b86eac4edf56b295d93b3dfbc8b7d2766411b3dcd4fb3c618ed44e9ed5a27ed38b844e530465b6acf SHA512 c6acfcfa7e2c50aa64b1ad31dda9c52d530a886e4ef477f06c56d32eab809215bc018ccf0180175abd81745b4432b8f9563e51ec6e1df72cf0a6125c95635478
 MISC metadata.xml 472 BLAKE2B e5dbc6beb699846057be74ff6c05e1273bdc2f19910be0ff73c1397b48173526e0c6eda649e7178a9858aaf055628df0285792107cfd49bf5ba4dc9c56f8c835 SHA512 3d4b87f67a5665c0520996c36297afbbbaa1410bfbe244db215286b044a57c030b2a24d4dd9370fba6a7bd148a71b0bf8e2ff85c49ca321441da831ce47b9faf
diff --git a/media-libs/gegl/gegl-0.2.0-r4.ebuild b/media-libs/gegl/gegl-0.2.0-r4.ebuild
index ddb70a4e401d..2268786841ab 100644
--- a/media-libs/gegl/gegl-0.2.0-r4.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r4.ebuild
@@ -54,15 +54,26 @@ DEPEND="${RDEPEND}
 
 DOCS=( ChangeLog INSTALL README NEWS )
 
-src_prepare() {
+PATCHES=(
 	# 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"
+	"${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
+	"${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=416587
-	epatch "${FILESDIR}/${P}-introspection-version.patch"
+	"${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
+)
 
-	epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
+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
@@ -70,15 +81,6 @@ src_prepare() {
 		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
-	epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
-	epatch "${FILESDIR}"/${P}-fix-without-exiv2.patch  # bug 641872
-
-	eapply_user
 	eautoreconf
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=468248
diff --git a/media-libs/gegl/gegl-0.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild
index 717ad1841b63..cd6b1554809a 100644
--- a/media-libs/gegl/gegl-0.2.0-r5.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r5.ebuild
@@ -54,18 +54,30 @@ DEPEND="${RDEPEND}
 
 DOCS=( ChangeLog INSTALL README NEWS )
 
-src_prepare() {
+PATCHES=(
 	# https://bugs.gentoo.org/show_bug.cgi?id=636780
-	epatch "${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
+	"${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
 
 	# 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"
+	"${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
+	"${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=416587
-	epatch "${FILESDIR}/${P}-introspection-version.patch"
+	"${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
+
+)
 
-	epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
+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
@@ -73,15 +85,6 @@ src_prepare() {
 		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
-	epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
-	epatch "${FILESDIR}"/${P}-fix-without-exiv2.patch  # bug 641872
-
-	eapply_user
 	eautoreconf
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=468248
diff --git a/media-libs/gegl/gegl-0.3.20.ebuild b/media-libs/gegl/gegl-0.3.20.ebuild
index 6afa0cc4600d..ca8af3a92928 100644
--- a/media-libs/gegl/gegl-0.3.20.ebuild
+++ b/media-libs/gegl/gegl-0.3.20.ebuild
@@ -75,6 +75,10 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -91,8 +95,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.24.ebuild b/media-libs/gegl/gegl-0.3.24.ebuild
index 4dc1c3610076..725be5c3b377 100644
--- a/media-libs/gegl/gegl-0.3.24.ebuild
+++ b/media-libs/gegl/gegl-0.3.24.ebuild
@@ -75,6 +75,10 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -91,8 +95,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index 7aa01eab364d..aaf6fcd179ba 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.ebuild
@@ -75,6 +75,10 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -91,8 +95,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.28.ebuild b/media-libs/gegl/gegl-0.3.28.ebuild
index 863f2e51ff1d..7ca15acd39e0 100644
--- a/media-libs/gegl/gegl-0.3.28.ebuild
+++ b/media-libs/gegl/gegl-0.3.28.ebuild
@@ -75,6 +75,10 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -91,8 +95,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.30.ebuild b/media-libs/gegl/gegl-0.3.30.ebuild
index 7ea4b3acef94..6ca6a617b173 100644
--- a/media-libs/gegl/gegl-0.3.30.ebuild
+++ b/media-libs/gegl/gegl-0.3.30.ebuild
@@ -75,6 +75,10 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -91,8 +95,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
new file mode 100644
index 000000000000..075874901a6d
--- /dev/null
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -0,0 +1,179 @@
+# 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.3"
+
+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.3.8.ebuild b/media-libs/gegl/gegl-0.3.8.ebuild
index 92e02f5f4eb8..519fc7305637 100644
--- a/media-libs/gegl/gegl-0.3.8.ebuild
+++ b/media-libs/gegl/gegl-0.3.8.ebuild
@@ -75,6 +75,11 @@ pkg_setup() {
 	use test && use introspection && python-any-r1_pkg_setup
 }
 
+PATCHES=(
+	#"${FILESDIR}"/${P}-g_log_domain.patch
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+)
+
 src_prepare() {
 	default
 
@@ -86,15 +91,11 @@ src_prepare() {
 		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
 
-	epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
-
 	eautoreconf
 
 	gnome2_environment_reset