gentoo resync : 02.02.2022

6 files changed, 107 insertions, 16 deletions

diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index e02ac1bfa524..9708d75d6dd9 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,7 +1,10 @@
 AUX cgdb-0.7.1-respect-AR.patch 807 BLAKE2B 6689327f2a41f52d772b1d1f2714bac4f4cd40e994b51c6b12a8c9c5d40ed6616cb03128753e60bb773a6c6b46d26fb6d9d80c67c0ac8432e5f17e34b70105d8 SHA512 db51c83bec17cf05e9b8dfc7d92b253999e545c2c1a002db2f63edc0a08d0c831fa6b4b5177e972844755f4df455ec268e5b3554115f5fdeafa071d1df0dd4bc
-AUX cgdb-9999-respect-AR.patch 378 BLAKE2B 684cd519d7fc856c9d1b66c97b5a8311f136ed0458f73e79bf23ab3a2e84704d5b98480c1d8a7f8eb9a4434d9e6a6e0828e285ebeabe215e9b7d234f16410155 SHA512 e075fee139e373befb1d027ff9ce57910ab2adf877e8e03fbcde9133e494ac0b657acb0a5cd6433fd9d3d39c5766e3d2ab8d5ed69d2b2a6a18f97aed90d96646
+AUX cgdb-0.8.0-ar.patch 469 BLAKE2B e0633baffddab3d298f1a5ef7bb6c39138a01f639d58121fc4d52fc2b5aa1244fb6ebb848fb301f71f8bd5a2ab629c7fd0771e3bc73bc999c12e0f4b5dc48164 SHA512 e0c60ea8f3c5e89071e38f5b3b42c54a6f1cb39715c0b77fd72c6c7453da1ff16c2edced39a788b905400f635ed4a74e9b531b3e72879fa3c62b949bb1e1147d
+AUX cgdb-9999-ar.patch 378 BLAKE2B 684cd519d7fc856c9d1b66c97b5a8311f136ed0458f73e79bf23ab3a2e84704d5b98480c1d8a7f8eb9a4434d9e6a6e0828e285ebeabe215e9b7d234f16410155 SHA512 e075fee139e373befb1d027ff9ce57910ab2adf877e8e03fbcde9133e494ac0b657acb0a5cd6433fd9d3d39c5766e3d2ab8d5ed69d2b2a6a18f97aed90d96646
 AUX cgdb-test.patch 2132 BLAKE2B 7308e2817a0956382a2949baad003ff0adf10989825170fcc953979d9f39da245584de4245d4d86b81e9cb74cccf11628ce3448a736cc3e89ae6e9dfabc3112e SHA512 8c5dde409035134ee75115c99a9b257a6c711750fbf662478d33911a015cccf4bf1a1ee6ec9d72d7075b0ce6dfae98a30ec60f4d2447f958ba322ced71be203c
 DIST cgdb-0.7.1.tar.gz 314768 BLAKE2B 767a57d071fa4e3c75d231a1ec879d871669fcda9c733d157d380fa525dd321f1deb68d7ef7f424b3f36a115043a0a0faae271f24746f934e288ba7d9a4e7fa1 SHA512 050c7bad963d51c1a2cb309530319ca77e9d236f419fb0abac4ab5030ff1068d799fa626959a8b3036321711de98bddf40d264bf9367ff5697075e30ca8168c6
+DIST cgdb-0.8.0.tar.gz 328281 BLAKE2B 60e577dd5f8363b91da33136a9ffd911581e9cea4cdc1d0fcd338e0a761a26921e6edf6298c619b8d0eb1486449843457b2c5370a395a8c49fed5382a60e63a2 SHA512 e2b653db472de2014402dae6d13953ab811526a47ad5d7a05e34cfba09f44d6fea6b19304b9205ff0e2ac9549ffa5818f4282d7c03293b6c0ca9d563f9ae89e1
 EBUILD cgdb-0.7.1.ebuild 1541 BLAKE2B 9ec609c8cd1a8f9b5c89e3ccb160119a5bfc3f31171f056aea03060789cf1813df45702c727600049d76324c548f9f292dc41423b2539b9a3391db9c4264a287 SHA512 647bef5ac18b1f0ba19bbf4e3b2148f760c564cd7f74e4a66721c2417ce46a1605331e29f19615fbc1e843419e8955b42da70494f2c78a770162466c5b072ce0
