| 1 |
commit: a264003c48500e2f230c82baaa65e2108bafe15b |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 3 18:39:33 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 3 18:59:09 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a264003c |
| 7 |
|
| 8 |
net-analyzer/bmon: port to EAPI 7 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-analyzer/bmon/bmon-4.0.ebuild | 29 +++++++++++++---------------- |
| 13 |
net-analyzer/bmon/bmon-999.ebuild | 12 +++++------- |
| 14 |
2 files changed, 18 insertions(+), 23 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild |
| 17 |
index ce39ebbf63e..13ecfa5de9d 100644 |
| 18 |
--- a/net-analyzer/bmon/bmon-4.0.ebuild |
| 19 |
+++ b/net-analyzer/bmon/bmon-4.0.ebuild |
| 20 |
@@ -1,14 +1,13 @@ |
| 21 |
-# Copyright 1999-2020 Gentoo Authors |
| 22 |
+# Copyright 1999-2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=6 |
| 26 |
-inherit autotools eutils linux-info toolchain-funcs |
| 27 |
+EAPI=7 |
| 28 |
|
| 29 |
-DESCRIPTION="interface bandwidth monitor" |
| 30 |
+inherit autotools linux-info toolchain-funcs |
| 31 |
+ |
| 32 |
+DESCRIPTION="Interface bandwidth monitor" |
| 33 |
HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/" |
| 34 |
-SRC_URI=" |
| 35 |
- https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz |
| 36 |
-" |
| 37 |
+SRC_URI="https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" |
| 38 |
|
| 39 |
LICENSE="BSD-2 MIT" |
| 40 |
SLOT="0" |
| 41 |
@@ -19,10 +18,8 @@ RDEPEND=" |
| 42 |
dev-libs/confuse:= |
| 43 |
dev-libs/libnl:3 |
| 44 |
" |
| 45 |
-DEPEND=" |
| 46 |
- ${RDEPEND} |
| 47 |
- virtual/pkgconfig |
| 48 |
-" |
| 49 |
+DEPEND="${RDEPEND}" |
| 50 |
+BDEPEND="virtual/pkgconfig" |
| 51 |
|
| 52 |
DOCS=( ChangeLog ) |
| 53 |
|
| 54 |
@@ -32,12 +29,12 @@ ERROR_NET_SCHED=" |
| 55 |
Run ${PN} -i proc to use the deprecated proc interface instead. |
| 56 |
" |
| 57 |
|
| 58 |
-src_prepare() { |
| 59 |
- eapply \ |
| 60 |
- "${FILESDIR}"/${PN}-3.6-docdir-examples.patch |
| 61 |
- |
| 62 |
- eapply_user |
| 63 |
+PATCHES=( |
| 64 |
+ "${FILESDIR}"/${PN}-3.6-docdir-examples.patch |
| 65 |
+) |
| 66 |
|
| 67 |
+src_prepare() { |
| 68 |
+ default |
| 69 |
eautoreconf |
| 70 |
} |
| 71 |
|
| 72 |
|
| 73 |
diff --git a/net-analyzer/bmon/bmon-999.ebuild b/net-analyzer/bmon/bmon-999.ebuild |
| 74 |
index 1939b19057e..c7b2e2c82e0 100644 |
| 75 |
--- a/net-analyzer/bmon/bmon-999.ebuild |
| 76 |
+++ b/net-analyzer/bmon/bmon-999.ebuild |
| 77 |
@@ -1,26 +1,24 @@ |
| 78 |
-# Copyright 1999-2020 Gentoo Authors |
| 79 |
+# Copyright 1999-2021 Gentoo Authors |
| 80 |
# Distributed under the terms of the GNU General Public License v2 |
| 81 |
|
| 82 |
EAPI=7 |
| 83 |
+ |
| 84 |
inherit autotools git-r3 linux-info toolchain-funcs |
| 85 |
|
| 86 |
-DESCRIPTION="interface bandwidth monitor" |
| 87 |
+DESCRIPTION="Interface bandwidth monitor" |
| 88 |
HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/" |
| 89 |
EGIT_REPO_URI="https://github.com/tgraf/bmon/" |
| 90 |
|
| 91 |
LICENSE="BSD-2 MIT" |
| 92 |
SLOT="0" |
| 93 |
-KEYWORDS="" |
| 94 |
|
| 95 |
RDEPEND=" |
| 96 |
>=sys-libs/ncurses-5.3-r2:0= |
| 97 |
dev-libs/confuse:= |
| 98 |
dev-libs/libnl:3 |
| 99 |
" |
| 100 |
-DEPEND=" |
| 101 |
- ${RDEPEND} |
| 102 |
- virtual/pkgconfig |
| 103 |
-" |
| 104 |
+DEPEND="${RDEPEND}" |
| 105 |
+BDEPEND="virtual/pkgconfig" |
| 106 |
|
| 107 |
DOCS=( ChangeLog ) |
Archives