gentoo auto-resync : 09:09:2022 - 10:40:04

9 files changed, 37 insertions, 38 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 5a727c6da086..442534902637 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 0063eca30ab0..1da31b55556e 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -3,5 +3,5 @@ AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb23145674
 AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0
 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a
 DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18
-EBUILD axtls-2.1.5-r101.ebuild 4706 BLAKE2B a159b0b0e2714cfcd544973708a2cc55027bfdde1d13f3c485beebe253713e20e3cd4c3385fe1e92d146f82fbef21047de59e34de8c60fdcbe68ebaf8f0c65bd SHA512 c11a0b60ac84687d84da047a3ec422a78713b98322cada28a67d0241853a2ef6534da68fef35338a9a27fa2490aac8e340cd1386f18b17c6af18262a13b8e52e
+EBUILD axtls-2.1.5-r102.ebuild 4523 BLAKE2B 9c1d728e6f0969b4469631022fe5b0e106f355c90278d9a0249b9917d1a793111d4cb756f7cec30fed99bad7c70f2605850343364012f0c261a5d8dd7bbd4aac SHA512 1e235123cb943036fc8dd1a959d098bbe7811c924f011cadc80cb82c1001a4c90602a87e345fd46b2fbd2d7aacf54b9a5f43ba6395a9e8dc2075aad71409834f
 MISC metadata.xml 633 BLAKE2B 0f5a868fdbf1ba1fe6f91265916bb58fb5633c499a7d3bdb6961ea8850f88dfc76e17f43458563d19dd5c2f1d38305998696dc553ca9dd1e1c8737576373dac7 SHA512 f59c372706cb4a5cd83dde90c23fee03d18e7da5b6d601e4edc53b57e313340719efb29948a270ea839324695eaa33cd7b331d34ba113fa0213442c02d7f5ff7
diff --git a/net-libs/axtls/axtls-2.1.5-r101.ebuild b/net-libs/axtls/axtls-2.1.5-r102.ebuild
index 5f09e2c9f169..046f79d41d75 100644
--- a/net-libs/axtls/axtls-2.1.5-r101.ebuild
+++ b/net-libs/axtls/axtls-2.1.5-r102.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit lua-single multilib-minimal savedconfig toolchain-funcs
+inherit lua-single savedconfig toolchain-funcs
 
 ################################################################################
 # axtls CONFIG MINI-HOWTO
@@ -44,7 +44,7 @@ LICENSE="BSD GPL-2"
 SLOT="0/1"
 KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
+IUSE="httpd cgi-lua cgi-php static doc"
 
 # TODO: add ipv6, and c#, java, lua, perl bindings
 # Currently these all have some issue
