commit: ea5fcae372a8ed36f7077ede83595cc62f9d0cfd Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Wed Jan 12 21:28:41 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Wed Jan 12 21:31:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5fcae3
app-emulation/xe-guest-utilities: Port to EAPI 8 Closes: https://bugs.gentoo.org/819729 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> ...st-utilities-6.2.0_p1120-Guest-Attributes.patch | 4 +-- ...-utilities-6.2.0_p1120-Linux-Distribution.patch | 4 +-- ...ld => xe-guest-utilities-6.2.0_p1120-r1.ebuild} | 35 +++++++++++++--------- 3 files changed, 25 insertions(+), 18 deletions(-) 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 similarity index 76% rename from app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild rename to 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
