Drop old ebuilds per Andrej Filipcic #383473.

8 files changed, 7 insertions, 1033 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 38a6d240f7eb..43014c7c79da 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/openafs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.175 2011/09/18 21:30:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.176 2011/09/18 21:31:29 vapier Exp $
+
+  18 Sep 2011; Mike Frysinger <vapier@gentoo.org> -openafs-1.4.9.ebuild,
+  -openafs-1.4.12.1-r2.ebuild, -openafs-1.4.14.ebuild, -openafs-1.5.34.ebuild,
+  -openafs-1.6.0_pre2.ebuild, -openafs-1.6.0_pre3.ebuild,
+  -openafs-1.6.0_pre6.ebuild:
+  Drop old ebuilds per Andrej Filipcic #383473.
 
   18 Sep 2011; Mike Frysinger <vapier@gentoo.org> openafs-1.4.14-r1.ebuild:
   Mark stable for amd64/x86 #383473 by Andrej Filipcic.
diff --git a/net-fs/openafs/openafs-1.4.12.1-r2.ebuild b/net-fs/openafs/openafs-1.4.12.1-r2.ebuild
deleted file mode 100644
index d755d55c6353..000000000000
--- a/net-fs/openafs/openafs-1.4.12.1-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.12.1-r2.ebuild,v 1.1 2010/08/23 22:01:06 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
-
-MY_PV=$(get_version_component_range 1-3)
-PVER="2"
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/${MY_PV}/${P}-src.tar.bz2
-	http://openafs.org/dl/${MY_PV}/${P}-doc.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc kerberos pam"
-
-RDEPEND="~net-fs/openafs-kernel-${PV}
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-src_prepare() {
-	EPATCH_EXCLUDE="012_all_kbuild.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-
-	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
-	sed -i '/^a/s:^:e:' regen.sh
-	skipman=1
-	. regen.sh
-}
-
-src_configure() {
-	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
-	local myconf=""
-	if use kerberos; then
-		myconf="--with-krb5-conf=$(type -p krb5-config)"
-	fi
-
-	AFS_SYSKVERS=26 \
-	XCFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable pam) \
-		--enable-largefile-fileserver \
-		--enable-supergroups \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 all_nolibafs || die
-}
-
-src_install() {
-	local CONFDIR=${WORKDIR}/gentoo/configs
-	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
-
-	emake -j1 DESTDIR="${D}" install_nolibafs || die
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB || die
-	echo "/afs:/var/cache/openafs:200000" > "${D}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${D}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${D}"/usr/$(get_libdir)/pam_afs* || die
-	fi
-	rm -f "${D}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${D}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${D}"/usr/bin/kpasswd{,_afs} || die
-	mv "${D}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${D}"/usr/include/{lwp,lock,timer}.h "${D}"/usr/include/afs/ || die
-	mv "${D}"/usr/$(get_libdir)/liblwp* "${D}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${D}"/usr/include/*.h \
-		"${D}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${CONFDIR}"/README src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc doc/{arch,examples,pdf,protocol,txt}/*
-		dohtml -A xml -r doc/{html,xml}/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
-	newconfd "${CONFDIR}"/openafs-client openafs-client || die
-	newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
-	newconfd "${CONFDIR}"/openafs-server openafs-server || die
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/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 "${ROOT}"/etc/openafs/${x} ] ; then
-			cp "${ROOT}"/etc/openafs/${x} "${D}"/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 "  http://www.gentoo.org/doc/en/openafs.xml"
-}
diff --git a/net-fs/openafs/openafs-1.4.14.ebuild b/net-fs/openafs/openafs-1.4.14.ebuild
deleted file mode 100644
index 83b470d0c033..000000000000
--- a/net-fs/openafs/openafs-1.4.14.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.14.ebuild,v 1.1 2011/01/08 02:07:43 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
-
-MY_PV=$(get_version_component_range 1-3)
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/${MY_PV}/${P}-src.tar.bz2
-	http://openafs.org/dl/${MY_PV}/${P}-doc.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc kerberos pam"
-
-RDEPEND="~net-fs/openafs-kernel-${PV}
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-src_prepare() {
-	EPATCH_EXCLUDE="012_all_kbuild.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-
-	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
-	sed -i '/^a/s:^:e:' regen.sh
-	skipman=1
-	. regen.sh
-}
-
-src_configure() {
-	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
-	local myconf=""
-	if use kerberos; then
-		myconf="--with-krb5-conf=$(type -p krb5-config)"
-	fi
-
-	AFS_SYSKVERS=26 \
-	XCFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable pam) \
-		--enable-largefile-fileserver \
-		--enable-supergroups \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 all_nolibafs || die
-}
-
-src_install() {
-	local CONFDIR=${WORKDIR}/gentoo/configs
-	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
-
-	emake -j1 DESTDIR="${D}" install_nolibafs || die
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB || die
-	echo "/afs:/var/cache/openafs:200000" > "${D}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${D}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${D}"/usr/$(get_libdir)/pam_afs* || die
-	fi
-	rm -f "${D}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${D}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${D}"/usr/bin/kpasswd{,_afs} || die
-	mv "${D}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${D}"/usr/include/{lwp,lock,timer}.h "${D}"/usr/include/afs/ || die
-	mv "${D}"/usr/$(get_libdir)/liblwp* "${D}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${D}"/usr/include/*.h \
-		"${D}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${CONFDIR}"/README src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc doc/{arch,examples,pdf,protocol,txt}/*
-		dohtml -A xml -r doc/{html,xml}/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
-	newconfd "${CONFDIR}"/openafs-client openafs-client || die
-	newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
-	newconfd "${CONFDIR}"/openafs-server openafs-server || die
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/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 "${ROOT}"/etc/openafs/${x} ] ; then
-			cp "${ROOT}"/etc/openafs/${x} "${D}"/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 "  http://www.gentoo.org/doc/en/openafs.xml"
-}
diff --git a/net-fs/openafs/openafs-1.4.9.ebuild b/net-fs/openafs/openafs-1.4.9.ebuild
deleted file mode 100644
index e5990e0717e0..000000000000
--- a/net-fs/openafs/openafs-1.4.9.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.9.ebuild,v 1.4 2010/06/23 18:22:05 halcy0n Exp $
-
-inherit flag-o-matic eutils toolchain-funcs versionator pam
-
-PATCHVER=0.15
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${PV}/${P}-src.tar.bz2
-	doc? ( http://openafs.org/dl/${PV}/${P}-doc.tar.bz2 )
-	mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE="debug kerberos pam doc"
-
-RDEPEND="~net-fs/openafs-kernel-${PV}
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
-CONFDIR=${WORKDIR}/gentoo/configs
-SCRIPTDIR=${WORKDIR}/gentoo/scripts
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	# Apply patches to apply chosen compiler settings, fix the hardcoded paths
-	# to be more FHS friendly, and the fix the incorrect typecasts for va_arg
-	EPATCH_SUFFIX="patch" \
-	EPATCH_EXCLUDE="012_all_kbuild.patch" \
-		epatch ${PATCHDIR}
-
-	# disable XCFLAGS override
-	sed -i 's/^[ \t]*XCFLAGS.*/:/' src/cf/osconf.m4
-	# disable compiler choice override
-	sed -i 's/^[ \t]\+\(CC\|CCOBJ\|MT_CC\)="[^ ]*\(.*\)"/\1="${CC}\2"/' src/cf/osconf.m4
-
-	# fix autoconf cludge (bug #218234)
-	sed -i 's/^AC_\(AIX\|MINIX\)$//' acinclude.m4
-
-	./regen.sh || die "Failed: regenerating configure script"
-}
-
-src_compile() {
-	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
-	local myconf=""
-	if use kerberos; then
-		myconf="--with-krb5-conf=$(type -p krb5-config)"
-	fi
-
-	# AFS_SYSKVERS: fix linux version at 2.6
-	AFS_SYSKVERS=26 \
-	XCFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable pam) \
-		$(use_enable debug) \
-		--enable-largefile-fileserver \
-		--enable-supergroups \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		${myconf} || die econf
-
-	emake -j1 all_nolibafs || die "Build failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install_nolibafs || die "Installing failed"
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam; then
-		dopammod "${D}"/usr/$(get_libdir)/pam_afs*
-		rm -f "${D}"/usr/$(get_libdir)/pam_afs*
-	fi
-
-	# compile_et collides with com_err.  Remove it from this package.
-	rm "${D}"/usr/bin/compile_et
-
-	# avoid collision with mit_krb5's version of kpasswd
-	(cd "${D}"/usr/bin; mv kpasswd kpasswd_afs)
-	use doc && (cd "${D}"/usr/share/man/man1; mv kpasswd.1 kpasswd_afs.1)
-
-	# minimal documentation
-	dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB
-
-	# documentation package
-	if use doc; then
-		use pam && doman src/pam/pam_afs.5
-
-		cp -pPR doc/* "${D}"/usr/share/doc/${PF}
-	fi
-
-	# Gentoo related scripts
-	newconfd ${CONFDIR}/openafs-client openafs-client
-	newconfd ${CONFDIR}/openafs-server openafs-server
-	newinitd ${SCRIPTDIR}/openafs-client openafs-client
-	newinitd ${SCRIPTDIR}/openafs-server openafs-server
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/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)
-	# CellServDB
-	if [ ! -e "${ROOT}"etc/openafs/CellServDB ] \
-		|| grep "GCO Public CellServDB" "${ROOT}"etc/openafs/CellServDB &> /dev/null
-	then
-		cp ${CONFDIR}/CellServDB "${D}"etc/openafs
-	fi
-	# cacheinfo: use a default location cache, 200 megabyte in size
-	# (should be safe for about any root partition, the user can increase
-	# the size as required)
-	if [ ! -e "${ROOT}"etc/openafs/cacheinfo ]; then
-		echo "/afs:/var/cache/openafs:200000" > "${D}"etc/openafs/cacheinfo
-	fi
-	# ThisCell: default to "openafs.org"
-	if [ ! -e "${ROOT}"etc/openafs/ThisCell ]; then
-		echo "openafs.org" > "${D}"etc/openafs/ThisCell
-	fi
-}
-
-pkg_postinst() {
-	elog
-	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 "  http://www.gentoo.org/doc/en/openafs.xml"
-}
diff --git a/net-fs/openafs/openafs-1.5.34.ebuild b/net-fs/openafs/openafs-1.5.34.ebuild
deleted file mode 100644
index 76627e364b4b..000000000000
--- a/net-fs/openafs/openafs-1.5.34.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.5.34.ebuild,v 1.4 2010/06/23 18:22:05 halcy0n Exp $
-
-inherit flag-o-matic eutils toolchain-funcs versionator pam
-
-PATCHVER=0.14
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${PV}/${P}-src.tar.bz2
-	doc? ( http://openafs.org/dl/${PV}/${P}-doc.tar.bz2 )
-	mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos pam doc"
-
-RDEPEND="~net-fs/openafs-kernel-${PV}
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
-CONFDIR=${WORKDIR}/gentoo/configs
-SCRIPTDIR=${WORKDIR}/gentoo/scripts
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	# Apply patches to apply chosen compiler settings, fix the hardcoded paths
-	# to be more FHS friendly, and the fix the incorrect typecasts for va_arg
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-
-	sed -i 's/^[ \t]*XCFLAGS.*//' src/cf/osconf.m4
-
-	./regen.sh || die "Failed: regenerating configure script"
-}
-
-src_compile() {
-	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
-	local myconf=""
-	if use kerberos; then
-		myconf="--with-krb5-conf=$(type -p krb5-config)"
-	fi
-
-	# fix linux version at 2.6
-	AFS_SYSKVERS=26 \
-	XCFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable pam) \
-		$(use_enable debug) \
-		--enable-largefile-fileserver \
-		--enable-supergroups \
-		--disable-kernel-module \
-		${myconf} || die econf
-
-	emake -j1 all_nolibafs || die "Build failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install_nolibafs || die "Installing failed"
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam; then
-		dopammod "${D}"/usr/$(get_libdir)/pam_afs*
-		rm -f "${D}"/usr/$(get_libdir)/pam_afs*
-	fi
-
-	# compile_et collides with com_err.  Remove it from this package.
-	rm "${D}"/usr/bin/compile_et
-
-	# avoid collision with mit_krb5's version of kpasswd
-	(cd "${D}"/usr/bin; mv kpasswd kpasswd_afs)
-	use doc && (cd "${D}"/usr/share/man/man1; mv kpasswd.1 kpasswd_afs.1)
-
-	# minimal documentation
-	dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB
-
-	# documentation package
-	if use doc; then
-		use pam && doman src/pam/pam_afs.5
-
-		cp -pPR doc/* "${D}"/usr/share/doc/${PF}
-	fi
-
-	# Gentoo related scripts
-	newconfd ${CONFDIR}/openafs-client openafs-client
-	newconfd ${CONFDIR}/openafs-server openafs-server
-	newinitd ${SCRIPTDIR}/openafs-client openafs-client
-	newinitd ${SCRIPTDIR}/openafs-server openafs-server
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/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)
-	# CellServDB
-	if [ ! -e "${ROOT}"etc/openafs/CellServDB ] \
-		|| grep "GCO Public CellServDB" "${ROOT}"etc/openafs/CellServDB &> /dev/null
-	then
-		cp ${CONFDIR}/CellServDB "${D}"etc/openafs
-	fi
-	# cacheinfo: use a default location cache, 200 megabyte in size
-	# (should be safe for about any root partition, the user can increase
-	# the size as required)
-	if [ ! -e "${ROOT}"etc/openafs/cacheinfo ]; then
-		echo "/afs:/var/cache/openafs:200000" > "${D}"etc/openafs/cacheinfo
-	fi
-	# ThisCell: default to "openafs.org"
-	if [ ! -e "${ROOT}"etc/openafs/ThisCell ]; then
-		echo "openafs.org" > "${D}"etc/openafs/ThisCell
-	fi
-}
-
-pkg_postinst() {
-	elog
-	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 "  http://www.gentoo.org/doc/en/openafs.xml"
-}
diff --git a/net-fs/openafs/openafs-1.6.0_pre2.ebuild b/net-fs/openafs/openafs-1.6.0_pre2.ebuild
deleted file mode 100644
index 08ca1745ea79..000000000000
--- a/net-fs/openafs/openafs-1.6.0_pre2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre2.ebuild,v 1.2 2011/03/20 09:58:35 stefaan Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-doc.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc kerberos pam"
-
-RDEPEND="~net-fs/openafs-kernel-${PV}
-pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-src_prepare() {
-	EPATCH_EXCLUDE="012_all_kbuild.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-
-	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
-	sed -i 's/^\(\s*\)a/\1ea/' regen.sh
-	: # this line makes repoman ok with not calling eautoconf etc. directly
-	skipman=1
-	. regen.sh
-}
-
-src_configure() {
-	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
-	local myconf=""
-	if use kerberos; then
-		myconf="--with-krb5-conf=$(type -p krb5-config)"
-	fi
-
-	AFS_SYSKVERS=26 \
-	XCFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable pam) \
-		--enable-supergroups \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		${myconf}
-}
-
-src_compile() {
-	emake all_nolibafs || die
-}
-
-src_install() {
-	local CONFDIR=${WORKDIR}/gentoo/configs
-	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
-
-	emake DESTDIR="${D}" install_nolibafs || die
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB || die
-	echo "/afs:/var/cache/openafs:200000" > "${D}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${D}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${D}"/usr/$(get_libdir)/pam_afs* || die
-	fi
-	rm -f "${D}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${D}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${D}"/usr/bin/kpasswd{,_afs} || die
-	mv "${D}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${D}"/usr/include/{lwp,lock,timer}.h "${D}"/usr/include/afs/ || die
-	mv "${D}"/usr/$(get_libdir)/liblwp* "${D}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${D}"/usr/include/*.h \
-		"${D}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${CONFDIR}"/README src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc doc/{arch,examples,pdf,protocol,txt}/*
-		dohtml -A xml -r doc/{html,xml}/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
-	newconfd "${CONFDIR}"/openafs-client openafs-client || die
-	newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
-	newconfd "${CONFDIR}"/openafs-server openafs-server || die
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/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 "${ROOT}"/etc/openafs/${x} ] ; then
-			cp "${ROOT}"/etc/openafs/${x} "${D}"/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 "  http://www.gentoo.org/doc/en/openafs.xml"
-}
diff --git a/net-fs/openafs/openafs-1.6.0_pre3.ebuild b/net-fs/openafs/openafs-1.6.0_pre3.ebuild
deleted file mode 100644
index 31bfdebcafd6..000000000000
--- a/net-fs/openafs/openafs-1.6.0_pre3.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre3.ebuild,v 1.1 2011/03/20 09:58:35 stefaan Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-doc.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc kerberos pam"
-
-RDEPEND="~net-fs/openafs-kernel-${PV}
-	sys-libs/ncurses
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-src_prepare() {
-	EPATCH_EXCLUDE="012_all_kbuild.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-
-	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
-	sed -i 's/^\(\s*\)a/\1ea/' regen.sh
-	: # this line makes repoman ok with not calling eautoconf etc. directly
-	skipman=1
-	. regen.sh
-}
-
-src_configure() {
-	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
-	local myconf=""
-	if use kerberos; then
-		myconf="--with-krb5-conf=$(type -p krb5-config)"
-	fi
-
-	AFS_SYSKVERS=26 \
-	XCFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable pam) \
-		--enable-supergroups \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		${myconf}
-}
-
-src_compile() {
-	emake all_nolibafs || die
-}
-
-src_install() {
-	local CONFDIR=${WORKDIR}/gentoo/configs
-	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
-
-	emake DESTDIR="${D}" install_nolibafs || die
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB || die
-	echo "/afs:/var/cache/openafs:200000" > "${D}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${D}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${D}"/usr/$(get_libdir)/pam_afs* || die
-	fi
-	rm -f "${D}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${D}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${D}"/usr/bin/kpasswd{,_afs} || die
-	mv "${D}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${D}"/usr/include/{lwp,lock,timer}.h "${D}"/usr/include/afs/ || die
-	mv "${D}"/usr/$(get_libdir)/liblwp* "${D}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${D}"/usr/include/*.h \
-		"${D}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${CONFDIR}"/README src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc doc/{arch,examples,pdf,protocol,txt}/*
-		dohtml -A xml -r doc/{html,xml}/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
-	newconfd "${CONFDIR}"/openafs-client openafs-client || die
-	newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
-	newconfd "${CONFDIR}"/openafs-server openafs-server || die
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/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 "${ROOT}"/etc/openafs/${x} ] ; then
-			cp "${ROOT}"/etc/openafs/${x} "${D}"/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 "  http://www.gentoo.org/doc/en/openafs.xml"
-}
diff --git a/net-fs/openafs/openafs-1.6.0_pre6.ebuild b/net-fs/openafs/openafs-1.6.0_pre6.ebuild
deleted file mode 100644
index d6ce106e8fc7..000000000000
--- a/net-fs/openafs/openafs-1.6.0_pre6.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.0_pre6.ebuild,v 1.1 2011/06/17 04:18:27 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-doc.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc kerberos pam"
-
-RDEPEND="~net-fs/openafs-kernel-${PV}
-	sys-libs/ncurses
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-src_prepare() {
-	EPATCH_EXCLUDE="012_all_kbuild.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-
-	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
-	sed -i 's/^\(\s*\)a/\1ea/' regen.sh
-	: # this line makes repoman ok with not calling eautoconf etc. directly
-	skipman=1
-	. regen.sh
-}
-
-src_configure() {
-	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
-	local myconf=""
-	if use kerberos; then
-		myconf="--with-krb5-conf=$(type -p krb5-config)"
-	fi
-
-	AFS_SYSKVERS=26 \
-	XCFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable pam) \
-		--enable-supergroups \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		${myconf}
-}
-
-src_compile() {
-	emake all_nolibafs || die
-}
-
-src_install() {
-	local CONFDIR=${WORKDIR}/gentoo/configs
-	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
-
-	emake DESTDIR="${D}" install_nolibafs || die
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB || die
-	echo "/afs:/var/cache/openafs:200000" > "${D}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${D}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${D}"/usr/$(get_libdir)/pam_afs* || die
-	fi
-	rm -f "${D}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${D}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${D}"/usr/bin/kpasswd{,_afs} || die
-	mv "${D}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${D}"/usr/include/{lwp,lock,timer}.h "${D}"/usr/include/afs/ || die
-	mv "${D}"/usr/$(get_libdir)/liblwp* "${D}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${D}"/usr/include/*.h \
-		"${D}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${CONFDIR}"/README src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc doc/{arch,examples,pdf,protocol,txt}/*
-		dohtml -A xml -r doc/{html,xml}/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
-	newconfd "${CONFDIR}"/openafs-client openafs-client || die
-	newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
-	newconfd "${CONFDIR}"/openafs-server openafs-server || die
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/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 "${ROOT}"/etc/openafs/${x} ] ; then
-			cp "${ROOT}"/etc/openafs/${x} "${D}"/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 "  http://www.gentoo.org/doc/en/openafs.xml"
-}