commit: a264003c48500e2f230c82baaa65e2108bafe15b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Apr 3 18:39:33 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Apr 3 18:59:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a264003c
net-analyzer/bmon: port to EAPI 7 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/bmon/bmon-4.0.ebuild | 29 +++++++++++++---------------- net-analyzer/bmon/bmon-999.ebuild | 12 +++++------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild index ce39ebbf63e..13ecfa5de9d 100644 --- a/net-analyzer/bmon/bmon-4.0.ebuild +++ b/net-analyzer/bmon/bmon-4.0.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils linux-info toolchain-funcs +EAPI=7 -DESCRIPTION="interface bandwidth monitor" +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Interface bandwidth monitor" HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/" -SRC_URI=" - https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz -" +SRC_URI="https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" LICENSE="BSD-2 MIT" SLOT="0" @@ -19,10 +18,8 @@ RDEPEND=" dev-libs/confuse:= dev-libs/libnl:3 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( ChangeLog ) @@ -32,12 +29,12 @@ ERROR_NET_SCHED=" Run ${PN} -i proc to use the deprecated proc interface instead. " -src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-3.6-docdir-examples.patch - - eapply_user +PATCHES=( + "${FILESDIR}"/${PN}-3.6-docdir-examples.patch +) +src_prepare() { + default eautoreconf } diff --git a/net-analyzer/bmon/bmon-999.ebuild b/net-analyzer/bmon/bmon-999.ebuild index 1939b19057e..c7b2e2c82e0 100644 --- a/net-analyzer/bmon/bmon-999.ebuild +++ b/net-analyzer/bmon/bmon-999.ebuild @@ -1,26 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools git-r3 linux-info toolchain-funcs -DESCRIPTION="interface bandwidth monitor" +DESCRIPTION="Interface bandwidth monitor" HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/" EGIT_REPO_URI="https://github.com/tgraf/bmon/" LICENSE="BSD-2 MIT" SLOT="0" -KEYWORDS="" RDEPEND=" >=sys-libs/ncurses-5.3-r2:0= dev-libs/confuse:= dev-libs/libnl:3 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( ChangeLog )