gentoo auto-resync : 09:01:2025 - 06:41:15

4 files changed, 83 insertions, 12 deletions

diff --git a/app-shells/bashdb/Manifest b/app-shells/bashdb/Manifest
index fc43f4822066..8bbeb4deb217 100644
--- a/app-shells/bashdb/Manifest
+++ b/app-shells/bashdb/Manifest
@@ -1,4 +1,6 @@
 DIST bashdb-4.4-1.0.0-missing-test-files.tar.xz 996 BLAKE2B 7ea67884cceda11559cf49355645cad2cfd485537643ad2fa05398518f498163596b6f591756bedd0e7b7e013fed3c6a031e245d15cd0cf316d42ef4f5c8b3e6 SHA512 e19d41569c2001ce026e4c5f80cc21c81651ff9980be059236c45e215162769ceda266eb46aa4199000e377c0bb53dec98fa1b7c5290459c412f21329b3589a5
 DIST bashdb-5.0-1.1.2.tar.bz2 574210 BLAKE2B 6de1cac2cb66022f60ab7f0385361762fedee56c26729f22acb070e24a7bcf317700fb5db314c1592b8f9ccf9f7d07bfc80afd5fc88a753d0ad2954325a7f078 SHA512 32ff6d315e8cf9d59485802d5284fde53fa2d9f40ec238428a479f8a1ed1359e9bea2946b192b78534e7ac835491d5d64d73f536c8dfa93583b4c6d55d4d4545
-EBUILD bashdb-5.0.1.1.2.ebuild 1070 BLAKE2B 44d18df6f661b4e44ac2e430e802d458ecc2d79589b33051b473c69875a323dbe0626ced7b22273db3f1770a9b86d770a16367eccdc7683351bfb9a9b5dffcf3 SHA512 6e7a98fc01d65cb2c546b0389f64dcef46cca129dc8a20ff2c999624ea4a9e5e6ccc75f1c33b0455386f9497e4390b887c1170f627e62b3f0aa91df62b56e5bc
-MISC metadata.xml 244 BLAKE2B c23abbab2e247161218cc0dc192e9307a9ebc48213c4ce2091ee62160b15a84e7ccdbba84b0059e8b535d00345a4f75bc91acc19583293ffa0c6068ad322d9f7 SHA512 e3052359d186fd6b92658206ff83c39396fdd873c4fec15f8c010068ffd3079bc507c0e9530da1f77e701f45157eb817187e952800c01a2c17cf6ced1c9d9262
+DIST bashdb-5.1_pre20240617.gh.tar.gz 690536 BLAKE2B b8c736ea16f90c14ebcbe06ae6dcdcc8187161e94ca5672f9078366161afec77bd54e95f0782ec4204f6997b173844f288d9cd39a03539e83447fcdc33cc6545 SHA512 748de6d3a7a30ce59269ec953f3d2ee71d50a92038001f3a74ef758225d77de6db906945936a20439869442ac995001ef26c394050d6e73f5a1c288022faaaec
+EBUILD bashdb-5.0.1.1.2-r1.ebuild 1141 BLAKE2B 40f008fcbca7968aed07ab08310e27c4f6a4ec8dd62df1e897016e7ce609d5f6bff85d50ca0240de5fdcc35a5b18c758d25a0bdcbf35c19eb636505789b7f5a9 SHA512 83fddeb8d86790b160b2f75bd623d76f29766f9a0cbffc4615f441199f657d5b43e250134d1cc481a1d86405b2ff837595b117a9fa64ee7c7d3b7537a0b06a93
+EBUILD bashdb-5.1_pre20240617.ebuild 1649 BLAKE2B cd80b00fbd6aed0895a8701ff4868e79831f3ec2237476914813b7f4b1966eaa2beced7625b7cbd522aa6fc6a3bca795b59dec5c77018257af5ba1d3039de5e1 SHA512 7bdaaf00bab12643c334f50abc22d48c15b67ae10ddeb5650bcb3f0da3e9d7914a60513549b45b5242af172554fb89c3aae27453ed3fa652a887fd94146bc962
+MISC metadata.xml 307 BLAKE2B c2e8705973bf72ae22aed727d054c7c3f16b20e8bdab01d7b87a95fe2a3ea830f319f5b5eaf48c7881bc57de2eeb82bb649551542c659d14506fcaa13fd97aaf SHA512 f70f910fc9b2f032a8efafb902ffa3b11b84148cde370a3f2edd7b1cf8a803a6134fa7ca728f7249c63dfc7d97a3c3df4df799b992cd3ed31b37a5dac23b3236
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
index d73f4c54fbbd..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-2024 Gentoo Authors
+# 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,10 +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
@@ -35,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
-	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'
 }
diff --git a/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild b/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild
new file mode 100644
index 000000000000..2468ebc8a2a9
--- /dev/null
+++ b/app-shells/bashdb/bashdb-5.1_pre20240617.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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/"
+
+if [[ ${PV} == *_pre* ]] ; then
+	inherit autotools
+
+	# bashdb for newer bash versions doesn't (yet?) have tags, so we
+	# take snapshots. Make sure to pick the right branch.
+	BASHDB_COMMIT="11150b3bee22215632143942ade99b5f2441c4ca"
+	SRC_URI="
+		https://github.com/Trepan-Debuggers/bashdb/archive/${BASHDB_COMMIT}.tar.gz -> ${P}.gh.tar.gz
+	"
+	S="${WORKDIR}"/${PN}-${BASHDB_COMMIT}
+else
+	SRC_URI="
+		https://downloads.sourceforge.net/bashdb/${MY_P}.tar.bz2
+	"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND=">=app-shells/bash-${BASH_SLOT}:${BASH_SLOT}"
+RDEPEND="${DEPEND}"
+
+# test-bug-loc fails with formatting differences
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *_pre* ]] && eautoreconf
+
+	# We don't install this, so don't bother building it. #468044
+	sed -i 's:texi2html:true:' doc/Makefile.in || die
+}
+
+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${bash_suffix} \
+		--with-dbg-main='$(PKGDATADIR)/bashdb-main.inc'
+}
diff --git a/app-shells/bashdb/metadata.xml b/app-shells/bashdb/metadata.xml
index c410fc64f546..97949e8bc810 100644
--- a/app-shells/bashdb/metadata.xml
+++ b/app-shells/bashdb/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">bashdb</remote-id>
+		<remote-id type="github">Trepan-Debuggers/bashdb</remote-id>
 	</upstream>
 </pkgmetadata>