Drop old ebuilds per Andrej Filipcic #383473.

16 files changed, 26 insertions, 1406 deletions

diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 6fa45fc2b648..2a5d2748718f 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX auto.master 267 RMD160 4e8e79ef65122f4a1c6227298c8c4e39f3dd5846 SHA1 88da29f5d82a1073471eed654c99ff1fc3c064f3 SHA256 47df928601dc31bc8c23781bd0475b7ecb5bd09525c92a8772d51e0dc660b414
 AUX auto.misc 319 RMD160 363c7b0be2d0d79c93b3b74968ae197df49962b4 SHA1 17a5e54accde91da5130599c4375ff3beda99f52 SHA256 7fa3f3cee3d8b0e859316b89fa3fcbad9da03f757de2d3d1a317af94b700e078
 AUX auto.net 1134 RMD160 6396a1d4faac5e9a2bf0f83d53fa7e3c578840f9 SHA1 7a6c88657d22630f688ca80cc5ca782a93eb33f0 SHA256 5ff54fb5e8588b7e7503fca90cad179acec1dbe85a4b81f9c2320151f6b34602
@@ -163,7 +166,14 @@ EBUILD autofs-5.0.5-r4.ebuild 3505 RMD160 f4657832f24d5f427859868f41f8b9c581d9cd
 EBUILD autofs-5.0.5-r5.ebuild 3374 RMD160 41f3d38a90d35e9c3d718260cc997208d0ea1858 SHA1 965ab1e86ea9368a42752b64e6e8d8b6fc1d12a7 SHA256 4468f9b6170af3199f49f8437afa8d956254c1838698a7666275319ff0f0dbc6
 EBUILD autofs-5.0.5.ebuild 2835 RMD160 5c5ca0c11ae8205f85bc8fbec7e2b95f206bbb91 SHA1 0d342ceed013e86f9c7f3a97706bde018843b301 SHA256 5107794cdebe88a072bb8ea82e42b0e17de242da17e032d515fb19a650dab8fe
 EBUILD autofs-5.0.6-r1.ebuild 3702 RMD160 589d540d027f97a674a4723db36d997118d17172 SHA1 bf120380ceb21c7d6a72c8e09b50c64c0ceb8d89 SHA256 f2f8f94c1f6c1e75bd7acfdfc83d1a5ba1bce3368c0fa230989edb466a652107
-EBUILD autofs-5.0.6-r2.ebuild 3818 RMD160 727fda72f10ef8207d4cee8c5587d3303d5bd2b2 SHA1 82439d05acdfc58d8c9f290dd81321851a4647ef SHA256 40c1fabdc13e13790b2aae4442601f152435a5d4d1232074511ce111b23d8f24
+EBUILD autofs-5.0.6-r2.ebuild 3819 RMD160 aa4420c301047cbd3a539b20bfefba3dea83e292 SHA1 3c1276034a8f597203359a2713da789f2099e57b SHA256 8990f5170da2715d492815b8caae5727938128e38fbb9608422b1f18828d0673
 EBUILD autofs-5.0.6.ebuild 3485 RMD160 7c7accf22b56f49a3fa89fd0356a12ef17f39399 SHA1 24ebb4e411afb5721b1acd634ab2e516aae237f0 SHA256 faa6b414e896e49b3b8bac1507f3a43baa0399cd84b29c4ad517ac3ff59ba1e0
