gentoo resync : 15.12.2017

5 files changed, 4 insertions, 680 deletions

diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 4987bf4de776..3b21068dcd6f 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,15 +1,5 @@
-DIST openafs-1.6.20.1-doc.tar.bz2 3533007 SHA256 2c4bf6f53030e8a9cf3460d9c9292bcdbfea356930ed1d436506e8dc60db0f1c SHA512 53d36ae28ce303fd397635f888ba5e7b1a74967072919bab44dc68858881e6b0586b1e2339dcfdfe1de3bf69591077e4c09ad0c0444eb1a1557a71b39b793da4 WHIRLPOOL 39e50d9af1acda7be5f508392eceac2caf6b13d03e825719d09de539d9080386ff82b3a0f5e8c489f3e0c2e9051a08623baa3176be61816a154ad734dcd03644
-DIST openafs-1.6.20.1-src.tar.bz2 14672548 SHA256 dc869eecf6c81949d3dd2021eaf87118ef9b90ec5012a35f64836a02a58a8826 SHA512 cd6a0cd5d48fffaf37d143a9f8f7cd84c78ada6a645ac1a6cd3cf5b4a8a5af602e84133506c797e62ef2e61180a1c89915ea8657ac95bb872ada018b1baf0d59 WHIRLPOOL e289125306024b5a4d651017f35c0b2a91cadfeecf5820298e5ecccebf8c94a8126f7b70c120a687c5edfc4ad769ecfe72f9597173c34fb0dec6e13a7619cf4c
-DIST openafs-1.6.20.2-doc.tar.bz2 3531309 SHA256 ec19f00594d8dd0b201aa8a2799ccab54994d8ca4ce621f843d8c4c2283f4259 SHA512 ff22960ce35e459acb04ca22a247d8199f81061498e0c4c3b83090200561199e1ae80152ab5c6b148983978ffed730c9efad8346bce289a6c5128d17510db772 WHIRLPOOL b3b3bfc23342fadb1f5baf72df0f716f0ec498f6521eb8e37f9a113dc14c6d3cf74c95c0f07141396eeb3e26f539d6aa7efe5fa2b609739cbabbd1152a618a53
-DIST openafs-1.6.20.2-src.tar.bz2 14676861 SHA256 50234820c3da9752d2ca05fb7e83b7dc5c96a0e96a0b875ebc7ae3c835607614 SHA512 74c50fa71a98e7ad8bfed0610ab1dbf5c6669cdbd1e240c7b155f345fc511d9e51b4d9caa8d235223ad929b711577a192ca0841c92279bf16991cace8f19a575 WHIRLPOOL af213b7bb94962dcf76d22cf2078c8cc02d435a22a26f14ca7113d3eafb4304823b9806ff4121e5c0ab4f9f4f665eed0910c08dd41f3f2de136e8818f7ed2b1e
-DIST openafs-1.6.21-doc.tar.bz2 3532948 SHA256 5bc07340fc6b6db12e92f88a33c70478d22c93de7ae1725c4b25ef43caac6e8c SHA512 37ee9a140e9f34145a020ee2ba06c8635a27c3329836dc379af2fcda9928182637b4ab3da303b4a54d8dde6df463e50481b9a970b1d07d180a78f8a9e46e0d96 WHIRLPOOL fbe089e6ec88babfb9865917a64cf711f952be20dc0079c4e31327bf7a0d2ee1ab10c77a531297a366402df6c5994411f1ae3ed99ea966feb64c5341e5d695bd
-DIST openafs-1.6.21-src.tar.bz2 14682997 SHA256 ba9c1f615edd53b64fc271ad369c49a816acedca70cdd090975033469a84118f SHA512 451c38ed5031b8a962da3276bf5d0f1b74c5956c2d10cdb8bbd22ea633880ebf35cf5fc71feb5d2eca4306762f6c2376a46f4522150291acfc469f8be2da757f WHIRLPOOL a643735720d8ab486fc32f0f21a1340792879e0648d0ffa72bfe7a10a4659f5c0f986d4b918bfc7810c2fe4fa0762a0c727c7fd8de5c179b14bdbdb56664c607
-DIST openafs-1.6.21.1-doc.tar.bz2 3532980 SHA256 a8b2482eaa3bd5a3521b8dfde69337e5e01b1b1626c0a2e0a489049834a2983a SHA512 97236d45153dd8f487caad2e5fff382dc63dd3c75270f58c8afd47145176255d1c7b454b366118543a168951066fd721c7dce506e123adf57d3db939129e6356 WHIRLPOOL 6a72623508a01f9cb8fd5ec33a7a407a3c813e24756ed88e45edf0cc9503135ac85a6fc78257d5ea91bdfa4cce4dd25b9a38a5a463a901bd665c1da85830a5be
-DIST openafs-1.6.21.1-src.tar.bz2 14679991 SHA256 aed896b0f598e3033e9ceb2a1eae24addff9ec0bb2d713ab63945a449ded3a5a SHA512 a8c496657a59ee00411717aac8b6c4ca64f7ffeef400ae84ff902c8b2d81d19a367f78fbe105512ec7ec7181e8b0158fc359565eb99e2beb39d6a93ed1b28f98 WHIRLPOOL 57919d0babfee0aca6659e0e036437b9f0d01d8798bdaf51200798dd47d08b706a078bdff055f0ac0f85cb4ee7cf3adc239feaf9bec19dfb268984b9fd47faca
-DIST openafs-patches-20170212.tar.xz 11008 SHA256 9e20ca0ce0af6178ba39e459e88ecf3da8e6d97947a8b77a65f3cb0e523f6b47 SHA512 13e525a3f612b43318ad2fefaa3edf15ad572153494e94826815400f90a253678d2ade44d6adae08b1cb0dc8f311f5407f5aa540ed0df7a2d2d6024695bd917f WHIRLPOOL 4f81b94ad5ae7aab8ab954a333aa5cf72692cf91784b441b16e55fd023e58b7fe575b0228073fbacb9036cd4a7bfccd7553795457872973d15bbe48b95ac4484
-DIST openafs-patches-20170822.tar.xz 11036 SHA256 970324fc50ee48bc6aa06bbe448c0aac5a398c38e196155924b85dc8ed36e649 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a WHIRLPOOL d9485c1d08f2346218cf1285d02ac5097bc283d4648ba9203d861162c259fa74ff749acb455e62eaa38a717cf253ed221c11f3ad0339600496b7da4929419e50
-EBUILD openafs-1.6.20.1.ebuild 7024 BLAKE2B f9e95f134377e0d141d8329bcc0d9f3d7445485783c7f15e229e5bb6eb6f4aa566f08e1ca6ab14250ed5cbec22885649aa2f54df5345d41ee243ad9ac7cc1db2 SHA512 32b95ec66b6eaf1e5c796e1f9d2b37822abfb760842f6d8d5ce44478f1938cd47c51ec190eaadab4d65025bafba35da63366935f8def30de23d35bc356e77d2e
-EBUILD openafs-1.6.20.2-r1.ebuild 7027 BLAKE2B a1c4fc676f871605a2e4909666bad89182c55d690151284b37fbad593d2a0bb24265dc90e7bd80ea64512b8eb4bef0be0fec31256c621a1dbda4b3c2e5dfa8c4 SHA512 bb058ead9fc46b8cfe19eaeff73bc1fe213e11ccfb0bb837753b3748810d72963925bcbdcf1c1311aef4992cbfe422d14a652273c5524bb4276b2969817a032a
-EBUILD openafs-1.6.21-r1.ebuild 7025 BLAKE2B a99844715433a7645bc4a8d9793a3116fa8797429c84b3ea20fca58732f4bfcbf81588ba98213b184f29552fe08769cfe70b4e5247d9a8ba6ad0b502c49441fd SHA512 b635c9e39e1034f35ccf90e843ca8e61122e8a6692fe9a7074b0a16ad738c5160886209bcf362a3bbee673506395e3eefa95e70e3db82e662788eba22e4fd176
-EBUILD openafs-1.6.21.1.ebuild 7027 BLAKE2B a1c4fc676f871605a2e4909666bad89182c55d690151284b37fbad593d2a0bb24265dc90e7bd80ea64512b8eb4bef0be0fec31256c621a1dbda4b3c2e5dfa8c4 SHA512 bb058ead9fc46b8cfe19eaeff73bc1fe213e11ccfb0bb837753b3748810d72963925bcbdcf1c1311aef4992cbfe422d14a652273c5524bb4276b2969817a032a
+DIST openafs-1.6.22-doc.tar.bz2 3567926 BLAKE2B 49c20ba0cf28cf567bbdbdd9f34bce504bfc90fe87d74bc9a1f30250a51802239ff9ee1286da5961fed50e84c71d311df7b3c11e393a10f58f88e4dc57773ca1 SHA512 6ae43aa86744b1a7879e583faea96ecbdf4dd6f9c4eb39040ca58217c63ae5bbf565cd70e48cddf870b8cb7623e923260a31559d7d1e22b4ef86922601aedd62
+DIST openafs-1.6.22-src.tar.bz2 14606745 BLAKE2B ee406ac0bc2f91862b916fe2c84bb5b1887b43bfb396a0d4b4d3349420b4af397344a2c4d585698fe6f3870fba2090df7b7da85431275b5d1c28b01168221557 SHA512 7a533462175e79aa48339c5105d2dbddde284e23e5d5bcff58a4893839fc7bcfdd779d1d65abfc5217b185624bf88fe1ef02d0c37d29b6ff96616e96f54a6d87
+DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
+EBUILD openafs-1.6.22.ebuild 7025 BLAKE2B a99844715433a7645bc4a8d9793a3116fa8797429c84b3ea20fca58732f4bfcbf81588ba98213b184f29552fe08769cfe70b4e5247d9a8ba6ad0b502c49441fd SHA512 b635c9e39e1034f35ccf90e843ca8e61122e8a6692fe9a7074b0a16ad738c5160886209bcf362a3bbee673506395e3eefa95e70e3db82e662788eba22e4fd176
 MISC metadata.xml 895 BLAKE2B a4b319002867999c6da30251eb0408991bcc5ba727d975cd190f9064feb8c291343a60d4f305d7e98ad3cad443c15bc554971ed518b0566b85a172805d08d558 SHA512 5117449a47343db76f8d88a91beb18a2aade828fcbef6133f2307225b8160418fa407faaa550728d8916a5ff06e610198ccdb6fec1f975e7cc892a38fc590534
