| 1 |
commit: f6dbfda12393dd52bfa72ac7f02971eec72b490b |
| 2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 6 19:49:37 2021 +0000 |
| 4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 6 19:49:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6dbfda1 |
| 7 |
|
| 8 |
dev-util/cgdb: Update live ebuild |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/820680 |
| 11 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/cgdb/cgdb-9999.ebuild | 17 ++++++----------- |
| 14 |
dev-util/cgdb/files/cgdb-9999-respect-AR.patch | 16 ++++++++++++++++ |
| 15 |
2 files changed, 22 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild |
| 18 |
index 191687d3b09..75f88b51bff 100644 |
| 19 |
--- a/dev-util/cgdb/cgdb-9999.ebuild |
| 20 |
+++ b/dev-util/cgdb/cgdb-9999.ebuild |
| 21 |
@@ -1,13 +1,11 @@ |
| 22 |
-# Copyright 1999-2020 Gentoo Authors |
| 23 |
+# Copyright 1999-2021 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
|
| 28 |
if [[ ${PV} = *9999* ]]; then |
| 29 |
+ EGIT_REPO_URI="https://github.com/cgdb/cgdb.git" |
| 30 |
inherit git-r3 |
| 31 |
- EGIT_REPO_URI=" |
| 32 |
- https://github.com/cgdb/cgdb.git |
| 33 |
- git@××××××.com:cgdb/cgdb.git" |
| 34 |
else |
| 35 |
SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 36 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
| 37 |
@@ -23,8 +21,10 @@ IUSE="test" |
| 38 |
RESTRICT="!test? ( test )" |
| 39 |
|
| 40 |
DEPEND=" |
| 41 |
- sys-libs/ncurses:0= |
| 42 |
+ sys-libs/ncurses:= |
| 43 |
sys-libs/readline:0=" |
| 44 |
+RDEPEND="${DEPEND} |
| 45 |
+ sys-devel/gdb" |
| 46 |
|
| 47 |
BDEPEND=" |
| 48 |
test? ( |
| 49 |
@@ -32,20 +32,15 @@ BDEPEND=" |
| 50 |
app-misc/dtach |
| 51 |
)" |
| 52 |
|
| 53 |
-RDEPEND=" |
| 54 |
- ${DEPEND} |
| 55 |
- sys-devel/gdb" |
| 56 |
- |
| 57 |
DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md ) |
| 58 |
|
| 59 |
PATCHES=( |
| 60 |
# Bug: #724256 |
| 61 |
- "${FILESDIR}/${PN}-0.7.1-respect-AR.patch" |
| 62 |
+ "${FILESDIR}/${P}-respect-AR.patch" |
| 63 |
) |
| 64 |
|
| 65 |
src_prepare() { |
| 66 |
default |
| 67 |
- cp configure.{init,ac} || die "cp failed" |
| 68 |
AT_M4DIR="config" eautoreconf |
| 69 |
} |
| 70 |
|
| 71 |
|
| 72 |
diff --git a/dev-util/cgdb/files/cgdb-9999-respect-AR.patch b/dev-util/cgdb/files/cgdb-9999-respect-AR.patch |
| 73 |
new file mode 100644 |
| 74 |
index 00000000000..ed5f200b326 |
| 75 |
--- /dev/null |
| 76 |
+++ b/dev-util/cgdb/files/cgdb-9999-respect-AR.patch |
| 77 |
@@ -0,0 +1,16 @@ |
| 78 |
+--- a/configure.ac |
| 79 |
++++ b/configure.ac |
| 80 |
+@@ -13,6 +13,13 @@ AC_PROG_INSTALL |
| 81 |
+ AC_PROG_RANLIB |
| 82 |
+ AM_PROG_LEX |
| 83 |
+ AC_PROG_YACC |
| 84 |
++m4_ifndef([AC_PROG_AR],[dnl |
| 85 |
++ AN_MAKEVAR([AR], [AC_PROG_AR]) |
| 86 |
++ AN_PROGRAM([ar], [AC_PROG_AR]) |
| 87 |
++ AC_DEFUN([AC_PROG_AR], |
| 88 |
++ [AC_CHECK_TOOL(AR, ar, :)]) |
| 89 |
++]) |
| 90 |
++AC_PROG_AR |
| 91 |
+ |
| 92 |
+ dnl determine if we are running in linux, cygwin, solaris, or freebsd |
| 93 |
+ AC_CANONICAL_HOST |
Archives