From: Lars Wendler <polynomial-c@gentoo.org>
Date: Fri, 28 Jul 2017 06:36:06 +0000 (+0200)
Subject: app-emulation/virtualbox: Don't apply nopie patch unconditionally.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d94b9e0e9dd9b20ebd2f1381111da79d6df98796;p=gentoo.git

app-emulation/virtualbox: Don't apply nopie patch unconditionally.

Package-Manager: Portage-2.3.6, Repoman-2.3.3
---

diff --git a/app-emulation/virtualbox/virtualbox-5.1.24.ebuild b/app-emulation/virtualbox/virtualbox-5.1.24.ebuild
index 8249f3d55e26..e874868ea021 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.24.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.24.ebuild
@@ -182,9 +182,9 @@ src_prepare() {
 	fi
 
 	# Only add nopie patch when we're on hardened
-	#if ! gcc-specs-pie ; then
-	#	rm "${WORKDIR}"/patches/050_${PN}-*-nopie.patch || die
-	#fi
+	if gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
+	fi
 
 	# Only add paxmark patch when we're on pax_kernel
 	if use pax_kernel ; then
@@ -192,7 +192,6 @@ src_prepare() {
 	fi
 
 	eapply "${WORKDIR}/patches"
-	eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
 
 	eapply_user
 }