gentoo resync : 07.01.2022

6 files changed, 7 insertions, 22 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 07c3cd6f228d..78a6604d5a45 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 25f53334aeaa..94f69cfc30f1 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -13,5 +13,5 @@ DIST autofs-5.1.8-patches-0.tar.xz 3476 BLAKE2B a7fb146542f9cb0a8e93240d9c3f68ff
 DIST autofs-5.1.8.tar.xz 327396 BLAKE2B 22ef626cc867c1ed4f1f859aebe2547c497c35dea712967de70158e85db590f5ffc26165e1479cfc64eb8070a9c43fd06b1570a82bd8bbbac70f2930e1841718 SHA512 6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223
 EBUILD autofs-5.1.6-r2.ebuild 3141 BLAKE2B 48811e587d6a4637f6e07e9add7e3943e5063456ad91610e18a9deb379d09187d8eb62506dcafa21f06ad932b1f3c6c3fdccbbdb18befbd33e16ae724383a5a1 SHA512 e37770f987c646a2b44477f4fa50a357e2ceece27441f4a75dc3ed8b0564d3f778ba8c162c9a7f3c6fc4c78ed41f557475dda7963c6ab5e2f3297b9fac59d75d
 EBUILD autofs-5.1.7-r1.ebuild 3239 BLAKE2B a329da93036678a45676f230d85ad83f88f473fccfada7d836b8c3cdd413dcc364eff7c5d2a7944336fbfa32c42a457a942ac1f29404e3fd6a6cdf019f11914d SHA512 f1e9e6aa768400a13663e15fa2c9b3a5dea0b427df1020bffa14cdadd4d941249c114156e6385748d2210c5d608647ab5b546c4e0e7ebc59d23a3351121b425d
-EBUILD autofs-5.1.8-r1.ebuild 3275 BLAKE2B ac50e477c362a8a32a5aae66b0482f81ab4e64451f98735547ea4c2deb892e7d3b980e54a5b3e9b27f49af8f92e78856594038202cefeb31f1d9d11638674760 SHA512 f31bc210fd2369819a2df723d0392e7c59526dcbab5821d8a8e4caa4fdae0b2f51104de5cf86e84413067fcef12cdd6561f32bc81846fadce066e0d34e35a945
+EBUILD autofs-5.1.8-r1.ebuild 3265 BLAKE2B 331e79abeb6ec778ac7ab0511955c50e6d44a8c95f938216cb19ba00e6b3d82d9c746694cb8070e80f51b0e7f10275423309f63364c4a293bb3ebf60e334a28b SHA512 2ac85218bfab07a00ebae135636d3459f785ca1ff91cc32cf2ff4ece315c09922dc9ca04be711d249c6fb97f606362dfd831c50e6a1f2911f629abca87b25ccd
 MISC metadata.xml 870 BLAKE2B d2813cbc47232ecb5d5726672d038d72e9e5dd3078e915552f566a61bb2db7909d8b4d7d135d7c3ebba9c8f827121de2f42bd25c7c9fd975190f8bb67635affd SHA512 b1ee8b21924f1b6ade69603deff4ff5dc954f4f9161dce592b1676cad1e01dc2a0b4802877f8d4922a037f3e10b2f2085128f86cd2cf21f691c568d6a1f3a25d
