gentoo resync : 18.11.2018

8 files changed, 44 insertions, 103 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index ba655079bf01..8258c0881dbd 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bashdb/Manifest b/app-shells/bashdb/Manifest
index 4e757e5ab7b2..f53bb386166d 100644
--- a/app-shells/bashdb/Manifest
+++ b/app-shells/bashdb/Manifest
@@ -1,7 +1,10 @@
 DIST bashdb-4.3-0.91.tar.bz2 660370 BLAKE2B 5d0872cc637be064c4f620ea5f060335865bddcae0652978f3b2f529b16c7dbcffabdecbd8940a4178830714bdfa16a7e7326c67de87f590d543143e024b0dcd SHA512 903710e61efcf272213c3dcc20799842e8ef969e791e3d1a8eab071e5b7538a195f621320945019611042ed623d005e481bd75724194cc10cb6f668b615ce3af
 DIST bashdb-4.4-0.92.tar.bz2 678961 BLAKE2B a47e964653238452fcad6f4e098df64de4d230a796ccecafb09829727fa21521c9a28faac8a3d65b14a9689a15d45ae9ea5f087ca30d8d9f28eec7335e2a14f5 SHA512 68d5cdf4fb6cbacb0e7b69fb793ab9ead3114e152ea87dfb9d540103c9975af8dcaa78ad9a89b00a0f85f3ab1f090d9b6ca6a13c3e09673b5ab073762500fb80
 DIST bashdb-4.4-0.94.tar.bz2 810610 BLAKE2B fa3a68349b0ab64e17c094c34b82c8ba054a86f83452bab50a55bc9f63181459fd49a7a39e2e7a7c66063ac291b8f2a03d4ba6b834a3d5869d2fe9b099f4eb2b SHA512 97e7d057f16d90d7f1677e1b29d2467d5ee263e9aaad64e2d7a8b8a19b3f3ca68023f23a45faea235fdba57e803fae762a19aab67f650b81e868a8a01c5b1fb7
+DIST bashdb-4.4-1.0.0-missing-test-files.tar.xz 996 BLAKE2B 7ea67884cceda11559cf49355645cad2cfd485537643ad2fa05398518f498163596b6f591756bedd0e7b7e013fed3c6a031e245d15cd0cf316d42ef4f5c8b3e6 SHA512 e19d41569c2001ce026e4c5f80cc21c81651ff9980be059236c45e215162769ceda266eb46aa4199000e377c0bb53dec98fa1b7c5290459c412f21329b3589a5
+DIST bashdb-4.4-1.0.0.tar.bz2 701749 BLAKE2B 2fa4bfd21f6c646c6bb1c2439dfed870478fb985dd52c8ba716e08fa0312da9adb0c29396594280bce525bb88f15b7398878c7a9bb2a39c078d4e5f17706c20a SHA512 eae45eb221c662e6bbf86814b861992944fcdef221e1bbc7df6c4fd0197022b82fabf4b7e5d583ba4fff94a0b486f71901d42f9df12a8b6a5f564e9236ad37e5
 EBUILD bashdb-4.3.0.91-r2.ebuild 823 BLAKE2B 76e207846110a1c811ef649e5416543abe89bdc4a12511951f669eb5dd84b37222b540a415875404c6a2ef449deae190940eec88cbf55c4090e0559c811d0fb7 SHA512 c033a061731873fb0d2a355f05503a7c259c6b6d21829eaca4956a8c6aea28df6fd77046fa30cdb7b405397446e4ddac1e34e75c6801d5cc45df55edba5f1dc4
 EBUILD bashdb-4.4.0.92.ebuild 837 BLAKE2B 633488ec8ba934ff9a78b00f60ef9a7ab3623caf82658411cd876af9bad656b04dd040ac68e5b7feab89aeb8899f662fb6260a3cf203d0a069ca0115c8ef8c85 SHA512 986bf2b35d7b8d3a22225c3082077334909311b5a1e3b203af391ce17a93223054c592f759526277c7f88e3f69636a543f8db89c4641a77eff3ad199db020df0
 EBUILD bashdb-4.4.0.94.ebuild 837 BLAKE2B 235d50ad42282afbe67ef7a6ce742461983610f6061f42de8fcd190e15312aabbe79fd98bb4ee9a2f6d977d93d6595a130e6401a215ed5ee1fc872ccdcfc67b9 SHA512 f9adef378b907f9ed78e433c39a67a0801b664774b63c1aa76615b9e414491997549c71398952818d7e69c58c49ada1e0049bbae3fbc0789b4f7cd59efa4b4b2
