gentoo resync : 25.04.2020

2 files changed, 13 insertions, 24 deletions

diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index 28457aef781c..c7cbb1305435 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -1,9 +1,8 @@
 AUX spice-vdagent.confd-2 314 BLAKE2B 93d93f9e03e3aba9d889703ad24d08401222cf9d4b5fd0e72001bd0c0cf261d9f6879d1d0a89b51fc34dee2b15729425c694aca5522b1918f01edeea9b38b536 SHA512 ef3e02c65dd83ed0d4b1eaad9c6000a9d5d53fbbf2c19fe9604583f85478c92276b3b80554bd1573af6866e242c484f02da5c3500c0b4c430d3af0de755eed38
 AUX spice-vdagent.initd-3 1475 BLAKE2B 0d39828bd5be6271e0d3f1f7262751e1bee263bb52c0d409f5e85c51ac69b2ed1f6fa1b0ea377cae0e2879ed7d0ae39b93219fc961ed34c3d1d42b771a452932 SHA512 11e61f5cd8081231318248e332f081e43a36fb2315c70d52e436e83a14f1fca5ee4ddd8016e8c9d639cdafe69c3e5f360fb66dc2405f0d45f817130221ece516
 AUX spice-vdagent.initd-4 1465 BLAKE2B f03734461fac2ec869b48a3e2b4c4bd7ebfe152f3d2563fb5005477ce1eebbc887ebe0cc8e317e5b80de073b3cc27dc1475e86b2127a7f4907470e398112d05e SHA512 a10614b9058f9a6d70d350d2764809646251fe555abf7127ce49b2e794545a72a500c9b6ab9e5dcc632253a1ed24017392b6d0446d469ffce954d00e5c96a6c8
-DIST spice-vdagent-0.17.0-patches-20180319.tar.xz 38924 BLAKE2B c7c7f851d307cd7dde620278c6ea240d71f8b1f25d6367f81213c7e902d2b2c15f72c71344f965743a45b5693832a2937041ca7b5511ce1db479dafe137bc7b1 SHA512 8ac627f56605151aebc100a6c6d61243776662150095c768196d750929971f98f4b6d1a831cfb547d29ae8a6734795c93e51a9c4f27dcf53bd66aca6df437c51
-DIST spice-vdagent-0.17.0.tar.bz2 130413 BLAKE2B b2fb522f491512d94ac15fa8d253e8e682210ad40657eb9e5e40489eaab18c9f1d5ef5f97075a4389501050a758e1f56d47132de6b1c74bb153fc6b5e87a698d SHA512 b26e44f6463ba70d5815956b301cc2351db22de41ed2ce8b2828d9bfa1cc581c86acd433f8f0d35d552d20f6ca140f88fa39b079ba26e9166dc07ad35bee502e
 DIST spice-vdagent-0.19.0.tar.bz2 151356 BLAKE2B b7a99a7205d955b27edfe483746e3f267a6e0b7885c4b8146ba42d99b581cf4e1748b503a37a3d6b66623ef2515b42756f2e6a5a4775d56def7aa396bd0dfb4f SHA512 f5056dfe66df3ee8205549be22bbc8c17d2196c8448eda97f01659ff30c34d9929f330767d7fafec557dc5f7fb9b65eaf85973193b38df774042de9b72d6e60d
-EBUILD spice-vdagent-0.17.0_p20180319-r1.ebuild 1680 BLAKE2B 7a9019d3e5d3e303b09f2c31b79c7ca8fd44905b19ee9e722e83c1a7ca44a7ff61340da6fb00884d8d91f3f57a5065f022da6c768fc2615c73780422505ad582 SHA512 31050b50116202a58f075443c9eeed79960c1a98bfa1501811f4f69beb21ae10ac755eaa450ddc10552c0caf5a8731ff8499dfeda6b661b160ceb6e579fbd3c9
+DIST spice-vdagent-0.20.0.tar.bz2 152510 BLAKE2B b00caadab385f4208bd18b78a006831953f99387e55fd86226efffdf537426627f02bb46708173b700eecd21f598a0db94f454c5252b0f4bfb93c30b39d69d16 SHA512 a6288e056645c071834f9ce5800669cb64e0f86a5efeb8eec61ac1e11f1fd56f7da8ea19b28a94c88741d794a0290fac9bcf74d45bcef271c2c5abfb2573a8e1
 EBUILD spice-vdagent-0.19.0-r1.ebuild 1547 BLAKE2B d43fc922789d4c6d31fa3b6c5fda1de6510f1a77265729c058b4cce1d1f2e8fad8068c2ba087a4d67bd314afdc03f7de4e05a274b58e4b52a52e0830904689e0 SHA512 d7f08bd18da68a8edafcda4d2a409f0e5113e65617549daecd80c0841c393b4da94e3ca536d7f69771deac1ec79a9c1bc55f282d6f638de8a21c25753219767e
+EBUILD spice-vdagent-0.20.0.ebuild 1549 BLAKE2B bf17b60d824dbf69f20c9d3c20da94fe550ac5e9a78c1d7604a11e8ee7c49eee43f611c0920c36a65a6b1accef3ffb7646176375770dca00cca2283c24e0da44 SHA512 86d8e668087cef6b30a8af1ef75657809aeedd8c07d862e83a252c2309f4df41afd8ab19947bbd8f3c6d05c29dd78fa21c7c414626a1b28f0b79557036c960de
 MISC metadata.xml 446 BLAKE2B 263e7a9d21436d2549384fe53b85c4cbeec35d55714a4bd1f926f68077641da84991a4c670b79057f3bc4bb62d419f1c18fa558fb9d290df5a6607f626f965f2 SHA512 7b47aee99363ac11c21733be4ce320e4dc704924c80372f28af7da08b975845aa11a96d7c48e01ab9ae78e77c89fbe71d177f41b474f84a3fa9c27c597ed3f1b
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.20.0.ebuild
index 5a356f6ee6ef..2cac3817d767 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.20.0.ebuild
@@ -1,33 +1,31 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools linux-info
 
-MY_P="${P/_*/}"
-PATCHSET="${P/*_p/}"
-
 DESCRIPTION="SPICE VD Linux Guest Agent"
 HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/releases/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~tamiko/distfiles/${MY_P}-patches-${PATCHSET}.tar.xz"
+SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="consolekit selinux systemd"
-S="${WORKDIR}/${MY_P}"
+KEYWORDS="~amd64 ~x86"
+IUSE="consolekit gtk selinux systemd"
 
 CDEPEND="
-	>=app-emulation/spice-protocol-0.12.8
+	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
 	consolekit? ( sys-auth/consolekit sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:3 )
 	systemd? ( sys-apps/systemd )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -38,15 +36,6 @@ 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"
 
-PATCHES=(
-	"${WORKDIR}"/patches
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
 	local opt=()
 	if use consolekit; then
@@ -60,6 +49,7 @@ src_configure() {
 	econf \
 		--with-init-script=systemd \
 		--localstatedir="${EPREFIX}"/var \
+		$(use_with gtk) \
 		"${opt[@]}"
 }
 
@@ -70,6 +60,6 @@ src_install() {
 
 	keepdir /var/log/spice-vdagentd
 
-	newinitd "${FILESDIR}/${PN}.initd-3" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd-4" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
 }