gentoo resync : 05.04.2019

5 files changed, 53 insertions, 55 deletions

diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index 4f15d73f1c1d..2bd6c90eb9a0 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,10 +1,6 @@
-DIST cgdb-0.6.6.tar.gz 954789 BLAKE2B 71a095ce0237dc00e8387349818a9af5d5afd6d3ba72f0835eab80e674bb3c2934dca361b58fe70115db3b0315cf2cd34e60640f0d10fee75c261a8cbc3d231b SHA512 9efd4e60f07f6e189fe3c91ef52c1b3c8d70623b11d08bac6d78c36e8f8f549071448212db973974b9604f84aafc73697d9d1305c3d9691fb5f19346d2e04e8f
-DIST cgdb-0.6.7.tar.gz 674132 BLAKE2B 5378bffd3bed99934b83c1db82baea86d24f83c4e586d0695193bd5ee864ca0c76ea493187ffb307d16610b2e5a8bcdd9c4b2949c1e00299eb20ceab7dd609a0 SHA512 0a9d1cc3fb00c3cdaeb060d20d3312dd738b617ff1b188db33a074e2790f9721ca58e924ecc9929b84832c3ca22a334d7a66294439341a9b6868eef1baafca3e
 DIST cgdb-0.6.8.tar.gz 435115 BLAKE2B 31efcd8740dc0a0354c8d655cd7b77b18b25842dc39d1de42a92917305879394b425d7a7b0e555b368fc6a67f535fe9244c3fedeec9105c3622ace313b24c8c8 SHA512 ef3d94820bb5a37a8d7fbac48c8d144e0ac73c4f5a9d25bea33f2c4390080bb2dbdc5e7e21a5ef8a4980515cc48d80f140f7cf1f90eebac3f8bf1cc6168585ea
 DIST cgdb-0.7.0.tar.gz 319980 BLAKE2B bfc62f9214f6726e5df081119e85ccdeaea9a2310a9bb7a1746525ab998ea94ec1181efd3a1986ec0d33103c2f2b888e4d93c4ddaa4a996db4e47b0173c3b67c SHA512 83aeb919e96cd0981d8fe5cdd257df3e8d8bfbceea720ea66c1773b28c9f0ecb0e303e0585206c55242bc4438d505e328d43b4991c6ddc4e4202e048558c30d9
-EBUILD cgdb-0.6.6.ebuild 446 BLAKE2B 6916fd61e26daf6d29f59ae01772cfc7144ba34e9f056cc132e95cdd3879b51a15ae897528e0fd4e1e77a69e6ae8b159665edcc4e8ca81440faba1c8325cb556 SHA512 8b42cf87241b9ea21930d581e23792d8f8fdbfded7b32e00d2c49d52fdc48c9cb0fa4e30638467c66b3baffaaa4c40e221f1b5cfb5a6bba0e46b7ba70285cb2c
-EBUILD cgdb-0.6.7.ebuild 448 BLAKE2B e5d0ffc9397a430d76d3b67567ffe0a512bca902bc975193bc8ba01f570dd7b1e4de68cb26ee94efe528811fd15442f74af6e6188d56b5ae69306f5d21b28535 SHA512 00ad998f1b28cf7a99e78841943a973ee5f5a3e2888c4c749e68f36d082f20a2d518dfad0ac4dc493dc77d1549fe97c4f45fbd3782fe5e4b776ebf076b17ac8e
 EBUILD cgdb-0.6.8.ebuild 878 BLAKE2B 3f645a5f31c9a450a2426c4060d1cfa6041f5a3249565bf1baf0490f8e3894a17317c8ba0c88d0754c795f6ab072a667ab606a046a56b9449f5c01a6f660d026 SHA512 ef2ec446e1a58ebdc3e66d2097af59d8afbc573fdb8ca98da9a0bab71d6ad755ab0832f1d1028bc4d3148f68326a4d054242d7293ce73f54f128d80bb0f955ed