+EBUILD bashdb-4.4.1.0.0.ebuild 1039 BLAKE2B 7a0c8e1b2f6c9540427f905cb374045d4e328445ab782da5981522d1147f38bfc9f4037caf3ff0f5265511e452eefca338859163dc8be2cd0e78d2c6ca3cf52f SHA512 c63ec5fffb2954227002d697d8e85263c8b5224f69b308111c3acd89ee236f1ee649c368bc528f3657e06af468db780e3f5d641f807bf16aeb24c6d3a0955683
 MISC metadata.xml 333 BLAKE2B 3d15d5b1c4dc17fb6eb805020e6cacb0b835ec4113cccec2756d5b3ccd6be5ce427383598b136f9e13280452e1d9252a609671d3016fffd14ccd898fa7553ad8 SHA512 eb1b078a7e431900181f558710bba93fb5c4633733364664e85e07b4bd05c8ba7492948d4a3ac8cb4866f128b116d82b5b6f1c8b2966318fb9ed61a9c78dda82
diff --git a/app-shells/bashdb/bashdb-4.4.1.0.0.ebuild b/app-shells/bashdb/bashdb-4.4.1.0.0.ebuild
new file mode 100644
index 000000000000..2e08dfbbd120
--- /dev/null
+++ b/app-shells/bashdb/bashdb-4.4.1.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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"
+
+DEPEND="!>=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'
+}
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index 2ba079bd5850..7eb3a517e622 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,10 +1,4 @@
 AUX hstr-1.23-tinfo.patch 481 BLAKE2B 3279671caf216d810c3fef490c5ae219906e59430dc15a850118bbafe49140f46fb1645be1c0a8a8977c795af018164027f928d4fcb0a664186c97f2b968edfb SHA512 64c1e0a5b2ee28354f85563472dd301a9e45eb568fe74c0d601765ee25095650320b8f853c95280f294f323eec6b7f9a155c2a09a5fde2e52568d2c9809c1e91
-DIST hstr-1.23.tar.gz 47239 BLAKE2B dec630f1e8161edc40544561dd85ea1c128a6704eeeaeb39eb6987bdc096a070c9e242b938bed01b80e208aadf08606518a007919d353f76ff1c36e7906aeabb SHA512 234c72587d0492d788b1c001b5e53f74820790a9ebe670e8abd28cd82fc7db65996d54160e675055be54cab110686838fe6e36dbefe0fbef9175613633bc5910
-DIST hstr-1.24.tar.gz 47523 BLAKE2B 6e84ea6bd26cb0745f48e5f8701d4d956ae4b83ed825398fdc401fd0b7f13eb9874de62d438e71a57fa048a535a538504e7fabd7b4a698665a10a901e0a570e6 SHA512 fe522374e33150007c0bbe5d11d38e63c355519350f5777c8787aae62826553b61a358185994d196d015590649fb3accf75948e340233459409d594e51874658
-DIST hstr-1.25.tar.gz 48926 BLAKE2B ee27adaabcf8c28d10c2188d9570e92609192712e54e73a7904dc32e02805e564d4abcad60d506a961c0d9266c62a4fe1b4ef42171efd8f60d1234bbc9f4921d SHA512 83c6250b1627bf185a572a7278a23f1e779d8f926f62fe341644f0d26b4f9daac8d904a5fe5af63e963a2ec15b7d98ee229bd5f812ee0d167bd2a12ee2e57467
 DIST hstr-2.0.tar.gz 1242802 BLAKE2B 24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e SHA512 50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7
