app-emulation/xen: obsolete epatch if EAPI=6

Package-Manager: Portage-2.3.16, Repoman-2.3.6
johu · Dec 5, 2017 · f4fa9a8 · f4fa9a8
1 parent 8905dbf
commit f4fa9a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 29 deletions.
diff --git a/app-emulation/xen/xen-4.8.2-r3.ebuild b/app-emulation/xen/xen-4.8.2-r3.ebuild
@@ -80,12 +80,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
 
 	# Security patchset
 	if [[ -n ${SECURITY_VER} ]]; then
@@ -100,18 +95,14 @@ src_prepare() {
 
 		local i
 		for i in ${XEN_SECURITY_MAIN}; do
-			epatch "${WORKDIR}"/patches-security/xen/$i
+			eapply "${WORKDIR}"/patches-security/xen/$i
 		done
 	fi
 
 	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
-	fi
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
 
-	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
 
 	# Drop .config
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"

diff --git a/app-emulation/xen/xen-4.9.1.ebuild b/app-emulation/xen/xen-4.9.1.ebuild
@@ -79,38 +79,26 @@ pkg_setup() {
 
 src_prepare() {
 	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
 
 	# Security patchset
 	if [[ -n ${SECURITY_VER} ]]; then
 	einfo "Try to apply Xen Security patch set"
 		# apply main xen patches
 		# Two parallel systems, both work side by side
 		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
 		source "${WORKDIR}"/patches-security/${PV}.conf
 
 		local i
 		for i in ${XEN_SECURITY_MAIN}; do
-			epatch "${WORKDIR}"/patches-security/xen/$i
+			eapply "${WORKDIR}"/patches-security/xen/$i
 		done
 	fi
 
 	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
-	fi
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
 
-	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
 
 	# Drop .config
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"