-EBUILD cgdb-9999.ebuild 1398 BLAKE2B 3e153439307e809ab81f30c9c1d4c4b6f8a1d92cd8a2f2026891b9257a5f4e00e157f342a845a5d2425b658f6633d69393a2ef99856209da343242f1a25b3d74 SHA512 fce4d64f769b1c4d55859514bee9a9f77b05f5e97a2a372baf9ad9f3dcf3ea83ba88340c6aeb4aac996fa66e8535a901a7544852fdd2314bcf60319e619d71dd
-MISC metadata.xml 371 BLAKE2B 374f6b79292f6bcb5e4fb612d7c72e888be0f32d1ef10cda456b168dbd6ae0f6297ba9d508b86c01c1ba2bc979e9466be9dbce776451ba368a9c558cd50ace88 SHA512 139e032fe97e70d530940ef728124a177647c6012263adcf25afba829c5cfbfe9b2bc2cf0a230ea1b93d1628976b3620650d7aefd16a1bb23646b081db2541db
+EBUILD cgdb-0.8.0.ebuild 1475 BLAKE2B acdb9fb5b71f846519346a6492707c961d6f28ff3699f6410c460d1314cec77f64dbd063866060f4d3934f6e980a77b2aea2dbaa740422a83222a2e1d8b1cef0 SHA512 8e7546a49e732727c88aadb3672aea19d75ff41ab2afcd891c821619ab07802178b0e94f7e916e3a5147c95869f2eb538aa1d4dd74c2c8e8b46b28e80d2d610d
+EBUILD cgdb-9999.ebuild 1475 BLAKE2B acdb9fb5b71f846519346a6492707c961d6f28ff3699f6410c460d1314cec77f64dbd063866060f4d3934f6e980a77b2aea2dbaa740422a83222a2e1d8b1cef0 SHA512 8e7546a49e732727c88aadb3672aea19d75ff41ab2afcd891c821619ab07802178b0e94f7e916e3a5147c95869f2eb538aa1d4dd74c2c8e8b46b28e80d2d610d
+MISC metadata.xml 291 BLAKE2B 10d0b1b36ae41f63a8dac8cae9860c08141b6bddad3672fa8f6649cdc50e545ee2c8f1ebd800b4026dd32dfa5e8545380a68765d5539617d971229e90535407b SHA512 b7dcb0521d63080ce670d3195bd56fe54af7d3fa3d2f0f2eaee2f1ee93a14106facffb67f1e82ff49768c90133ceaf7dc57df089b86a98f67007df1089471d77
diff --git a/dev-util/cgdb/cgdb-0.8.0.ebuild b/dev-util/cgdb/cgdb-0.8.0.ebuild
new file mode 100644
index 000000000000..416db639d484
--- /dev/null
+++ b/dev-util/cgdb/cgdb-0.8.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cgdb/cgdb.git"
+else
+	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A curses front-end for GDB, the GNU debugger"
+HOMEPAGE="https://cgdb.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+# Tests are broken, need additional research to figure out the cause
+# Bug: https://bugs.gentoo.org/831899
+RESTRICT="test"
+
+DEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		app-misc/dtach
+	)"
+
+RDEPEND="
+	${DEPEND}
+	sys-devel/gdb"
+
+DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ar.patch
+)
+
+src_prepare() {
+	default
+	AT_M4DIR="config" eautoreconf
+}
+
+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 75f88b51bff1..416db639d484 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/cgdb/cgdb.git"
 	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cgdb/cgdb.git"
 else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
@@ -15,16 +15,17 @@ inherit autotools multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
 HOMEPAGE="https://cgdb.github.io/"
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
-RESTRICT="!test? ( test )"
+# Tests are broken, need additional research to figure out the cause
+# Bug: https://bugs.gentoo.org/831899
+RESTRICT="test"
 
 DEPEND="
-	sys-libs/ncurses:=
+	sys-libs/ncurses:0=
 	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-	sys-devel/gdb"
 
 BDEPEND="
 	test? (
@@ -32,11 +33,14 @@ BDEPEND="
 		app-misc/dtach
 	)"
 
+RDEPEND="
+	${DEPEND}
+	sys-devel/gdb"
+
 DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 
 PATCHES=(
-	# Bug: #724256
-	"${FILESDIR}/${P}-respect-AR.patch"
+	"${FILESDIR}"/${P}-ar.patch
 )
 
 src_prepare() {
diff --git a/dev-util/cgdb/files/cgdb-0.8.0-ar.patch b/dev-util/cgdb/files/cgdb-0.8.0-ar.patch
new file mode 100644
index 000000000000..128c32ec238c
--- /dev/null
+++ b/dev-util/cgdb/files/cgdb-0.8.0-ar.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/724256
+Patch taken from https://github.com/cgdb/cgdb/pull/142
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,6 +13,13 @@ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AM_PROG_LEX
+ AC_PROG_YACC
++m4_ifndef([AC_PROG_AR],[dnl
++  AN_MAKEVAR([AR], [AC_PROG_AR])
++  AN_PROGRAM([ar], [AC_PROG_AR])
++  AC_DEFUN([AC_PROG_AR],
++  [AC_CHECK_TOOL(AR, ar, :)])
++])
++AC_PROG_AR
+ 
+ dnl determine if we are running in linux, cygwin, solaris, or freebsd
+ AC_CANONICAL_HOST
diff --git a/dev-util/cgdb/files/cgdb-9999-respect-AR.patch b/dev-util/cgdb/files/cgdb-9999-ar.patch
index ed5f200b3260..ed5f200b3260 100644
--- a/dev-util/cgdb/files/cgdb-9999-respect-AR.patch
+++ b/dev-util/cgdb/files/cgdb-9999-ar.patch
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index 8b25c5b76d4d..6dfc01c9d272 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jsmolic@gentoo.org</email>
-		<name>Jakov Smolić</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">cgdb/cgdb</remote-id>
 		<remote-id type="sourceforge">cgdb</remote-id>