gentoo resync : 15.01.2020

4 files changed, 20 insertions, 7 deletions

diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 7cd7e7881384..f773a3ee51e3 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -7,7 +7,7 @@ AUX gegl-0.2.0-fix-without-exiv2.patch 823 BLAKE2B f2f0f8ff2d12ae0586518d4bfdbee
 AUX gegl-0.2.0-g_log_domain.patch 1079 BLAKE2B 7d0ba02291aa33b4a8077d56de01c5b0e10b46740c64565bf8b6a9867a6d76fe6fa07a752d0698f0674236e0be06c41135af114847096cfec642572fba315c06 SHA512 a538d42164dbefbd5044461fe8fdac5d3b2de2d7df5013a5206b0230fe48ea7cf537972b8aab2a40081a15ece1dd818bef70cef95cd0a04bc7179764070a1e45
 AUX gegl-0.2.0-introspection-version.patch 1233 BLAKE2B 1565b0600b5d5c55e0e3909670c59fb6b73d91222911cc4caac07025cfadba39af39d60d42d133ed209f1464bf97aa5a5bd7da233e673a4557ef4451999ab7f3 SHA512 539508215c769a5571ba0b798ab001d37756a0f264817394282ee3aa9d46ca83fe10a3d37ee8915afe79453d1e72e7adcb928fbb54a22229a06cf0a308095d23
 AUX gegl-0.2.0-libopenraw-0.1.patch 1733 BLAKE2B 16aacee7c0a702b0965c0f342822710b8b791fc950e10040de92a4eef06b4d5010b1f8fb8c0d1b23d5bc43e92487e37d278dd750baf06a641d91bbd5205b676f SHA512 8eaa767c7d30e77ebffacb9ebb01789f05c82385ed7671767f0e04dba98a95ee22a4a8f0ca8f19365e0b26e74641dbe00939ff8baa40e84a8a26770c325ad980
-AUX gegl-0.2.0-underlinking.patch 1638 BLAKE2B c8118a47b9d83d9737a2ec1deb25d23b99219a8ca018f74a330050e15f6a62f73fd534327bdbd75831121931c54f69c067dfba125ce18b84fc6a7355d27abb22 SHA512 cec86ffddbe6ce1fd4b6bcf5b7550b538b4967ce409034153ea8712ae59f52471c653ed9b28b4821cc8ddc8b6bfd54775ca17db8c65718712ee6205803050bfd
+AUX gegl-0.2.0-underlinking.patch 2038 BLAKE2B 80dc1aeeb73d08ae7184f5eb57f97a16ec4d5b237bf7fb4232fef16c443f913d16b179a297e0bea8b8b459cd740720843d06d537e9cc703c66ae3b54b6c70255 SHA512 c952d015ac74eefea96c6b6c4190fc5c230654cb6efee20ea06f9b43e4f3dac8953ce94f604602489556e4ab59b44f85daff95e3e7c98c640b2b532d1de3dfc5
 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
@@ -26,6 +26,6 @@ EBUILD gegl-0.3.0.ebuild 5255 BLAKE2B ba5de53a099d96b637bcbcfee75b7b387cb391101c
 EBUILD gegl-0.3.34.ebuild 5322 BLAKE2B f9446f59e9a0d1b5a796d74ab1629bbce550b8303aa9dcbe346f0b982f42acc672a166be05bce83f4732ae93380bd11ad5c99b3c51b32d57310cd02f7ba148d7 SHA512 f228fda2bb264a091afa38e490fe4865ab3d5cac57e0cd10577e10db1c8a25ac32082f8ec69625dc65b848ef511c348d39291864303249a9d0b20c7a3ff23c96
 EBUILD gegl-0.4.14.ebuild 4990 BLAKE2B 402cee7dc2c3c3537faa945bd2633df1e40925764bf5b350068ed3db413ab573b8b6a9c80320690e51f4b6cba42ace54aeffe47a8122518f940db1fe46f9ca15 SHA512 c56a418e491a617b1d058f99fcf6f447b89be5f1fb222a4d7c52043a29614eee9d81509300272afe570eff06ce83bf44d5e07e6fd57da8d985183da510e8cb21
 EBUILD gegl-0.4.16.ebuild 4872 BLAKE2B 5126609563c9d39b6d4d6c691e9c1418859461a936805238f493b53d2766a5240a5cd9252e4659bdb99f9a72df068c601170885243fabb000210223c6dd651bc SHA512 c86beb3fe1024a23ad1ce8307e05c985124b2c74d03d0d2a0abebfbe6749ea76437107a15eefb7e4e5da00cd45d1d485f38c5ce5d34052f9f811839f2837740f
-EBUILD gegl-0.4.18.ebuild 4856 BLAKE2B f44c0be360f580fa8a87023e1cafb6c65c6eb56a0cbd34947075f3db6ae4f1f1d0e15dd09fde11c0be1b9dfd0a8153c7c5048ce2124c0067b551f91ee740037d SHA512 ac98299d44101a4278b70fb987dc5033ebfd588843d2085d924ea3c24c4675d8058b94520eb466b16674422b5b2111f9dedc2bc387d1a66776887d4a1e45d2cc
-EBUILD gegl-9999.ebuild 4468 BLAKE2B b1bbefe3a68f767853f2be612e5158c0cd9d54765945815410ff333ac208cffb7260e1988d6e9b88be1830654600d43e16dcd29d4b14c9c2067fb8b499121807 SHA512 564f1845c8b29ba6223191ffaeeae26495548aefed1f6bfed1f5f3e27b0195b0a531d6df874a989c3505fc03b5bcd7c389b59d82d76e4b04bdf1e6e809789b7f
+EBUILD gegl-0.4.18.ebuild 4854 BLAKE2B cde5a6dd8f2689763a091ab4ec84fdfa6a795826bd8d2db0604e09edd9c4d23c2eb6395eed3a822925494856b83f4f15a351782245c6018e8d8b39179f0985b6 SHA512 8367124789367070775d734a2cf12da3b844ca107564205cc164d6d49ce58c0232e289eaabddb7bcc557dc051fe7704d1054d2d2d1916228788b5aeab48ec033
+EBUILD gegl-9999.ebuild 4466 BLAKE2B d8ce86a2625434508d004bd54139d9a5baeb53c860ca13e9244c9b9da31958c0870cfcd6a451336047a15170bfcf9a169040618a6184162fee517bc9dfed0360 SHA512 2ac085cfc1232a9d68aada6227487ec5f11112ccd9a48ab519c5d8b602aa6ca7e743cbcc29201c8ef5db9055750ffa98bd9b4cb25de114819789ce9f4aa5f88c
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
index 53f29c49da7d..00e936ce68ea 100644
--- a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
+++ b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
@@ -47,6 +47,19 @@ index 8f1077d..4dd3845 100644
  
  noinst_PROGRAMS = introspect operation_reference img_cmp
  
+diff --git a/tests/buffer/Makefile.am b/tests/buffer/Makefile.am
+index d62ce71..0a4df53 100644
+--- a/tests/buffer/Makefile.am
++++ b/tests/buffer/Makefile.am
+@@ -30,7 +30,7 @@ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+ 
+ buffer_test_LDADD = 						\
+ 	$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la	\
+-	$(DEP_LIBS) $(BABL_LIBS)
++	$(DEP_LIBS) $(BABL_LIBS) $(MATH_LIB)
+ 
+ 
+ # Our custom target rules
 -- 
 2.12.2
 
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index 0faafc6c7f59..f2c662e0cbae 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 3651bef83e5b..98a250798f67 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen