gentoo resync : 16.01.2021

4 files changed, 28 insertions, 21 deletions

diff --git a/app-emulation/xe-guest-utilities/Manifest b/app-emulation/xe-guest-utilities/Manifest
index d1633afc3864..a20eb3b27273 100644
--- a/app-emulation/xe-guest-utilities/Manifest
+++ b/app-emulation/xe-guest-utilities/Manifest
@@ -1,6 +1,6 @@
 AUX xe-daemon.initd 628 BLAKE2B 2307505518a79ff929dd8559ceea7e25df88f8b32e589228b64a50e1117c0cfa7da6d43fe5f4b32add62dbc24f5da02d959a06602b973546777bc36558547e99 SHA512 0278202ff6ce4d8537fd56293844039cee438d5487bb5bd843634f7ca91a0ade2afe5d5b5e5fbc3715e5ef3966ff58772a3540ae9e3cbc19b19eac4266b953b6
-AUX xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch 4599 BLAKE2B 6bcbd37c9386ed91635d23cbe43ea07ea321063d4c859688735303f14734b08b7895886f49791c000d64eff0e9b458f266a2c921e7c4fd202cd6d10fafcf1b76 SHA512 c9147d9a93b45d7300441b6c398c27bf3c38d39c0a6908f80a2708b8c26329c9b138522ca3b7ae7b4af2ace3b43ededda03dd39b9c8cafd31dbe32beae739690
-AUX xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch 2146 BLAKE2B 6875bf6ff48acd48cee2e590402cc546dd53df8a0861a6941b2de0d8c8caeb509f107d2b24c4e5c5d665890c15972c84c80c299eab718ec81131dc0594b6a5ec SHA512 93f5c1445b7ee449fedaed3c73a3f21b6adc0fad67d90e3bb35213749ae659ffae85dec3ddf43d4b5df21500e8b651651dd7496a2ffb8fa2d9091dd246c839de
+AUX xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch 4508 BLAKE2B 94a4af56898bae5a79cf47b0ee96270a427a78d4c3e51541545e695ad3df0906bf394db0fa8a189bb55807066a70bf66ce3e21079014f2dc5eb644a1645cf785 SHA512 bb36bc82ce014d203c0005f905acf8d7a4586b88f5096ffaadbf8bfb51d9597e847b155ef9780493099338d53868abafd8a50761c4183a55f3981dae8dfe9c3b
+AUX xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch 2055 BLAKE2B 0ea0c68134ff4969066d69ea64d0ac5fffa8c2b649538cf273819e3888a1352ada8ebf23795a9bc5b5ddeae41adde925e8cd5f1a3ecb555d5a2dd66a82630b42 SHA512 6a5691e2156a1b147bd456af8acfaad5c6e2aa404e085c54dce642a8c09e77a5fd518d46d80063a5690c675796ab8cec0ecd36849573fe4bcbce905c725c14e9
 DIST xe-guest-utilities-6.2.0-1120.src.rpm 566881 BLAKE2B b2c727c551996f218c021d509ba1841baa07c70cbaf7660c0ec9cbeae696c4e77921d8ca12e8dfdf934a6894058c62ee6bf4e86bd1918e304cc76ee28d396fad SHA512 b945b3bf8175816b41b3a07a7dd8f0d9d2fdb1a7144448a5bb7fb4b6729736c67cea88fd45031df41abdd99416addb17fa1ee9cfe1fc76acf610cde3b3213880