diff --git a/net-fs/autofs/autofs-5.1.8-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild
index 019f79e0808e..d3260d26b3e2 100644
--- a/net-fs/autofs/autofs-5.1.8-r1.ebuild
+++ b/net-fs/autofs/autofs-5.1.8-r1.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
@@ -96,8 +96,7 @@ src_configure() {
 }
 
 src_compile() {
-	export DONTSTRIP=1
-	default
+	emake DONTSTRIP=1
 }
 
 src_install() {
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index ac436937893a..1b84ae8d705f 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -4,6 +4,6 @@ DIST openafs-1.8.8.1-doc.tar.bz2 3770278 BLAKE2B 4d10c96f05190a71b8d7aa89557946d
 DIST openafs-1.8.8.1-src.tar.bz2 14866119 BLAKE2B ae58a1d30fc8d72b4487700203c03e62fc15d0034a03516d4ea5b52c33970e8d9954e6b3c812a4633910c512d283c11431abbcb3868569d8d5ced1a69585263e SHA512 fb181e0989e9bae714af26de916a96946eea20f98b47154f2de7b5e296cb4f42af5df037ef7b603073e97eafe52d7c401666f03130c1e0c9a6ae1a6c2707c384
 DIST openafs-patches-20210116.tar.xz 67300 BLAKE2B aaafa197d1be1e9d89685fe5193a4682ea9e5e5c1c3227963a97ca7a98e6ab5e855ee65d615a31162559b30ae5867fde6ceeec1055af1a375e73b9fa25654de5 SHA512 06e9e1b65fceda34a197556aba1a05eabb630723fc17c5060d5e2a054e60ab8c5195d5c80eff3d3444bcdca40b7115da9143f5b8100659061446038ad4a79007
 DIST openafs-patches-20211212.tar.xz 13892 BLAKE2B 64582135ff3b81725cf0510d1157785b112f76197b8f50a947d22a82b8b55bebd163f2288b19d68a994f22c78bd90b6bfdad5f75383df1cac06d40feb72e8de8 SHA512 40a1a0d126ae194609da8a264c26b278b6081d95020bcbdb3a809952a70535fa551d1983e811e4ab9deaec06f061075906c2bbaf91e4354bff3520584e3fd336
-EBUILD openafs-1.8.7.ebuild 10947 BLAKE2B 77eabe0d6ca7ac9afbc91cedf3b9ca02bfa8e8210bfdccfce81a3a310979d69d576947031ac8e55d220141ee3317b61c1e08f104495b97e2bb0df23750236990 SHA512 e0e647b65144e6bd3e168ccc697d437c73238908c2179a2c2d4ede58e2ea70f2e2b0fe7ba29dc89737c78adf3d914d06143e8441fc1c32bb1400c0a38e70bb15
-EBUILD openafs-1.8.8.1-r1.ebuild 10841 BLAKE2B 561af5c3e107ad2c42b024b41a9c26c6f6f18842637c56ea5eb0830b3fbe3cf46159bbf03c5bebdf0cfb4502e9377d2b43709cf17c3c6ec792a71207a7744293 SHA512 302210154f3e3ef846020ff24692aa0b5cae0e8b8ced45e47dffd25ca80148a7673a4692af6fc5f748f84560197f9ae55983f95a81cb60d37c4c0ea2dc342364
+EBUILD openafs-1.8.7.ebuild 10619 BLAKE2B 39f0e860feaa41a71d2241e4fefd56cce067b8537fc94b41381f2d53d84dad8e2d82e22879c4ea9937162bd9546d11db3a8380da36071337a56dc1df8987b582 SHA512 30cbeea78674a216ec5fb9426c5a42e511dad0b84fdd2dc3a5b027b0898e06819423aeb08e20d15f4592165a076b1e6ed8c6a52b4357022ae88c66d4d38ebb25
+EBUILD openafs-1.8.8.1-r1.ebuild 10513 BLAKE2B 1c39d8e60df30ca130d90b6eb788f88649f19a9e0b502c07715ca00d107cbc85645da4cfa78da2e0ea5e72638d363a54e93ebe4a60ac3a4c78e4ac87eccf016b SHA512 3e17c0ba8a02c4eefdef77e9cd3dbb7144148b5d96c526521ccd9ef8b3360c68c8be3c7043698f41c0d67fb39f6f7542bdb3a2bd6a08193930bd0e2c07fec967
 MISC metadata.xml 1434 BLAKE2B 2fc1966b8fbebd7cc55f64f126a7f57c1981f21c6632ac6194115e4fda701189836ffbd7e439e804fb1219ddc164531fcfded18248b700cccd9bc36d5d9fb3e7 SHA512 386fca3b025e53e6182cd778fe7d486d03a2982325c21e77093d4bcd243ff53f4240c9dca34e83b7cb95125eb737e61dcbb6c7899196848ec30bff72d09523c2
diff --git a/net-fs/openafs/openafs-1.8.7.ebuild b/net-fs/openafs/openafs-1.8.7.ebuild
index f2f6237fddcc..8d42811d43cf 100644
--- a/net-fs/openafs/openafs-1.8.7.ebuild
+++ b/net-fs/openafs/openafs-1.8.7.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
@@ -127,8 +127,6 @@ src_configure() {
 			fi
 			myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
 					  --with-linux-kernel-build="${KV_OUT_DIR}" )
-		elif use kernel_FreeBSD; then
-			myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
 		fi
 	fi
 
@@ -187,9 +185,6 @@ src_install() {
 			MODULE_NAMES="libafs(fs/openafs:${srcdir})"
 
 			linux-mod_src_install
-		elif use kernel_FreeBSD; then
-			insinto /boot/modules
-			doins "${S}"/src/libafs/MODLOAD/libafs.ko
 		fi
 	fi
 
@@ -286,7 +281,6 @@ pkg_preinst() {
 pkg_postinst() {
 	if use modules; then
 		# Update linker.hints file
-		use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
 		use kernel_linux && linux-mod_pkg_postinst
 	fi
 
@@ -309,7 +303,6 @@ pkg_postinst() {
 pkg_postrm() {
 	if use modules; then
 		# Update linker.hints file
-		use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
 		use kernel_linux && linux-mod_pkg_postrm
 	fi
 }
diff --git a/net-fs/openafs/openafs-1.8.8.1-r1.ebuild b/net-fs/openafs/openafs-1.8.8.1-r1.ebuild
index 8fe9b5e98f6f..bedbe27e50a1 100644
--- a/net-fs/openafs/openafs-1.8.8.1-r1.ebuild
+++ b/net-fs/openafs/openafs-1.8.8.1-r1.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
@@ -126,8 +126,6 @@ src_configure() {
 			fi
 			myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
 					  --with-linux-kernel-build="${KV_OUT_DIR}" )
-		elif use kernel_FreeBSD; then
-			myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
 		fi
 	fi
 
@@ -186,9 +184,6 @@ src_install() {
 			MODULE_NAMES="libafs(fs/openafs:${srcdir})"
 
 			linux-mod_src_install
-		elif use kernel_FreeBSD; then
-			insinto /boot/modules
-			doins "${S}"/src/libafs/MODLOAD/libafs.ko
 		fi
 	fi
 
@@ -285,7 +280,6 @@ pkg_preinst() {
 pkg_postinst() {
 	if use modules; then
 		# Update linker.hints file
-		use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
 		use kernel_linux && linux-mod_pkg_postinst
 	fi
 
@@ -308,7 +302,6 @@ pkg_postinst() {
 pkg_postrm() {
 	if use modules; then
 		# Update linker.hints file
-		use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
 		use kernel_linux && linux-mod_pkg_postrm
 	fi
 }