gentoo Easter resync : 12.04.2020

5 files changed, 7 insertions, 8 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index caa3e052b11c..546c38cd2395 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -4,7 +4,7 @@ AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e7
 AUX webkit-gtk-2.24.4-icu-65.patch 1991 BLAKE2B e69612d43f66e9e31190c3b35e5ea2581ce3726c685e719b4040e670dc7ae236f6a024b5d33659ccac172a9eef442eddf35f4ebfcabc7cfdfd1cfde217f341e1 SHA512 8eab3ddf0dea73f2ba41c3c1ff7f9643334ad52ac61adcb86d1352b9367b03f0ffd072b8f910aaf875134d3f09d1106db7e44f38c8c4756555c0e5fbfe6a53cf
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
-EBUILD webkit-gtk-2.24.4.ebuild 8450 BLAKE2B aa5c958a3b3961bb8e32ad0571dc18e69ebca19b22ed009e3398ee97ef137e19e1f997e743723491bf7c37a32f1cba69e21fbddb61d193f42b35a0ba48bae16e SHA512 6294d57daa1d3bc6ad1ee775c2bcadd299d6ce9498a77b84b1492704accc5442a2022e1dd52fa715b0668f6ab15e09fad6d5628a2d4ec1eee5cd2720f2e6e723
-EBUILD webkit-gtk-2.26.4-r1.ebuild 8751 BLAKE2B 12ea689a54a4edc3f2058cebc709702bd64e1b41d00bbae9ea9aff3453562c74ec9d5d94569aa5f1a4e34e4fdd55c354a95375e95f1447b54185ab5e2f0b0df0 SHA512 f53e17611ece19ddbf8f488bd80fcfff238c4eb8a725ea87534188b54c459d2839ca838efff9124559517ccbcb5699f81b3c1e8c40250e9f171e8255ce079f53
-EBUILD webkit-gtk-2.26.4.ebuild 8749 BLAKE2B 65b5c544b6713fc151dc7bd4b8419eaf59be2b6ab3291a6d5463352ff530c9c77da7afd23c63bb9dde48a77751e9af230f3eefeddceb38c5e2349c397b5d6971 SHA512 e3bb0dab5af99db0774d382a7d8c620c8de583b959e4c7c0c5c67339bdc4a11a966fcab3ea583525e7fcf331f62570d2e0fd7330cace6010a09acb6d572c820f
-MISC metadata.xml 837 BLAKE2B 58680ed3ff0941924b33c03aef91322437b90c88e46951bf780b99507b7dfd599d055c8109a45e8fde18a9d871c19b9e86d21550cd0a01bc3e02db2f075ccfda SHA512 6a8191200dd2e84ac2cfaedeecc753d8a9201d764acedd2b11c707e8ce21ba5b0e91e73c4342efb33c96a46a65c2a67736cb32599f07219acc9bdd38d453203d
+EBUILD webkit-gtk-2.24.4.ebuild 8444 BLAKE2B 0e07771b88a5956fb5b824d3713d6e2ffcf3e6abc0238efe8059bfae5d799e2198174b0ac015b57f8688b9055992730892e05bbaf106eb7f0df98d6088a5d481 SHA512 76d4910adc9c2a69a589e1261eccd7188aecb890cd818271e31a5c44bdfeddea82ef14ff1e513d8c35d9560b9b9460598d574dc55eb60eddb1679335f9e82b13
+EBUILD webkit-gtk-2.26.4-r1.ebuild 8758 BLAKE2B 0779af3f244bd5d36866c79e97150c17a714f5f3469bc33e1bbecd9078f91f4a3ab699147ddd9819df5122e4e60bef2e35f0a7890872ecf7972f086aa3469791 SHA512 67cf5221da862dbada5d2bbc88a2a587674f9233dd44553b84cea3939db495647878bb910a34ff8d240d680b804761d554ef012d5fad20e409216d065cb4d626
+EBUILD webkit-gtk-2.26.4.ebuild 8755 BLAKE2B 8b2c147789ae8e0e71f5051f5cb48334e73c1d2ef3d73a1f229700661c24c6cfe3485003dcf8dd8c5d3dc57c35ae724537fb9fcb598c5090a39e90af62986195 SHA512 caaf03779f43c9cd402b4118f75adf26563b7a112b7111a7bc2aac5d639575bad780db2612857f38f2f80d4adf0b563e98050b7df55ebf4f773b62abde038306
+MISC metadata.xml 760 BLAKE2B b6b93a6f66b0145a6cc95f62d9f4a19e6d69c337c6be1ab8aa6c2a2a5de5bed19466f388908bed34bc77b90285297f8dc2f332f70abcf70fea81a2aac8288c99 SHA512 849039d811ebc06003b7dfe505c6cf809b3feb95dd7965dfef41aa8c9ce2dfd773d019741fc66e784bdcde5f91c216e0f96f887647f3723778a21e500dded8f2
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index e88c10a5699c..27c7a387561f 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -10,7 +10,6 @@
 	<flag name="egl">Enable EGL support</flag>
 	<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="gles2">Enable GLESv2 support</flag>
-	<flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL</flag>
 	<flag name="jumbo-build">Combine source files to speed up build process</flag>
 	<flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index 47f5da095e91..430f780b0e2c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~arm arm64 ~ppc ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~arm ~ppc ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
index 984486444020..83663f86017f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
index 3fc54945ccea..48c9e084906f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~ia64 ~ppc64 ~sparc x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"