-EBUILD xe-guest-utilities-6.2.0_p1120.ebuild 1500 BLAKE2B 42233eba29d6748e4bfda2ad162b94fdc380797ff773bc389c5bfd1a2126c41021b8001dfa87c62495f63eacd9f728254aacb684d81d8107f6e5a0b4a83fa22a SHA512 8ea1175a64528178645256f030d0cc4818c8318cb87681268c3b3fcb64c0e156107dadf36d40f20da86af52a533a392e65818a0029cbe67c358b83fe3daeee39
+EBUILD xe-guest-utilities-6.2.0_p1120-r1.ebuild 1483 BLAKE2B 2ad9f008b0b04625797dd799a34c0315f1446bf182ffc9f05414db6049e6cf5d4c433a2c757af444be3673a9043f57ab50fc09f5583f73304a65f0622ef9e6c5 SHA512 f09206181abef7023facb72c51704a0650ccf9c30c86a5029801a52613e8cab7595f91a48949a171ae5a03d6859e9164b079ec7232693cb7e25f586a2f9d5376
 MISC metadata.xml 791 BLAKE2B fc1e107b5d409edbff73ee781c03e81d113145f4a7424fafef60cbc876959e8ba6ccbe2f1f83ee75172647f7cad0fd4ff43c9aadde75d176ffb1626125820a68 SHA512 f475e1a5b4f50bb9c3de828ba2d0433e6eb54706c207fc7591aa16d5c2ac128b6649f77dd751f65e901280a47a9cb690599b57f625858bca580ebc34036048cf
diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch
index d431cdfcf999..29c8ebc91074 100644
--- a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch
+++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch
@@ -1,5 +1,5 @@
---- usr/sbin/xe-update-guest-attrs.orig	2013-06-14 07:57:18.000000000 -0500
-+++ usr/sbin/xe-update-guest-attrs	2014-04-19 13:38:14.627477193 -0500
+--- a/xe-update-guest-attrs
++++ b/xe-update-guest-attrs
 @@ -1,6 +1,7 @@
  #!/bin/sh
  
diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch
index 45b0bbc56c69..d1ec22668603 100644
--- a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch
+++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch
@@ -1,5 +1,5 @@
---- usr/sbin/xe-linux-distribution.orig	2013-06-14 07:57:18.000000000 -0500
-+++ usr/sbin/xe-linux-distribution	2014-04-19 13:54:13.270477193 -0500
+--- a/xe-linux-distribution
++++ b/xe-linux-distribution
 @@ -1,6 +1,7 @@
  #! /bin/sh
  
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120-r1.ebuild
index 9fdc1dc8bc30..5c0e8352fb77 100644
--- a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120-r1.ebuild
@@ -1,38 +1,45 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch rpm linux-info
-DESCRIPTION="XenServer Virtual Machine Tools"
-HOMEPAGE="https://www.citrix.com/"
+EAPI=8
+
+inherit rpm linux-info
+
 PV_BASE=${PV/_*}
 PV_FULL=${PV/_p/-}
+
+DESCRIPTION="XenServer Virtual Machine Tools"
+HOMEPAGE="https://www.citrix.com/"
 SRC_URI="http://updates.vmd.citrix.com/XenServer/${PV_BASE}/rhel4x/SRPMS/xe-guest-utilities-${PV_FULL}.src.rpm"
+S="${WORKDIR}"
+
 LICENSE="LGPL-3 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="xenstore"
-DEPEND="app-arch/rpm2targz"
+
+BDEPEND="app-arch/rpm2targz"
 RDEPEND="
 	!xenstore? ( app-emulation/xen-tools )
-	xenstore? ( !app-emulation/xen-tools )"
-S=${WORKDIR}
+	xenstore? ( !app-emulation/xen-tools )
+"
+
 CONFIG_CHECK="~XEN_COMPAT_XENFS ~XENFS"
 QA_PREBUILT="usr/bin/xenstore* usr/bin/xeninfo"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.0_p1120-Guest-Attributes.patch
+	"${FILESDIR}"/${PN}-6.2.0_p1120-Linux-Distribution.patch
+)
+
 src_unpack() {
 	rpm_src_unpack ${A}
 	# Upstream includes xenstore-sources.tar.bz2
 	# but it is NOT the complete source :-(
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Guest-Attributes.patch
-	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Linux-Distribution.patch
-}
-
 src_install() {
-	newinitd "${FILESDIR}/xe-daemon.initd" xe-daemon
+	newinitd "${FILESDIR}"/xe-daemon.initd xe-daemon
 	dosbin xe-daemon
 	dosbin xe-linux-distribution
 	dosbin xe-update-guest-attrs