gentoo auto-resync : 17:07:2024 - 12:28:31

4 files changed, 39 insertions, 85 deletions

diff --git a/dev-debug/cgdb/Manifest b/dev-debug/cgdb/Manifest
index 29527b38e3c1..7686d4cb4356 100644
--- a/dev-debug/cgdb/Manifest
+++ b/dev-debug/cgdb/Manifest
@@ -1,10 +1,9 @@
 AUX cgdb-0.7.1-respect-AR.patch 807 BLAKE2B 6689327f2a41f52d772b1d1f2714bac4f4cd40e994b51c6b12a8c9c5d40ed6616cb03128753e60bb773a6c6b46d26fb6d9d80c67c0ac8432e5f17e34b70105d8 SHA512 db51c83bec17cf05e9b8dfc7d92b253999e545c2c1a002db2f63edc0a08d0c831fa6b4b5177e972844755f4df455ec268e5b3554115f5fdeafa071d1df0dd4bc
 AUX cgdb-0.8.0-ar.patch 469 BLAKE2B e0633baffddab3d298f1a5ef7bb6c39138a01f639d58121fc4d52fc2b5aa1244fb6ebb848fb301f71f8bd5a2ab629c7fd0771e3bc73bc999c12e0f4b5dc48164 SHA512 e0c60ea8f3c5e89071e38f5b3b42c54a6f1cb39715c0b77fd72c6c7453da1ff16c2edced39a788b905400f635ed4a74e9b531b3e72879fa3c62b949bb1e1147d
+AUX cgdb-0.8.0-configure-c99.patch 708 BLAKE2B 68f040f56279914a552c1123c2b191ae1ebb46a336aa488dbef95dd61cc6951efa84417fd68e6f65a13026aabc03a58c402897dbb5b126bc8ac3ad5da7c3cbdb SHA512 7cdf870d92552e44ad9ee09406983130897e05995aee5366e19d47a83cb370edd191a468693f56761fb06ad376fdc2624cb0a3352e1b84d0df2b19dec75ff9aa
 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 1deadc0b7c8812ef91d4a1019c6883f98f2114fd0a29e7de38507c1eddbd83ea0bc5f2a937112ffaa11673434d32bf24de4f73728f8050e713c5869890aa04ba SHA512 bf337be44c4729028621db8d58d2850d92e33b1a8843f27de991de4049b76b7113a4d7ca14989abf3a1d15978d464577dc9b956ff8e38524b2ea78c130781bfc
-EBUILD cgdb-0.8.0.ebuild 1470 BLAKE2B cfa57fd5d053826e29ffb3e71eab49da522bede2ef83885efd7aea724f146db86b7f6176a5778c979da65fac9338c7d251a456b00fa4dc6dfb9cf07f1195114d SHA512 82dad9ce5f26c4a87cc017c087debf857ab98d7a5fa62d719d554cc10ecb2ee2f6f81a2888e39a10ae5814054ea47e8c40806f77eb28d652e3a53c10ced67370
+EBUILD cgdb-0.8.0.ebuild 1543 BLAKE2B 4b659dbf9c946606f12e7ec293b13002b49956a3be01a841e30e782d0a86f9f41a1d451a222d9e73bf84e8b9fe6ec193921e3f45eb09919ea6063be13db34cf3 SHA512 00babcd6e46980ab412a5065cad52c016794092abde6e50a854560a5155a3bc24b6d72866ae74493da99aa655757668d3d818c0fe9f1d84a9a168a6417739830
 EBUILD cgdb-9999.ebuild 1475 BLAKE2B 6a67d5ae4407058d33c10145d3dd5e8b501f2a8d5c35f65e13f26f6cd9bc765553c984cea9594026feaa620881d3b31b0e347af63f1b2a8c03bb57d602db3e1b SHA512 9dc66403c54dbbefa88e3d67f488d2a72e271ecad9ac33f50cbbfc14e42a78f1e999777570375f72a56abbef0988eaedd952f885ba1c491f306b77bcb9be14b8
 MISC metadata.xml 291 BLAKE2B 10d0b1b36ae41f63a8dac8cae9860c08141b6bddad3672fa8f6649cdc50e545ee2c8f1ebd800b4026dd32dfa5e8545380a68765d5539617d971229e90535407b SHA512 b7dcb0521d63080ce670d3195bd56fe54af7d3fa3d2f0f2eaee2f1ee93a14106facffb67f1e82ff49768c90133ceaf7dc57df089b86a98f67007df1089471d77
