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 340EA15813A for ; Thu, 09 Jan 2025 00:08:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A5D0E077D; Thu, 09 Jan 2025 00:08:28 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0028DE077D for ; Thu, 09 Jan 2025 00:08:27 +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 F388C342FAA for ; Thu, 09 Jan 2025 00:08:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30DE61DD6 for ; Thu, 09 Jan 2025 00:08:25 +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: <1736381249.2fc310f411d8dbd4da03f31b7e473fdcf2fef626.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.0.1.1.2-r1.ebuild app-shells/bashdb/bashdb-5.0.1.1.2.ebuild X-VCS-Directories: app-shells/bashdb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2fc310f411d8dbd4da03f31b7e473fdcf2fef626 X-VCS-Branch: master Date: Thu, 09 Jan 2025 00:08:25 +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: 051ef827-63b5-4296-b237-7af28a294c84 X-Archives-Hash: b24d43214d0322b77d9eeee700eb4cde commit: 2fc310f411d8dbd4da03f31b7e473fdcf2fef626 Author: Sam James gentoo org> AuthorDate: Wed Jan 8 23:50:33 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 9 00:07:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fc310f4 app-shells/bashdb: EAPI 8, adapt to slotted bash bashdb releases tend to lag (significantly) behind bash releases, so the previous approach from bug #316611 where blockers were added on newer bash isn't really sustainable. Not least as configure aborts on any other bash version. Depend on slotted bash and pass --with-bash with the appropriate version. Bug: https://bugs.gentoo.org/316611 Signed-off-by: Sam James gentoo.org> ...5.0.1.1.2.ebuild => bashdb-5.0.1.1.2-r1.ebuild} | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild b/app-shells/bashdb/bashdb-5.0.1.1.2-r1.ebuild similarity index 70% rename from app-shells/bashdb/bashdb-5.0.1.1.2.ebuild rename to app-shells/bashdb/bashdb-5.0.1.1.2-r1.ebuild index b773dc20f54e..f4018c58806a 100644 --- a/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild +++ b/app-shells/bashdb/bashdb-5.0.1.1.2-r1.ebuild @@ -1,13 +1,16 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_P="${PN}-${PV:0:3}-${PV:4}" DESCRIPTION="bash source code debugging" HOMEPAGE="http://bashdb.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/bashdb/${MY_P}.tar.bz2 - test? ( mirror://gentoo/30/bashdb-4.4-1.0.0-missing-test-files.tar.xz )" +SRC_URI=" + https://downloads.sourceforge.net/bashdb/${MY_P}.tar.bz2 + test? ( mirror://gentoo/30/bashdb-4.4-1.0.0-missing-test-files.tar.xz ) +" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" @@ -15,12 +18,8 @@ KEYWORDS="amd64 ppc ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" -DEPEND=" - >=app-shells/bash-5 - !>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1)) -" - -S="${WORKDIR}/${MY_P}" +DEPEND="app-shells/bash:${PV:0:3}" +RDEPEND="${DEPEND}" src_prepare() { if use test ; then @@ -37,6 +36,8 @@ src_prepare() { src_configure() { # This path matches the bash sources. If we ever change bash, - # we'll probably have to change this to match. #591994 - CONFIG_SHELL="${BROOT}"/bin/bash econf --with-dbg-main='$(PKGDATADIR)/bashdb-main.inc' + # 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-dbg-main='$(PKGDATADIR)/bashdb-main.inc' }