gentoo resync : 25.08.2020

21 files changed, 352 insertions, 14 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 2fbd4aa55939..dd3fb694777e 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/amtk/Manifest b/gui-libs/amtk/Manifest
index f703dcefb1f6..3662b1a07725 100644
--- a/gui-libs/amtk/Manifest
+++ b/gui-libs/amtk/Manifest
@@ -1,3 +1,3 @@
 DIST amtk-5.0.2.tar.xz 368440 BLAKE2B d13498079714612ac775a20032c0684b77c8a2238dad055dba6b87e81c009da22b53cb93df185a10278eedab2857321ee59230488f738064a4fb305345eba345 SHA512 71876430c4e7c19c49170ef6ff8d4c5324f871fd1e02162f33a9249b87f693fa4f4f748ac73d901135d331fee662e5000851e86a00d921da6669319728526136
-EBUILD amtk-5.0.2.ebuild 742 BLAKE2B 5b5f0f13a882bcbda6586a5758f4adffed5c01417fd4934405e0dd89d60de233fe8c09cb219f0ae9a25843a9b2f860b5876b1b422277b4bdd352b8dca4201077 SHA512 603db580eb621321c544a297d3091cb12283ce093f547611f1c0665c42d736c5bae781f92ad2ce499202dcf0477c4d4540fc49f2835e2a91417ee336828ccac5
+EBUILD amtk-5.0.2.ebuild 749 BLAKE2B 42da7206e0fdbf3bcfd34ca8862a4f661f74dc9e4719d763add48573aa9b01a25366cdf935811a52349ac65ae7e065c35747021d5cfe6d7739f87b4d0289c29d SHA512 0d33110e0a4ab73986a02ce10ed132483691a37e2c8ef204fb80509912d79f6a4d4f1c2c7a00e106995ac9e032969a9b6827487b6c1c6b88197122ce1bb9c118
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gui-libs/amtk/amtk-5.0.2.ebuild b/gui-libs/amtk/amtk-5.0.2.ebuild
index 3617d3db91f7..29ddf52b6fcc 100644
--- a/gui-libs/amtk/amtk-5.0.2.ebuild
+++ b/gui-libs/amtk/amtk-5.0.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Amtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gui-libs/gtk-layer-shell/Manifest b/gui-libs/gtk-layer-shell/Manifest
index e3a69ef1575b..aaef4c9aacde 100644
--- a/gui-libs/gtk-layer-shell/Manifest
+++ b/gui-libs/gtk-layer-shell/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-layer-shell-0.1.0.tar.xz 34580 BLAKE2B db815d711e53485e00de2e0b7d238f6c66ddac9ca790d5f31c44eed965ad01ee07392d27552ae21bb1eab4905cc1d5f7dad9c10fd059afb43ba85c7ea1af2aa5 SHA512 3788559405a495d43279b20b9d64e1fb0fb9be4125eb3011a623565938246310c2e81cb6d52db111e42a9cd0739bb273ccf7fcb7c52db8b74a1e44108e061c6d
-EBUILD gtk-layer-shell-0.1.0-r1.ebuild 837 BLAKE2B 8f516188e5760f529ead9bf30f42eedd2b9f0b849b6face911de7ee76636c3388e426f7aa37747bd9d19682a4175bb2dbaac7b67defeea70d7f2e0fef884b488 SHA512 84aa5fe5d1b127cef1913ad2374afdef12f88527c7646956a26bbd6cd5e6c228a413af9cea26cdcbe53645a04560db5fd6df69a4270624a402189eb154acc722
+EBUILD gtk-layer-shell-0.1.0-r1.ebuild 840 BLAKE2B 979c1c8f5360f0aa82b30d28cc3619d26670f2af06c76b130dcd56c979d730a5ba114beb84bc38089d85019a81c1c77fba2ac3d9b20d8c3d8670e4932cb1a41d SHA512 730515236b7164a453e46fe0115ff9dde161f7d878564b9240a1e2a20921eccd0532d07aacedf5352cb859e0d0f2aee81840a52fc1dbfe13b1faaab81513ed81
 MISC metadata.xml 482 BLAKE2B 19f0a3db275c6912f7bb19f3ff1d17fe12db4e2b1c804abff3e87650e282506e57b72950fbd65b58c02ada9dd02426188cb7d9a47ad7b1f647eb4279a45c4902 SHA512 788e382605a2c25ff6bf932c99d72c5d77bc9f2adbe722996d1079509edac1c35d1fb95fbb146d856402927fb3ea5287ce87e1bddd7694ff8e5f9fc09db60dc8
