gentoo resync : 16.09.2021

4 files changed, 67 insertions, 8 deletions

diff --git a/sys-auth/seatd/Manifest b/sys-auth/seatd/Manifest
index f56d9f22fcdc..c3dbb79e74c6 100644
--- a/sys-auth/seatd/Manifest
+++ b/sys-auth/seatd/Manifest
@@ -1,6 +1,8 @@
 AUX seatd.initd 87 BLAKE2B e88a8c353191ad9b69c0ee263aee7a050333d43e8dd26c8b3ee40cfbcb17f9b7a9391720ac34d19f375a880fae8178cd7dfc0b45cc9565b4b073bbe43cadf5ce SHA512 a19171b55e6650a9237f89258d92aba18508684412fe8a072387c505945b8e54557bd52261de76230553a572d627f40e00770087040111a7473fadfe3c33c931
 DIST seatd-0.5.0.tar.gz 34762 BLAKE2B 054bd64800b734f6092f856540217e5ea4872c5a363960bac6c5aa7dac5355bdbd982232efd2f8078ad326ec0e6257f3ee7643384c88a3bbe15255d65f02540c SHA512 a6b1f11313411fe99e8bdd64aa493fc19bde7b0b927f21e2c3ec8a7fadc6cf2f04fcefa73fa033d971d1dc482665d3dc927ec168026289fe88b2593a45adbc0f
+DIST seatd-0.6.0.tar.gz 37418 BLAKE2B 0598191cd5988ec24506a5b70f2011b1ec1691f5e32108c4c44e79d5527527cae4da8bfbe934ca64efbb1a1dd8471b35589c33399cf85dc89b4cec92d2ef1192 SHA512 9b0b67a028cf9bba63a6c4630c66b21dd2cb87de0d290bfc51245727cda72964fbd0ffee709eded1e81c28f403db6bae8926a257fdd9267e154fbe8697d22a2b
 EBUILD seatd-0.5.0-r1.ebuild 1149 BLAKE2B 5d2dea641973020351e6eceda0c32c6d91d8548406cee5b3713cd64a850c08975c2e1bd8be7a2b4f09581d4b88ed11b8fd103e81c30b70c3b101f70d7437f29e SHA512 d60e0a835c74ccd649dc41011d26b4fb5d0a7241b3a5ec17cca3ba1461510bfb2635f5a70a564648de54697625ab6b66d0edbe03ce69a60554b919bb45d31145
 EBUILD seatd-0.5.0.ebuild 1049 BLAKE2B d3e8166eb298e7b7cc6c2263bc95b011a2eaf02957a2e0af9fec7cfcdd71d0275e3ec7576a817e8a4acf022cfe7ec3231be532cf6205ef0941b0b3ca68a795a0 SHA512 609f6607bbad760600413e46a69aa0a349b139e7f6c7cff461b77a676b00561241da9cb31fd1debcdb48b65c23dee1e0c8ae5e0c3b0fff2e89ed5647568fbb2a
-EBUILD seatd-9999.ebuild 1158 BLAKE2B c2934dd77497dc1cb1a7bda23f8e0978b086af1342eca10e140e04f8884e1c9d696d52438edda91ff59a2eef8a3b7525c36687bf33fcc41878025ff49283db23 SHA512 552bf05249d1ae2503c5bd2bc76e47347f6321f7626820fe3d539e9fe0c470b4664557cc4af31e26e6cf6416377c141d42a4b3905690e8091a08a73eb0035c5e
-MISC metadata.xml 536 BLAKE2B efbdb0f2834257b99edf61e45a427858d9d2a259b35839546a16a07f8c18748b2526eedade719f5b6883e056d6e40d1ff136e3467b08072ead946c6312301bc2 SHA512 746479d9a034df61840b5dfa5fa9b59d443fcc90c2e15636c1841149efb5c57b3c9a1e4a2f03188a11498022bb3622e14aa31a2bf6815bd0479f11b1a3338679
+EBUILD seatd-0.6.0-r1.ebuild 1234 BLAKE2B 411a2db76f7676393aa193a95eba5001ddfea1c98731fe48e57a9c012ece2c58b0f47bb0bd474ccd99a891feb889d56ef0a9ec659ca893d39a77638be1951ff1 SHA512 868642571e7ead729f9aa75e7d60b01666ddd85436ef91851329b1ee44460c0818a476f4aa743c4e05dd2c1d13c5c8163a84b4906682bee26bd6324cd720ae40
+EBUILD seatd-9999.ebuild 1234 BLAKE2B 411a2db76f7676393aa193a95eba5001ddfea1c98731fe48e57a9c012ece2c58b0f47bb0bd474ccd99a891feb889d56ef0a9ec659ca893d39a77638be1951ff1 SHA512 868642571e7ead729f9aa75e7d60b01666ddd85436ef91851329b1ee44460c0818a476f4aa743c4e05dd2c1d13c5c8163a84b4906682bee26bd6324cd720ae40
+MISC metadata.xml 537 BLAKE2B 470177aa653458ce1a00df3640bd16932a0b7d71b6fef66e853edbc04b7d483a878bcdb395255068b9971753ec1335bfb467aca1be5e3e34ee676f636d087441 SHA512 8695c2958e8ebcb3c7f593815691bfab7c3198c85793f8039ed2cd5b8760546d1ac9929cc5ef6f8ba0a84add2c1b078868a9f19cc454ea379cfedecf7087cbcd
diff --git a/sys-auth/seatd/metadata.xml b/sys-auth/seatd/metadata.xml
index dad3217f8ee8..835e6a9e6bf1 100644
--- a/sys-auth/seatd/metadata.xml
+++ b/sys-auth/seatd/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" proxied="yes">
 	<email>contact@hacktivis.me</email>
diff --git a/sys-auth/seatd/seatd-0.6.0-r1.ebuild b/sys-auth/seatd/seatd-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..8513ea785669
--- /dev/null
+++ b/sys-auth/seatd/seatd-0.6.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson systemd
+
+DESCRIPTION="Minimal seat management daemon and universal library"
+HOMEPAGE="https://sr.ht/~kennylevinsen/seatd"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
+else
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="builtin elogind +server systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=app-text/scdoc-1.9.7"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=enabled
+		-Dwerror=false
+		$(meson_feature builtin libseat-builtin)
+		$(meson_feature server)
+	)
+
+	if use elogind ; then
+		emesonargs+=( -Dlibseat-logind=elogind )
+	elif use systemd; then
+		emesonargs+=( -Dlibseat-logind=systemd )
+	else
+		emesonargs+=( -Dlibseat-logind=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use server; then
+		newinitd "${FILESDIR}/seatd.initd" seatd
+		systemd_dounit contrib/systemd/seatd.service
+	fi
+}
diff --git a/sys-auth/seatd/seatd-9999.ebuild b/sys-auth/seatd/seatd-9999.ebuild
index c826e115f27c..8513ea785669 100644
--- a/sys-auth/seatd/seatd-9999.ebuild
+++ b/sys-auth/seatd/seatd-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson systemd
 
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
 else
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 LICENSE="MIT"
@@ -34,10 +34,12 @@ src_configure() {
 		$(meson_feature server)
 	)
 
-	if use elogind || use systemd; then
-		emesonargs+=( -Dlogind=enabled )
+	if use elogind ; then
+		emesonargs+=( -Dlibseat-logind=elogind )
+	elif use systemd; then
+		emesonargs+=( -Dlibseat-logind=systemd )
 	else
-		emesonargs+=( -Dlogind=disabled )
+		emesonargs+=( -Dlibseat-logind=disabled )
 	fi
 
 	meson_src_configure