diff --git a/net-fs/openafs/openafs-1.6.20.1.ebuild b/net-fs/openafs/openafs-1.6.20.1.ebuild
deleted file mode 100644
index 37fc178aa241..000000000000
--- a/net-fs/openafs/openafs-1.6.20.1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="20170212"
-
-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
-
-CDEPEND="
-	virtual/libintl
-	fuse? ( sys-fs/fuse )
-	kerberos? ( virtual/krb5 )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( virtual/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.20.2-r1.ebuild b/net-fs/openafs/openafs-1.6.20.2-r1.ebuild
deleted file mode 100644
index 4ecf063fc89f..000000000000
--- a/net-fs/openafs/openafs-1.6.20.2-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
-
-CDEPEND="
-	virtual/libintl
-	fuse? ( sys-fs/fuse )
-	kerberos? ( virtual/krb5 )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( virtual/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.21.1.ebuild b/net-fs/openafs/openafs-1.6.21.1.ebuild
deleted file mode 100644
index 4ecf063fc89f..000000000000
--- a/net-fs/openafs/openafs-1.6.21.1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
-
-CDEPEND="
-	virtual/libintl
-	fuse? ( sys-fs/fuse )
-	kerberos? ( virtual/krb5 )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( virtual/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.21-r1.ebuild b/net-fs/openafs/openafs-1.6.22.ebuild
index 3c3aa6efbac9..3c3aa6efbac9 100644
--- a/net-fs/openafs/openafs-1.6.21-r1.ebuild
+++ b/net-fs/openafs/openafs-1.6.22.ebuild