gentoo resync : 20.06.2021

9 files changed, 9 insertions, 80 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index da305d5c595f..7e6fce981fae 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 f316f8d98a5f..22ad2185545b 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -3,5 +3,5 @@ AUX egl-wayland-1.1.6-remove-werror.patch 251 BLAKE2B 12a14b185f9b1cb3a422267086
 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
+EBUILD egl-wayland-1.1.7.ebuild 1667 BLAKE2B dd908d257236ced3909795e2cb2b37d08c92aa61ba49ca5ff3180f6079b0f2e5bd4f194b527dc4e3527b2d13914fcb7102c05c80296cd0ed7d885c29c819def3 SHA512 eecdaf683a786a819d76d5726eaf52c46daf27d8a988619426dc12f59f89fc54232b67b44524c21f8dbd1e3fec9ca4837e5a36f2db41b3aaa153ba16e671cbbc
 MISC metadata.xml 328 BLAKE2B 0967a32e5ffc7a996fe48c6cc822e1e2e6efdd7093876ef28256bdc35c292b5216191a786b5592dce818b9aaeaef3f0992f68a369bf36d4ba835d56a6cd786cb SHA512 f06489d4abad797233a1fe8183d3248a4b31c08549c57d59374bceb844566767e0bdddffa88e008e043543f28fd52de3a3dff2692dcde060d8a441e271917aa6
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.7.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.7.ebuild
index 01dea054a2c3..dc19e9bcb8c5 100644
--- a/gui-libs/egl-wayland/egl-wayland-1.1.7.ebuild
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/wayland
diff --git a/gui-libs/wayfire-plugins-extra/Manifest b/gui-libs/wayfire-plugins-extra/Manifest
index 3d5acc428441..def857138363 100644
--- a/gui-libs/wayfire-plugins-extra/Manifest
+++ b/gui-libs/wayfire-plugins-extra/Manifest
@@ -1,4 +1,4 @@
 DIST wayfire-plugins-extra-0.7.0.tar.xz 74312 BLAKE2B f72d706502499e4d467a4b59e10f66628024be1bab1c5e10c807758869c9b9e4aacbe426c2db0e3faa5ab166f7e4f4d0f1c345e205c6747a16a164745c6f0d74 SHA512 ff25a4685c88ca0129a2372b216166246cab072c2cb4f84eb7bd500db525bf5881bd7e54d0d888473d4aab0e5b33d2ee13eb7f788bb2a524e1e8e0c5efc1a6bd
-EBUILD wayfire-plugins-extra-0.7.0.ebuild 690 BLAKE2B 2d23730042b8240adbc105cd1874e795eb91902b1187e0912990142ccf9ce60277e8f3282024bb17cf623ee1a4dee36c1f38b0b3b65aadced19e065bcc31e098 SHA512 b8726e866eede97fc2cfc8bdd3ba31f038dfb043925c336a7f57c3548c829573029fe6be443096044497fa75519d0e3dee20df2ec11b4e5f481487bc659575c3
+EBUILD wayfire-plugins-extra-0.7.0.ebuild 716 BLAKE2B 9831ff638725a4fb0f726689ed45d96bac17f38e2a7ce744b2dec6c0bd45bf6bc451af410b1e0fc6284b7e1e314ccbd11247319c025f960518bded298df1bad7 SHA512 51ec749dc827dff85ccc4ec6fcdc583343164e9ca358200159eda417bb918723cabbdf3f42e576933958a1fa450e1e64a48126cbad19c71ab1d802fde224d304
 EBUILD wayfire-plugins-extra-9999.ebuild 684 BLAKE2B 6bedcb051d70e8992c3ed0bd9e686b24628321c9bb34bc72c473c19f6d53a6b54c887747bad3b3b5e7f88eefc3d0fafc7a08db4a06cf88ae8b9727735b6626b8 SHA512 97e32218968d27d00ee9525dc3ceddc1d70f94f7bdd361d1b95ec836d7e391cb68536385f8df7259572c9dcc4e574c4a72643f64fbcfb4336578336c33b05619
 MISC metadata.xml 425 BLAKE2B 5d9c660cfc12dcbf505ff9aac20388b27d799901fe762194192c882f05d57c23dbfef9e7f246ff626a6726c148c3175523999549e73692786d589144b912ca51 SHA512 e05e9cf8034efa227849bbd76817c87f3eff0cc2c29e6b15f6e70d4b3e956f28d415af8874a6034d402d6d7c47d0ff6850bcc4e11ff5ca8dc9e6a2bdb713996d
