4 files changed, 23 insertions, 75 deletions
diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index d62998b6b3ac..49738685af14 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -1,2 +1 @@
-DIST spice-vdagent-0.19.0.tar.bz2 151356 BLAKE2B b7a99a7205d955b27edfe483746e3f267a6e0b7885c4b8146ba42d99b581cf4e1748b503a37a3d6b66623ef2515b42756f2e6a5a4775d56def7aa396bd0dfb4f SHA512 f5056dfe66df3ee8205549be22bbc8c17d2196c8448eda97f01659ff30c34d9929f330767d7fafec557dc5f7fb9b65eaf85973193b38df774042de9b72d6e60d
-DIST spice-vdagent-0.20.0.tar.bz2 152510 BLAKE2B b00caadab385f4208bd18b78a006831953f99387e55fd86226efffdf537426627f02bb46708173b700eecd21f598a0db94f454c5252b0f4bfb93c30b39d69d16 SHA512 a6288e056645c071834f9ce5800669cb64e0f86a5efeb8eec61ac1e11f1fd56f7da8ea19b28a94c88741d794a0290fac9bcf74d45bcef271c2c5abfb2573a8e1
+DIST spice-vdagent-0.22.1.tar.bz2 165560 BLAKE2B 4fd4318592d20d305d515c65d7491b90ac79bcc7f5bdfafd9df7858bdce24aa57c79f2121bbf9cbadec8e6297890f4b8598b9abcadcce5a9f39712b96deaa396 SHA512 5a4d2661145f33a0583880a128d925b15ca5aec05df83271c80f8baa0fcdd28fab0242301bc38443ccddf70fbdcfd76b5d30bb5a6b4b7c895c3cea0eb38bdf92
diff --git a/app-emulation/spice-vdagent/metadata.xml b/app-emulation/spice-vdagent/metadata.xml
index 121cd46cb5e1..cfac6f8ac4ff 100644
--- a/app-emulation/spice-vdagent/metadata.xml
+++ b/app-emulation/spice-vdagent/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="project">
 		<email>virtualization@gentoo.org</email>
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.20.0.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.20.0.ebuild
deleted file mode 100644
index 3365574e5bb4..000000000000
--- a/app-emulation/spice-vdagent/spice-vdagent-0.20.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="SPICE VD Linux Guest Agent"
-HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk selinux systemd"
-
-CDEPEND="
-	dev-libs/glib:2
-	>=app-emulation/spice-protocol-0.14.0
-	media-libs/alsa-lib
-	>=x11-libs/libpciaccess-0.10
-	x11-libs/libdrm
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libX11
-	x11-libs/libXinerama
-	gtk? ( x11-libs/gtk+:3 )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-vdagent )"
-
-CONFIG_CHECK="~INPUT_UINPUT ~VIRTIO_CONSOLE"
-ERROR_INPUT_UINPUT="User level input support (INPUT_UINPUT) is required"
-ERROR_VIRTIO_CONSOLE="VirtIO console/serial device support (VIRTIO_CONSOLE) is required"
-
-src_configure() {
-	local opt=()
-	if use systemd; then
-		opt+=( --with-session-info=systemd )
-	else
-		opt+=( --with-session-info=none )
-	fi
-
-	econf \
-		--with-init-script=systemd \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_with gtk) \
-		"${opt[@]}"
-}
-
-src_install() {
-	default
-
-	cd "${ED}" && rmdir -p var/run/spice-vdagentd || die
-
-	keepdir /var/log/spice-vdagentd
-
-	newinitd "${FILESDIR}/${PN}.initd-4" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
-}
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
index 81ddd00bd633..c58c80ea1479 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools linux-info
+inherit linux-info tmpfiles udev
 
 DESCRIPTION="SPICE VD Linux Guest Agent"
 HOMEPAGE="https://www.spice-space.org/"
@@ -11,25 +11,27 @@ SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 ~loong x86"
 IUSE="gtk selinux systemd"
 
-CDEPEND="
+COMMON_DEPEND="
 	dev-libs/glib:2
 	>=app-emulation/spice-protocol-0.14.0
 	media-libs/alsa-lib
-	>=x11-libs/libpciaccess-0.10
+	sys-apps/dbus
 	x11-libs/libdrm
+	>=x11-libs/libpciaccess-0.10
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libX11
 	x11-libs/libXinerama
 	gtk? ( x11-libs/gtk+:3 )
 	systemd? ( sys-apps/systemd )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto"
+RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-vdagent )"
+BDEPEND="virtual/pkgconfig"
 
 CONFIG_CHECK="~INPUT_UINPUT ~VIRTIO_CONSOLE"
 ERROR_INPUT_UINPUT="User level input support (INPUT_UINPUT) is required"
@@ -53,10 +55,19 @@ src_configure() {
 src_install() {
 	default
 
-	cd "${ED}" && rmdir -p var/run/spice-vdagentd || die
+	rmdir "${ED}"/var/run/spice-vdagentd || die
 
 	keepdir /var/log/spice-vdagentd
 
 	newinitd "${FILESDIR}/${PN}.initd-4" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
 }
+
+pkg_postinst() {
+	udev_reload
+	tmpfiles_process spice-vdagentd.conf
+}
+
+pkg_postrm() {
+	udev_reload
+}