commit:     9fcc12201af68e32d65371582e1e45b058a3fb82
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 19:24:40 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 19:24:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fcc1220

sys-devel/binutils: add USE=vanilla to skip live patches

Sometimes Gentoo patches get stale and fail to apply to
binutils from head. Allow users to opt out.

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-devel/binutils/binutils-9999.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys-devel/binutils/binutils-9999.ebuild 
b/sys-devel/binutils/binutils-9999.ebuild
index 7e5b921ee5f..4cb22a0c7fc 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -8,7 +8,7 @@ inherit eutils libtool flag-o-matic gnuconfig multilib 
toolchain-funcs
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/";
 LICENSE="GPL-3+"
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
+IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test 
vanilla"
 REQUIRED_USE="default-gold? ( gold )"
 
 # Variables that can be set here:
@@ -101,8 +101,10 @@ src_unpack() {
 
 src_prepare() {
        if [[ ! -z ${PATCH_VER} ]] ; then
-               einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset 
${PATCH_VER}"
-               eapply "${WORKDIR}/patch"/*.patch
+               if ! use vanilla; then
+                       einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset 
${PATCH_VER}"
+                       eapply "${WORKDIR}/patch"/*.patch
+               fi
        fi
 
        # This check should probably go somewhere else, like pkg_pretend.

Reply via email to