gentoo resync : 22.05.2021

10 files changed, 154 insertions, 11 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index c88a9372931c..b535addddc5b 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/egl-wayland/Manifest b/gui-libs/egl-wayland/Manifest
index 4f3c3b98fc04..3d568e27e56d 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -1,5 +1,7 @@
 AUX 10_nvidia_wayland.json 115 BLAKE2B b10206c742e8966d1192b9b0604137e6b296d2be74a437841c63844c0716343578b11565a34fb4c534d5908c0b5775305581b68039a6ff9ed7421c9d385a2b7a SHA512 1a611ac0fc2762d94661efc28fa58d57a821185afa7589158d1b8d503bd7361ba1b5029302550134ed1787c2bf90e2ea8afbf3bdefbfe268d8cf13d2f340fb47
 AUX egl-wayland-1.1.6-remove-werror.patch 251 BLAKE2B 12a14b185f9b1cb3a42226708642f5b57c2b0eb64d81c96438ee24ac45b950ba588591194648fc8e64e3aa8d2fda9ba2dba63a2f78fc22c00a14d56403bf6839 SHA512 c6c3c4d4f776f44d642d51ab2eed44a0388558b43f2c4c894b6d19bdef40b8a646be43b6b356a3ffa0297e36a48122ef057265db68a8717020abe30906bc8f28
 DIST egl-wayland-1.1.6.tar.gz 48674 BLAKE2B 66f58d4b841ebaaec6c0711e0dae0b3c774a7b0206f9cfd4d9e94a2c05688d563fddbbf9a60247980df00c3c493147e292bc536e2eb56de962f3b34c6215e026 SHA512 81fd3be3f49ad012efd31189d85666e869653f1f4004de4103f4ad13b7fda036cef432d1e30e33664ae423092dc1b86cfd2773d6542bb09d7a74720ba14e0fa4
+DIST egl-wayland-1.1.7.tar.gz 48681 BLAKE2B eebbd0e36045c50b39ef70292156f5cd137a51af2169b56a35d318d90ade3d4a5b94206d86246d52fda0c6c093ff25e389b1a3ccbe60595dc9661d199e30f33b SHA512 edc81d9f2c617587044d5f9d35b3e355db8544e8fa1d861c1b92a5a11bc1af7d994ca8abd49ce6f462a1971f20296b4c757bdf1df0d2bfc981cdafaa839f12af
 EBUILD egl-wayland-1.1.6.ebuild 1660 BLAKE2B a2dc305faacb372b25c49692081f9f8ce3c441405388abc8b231d89703c6e136e53eca1b32770a1d9f3c39a56cb32c13cc07b75fc3c94168bb28fe17e7465383 SHA512 83952f79b5f07f5a709268d37e09e465befa617091e8cd9b6aba1e3208e3441df0ab908cc5366ca9cb8ddafc5ec830d69bad86bcb893ff47077a725a546fe34f
