gentoo (valentine's day) resync : 14.02.2021

16 files changed, 168 insertions, 21 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 33f8f4ec4ac6..652926780eb4 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/display-manager-init/Manifest b/gui-libs/display-manager-init/Manifest
index 24989ab214af..85de95cb1e32 100644
--- a/gui-libs/display-manager-init/Manifest
+++ b/gui-libs/display-manager-init/Manifest
@@ -1,7 +1,8 @@
 AUX display-manager-setup.initd 224 BLAKE2B 8513295b8c315d71521ac24fc9da1878e32044ebe7b6e37afb77a25eb8ec449568a82e516fd04de7fb2b0f0b5ff355a54a257041616d0035b25d0ae191e336e4 SHA512 d0048fc5b3c0fd92a44b71f7b8132e35787e42095c22f53aa41c10505c219eb25015f76163069aab7ebb6f0ac9feeac62d1b74682fd3947e835ea5de36957727
 AUX display-manager.confd 608 BLAKE2B 814b4d36ce74d2f70a771cda31c3b9f6e21246bef681607d2687b3ed51f1baab8752fe94ad1021b9fd81b3e8444a328d2c1de83718534ea722ef9dadcbdca164 SHA512 40fb28fb6ac06b59fed9fec86816a444f53ea499bb9a7e7a072a5a932b45a29f830b9da9de0954b1f5cb21903c08ff5c997db2e32ee0bb1a300cd6c070cc8aa6
-AUX display-manager.initd 6145 BLAKE2B fb1debd71978b157c185d9a7065c7f630a0d64839652b3882e6f69823444694f4a7fb347a49dcff35c11a9df94b5e8dcc85eac8351ce9a9992c23a13e67eb669 SHA512 5ea8c89d29c03ebf814a5bd036387bf9d8e65962f402b6ea2ce26e3c99f2972fc971b3b6e5e6971a3f1dc559a6d0ddf8b7f5b7f2170bafacfa79653cf3c5445d
+AUX display-manager.initd-r1 6201 BLAKE2B d30dd3c2cfc651c48e4f5a25ddae401894c994286fd5dd5c3668de92e107fdd36a7c14d47f0c080854004aaf6f9cfe7e0a41abee552a69077ed4c795ce834623 SHA512 fdef2ff2eedda6c0b262f5f1fa4b0f3c9bea56b575956b308c2fd145eba204c3cf9f336b6348cc12dd342bcbb64ed2e49f3f82c143249d74c922ac472b786851
 AUX startDM 786 BLAKE2B c5026e862508e598a0b3e8940a5dffd697fecc109eef343ea0f91d72b1b6df927dd273a1e69cddbae7324b707c9cc7b2f2699c44d106100f2b32db28c331f331 SHA512 a35ef86109624f5adb4275906f8466ef8e7a62af93bf2038b5f44e713b446264f1ecb00ff8bb7bb498a89bdbf3b96e50ebf5a7a39471c3c4395506c92f907dcd
 AUX xdm.initd 200 BLAKE2B ec997b7080037a7197a6f75728d9075c846168115d705015afc6518e1e72d815cdf87c2e9e3f3ad950034599e548d015e530cb7821f83b9d289337908455c17a SHA512 4552215cc2cdffa3298a9136e2a22f600f55958d7f74b2d06bbf48568d8034ef24deea27ad9f8d6d100516b0efb4e2688c1f454dc556120f759b1da7fecd877c
-EBUILD display-manager-init-1.0.ebuild 1097 BLAKE2B e053ed6307efcfb8bfd28e031d675cfcf0283fe228eb61429c546568d902687d1ffc651195b15468c7dc56adbc0fff33c7dde0ed92203cda243ec5422fe62849 SHA512 97bd4912687bf6854c1837688ee90ada622857ea7c5fa9913d79d48b1523bd486becdf3a9b7810bd3ef11d9f43ed152a70fb159544b6e9cae11bb09d088334b8
-MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
+EBUILD display-manager-init-1.0-r1.ebuild 1643 BLAKE2B 710562e058ccc71a7a1a3dcf8fa902e0d51cf45ccc0f0667d55b347228256d28fc6a05257dc8800133dbe0e2fa1c06e1c9ecc1af4dbb1e69f00b2c5d0080aa15 SHA512 001d37f515186d70e4fe9314e2917935e4447b682ad6a9557c43f2ed3f45704faf42a30071748b3bfb5d26bf82605500adaa7b0e688522ad31ddbad1cc8c4d58
+EBUILD display-manager-init-1.0-r2.ebuild 1678 BLAKE2B 5802fc8de7652abf1317fac29763209c166406e40850beb11ee68b78020f475ef0079e1d48de50b5cb21ac94b81a45ab7259c11411c0b0378c89b2683ec0857e SHA512 3a267dfc891555d48e0e57bd3c362100f20cc2378a1d184914cc18344495064d5d7575cf6ed162fb5a9abd88fcf70ed53ffdf235943945b046546e94d4dd1fc4
+MISC metadata.xml 258 BLAKE2B 4597deb2f1355078e78791baad22d30ec067357a50f01a817b3fdd239e794a4255ac4e59908b7d9d2e276e455fd352320ab46f37dbfd7df036f64c0bf3cc4900 SHA512 d97af5111022f569340bb378949f4f70ab33607c1d5dc027eff7d64a7a2ed64238710f8bfb623e01e01d48c7b1db60318ac340b8a4279d7fa6984f35a083b2a8
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild
index 576a0a7c887c..d5a588002df3 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,10 +7,10 @@ DESCRIPTION="RC init files for starting display and login managers"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
-S="${FILESDIR}"
+S="${WORKDIR}"
 
 RDEPEND="
 	sys-apps/gentoo-functions
@@ -21,7 +21,7 @@ RDEPEND="
 
 src_install() {
 	newinitd "${FILESDIR}"/display-manager-setup.initd display-manager-setup
-	newinitd "${FILESDIR}"/display-manager.initd display-manager
+	newinitd "${FILESDIR}"/display-manager.initd-r1 display-manager
 	newinitd "${FILESDIR}"/xdm.initd xdm
 	newconfd "${FILESDIR}"/display-manager.confd display-manager
 	exeinto /usr/bin
@@ -32,6 +32,23 @@ src_install() {
 
 pkg_preinst() {
 	if [[ ${REPLACING_VERSIONS} == "" && -f "${EROOT}"/etc/conf.d/xdm && ! -f "${EROOT}"/etc/conf.d/display-manager ]]; then
-		mv "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
+		cp -a "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
+	fi
+	local rlevel using_xdm
+	using_xdm=no
+	for rlevel in boot default sysinit; do
+		if [[ -e "${EROOT}"/etc/runlevels/${rlevel}/xdm ]]; then
+			using_xdm=yes
+		fi
+	done
+	if [[ "${using_xdm}" = "yes" ]]; then
+		ewarn "The 'xdm' service has been replaced by new 'display-manager'"
+		ewarn "service, please switch now:"
+		ewarn
+		ewarn "  # rc-update del xdm default"
+		ewarn "  # rc-update add display-manager default"
+		ewarn
+		ewarn "Remember to run etc-update or dispatch-conf to update the"
+		ewarn "config protected service files."
 	fi
 }
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild
new file mode 100644
index 000000000000..3c54378da256
--- /dev/null
+++ b/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="RC init files for starting display and login managers"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	sys-apps/gentoo-functions
+	!<=sys-apps/sysvinit-2.98
+	!<=x11-apps/xinit-1.4.1
+	!<=x11-base/xorg-server-1.20.10
+	!=x11-base/xorg-server-1.20.10-r2
+"
+
+src_install() {
+	newinitd "${FILESDIR}"/display-manager-setup.initd display-manager-setup
+	newinitd "${FILESDIR}"/display-manager.initd-r1 display-manager
+	newinitd "${FILESDIR}"/xdm.initd xdm
+	newconfd "${FILESDIR}"/display-manager.confd display-manager
+	exeinto /usr/bin
+	doexe "${FILESDIR}"/startDM
+	# backwards compatibility
+	dosym "${ESYSROOT}"/usr/bin/startDM /etc/X11/startDM.sh
+}
+
+pkg_preinst() {
+	if [[ ${REPLACING_VERSIONS} == "" && -f "${EROOT}"/etc/conf.d/xdm && ! -f "${EROOT}"/etc/conf.d/display-manager ]]; then
+		cp -a "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
+	fi
+	local rlevel using_xdm
+	using_xdm=no
+	for rlevel in boot default sysinit; do
+		if [[ -e "${EROOT}"/etc/runlevels/${rlevel}/xdm ]]; then
+			using_xdm=yes
+		fi
+	done
+	if [[ "${using_xdm}" = "yes" ]]; then
+		ewarn "The 'xdm' service has been replaced by new 'display-manager'"
+		ewarn "service, please switch now:"
+		ewarn
+		ewarn "  # rc-update del xdm default"
+		ewarn "  # rc-update add display-manager default"
+		ewarn
+		ewarn "Remember to run etc-update or dispatch-conf to update the"
+		ewarn "config protected service files."
+	fi
+}
diff --git a/gui-libs/display-manager-init/files/display-manager.initd b/gui-libs/display-manager-init/files/display-manager.initd-r1
index e650df9600e8..9402e969f4a5 100644
--- a/gui-libs/display-manager-init/files/display-manager.initd
+++ b/gui-libs/display-manager-init/files/display-manager.initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
 # This is here to serve as a note to myself, and future developers.
@@ -46,9 +46,11 @@ depend() {
 	# (#291269) Start after quota, since some dm need readable home
 	# (#390609) gdm-3 will fail when dbus is not running
 	# (#366753) starting keymaps after X causes problems
+	# (#768834) race condition with elogind
 	after bootmisc consolefont modules netmount
 	after readahead-list ypbind autofs openvpn gpm lircmd
 	after quota keymaps
+	after elogind
 	before alsasound
 
 	# Start before GUI
diff --git a/gui-libs/display-manager-init/metadata.xml b/gui-libs/display-manager-init/metadata.xml
index 7a7bbf810544..303dfce27f8c 100644
--- a/gui-libs/display-manager-init/metadata.xml
+++ b/gui-libs/display-manager-init/metadata.xml
@@ -5,4 +5,5 @@
 		<email>x11@gentoo.org</email>
 		<name>X11</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index 732cd9e8842b..a64e98f50e15 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,3 +1,3 @@
 DIST libwpe-1.8.0.tar.xz 51260 BLAKE2B d5f5249e3fffba03a0e87e6a8b2a261e426dc25c2a57d5e060d81f7618e957884c1c74a86a79216d4e5e85f9e173e7629be9c6a674898b20e701fd59d487bd32 SHA512 38b02d97f9ee40a1bb345ba0766acd1852500c704447bde224ac79f41e91abc06fb3047119f9843a11c78cdd5899287ab86ccedbcaefb51e366a1810f2f42fa8
-EBUILD libwpe-1.8.0.ebuild 579 BLAKE2B c45bbab88c62dcc3d07c0ba9cc294b2156f7aef9d19b2899c3003b0e1104fd8aa4917e114c86425c404498527dc47d7b2f75f5f1a28f9b7a21e83d9c3009f090 SHA512 aca65332f9a002e9da94b21da16439d529200adf6afb3a5f8dbd8f5007df8a6338826a9feb0c4212f5b5f34a3afdf35d36eb1f4034e3b19e44573058f422d018
+EBUILD libwpe-1.8.0.ebuild 578 BLAKE2B 02f5854326a78a43559883731c4f0756fe3d33c5ab06dc646ab39a43b1b87e9ebda544622d17430dd20c6eddf40366252f0f099eac383ace236401cb4181319a SHA512 b9e8cba85bf9febfc58810f1501121715638d3f404f1cf5ad1050908cf8baf3e472954566678115c917131b9784ab624874b75e72f5072fcbdec4339313898ac
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/libwpe/libwpe-1.8.0.ebuild b/gui-libs/libwpe/libwpe-1.8.0.ebuild
index 4394cfb0a82b..989e6d4828af 100644
--- a/gui-libs/libwpe/libwpe-1.8.0.ebuild
+++ b/gui-libs/libwpe/libwpe-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/mesa[egl]
diff --git a/gui-libs/wayfire-plugins-extra/Manifest b/gui-libs/wayfire-plugins-extra/Manifest
index d515603bb07a..b23f32f70e31 100644
--- a/gui-libs/wayfire-plugins-extra/Manifest
+++ b/gui-libs/wayfire-plugins-extra/Manifest
@@ -1,4 +1,6 @@
 DIST wayfire-plugins-extra-0.6.0.tar.gz 47411 BLAKE2B 32f784abff6b0f05cdfde0bd491e6c8321eb6038f5ac49ff5b241e628abfb0002289fac6f1deaef4148fd8e071ad08c54ea15a441f9d6356ca43bbf4beb9c7b6 SHA512 2ad35cc54892cf716e8492227f96cab7eb89173294ef928115ca998c8c06e9daef69f60d6d11c5393a3038ded0184ccaa404552fe6035a019682d2fdbe4b768d
+DIST wayfire-plugins-extra-0.7.0.tar.xz 74312 BLAKE2B f72d706502499e4d467a4b59e10f66628024be1bab1c5e10c807758869c9b9e4aacbe426c2db0e3faa5ab166f7e4f4d0f1c345e205c6747a16a164745c6f0d74 SHA512 ff25a4685c88ca0129a2372b216166246cab072c2cb4f84eb7bd500db525bf5881bd7e54d0d888473d4aab0e5b33d2ee13eb7f788bb2a524e1e8e0c5efc1a6bd
 EBUILD wayfire-plugins-extra-0.6.0.ebuild 688 BLAKE2B 472cbfa68a581af6bf9a2cde259aac056dc7ce55fa21d348e4910bf00237049f8311465301b859b6335f1b834a6e1c026f2d3212eb03e68f7cfd1b54b8ff1126 SHA512 808abd51fd9b20faad08f2e55d7cf71790a49714834a61509f681e804175ed3557a0fdfd74a56f3a01a05f22aee8359ed9a27489406d23c073bb7e56ccbf0b4b
-EBUILD wayfire-plugins-extra-9999.ebuild 688 BLAKE2B 472cbfa68a581af6bf9a2cde259aac056dc7ce55fa21d348e4910bf00237049f8311465301b859b6335f1b834a6e1c026f2d3212eb03e68f7cfd1b54b8ff1126 SHA512 808abd51fd9b20faad08f2e55d7cf71790a49714834a61509f681e804175ed3557a0fdfd74a56f3a01a05f22aee8359ed9a27489406d23c073bb7e56ccbf0b4b
+EBUILD wayfire-plugins-extra-0.7.0.ebuild 688 BLAKE2B d7e4a3505a83c0428415cc7748fc4aea0657403a8b4f9dbcccc2968a2267bb7a9b419bc4cd686971838ffa1109953c9ed66ae785a2d95ecde7e91c1d1c582b4b SHA512 6cf76150e89ff25309f30c5fb923c4a790117c0a4b559c4a97d1a07e97ea4e30f5d56a763b207c188c8962e74654dce99e0c036c9a0f3c2c7efaeae73b28b77f
+EBUILD wayfire-plugins-extra-9999.ebuild 688 BLAKE2B d7e4a3505a83c0428415cc7748fc4aea0657403a8b4f9dbcccc2968a2267bb7a9b419bc4cd686971838ffa1109953c9ed66ae785a2d95ecde7e91c1d1c582b4b SHA512 6cf76150e89ff25309f30c5fb923c4a790117c0a4b559c4a97d1a07e97ea4e30f5d56a763b207c188c8962e74654dce99e0c036c9a0f3c2c7efaeae73b28b77f
 MISC metadata.xml 395 BLAKE2B a08fac50820a592a0c79a1f7b376099208b70506a6d6c5badaf9c06c45639f366d8fbe17b42d8c5f0481ef5411b7ba4e6f675c917333e8dc5aaedcf5ff9a0381 SHA512 8837eddafde633e308bf550a194e21ec15fa7275a23e2fb7677e33f45d2054969a6be7059b7f0c016c376cf79ef9aaed698a63ebaf6a5a653f098d2ac2dcbeab
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
new file mode 100644
index 000000000000..cc17eb4c723e
--- /dev/null
+++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="extra plugins for wayfire"
+HOMEPAGE="https://github.com/WayfireWM/wayfire-plugins-extra"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+	dev-cpp/glibmm
+	>=gui-libs/wlroots-0.11.0
+	>=gui-wm/wayfire-${PV%.*}
+	x11-libs/cairo
+"
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+"
diff --git a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
index 74ef87cc7523..cc17eb4c723e 100644
--- a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
+++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WayfireWM/wayfire-plugins-extra.git"
 else
-	SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
index d8a4cffd3f18..ba86fb07399d 100644
--- a/gui-libs/wf-config/Manifest
+++ b/gui-libs/wf-config/Manifest
@@ -1,6 +1,8 @@
 DIST wf-config-0.5.0.tar.xz 64760 BLAKE2B c1939035820794828b356371c51dbd55a73a569e3a9dcf801b4aedf61c3c0131e47040a1b05e2a8cd30ecbb57f160f702b735437dfb49051a8a6a63d95201204 SHA512 b365884195cb7fc64a1ca1d74a2d12b56e1ef0f4dd49d298a9379455f2917f2c644de2b12f5068304ca404b112490e38fbfe3111aac31d301f02f23429df87c7
 DIST wf-config-0.6.0.tar.xz 65360 BLAKE2B 130a8752e311863642d68c44ef6696bb4b6795775d538f79b26130d611035ecc399757b1fdad0d8984fb79ea66d14aad2b8fe14fea5a42e6acf4de69132ba121 SHA512 f6c954fe0aee47074cab4c50bdafba82fe01f502eac3154da3ff94cf69b235ed7f7af10ad56a17dbca44b0b472c6b87e0513eae12a86d64cf10fdfc365242403
+DIST wf-config-0.7.0.tar.xz 73332 BLAKE2B 709a9358e564538b9db8536a5e24f2e7843498830e643ed005801624de9f71ad2661824de75f5b57541ece99d525a4689048c990df5ddc3fdcee6fc83c03e490 SHA512 ddad687b180e786060839cafe5623a0897ade061e6ad057dbe579d51595fbf2dc45674df3fb35070520dc51d7e02d4c9158d9cf8d4619ac49334014f6701f06d
 EBUILD wf-config-0.5.0.ebuild 668 BLAKE2B ee167eaf5b8991981e513e91e75dbe55e122486a823b15a9763cad4266c5e8f18ddf9814eaeb38601e579513a52114166d65f64067b1b9397f4b1a64f91b0a31 SHA512 4979a6365da9f206276e6c862466df1b16e1e4451d2d3fe17ae73de0cd920c5e0d0347bb97d550a65ecb78cda0dacfa487b4b5142342576dd963a8154eed4868
 EBUILD wf-config-0.6.0.ebuild 669 BLAKE2B 62e45d51784a4c62929dcc761b150fce817f0b4dfe95046e9a8da73ce6c430870bb0786a31bb008468260df3db6af47d38917820498973cde102f4258d3a912d SHA512 3af3d010eece7b17766e551a2f7cca2fbd4f4da680e521405972084bf1dfa993667df9edf9f85ab1123a50f0e9c489fdbe9459fcaf36249b780f2630bb834036
-EBUILD wf-config-9999.ebuild 669 BLAKE2B 62e45d51784a4c62929dcc761b150fce817f0b4dfe95046e9a8da73ce6c430870bb0786a31bb008468260df3db6af47d38917820498973cde102f4258d3a912d SHA512 3af3d010eece7b17766e551a2f7cca2fbd4f4da680e521405972084bf1dfa993667df9edf9f85ab1123a50f0e9c489fdbe9459fcaf36249b780f2630bb834036
+EBUILD wf-config-0.7.0.ebuild 670 BLAKE2B 5fe30b569fc393d7b34d0bb4a1b5f0abbe3f2994e79e222fe22307aee573180c3a7cfcbd0c5ae8854c7323219b43f72a300df2899706194a2834ddd8a2923cb8 SHA512 b6fb0df3ab0b53b21ba6e2a108e4e602107e31c2915a7817067c3db2f8c1ffff45b6d672d1dda64152adddaf7b9ef6eb579fa0ec5539ee8152a5e0e1c21d717d
+EBUILD wf-config-9999.ebuild 670 BLAKE2B 5fe30b569fc393d7b34d0bb4a1b5f0abbe3f2994e79e222fe22307aee573180c3a7cfcbd0c5ae8854c7323219b43f72a300df2899706194a2834ddd8a2923cb8 SHA512 b6fb0df3ab0b53b21ba6e2a108e4e602107e31c2915a7817067c3db2f8c1ffff45b6d672d1dda64152adddaf7b9ef6eb579fa0ec5539ee8152a5e0e1c21d717d
 MISC metadata.xml 635 BLAKE2B 9152d0eb342e1cd50821c22beb370e0fb62acb40edefc5f0c2bb8f2c61852239f596975692c6ab6cbb36304a074357ee567f807577facd768025e9452072db4b SHA512 acdaed58e3430342773bec4dff0c0879c371b4cd26fb8ddf84606fd3ab2eee3f4d19b1a471b843e6880d2678f47fdf8533e872c37357639094084a9480cd91ed
diff --git a/gui-libs/wf-config/wf-config-0.7.0.ebuild b/gui-libs/wf-config/wf-config-0.7.0.ebuild
new file mode 100644
index 000000000000..26f5dea6385b
--- /dev/null
+++ b/gui-libs/wf-config/wf-config-0.7.0.ebuild
@@ -0,0 +1,34 @@
+# 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-9999.ebuild b/gui-libs/wf-config/wf-config-9999.ebuild
index fdcbe17d4da5..26f5dea6385b 100644
--- a/gui-libs/wf-config/wf-config-9999.ebuild
+++ b/gui-libs/wf-config/wf-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 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"
+	SRC_URI="https://github.com/WayfireWM/wf-config/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index fb4827b7cd90..62583c619b96 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,3 +1,3 @@
 DIST wpebackend-fdo-1.8.0.tar.xz 42520 BLAKE2B 885a1eee84d040e176a4f9d06e3cd527a6f619c3a85f19f2331b18a84460a102692aec3f3a1a5eff96e9fe858aa45df5ab5785db5c8c71f76cee5dc3a49f0338 SHA512 e885a169e89f90bdd38149894406af368ddd951a17612975a459bd958fef3adf46f39f80c2264a9a2eae965984a8f1f61b36440836780e73cb4e7b8f433335a6
-EBUILD wpebackend-fdo-1.8.0.ebuild 635 BLAKE2B 64d60a47c52a1b3ce92db12658f5514199612825839543fea55cf406e20466e1f6dd2bc902d7f444409a90d7f26ee462d672a3f132b92c571330cd995df72c75 SHA512 9f5191147af77e25591d027461bcfd6de44d97750ab993919cf82efb0febf7a7ccb3f41b25ea019dd64a8f9fe4f43347f2b5e8258eb9de9e1a8e1b3410a51616
+EBUILD wpebackend-fdo-1.8.0.ebuild 634 BLAKE2B a047c20e6f34d3b3d22c705b03b7e39e9783d6960998e5b945ab5fdf53a56017cb4f2e70797de27aa1c63233951ded0f7de89517d0121223d3fa6d5673537a98 SHA512 cb410716a72123d7e64dc1852970c8aec1e2fcfa42f5b6096d6aa8bf5835bab434224f840cc33d58dfd574ca6f884913b3164dbe6faebe0babecb21ad14834b3
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
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 7ac3f00cdb61..4e9149712be5 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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]