gentoo resync : 29.12.2022

3 files changed, 28 insertions, 23 deletions

diff --git a/net-libs/liboping/Manifest b/net-libs/liboping/Manifest
index 191da9dfbf2e..2cbd1b8afa6d 100644
--- a/net-libs/liboping/Manifest
+++ b/net-libs/liboping/Manifest
@@ -4,5 +4,5 @@ AUX liboping-1.10.0-no-werror.patch 240 BLAKE2B dc51e4dbaa3259d9e751d00be4d61f63
 AUX liboping-1.10.0-report-right-error-msg-when-select-fails.patch 963 BLAKE2B 94ae49152a81164aeb73a3498a9c2a1b2c901b578387cd8c4a376e0f2583d63aded21d9d22552d5804b332faaf9770c961e7e9f2a7312406aed3de68c5afddfc SHA512 506e28def5b7337fd6f883041ee4b69b1bfd4151b30fce5dc330d4d08fed4333c951e5a58791b5fe5d5f65a2126a4268e7bd902715bfdb663f54814cdaa13348
 AUX liboping-1.6.2-nouidmagic.patch 741 BLAKE2B c8ee54176ded65740d5b035a4f572b45b42f8c4f6f99b723eef7c73d459c4b38907570c3da3dc54c2b71a360164ed1d84dce44a2053050c7ef13f72a13b36ba7 SHA512 d991b2871091c3e92d6b194bfdaa77db34455aec3c32087fff0a02ccee0e1f6fa0e0453a61d28a0fc9549644359f91425efef0b94e37c033d4d43b12bbd7b07d
 DIST liboping-1.10.0.tar.bz2 318150 BLAKE2B 2fa8719df251116c51aa93262697751df72b93368d543e5bb34668eb1bb07d7c0be143c943b32b23ee8d02e94ac2cc66f46f923ee4ab672b414ef16ce2f75acf SHA512 f1e9984cf0c1df89b29f7bc657c19a5439019db7643680744d8f353664b6a53070581f40b51e72f896c7df88799c6868257f6308e1a9d84b4d2a0666491214d8
-EBUILD liboping-1.10.0-r2.ebuild 1526 BLAKE2B 05c422500db66c6d53df79859c471e89e730b36c70104a32b545b560f65b56a89b90ffa1760599f5a01083713eea5720cffdd12fee6b827e5ee5737f4e56d04e SHA512 efe4669ef6abff4ce9be0b4f93139e73c288a2b5514994a05a518bdfb08925bc26d359cc29ba68d4dc9310f7b3122605b8907858ee92961d7f8621d3f47ccbf4
-MISC metadata.xml 718 BLAKE2B b2c0eadf62fc6e49319699398ff14e15addecec059fa1f2a1d708aa3544fdee3b2cc1daa2236b788a3c39517412c3610846d2f6509f502d1b122b3d17c6c1159 SHA512 5c68fa08a0cabca00c59b34650d4759ae067a7585af70b822ddc76855bedf6058326dc9065d4029890f03801686b918a771e93024847f1e237b46ef1cd20d69d
+EBUILD liboping-1.10.0-r3.ebuild 1614 BLAKE2B 76154c9f714caca72ea287ca3231bc1936e5060f37a531bf29611fb6f0135aee6bc2f32bcef04a2f6fdee918448b0136499687a194440de0af1bf6b0fd861f34 SHA512 955ee474651729a1f3620cdca9018462bd3aa9d33abe9d5552062d74eb2454bc7b5f1082a468f5e096df6f82dcf74d4d04015b9a11156cc6091520e951adfca0
+MISC metadata.xml 717 BLAKE2B 2d93cbf6b91421a2671b13beebdfed97c450118e25cbf68c182ba879e07a2c23c34d2c08d594b8eca0e2b90f1a23ec046f4e91773b879319566aec34a69bce6a SHA512 123c59bd06dd253b166e3d76c4cde31a7cc4d49efba6fe2ef1e96d3757eeb24caf5e46217a63bda4cc5308f5b2dd723317c7e292ce8edd42a11b9b1d204ac72c
diff --git a/net-libs/liboping/liboping-1.10.0-r2.ebuild b/net-libs/liboping/liboping-1.10.0-r3.ebuild
index dfa32d0b9ef4..80266390c95f 100644
--- a/net-libs/liboping/liboping-1.10.0-r2.ebuild
+++ b/net-libs/liboping/liboping-1.10.0-r3.ebuild
@@ -1,63 +1,68 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools fcaps perl-module
 
 DESCRIPTION="Protocol independent ANSI-C ping library and command line utility"
-HOMEPAGE="https://noping.cc/"
+HOMEPAGE="
+	https://noping.cc/
+	https://github.com/octo/liboping
+"
 SRC_URI="https://noping.cc/files/${P}.tar.bz2"
 
-LICENSE="LGPL-2.1 GPL-2"
+LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/0.3"
-KEYWORDS="~alpha amd64 arm x86"
+KEYWORDS="~alpha amd64 arm ~arm64 x86"
 IUSE="+filecaps ncurses perl"
 
 DEPEND="ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.0-no-werror.patch
+	"${FILESDIR}/${PN}-1.10.0-no-werror.patch"
 	"${FILESDIR}/${PN}-1.6.2-nouidmagic.patch"
-	"${FILESDIR}"/${P}-gcc8-fix.patch
-	"${FILESDIR}"/${P}-do-not-quit-when-ping_send-fail.patch
-	"${FILESDIR}"/${P}-report-right-error-msg-when-select-fails.patch
+	"${FILESDIR}/${PN}-1.10.0-gcc8-fix.patch"
+	"${FILESDIR}/${PN}-1.10.0-do-not-quit-when-ping_send-fail.patch"
+	"${FILESDIR}/${PN}-1.10.0-report-right-error-msg-when-select-fails.patch"
 )
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_with perl perl-bindings INSTALLDIRS=vendor) \
+	myeconfargs=(
 		$(use_with ncurses)
+		$(use_with perl perl-bindings INSTALLDIRS=vendor)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {
 	if use perl; then
-		pushd bindings/perl >/dev/null || die
+		pushd bindings/perl || die
 		perl-module_src_test
-		popd >/dev/null || die
+		popd || die
 	fi
 }
 
 src_install() {
 	default
-
-	find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_postinst() {
 	if use filecaps; then
 		local _caps_str="CAP_NET_RAW"
-		_files=( "${EROOT%/}/usr/bin/oping")
+		_files=( "${EROOT}/usr/bin/oping")
 
 		if use ncurses; then
-			_files+=( "${EROOT%/}/usr/bin/noping")
+			_files+=( "${EROOT}/usr/bin/noping")
 		fi
 
 		fcaps "${_caps_str}" "${_files[@]}"
diff --git a/net-libs/liboping/metadata.xml b/net-libs/liboping/metadata.xml
index 2a895499c86d..2b599b99ab89 100644
--- a/net-libs/liboping/metadata.xml
+++ b/net-libs/liboping/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<slots>
 		<subslots>Reflect major ABI version (=upstream's LIBOPING_CURRENT value) of liboping.so.</subslots>