+EBUILD egl-wayland-1.1.7.ebuild 1668 BLAKE2B e30178a9c6b007e9c3d8e32a3a4c0747d95e433dc5ce5c64b240e07ff5b475b86455e0292bd1f1c14795e688b0f48a9a606b1b898a3fb4133bea32e10f45ca4e SHA512 811afc180dda6e110e69c54d5b1bbdb3c9088ca8820d4e5916b960b96548bc90b7fcda57f0b0150afcab377ec705ebf1dfe440b6953dd3739e2511cb3714d31c
 MISC metadata.xml 477 BLAKE2B 406298dc8bb1aabdb3f5dbe507846089c4dfeee1bf4db6e76624c33b369b2f3afd485c91020073aaaf09bc0a3500c0ca6f991b52325478e302c4c7134f009f74 SHA512 cc1b9b630d0751801cb834dafe15003eb370f3984ffeec7d5515eb2972587a5b8bb72b03dabb1e27dcbfc6c509e6974713d0fdcfcb2c96c5737f19e9ebe2ac18
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.7.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.7.ebuild
new file mode 100644
index 000000000000..01dea054a2c3
--- /dev/null
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic meson
+
+DESCRIPTION="EGLStream-based Wayland external platform (for NVIDIA)"
+HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
+SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/wayland
+	!x11-drivers/nvidia-drivers[wayland(-)]"
+DEPEND="
+	${RDEPEND}
+	gui-libs/eglexternalplatform
+	media-libs/libglvnd"
+BDEPEND="dev-util/wayland-scanner"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch
+)
+
+src_configure() {
+	# EGLStream is not intended for X11, always build without (bug #777558)
+	append-cppflags -DEGL_NO_X11
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/egl/egl_external_platform.d
+	doins "${FILESDIR}"/10_nvidia_wayland.json
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "To use EGLStream with x11-drivers/nvidia-drivers, it is necessary to"
+		elog "load the nvidia-drm module with experimental nvidia-drm.modeset=1."
+		elog
+		elog "Can be accomplished by:"
+		elog "  echo 'options nvidia-drm modeset=1' > ${EROOT}/etc/modprobe.d/nvidia-drm.conf"
+		elog "...then reloading the module."
+		elog
+		elog "Note that EGLStream requires support from the wayland compositor and"
+		elog "is not currently supported by many popular options such as gui-wm/sway."
+	fi
+
+	if has_version "<x11-drivers/nvidia-drivers-391"; then
+		ewarn "<=nvidia-drivers-390.xx may not work properly with this version of"
+		ewarn "egl-wayland, it is recommended to use nouveau drivers for wayland."
+	fi
+}
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 8bfb7d2fa2a6..df44cfb9bda4 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-4.2.0.tar.xz 25772584 BLAKE2B 38c29475050ff6d0aa41299201343d506e051387c44058f8d3e970470e49046bb11eae57d57d8d869577ca2d5f01da507edb3a87f79c98828ec938a0d87e6989 SHA512 12e825245b92f5dc652530c35b9a48a0bb284641d4128d054a19a35cb7814babe78bfbbdfd7fe3f2472d5028d078ae209a6da5d614b023c2b438223e4c5a04a0
 DIST gtk-4.2.1.tar.xz 25809520 BLAKE2B 63183950703375b092ce451be93d16d1149eb2095b5f304578a064422821546ae161235b46617647cd67a7d8898e2c3854d87bf31ede0cd6db2138d7e5c36c30 SHA512 a2721d6b9a72be481460081aedfbd713842cb5abdb24d810ec48e346342d0d91271f4ace321a9697214477ad4829d0b0ca67754ea316e719784f01c43f0fe732
 EBUILD gtk-4.2.0.ebuild 4452 BLAKE2B 26ff8af4001096d0515b3322e3feb36f3f535eadfc0cd5f07384f51c0e92e28752fa5a8ff064fbd6c6cac9b24fd224ef7bf92b1768308ff9c0a46cc9695b6448 SHA512 f8ddee9dda3d44ecf27fb4dfea414ea05fe308b01b62bb71c8e2f0ec0582ba90e2d93fbad7dcce6962b4bf90357b829dd7a8e303b6f50162b4194af42936fc01
-EBUILD gtk-4.2.1.ebuild 4715 BLAKE2B a5176b6f42dfd8908262e538f263dc486ec3b5a3bcec88d2d018241edb8a04fc794578857a07e335897543f3f0a3e488d56312ede02240a2f4d24a531ee5ff3e SHA512 0c480fc448c1bc993e576bff05d712f78903b722fa30657e3ab824484a0c49b4a8f9a9deca65008942bd6e514746af44879f67df9a356d6cdd4f926b224ee27d
+EBUILD gtk-4.2.1.ebuild 4722 BLAKE2B f695e6f40466f64fa521e512d37ced9f9644b4463b20c69abc10da5ca45bd12fd7fbf0442b32de218d6f721b2508e171783cd0f2676b0caee31389520ec0b9bc SHA512 7e7d49494b3c765561e418895f55fabbff5a66d805b6d6865ab300f258af00956bb3982aef9e4f31ec39e1b50a0ecd75eda6b93fa2b3b627f82532f1bef6a2e7
 MISC metadata.xml 762 BLAKE2B ba9cb841a877cab910c5517bd4ddd5ade8eeeee9730842412ea371c745a90c5b69d06d95d2f77adff6b90daff589173525914139bb6bde699f241c3ddaa5662b SHA512 8678e380c257cb7cdbee752bec79bc53632b453bbb72a6c05c9ecbd791285e964ea3a57197dd247b0cd881757f3e5210551755e043126a3db9913f96a0f142ae
