gentoo resync : 14.12.2020

13 files changed, 6 insertions, 740 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 48e5de4eef41..c1d532a718e2 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 14d02d765394..4c048f65e389 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1,4 +1,4 @@
 DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa
-EBUILD libnfs-4.0.0.ebuild 1195 BLAKE2B 78388183ac880e6f418ab0a9e940a60666ee13d6bf3147e358c95d951bf9d329cfa43ad909ba3aad0b291c4ae2615b0fec68f392c0353492d2cb04f8bcaad341 SHA512 f14e08c553cc26c6085522a206cf6ef0749c96b7b21a45f9dfd699e7d2ff4d7ba4c126ebf85adb0d21ca9286093b48ead1e8e96769c69213c5c8e8eb1e44b757
-EBUILD libnfs-9999.ebuild 1203 BLAKE2B c2f6f95e87478e5f33574dccdac1c9261ea6bb1942199deca4179ed1238e681a3e92595f2b049438841ac432f8bf5464bbf659de29c5953f9f0f67a69ace4aaa SHA512 2162d6b5a34347117bfe99f3697bd804621c7b9afbcead44687767b360481122bb49799d444df882557e2619b3fc6d13ff1e25680f28975030cc17e9cdbf693b
+EBUILD libnfs-4.0.0.ebuild 1214 BLAKE2B f3f6113a34066cd84b635729cb7503bd9d019c9a15d78cecebf99e95a2346cde35fcc1d7ec41655ce2bd29218bb5dc6ba474180e2b44182c5b0ca8f43eed9c94 SHA512 11cf1696c9f56b5fa9e44c779e9c02fb0328a7f7f28a53ed2f8cb3ca128c90848a1e8fc36b55f2b283e71ae18434154a1b60deb4e4b77ed60e20f1497d1609d5
+EBUILD libnfs-9999.ebuild 1222 BLAKE2B 1a8a4db99c7c177f6cd8ceb7caf12afcc4ce0eb179afdf82b62ac1e050267fc8bf5c60874c0248a0cb2abceb33cf43a5d7673e91d41d5c572d475b5c9b298a10 SHA512 021322393f1fa33d3518369d70aba635a4f5601b4846a767fceef8ca59e7d8a0f618dcdf5bb74c4b656fd111a12c1f7be62c827bfe96cf06c7f63c6dcbbd4800
 MISC metadata.xml 416 BLAKE2B dd298d1b48b996a31ccef799be0e581239d99bed3f79f05aba02693821e869cbb73425af4ba1d581d641ca52a7b636dba591e68cbcb7c647cfd6840745c16721 SHA512 69475dd9d86a2335ee1780e6a330ff6096ccf99d14fea094b8bab5a59aa1deb2841b7c0e1bf5c00fcec38756c219af9b7ff255f1986a54756c28128b9e447ce5
diff --git a/net-fs/libnfs/libnfs-4.0.0.ebuild b/net-fs/libnfs/libnfs-4.0.0.ebuild
index 45f09e152b3c..df04294996c8 100644
--- a/net-fs/libnfs/libnfs-4.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-4.0.0.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-werror
 		$(use_enable static-libs static)
 		$(use_enable utils)
 	)
diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild
index 13cae771f02b..2736936d4bfc 100644
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-werror
 		$(use_enable static-libs static)
 		$(use_enable utils)
 	)
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 458d45dd6c67..ced696f4b18d 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -26,6 +26,6 @@ DIST nfs-utils-2.5.1.tar.bz2 931848 BLAKE2B 84c93ef5707bd97e9e1107dcca0530a3c137
 DIST nfs-utils-2.5.2.tar.bz2 933724 BLAKE2B 691204739fa4348cea6234f1b87bd74872c94a0c175b09a08ebb4d5cefb0b04c1adfffadc82b7e9a4a45d5c86e7f2af62b275526d27482798d4c5dc296a5be09 SHA512 9e97cf5cd8be27d58e1dcd7fa563280ac8afa57d09387dddd2d6b03cbcd6dae4066ac29804b8b1624b61cb12f2aa016380c85b731113c9359a0e6887d2db0641
 EBUILD nfs-utils-2.4.1-r4.ebuild 6205 BLAKE2B 6a8c7bb4e2796bbf00c8aef69243cafd7a428aae5b1c0c1e4d82418593b14272efd37e8d7561ef0a671de217e27147f73c6287a207016185054c88ae31df3f86 SHA512 68a109f63eefc855a42569867db9876bd0c49ac222bc30c1791b5e7ce88752144315553e309c613c8953dfbc8f3c58c69f067312c936574a491355349ec61f14
 EBUILD nfs-utils-2.4.3.ebuild 5788 BLAKE2B fb3b87163a7337d3d8e08b87f874168a0ead5f40bfff0614366201221783e647ab8aa2dbd0e50bf5be6a948cf8b44955ae93c91a290d0d334b243854e0af8170 SHA512 f3d6b7c868ef735455f49ff495244396528bbd35134e85d42743054fe8eb8fb7fc8cd7afcf5d9a5781dfecf79832f6eb8cd5034c3fb9ec1d350b872c40760f67