-MISC ChangeLog 20688 RMD160 6b3cc88710282ce9b9e55e0131d57751639f4b16 SHA1 758be1144a0e3327b4266841d6ac068cd0875f2b SHA256 09ecc2fec15db408d6ec1eda8def4a45b9977bf0677433e1daf74e194cb581e7
+MISC ChangeLog 20796 RMD160 1d583eb7af8142929cd2e0f6e47212e3cf78afeb SHA1 6aff3f0b52fb9c00652a15f20eab0487afb84ca8 SHA256 0b41ebef8d1078fa1d59b31b276543c0323aa54cfab9b419826c6ccc49c2c053
 MISC metadata.xml 530 RMD160 417c66e2ec6e8627d23373d76d8c187a4dced885 SHA1 7629fc63948229c175548cc8ca24774316fe41b1 SHA256 454c11f4af437af306f09746ed10abe0d565c2b9b4b232b3d892dca494e0d768
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk52ZKIACgkQkKaRLQcq0GKpFgCgiGYw7Ee04a67MyRiPj1SkLRB
+O/0An0QAscPDq3afU4XqEAtRIRTquJ9w
+=Ye8F
+-----END PGP SIGNATURE-----
diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index 1ce89a53a28b..5d5642fed8d3 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/openafs-kernel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.132 2011/09/18 21:30:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.133 2011/09/18 21:31:57 vapier Exp $
+
+  18 Sep 2011; Mike Frysinger <vapier@gentoo.org> -openafs-kernel-1.4.9.ebuild,
+  -openafs-kernel-1.4.12.1.ebuild, -openafs-kernel-1.5.34.ebuild,
+  -openafs-kernel-1.6.0_pre2.ebuild, -openafs-kernel-1.6.0_pre3.ebuild,
+  -openafs-kernel-1.6.0_pre6.ebuild:
+  Drop old ebuilds per Andrej Filipcic #383473.
 
   18 Sep 2011; Mike Frysinger <vapier@gentoo.org> openafs-kernel-1.4.14.ebuild:
   Mark stable for amd64/x86 #383473 by Andrej Filipcic.
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.4.12.1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.4.12.1.ebuild
deleted file mode 100644
index 3ddd7a59ecca..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.4.12.1.ebuild
+++ /dev/null
@@ -1,63 +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-kernel/openafs-kernel-1.4.12.1.ebuild,v 1.2 2010/06/23 18:23:59 halcy0n Exp $
-
-EAPI="2"
-
-inherit eutils autotools linux-mod versionator toolchain-funcs
-
-PATCHVER=0.16
-MY_PN=${PN/-kernel}
-MY_P=${MY_PN}-${PV}
-MY_PV=$(get_version_component_range 1-3)
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${MY_PV}/${MY_P}-src.tar.bz2
-	mirror://gentoo/${MY_P}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-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() {
-	ARCH="$(tc-arch-kernel)" \
-	econf \
-		--with-linux-kernel-headers=${KV_DIR} \
-		--with-linux-kernel-build=${KV_OUT_DIR}
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die
-}
-
-src_install() {
-	MOD_SRCDIR=$(expr "${S}"/src/libafs/MODLOAD-*)
-	[ -f "${MOD_SRCDIR}"/libafs.${KV_OBJ} ] || die "Couldn't find compiled kernel module"
-
-	MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR)'
-
-	linux-mod_src_install
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.4.9.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.4.9.ebuild
deleted file mode 100644
index af29ef58bda4..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.4.9.ebuild
+++ /dev/null
@@ -1,58 +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-kernel/openafs-kernel-1.4.9.ebuild,v 1.4 2010/06/23 18:23:59 halcy0n Exp $
-
-inherit eutils linux-mod versionator toolchain-funcs
-
-PATCHVER=0.16
-MY_PN=${PN/-kernel}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${PV}/${MY_P}-src.tar.bz2
-	mirror://gentoo/${MY_PN}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${MY_P}-src.tar.bz2
-	unpack ${MY_PN}-gentoo-${PATCHVER}.tar.bz2
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_EXCLUDE="012_all_kbuild.patch" \
-		epatch ${PATCHDIR}
-
-	./regen.sh || die "Failed: regenerating configure script"
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" econf --with-linux-kernel-headers=${KV_DIR} \
-		--with-linux-kernel-build=${KV_OUT_DIR} || die "Failed: econf"
-
-	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die "Failed: emake"
-}
-
-src_install() {
-	MOD_SRCDIR=$(expr ${S}/src/libafs/MODLOAD-*)
-	[ -f ${MOD_SRCDIR}/libafs.${KV_OBJ} ] \
-			|| die "Couldn't find compiled kernel module"
-
-	MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR)'
-
-	linux-mod_src_install
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.5.34.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.5.34.ebuild
deleted file mode 100644
index bcdfdebb1660..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.5.34.ebuild
+++ /dev/null
@@ -1,52 +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-kernel/openafs-kernel-1.5.34.ebuild,v 1.4 2010/06/23 18:23:59 halcy0n Exp $
-
-inherit eutils linux-mod versionator toolchain-funcs
-
-PATCHVER=0.14
-MY_PN=${PN/-kernel}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${MY_PN}/${PV}/${MY_P}-src.tar.bz2
-	mirror://gentoo/${MY_PN}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
-
-CONFIG_CHECK="!DEBUG_RODATA"
-DEBUG_RODATA_ERROR="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-
-	./regen.sh || die "Failed: regenerating configure script"
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" econf --with-linux-kernel-headers=${KV_OUT_DIR} || die "Failed: econf"
-
-	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die "Failed: emake"
-}
-
-src_install() {
-	MOD_SRCDIR=$(expr ${S}/src/libafs/MODLOAD-*)
-	[ -f ${MOD_SRCDIR}/libafs.${KV_OBJ} ] \
-			|| die "Couldn't find compiled kernel module"
-
-	MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR) afspag(fs/openafs:$MOD_SRCDIR)'
-
-	linux-mod_src_install
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre2.ebuild
deleted file mode 100644
index aad14e673d17..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre2.ebuild
+++ /dev/null
@@ -1,66 +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-kernel/openafs-kernel-1.6.0_pre2.ebuild,v 1.2 2011/03/20 09:58:10 stefaan Exp $
-
-EAPI="2"
-
-inherit eutils autotools linux-mod versionator toolchain-funcs
-
-MY_PV=$(delete_version_separator '_')
-MY_PN=${PN/-kernel}
-MY_P2="${MY_PN}-${PV}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-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/${MY_P2}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-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() {
-	ARCH="$(tc-arch-kernel)" \
-	econf \
-		--with-linux-kernel-headers=${KV_DIR} \
-		--with-linux-kernel-build=${KV_OUT_DIR}
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die
-}
-
-src_install() {
-	MOD_SRCDIR=$(expr "${S}"/src/libafs/MODLOAD-*)
-	[ -f "${MOD_SRCDIR}"/libafs.${KV_OBJ} ] || die "Couldn't find compiled kernel module"
-
-	MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR)'
-
-	linux-mod_src_install
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre3.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre3.ebuild
deleted file mode 100644
index a968d8fa614b..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre3.ebuild
+++ /dev/null
@@ -1,65 +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-kernel/openafs-kernel-1.6.0_pre3.ebuild,v 1.1 2011/03/20 09:58:10 stefaan Exp $
-
-EAPI="2"
-
-inherit eutils autotools linux-mod versionator toolchain-funcs
-
-MY_PV=$(delete_version_separator '_')
-MY_PN=${PN/-kernel}
-MY_P2="${MY_PN}-${PV}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-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
-	mirror://gentoo/${MY_P2}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-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() {
-	ARCH="$(tc-arch-kernel)" \
-	econf \
-		--with-linux-kernel-headers=${KV_DIR} \
-		--with-linux-kernel-build=${KV_OUT_DIR}
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die
-}
-
-src_install() {
-	MOD_SRCDIR=$(expr "${S}"/src/libafs/MODLOAD-*)
-	[ -f "${MOD_SRCDIR}"/libafs.${KV_OBJ} ] || die "Couldn't find compiled kernel module"
-
-	MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR)'
-
-	linux-mod_src_install
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre6.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre6.ebuild
deleted file mode 100644
index 7ddbde5c6078..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.0_pre6.ebuild
+++ /dev/null
@@ -1,66 +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-kernel/openafs-kernel-1.6.0_pre6.ebuild,v 1.2 2011/06/19 19:15:51 vapier Exp $
-
-EAPI="2"
-
-inherit eutils autotools linux-mod versionator toolchain-funcs
-
-MY_PV=$(delete_version_separator '_')
-MY_PN=${PN/-kernel}
-MY_P2="${MY_PN}-${PV}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-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
-	mirror://gentoo/${MY_P2}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-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() {
-	ARCH="$(tc-arch-kernel)" \
-	econf \
-		--with-linux-kernel-headers=${KV_DIR} \
-		--with-linux-kernel-build=${KV_OUT_DIR}
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die
-}
-
-src_install() {
-	MOD_SRCDIR=$(expr "${S}"/src/libafs/MODLOAD-*)
-	[ -f "${MOD_SRCDIR}"/libafs.${KV_OBJ} ] || die "Couldn't find compiled kernel module"
-
-	MODULE_NAMES='libafs(fs/openafs:$MOD_SRCDIR)'
-
-	linux-mod_src_install
-}
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"
-}