gentoo resync : 14.05.2020

3 files changed, 46 insertions, 3 deletions

diff --git a/app-shells/bashdb/Manifest b/app-shells/bashdb/Manifest
index 05932909f782..c45f758f7f51 100644
--- a/app-shells/bashdb/Manifest
+++ b/app-shells/bashdb/Manifest
@@ -1,6 +1,8 @@
 DIST bashdb-4.4-1.0.0-missing-test-files.tar.xz 996 BLAKE2B 7ea67884cceda11559cf49355645cad2cfd485537643ad2fa05398518f498163596b6f591756bedd0e7b7e013fed3c6a031e245d15cd0cf316d42ef4f5c8b3e6 SHA512 e19d41569c2001ce026e4c5f80cc21c81651ff9980be059236c45e215162769ceda266eb46aa4199000e377c0bb53dec98fa1b7c5290459c412f21329b3589a5
 DIST bashdb-4.4-1.0.1.tar.bz2 701807 BLAKE2B 8d41a39831ce9466f5fcd205cf84e337ca7d876fddaea8b8c013fe4ac93a143c9f5b5e46bcc8edbb50fe4c77e87bd282ff9a244e41df007897d3b37f732bb0a3 SHA512 306fc5a49490fe04828cd6c64b23302e0f48ba8558780c93d45d9c615206e91dac5d8ff3d0660e50bc3204873131d1296492bccc23119d2f58c990bd3603221c
 DIST bashdb-5.0-1.1.0.tar.bz2 693459 BLAKE2B f8697c0f4a10b57215b0923cfb49c76536cc75de5273e6ed1709aaa56fcced8c5b3f281f15f01b8bd72363ad7c47acbd6d06a3bb3ba58b9a2daae017c101ae46 SHA512 0da69ea426c57d2f2b3f208356ee893b3fa8b96c68bf321446b5747b6bfb2eac502be6a01e3922fa873684a3953c6a3ded4a30f5682e4030680d698ee5062143
+DIST bashdb-5.0-1.1.2.tar.bz2 574210 BLAKE2B 6de1cac2cb66022f60ab7f0385361762fedee56c26729f22acb070e24a7bcf317700fb5db314c1592b8f9ccf9f7d07bfc80afd5fc88a753d0ad2954325a7f078 SHA512 32ff6d315e8cf9d59485802d5284fde53fa2d9f40ec238428a479f8a1ed1359e9bea2946b192b78534e7ac835491d5d64d73f536c8dfa93583b4c6d55d4d4545
 EBUILD bashdb-4.4.1.0.1.ebuild 1062 BLAKE2B 51762bb709b2c6234197db4c0ad466219a7896dea92c9de7b614f1eb3a53bfc4bcb2991312b9df902d41fc3f67abccb0064846913797260a3f4b863db46bd461 SHA512 ac35a5096a77039d581d037c4857847c7e6e8aa65d447f23fc2492a9d7bba06407cbe325d30afb3889ec8f4dc456e0d0bf9a8bcb365d46df28d9303873f3102e
-EBUILD bashdb-5.0.1.1.0.ebuild 1064 BLAKE2B ea70dfbce1cdc413e11d981152d64f77e15dfd720b1f1e27bbc8cfd81b3a1b2f40b715bc39f5f97d6b2611f4d680918bbfbb12a8e4787f60e645c62074ff6d4b SHA512 a0d9696201f4e6e0672faa1a6f0f65119220dcd43be49743e54dc43435ae6faa38fc72a68ffd4c422c2aded0af3627cd4f306e794974c5bf0994285bdeffd24f
+EBUILD bashdb-5.0.1.1.0.ebuild 1085 BLAKE2B 07ed00ed009971aac23ab31025c1943a9fe2b9efdea156dea6208710c4c74edf81a66d4629ffa8fc71e94ca0f626cd0f5f180e756bf4bc524aaf080126ee0268 SHA512 5b15f0ce3a9ff0885a5c7882fc3fda9019ed0a882bd9068bcc5c4527bfb505a7121a2ff296759474de346372d7e21bbabb168b779966f9ecd5a7c69500518f48
+EBUILD bashdb-5.0.1.1.2.ebuild 1081 BLAKE2B c0bafeb58dd2bd2054184498eebd6d4ca6a4fc867f5a0ee67ee0322dba3603e211c90e8bc1c76aa47fc8a1988ff0fc1d3f27be451cfe8ef1fab05301c21f222d SHA512 6c4f259252dc1a56870c6b72d18520e2f4149d181bba5abd042459bfe07d3a2204728c3f160722c66c47b5565be5e8873e0ce9a4c262fb31ccdf963209a7236a
 MISC metadata.xml 333 BLAKE2B 3d15d5b1c4dc17fb6eb805020e6cacb0b835ec4113cccec2756d5b3ccd6be5ce427383598b136f9e13280452e1d9252a609671d3016fffd14ccd898fa7553ad8 SHA512 eb1b078a7e431900181f558710bba93fb5c4633733364664e85e07b4bd05c8ba7492948d4a3ac8cb4866f128b116d82b5b6f1c8b2966318fb9ed61a9c78dda82
diff --git a/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild b/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
index 0448dc38e718..2d3d4513fe42 100644
--- a/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
+++ b/app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
+DEPEND=">=app-shells/bash-5
+	!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild b/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
new file mode 100644
index 000000000000..01b050fcc7fb
--- /dev/null
+++ b/app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-${PV:0:3}-${PV:4}"
+DESCRIPTION="bash source code debugging"
+HOMEPAGE="http://bashdb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2
+	test? ( https://dev.gentoo.org/~whissi/dist/bashdb/bashdb-4.4-1.0.0-missing-test-files.tar.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+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}"
+
+src_prepare() {
+	if use test ; then
+		einfo "Copying missing files ..."
+		# https://sourceforge.net/p/bashdb/bugs/52/
+		cp -vafn "${WORKDIR}"/missing-files/* "${S}"/test || die
+	fi
+
+	default
+
+	# We don't install this, so don't bother building it. #468044
+	sed -i 's:texi2html:true:' doc/Makefile.in || die
+}
+
+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'
+}