gentoo resync : 04.01.2022

7 files changed, 8 insertions, 52 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 231d0096bc0a..3afacc55d62d 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 533d1b4906c8..f293da21e724 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -1,9 +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.7.tar.gz 48681 BLAKE2B eebbd0e36045c50b39ef70292156f5cd137a51af2169b56a35d318d90ade3d4a5b94206d86246d52fda0c6c093ff25e389b1a3ccbe60595dc9661d199e30f33b SHA512 edc81d9f2c617587044d5f9d35b3e355db8544e8fa1d861c1b92a5a11bc1af7d994ca8abd49ce6f462a1971f20296b4c757bdf1df0d2bfc981cdafaa839f12af
-DIST egl-wayland-1.1.9.tar.gz 57069 BLAKE2B 64cc1d91c5dab5d070ea23211ffac47a5e5ddde31dfd18bc2a31f24b4cd0b85510752a5d2219e8a919690645426914a1dae325f47dbf46ec0487e0042b392d8f SHA512 3125f4130a5a738f8ecb2acf4d1a7936ca44958a78ade29118222fcd0b5d46f6edf6e18f4e992f541294e08e88c54a8dc231eb2bdcfcd7d56ac543f4e1ed3f8c
 DIST egl-wayland-1.1.9_p20211123.tar.gz 58900 BLAKE2B a5a08df06e302b573f1036264495e7b29ec4d3def9be0e9b8037206a42aab5c18d78b79cc3f3ffeede9708916e644f8090fadf34318429cf0040c3623da28ce1 SHA512 8de18c8c0c38ca672688a5197be20534cc90b0fecae9ea2f3d3bc851d5b50d3f148a4ce97b835a9576251c8273ea21f82f2c9694cf2b7bba28fa3b53850c43b2
 EBUILD egl-wayland-1.1.7-r1.ebuild 1132 BLAKE2B 8e4b03714a6ca4b8b46713becd2aa60863712bceff60078ebbef97d1c5ffcbcc7fd7cb6e1d16f44830310b731fc5d068df9debeaf2f26cd1052f4183f5be6a44 SHA512 01dece299473c23b5f0b4f7982a8fd413a327284bce7254f22d5753878f2d10b2fb6a3bdf3d40f565fabb781cba0a24392befae9056d78ef84331b2d60146522