diff --git a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
index 52b33d72a1f4..b947dbb09778 100644
--- a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
+++ b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wmww/${PN}"
 else
 	SRC_URI="https://github.com/wmww/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Library to create desktop components for Wayland using the Layer Shell protocol"
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 4bbf85fb44d1..b9019541fad5 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,3 +1,5 @@
+AUX 0.0.13-glade3.36-compat1.patch 1655 BLAKE2B fcc6be57b5eea5554e5ba0149fdc6fe9067a436b333c299f2b6366c98798e821d6d1c861b0fc299c6de145e9f310ea5822505591e678c36f938802accecbe0e6 SHA512 beffe74c8f78767113930193870165c751443d0f9c3cf5c6df89f1f872c892a559c1d34c63f84090d6187afa4495bc2c6a557335db5a98afc3820fe688a48a6f
+AUX 0.0.13-glade3.36-compat2.patch 1879 BLAKE2B d21b874a52028e2b7e4c09da9fb1b97296872a2a7d1665124813a644c9524e56fdeba2afbca218519edf524e91efb76f6182009319e3b098e2464e478b4b5b2d SHA512 c154ee41052dadc97afe99350a08eb141c61dad7201fe2421ae0c27e9cbd5fad8af057e44ae277a2dac9b22d3e1bf945345791bc764783a8bd19448da63bde95
 DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
-EBUILD libhandy-0.0.13.ebuild 1529 BLAKE2B 19de19913c32cf576e8c50e2d97d21baf1de6f82287c6f423e70ec1b86928ad1b1f619535e59abba0c6202dd4a5062e3293dd983bef15b5cb1e5f70bb27d958a SHA512 233e6db2a84c03810aaa1eeeebdd7a890aba1993de78f732e5d25db64d8d07ad7a0fd56109f6473fcfcfbad9875de22f598c592cac0818246c89da0a94bd558e
+EBUILD libhandy-0.0.13.ebuild 1591 BLAKE2B d74668dab9d35dae1878479aca43a8c14369fb27beaa93aac0c7c9c9a65f267bdd46e0678e5e3dc29a8c8efe518db3d72043c66e31bd6663b02ccee96dda1869 SHA512 fe0692e70fd80f63fbb3a9ed21231901cf02a2e81760f0eae1dc1ef0689ded1706875a040c131be5254684bb139dde4296383e8fc39ebbea0a732bdb650b4957
 MISC metadata.xml 474 BLAKE2B b8fba1ac64b79eaadbd70099133bc57a69be78738b9da3742ac9381286f62e5198b5b6dc5bf51dd5a11e0ea06819d3ccc00157f7f69939f18db18016db47705a SHA512 d9c79fbc1e8549dcdf6e42263040844efd729440d725df7c8f06bdf5e6c8da0de8f24186c94a2444e03f4396aaa1e4043d1893996770cfa2e5ea9f1b0ca71b4a