diff --git a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.7.0.ebuild b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.7.0.ebuild
index 8b6d80959614..7fb2990acf81 100644
--- a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.7.0.ebuild
+++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.7.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/WayfireWM/wayfire-plugins-extra.git"
 else
 	SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
@@ -21,8 +21,9 @@ SLOT="0"
 
 DEPEND="
 	dev-cpp/glibmm:2
-	>=gui-libs/wlroots-0.11.0
-	>=gui-wm/wayfire-${PV%.*}
+	>=gui-libs/wlroots-0.13.0:=
+	<gui-libs/wlroots-0.14.0:=
+	>=gui-wm/wayfire-0.7.0
 	x11-libs/cairo
 "
 RDEPEND="${DEPEND}"
diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
index ac03cf9a1388..5567cdd15b50 100644
--- a/gui-libs/wf-config/Manifest
+++ b/gui-libs/wf-config/Manifest
@@ -1,8 +1,4 @@
-DIST wf-config-0.5.0.tar.xz 64760 BLAKE2B c1939035820794828b356371c51dbd55a73a569e3a9dcf801b4aedf61c3c0131e47040a1b05e2a8cd30ecbb57f160f702b735437dfb49051a8a6a63d95201204 SHA512 b365884195cb7fc64a1ca1d74a2d12b56e1ef0f4dd49d298a9379455f2917f2c644de2b12f5068304ca404b112490e38fbfe3111aac31d301f02f23429df87c7
-DIST wf-config-0.7.0.tar.xz 73332 BLAKE2B 709a9358e564538b9db8536a5e24f2e7843498830e643ed005801624de9f71ad2661824de75f5b57541ece99d525a4689048c990df5ddc3fdcee6fc83c03e490 SHA512 ddad687b180e786060839cafe5623a0897ade061e6ad057dbe579d51595fbf2dc45674df3fb35070520dc51d7e02d4c9158d9cf8d4619ac49334014f6701f06d
 DIST wf-config-0.7.1.tar.xz 39120 BLAKE2B b18048334df12b002391fe4a74529cb61df76a0678c9052f8ac91d777e8a48dae46b87680fb44630ebfb9a350dbac36b15bc81850341fa4cd6299c12f6fa057d SHA512 d535a09a3465a54a607df7b8764ee6818ab8b83536d68c85167b282b95a176636e4bf5cda6c0d1638c07721a1f4208203e9d41b83675038fb590a535314df719
