gentoo resync : 16.09.2021

11 files changed, 20 insertions, 120 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index d6615cf22e33..41950c169919 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index fc91a8102824..1c0d4dbed465 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,4 +1,4 @@
 AUX hikari-2.2.1-pkgconfig.patch 2675 BLAKE2B c5313156b4c9fb2871d3c5ee7b0b4532235c9ccf36747d5b6f2b519f1cd9f9fc65b366f404c4c30842286c3656ee75a59ebf214c6b06f4ad3be188d312f9b371 SHA512 d9e782c9bc7038e452a2a2956dd7e812484d8e8cbbd73018dff45a91522594ebd9cfa3e8737b66c143ab7a8cfd04e360b41b9cf4f037a8f215e1986745467378
 DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
 EBUILD hikari-2.2.2-r1.ebuild 1721 BLAKE2B 752691578c78743032d04b5773e6165a384fa83fb2945d8d0b95177cf36605a2e482df839b23fed74a29ee5071bb15b8aff773f45e3de45e765cf49a9296b6f1 SHA512 684e98f99c7a12034bf02b178d75fe0b6086517c1d7b1876036931cb162f52de5fec39e82bff9ba17041abd6b7566fae06e1510094bc81cbb35f56e1c90501be
-MISC metadata.xml 1045 BLAKE2B fcfd7999c8a58b0608cda077a5b0c6e3fe8ed49cd51dc57f22b007bb90b90966f301d846d0ebc97941a9d41a51ddaa0a79d051ec40ccd8a074c516b1a67e281c SHA512 502cc69aa55feee8b926f4848a5aa8291975ed7c33b3f3f1404e9a1768c512cc87c73b25ab402cd023e06034e2e0c4608287252305038119f82325a5d5fde398
+MISC metadata.xml 1046 BLAKE2B 684215385f117eed8604eb2a11be44e52db4618298ef7e0adeef2f5ea605286e87ee92435ae5143d8377368bc0e7410e6055893dd5caabce5e54260327f4d4f2 SHA512 1b7bac644575c4545fc57e72d7ba44d58a8c6c98bf44216cba1d5bddb4e9ebd554aef5f8f6d427f67b48a6d1f87216407b8fd5b49eccc362dfbc3b8705d198a2
diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml
index dbb748db812b..9cd2500a639d 100644
--- a/gui-wm/hikari/metadata.xml
+++ b/gui-wm/hikari/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <longdescription>
         hikari is a minimalistic wayland window manager
diff --git a/gui-wm/metadata.xml b/gui-wm/metadata.xml
index 4d356cb3ba71..0a9936c600ce 100644
--- a/gui-wm/metadata.xml
+++ b/gui-wm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <catmetadata>
 	<longdescription lang="en">
 		The gui-wm category contains various window managers.
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 4efacc8df9ff..3d5629d99135 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,4 +1,4 @@
 DIST sway-1.6.1.tar.gz 5550126 BLAKE2B a4ecc93df0eb16fcd9037ce62dd39c63e1712b3bc9e8ae36331a815759b18576f4a2c1b78a26545922038974f226f02e2d91f78d6e3933125d9b808871b7a887 SHA512 7f37fea99970db42c5485277df06d69bef5225fa03d25be179893b14d73c1d681f0355a1bc74091b4173bbccc88994a63ad0f9322e070811ba963648cf68cdeb
 EBUILD sway-1.6.1-r1.ebuild 2344 BLAKE2B 68447972210cbecf79dbc7fcffdf70296d574c94ca9ccb7270c3f416f41cba7d430c8a0b8655dc52625d3906351c7fa6fe7b3f7ce982d08b04e122f27455707e SHA512 89b0e797a827702c60e4f9c7f81bf283e71803138c4e69230e73bf60979c36b17319475897a48921a80938b54c5dba1106b7674c7dd1a9fd54f263261c97cc76
 EBUILD sway-9999.ebuild 2340 BLAKE2B 57e417902e201901b1b983e3e7ac9e6da4c314cfd43cd676037c689427b88e5e766dce5a75a136230a0bde42e6d1fe2279da2d7cab972b278b1353514f0d3f2a SHA512 a83c7d868f6653d2e15deae9bfc4de6041bb31bfd160e1886572c4d0432956a6e93200d4bf0101b29c8e81178935286943584b4af834ca974ffe9aa7d50d34b0
