commit: f6dbfda12393dd52bfa72ac7f02971eec72b490b Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Sat Nov 6 19:49:37 2021 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sat Nov 6 19:49:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6dbfda1
dev-util/cgdb: Update live ebuild Closes: https://bugs.gentoo.org/820680 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-util/cgdb/cgdb-9999.ebuild | 17 ++++++----------- dev-util/cgdb/files/cgdb-9999-respect-AR.patch | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild index 191687d3b09..75f88b51bff 100644 --- a/dev-util/cgdb/cgdb-9999.ebuild +++ b/dev-util/cgdb/cgdb-9999.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 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 - [email protected]: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" @@ -23,8 +21,10 @@ IUSE="test" RESTRICT="!test? ( test )" DEPEND=" - sys-libs/ncurses:0= + sys-libs/ncurses:= sys-libs/readline:0=" +RDEPEND="${DEPEND} + sys-devel/gdb" BDEPEND=" test? ( @@ -32,20 +32,15 @@ BDEPEND=" app-misc/dtach )" -RDEPEND=" - ${DEPEND} - sys-devel/gdb" - DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md ) PATCHES=( # Bug: #724256 - "${FILESDIR}/${PN}-0.7.1-respect-AR.patch" + "${FILESDIR}/${P}-respect-AR.patch" ) src_prepare() { default - cp configure.{init,ac} || die "cp failed" AT_M4DIR="config" eautoreconf } diff --git a/dev-util/cgdb/files/cgdb-9999-respect-AR.patch b/dev-util/cgdb/files/cgdb-9999-respect-AR.patch new file mode 100644 index 00000000000..ed5f200b326 --- /dev/null +++ b/dev-util/cgdb/files/cgdb-9999-respect-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