diff --git a/dev-debug/cgdb/cgdb-0.7.1.ebuild b/dev-debug/cgdb/cgdb-0.7.1.ebuild
deleted file mode 100644
index 970c6382192f..000000000000
--- a/dev-debug/cgdb/cgdb-0.7.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="
-		https://github.com/cgdb/cgdb.git
-		git@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"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-
-BDEPEND="
-	test? (
-		dev-util/dejagnu
-		app-misc/dtach
-	)"
-
-RDEPEND="
-	${DEPEND}
-	dev-debug/gdb"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
-
-PATCHES=(
-	# Bugs: #730138, #678006, #630512
-	"${FILESDIR}/${PN}-test.patch"
-	# Bug: #724256
-	"${FILESDIR}/${P}-respect-AR.patch"
-)
-
-src_prepare() {
-	default
-	cp configure.{init,ac} || die "cp failed"
-	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-debug/cgdb/cgdb-0.8.0.ebuild b/dev-debug/cgdb/cgdb-0.8.0.ebuild
index fad641ffce59..4c8395ac8b3f 100644
--- a/dev-debug/cgdb/cgdb-0.8.0.ebuild
+++ b/dev-debug/cgdb/cgdb-0.8.0.ebuild
@@ -24,23 +24,26 @@ IUSE="test"
 RESTRICT="test"
 
 DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+"
 BDEPEND="
+	sys-devel/flex
 	test? (
 		dev-util/dejagnu
 		app-misc/dtach
-	)"
-
+	)
+"
 RDEPEND="
 	${DEPEND}
-	dev-debug/gdb"
+	dev-debug/gdb
+"
 
 DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${PN}-0.8.0-configure-c99.patch
 )
 
 src_prepare() {
@@ -48,6 +51,11 @@ src_prepare() {
 	AT_M4DIR="config" eautoreconf
 }
 
+multilib_src_configure() {
+	unset LEX
+	ECONF_SOURCE="${S}" econf
+}
+
 multilib_src_test() {
 	# Tests need an interactive shell, #654986
 
@@ -63,7 +71,3 @@ multilib_src_test() {
 	[[ -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-debug/cgdb/files/cgdb-0.8.0-configure-c99.patch b/dev-debug/cgdb/files/cgdb-0.8.0-configure-c99.patch
new file mode 100644
index 000000000000..bd021476bf53
--- /dev/null
+++ b/dev-debug/cgdb/files/cgdb-0.8.0-configure-c99.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/830222
+https://github.com/cgdb/cgdb/pull/338
+
+From 039dba0ec3ae2c4b2636418652a5c63f9ff86049 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 8 Mar 2023 11:29:06 +0100
+Subject: [PATCH] configure: Avoid implicit int in readline check
+
+Future compilers will not accept implicit ints by default, altering
+the outcome of the check without this change.
+
+Signed-off-by: Florian Weimer <fweimer@redhat.com>
+--- a/config/readline_check_version.m4
++++ b/config/readline_check_version.m4
+@@ -86,7 +86,7 @@ AC_CACHE_VAL(ac_cv_rl_version,
+ #include <stdlib.h>
+ #include <readline/readline.h>
+ 
+-main()
++int main(void)
+ {
+ 	FILE *fp;
+ 	fp = fopen("conftest.rlv", "w");