-EBUILD hstr-1.23.ebuild 637 BLAKE2B f1af596ccaa3c5460acc5b8f49e5b38f529e7a86393ed5929ee67efaf67aed9ce2bc0242ef2696d58c88360a31ae56a046289e0978b2b61f1498d88947f2d917 SHA512 890b59a4e75d3bb1d11a586c9b8e840bc4303ea14520d4a9f7b877c7eb39661ff86bd38a81b2900f12ee05439ea0535595983021cfe4f12a5d38ec84b54a98c3
-EBUILD hstr-1.24.ebuild 639 BLAKE2B d8dd06c98a24245775915829f378a8561f97dfb11c076bf74cdae5d765ad7f66cc9119ba8ce7472102ee269b4d919c6320137a9df11ea2308ef5602fd43ef13c SHA512 a5ef7818c2e7f77e34d8f3c8612d626609cea02bf9f8d30da00a2a2dfa390cd782ef89feb0517ab7a08360782351436502510a45131baf39df5171521b418bff
-EBUILD hstr-1.25.ebuild 641 BLAKE2B 2256e2b6b9ace003039db68afde3e1e049dc6835e52318ca61bcd016caa5ad6e4b7e164f31e18948cc743d8e314b7d02cdea528c617fcb44a03c6ee7abe6b88f SHA512 122c90303b6ae74bec9d10af6f0e6b9c5dd9d1ddedb4791a934a8ba45eb853419a03f095c7ed6870d9869d13555f6aff4b14339a3af09a6a306e783f111cd97d
-EBUILD hstr-2.0.ebuild 641 BLAKE2B 2256e2b6b9ace003039db68afde3e1e049dc6835e52318ca61bcd016caa5ad6e4b7e164f31e18948cc743d8e314b7d02cdea528c617fcb44a03c6ee7abe6b88f SHA512 122c90303b6ae74bec9d10af6f0e6b9c5dd9d1ddedb4791a934a8ba45eb853419a03f095c7ed6870d9869d13555f6aff4b14339a3af09a6a306e783f111cd97d
+EBUILD hstr-2.0.ebuild 636 BLAKE2B 4a85942441e64790304b6e1fc4266065cc2d58d3138a00b7e405fa06184f2c587fb5b75af8f7b4dd42421d4b3d743ad50364c09c505fcbecd331348fcb4217f3 SHA512 f68e70872e5f53190c5325f8eb0fa1a32e12ed06f4953a0ea9238c2d5844c23a4147bb504c4b3261fc066975128da58beea06a51423993abbedb47c6c6d37f8b
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/hstr-1.23.ebuild b/app-shells/hstr/hstr-1.23.ebuild
deleted file mode 100644
index 6fbe6ef2f86a..000000000000
--- a/app-shells/hstr/hstr-1.23.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Shell history suggest box"
-HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
-SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86 ~amd64-fbsd"
-
-RDEPEND="sys-libs/ncurses:0="
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CONFIGURATION.md README.md )
-PATCHES=( "${FILESDIR}/${PN}-1.23-tinfo.patch" )
-
-src_prepare() {
-	default
-	sed \
-		-e 's:-O2::g' \
-		-i src/Makefile.am || die
-	eautoreconf
-}
diff --git a/app-shells/hstr/hstr-1.24.ebuild b/app-shells/hstr/hstr-1.24.ebuild
deleted file mode 100644
index 4e958038c0c9..000000000000
--- a/app-shells/hstr/hstr-1.24.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Shell history suggest box"
-HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
-SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
-
-RDEPEND="sys-libs/ncurses:0="
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CONFIGURATION.md README.md )
-PATCHES=( "${FILESDIR}/${PN}-1.23-tinfo.patch" )
-
-src_prepare() {
-	default
-	sed \
-		-e 's:-O2::g' \
-		-i src/Makefile.am || die
-	eautoreconf
-}
diff --git a/app-shells/hstr/hstr-1.25.ebuild b/app-shells/hstr/hstr-1.25.ebuild
deleted file mode 100644
index dbe778861aab..000000000000
--- a/app-shells/hstr/hstr-1.25.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Shell history suggest box"
-HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
-SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
-
-RDEPEND="
-	sys-libs/ncurses:0="
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CONFIGURATION.md README.md )
-PATCHES=( "${FILESDIR}/${PN}-1.23-tinfo.patch" )
-
-src_prepare() {
-	default
-	sed \
-		-e 's:-O2::g' \
-		-i src/Makefile.am || die
-	eautoreconf
-}
diff --git a/app-shells/hstr/hstr-2.0.ebuild b/app-shells/hstr/hstr-2.0.ebuild
index dbe778861aab..69a54df0bce8 100644
--- a/app-shells/hstr/hstr-2.0.ebuild
+++ b/app-shells/hstr/hstr-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd"
 
 RDEPEND="
 	sys-libs/ncurses:0="