diff --git a/gui-libs/gtk/gtk-4.2.1.ebuild b/gui-libs/gtk/gtk-4.2.1.ebuild
index 1c39b4eafebb..8376849026ce 100644
--- a/gui-libs/gtk/gtk-4.2.1.ebuild
+++ b/gui-libs/gtk/gtk-4.2.1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index b6d54b71e590..3dd99b7b4e3e 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,5 +1,7 @@
 DIST wpebackend-fdo-1.8.0.tar.xz 42520 BLAKE2B 885a1eee84d040e176a4f9d06e3cd527a6f619c3a85f19f2331b18a84460a102692aec3f3a1a5eff96e9fe858aa45df5ab5785db5c8c71f76cee5dc3a49f0338 SHA512 e885a169e89f90bdd38149894406af368ddd951a17612975a459bd958fef3adf46f39f80c2264a9a2eae965984a8f1f61b36440836780e73cb4e7b8f433335a6
 DIST wpebackend-fdo-1.8.3.tar.xz 42976 BLAKE2B 9c155f7da5bcfb9a485ffc9aca24bf27aa423cf1f456deec628de9ba1cbfc92c30041572562148403889442caf3953bc4bd075df980cca12db5e30f97bfaeb5d SHA512 5b53604d192d78d92644dd9d266f06ac149fc404850e2c68ad0cef04b98931bd8417791450d96d60bdf8f02fae6c486c2d53c61dbf3da5d556bc4daba0b7b528
+DIST wpebackend-fdo-1.8.4.tar.xz 43276 BLAKE2B 03973e94ea19db6f9a3e8e9855d970d6b2bdc546a5a69e5e80d07aec3c2aa48739653c596138c798f766816fbc4b1df4da0a5ed5bf42969812a87b4670db502e SHA512 a92fea7e16b48c89789ffa35427f716900071d4e65d7f06acc94d28f49688f3ff344623cc4801d4f5b7ebbd740a8349cce064467826c41a7983cc90811805a64
 EBUILD wpebackend-fdo-1.8.0.ebuild 633 BLAKE2B d2bf545e94c9f923d7f38e73bd2d65a719c954e727cac98ad6acb062ffe2c86e3ada6016cae5141b0811fec7dfc3b27f706ada0ada4a5c3058ba1e0e5638cbe5 SHA512 8c46f7c93cc9fba12d29dda2430b9e8ab4cac4b0d34f4295939a02df6fbb850358cd4ab00b37aa2ead724cc828876283610026e0ee90200ed3de3b9d87e7ba16
 EBUILD wpebackend-fdo-1.8.3.ebuild 630 BLAKE2B 5aa71f6425525ca425523167e5694e092d8477e01c4a5f5010013944ce864e638f2954c2514a3f91d5ed04d5c114157c7a99d54e11eba849f748b0182dd47d2f SHA512 9870a58f33f416ee4a5717ff0dc9397c2bb2a0ecb4b8f38f4994ced2c7fb0342c81bd80b6e87d3d7bff953bffa3e1b7754665b8c97a646d0c4381072d7278f3e
+EBUILD wpebackend-fdo-1.8.4.ebuild 630 BLAKE2B 5aa71f6425525ca425523167e5694e092d8477e01c4a5f5010013944ce864e638f2954c2514a3f91d5ed04d5c114157c7a99d54e11eba849f748b0182dd47d2f SHA512 9870a58f33f416ee4a5717ff0dc9397c2bb2a0ecb4b8f38f4994ced2c7fb0342c81bd80b6e87d3d7bff953bffa3e1b7754665b8c97a646d0c4381072d7278f3e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.4.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.4.ebuild
new file mode 100644
index 000000000000..d71374deea58
--- /dev/null
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 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"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	media-libs/libepoxy[egl]
+	dev-libs/glib:2
+	>=dev-libs/wayland-1.10
+	>=gui-libs/libwpe-1.5.90:1.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=OFF # hotdoc not packaged
+	)
+
+	cmake_src_configure
+}
diff --git a/gui-libs/xdg-desktop-portal-wlr/Manifest b/gui-libs/xdg-desktop-portal-wlr/Manifest
index 372f6e2a1e66..9f12ed071398 100644
--- a/gui-libs/xdg-desktop-portal-wlr/Manifest
+++ b/gui-libs/xdg-desktop-portal-wlr/Manifest
@@ -1,4 +1,6 @@
 DIST xdg-desktop-portal-wlr-0.2.0.tar.gz 22260 BLAKE2B a1f3a8244b985874a0b663b311157bc2e2098b8c50b6e3688c89d1c7bf7c454048b359ad42b97edb2faae7b232cd5b6843c07098c07e1f97ede507995d214271 SHA512 9b01919b380510389710c005901810ac6fa00299f2b35a37fa949aab361438ab08c30fc95b88e1805dcea7e97ebe2d19111693f82eee545864077347d2659ca9
