gentoo resync : 25.09.2021

7 files changed, 86 insertions, 11 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 41950c169919..155b71cc8d89 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 1c0d4dbed465..bb5bea8d2be8 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,4 +1,6 @@
 AUX hikari-2.2.1-pkgconfig.patch 2675 BLAKE2B c5313156b4c9fb2871d3c5ee7b0b4532235c9ccf36747d5b6f2b519f1cd9f9fc65b366f404c4c30842286c3656ee75a59ebf214c6b06f4ad3be188d312f9b371 SHA512 d9e782c9bc7038e452a2a2956dd7e812484d8e8cbbd73018dff45a91522594ebd9cfa3e8737b66c143ab7a8cfd04e360b41b9cf4f037a8f215e1986745467378
 DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
+DIST hikari-2.3.2.tar.gz 1022093 BLAKE2B 8e4df4377728cc1feab3509588a9f2d5138af6e3175682672eedce4ca45d5bb9b7e56568a860871b319b3ff1213468f38f0b6253927f6ab4b905dd495c05c53e SHA512 b7485be089064dd19c4614f60066b3f7b2f322328fa771d4383db27656695746fb00ab534cc754929141c23b7556992391529e537e0522080177068f3d0e2954
 EBUILD hikari-2.2.2-r1.ebuild 1721 BLAKE2B 752691578c78743032d04b5773e6165a384fa83fb2945d8d0b95177cf36605a2e482df839b23fed74a29ee5071bb15b8aff773f45e3de45e765cf49a9296b6f1 SHA512 684e98f99c7a12034bf02b178d75fe0b6086517c1d7b1876036931cb162f52de5fec39e82bff9ba17041abd6b7566fae06e1510094bc81cbb35f56e1c90501be
-MISC metadata.xml 1046 BLAKE2B 684215385f117eed8604eb2a11be44e52db4618298ef7e0adeef2f5ea605286e87ee92435ae5143d8377368bc0e7410e6055893dd5caabce5e54260327f4d4f2 SHA512 1b7bac644575c4545fc57e72d7ba44d58a8c6c98bf44216cba1d5bddb4e9ebd554aef5f8f6d427f67b48a6d1f87216407b8fd5b49eccc362dfbc3b8705d198a2
+EBUILD hikari-2.3.2.ebuild 1422 BLAKE2B 312e7affe946ab5060348d2ed20e35b42d69298f9aec161b0652826ec92a46eb88e2fee51aa2ad644558d3ed2872bfde290be7d91424ed2b57f44966f92ea01b SHA512 09a16c5af0ed7239de799464c33021acb5acede8e28831fac0f68ad21167c575e7f3ce63f221578fc7d8581be37842d08a8f47f658e5e9c2dd10a36c4a30d610
+MISC metadata.xml 1123 BLAKE2B 87bac2642347d19894041219a36a4dd0cdd74ff8f7715de61a57076db05734d343bc4a8c97cf2ed60ed170f00a1c6bbf96308198cbf5cc4db3649a52593b4835 SHA512 ca3221cd78298350f5cc7097ba029b69901f3bdcb45c405ce6b2db48dea3e9f1cb79eaed4f7839bb9c14e6f603c5d0a2a728f5d10c9966f210e01f1237109227
diff --git a/gui-wm/hikari/hikari-2.3.2.ebuild b/gui-wm/hikari/hikari-2.3.2.ebuild
new file mode 100644
index 000000000000..119bd1fe8f0c
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.3.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="Wayland compositor inspired by CWM"
+HOMEPAGE="https://hikari.acmelabs.space/"
+SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X suid"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/libinput:=
+	dev-libs/libucl
+	dev-libs/wayland
+	gui-libs/wlroots:0/14[X?]
+	sys-libs/pam
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-misc/xkeyboard-config"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/wayland-protocols"
+BDEPEND="
+	dev-util/wayland-scanner
+	sys-devel/bmake
+	virtual/pkgconfig"
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+
+	local bmake=(
+		bmake -j$(makeopts_jobs)
+		ETC_PREFIX="${EPREFIX}"
+		CFLAGS_EXTRA="${CFLAGS} ${CPPFLAGS}"
+		LDFLAGS_EXTRA="${LDFLAGS}"
+		VERSION=${PV}
+		-DWITH_GAMMACONTROL
+		-DWITH_LAYERSHELL
+		-DWITH_POSIX_C_SOURCE
+		-DWITH_SCREENCOPY
+		-DWITH_VIRTUAL_INPUT
+		$(usev X -DWITH_XWAYLAND)
+	)
+
+	# empty flags to avoid duplicates (some parts use only _EXTRA, others both)
+	echo "${bmake[*]}"
+	CFLAGS= LDFLAGS= "${bmake[@]}" || die
+}
+
+src_install() {
+	local bmake=(
+		bmake install
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		ETC_PREFIX="${EPREFIX}"
+		$(usev suid -DWITH_SUID)
+	)
+
+	echo "${bmake[*]}"
+	"${bmake[@]}" || die
+}
diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml
index 9cd2500a639d..8446f7621df3 100644
--- a/gui-wm/hikari/metadata.xml
+++ b/gui-wm/hikari/metadata.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <longdescription>
-        hikari is a minimalistic wayland window manager
-        based on wlroots trying inspired by the simplicity
-        of CWM in the X days. It aims stay out of your way
-        and focus more on the task than the windows.
-    </longdescription>
     <maintainer type="person" proxied="yes">
         <email>gentoo@aisha.cc</email>
         <name>Aisha Tammy</name>
