commit: 55525cbf01d282401ce10eb70b9c13bb317a9960
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 14:49:36 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 14:49:36 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=55525cbf
sys-devel/binutils: sync testing with ::gentoo
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
sys-devel/binutils/Manifest | 2 +-
.../{binutils-2.34.ebuild => binutils-2.34-r2.ebuild} | 11 ++---------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 6a78d89..1d49d57 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -1,4 +1,4 @@
DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B
0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212
SHA512
d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B
c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c
SHA512
b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
-DIST binutils-2.34-patches-1.tar.xz 20388 BLAKE2B
8828505f62259a307de445357320827e7f6bc416a7f4c72140add505f62eef3928c7daec13be158b52c2a7a1d989f539025e4be6ec27ef80ede81477a42c5042
SHA512
951dffcc30ad5706dc48e71995217655c5d96472446ab66a357f19486b57d1868143a9809887eab7ba8c42c33124f8b37d3bab6618388ea8a08b4399d348a645
+DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B
d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447
SHA512
e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
DIST binutils-2.34.tar.xz 21637796 BLAKE2B
07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d
SHA512
2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
diff --git a/sys-devel/binutils/binutils-2.34.ebuild
b/sys-devel/binutils/binutils-2.34-r2.ebuild
similarity index 98%
rename from sys-devel/binutils/binutils-2.34.ebuild
rename to sys-devel/binutils/binutils-2.34-r2.ebuild
index bb58baf..f8d1d87 100644
--- a/sys-devel/binutils/binutils-2.34.ebuild
+++ b/sys-devel/binutils/binutils-2.34-r2.ebuild
@@ -19,8 +19,8 @@ REQUIRED_USE="default-gold? ( gold )"
# PATCH_DEV - Use download URI
https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
# for the patchsets
-PATCH_VER=1
-PATCH_DEV=slyfox
+PATCH_VER=6
+PATCH_DEV=dilfridge
case ${PV} in
9999)
@@ -84,10 +84,6 @@ BDEPEND="
RESTRICT="!test? ( test )"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.33-gcc-10.patch
-)
-
MY_BUILDDIR=${WORKDIR}/build
src_unpack() {
@@ -104,9 +100,6 @@ src_unpack() {
src_prepare() {
if [[ ! -z ${PATCH_VER} ]] ; then
- # Use upstream patch to enable development mode
- rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch
|| die
-
einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset
${PATCH_VER}"
eapply "${WORKDIR}/patch"/*.patch
fi