-EBUILD wf-config-0.5.0.ebuild 668 BLAKE2B ee167eaf5b8991981e513e91e75dbe55e122486a823b15a9763cad4266c5e8f18ddf9814eaeb38601e579513a52114166d65f64067b1b9397f4b1a64f91b0a31 SHA512 4979a6365da9f206276e6c862466df1b16e1e4451d2d3fe17ae73de0cd920c5e0d0347bb97d550a65ecb78cda0dacfa487b4b5142342576dd963a8154eed4868
-EBUILD wf-config-0.7.0.ebuild 670 BLAKE2B 5fe30b569fc393d7b34d0bb4a1b5f0abbe3f2994e79e222fe22307aee573180c3a7cfcbd0c5ae8854c7323219b43f72a300df2899706194a2834ddd8a2923cb8 SHA512 b6fb0df3ab0b53b21ba6e2a108e4e602107e31c2915a7817067c3db2f8c1ffff45b6d672d1dda64152adddaf7b9ef6eb579fa0ec5539ee8152a5e0e1c21d717d
-EBUILD wf-config-0.7.1.ebuild 700 BLAKE2B 663f7973a977f7975163cb1c5c41d486bf23ef14707a2058e5cb915b111d91a38cbd4f2715eeb5da45ad33da84426f0da6040d394a46beca48b1609400b05a66 SHA512 966e7cf897a48cc622ac1970535de83cf061195afbeefb51e784a2e3ca2c46ee974e0d673d5e3402fe134f2f6621ff12d15b56cfa147118fa0451c2eee30f66f
+EBUILD wf-config-0.7.1.ebuild 699 BLAKE2B 8e7d79bbfc9bdcdfbfc8c33ee510542bfbe5c9a5ad0c90a05699e00830c133a2768f739bef88fa9c1927d09fe2c094bdef9df97ebbc0ec76f3ab678af3b200cc SHA512 7f889ca1de30eb2cdebc95f436f832822de54e216c405938f4b30981512a2d5ee8c33f7799bf4794df84d5fcb68047c85e978dec07211e4d3031f58bce2f5042
 EBUILD wf-config-9999.ebuild 669 BLAKE2B a9c2b3b6fb304e93370c67302eefdee8a6c34fec612bcc3f1696a20d4a38bc530754ef0d04b919f5bccfbe4fb40d10fcf6812f32e1e06adaa610e576a143ce71 SHA512 a63b20723a40399b014e7092859eee37562e44a4209cdb2dfc4bbcb5e7fc364cf60fb17b69f91876f8913630ccf02495358830dfed6b19a2a457a9ecbb651c44
 MISC metadata.xml 665 BLAKE2B d4367bc2ae5a738a1f20258d71d0d7374ac5887a2a8634ad988d2c5e3eec04253b56ddbbd664b080decf94fbac9c8e773548af4336ceaeb78f6ed261f48faa5a SHA512 7dd518eda1cde07e698fab109c535e6129527562db3c91eefc934c23c5f08f2b5f82d8572b7923d0f974df3f6c88415e467a2abf15b9925d6a491c0b3e9b8312
diff --git a/gui-libs/wf-config/wf-config-0.5.0.ebuild b/gui-libs/wf-config/wf-config-0.5.0.ebuild
deleted file mode 100644
index f931c5c75f9f..000000000000
--- a/gui-libs/wf-config/wf-config-0.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="library for managing wayfire configuration files"
-HOMEPAGE="https://github.com/WayfireWM/wf-config"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git"
-else
-	SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="
-	dev-libs/libevdev
-	dev-libs/libxml2
-	>=gui-libs/wlroots-0.11.0
-	media-libs/glm
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-"
diff --git a/gui-libs/wf-config/wf-config-0.7.0.ebuild b/gui-libs/wf-config/wf-config-0.7.0.ebuild
deleted file mode 100644
index 26f5dea6385b..000000000000
--- a/gui-libs/wf-config/wf-config-0.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="library for managing wayfire configuration files"
-HOMEPAGE="https://github.com/WayfireWM/wf-config"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git"
-else
-	SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="
-	dev-libs/libevdev
-	dev-libs/libxml2
-	>=gui-libs/wlroots-0.12.0
-	media-libs/glm
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-"
diff --git a/gui-libs/wf-config/wf-config-0.7.1.ebuild b/gui-libs/wf-config/wf-config-0.7.1.ebuild
index 6b7ee7b76285..1df962610514 100644
--- a/gui-libs/wf-config/wf-config-0.7.1.ebuild
+++ b/gui-libs/wf-config/wf-config-0.7.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/WayfireWM/wf-config.git"
 else
 	SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"