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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2AD4515813A for ; Thu, 09 Jan 2025 10:21:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63981E041F; Thu, 09 Jan 2025 10:21:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 49236E041F for ; Thu, 09 Jan 2025 10:21:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6492B335D6A for ; Thu, 09 Jan 2025 10:21:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EEA8511B5 for ; Thu, 09 Jan 2025 10:21:51 +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: <1736418093.4f03a72e120646885097d428aa87afb1e6de1da7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bashdb/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/bashdb/bashdb-5.1_pre20240617.ebuild X-VCS-Directories: app-shells/bashdb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4f03a72e120646885097d428aa87afb1e6de1da7 X-VCS-Branch: master Date: Thu, 09 Jan 2025 10:21:51 +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: ed2f8a9b-cf46-4e24-a557-694001347788 X-Archives-Hash: 8babefbc773f349cc635d546573c7e5b commit: 4f03a72e120646885097d428aa87afb1e6de1da7 Author: Sam James gentoo org> AuthorDate: Thu Jan 9 10:21:08 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 9 10:21:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f03a72e app-shells/bashdb: avoid BASH_* var name It gets stripped from the environment. Closes: https://bugs.gentoo.org/947766 Signed-off-by: Sam James gentoo.org> app-shells/bashdb/bashdb-5.1_pre20240617.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild b/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild index 2468ebc8a2a9..299fe8ca9828 100644 --- a/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild +++ b/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild @@ -4,12 +4,12 @@ EAPI=8 # Set to 1 for older versions of bash (that are hence slotted) -BASH_IS_SLOTTED=1 +SLOTTED_BASH=1 -if [[ ${BASH_IS_SLOTTED} == 1 ]] ; then - BASH_SLOT="${PV:0:3}" +if [[ ${SLOTTED_BASH} == 1 ]] ; then + MANGLED_PV="${PV:0:3}" else - BASH_SLOT="0" + MANGLED_PV="0" fi MY_P="${PN}-${PV:0:3}-${PV:4}" DESCRIPTION="bash source code debugging" @@ -36,7 +36,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -DEPEND=">=app-shells/bash-${BASH_SLOT}:${BASH_SLOT}" +DEPEND=">=app-shells/bash-${MANGLED_PV}:${MANGLED_PV}" RDEPEND="${DEPEND}" # test-bug-loc fails with formatting differences @@ -53,8 +53,8 @@ src_prepare() { src_configure() { local bash_suffix - if [[ ${BASH_IS_SLOTTED} == 1 ]] ; then - bash_suffix="-${BASH_SLOT}" + if [[ ${SLOTTED_BASH} == 1 ]] ; then + bash_suffix="-${MANGLED_PV}" fi # This path matches the bash sources. If we ever change bash,