[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc/

[Sergei Trofimovich]

commit:     8ff1ffb283bb4377e463f5e9e2608ff7c98185e2
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu May  7 21:01:19 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri May  8 00:30:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ff1ffb2

sys-devel/gcc: use gcc-10.1.0 patchset against live ebuilds

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

 sys-devel/gcc/gcc-10.1.1_pre9999.ebuild | 19 ++-----------------
 sys-devel/gcc/gcc-11.0.0_pre9999.ebuild | 19 ++-----------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/sys-devel/gcc/gcc-10.1.1_pre9999.ebuild b/sys-devel/gcc/gcc-10.1.1_pre9999.ebuild
index aaebb18cace..ff3ea350967 100644
--- a/sys-devel/gcc/gcc-10.1.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-10.1.1_pre9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-PATCH_GCC_VER="9.3.0" # reuse subset of patches for latest for live ebuilds gcc
-PATCH_VER="2"
+PATCH_GCC_VER="10.1.0" # reuse subset of patches for latest for live ebuilds gcc
+PATCH_VER="1"
 
 inherit toolchain
 
@@ -13,18 +13,3 @@ inherit toolchain
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p ignore_patches=(
-		11_all_extra-options.patch # needs a port
-		27_all_default_ssp-buffer-size.patch # needs a port
-
-		12_all_pr55930-dependency-tracking.patch # upstreamed
-		25_all_ia64-bootstrap.patch # upstreamed
-	)
-	for p in "${ignore_patches[@]}"; do
-		mv -v "${WORKDIR}"/patch/"${p}" "${WORKDIR}"/patch/"${p}"_disabled || die "failed to disable '${p}'"
-	done
-
-	toolchain_src_prepare
-}

diff --git a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
index 8d31708b6ee..12a6ad6eb62 100644
--- a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="7"
 
-PATCH_GCC_VER="9.3.0" # reuse subset of patches for latest for live ebuilds gcc
-PATCH_VER="2"
+PATCH_GCC_VER="10.1.0" # reuse subset of patches for latest for live ebuilds gcc
+PATCH_VER="1"
 
 inherit toolchain
 
@@ -15,18 +15,3 @@ EGIT_BRANCH=master
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p ignore_patches=(
-		11_all_extra-options.patch # needs a port
-		27_all_default_ssp-buffer-size.patch # needs a port
-
-		12_all_pr55930-dependency-tracking.patch # upstreamed
-		25_all_ia64-bootstrap.patch # upstreamed
-	)
-	for p in "${ignore_patches[@]}"; do
-		mv -v "${WORKDIR}"/patch/"${p}" "${WORKDIR}"/patch/"${p}"_disabled || die "failed to disable '${p}'"
-	done
-
-	toolchain_src_prepare
-}