@@ -72,14 +72,12 @@ src_prepare() {
 
 	eapply "${FILESDIR}/explicit-libdir-r1.patch"
 
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
+	# We want CONFIG_DEBUG to avoid stripping
+	# but not for debugging info
 	sed -i -e 's: -g::' config/Rules.mak || die
 	sed -i -e 's: -g::' config/makefile.conf || die
 
 	eapply_user
-
-	multilib_copy_sources
 }
 
 use_flag_config() {
@@ -122,12 +120,12 @@ use_flag_config() {
 	emake -j1 oldconfig < <(yes n) > /dev/null
 }
 
-multilib_src_configure() {
-	#Per-ABI substitutions.
+src_configure() {
+	# Per-ABI substitutions.
 	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
 		Makefile || die
 
-	#Use CC as the host compiler for mconf
+	# Use CC as the host compiler for mconf
 	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
 		config/Rules.mak || die
 
@@ -145,25 +143,21 @@ multilib_src_configure() {
 	fi
 }
 
-multilib_src_install() {
-	if multilib_is_native_abi && use savedconfig; then
+src_install() {
+	if use savedconfig; then
 		save_config config/.config
 	fi
 
 	emake PREFIX="${ED}/usr" install
 
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
-	fi
+	rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
 
 	# The build system needs to install before it builds docs
-	if multilib_is_native_abi && use doc; then
+	if use doc; then
 		emake docs
 		dodoc -r docsrc/html
 	fi
-}
 
-multilib_src_install_all() {
 	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
 		mv "${ED}"/usr/bin/{,ax}htpasswd || die
 	fi
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index 7979d0d4b6c2..04525df4a6c8 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -1,4 +1,4 @@
 AUX http-parser-2.9.4-non-x86-test.patch 645 BLAKE2B c96cb4bbdd4560b738012b0c6a4e527a5d7b1e7253ec69ee65710b2afcd4162680b6835c20144e5baeed8e9dce253a60dbb240943adad91ec5b642cd981e7538 SHA512 4bd68020912ed43e07f2abaf7425e57ab855a3d04086a4b06d3bdb8fb4a30887a6094d0aebbf2fcd67757eda7c9dc2ae0a1c4e9cbcd2242f50fc4f0b38b764c0
 DIST http-parser-2.9.4.tar.gz 52056 BLAKE2B 988ebc3f3e1a7d53ed4147dac2e09c4d6021bb1a287990d83130c24e9fee01a3123b4c5ad9e1b86c0f123248484dae272010aa1f3ebd3bd4574d8407ede94e62 SHA512 b45df7b94d1c51079d44687d0a7f901f44faae51df4e84c7e3fe38f130c2d809d0e7c2a146c57b3723e60732aededc246bf44eadb10a95b710963d641f9fe7cd
-EBUILD http-parser-2.9.4-r1.ebuild 1073 BLAKE2B 334e9d9bcdfe9d3ef082bd31d15179e5e512d829778c1c92a4c66e86ccfa7463456c0833d197fd0c97e71784020bbbe00c5d0f4f58a4bbc5fcb1fbf6bf636f0a SHA512 2bc2b1457c18452fad835e6bea40b929abab025b1a1cc1643063167c4f8fa543191c18526ce6fb7dd85048cdd6c78ce46752c1e647ed04758755ee27c3ea8c68
+EBUILD http-parser-2.9.4-r2.ebuild 1015 BLAKE2B 7e58d6008493d726540932f6b35e4b92c479f222a930682baa7cc513cc388e95c5174180be80e38efbe50c5f450ad2aa55114c51c968e6386652db72105a0951 SHA512 8e29e7c9ac6c85a980f54f57cdf618eab65f569795ce78bd5dbae97d5f65f25f5bdeea4db68053462daec60906b5fca070667806a9e56e06a246674bf1330ca1
 MISC metadata.xml 331 BLAKE2B d6e20b95ae54b8219010abf671695481ae680496170f863526517cbc5dadc226f62c1c9f4df6bc914007c564d8e7e4086854bcc1733219a1839e055d8888528e SHA512 0dcc220dc9e1e3a5ecfc773575b67c94808ce2dd7c573d4f102828b7ecf7f1f209b93a25ed0e0637904342f76d4c036584ccbab1c716d25be1e37fae5ffabf47
diff --git a/net-libs/http-parser/http-parser-2.9.4-r1.ebuild b/net-libs/http-parser/http-parser-2.9.4-r2.ebuild
index 8ceeb33fae6e..34954b2e531a 100644
--- a/net-libs/http-parser/http-parser-2.9.4-r1.ebuild
+++ b/net-libs/http-parser/http-parser-2.9.4-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit toolchain-funcs multilib-minimal
+EAPI=8
+
+inherit toolchain-funcs
 
 DESCRIPTION="HTTP request/response parser for C"
 HOMEPAGE="https://github.com/nodejs/http-parser"
@@ -18,20 +19,20 @@ PATCHES=(
 	"${FILESDIR}"/${P}-non-x86-test.patch
 )
 
-src_prepare() {
-	default
+src_configure() {
 	tc-export CC AR
-	multilib_copy_sources
 }
 
-multilib_src_compile() {
+src_compile() {
 	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
 }
 
-multilib_src_test() {
+src_test() {
 	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
 }
 
-multilib_src_install() {
+src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	einstalldocs
 }
diff --git a/net-libs/libhtp/Manifest b/net-libs/libhtp/Manifest
index 2a97e618d7ad..5c93e8869a1f 100644
--- a/net-libs/libhtp/Manifest
+++ b/net-libs/libhtp/Manifest
@@ -1,3 +1,3 @@
 DIST libhtp-0.5.40.tar.gz 499564 BLAKE2B 37239d8d0afb6841c54bab1669a17ec7336b10998f8835ef91cf9556dd7449991ce6fb04a408d16b431ba6327b32f6f509a79a4c79ffc6e88e555fcf2e9f2cce SHA512 e60ad9c2bbdb0aea0966b4d672353ae68aa1fde4dfb3ad4eabc3b9ebf7907685cf583a2b66e5bfc080c5833a2fc3c593e0cd025c62051f6fe13f89d450bab18b
-EBUILD libhtp-0.5.40.ebuild 788 BLAKE2B 40425a10377c090eac5190ed5a99d9794b89373cad4a218f5e3d5c81829ca8eac834ed4f2fecaf8d8f73db11440260cfe5373e24c40286badfca8c7a7ce16bab SHA512 44faed2c4f75537bb92e356082394da691519e52d7516321dc9e7892b8faba15a99eaa452ca14b36ba8abdbc021bbed8da7cd3cbc9f6fedaadc728253d4cb233
+EBUILD libhtp-0.5.40-r1.ebuild 709 BLAKE2B 3302b4a0fa04faece65cfbd2c6e26d9be529092fe73b061854818a04b12bcfc4cafcc945da2c936c9ed712a8d5636fe0574027d9aad8657be5266e1c3fe460ed SHA512 b9e9b53411b4b28b7a04c9dd375474d754f7cae779a4c672a0bd85d9d03bfa1003016975406817b290db254f26a7c965590656e6a512d6da54102d4318df03bc
 MISC metadata.xml 315 BLAKE2B 6bc47ec9cf301e16cb6047079014a7de8068847b18b822a078f7ca4c99284020af1fa716eb87d06c2e0aaf3bd8577761f77134e9417e7286dce954caef6ec8a1 SHA512 a92ed083085ed48b0735e088a55bd5a1d55cfba73531ae4a3b13aefc46afd108e189188e69d8246f0a4003b5e534b72be5f72c561d57564b7c708d0212a495f4
diff --git a/net-libs/libhtp/libhtp-0.5.40.ebuild b/net-libs/libhtp/libhtp-0.5.40-r1.ebuild
index c105c3aaa523..5bbe9e699afb 100644
--- a/net-libs/libhtp/libhtp-0.5.40.ebuild
+++ b/net-libs/libhtp/libhtp-0.5.40-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="security-aware parser for the HTTP protocol and the related bits and pieces"
 HOMEPAGE="https://github.com/OISF/libhtp"
@@ -22,14 +22,12 @@ src_prepare() {
 	eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	# The debug configure logic is broken.
-	ECONF_SOURCE=${S} \
-	econf \
-		$(usex debug '--enable-debug' '') \
-		--disable-static
+	econf $(usev debug '--enable-debug')
 }
 
-multilib_src_install_all() {
+src_install() {
+	default
 	find "${ED}" -name '*.la' -delete || die "Failed to remove .la files"
 }
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 7c3581139f63..9c3337ba1e2d 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,5 +1,5 @@
 AUX libsmi-0.5.0-implicit-function-declarations.patch 1887 BLAKE2B e18558f09095008d79a94a3baddc6e6623865b18b0a829d0e53f0bca7afa23ee4a45eda5c77edc54f3fd88c009d4623673909469164ec9c3d64b19ae35bfdec1 SHA512 ab4e978066252f4a8df72b6877bae8574579c3d06c0d31f268fce50aecd645b1f003b9d29b440070c80ad8025a6599e238399f4d037893e67f31cedb2476593c
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
 EBUILD libsmi-0.5.0-r1.ebuild 913 BLAKE2B 4626df8d49a139986ee6ceb4919a55d44e1458c93e841d03af42670498b7c637aee0f969613494ea4c8b319e0412cd34efbf500e6e1413b009a8032eefdc83da SHA512 2eac483f4f86ced64c51bc19c0a6c08c7acfbe0433e74403708e528bdada268d92a2f119478b0be244f7afb644f1b5b3e1515d45f4dfdf67fd116a70ea399d69
-EBUILD libsmi-0.5.0-r2.ebuild 957 BLAKE2B 81baf09b2136fb7e334dea06ecd08f3e2cf867476ea4b365e5c8286089198e9053eb081e6eeb15cd21ac86dab576ab1534d607663939b4a229668fb83cf0de7a SHA512 ad858b8f6cea88044f14d5f602128e217f149a1249bd21b83502c8cacacd9261c8e49d8c0c7ce9029b2fce980c132246a873f76aad6fa5d8271529868b8f1904
+EBUILD libsmi-0.5.0-r2.ebuild 1067 BLAKE2B e0f302d1ea41e1f8ddf9a723d26ad77186b5a8627075abbcf25335e8544481e2a6d40eeba43dfa34270085c3380ff6d34693657043bf9dcfc2245c051be2da23 SHA512 318a8d606d531b00c095bed147051429bc20e8e7cee01afac2258a8553c36ce1eff75b1b7e6a6875a2641e11d63f7da60e6dccc3a3fda7c64b98e9ac13a3c4b6
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-libs/libsmi/libsmi-0.5.0-r2.ebuild b/net-libs/libsmi/libsmi-0.5.0-r2.ebuild
index 2769b75bce56..92b2580e9492 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r2.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r2.ebuild
@@ -12,6 +12,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 RESTRICT="test"
 
+# libsmi-0.5.0-implicit-function-declarations.patch touches parser
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.5.0-implicit-function-declarations.patch
 )