gentoo resync : 28.04.2021

3 files changed, 30 insertions, 34 deletions

diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest
index 111b114f7cc3..1d766ec1611d 100644
--- a/net-analyzer/ifstatus/Manifest
+++ b/net-analyzer/ifstatus/Manifest
@@ -4,6 +4,6 @@ AUX ifstatus-1.1.0-tinfo.patch 472 BLAKE2B 180f38fbeb7c820db4e25204e60719eb66acd
 AUX ifstatus-2.0.0-tinfo.patch 191 BLAKE2B 3294763f55f0219c9f19d317b931470aaa15b2463f3acf309475d88a4d30d2fe88839d3f41e250a80dc45c5c37022be2edd31b0e82db3c64bcc2e7b626408846 SHA512 febc844be240323844fc0b7f29b4c00ef4c0cfb29b50cad8501be05271d21733529f1725b0e5980f2c973663f9953e242b4f6bd4bb567d9a13701f0c7cca30ea
 DIST ifstatus-v1.1.0.tar.gz 25233 BLAKE2B de9d088bf7001799c3a54775c0c63d5dcf4f1f3f4998ce02b82a11bea7a6dabb1263829ff42ba1cd05ebd6b202827196757727c24db022ffa7d06ece38db6616 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766
 DIST ifstatus-v2.0.0.tar.gz 24058 BLAKE2B 09a2b0af26cb05dfc24eefdbb6ac52b0ac289a687301f5fa67f0fcaf2622da96e149af3f7c08257e0ef8418f4f08b5ca1b77af71ba7c00dabddcb87cc95ddce7 SHA512 e1720f5dcc26788149cc72ccb72b85fffc72b367f2268e1e4f06a8fe4d80685146d310746c0b1a913e24995f6e93011d7d75ea5b4f9ca479af2d79264b89e27d
-EBUILD ifstatus-1.1.0-r2.ebuild 928 BLAKE2B 9646aaa3eeb56fa383563286a786142efeb0381552423eb4916671c6cc00d87fde4ea45427c70a484951ab2cce17b07d229d5ed4e6eedff375b325ecc1a5dabc SHA512 20882c2ebe3e23bedb9ba8ebcc83d5c37be9d9940fe3c51d71fe5f9041f3b6b56e44764134bbb76c696d682bf156a9e923c8dd3854ba4a5b4b1e45a5a1921a7b
-EBUILD ifstatus-2.0.0.ebuild 891 BLAKE2B c4e496921cbc02785583c4925b480216239fc3009dca26f921da2fd0ce2fa8ae9a0c5220594fd6cf3aa66bafa28cb04cb138bbc0ad6907eb2437e43754d51ff5 SHA512 66dca0c1d8fc07ba210d0be1e648ca550cef24d89b1b56186ba2ddcc4c335902e2c94848c966acf1f122357d3d6857f6a0fa338d6b8cdeeb5af8d2815105614b
+EBUILD ifstatus-1.1.0-r2.ebuild 923 BLAKE2B 94fbf50de6b256cf4752b7aa589004d8b2f740e0f7a6b0c9809a7368a129fd3015bb0430a448787f2ffb01e77ba6402e9d4ecdee5263bc3b832cbecb7c582007 SHA512 f83e52bf3eeebbd30b7a50dd7b88d0c659bce4515d93481ec9349c03fe251a7a209a7ee9d5839e08bbeb807d47309de324189cc2aa684c483c8247ef62204ce4
+EBUILD ifstatus-2.0.0.ebuild 897 BLAKE2B 54a12fd4efefd2a57b95b813e7fd781b549b71fb54109afd11b675a1995b7ef7a815cfe1c83e3ac4aaa44fb7f5a63d488215332b269e43d34ca48812e9e55c2a SHA512 ffdb8ca33899b719854ce7aac7ede18d140713fa3d2337850d893b1513af2723dee4bdc81c77bc185892f484d345750d1c8ce9b9d4885b8d98b746536eb1453d
 MISC metadata.xml 358 BLAKE2B e6d48885bc56f4b4057509378e2f84fe2468c417805bcaca14686a250420762c76bd3a656612019d5784a65df12e85b4dbaf89265d9b91d9455190d234f28813 SHA512 b23a7f0e009c71d86cd145b033b4bc7f77e7a316f048d8236e9bb2bf9cd34671ec24af37b11ef934791c6f046e1a761087c7f5e570bac80b09e30862e162d005
diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
index 10f512067d0b..986b1e4ad565 100644
--- a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
@@ -1,29 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils toolchain-funcs
+EAPI=7
 
-KEYWORDS="amd64 arm ~ppc x86"
+inherit toolchain-funcs
 
 DESCRIPTION="A simple CLI program for displaying network statistics in real time"
 HOMEPAGE="http://ifstatus.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 arm ~ppc x86"
 
 RDEPEND=">=sys-libs/ncurses-4.2:0="
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gcc43.patch"
-	"${FILESDIR}/${P}-tinfo.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-gcc6.patch
 )
 
 src_prepare() {
@@ -37,8 +35,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog	"You may want to configure ~/.ifstatus/ifstatus.cfg"
-	elog 	"before running ifstatus. For example, you may add"
-	elog	"Interfaces = eth0 there. Read the README file for"
-	elog	"more information."
+	elog "You may want to configure ~/.ifstatus/ifstatus.cfg"
+	elog "before running ifstatus. For example, you may add"
+	elog "Interfaces = eth0 there. Read the README file for"
+	elog "more information."
 }
diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
index 0b58e01792d6..400d6a60c000 100644
--- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
@@ -2,31 +2,29 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs
 
-KEYWORDS="amd64 ~arm ~ppc x86"
+inherit toolchain-funcs
 
 DESCRIPTION="A simple CLI program for displaying network statistics in real time"
 HOMEPAGE="http://ifstatus.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}/${PN}-v${PV}"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 arm ~ppc x86"
+
+RDEPEND=">=sys-libs/ncurses-4.2:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-RDEPEND="
-	>=sys-libs/ncurses-4.2:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.0-tinfo.patch
 )
-S="${WORKDIR}/${PN}-v${PV}"
 
 src_compile() {
 	tc-export CXX PKG_CONFIG
-	emake GCC=$(tc-getCXX) ${PN}
+	emake GCC="$(tc-getCXX)" ${PN}
 }
 
 src_install() {
@@ -35,8 +33,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog	"You may want to configure ~/.ifstatus/ifstatus.cfg"
-	elog	"before running ifstatus. For example, you may add"
-	elog	"Interfaces = eth0 there. Read the README file for"
-	elog	"more information."
+	elog "You may want to configure ~/.ifstatus/ifstatus.cfg"
+	elog "before running ifstatus. For example, you may add"
+	elog "Interfaces = eth0 there. Read the README file for"
+	elog "more information."
 }