-MISC metadata.xml 2187 BLAKE2B 700399f0647c77f518c8a3fc48a683e7aa95a734178763d6334a46c319e5ad205d54317ce0081201ceea906f67ef6d3faaf55c685fb03748bc69d4c865f69a32 SHA512 7608895649328cf94587e42977cf7f4e7a98b52bb2ee52d2b98ac3dae303bbf61a769a161b87d1982638843c8a87e586677d232f25133f9e5f640cfd35202e43
+MISC metadata.xml 2188 BLAKE2B 5e8eb1e6cb3ef8e7398972a8a38556674469008a1531a5c44a35e2eb6c4a43ef01d1fe5f39d560c467b300aa3d9237268ae6a7768beccf4fa268563ac7bdd485 SHA512 a59f659d2b575d7db284dae3fe1c784c0ff2824365d8a96455e5cdc9850d20bf0ae66d3129884b15c8fb8a0fdd88316998a504558fa938c0403e1de64b922783
diff --git a/gui-wm/sway/metadata.xml b/gui-wm/sway/metadata.xml
index 62b75a87a154..0f236d0a69f7 100644
--- a/gui-wm/sway/metadata.xml
+++ b/gui-wm/sway/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>bman@gentoo.org</email>
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 7b0a82bd9b70..4bbb36663dd7 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,8 +1,6 @@
 AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d
 AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
-DIST wayfire-0.7.1.tar.xz 753104 BLAKE2B e26b5e770fff44ef04a9d832ed404f05d37448c8ecc0be1e976b8bd0866c2716150bc43394fc4d2fbba1854696eaf54f16dabc632b686f236e66313d0d1eaf59 SHA512 c045ed16d2eb24b508f84d6616021638ec139b99618f5cb834f2b3675d1e549a6cc1bc3150dd97965a16a2a23fe54abe34e4671ce345350a7fb4084f13d7e969
 DIST wayfire-0.7.2.tar.xz 753132 BLAKE2B 0873ff9937cdc7cc63af2c2c365c7e3eed9c0784ab0777e88de9aa373316e9bb1c87a10651d8526577e3da32e402e4d8f6db68d32bc4fcf5513f526751f76829 SHA512 e1321605dbae2b9769a54aaacb0e4a4259b1e2ab4304e8a8c1257f7033b2d740b0632053309ecccc75e04f7b6d2bdf6d68dcebad6950fd914c3052b19bc58e24
-EBUILD wayfire-0.7.1.ebuild 2580 BLAKE2B 09eb5d67feff24b583b0e4ee01daf29648d94cc24e11c3a691180ba669800a37e59d8caf3fdba5bce719c0cd2f56d159324ec01dc3306c4dd90dfefb6a2af01f SHA512 708e46581f1aebb898303b681cb69de80a53991f9f7f0bb8b0ffe130e7993ccaf6cb4d261348b2c6648c2a9f2d4d697e8b13ded6d7da75de5737d809801f4d99
-EBUILD wayfire-0.7.2.ebuild 2313 BLAKE2B c94b3744ee151f14a36753153833f4d6cbb7cf2903206e0a09c5a823212bd26ac2f3fffdda3fb050f0413421008ad35142c0e9e6ad609edb2c02c30927e4df3c SHA512 ce905fb586c3166cb1f356a878d32d554f2bc26b7ac495cd8ef956e353a62b962531d6390612bc52de01f5f859e1af9b8a88199fcda685fa619df0540e50add8
-EBUILD wayfire-9999.ebuild 2239 BLAKE2B ef25ef945f009d6e4cc824fe91fdd5f5c53220b6082299c5b4aee322001765cfc22dcad861c504efa326fd042d8facb8cb0324389aa477379d8032a6268a6d35 SHA512 62aa06ab7ba2f4b26fdcaa93f5c1c2a7ac8a8334a2e99cef923fea1e5217aab19a1f92387ca144d9379c82279e6a47df5ff876dcefc81cfce8d991a99c8c5ef0
-MISC metadata.xml 1080 BLAKE2B 4bdf18556fcdd4e1c5f10e658dc0c7c7237d19d3678b2cd9025f703f29f3faffc1f9c7b1adcf8aa930ad819c932d55281169cec624e05000adeac17eff3caef9 SHA512 fff94cb62f8362b451f1843bf440109e4d4a941c866197cc249e209443ec373e6b7cfb491fadeebdfb84f2165cee3ee58d498c07056f5e8cb4040b9029f41f80
+EBUILD wayfire-0.7.2.ebuild 2335 BLAKE2B 980475ce5d54014c508ffa26b305cae8323b7774e0fa58425ecc89b288b3cef031b5c7719e468e78497964374edfc13af22cf48ef10a7aee7b7ac857560633fa SHA512 63b057d9396dab26389c331f4d73d09680d9f826b83769abaf5ca30c86da0476fc6de71b816bd7bcf15a3d98bef838a8632755296e42cb78633ffa186d4f3b28
+EBUILD wayfire-9999.ebuild 2256 BLAKE2B 3bfd365944660783f21659e8cb7ee60d23687c63a783a566f19df2eaef43698e9faee5de9a229df86169190f3dfc34f3aff2680ff625b2549becaa456e364edd SHA512 24498dcf2c55decf5c37f124f746a39f91643cc75f4bb888f60114fe3d6dc34cea8e2ee1af746b536a432b70b40ab7dc59508a7a496008276aaab71cabdd045d
+MISC metadata.xml 1081 BLAKE2B 906a3e4da3c6737f0d0686a2a927c7519a26beebaf4e7e1e8365f5382db089969c5e43d081bfe6bef7eae2ead1af4a44d53935a1b023a2ba79360d2eb983f930 SHA512 c86ab8b31cff5af7fac0bb8df64b78d0497549d168c24aa37e8c77e3f723aa9ac779f4c01cab37468b5170dbf57d89ad08e4a1e14ec3d401115fffc327325e9d
diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml
index ebb88ce3d365..bc435a800ec8 100644
--- a/gui-wm/wayfire/metadata.xml
+++ b/gui-wm/wayfire/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <longdescription>
         compiz like eye-candy 3D wayland, with low memory footprint.
