From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 56DE61388C1 for ; Sun, 6 Dec 2015 05:35:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2C80E087F; Sun, 6 Dec 2015 05:35:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58590E087E for ; Sun, 6 Dec 2015 05:35:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3965E340906 for ; Sun, 6 Dec 2015 05:35:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3AD73CAF for ; Sun, 6 Dec 2015 05:35:30 +0000 (UTC) From: "Doug Goldstein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Doug Goldstein" Message-ID: <1449380114.415ca2fc9582e38407e41bb10b4c905e00538661.cardoe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/xen/xen-4.6.0-r2.ebuild X-VCS-Directories: app-emulation/xen/ X-VCS-Committer: cardoe X-VCS-Committer-Name: Doug Goldstein X-VCS-Revision: 415ca2fc9582e38407e41bb10b4c905e00538661 X-VCS-Branch: master Date: Sun, 6 Dec 2015 05:35:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 679949c3-b487-4bbe-b94a-c4f6eb7afda5 X-Archives-Hash: e3f9c2a15809ee9de81620ee8e497b5d commit: 415ca2fc9582e38407e41bb10b4c905e00538661 Author: Doug Goldstein gentoo org> AuthorDate: Sun Dec 6 05:28:08 2015 +0000 Commit: Doug Goldstein gentoo org> CommitDate: Sun Dec 6 05:35:14 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=415ca2fc app-emulation/xen: don't install EFI bits with USE=-efi Don't install the EFI bits if the user didn't want them. Signed-off-by: Doug Goldstein gentoo.org> app-emulation/xen/xen-4.6.0-r2.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-emulation/xen/xen-4.6.0-r2.ebuild b/app-emulation/xen/xen-4.6.0-r2.ebuild index 717b3e1..b67f639 100644 --- a/app-emulation/xen/xen-4.6.0-r2.ebuild +++ b/app-emulation/xen/xen-4.6.0-r2.ebuild @@ -6,7 +6,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit eutils mount-boot flag-o-matic python-any-r1 toolchain-funcs versionator +inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs versionator MY_PV=${PV/_/-} MY_P=${PN}-${PV/_/-} @@ -170,6 +170,9 @@ src_install() { fi emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install + + # make install likes to throw in some extra EFI bits if it built + use efi || rm -rf "${D}/usr/$(get_libdir)/efi" } pkg_postinst() {