[gentoo-commits] repo/gentoo:master commit in: net-fs/openafs/

[NP Hardass]

commit:     b628e20fc4a845b1fb5b848cca7c93f0124464da
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 19:15:24 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 19:15:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b628e20f

net-fs/openafs: Drop older versions

Bug: https://bugs.gentoo.org/640536
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-fs/openafs/Manifest                   |   9 --
 net-fs/openafs/openafs-1.6.20.1.ebuild    | 222 ------------------------------
 net-fs/openafs/openafs-1.6.20.2-r1.ebuild | 222 ------------------------------
 net-fs/openafs/openafs-1.6.21-r1.ebuild   | 222 ------------------------------
 net-fs/openafs/openafs-1.6.21.1.ebuild    | 222 ------------------------------
 5 files changed, 897 deletions(-)

diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 89d0db3d5c1..70f619f99b4 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,12 +1,3 @@
-DIST openafs-1.6.20.1-doc.tar.bz2 3533007 BLAKE2B 9e98543277cc80dacb7f5145658fc629b8437e4e2f76375f94a82834780329bc413148e4b04b0736f88ff91d5c5bea2975360d568a559da0d69a1cfc238132ed SHA512 53d36ae28ce303fd397635f888ba5e7b1a74967072919bab44dc68858881e6b0586b1e2339dcfdfe1de3bf69591077e4c09ad0c0444eb1a1557a71b39b793da4
-DIST openafs-1.6.20.1-src.tar.bz2 14672548 BLAKE2B e558a43be0dc0098b726f5a969cf1cf0d64dafdc9405b605c9eea2ce6ed8c4fa3026b3ee5e7277609286e25bf9db69f2e10789fd78aef2693ac4d67ae4311bfe SHA512 cd6a0cd5d48fffaf37d143a9f8f7cd84c78ada6a645ac1a6cd3cf5b4a8a5af602e84133506c797e62ef2e61180a1c89915ea8657ac95bb872ada018b1baf0d59
-DIST openafs-1.6.20.2-doc.tar.bz2 3531309 BLAKE2B d91cb52ebdf65a70d2ef7424877181b7c29c2d8262ab40d87f8cff725c3406fad3a38438c04232228999f30100bd16940f8d976fd3e41f90127fe67d52b2e496 SHA512 ff22960ce35e459acb04ca22a247d8199f81061498e0c4c3b83090200561199e1ae80152ab5c6b148983978ffed730c9efad8346bce289a6c5128d17510db772
-DIST openafs-1.6.20.2-src.tar.bz2 14676861 BLAKE2B 538534c451e51e449d225772cfb38a119b2297aee82bf5758434a8d5784b08afb08996f7dd80d78e11c9da8a55165815aa138bdb4aba4bda86549a1d2e5ab8d4 SHA512 74c50fa71a98e7ad8bfed0610ab1dbf5c6669cdbd1e240c7b155f345fc511d9e51b4d9caa8d235223ad929b711577a192ca0841c92279bf16991cace8f19a575
-DIST openafs-1.6.21-doc.tar.bz2 3532948 BLAKE2B 03ad1a7ad0b81b7fde98a126c1bd629d5541556a5639cbbc712f9b45404c325208a2d20fcbee714849829c6e3e665614ce255d0aab7df9a7320ceed54febf056 SHA512 37ee9a140e9f34145a020ee2ba06c8635a27c3329836dc379af2fcda9928182637b4ab3da303b4a54d8dde6df463e50481b9a970b1d07d180a78f8a9e46e0d96
-DIST openafs-1.6.21-src.tar.bz2 14682997 BLAKE2B 304a1ad57528f933dcf12d40b30325a58cbee21edfae5d043098cdf77b620fb321bcab01d28300ecc380486d87bb1925e2f030d9bd23afb58432fd0d0782736a SHA512 451c38ed5031b8a962da3276bf5d0f1b74c5956c2d10cdb8bbd22ea633880ebf35cf5fc71feb5d2eca4306762f6c2376a46f4522150291acfc469f8be2da757f
-DIST openafs-1.6.21.1-doc.tar.bz2 3532980 BLAKE2B a50b7bfb04ffa81034d2bc9b92c2eacae6157d7f9604785877d617c443271d04e236e4c79470174ab9df284860a2bbcf41cecb90474fae091d7e0737bf5e444d SHA512 97236d45153dd8f487caad2e5fff382dc63dd3c75270f58c8afd47145176255d1c7b454b366118543a168951066fd721c7dce506e123adf57d3db939129e6356
-DIST openafs-1.6.21.1-src.tar.bz2 14679991 BLAKE2B 7c18dccb638ed24b33d188f9e58447135a06aed4cf1f4ce8d5c985f1efcb418d891187b4492f2f50111994801852db080c6dec4d0c5629771dcea3393f90add5 SHA512 a8c496657a59ee00411717aac8b6c4ca64f7ffeef400ae84ff902c8b2d81d19a367f78fbe105512ec7ec7181e8b0158fc359565eb99e2beb39d6a93ed1b28f98
 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-20170212.tar.xz 11008 BLAKE2B 6a51a849a61dbc8486a78ba44ced693f76dcb79f1db0131e82e81d16f66bee658b9604064b7c828545dcc4984d4c0f25c5972cf2e61c2036d1d093662068d539 SHA512 13e525a3f612b43318ad2fefaa3edf15ad572153494e94826815400f90a253678d2ade44d6adae08b1cb0dc8f311f5407f5aa540ed0df7a2d2d6024695bd917f
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a

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 37fc178aa24..00000000000
--- 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 4ecf063fc89..00000000000
--- 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-r1.ebuild b/net-fs/openafs/openafs-1.6.21-r1.ebuild
deleted file mode 100644
index 3c3aa6efbac..00000000000
--- a/net-fs/openafs/openafs-1.6.21-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 4ecf063fc89..00000000000
--- 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."
-}