-EBUILD nfs-utils-2.5.1.ebuild 5788 BLAKE2B fb3b87163a7337d3d8e08b87f874168a0ead5f40bfff0614366201221783e647ab8aa2dbd0e50bf5be6a948cf8b44955ae93c91a290d0d334b243854e0af8170 SHA512 f3d6b7c868ef735455f49ff495244396528bbd35134e85d42743054fe8eb8fb7fc8cd7afcf5d9a5781dfecf79832f6eb8cd5034c3fb9ec1d350b872c40760f67
+EBUILD nfs-utils-2.5.1.ebuild 5787 BLAKE2B 5df4bf34677270d07a45ff0daf2d2b53df4640d46f221e47396346e44b2e2dc5fcb40d251fd14f0625d54ab500eb527bf95b05b42244f0117bfa2f544d4fee0e SHA512 cd40a96714efc6b0e1afc1c214ed464e312b1d5b88746b5cea8fa74b1f7f6cb6c0eecfb31c4866856888005607ab7a1fc479cddaebabf8b1bb374b3b58d81902
 EBUILD nfs-utils-2.5.2.ebuild 5796 BLAKE2B f0f86570e1c75607d76ad3716bb4c6e2fb13b8ab5e719571f7ea6703709ff1c1120b1d8078cfad98594f1cdb166f46e5faec8cccf973d46625c0d3cd8713091c SHA512 92ff15f9816b5f1526564148880f6627b700b1d6a253f263610b7c54ccbf741cd263499cb756c5f379d44ef393c5d304abfba8202470ae379d4a1af85d942a23
 MISC metadata.xml 865 BLAKE2B b0f6be692417a8af07b26e95555c5aba8416ed9d1afa59d15bf9df313b727db2a0331500dc93ae34ee9ed4c693c3505bad2dbc405facdbca5447cf37d92340fc SHA512 df1dd59066480b5e3eb8b46091d134ea1701600c20766b259d60c8a81786f4f06edbe7441a20bb62f10b53d6d8c5d76ae073f392254caa12d3dea3b09c172973
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
index 259c7ff8cd49..0a86a696dec5 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
deleted file mode 100644
index 17ae818bcef0..000000000000
--- a/net-fs/openafs-kernel/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
-DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3 SHA512 e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
-DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
-EBUILD openafs-kernel-1.6.22.1-r1.ebuild 3811 BLAKE2B c972557334a6b49c22444af2b4887153d7d39ee849d63288db96798c0854271fffacc2483c107ddf35aad358274ae9baaf6a943898cfad53b9714a71bb282c0d SHA512 2316dd20bd1e097da0adc758ddda78fd873eb75222ff736dbc9f2063942a12a712431d06fd52b3329d445be1426360d39a4a33e0b7106e757472d2b9137a88cf
-EBUILD openafs-kernel-1.6.22.2-r1.ebuild 3813 BLAKE2B 634503b3fb6c4cd9fca02ab31b69f9e6025b4fdac5b6708cb033722007a3be7f3f302cf31f3ecd4e8346597d4cec0fa6595b98267327a6a00e9b3df52f11dc36 SHA512 58a7c5560f152a816cb91a095b06db017bc7c67e09744d8331e1180c2c49469e5c166d2c6f1158e8485268452b78d4b44368521f5eb5f262044b7f61d693376d
-MISC metadata.xml 325 BLAKE2B d173efd11e6fdc79eafa352e60e091bf539ceda665d052395047f255cb7682a72c7b839b6e3db6005e23ad38fa5cb008228f8971ef0622d801bb41f248c52c31 SHA512 60554e65e28506ae082618d223c5b00615f26c849f799a3077294430a1e23f9e5cc4d69aa115dcbf247d5805dfaaa06e3533e576434abe13426022f6776d9947
diff --git a/net-fs/openafs-kernel/metadata.xml b/net-fs/openafs-kernel/metadata.xml
deleted file mode 100644
index e76fe2c4c443..000000000000
--- a/net-fs/openafs-kernel/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>NP-Hardass@gentoo.org</email>
-</maintainer>
-<maintainer type="person">
-	<email>bircoph@gentoo.org</email>
-	<name>Andrew Savchenko</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.22.1-r1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.22.1-r1.ebuild
deleted file mode 100644
index 8dbaaf5e78de..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.22.1-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools linux-mod multilib toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_PN="${PN/-kernel}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="20170822"
-
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~!AFS_FS KEYS"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is ge 4 15 ; then
-		ewarn "Gentoo supports kernels which are supported by OpenAFS"
-		ewarn "which are limited to the kernel versions: < 4.15"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Please do not file a bug report about this."
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	local myconf=""
-	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
-	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
-		myconf="--enable-linux-d_splice_alias-extra-iput"
-	fi
-
-	local ARCH="$(tc-arch-kernel)"
-	local MY_ARCH="$(tc-arch)"
-	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
-
-	if use kernel_linux; then
-		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
-	econf \
-		$(use_enable debug debug-kernel) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
-}
-
-src_install() {
-	if use kernel_linux; then
-		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
-		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
-		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
-}
-
-pkg_postinst() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postinst
-
-	if use kernel_linux; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.6.18.2 ${v}; then
-				ewarn "As of OpenAFS 1.6.18.2, Gentoo's packaging no longer requires"
-				ewarn "that CONFIG_DEBUG_RODATA be turned off in one's kernel config."
-				ewarn "If you only turned this option off for OpenAFS, please re-enable"
-				ewarn "it, as keeping it turned off is a security risk."
-				break
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.22.2-r1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.22.2-r1.ebuild
deleted file mode 100644
index 0a6b70212ca6..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.22.2-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools linux-mod multilib toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_PN="${PN/-kernel}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="20170822"
-
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~!AFS_FS KEYS"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is ge 4 16 ; then
-		ewarn "Gentoo supports kernels which are supported by OpenAFS"
-		ewarn "which are limited to the kernel versions: < 4.16"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Please do not file a bug report about this."
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	local myconf=""
-	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
-	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
-		myconf="--enable-linux-d_splice_alias-extra-iput"
-	fi
-
-	local ARCH="$(tc-arch-kernel)"
-	local MY_ARCH="$(tc-arch)"
-	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
-
-	if use kernel_linux; then
-		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
-	econf \
-		$(use_enable debug debug-kernel) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
-}
-
-src_install() {
-	if use kernel_linux; then
-		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
-		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
-		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
-}
-
-pkg_postinst() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postinst
-
-	if use kernel_linux; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.6.18.2 ${v}; then
-				ewarn "As of OpenAFS 1.6.18.2, Gentoo's packaging no longer requires"
-				ewarn "that CONFIG_DEBUG_RODATA be turned off in one's kernel config."
-				ewarn "If you only turned this option off for OpenAFS, please re-enable"
-				ewarn "it, as keeping it turned off is a security risk."
-				break
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 00ec2d0075c8..a84dd9dace79 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,12 +1,5 @@
-DIST openafs-1.6.22.1-doc.tar.bz2 3534064 BLAKE2B e9f67fb42b6c4e6c2092e713e801db5479beccb1e3dc6d48c16e655151dcf91693497c4ee57c47c98c52cba6eb0ad271698ed450487bdb462111a9276cb1eb74 SHA512 1c9481507824a450d6610dbbb427bdbccb3373e12bae0bf603ec121023ee7bbb05fef366f5eec793736b0643d0f6e8f611bc55473c71a831e3b31970420ec44c
-DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
-DIST openafs-1.6.22.2-doc.tar.bz2 3533975 BLAKE2B a44b39291ece3d4b1f9f9e722b35f48698063e4daecb94745b5a8ead00412b9e8e7baef0c1264c6289de45cab66b4b83ed3cfe83a60072480c848c14bb61016c SHA512 e8405ad2f5c3ad24d37789fdf71961ed3f1af4467b9385a87f70f8ffc39dfccf1db35a492360811cf62bb3959cdb7f6eee08991aaafa24961b24815f908172c1
-DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3 SHA512 e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
 DIST openafs-1.8.6-doc.tar.bz2 3769160 BLAKE2B c5fe08fbb2cdab48dd691a7e228cc590644e05b22c87afef24a5fb35aa12e379d8d49d4b920cb84dd23b4e1f1a04512078f3018808531cdc7180778885bdc466 SHA512 7525325a5ef6e1ceada7075f489a03e1d250d3cbd8b8e83a25c8e40d506d50cbf10c2b28b682f2f9663a8cd450cb70891a04e6dbc296347945ee2454b138d971
 DIST openafs-1.8.6-src.tar.bz2 14874336 BLAKE2B a83f5bfe543b3797fa6d80ebc96cacb1a15f58cf5495d1c693593bc6d24a9f08678693080b3920a97afebe937689dd0ad08bbca95c996af0d2c83935974d3613 SHA512 0800c3825d4e0384b43cb801fc898e9255a0fa0d0baf1f231fbf383317919cc30f68526eeec803d2dc21fc7a6b55155ea4cb23197604c70e89ecf4d520b85ec1
-DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
 DIST openafs-patches-20200913.tar.xz 28392 BLAKE2B 5e8b8f2554453abdb0a84dd45d8e719cc60127224ee6ebeaca4fcddba3d38309d7e5070c43659d10301ab9eaf371ba7dcbcf12950166626a7d359d2a39c922c6 SHA512 ec0aa800b945de2fe70d949259c89a97660bdbfee3c3e43d886a5c2f6b7c530252a53ff8f196f6e80a9a657bb81f26a6937a1bec3fafbd2c70322b313a712820
-EBUILD openafs-1.6.22.1.ebuild 6969 BLAKE2B 38d0afcf387995157317252cfad1ea5d831e89779c02a2635b600be0f0dc279357cc989b6982d5fab3b3e51acb7cf5d86eb97d0c07b9d5340e843861ecede6ee SHA512 96acce6ba9b8d4847ddaaaf459516f1b159bc27b9f9faa3c00909926d9a8aad3158864a2ccc74f83357419d31ccd8a94df994dd7f65f54e4513f532c47e02869
-EBUILD openafs-1.6.22.2.ebuild 6971 BLAKE2B 2cb82e548ec3c46082c4ebb2aa6c85387e0c8d6914fa772b23e02a94d94ac4cf41ff74749a6e94de235e980630991b629ed0b72639eb7e8e76501146fbc154b1 SHA512 eab046105a4744c1a3b21b29e436f028138333a182ee1d759e9d351fcd23fe9d218c21161131f4f381448a1f2c477cfec992efffa451e9178e00b856ae8a0d1e
 EBUILD openafs-1.8.6.ebuild 10940 BLAKE2B e5b3387b6320fdaf374e63fa3f3e33f38f9417d56c42689ff2f6b228a856bae3de78db6fa6b589b0ab6c89feac89e24ce880f5f6e36be168b4418546b2612772 SHA512 6db82a6605b116e92958db7e44fb706443b4cd4e48dd6bfb7ab9eca4d71008f8ef538c69ef6818f3b3946e369ed4ab92e623cdfb0337f0105441411760f8997e
 MISC metadata.xml 1433 BLAKE2B 649cbf6ca873658e3f4829223f60cf646dcd601eb1f0aadefe24a0ecf561367988c4e63b37550693b56fd74adbffe8ce27db526ec1f175536a7d2d5f184204c5 SHA512 a4f1ecf4833e0f8491ee7b2a0ae6f1baa8a19125971c8bc19f44ff4bb3d229c08870699207269be797af31dde53417577779e43f3a723ec621d04571b6a75df5
