gentoo resync : 14.12.2020

4 files changed, 2 insertions, 70 deletions

diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index 68617d627fab..fb4827b7cd90 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,6 +1,3 @@
-AUX 1.4.0-eglmesaext-include.patch 816 BLAKE2B 451eb913d74197820adcb639e6768c479aa8add03d8bc9e47933325380390268ac79c53d098e636ac484d5613b5e7e7ea6584949d745a814b9f6075499d733cb SHA512 453e6c310373b5e147a9a898401788e5d4ec6210e004eb0ad8428e0508a38296cdcb91442636bb8e8ef5faa2f0a7bab13d5f49f8c73c3b15de1983b44a03c9a7
-DIST wpebackend-fdo-1.4.0.tar.xz 30204 BLAKE2B dda32e0408a8fd98dc1d03c4606e20fb219fe722aef24360e31cd62027601a4795dbdbf026925e284e6b87f223e6e79824e8e6bab181b7bbf42a9db0664358dc SHA512 f94167b13345adfda15312b16e5de04910f812c7481f7e3c8a00163ce8387be22373867b51b2c5cb424e62de877c1aaa48592aac85ec9cc03c969c7e83185660
 DIST wpebackend-fdo-1.8.0.tar.xz 42520 BLAKE2B 885a1eee84d040e176a4f9d06e3cd527a6f619c3a85f19f2331b18a84460a102692aec3f3a1a5eff96e9fe858aa45df5ab5785db5c8c71f76cee5dc3a49f0338 SHA512 e885a169e89f90bdd38149894406af368ddd951a17612975a459bd958fef3adf46f39f80c2264a9a2eae965984a8f1f61b36440836780e73cb4e7b8f433335a6
-EBUILD wpebackend-fdo-1.4.0.ebuild 681 BLAKE2B cf241acf23a9f0ed3cb9b0a77b351e1836af881d634f9ede62185a9bf2ca93ec107ff4434f16a303720f7029fd10c37b32e8020fbffd3424ca321cbc96d3e589 SHA512 19b01b03c88022aeed8e377b75c5eabfabeeed854c4dfff4088bef7d91c2b5667430331412291a87719415f2a6ff7a56ee32247cc97e8769026d726b703fe09a
-EBUILD wpebackend-fdo-1.8.0.ebuild 638 BLAKE2B bfccd81194c4650c189b92e56d46523b5805972c7c9398504a7de4f0bea3add2d6d8b718fb137451af18d61e6e990e849f51a1fa236b433fe8c9dee9cce16d49 SHA512 85b0c87489f88f8451800679a5f308db7fcfa18f776acd8c3a7fe02b360ff0cd0f3247551ae502edd0d1446caff2aef22e0aef3563b9c9658b9ac0064db58a78
+EBUILD wpebackend-fdo-1.8.0.ebuild 635 BLAKE2B 64d60a47c52a1b3ce92db12658f5514199612825839543fea55cf406e20466e1f6dd2bc902d7f444409a90d7f26ee462d672a3f132b92c571330cd995df72c75 SHA512 9f5191147af77e25591d027461bcfd6de44d97750ab993919cf82efb0febf7a7ccb3f41b25ea019dd64a8f9fe4f43347f2b5e8258eb9de9e1a8e1b3410a51616
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/wpebackend-fdo/files/1.4.0-eglmesaext-include.patch b/gui-libs/wpebackend-fdo/files/1.4.0-eglmesaext-include.patch
deleted file mode 100644
index df332f93ef0b..000000000000
--- a/gui-libs/wpebackend-fdo/files/1.4.0-eglmesaext-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From bee4104c897412fbe58da0b9615d3a1a1bde826a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Sun, 15 Dec 2019 13:30:47 +0100
-Subject: [PATCH] Add missing include.
-
-In Fedora Rawhide, while trying to build WebKitGTK, I get a build error otherwise,
-as `PFNEGLQUERYWAYLANDBUFFERWL` is defined in `eglmesaext.h`.
-
-It looks like this header has existed for quite a while so should be fine to include
-directly.
----
- src/ws.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ws.cpp b/src/ws.cpp
-index f1ff709..53a6702 100644
---- a/src/ws.cpp
-+++ b/src/ws.cpp
-@@ -27,6 +27,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include "linux-dmabuf/linux-dmabuf.h"
- #include "bridge/wpe-bridge-server-protocol.h"
- #include <cassert>
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
deleted file mode 100644
index 19d3cdbadb2b..000000000000
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="WPE backend designed for Linux desktop systems"
-HOMEPAGE="https://wpewebkit.org/"
-SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="1.0"
-IUSE=""
-
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
-
-RDEPEND="
-	media-libs/mesa[egl]
-	dev-libs/glib:2
-	>=dev-libs/wayland-1.10
-	gui-libs/libwpe:1.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-eglmesaext-include.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=OFF # hotdoc not packaged
-	)
-
-	cmake_src_configure
-}
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
index dcb700c819f6..7ac3f00cdb61 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD-2"
 SLOT="1.0"
 IUSE=""
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
 
 RDEPEND="
 	media-libs/libepoxy[egl]