+DIST xdg-desktop-portal-wlr-0.3.0.tar.gz 29340 BLAKE2B 848e3cb969a6d9f9cfcbb25336bd66bf75e2ae01fc5ba637950bb202399c2344f14cbc7a65c5940678bc4ca02134cee26ee425b88a91d050c6833c6098d34fd6 SHA512 2b01fab18296cb95cf659ff5a74ed6bf1482c033fdb274904bf2c3ea736dd3c8cb2e82f0662439a88f81ae86cc2fca2fbc3c1a9c72267ba126571973a7662e3d
 EBUILD xdg-desktop-portal-wlr-0.2.0.ebuild 995 BLAKE2B 3378be82b18f265074ee9e5e6137e88b72b75b7d1cfba215d79a864d671f63254971ee087114870c67961d4cae378e570080c5dd9f8b5cf50bb11afcef351001 SHA512 75970f99d7affbf6af083eab700e8e838e4e4426f125126c4caff77e2239b18c69812ebefb54283717231fa03567a97b582fe4df36006cc771b18ca9df83c11a
-EBUILD xdg-desktop-portal-wlr-9999.ebuild 1097 BLAKE2B 6122b9a187f71e10543150b50eb479e8f78ff30905560e3b8a480393fd10cf44a588df724a230f035bd07cd2a6dbab3d2b21bb10b56d4ad41ec9a2e9c0780246 SHA512 ff757cbb453f0bb3a0bf3d7ba87bee5ae11d67f6a4443b3147509920a1fede2aeca47ba4053e82d1d3af7533d80d1f6ecf62c966a1572bded6136503e87ed4e4
+EBUILD xdg-desktop-portal-wlr-0.3.0.ebuild 1016 BLAKE2B c4f0c87b1f64a5d969d263798fcf1eaf6fbf470b46d654590e30f5578f581022ae987c6762942b086879f176905876ffa0913f288a2f585de2437d235fe9bb60 SHA512 9658e32936251dd2fed71e949fe7f54490c094a0eb1219506ac6584d45d33707f68e82e511716e2b01e34376ecb3f937ca12fe11d3ca680550d9f6f994651cd4
+EBUILD xdg-desktop-portal-wlr-9999.ebuild 1016 BLAKE2B c4f0c87b1f64a5d969d263798fcf1eaf6fbf470b46d654590e30f5578f581022ae987c6762942b086879f176905876ffa0913f288a2f585de2437d235fe9bb60 SHA512 9658e32936251dd2fed71e949fe7f54490c094a0eb1219506ac6584d45d33707f68e82e511716e2b01e34376ecb3f937ca12fe11d3ca680550d9f6f994651cd4
 MISC metadata.xml 347 BLAKE2B acd0b0dd1010eab7fcb18925c58a2f41a53704327e1b2419f2fba11b5f2c84eca044b7c1998fd16744c91e58d8cfaaa0c3e7758a892ba380774ea3132a7a4d92 SHA512 6cc79a37a31c38f1b3ab61124b5489fd0b9bfb5852eff1cc21b2285c2c7a83fcca129c9dd04c491cc33e5bcd6d3798e20d791a440d8612841315249eb29ca591
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.3.0.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.3.0.ebuild
new file mode 100644
index 000000000000..e5d42ca22778
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="xdg-desktop-portal backend for wlroots"
+HOMEPAGE="https://github.com/emersion/xdg-desktop-portal-wlr"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/9999"
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=media-video/pipewire-0.3.2:=
+	dev-libs/wayland
+	>=dev-libs/wayland-protocols-1.14:=
+	elogind? ( >=sys-auth/elogind-237 )
+	systemd? ( >=sys-apps/systemd-237 )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/xdg-desktop-portal
+"
+BDEPEND="
+	>=media-video/pipewire-0.3.2:=
+	>=dev-libs/wayland-protocols-1.14
+	>=dev-util/meson-0.50.0
+	dev-libs/iniparser:0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		"-Dwerror=false"
+	)
+	meson_src_configure
+}
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
index 029d5a3963d4..e5d42ca22778 100644
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
@@ -12,8 +12,8 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/emersion/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	#KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	SRC_URI="https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
@@ -36,6 +36,7 @@ BDEPEND="
 	>=media-video/pipewire-0.3.2:=
 	>=dev-libs/wayland-protocols-1.14
 	>=dev-util/meson-0.50.0
+	dev-libs/iniparser:0
 	virtual/pkgconfig
 "
 
@@ -43,11 +44,5 @@ src_configure() {
 	local emesonargs=(
 		"-Dwerror=false"
 	)
-	if use systemd; then
-		emesonargs+=("-DHAVE_SYSTEMD=1")
-	else
-		emesonargs+=("-DHAVE_ELOGIND=1")
-	fi
-
 	meson_src_configure
 }