diff --git a/net-fs/openafs/openafs-1.6.22.1.ebuild b/net-fs/openafs/openafs-1.6.22.1.ebuild
deleted file mode 100644
index 79daf3d59cf1..000000000000
--- a/net-fs/openafs/openafs-1.6.22.1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-PVER="20170822"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
-
-CDEPEND="
-	virtual/libintl
-	fuse? ( sys-fs/fuse:0= )
-	kerberos? ( virtual/krb5 )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( sys-libs/pam )"
-
-DEPEND="${CDEPEND}
-	virtual/yacc
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)"
-
-RDEPEND="${CDEPEND}
-	modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-src_prepare() {
-	default
-
-	# fixing 2-nd level makefiles to honor flags
-	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
-		src/*/Makefile.in || die '*/Makefile.in sed failed'
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	local myconf
-	use debug && use pam && myconf="--enable-debug-pam"
-
-	AFS_SYSKVERS=26 \
-	econf \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		$(use_enable bitmap-later) \
-		$(use_enable debug) \
-		$(use_enable debug debug-lwp) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable ncurses gtx) \
-		$(use_enable pam) \
-		$(use_enable pthreaded-ubik) \
-		$(use_enable supergroups) \
-		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
-		$(use_with kerberos krb5) \
-		"${myconf}"
-}
-
-src_compile() {
-	emake all_nolibafs
-	local d
-	if use doc; then
-		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
-			emake -C "${d}" html;
-		done
-	fi
-}
-
-src_install() {
-	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
-	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
-
-	emake DESTDIR="${ED}" install_nolibafs
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB
-	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
-	fi
-	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${ED}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
-	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
-	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${ED}"/usr/include/*.h \
-		"${ED}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
-			src/afsd/CellServDB NEWS README )
-
-	# documentation package
-	if use doc ; then
-		DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
-		dohtml -r doc/xml/
-	fi
-
-	einstalldocs
-
-	# Gentoo related scripts
-	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
-	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
-	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
-	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
-	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
-	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
-	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
-	systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
-	systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
-
-	# used directories: client
-	keepdir /etc/openafs
-
-	# used directories: server
-	keepdir /etc/openafs/server
-	diropts -m0700
-	keepdir /var/lib/openafs
-	keepdir /var/lib/openafs/db
-	diropts -m0755
-	keepdir /var/lib/openafs/logs
-
-	# link logfiles to /var/log
-	dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
-	## Somewhat intelligently install default configuration files
-	## (when they are not present)
-	local x
-	for x in cacheinfo CellServDB ThisCell ; do
-		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
-			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This installation should work out of the box (at least the"
-	elog "client part doing global afs-cell browsing, unless you had"
-	elog "a previous and different configuration).  If you want to"
-	elog "set up your own cell or modify the standard config,"
-	elog "please have a look at the Gentoo OpenAFS documentation"
-	elog "(warning: it is not yet up to date wrt the new file locations)"
-	elog
-	elog "The documentation can be found at:"
-	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
-	elog
-	elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
-	elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
-}
-
-pkg_config() {
-	elog "Setting cache options for systemd."
-
-	SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
-	[ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
-
-	CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
-	[ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
-
-	if [ ${CACHESIZE} -lt 131070 ]; then
-		AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
-	elif [ ${CACHESIZE} -lt 524288 ]; then
-		AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
-	elif [ ${CACHESIZE} -lt 1048576 ]; then
-		AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
-	elif [ ${CACHESIZE} -lt 2209715 ]; then
-		AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
-	else
-		AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
-	fi
-
-	# Replace existing env var if exists, else append line
-	grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
-		sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
-		sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
-		die "Updating ${SERVICED_FILE} failed."
-}
diff --git a/net-fs/openafs/openafs-1.6.22.2.ebuild b/net-fs/openafs/openafs-1.6.22.2.ebuild
deleted file mode 100644
index 394f4fe77717..000000000000
--- a/net-fs/openafs/openafs-1.6.22.2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-PVER="20170822"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
-
-CDEPEND="
-	virtual/libintl
-	fuse? ( sys-fs/fuse:0= )
-	kerberos? ( virtual/krb5 )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( sys-libs/pam )"
-
-DEPEND="${CDEPEND}
-	virtual/yacc
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)"
-
-RDEPEND="${CDEPEND}
-	modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-src_prepare() {
-	default
-
-	# fixing 2-nd level makefiles to honor flags
-	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
-		src/*/Makefile.in || die '*/Makefile.in sed failed'
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	local myconf
-	use debug && use pam && myconf="--enable-debug-pam"
-
-	AFS_SYSKVERS=26 \
-	econf \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		$(use_enable bitmap-later) \
-		$(use_enable debug) \
-		$(use_enable debug debug-lwp) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable ncurses gtx) \
-		$(use_enable pam) \
-		$(use_enable pthreaded-ubik) \
-		$(use_enable supergroups) \
-		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
-		$(use_with kerberos krb5) \
-		"${myconf}"
-}
-
-src_compile() {
-	emake all_nolibafs
-	local d
-	if use doc; then
-		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
-			emake -C "${d}" html;
-		done
-	fi
-}
-
-src_install() {
-	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
-	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
-
-	emake DESTDIR="${ED}" install_nolibafs
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB
-	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
-	fi
-	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${ED}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
-	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
-	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${ED}"/usr/include/*.h \
-		"${ED}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
-			src/afsd/CellServDB NEWS README )
-
-	# documentation package
-	if use doc ; then
-		DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
-		dohtml -r doc/xml/
-	fi
-
-	einstalldocs
-
-	# Gentoo related scripts
-	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
-	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
-	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
-	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
-	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
-	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
-	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
-	systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
-	systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
-
-	# used directories: client
-	keepdir /etc/openafs
-
-	# used directories: server
-	keepdir /etc/openafs/server
-	diropts -m0700
-	keepdir /var/lib/openafs
-	keepdir /var/lib/openafs/db
-	diropts -m0755
-	keepdir /var/lib/openafs/logs
-
-	# link logfiles to /var/log
-	dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
-	## Somewhat intelligently install default configuration files
-	## (when they are not present)
-	local x
-	for x in cacheinfo CellServDB ThisCell ; do
-		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
-			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This installation should work out of the box (at least the"
-	elog "client part doing global afs-cell browsing, unless you had"
-	elog "a previous and different configuration).  If you want to"
-	elog "set up your own cell or modify the standard config,"
-	elog "please have a look at the Gentoo OpenAFS documentation"
-	elog "(warning: it is not yet up to date wrt the new file locations)"
-	elog
-	elog "The documentation can be found at:"
-	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
-	elog
-	elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
-	elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
-}
-
-pkg_config() {
-	elog "Setting cache options for systemd."
-
-	SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
-	[ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
-
-	CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
-	[ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
-
-	if [ ${CACHESIZE} -lt 131070 ]; then
-		AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
-	elif [ ${CACHESIZE} -lt 524288 ]; then
-		AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
-	elif [ ${CACHESIZE} -lt 1048576 ]; then
-		AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
-	elif [ ${CACHESIZE} -lt 2209715 ]; then
-		AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
-	else
-		AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
-	fi
-
-	# Replace existing env var if exists, else append line
-	grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
-		sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
-		sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
-		die "Updating ${SERVICED_FILE} failed."
-}