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 63ADC15813A for ; Thu, 09 Jan 2025 00:28:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26686E077A; Thu, 09 Jan 2025 00:28:38 +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 040C4E077A for ; Thu, 09 Jan 2025 00:28:38 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C97A342FA7 for ; Thu, 09 Jan 2025 00:28:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 755611DD4 for ; Thu, 09 Jan 2025 00:28:35 +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: <1736382458.95ea0eaa51d21f9599664f7c7ceeda51f8ffff2e.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: 95ea0eaa51d21f9599664f7c7ceeda51f8ffff2e X-VCS-Branch: master Date: Thu, 09 Jan 2025 00:28:35 +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: 3e0cac8b-8089-41a3-a6ca-478407f26cb9 X-Archives-Hash: f81b106e53e2e15a2ca12db2bbc85d49 commit: 95ea0eaa51d21f9599664f7c7ceeda51f8ffff2e Author: Sam James gentoo org> AuthorDate: Thu Jan 9 00:27:38 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 9 00:27:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ea0eaa app-shells/bashdb: adjust ebuild for future bash-5.2 / non-slotted Signed-off-by: Sam James gentoo.org> app-shells/bashdb/bashdb-5.1_pre20240617.ebuild | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild b/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild index aa4a37d1a14e..2468ebc8a2a9 100644 --- a/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild +++ b/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild @@ -3,6 +3,14 @@ EAPI=8 +# Set to 1 for older versions of bash (that are hence slotted) +BASH_IS_SLOTTED=1 + +if [[ ${BASH_IS_SLOTTED} == 1 ]] ; then + BASH_SLOT="${PV:0:3}" +else + BASH_SLOT="0" +fi MY_P="${PN}-${PV:0:3}-${PV:4}" DESCRIPTION="bash source code debugging" HOMEPAGE="http://bashdb.sourceforge.net/" @@ -28,7 +36,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -DEPEND="app-shells/bash:${PV:0:3}" +DEPEND=">=app-shells/bash-${BASH_SLOT}:${BASH_SLOT}" RDEPEND="${DEPEND}" # test-bug-loc fails with formatting differences @@ -44,9 +52,14 @@ src_prepare() { } src_configure() { + local bash_suffix + if [[ ${BASH_IS_SLOTTED} == 1 ]] ; then + bash_suffix="-${BASH_SLOT}" + fi + # This path matches the bash sources. If we ever change bash, # we'll probably have to change this to match (bug #591994). CONFIG_SHELL="${BROOT}"/bin/bash econf \ - --with-bash="${EPREFIX}"/bin/bash-${PV:0:3} \ + --with-bash="${EPREFIX}"/bin/bash${bash_suffix} \ --with-dbg-main='$(PKGDATADIR)/bashdb-main.inc' }