[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/

[Doug Goldstein]

commit:     5e52bba8b60006a721f66527f194acae0410e4ce
Author:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 19:36:22 2015 +0000
Commit:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 19:38:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e52bba8

app-emulation/xen: fix compilation failures

A patch referenced in src_prepare() was missing so the package could not
build. LDFLAGS were being passed in which caused build failures with
USE=-custom-cflags. Dependency on binutils was incorrect.

 app-emulation/xen/xen-4.6.0-r2.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-emulation/xen/xen-4.6.0-r2.ebuild 
b/app-emulation/xen/xen-4.6.0-r2.ebuild
index 76febbc..3377511 100644
--- a/app-emulation/xen/xen-4.6.0-r2.ebuild
+++ b/app-emulation/xen/xen-4.6.0-r2.ebuild
@@ -28,7 +28,8 @@ else
        
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
                ${UPSTREAM_PATCHSET_URI}
                ${SECURITY_PATCHSET_URI}
-               ${GENTOO_PATCHSET_URI}"
+               ${GENTOO_PATCHSET_URI}
+               
https://dev.gentoo.org/~idella4/distfiles/${PN}-security-patches.tar.gz";
 fi
 
 inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils 
${live_eclass}
@@ -41,7 +42,7 @@ IUSE="custom-cflags debug efi flask xsm"
 
 DEPEND="${PYTHON_DEPS}
        efi? ( >=sys-devel/binutils-2.22[multitarget] )
-       !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+       !efi? ( >=sys-devel/binutils-2.22 )"
 RDEPEND=""
 PDEPEND="~app-emulation/xen-tools-${PV}"
 
@@ -151,6 +152,8 @@ src_configure() {
                replace-flags -O3 -O2
        else
                unset CFLAGS
+               unset LDFLAGS
+               unset ASFLAGS
        fi
 }