From 4774f4e27ac8665af94e6022388965e430ca22b3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 16 Jan 2020 08:00:28 +0000 Subject: [PATCH] dev-embedded/sdcc: drop upstreamed 'AR =' fix Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Sergei Trofimovich --- dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild | 8 +------- dev-embedded/sdcc/sdcc-9999.ebuild | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild index 08e64f35f2be..7917e57ae052 100644 --- a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild +++ b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -68,12 +68,6 @@ src_prepare() { -e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \ {} + || die - # https://sourceforge.net/p/sdcc/bugs/2398/ - sed -i -e '1iAR = @AR@' Makefile.common.in || die - sed -i \ - -e "/^AR =/s:=.*:=$(tc-getAR):" \ - support/cpp/Makefile.in || die - # Make sure timestamps don't get messed up. [[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} + diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild index 23c2e5edc149..e77bef24bf55 100644 --- a/dev-embedded/sdcc/sdcc-9999.ebuild +++ b/dev-embedded/sdcc/sdcc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -68,12 +68,6 @@ src_prepare() { -e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \ {} + || die - # https://sourceforge.net/p/sdcc/bugs/2398/ - sed -i -e '1iAR = @AR@' Makefile.common.in || die - sed -i \ - -e "/^AR =/s:=.*:=$(tc-getAR):" \ - support/cpp/Makefile.in || die - # Make sure timestamps don't get messed up. [[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} + -- 2.26.2