-EBUILD egl-wayland-1.1.9.ebuild 1009 BLAKE2B d94ba3293098d719a3b71f3a1c310d94904a8e1d2acaf3bb4658a7ab85857e097452940df98a71ae3fd0528a5833c7e4581fa36865abe57ead2fe30c2022c8b6 SHA512 88b75b47cc5c3938d003a921fc3032cf0f1de0e6252827fe98fbc2753a8682737e1158bc7bbf0a0373f824352fde76809bcfbf44b4d10a5c3c20662813e885d0
-EBUILD egl-wayland-1.1.9_p20211123.ebuild 1105 BLAKE2B 339719270197e34c773bb1172bd5cdcaada106c6d7e47238cbb20abb7a9c39142c61a18b74153363e46dc0bfdc384437d32b40664e686a003fdcf077705e6e51 SHA512 76208061e9c5759b68eb8fd0021d5afa5d8e642ac9d82bbb3b83091cb7af94218a2d0293e9c707930c6252e855c35eda562fa95c8835167cef4464b9bb0b4833
+EBUILD egl-wayland-1.1.9_p20211123.ebuild 1104 BLAKE2B f7e4a668abe218e26b8d8549529e90052b4cfef6a2c2396a2b57a004e6f1222584b4846abbf8211478cb1cf7399c8d2ecad2cd18ccbdf8f796a11ad6f7b9167c SHA512 ef4f7bf93f5c283ee91d64e0cfd34b1fefc7bcb6524f123d723f0d1d6003aa8e4ae6c34128a2cd3ba98addf307ebed2331f9293c921a8581f7c3e7c403440710
 MISC metadata.xml 329 BLAKE2B 9763d8fac09a9b4902a2a5d61f0f109659ad580117b52d7f844785e449623480752356d31507d86be1198b56a6e38fa6a6fa20aa2151421f79f3ce94f98865a5 SHA512 ae3d6edba2229abebf7f87b448a3f1eacd592d28f6ff3bf80e50e14d8718f15e5a67ec8496cdf03f86532f9525638c3dab5020ba9f62d2a9a4495a16a617d4d4
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.9.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.9.ebuild
deleted file mode 100644
index 5e15a81e06a6..000000000000
--- a/gui-libs/egl-wayland/egl-wayland-1.1.9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="EGLStream-based Wayland external platform"
-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-470.57.02[wayland(-)]"
-DEPEND="
-	${RDEPEND}
-	dev-libs/wayland-protocols
-	gui-libs/eglexternalplatform
-	>=media-libs/libglvnd-1.3.4"
-BDEPEND="dev-util/wayland-scanner"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch
-)
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/egl/egl_external_platform.d
-	doins "${FILESDIR}"/10_nvidia_wayland.json
-}
-
-pkg_postinst() {
-	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/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
index f1c9e329762c..797eb2b76f76 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/wayland
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index dcfd8b04dbfe..080876b4059f 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -3,6 +3,6 @@ DIST wlroots-0.14.1.tar.gz 505840 BLAKE2B fca4d259cdde62da0c196344ce1d0f5dd679d0
 DIST wlroots-0.15.0.tar.gz 565059 BLAKE2B d98529b4548e3b751a505a26af143be585ed42fb9617bc67b4a10747bb494f1359d7bdb75d1730a72396e7c550fe481e858a5ac88621d61671698439e3656920 SHA512 730b1e0cf003dabae23101664c6d1993636bd3a8ecbdb3c165eef415a92811c4d5228f48e0275f75361d8528f118dfb8a2298cfb05dbf6364539224ceedca447
 EBUILD wlroots-0.14.0-r2.ebuild 1500 BLAKE2B 766fa524353658f542c648281b05e9871140ee5272f160fbcbc36a28a48246d83494c6bd3e02ebbd16e1527c61139ea00ec00085d68a2a0b87b2b06347b2fa12 SHA512 22fc3dd03ec1c1a719bba7990b264dbb789445ba56afbff0c8e6aec6765b9a0a30ad4a27469f7d5a5ffa95848e861615aaa75a418ad6c771caec5b2179feeb21
 EBUILD wlroots-0.14.1-r1.ebuild 1503 BLAKE2B 12a12358ec5b012bb94a58d2aa20bbff7ddbf3fb34f06c1b6380429cec6fe9952ec53c85ea6607d1b0261a9c00060bdae71a23a40bc4f217c4fb8e0d28ee2853 SHA512 2a555ab4b3dc620394a4a9a975cbad6075757f27c85ee120448e6e0eb28c92ead7bbdd51ef935a104efafe8f5cb2f163f95f8fba6668258d8be996328027402f
-EBUILD wlroots-0.15.0.ebuild 1688 BLAKE2B 0586d218ad09988216977106910ce85f453abcdc7614c1eb9698c0e5a5f0650b404a1afd1df4ddb55450d02403d0f721d59a56c66e6a6aa9ef80d9c31937b5c7 SHA512 3c633667a8fd7b2d1800f28f23699ea99e2cea01780d7ec40b59d68c65598eebb1cfad17d43528f25e28862782dd7d5bd2639dc4d6180b9fa54983730404e40b
-EBUILD wlroots-9999.ebuild 1688 BLAKE2B 0586d218ad09988216977106910ce85f453abcdc7614c1eb9698c0e5a5f0650b404a1afd1df4ddb55450d02403d0f721d59a56c66e6a6aa9ef80d9c31937b5c7 SHA512 3c633667a8fd7b2d1800f28f23699ea99e2cea01780d7ec40b59d68c65598eebb1cfad17d43528f25e28862782dd7d5bd2639dc4d6180b9fa54983730404e40b
+EBUILD wlroots-0.15.0-r1.ebuild 1673 BLAKE2B 2bca9e82c6fc86221ded32517c88bc8bcaf573dcbe92ae47887c763bc62fb53a31d7962e4cdd85dca5a3e5c3845230e24d87218c407cc18f5bada1f19b271c92 SHA512 0d5e34031d57c598913eaa66fdc9e7cac613e2ea7e25adc3f450aa395a2218632b3f84028d3fcfa28213812b9a54ea82767b5a477bec22052c464b970293d109
+EBUILD wlroots-9999.ebuild 1688 BLAKE2B 54d38429e05901724e4a81c398da94cdb147125c5b8ad68efe81a716068022f141b0363d0c6849d40fc5823dbe9cf982db51ba526611f2299175fd146685b2f9 SHA512 fb44f6a7eb908d4504843c07d038c97131f42e969ac52a51036af8cb29d9827ddd73f0b61d8defb952667df4513183ef2de7ad074a3dad80a5e86981731a596a
 MISC metadata.xml 1545 BLAKE2B 561769f8f3911ce04fabf9300f08f264a15c3196009a1334601f3094409eef2c869b622997f5e31d7c7c5d9e05507124d62306e8aa0d635b535b6bbcd7d9e7ba SHA512 4f1ff86f60ec2c723682d0cdc9f4dd696af73c77e68937f53ab11641e8fc443f0a99c8f28ec6b844fe230bb493749e676a243a16bea7096635f68c3ae432f0ae
diff --git a/gui-libs/wlroots/wlroots-0.15.0.ebuild b/gui-libs/wlroots/wlroots-0.15.0-r1.ebuild
index 395649f12eb2..d7d3567a21fe 100644
--- a/gui-libs/wlroots/wlroots-0.15.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,9 +13,9 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	SLOT="0/9999"
 else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-	SLOT="0/14"
+	SLOT="0/15"
 fi
 
 LICENSE="MIT"
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 395649f12eb2..47b97d1e07e4 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-	SLOT="0/14"
+	SLOT="0/16"
 fi
 
 LICENSE="MIT"