From 791829506b64ae5bb8207aaccb8ae60f0b3ff762 Mon Sep 17 00:00:00 2001
From: Jakov Smolić <jsmolic@gentoo.org>
Date: Mon, 24 Jan 2022 23:23:41 +0100
Subject: dev-util/cgdb: Sync live ebuild
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
---
 dev-util/cgdb/cgdb-9999.ebuild                 | 22 +++++++++++++---------
 dev-util/cgdb/files/cgdb-9999-ar.patch         | 16 ++++++++++++++++
 dev-util/cgdb/files/cgdb-9999-respect-AR.patch | 16 ----------------
 3 files changed, 29 insertions(+), 25 deletions(-)
 create mode 100644 dev-util/cgdb/files/cgdb-9999-ar.patch
 delete mode 100644 dev-util/cgdb/files/cgdb-9999-respect-AR.patch

(limited to 'dev-util/cgdb')

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-9999-ar.patch b/dev-util/cgdb/files/cgdb-9999-ar.patch
new file mode 100644
index 000000000000..ed5f200b3260
--- /dev/null
+++ b/dev-util/cgdb/files/cgdb-9999-ar.patch
@@ -0,0 +1,16 @@
+--- 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-respect-AR.patch
deleted file mode 100644
index ed5f200b3260..000000000000
--- a/dev-util/cgdb/files/cgdb-9999-respect-AR.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
-- 
cgit v1.2.3-65-gdbad