From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8F6CE139694 for ; Fri, 28 Jul 2017 06:41:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0ADB1FC0E5; Fri, 28 Jul 2017 06:41:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 842731FC0E5 for ; Fri, 28 Jul 2017 06:41:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F809341996 for ; Fri, 28 Jul 2017 06:41:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A02674C4 for ; Fri, 28 Jul 2017 06:41:36 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1501224087.d94b9e0e9dd9b20ebd2f1381111da79d6df98796.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/virtualbox-5.1.24.ebuild X-VCS-Directories: app-emulation/virtualbox/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: d94b9e0e9dd9b20ebd2f1381111da79d6df98796 X-VCS-Branch: master Date: Fri, 28 Jul 2017 06:41:36 +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: 6a8a814e-f296-438e-8b69-045035c6fb76 X-Archives-Hash: c3cf64a6f603a9d2a964767124aa07a5 commit: d94b9e0e9dd9b20ebd2f1381111da79d6df98796 Author: Lars Wendler gentoo org> AuthorDate: Fri Jul 28 06:36:06 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Jul 28 06:41:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94b9e0e app-emulation/virtualbox: Don't apply nopie patch unconditionally. Package-Manager: Portage-2.3.6, Repoman-2.3.3 app-emulation/virtualbox/virtualbox-5.1.24.ebuild | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app-emulation/virtualbox/virtualbox-5.1.24.ebuild b/app-emulation/virtualbox/virtualbox-5.1.24.ebuild index 8249f3d55e2..e874868ea02 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 }