-EBUILD cgdb-0.7.0.ebuild 881 BLAKE2B 778de1aa175ab0ac9db729fab025ae1e1781e612b9a238a57dd7687c0458440bd468f940171dabf7e11de7d9ab76eef8a01df6f55941a2171eed220e205b5a75 SHA512 4fbb20d6d8e82979b5b81763dcf635f24a589ea12a1c00ecde694901a5747a90dc5a7ccb186f20329aa7d717aeb6d7d01469921b5a292c0446bd3d1d2f00cf9a
-EBUILD cgdb-9999.ebuild 881 BLAKE2B 5a3c6dc5bf761930537591428bc8f33df50ed1c93f1267eacb487d8e0ad8328606d7d8f5c7adb8c6e2cf945a328b2cd6fe3190dba7ae7e242fc4997e8941863a SHA512 ee777392e48feed140699b68c956da91dd38fca82d03facc6c45061ca1f1b11432af9667da84462dbf09c03cf40abcc9933611458d07e6333dc562958b68b106
+EBUILD cgdb-0.7.0-r1.ebuild 1334 BLAKE2B 24a7d37bbd9e055e105ee98ee4a982e5c1d38a61d60af61f70790fd3c4b50ec28d7fb33776d9b7bbd4d5b10b93e80f79bc6a223093cad1e92547255aae55f63a SHA512 6a9177d86a0a247d20f15621b3ac6b93c1f836fb004080f4c9e27222705c385318b96cfe23299e6f272a74530f2b0661a721f1960b8ca9f007a407c003a8d9ff
+EBUILD cgdb-9999.ebuild 1334 BLAKE2B 24a7d37bbd9e055e105ee98ee4a982e5c1d38a61d60af61f70790fd3c4b50ec28d7fb33776d9b7bbd4d5b10b93e80f79bc6a223093cad1e92547255aae55f63a SHA512 6a9177d86a0a247d20f15621b3ac6b93c1f836fb004080f4c9e27222705c385318b96cfe23299e6f272a74530f2b0661a721f1960b8ca9f007a407c003a8d9ff
 MISC metadata.xml 490 BLAKE2B 9eaa4ae0475e04d725f775f49d5bf57d7d0a00b53cfa1c0e67868d0127121f640ac304aef1c8d0c120666c03e815ab928b217800b2bf92e1bcbec9ed81a3519f SHA512 77ac0f28241716628619178ae93599276f8fd6051b7f00c5ef7fdfcd0a651cdd465dfde6de052156c8407d6a162a2a21199260001e06dd80e6eec8200bc11097
diff --git a/dev-util/cgdb/cgdb-0.6.6.ebuild b/dev-util/cgdb/cgdb-0.6.6.ebuild
deleted file mode 100644
index 5778250bac4c..000000000000
--- a/dev-util/cgdb/cgdb-0.6.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cgdb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	>=sys-libs/readline-5.1-r2"
-RDEPEND="${DEPEND}
-	sys-devel/gdb"
diff --git a/dev-util/cgdb/cgdb-0.6.7.ebuild b/dev-util/cgdb/cgdb-0.6.7.ebuild
deleted file mode 100644
index fd2095ed0c6f..000000000000
--- a/dev-util/cgdb/cgdb-0.6.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.github.io/"
-SRC_URI="http://cgdb.me/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	>=sys-libs/readline-5.1-r2"
-RDEPEND="${DEPEND}
-	sys-devel/gdb"
diff --git a/dev-util/cgdb/cgdb-0.7.0.ebuild b/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
index f1e40470f225..b4fe338de7f7 100644
--- a/dev-util/cgdb/cgdb-0.7.0.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -20,15 +20,18 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
 
-COMMONDEPEND="
+DEPEND="
 	sys-libs/ncurses:0=
 	sys-libs/readline:0="
 
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/dejagnu )"
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		app-misc/dtach
+	)"
 
 RDEPEND="
-	${COMMONDEPEND}
+	${DEPEND}
 	sys-devel/gdb"
 
 DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
@@ -38,6 +41,22 @@ src_prepare() {
 	./autogen.sh || die
 }
 
+multilib_src_test() {
+	# Tests need an interactive shell, #654986
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
 }
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index 5a5dd25473fd..b4fe338de7f7 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -20,24 +20,43 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
 
-COMMONDEPEND="
+DEPEND="
 	sys-libs/ncurses:0=
 	sys-libs/readline:0="
 
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/dejagnu )"
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		app-misc/dtach
+	)"
 
 RDEPEND="
-	${COMMONDEPEND}
+	${DEPEND}
 	sys-devel/gdb"
 
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README.md FAQ )
+DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 
 src_prepare() {
 	default
 	./autogen.sh || die
 }
 
+multilib_src_test() {
+	# Tests need an interactive shell, #654986
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
 }