diff --git a/gui-wm/wayfire/wayfire-0.7.1.ebuild b/gui-wm/wayfire/wayfire-0.7.1.ebuild
deleted file mode 100644
index 10e6172e29cf..000000000000
--- a/gui-wm/wayfire/wayfire-0.7.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="compiz like 3D wayland compositor"
-HOMEPAGE="https://github.com/WayfireWM/wayfire"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
-else
-	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	dev-libs/libevdev
-	dev-libs/libinput
-	gui-libs/gtk-layer-shell
-	media-libs/glm
-	media-libs/mesa:=[gles2,wayland,X?]
-	media-libs/libjpeg-turbo
-	media-libs/libpng
-	media-libs/freetype:=[X?]
-	x11-libs/libdrm
-	x11-libs/gtk+:3=[wayland,X?]
-	x11-libs/cairo:=[X?,svg]
-	X? ( x11-libs/libxkbcommon:=[X] )
-	x11-libs/pixman
-	gles? ( media-libs/libglvnd[X?] )
-	system-wfconfig? (
-		>=gui-libs/wf-config-0.7.1
-		<gui-libs/wf-config-0.8.0
-	)
-	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? (
-		>=gui-libs/wlroots-0.13.0:=[elogind=,systemd=,X?]
-		<gui-libs/wlroots-0.14.0:=
-	)
-	!system-wlroots? ( !gui-libs/wlroots )
-"
-
-RDEPEND="
-	${DEPEND}
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-	x11-misc/xkeyboard-config
-"
-
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-"
-
-src_configure() {
-	sed -e "s:@EPREFIX@:${EPREFIX}:" \
-	    "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
-	sed -e "s:@EPREFIX@:${EPREFIX}:" \
-	    "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
-	local emesonargs=(
-		$(meson_feature system-wfconfig use_system_wfconfig)
-		$(meson_feature system-wlroots use_system_wlroots)
-		$(meson_feature X xwayland)
-		$(meson_use gles enable_gles32)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	default
-	meson_src_install
-	dobin "${T}"/wayfire-session
-	einstalldocs
-
-	insinto "/usr/share/wayland-sessions/"
-	insopts -m644
-	doins wayfire.desktop
-	doins "${T}"/wayfire-session.desktop
-
-	dodoc wayfire.ini
-
-	if ! use systemd && ! use elogind; then
-		fowners root:0 /usr/bin/wayfire
-		fperms 4511 /usr/bin/wayfire
-	fi
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Wayfire has been installed but the session cannot be used"
-		elog "until you install a configuration file. The default config"
-		elog "file is installed at \"/usr/share/doc/${PF}/wayfire.ini.bz2\""
-		elog "To install the file execute"
-		elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini"
-	fi
-}
diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild
index f0a550b499df..91bd59b30f01 100644
--- a/gui-wm/wayfire/wayfire-0.7.2.ebuild
+++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
 else
 	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
@@ -35,7 +35,10 @@ DEPEND="
 	x11-libs/cairo:=[X?,svg]
 	x11-libs/libxkbcommon:=[X?]
 	x11-libs/pixman
-	X? ( x11-libs/libxcb )
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb
+	)
 	system-wfconfig? (
 		>=gui-libs/wf-config-0.7.1
 		<gui-libs/wf-config-0.8.0
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index ed76917f7d82..01dc7698d0f2 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -35,7 +35,10 @@ DEPEND="
 	x11-libs/cairo:=[X?,svg]
 	x11-libs/libxkbcommon:=[X?]
 	x11-libs/pixman
-	X? ( x11-libs/libxcb )
+	X? (
+		x11-libs/libxcb
+		x11-base/xwayland
+	)
 	system-wfconfig? ( ~gui-libs/wf-config-9999:= )
 	!system-wfconfig? ( !gui-libs/wf-config )
 	system-wlroots? ( ~gui-libs/wlroots-9999:=[X?] )
@@ -54,9 +57,9 @@ BDEPEND="
 
 src_configure() {
 	sed -e "s:@EPREFIX@:${EPREFIX}:" \
-	    "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+		"${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
 	sed -e "s:@EPREFIX@:${EPREFIX}:" \
-	    "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
+		"${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
 	local emesonargs=(
 		$(meson_feature system-wfconfig use_system_wfconfig)
 		$(meson_feature system-wlroots use_system_wlroots)