gentoo resync : 20.03.2022

2 files changed, 12 insertions, 15 deletions

diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index b17830fe67e4..20197139f9a6 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -4,10 +4,11 @@ AUX sancp-1.6.1-gcc6.patch 864 BLAKE2B 4ffd10b108e268e46ed71ff2930bd990df8f6d66d
 AUX sancp.confd 382 BLAKE2B 1e333a9ec995e733ee3ae7db19e2479dfe87da9a1e1cd3c8e610d0873fab5825a602fee083c87cd0ef40813f98994d1a73b2a7a2c571c850522fba01b3f91afa SHA512 4ae33d655ca0a81a3bf71a382241bca90b1e58e121695041ef5210bd4abdcdbbc4385dfe673a4367898303ae64f9998453c95d2e71d8271ca322473ee61368df
 AUX sancp.rc1 859 BLAKE2B 624ca79a7bb4efd9e6c9513ff53c7f999e85481b2b5555b18c62e27693f371a4098865243fb6aff88d756ade4c988e94b3eda326c7a3539668b1d117a9b55167 SHA512 16c713cf009d597c67981caa5f159b5597732c7f984fb9e91568d2956abdfdc2afb3ef6c35f8189dcca3e89757622c67c1fb67a9a6390851d0db118fd92efd0e
 AUX sguil_sancp.conf 2123 BLAKE2B 161ffda8054a825c10ac792222bbb702c1dac57c14b8500a3a731980cac892c8a66a11a0deafdec5f905b9c523660b9b08858828053c1f4cf7f129ac20f68e94 SHA512 13a6b2573cc239328aabd6b582fcdd6b2102a4fd5380474ab5a3b85e5e4de6547c26aed888baf204e442dbe8be69c11422404c83ac0a2008cad8b6de542ac95e
+DIST sancp-1.6.1-musl.patch.bz2 7013 BLAKE2B a54c3a3c45b1029a95451a21de2b42497434dff6715cb173db5f04293740f3e03869900e23c571dae97a563a9b7fdce76c4295f3267857a77a074a65e79f3b53 SHA512 3310577acef1d16b87b51924ed6fbb82b491afc5646555667fcd2430aef1b0dd5f0ee510c6356eebd32402b79eb8e9f5032955b5194517acc0c055da8dd74fc2
 DIST sancp-1.6.1.fix200511.a.patch 662 BLAKE2B d3d5114662f3904db4052d581b3a95f07f5a492b439958bd64149ca6f9aaf48f2d2d9cf2094500b9ab829b3a06358180893637ed6d3f502ef46f87dfe8527ccc SHA512 87662d9ea863a3a2468b7b64c81a191d34c81348eab9374245a73d3ed63cf2f25df54561f092f3713d516d9cc4eb553d4d7286fd920676a301e61669a023142e
 DIST sancp-1.6.1.fix200511.b.patch 870 BLAKE2B 18ad38c37f11aa1c4804400db5475323db25e0c135d3478e9c81af3a0a3885f397521fdf9b58825216fdd16ec2e2616584f3dc9e175e76d64c7125a767b2c029 SHA512 a54bbec1ce3799f83c006f7375297bafee85b12a90361f1f5dbbf46c936193c7e0f1196483a2bdf560019e93ceffe9129b3c01322eedc397e5dfa3a1a6b76b81
 DIST sancp-1.6.1.fix200601.c.patch 3578 BLAKE2B 7c7e5ef0e1967d41f731d3c79f4273a4ebfc922159ada1940ba4635f6f82e63ed55faeffe53636d2c8fd96d57e1516211fff8852c73876d019fc13d59f4ace9d SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f
 DIST sancp-1.6.1.fix200606.d.patch 6847 BLAKE2B 2d3d2369738adef1ae5ea37cfcab5952be243af269574292e042e361d7d4d02174bbaea2769f5fa6bf802eea6ae9559a3b637ee4dbce1b53715f1e4b66f9df51 SHA512 474a69052a2b9642fdc59e28c0237852d49b7b05445f0ffbbd2ea3f01b70a44e10ee49fba6294b413a53afe50271aaf88f979f8c479fb4b464b3ba5a70534276
 DIST sancp-1.6.1.tar.gz 69986 BLAKE2B 66ed4f5817f1bc299edc66441eea97fa0deeb0fffb15aeb251e3b0351d35f1c25aa452b30e0ba3feb80d306929687448228d0b6ac96e8deaf16c83322b73916a SHA512 41c6b35a2e7295d3b8185b9cc556c56b285cae7542c7ace78e663e54cef8d470bfa2ee083d9837fa34cf5ad1e7c325fb838b00e4f776f5662cade7d61e07145c
-EBUILD sancp-1.6.1-r7.ebuild 1808 BLAKE2B a7dba20da834ab99cebac5e15e5648ef173075988dd7f81e42f2651fe73e3dd286f7913dda797812dbfbdb6de987c8bc1f17df95ebb46ede47652b17ba2bab45 SHA512 e452694838979d828a255aaead1e9f1d9511bccefb7c37c1a5012000856a84c4c0cbc039be1f7f402dbb9e607bba80d67aa81f56738707a4dc9ef361965979e6
+EBUILD sancp-1.6.1-r7.ebuild 1866 BLAKE2B 956d0cb9edd31b05043d9805269623e82d9ff7a3ba76fb6db96f5a6ad1d34268ec35ad25230ed0aa46729fcdf8bd0dbe9d2b32ccf63133fc506a23474d0defa8 SHA512 9c21b4cccc4b0353604ea80468e80b7eeaa5bc95054c5406e3622ee2a7105964d5670c4c1626d53c88203747c6fc8fa20ad98a49d76404b82fe5c2f1d236fa46
 MISC metadata.xml 474 BLAKE2B 295c523017c01b7bbc19a0812bfbbc8016c508de39486180ccc974a01bd51019fa75e5f4754dd03e4b981e5d05eb6b07c65607499f038d30f9deb75be32ba897 SHA512 f59d62c7408bf041e6b2c035463fa22e0f9abc38f0a696f3d8be65dd5c54454deb4a3e60938fce2cbb9b18600a9adb7ed55afdec3bc27f05e32f4433703375dc
diff --git a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
index e18588995cbb..f3ea7b0a3461 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,15 +7,14 @@ inherit toolchain-funcs
 
 DESCRIPTION="collect network traffic statistics and store them in pcap format"
 HOMEPAGE="https://sourceforge.net/projects/sancp/"
-SRC_URI="
-	http://www.metre.net/files/${P}.tar.gz
+SRC_URI="http://www.metre.net/files/${P}.tar.gz
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch
-"
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.6.1-musl.patch.bz2"
 
-LICENSE="QPL-1.0 GPL-2"     # GPL-2 for init script
+LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sguil"
@@ -27,20 +26,17 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
+	"${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
+	"${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
+	# bug 138337
+	"${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
+	"${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
 	"${FILESDIR}"/${PN}-1.6.1-compiler.patch
 	"${FILESDIR}"/${PN}-1.6.1-gcc6.patch
 	"${FILESDIR}"/${PN}-1.6.1-extern.patch
+	"${WORKDIR}"/${PN}-1.6.1-musl.patch
 )
 
-src_prepare() {
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
-	# bug 138337
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
-	eapply "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
-	default
-}
-
 src_compile() {
 	tc-export CC CXX
 	emake CFLAGS="${CXXFLAGS}"