@@ -15,7 +9,14 @@
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
+    <longdescription>
+        Hikari is a minimalistic wayland window manager
+        based on wlroots trying inspired by the simplicity
+        of CWM in the X days. It aims stay out of your way
+        and focus more on the task than the windows.
+    </longdescription>
     <use>
+        <flag name="X">Enable support for X11 applications (XWayland)</flag>
         <flag name="gamma">add gamma control for redshift</flag>
         <flag name="layershell">add support for wayland apps using layer shell</flag>
         <flag name="screencopy">add support for screen grabbing</flag>
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 4bbb36663dd7..acb366684dd4 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,6 +1,6 @@
 AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d
 AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
 DIST wayfire-0.7.2.tar.xz 753132 BLAKE2B 0873ff9937cdc7cc63af2c2c365c7e3eed9c0784ab0777e88de9aa373316e9bb1c87a10651d8526577e3da32e402e4d8f6db68d32bc4fcf5513f526751f76829 SHA512 e1321605dbae2b9769a54aaacb0e4a4259b1e2ab4304e8a8c1257f7033b2d740b0632053309ecccc75e04f7b6d2bdf6d68dcebad6950fd914c3052b19bc58e24
-EBUILD wayfire-0.7.2.ebuild 2335 BLAKE2B 980475ce5d54014c508ffa26b305cae8323b7774e0fa58425ecc89b288b3cef031b5c7719e468e78497964374edfc13af22cf48ef10a7aee7b7ac857560633fa SHA512 63b057d9396dab26389c331f4d73d09680d9f826b83769abaf5ca30c86da0476fc6de71b816bd7bcf15a3d98bef838a8632755296e42cb78633ffa186d4f3b28
-EBUILD wayfire-9999.ebuild 2256 BLAKE2B 3bfd365944660783f21659e8cb7ee60d23687c63a783a566f19df2eaef43698e9faee5de9a229df86169190f3dfc34f3aff2680ff625b2549becaa456e364edd SHA512 24498dcf2c55decf5c37f124f746a39f91643cc75f4bb888f60114fe3d6dc34cea8e2ee1af746b536a432b70b40ab7dc59508a7a496008276aaab71cabdd045d
+EBUILD wayfire-0.7.2.ebuild 2342 BLAKE2B 823b3d959faff147f4f01c51236266bf2829d0a2344c7d015a1f036da7bc1b996e5aed6baa8ec4aaed7b4765cab94b744f9616e879821d0d3f911214f3f2e11b SHA512 4b1001eacd07c5ce6f12b1ee7155e7b7106398f8c1d1a3ab6ab4aae3c5ead84aea87a2e841c9f28608f121ce788b7c2358d9f105fcb2fb60e69d2b4309c6ca15
+EBUILD wayfire-9999.ebuild 2263 BLAKE2B bba88bf217d1661ada3f9177a607f454eb914beb8d299244b88efa773691463252f35f3468bf397e671bdc12e2472e54a1daced6425635807a89aafea67120e8 SHA512 c751385967cac35b4d9246d0c806a54ef37848c8bab751686fd2b35371c1659fbc1f36acb93c96dea3fa1b47b2fae4e33d06c2281706821c99c3b72421cfb919
 MISC metadata.xml 1081 BLAKE2B 906a3e4da3c6737f0d0686a2a927c7519a26beebaf4e7e1e8365f5382db089969c5e43d081bfe6bef7eae2ead1af4a44d53935a1b023a2ba79360d2eb983f930 SHA512 c86ab8b31cff5af7fac0bb8df64b78d0497549d168c24aa37e8c77e3f723aa9ac779f4c01cab37468b5170dbf57d89ad08e4a1e14ec3d401115fffc327325e9d
diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild
index 91bd59b30f01..eca2999b5712 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 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 01dc7698d0f2..8c86b4aadda7 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.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 ~riscv ~x86"
 fi
 
 LICENSE="MIT"