diff --git a/gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch b/gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch
new file mode 100644
index 000000000000..13321778ff2f
--- /dev/null
+++ b/gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch
@@ -0,0 +1,40 @@
+From c5ada7063a68cc05ed1b783a9769557b8e2a83ed Mon Sep 17 00:00:00 2001
+From: Alberto Fanjul <albertofanjul@gmail.com>
+Date: Thu, 7 May 2020 12:43:51 +0200
+Subject: [PATCH 1/2] glade: Adapt to Glade 3.36 API changes
+
+Fixes https://source.puri.sm/Librem5/libhandy/issues/267.
+---
+ glade/glade-hdy-header-group.c | 2 +-
+ glade/glade-hdy-swipe-group.c  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
+index be6a9de..aa83c6b 100644
+--- a/glade/glade-hdy-header-group.c
++++ b/glade/glade-hdy-header-group.c
+@@ -43,7 +43,7 @@ glade_hdy_header_group_read_widgets (GladeWidget *widget, GladeXmlNode *node)
+         string = widget_name;
+       } else if (widget_name != NULL) {
+         tmp =
+-          g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
++          g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
+                            widget_name);
+         string = (g_free (string), tmp);
+         g_free (widget_name);
+diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
+index 0b42798..ff909b0 100644
+--- a/glade/glade-hdy-swipe-group.c
++++ b/glade/glade-hdy-swipe-group.c
+@@ -45,7 +45,7 @@ glade_hdy_swipe_group_read_widgets (GladeWidget  *widget,
+         string = widget_name;
+       } else if (widget_name != NULL) {
+         tmp =
+-          g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
++          g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
+                            widget_name);
+         string = (g_free (string), tmp);
+         g_free (widget_name);
+-- 
+2.20.1
+
diff --git a/gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch b/gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch
new file mode 100644
index 000000000000..a3b2f891499a
--- /dev/null
+++ b/gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch
@@ -0,0 +1,56 @@
+From 2fb8c6a62b52aa85266f1cf0e8cf6dfa1a7f194f Mon Sep 17 00:00:00 2001
+From: Adrien Plazas <kekun.plazas@laposte.net>
+Date: Mon, 11 May 2020 13:38:36 +0200
+Subject: [PATCH 2/2] glade: Support both 3.24 and 3.36
+
+leio: Backported to 0.0.13
+---
+ glade/glade-hdy-header-group.c |  9 +++++++++
+ glade/glade-hdy-swipe-group.c  | 11 +++++++++++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
+index aa83c6b..bd620ad 100644
+--- a/glade/glade-hdy-header-group.c
++++ b/glade/glade-hdy-header-group.c
+@@ -14,6 +14,15 @@
+ #include <glib/gi18n-lib.h>
+ #include <gladeui/glade.h>
+ 
++/* Guess wether we are using a Glade version older than 3.36.
++ *
++ * If yes, redefine some symbols which got renamed.
++ */
++#ifndef GLADE_PROPERTY_DEF_OBJECT_DELIMITER
++#define GLADE_PROPERTY_DEF_OBJECT_DELIMITER GPC_OBJECT_DELIMITER
++#define glade_widget_action_get_def glade_widget_action_get_class
++#endif
++
+ #define GLADE_TAG_HEADERGROUP_WIDGETS "headerbars"
+ #define GLADE_TAG_HEADERGROUP_WIDGET  "headerbar"
+ 
+diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
+index ff909b0..5b165a2 100644
+--- a/glade/glade-hdy-swipe-group.c
++++ b/glade/glade-hdy-swipe-group.c
+@@ -15,6 +15,17 @@
+ #include <glib/gi18n-lib.h>
+ #include <gladeui/glade.h>
+ 
++/* Guess wether we are using a Glade version older than 3.36.
++ *
++ * If yes, redefine some symbols which got renamed.
++ */
++#ifndef GLADE_PROPERTY_DEF_OBJECT_DELIMITER
++#define GLADE_PROPERTY_DEF_OBJECT_DELIMITER GPC_OBJECT_DELIMITER
++#define glade_widget_action_get_def glade_widget_action_get_class
++#endif
++
++#define GLADE_TAG_HEADERGROUP_WIDGETS "headerbars"
++#define GLADE_TAG_HEADERGROUP_WIDGET  "headerbar"
+ #define PROP_SWIPEABLES "swipeables"
+ #define GLADE_TAG_SWIPEGROUP_SWIPEABLES "swipeables"
+ #define GLADE_TAG_SWIPEGROUP_SWIPEABLE "swipeable"
+-- 
+2.20.1
+
diff --git a/gui-libs/libhandy/libhandy-0.0.13.ebuild b/gui-libs/libhandy/libhandy-0.0.13.ebuild
index 4f69d327c067..07b2ca7fab24 100644
--- a/gui-libs/libhandy/libhandy-0.0.13.ebuild
+++ b/gui-libs/libhandy/libhandy-0.0.13.ebuild
@@ -37,6 +37,10 @@ BDEPEND="
 		app-text/docbook-xml-dtd:4.3 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-glade3.36-compat{1,2}.patch
