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 E93D3158092 for ; Thu, 16 Sep 2021 01:45:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18835E0833; Thu, 16 Sep 2021 01:45:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ED314E0833 for ; Thu, 16 Sep 2021 01:45:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BBC78335D96 for ; Thu, 16 Sep 2021 01:45:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42CFDE3 for ; Thu, 16 Sep 2021 01:45:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1631756616.78f470be1ec0d6908f205e3e859f80c15ad157b2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/binutils/binutils-2.37_p1.ebuild sys-devel/binutils/binutils-9999.ebuild X-VCS-Directories: sys-devel/binutils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 78f470be1ec0d6908f205e3e859f80c15ad157b2 X-VCS-Branch: master Date: Thu, 16 Sep 2021 01:45:03 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 869cdbf1-208e-4458-b4b6-50bb3b94cd19 X-Archives-Hash: a4b479d9fc96f0a7fe6c78ffab442195 commit: 78f470be1ec0d6908f205e3e859f80c15ad157b2 Author: Sam James gentoo org> AuthorDate: Thu Sep 16 01:43:36 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Sep 16 01:43:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f470be sys-devel/binutils: sync template with -hppa64 See: e2d2448a60d4872646acbe9f1dd389e1f1950231 Signed-off-by: Sam James gentoo.org> sys-devel/binutils/binutils-2.37_p1.ebuild | 7 +++++-- sys-devel/binutils/binutils-9999.ebuild | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sys-devel/binutils/binutils-2.37_p1.ebuild b/sys-devel/binutils/binutils-2.37_p1.ebuild index 5d38540bceb..5ee7334398a 100644 --- a/sys-devel/binutils/binutils-2.37_p1.ebuild +++ b/sys-devel/binutils/binutils-2.37_p1.ebuild @@ -82,13 +82,16 @@ src_unpack() { EGIT_CHECKOUT_DIR=${S} git-r3_src_unpack else - unpack ${P}.tar.xz + unpack ${P/-hppa64/}.tar.xz cd "${WORKDIR}" || die unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz # _p patch versions are Gentoo specific tarballs ... - S=${WORKDIR}/${P%_p?} + local dir=${P%_p?} + dir=${dir/-hppa64/} + + S=${WORKDIR}/${dir} fi cd "${WORKDIR}" || die diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild index 37d8a9fa13f..8394f7f945e 100644 --- a/sys-devel/binutils/binutils-9999.ebuild +++ b/sys-devel/binutils/binutils-9999.ebuild @@ -19,7 +19,7 @@ REQUIRED_USE="default-gold? ( gold )" # PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/... # for the patchsets -PATCH_VER=1 +PATCH_VER=0 PATCH_DEV=dilfridge if [[ ${PV} == 9999* ]]; then @@ -82,13 +82,16 @@ src_unpack() { EGIT_CHECKOUT_DIR=${S} git-r3_src_unpack else - unpack ${P}.tar.xz + unpack ${P/-hppa64/}.tar.xz cd "${WORKDIR}" || die unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz # _p patch versions are Gentoo specific tarballs ... - S=${WORKDIR}/${P%_p?} + local dir=${P%_p?} + dir=${dir/-hppa64/} + + S=${WORKDIR}/${dir} fi cd "${WORKDIR}" || die