[patch] patch for ebuild and metadata.xml

virtualbox-5.1.14.patch (text/plain), 1.98 KB, created by Magnus Granberg on 2017-02-13 22:15:58 UTC

diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index ee3648f32b..6748f0debf 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -17,6 +17,7 @@
   <flag name="extensions">Install extension module packages</flag>
   <flag name="headless">Build without any graphic frontend</flag>
   <flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag>
+  <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
   <flag name="sdk">Enable building of SDK</flag>
   <flag name="udev">Controls installation of special USB udev rules.</flag>
   <flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag>
diff --git a/app-emulation/virtualbox/virtualbox-5.1.14.ebuild b/app-emulation/virtualbox/virtualbox-5.1.14.ebuild
index e9f05dbdd1..d4a085e48a 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.14.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.14.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc headless java libressl lvm pam pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -75,6 +75,7 @@ DEPEND="${RDEPEND}
 	!headless? ( x11-libs/libXinerama )
 	java? ( >=virtual/jre-1.6:= )
 	pam? ( sys-libs/pam )
+	pax_kernel? ( sys-apps/elfix )
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
@@ -183,6 +184,11 @@ src_prepare() {
 		rm "${WORKDIR}"/patches/050_${PN}-*-nopie.patch || die
 	fi
 
+	# Only add paxmark patch when we're on pax_kernel
+	if ! use pax_kernel ; then
+		rm "${WORKDIR}"/patches/virtualbox-5.1.4-paxmark-bldprogs.patch || die
+	fi
+
 	eapply "${WORKDIR}/patches"
 
 	eapply_user