+)
+
 src_prepare() {
 	use vala && vala_src_prepare
 	xdg_src_prepare
diff --git a/gui-libs/tepl/Manifest b/gui-libs/tepl/Manifest
index 418cbd09b4a8..e9f37a5444a1 100644
--- a/gui-libs/tepl/Manifest
+++ b/gui-libs/tepl/Manifest
@@ -1,3 +1,5 @@
 DIST tepl-4.2.1.tar.xz 464120 BLAKE2B 74146cdf837923ab1a8e843e189bd83b2c7d7ae9cbf03ce4f3dbbbbfee1f47dffcda537ad8133cdf1b4efd747f0ee60092ddab029a67282b71fdc52d51564dc4 SHA512 c1b848cf1d336efdc2971e16060baf721e9019e6e6827bd755235c9dd37ae47803343e51888d9dd5817b6127bb1ba05a19d4a1be0caab9d2de125bc0cd8175a7
-EBUILD tepl-4.2.1.ebuild 1361 BLAKE2B 3ab71473823444b98de9fe21aca388638bb7404966da79e6ea436ce91a98b4c43668ef7153b7b1b93723b6a4e478c5788cf4425cf5ba615da5d3d156cf60d8d6 SHA512 7374205c677b8376f7619327d336da92278985245817d1ff34c704386cb41c93ad0f939f804664720617c4d80b28c6dcf0b45f8f1711113564be045716f02e2d
+DIST tepl-4.4.0.tar.xz 466576 BLAKE2B fe9d9c625a3febe6fc71e5972b864b0d732b7f75bcc114a391d7f94b2fc242fe7c5199e61d5a69a8ceccb845fffcf830d6071adb1ecda5e223d453d029ed3398 SHA512 2050c28f9564034bea7c44d3fa27784ab87503c2db6cf35e6389c40ca78722b092fbc52df5fdfc85cc1e39a9dc3c0e30fa7993fb63411b0240f3a6ac9607c282
+EBUILD tepl-4.2.1.ebuild 1362 BLAKE2B 4f44f0d9c5e34201da5dbb62c59cf93a9dd80ab99ee4fccc6299cb88e82eb72212158b1181738c5ccd8183d87651292ffd5cde7c27515ae0c9d5e8baa29cc9b1 SHA512 aaff7602fd71f69a4306fa39630225d41a2a3f717c4a2dfe177b911e37ac8e30f0276f1c3cba83102f14172e0aa513fb964dcd10632ab9cab30ad9bdc7d29f12
+EBUILD tepl-4.4.0.ebuild 1389 BLAKE2B f82732b3d968ac6a221c18505830382eb99907dc04b32b445d3d3cfd32093c8ba4f64999a452ff41573829b081b838dd84157b3d5d31a62853400d97822f7667 SHA512 b3e677687107facd95edaf66eb58c655be5c84aae6bb9035ebf516e019c5cb74851e09ff4ed303b013c9d8bf64430d7dba199f34f7fdc0dd96f3bdac73737715
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/tepl/tepl-4.2.1.ebuild b/gui-libs/tepl/tepl-4.2.1.ebuild
index ec3365a0e8c0..7ed6fd412fec 100644
--- a/gui-libs/tepl/tepl-4.2.1.ebuild
+++ b/gui-libs/tepl/tepl-4.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit gnome2 virtualx
 
 DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gtef"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tepl"
 
 LICENSE="LGPL-2.1+"
 SLOT="4"
@@ -22,7 +22,7 @@ RDEPEND="
 	app-i18n/uchardet
 	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.19.6
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.25
diff --git a/gui-libs/tepl/tepl-4.4.0.ebuild b/gui-libs/tepl/tepl-4.4.0.ebuild
new file mode 100644
index 000000000000..88a2a5abc727
--- /dev/null
+++ b/gui-libs/tepl/tepl-4.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 virtualx
+
+DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tepl"
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/gtksourceview-4.0:4[introspection?]
+	>=gui-libs/amtk-5.0:5[introspection?]
+	>=dev-libs/libxml2-2.5:2
+	app-i18n/uchardet
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.19.6
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	# requires running gvfs-metadata
+	sed -e 's:\(g_test_add_func.*/file/load_save_metadata_sync.*\):/*\1*/:' \
+		-e 's:\(g_test_add_func.*/file/load_save_metadata_async.*\):/*\1*/:' \
+		-e 's:\(g_test_add_func.*/file/set_without_load.*\):/*\1*/:' \
+		-i testsuite/test-file-metadata.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# valgrind checks not ran by default and require suppression files not in locations where they'd be installed by other packages
+	gnome2_src_configure \
+		--enable-gvfs-metadata \
+		--disable-valgrind \
+		$(use_enable introspection)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
index 9604e2b13505..8e6f22fb6141 100644
--- a/gui-libs/wf-config/Manifest
+++ b/gui-libs/wf-config/Manifest
@@ -1,4 +1,6 @@
 DIST wf-config-0.4.1.tar.xz 64752 BLAKE2B ed873ee15b860690a3ac2d8623c0af933f2892c24ff6c9a10ec090bf8e7b2787970b71869c07d5e8281417ed59a4881cf3117ecb085a6d7a1eeb8fdac7375245 SHA512 99d11dfc04e80645cc29491c9ef913015a6ad6f49f351b041b277ecc2e24f9b47fc96a22ce031e51b577fe4b31df07c448d2fafb715e8fe5118e677ccbf9abe8
+DIST wf-config-0.5.0.tar.xz 64760 BLAKE2B c1939035820794828b356371c51dbd55a73a569e3a9dcf801b4aedf61c3c0131e47040a1b05e2a8cd30ecbb57f160f702b735437dfb49051a8a6a63d95201204 SHA512 b365884195cb7fc64a1ca1d74a2d12b56e1ef0f4dd49d298a9379455f2917f2c644de2b12f5068304ca404b112490e38fbfe3111aac31d301f02f23429df87c7
 EBUILD wf-config-0.4.1.ebuild 679 BLAKE2B 258a4d4918c3c5a55a31b905f22e3af4e8361d5e925a69511027b802448020bd93b975d466f3ed7dbdf35611c45dfe70436ce3508777366983935cff2ae506c5 SHA512 d359fce329fd2cc9809e36ae29bb9f4f946333fb3a0e4c77e66bef5d4554bb14ac40d79aac91f1149476fe4f10f6f6ecae1ae405de04a34b494330e43ed63ca8
-EBUILD wf-config-9999.ebuild 677 BLAKE2B a34dbc8b675f9432906844a41d78ff79479f4a0e66bf5850a90e527d4c5417e929116039a6ffbd2bab46b247742f48b01b449d1c8d9256a0fb2ee8b14453c855 SHA512 e3290ade7af238c02e1a913d78318a4179e2cee18a09391e86c9c416546d703f7e22404cca91467759645a0000d7719eb70e24b4ce70b695cb13169471425a34
+EBUILD wf-config-0.5.0.ebuild 669 BLAKE2B 5d621086b5474fc4df6b511f7c14e6f1f49b87b68ea07c8c4529b7716726fc0fdb6c04858be369e5539da51891a7cf7ad1c90959d5963b31146b08d052cd946a SHA512 42858da2886f4effac03454356bb73343edfd7fd20df16d641fb7db09cc8191885233670b82dd955fd49b2a1fd75e5806f8c5e8c49709d569b87172f7d2fc9db
+EBUILD wf-config-9999.ebuild 669 BLAKE2B 5d621086b5474fc4df6b511f7c14e6f1f49b87b68ea07c8c4529b7716726fc0fdb6c04858be369e5539da51891a7cf7ad1c90959d5963b31146b08d052cd946a SHA512 42858da2886f4effac03454356bb73343edfd7fd20df16d641fb7db09cc8191885233670b82dd955fd49b2a1fd75e5806f8c5e8c49709d569b87172f7d2fc9db
 MISC metadata.xml 635 BLAKE2B 9152d0eb342e1cd50821c22beb370e0fb62acb40edefc5f0c2bb8f2c61852239f596975692c6ab6cbb36304a074357ee567f807577facd768025e9452072db4b SHA512 acdaed58e3430342773bec4dff0c0879c371b4cd26fb8ddf84606fd3ab2eee3f4d19b1a471b843e6880d2678f47fdf8533e872c37357639094084a9480cd91ed
diff --git a/gui-libs/wf-config/wf-config-0.5.0.ebuild b/gui-libs/wf-config/wf-config-0.5.0.ebuild
new file mode 100644
index 000000000000..b100b1d861f4
--- /dev/null
+++ b/gui-libs/wf-config/wf-config-0.5.0.ebuild
@@ -0,0 +1,34 @@
+# 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-9999.ebuild b/gui-libs/wf-config/wf-config-9999.ebuild
index 93cc2eacb2c5..b100b1d861f4 100644
--- a/gui-libs/wf-config/wf-config-9999.ebuild
+++ b/gui-libs/wf-config/wf-config-9999.ebuild
@@ -22,14 +22,13 @@ SLOT="0"
 DEPEND="
 	dev-libs/libevdev
 	dev-libs/libxml2
-	~gui-libs/wlroots-9999
+	>=gui-libs/wlroots-0.11.0
 	media-libs/glm
 "
 
 RDEPEND="${DEPEND}"
 
 BDEPEND="
-	${DEPEND}
 	dev-libs/wayland-protocols
 	virtual/pkgconfig
 "
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index d3075bdfdeb2..e1dec9310a61 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,7 +1,9 @@
 AUX wlroots-gcc-10.patch 1020 BLAKE2B a3548355bd2374e590c83b873d1381f76857891aca5372190cf11e5e58bbd5d6909ea204674537bd3c5955cd2ef19d6cc3589dad5520a989dcdcf3ea4a694d07 SHA512 e09695602898104e03a6fa4d05fde2b617ef536460ae0ea1c9a5d35f704fe4d114bc405652f499570593a1b8cc61c5d0bd219bab5529d254f519e73ee23852a1
 DIST wlroots-0.10.0.tar.gz 454540 BLAKE2B 0d2326a62267019001be5f0d79c7b5c937ed20b952c92f0dd8cb04c3a0c06f3ef58723f552b1da1b947ea50ad91df46a543ec9705dad588db800bfa944743d11 SHA512 0e8e0c37f1afb1d99f0ecb3c2282992ffd06381aaa396c7234ead9f3ff2d5c599e766b677680ebaecf68e792054c3e42657d24f32d08bc8bcf35f9eb4bdaa876
 DIST wlroots-0.10.1.tar.gz 455232 BLAKE2B 0f4def61d8501b7746ccc589d59586b3641340fb7633b0c4a7b518f1b1b5285c1ee71fb629aa0a0e649c15a4ae69b5cfbc7a034c96e545765a96ddda35f10609 SHA512 e1af5a5b6484b5f4060090e13d22d699d5aaa6926e1a6b1043d2b900f88a002ed67dacf8498f23ed3008bf8a35500f415f95b3dbcf50de5da354f309f9161d58
+DIST wlroots-0.11.0.tar.gz 481126 BLAKE2B d2262298f24948293643b02c823851b4643289f776bc087d7b67240f4c9c76a7aca03c7dc7e13a65b3d0d3a7c8a5f5246a0e282d2cb3b88bbae0ef94b906f18a SHA512 a8a0c498d10664ff0a5aab8ad1a4fd034179542eff38b058e1da7e4653c42136e4a3586634f3d0a25a985aa7f4c5d17260117d9f4a70a7f8060494c04456f575
 EBUILD wlroots-0.10.0.ebuild 1882 BLAKE2B c438d4d1e895ad8c539ccfd69f32a80ceb609b139e2b14929f6e5d173184e01026978531919805b3602530813ecbbc5abe5393933b1fe34bf374b86f830129f5 SHA512 269a1ec002a5e80bc5384833025135eadba865e106009d214fa24271066344d1a8876d7b1832483a78ffdd59f1b2e2d009c26eeee1370027132ddc16bd12ba7b
 EBUILD wlroots-0.10.1.ebuild 1949 BLAKE2B 3e7e878846b1d2911b3fe2f34483757e48c918fe33ecf7b84cd664992b070bbb96a2e1495a85c7e58631231708384116b251ebf4f5c41f1f1820c6090732ae05 SHA512 28a91c1e0c5ed36e4b6f4c47d8f8609b8762936172b5ad22dd464e76041690930b80dbee5af01d4680ad6215af8ef55aa69cea3fc9e2d98b2e2fbbc58859c29e
-EBUILD wlroots-9999.ebuild 1868 BLAKE2B 0a3ec528911987688a69ac334fc9a4d9c50306e1bfd4df5c7a7a4df6c8bc057f2ff4454e8d3aa21b3217e9b6b8b08620cec6c69d9c7a6e8bcf12ceb46e1f14e6 SHA512 7b00c440de3dea8082e82c52975afefc209495e294bb905be8bce0ea2b42f1546fe5f837c01c456ebeb1d7d7da17c8f3eae5dd2c74ab361721b026126d966f66
+EBUILD wlroots-0.11.0.ebuild 1855 BLAKE2B cdf38296782645752facdb54febb5a75ae7a4577809ce14ec24fb31109193810fecfbaaba16536b7633e86799d480da7426203e61309a02063b0497c0178e3e9 SHA512 5447e589bfa0057b55a2ff918a900357b59ec8ef6f33b5ed81175a32b3305fb9e803d0ba75c307179b86c289cab75d5df057ed89548f89587fcef24be6cee897
+EBUILD wlroots-9999.ebuild 1860 BLAKE2B 620db003337167d00ef9126e5e12b9f391280008d7e1c508d24e5cc46452a68b15d324e2d45e37c9114f41dfa46a86ca2d53fe2932e82352e7aec6f69e4f0288 SHA512 a635e1eb74699bee9827f5cecce4b51a7dec44a4910f001396beea531041ca918c72af92ba28f9ed6ad8fbb100186dcb67d589c695b70a8d930c9c980b08bcae
 MISC metadata.xml 1611 BLAKE2B a52787db83324cc424c28255d7a6db05fa6ea7f92f2d5d7cd6ac4121e89f77b9e642be4ecccdb5b75be2f4ac9b1434f98d40743ae86be8044165f70cc59add65 SHA512 b04fbd1afea30e057f0feea17d05195fb76bf872aa80b5d5d6f20ac47a99c08c3703bee65b2352587a6ac588974a7da375228b439c82f861bdefa41537278a99
diff --git a/gui-libs/wlroots/wlroots-0.11.0.ebuild b/gui-libs/wlroots/wlroots-0.11.0.ebuild
new file mode 100644
index 000000000000..b8e99a306c9e
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.11.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/11"
+IUSE="elogind icccm systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/libinput-1.9.0:0=
+	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-protocols-1.17.0
+	media-libs/mesa[egl,gles2,gbm]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	icccm? ( x11-libs/xcb-util-wm )
+	systemd? ( >=sys-apps/systemd-237 )
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xorg-server[wayland]
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.17
+	>=dev-util/meson-0.54.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		-Dxcb-icccm=$(usex icccm enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+		"-Dexamples=false"
+		"-Dwerror=false"
+	)
+	if use systemd; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 35d3047c671d..6496ad0a75a2 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -23,7 +23,8 @@ REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
 	>=dev-libs/libinput-1.9.0:0=
-	>=dev-libs/wayland-1.17.0
+	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-protocols-1.17.0
 	media-libs/mesa[egl,gles2,gbm]
 	virtual/libudev
 	x11-libs/libdrm
@@ -52,7 +53,6 @@ src_configure() {
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
 		"-Dxcb-errors=disabled"
-		-Dlibcap=$(usex filecaps enabled disabled)
 		-Dxcb-icccm=$(usex icccm enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
diff --git a/gui-libs/xdg-desktop-portal-wlr/Manifest b/gui-libs/xdg-desktop-portal-wlr/Manifest
new file mode 100644
index 000000000000..e5f9cd1ffd1e
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/Manifest
@@ -0,0 +1,2 @@
+EBUILD xdg-desktop-portal-wlr-9999.ebuild 1110 BLAKE2B 095863023783374e704e11ec6d3db643294893b877f39fe3b3c5f430b8380ed26fb8f47a62cf900233e42111d79e7b547d7229e9dd5ab3652940c8a57619674c SHA512 f6e7b15f9500200fef370f44a5abfce0a83ba33b08cdd693ffc1cf246cdc28fae2e6dabad34b9c287f13b2ad1e711e1f98c4c63c89eb130b511d95562ffb54ec
+MISC metadata.xml 347 BLAKE2B acd0b0dd1010eab7fcb18925c58a2f41a53704327e1b2419f2fba11b5f2c84eca044b7c1998fd16744c91e58d8cfaaa0c3e7758a892ba380774ea3132a7a4d92 SHA512 6cc79a37a31c38f1b3ab61124b5489fd0b9bfb5852eff1cc21b2285c2c7a83fcca129c9dd04c491cc33e5bcd6d3798e20d791a440d8612841315249eb29ca591
diff --git a/gui-libs/xdg-desktop-portal-wlr/metadata.xml b/gui-libs/xdg-desktop-portal-wlr/metadata.xml
new file mode 100644
index 000000000000..e797b91ba9cc
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<use>
+		<flag name="elogind">Enable support for rootless session via elogind</flag>
+	</use>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..ee6f4d833661
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 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}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	#KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS=""
+fi
+
+LICENSE="MIT"
+SLOT="0/9999"
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=media-video/pipewire-0.2.9:=
+	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.2.9:=
+	>=dev-libs/wayland-protocols-1.14
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		"-Dwerror=false"
+	)
+	if use systemd; then
+		emesonargs+=("-DHAVE_SYSTEMD=1")
+	else
+		emesonargs+=("-DHAVE_ELOGIND=1")
+	fi
+
+	meson_src_configure
+}