Remove obsolete ebuilds and patches

Package-Manager: portage-2.0.52-r1

16 files changed, 4 insertions, 1720 deletions

diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index e0392dc81951..ce902daa52f7 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,10 +1,6 @@
-MD5 82986966cfed5ce10623e4893ae95ee5 ChangeLog 1524
+MD5 926e6447ec25af1551a2a5b11baf94e7 ChangeLog 1753
 MD5 59bbb0e897a1a23a82305e12742e9ac6 metadata.xml 398
-MD5 a4552f859ce00bdeffa11204fe7d8122 openafs-kernel-1.2.13.ebuild 1540
-MD5 4b4125b4c4a4d5d3c5b5bde63c2ec185 openafs-kernel-1.3.85.ebuild 1376
-MD5 9e7610ee8b00a013d40a951fab61f48b openafs-kernel-1.4.0_rc2.ebuild 1409
-MD5 15e891af8b6c61afa832173f0ef0e68a openafs-kernel-1.4.0_rc3.ebuild 1409
+MD5 228eb67d0e3ba6073ade6a9569dda9ec openafs-kernel-1.2.13.ebuild 1548
+MD5 1fcc8bc21c2337aacae810e65c5fd842 openafs-kernel-1.4.0_rc3.ebuild 1417
 MD5 154b7f0bf57bb9377c49d03565366b15 files/digest-openafs-kernel-1.2.13 144
-MD5 783c2d18fada2fa1d874b8aabf98e84d files/digest-openafs-kernel-1.3.85 143
-MD5 4e24ea4a9fc322e49aec4643b8a47756 files/digest-openafs-kernel-1.4.0_rc2 147
 MD5 923022c8ef5c25c5cae5ced4da170bfd files/digest-openafs-kernel-1.4.0_rc3 147
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 103f58816797..5807bd470be1 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,27 +1,13 @@
 MD5 af1cddb45a7da9c6a1e14e2be2f1c8ff ChangeLog 8626
 MD5 59bbb0e897a1a23a82305e12742e9ac6 metadata.xml 398
 MD5 724bc6d7494376e988f9b32ef90071ba openafs-1.2.13-r2.ebuild 9986
-MD5 3880fe8a3b787d05f3cce22e553aa715 openafs-1.2.13.ebuild 8637
-MD5 161bd598fc762eca1bab7390fc9e531f openafs-1.3.85.ebuild 8711
-MD5 421eff5e3307eab62a747d3ee5e1a791 openafs-1.4.0_rc3.ebuild 10404
-MD5 92fd49421614bc6c108b0e77b7c349d9 openafs-1.2.13-r1.ebuild 9869
 MD5 9106d1f894ff97e7f12f6bca2efec680 openafs-1.2.10-r1.ebuild 2426
-MD5 890571336f60c8cf54277a0cd33ac725 openafs-1.4.0_rc2-r1.ebuild 10407
-MD5 96f0bb59f18c1adac4338d8fabcdea90 openafs-1.4.0_rc2.ebuild 10205
+MD5 421eff5e3307eab62a747d3ee5e1a791 openafs-1.4.0_rc3.ebuild 10404
 MD5 4584cc6910401787e1ebd81cfa06f060 files/CellServDB 41
 MD5 c620f50b47424c46f59dc847eb8c0dd3 files/README 8735
 MD5 1903c6a5e0aeedf794939945536341cd files/ThisCell 7
 MD5 4f3ec773401fff6eeeacd14345ba89c1 files/afs.rc.rc6 5429
 MD5 e8488032f070544719cba9c7dbaf8108 files/digest-openafs-1.2.10-r1 73
-MD5 87bbfd1999ad85475d820a6c42e49e84 files/digest-openafs-1.2.13 143
-MD5 154b7f0bf57bb9377c49d03565366b15 files/digest-openafs-1.2.13-r1 144
-MD5 783c2d18fada2fa1d874b8aabf98e84d files/digest-openafs-1.3.85 143
-MD5 4e24ea4a9fc322e49aec4643b8a47756 files/digest-openafs-1.4.0_rc2 147
-MD5 19d17f83fbb3cc6c491476dba77eaad7 files/openafs-1.2.6.patch 822
 MD5 36dc33d8c6e647e8aacf8e69849a28a3 files/openafs-pinstall-execve-1.2.10.patch 1242
-MD5 36dc33d8c6e647e8aacf8e69849a28a3 files/openafs-pinstall-execve-env.patch 1242
-MD5 9554c33f806d3f69d9497d6c56d55b4e files/openafs-pinstall-execve.patch 1766
-MD5 28ae5081e8e323cd402a659ac5e0730c files/openafs-typechange.patch 1371
 MD5 a1b6ea45c7ab974a743757727b6ea8ce files/digest-openafs-1.2.13-r2 144
-MD5 1575dfbf4bdd9cd86ff444b5bed1c959 files/digest-openafs-1.4.0_rc2-r1 222
 MD5 c34ff780d55a6cb8a4776f42ab0daa74 files/digest-openafs-1.4.0_rc3 222
diff --git a/net-fs/openafs/files/digest-openafs-1.2.13 b/net-fs/openafs/files/digest-openafs-1.2.13
deleted file mode 100644
index 577c7bdfddb9..000000000000
--- a/net-fs/openafs/files/digest-openafs-1.2.13
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6a1e6b5ad2da4532d6e1086024150ecd openafs-1.2.13-src.tar.bz2 10354615
-MD5 574492d1b49925ec909217053d29077a openafs-gentoo-0.1.tar.bz2 17005
diff --git a/net-fs/openafs/files/digest-openafs-1.2.13-r1 b/net-fs/openafs/files/digest-openafs-1.2.13-r1
deleted file mode 100644
index cce296d1754b..000000000000
--- a/net-fs/openafs/files/digest-openafs-1.2.13-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6a1e6b5ad2da4532d6e1086024150ecd openafs-1.2.13-src.tar.bz2 10354615
-MD5 dfca6186129259559b8c491b1d6072c6 openafs-gentoo-0.2a.tar.bz2 17761
diff --git a/net-fs/openafs/files/digest-openafs-1.3.85 b/net-fs/openafs/files/digest-openafs-1.3.85
deleted file mode 100644
index 583831a99cd6..000000000000
--- a/net-fs/openafs/files/digest-openafs-1.3.85
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3f31a5dd8dc4c60cf5d6fe7b5e7f9e6c openafs-1.3.85-src.tar.bz2 10985038
-MD5 574492d1b49925ec909217053d29077a openafs-gentoo-0.1.tar.bz2 17005
diff --git a/net-fs/openafs/files/digest-openafs-1.4.0_rc2 b/net-fs/openafs/files/digest-openafs-1.4.0_rc2
deleted file mode 100644
index 6865f4b5dc67..000000000000
--- a/net-fs/openafs/files/digest-openafs-1.4.0_rc2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9dbef5c07eddd7a90e680079b9035e17 openafs-1.4.0-rc2-src.tar.bz2 10989632
-MD5 dfca6186129259559b8c491b1d6072c6 openafs-gentoo-0.2a.tar.bz2 17761
diff --git a/net-fs/openafs/files/digest-openafs-1.4.0_rc2-r1 b/net-fs/openafs/files/digest-openafs-1.4.0_rc2-r1
deleted file mode 100644
index 662476646287..000000000000
--- a/net-fs/openafs/files/digest-openafs-1.4.0_rc2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9dbef5c07eddd7a90e680079b9035e17 openafs-1.4.0-rc2-src.tar.bz2 10989632
-MD5 7224b6448319016b0cf3222aeed58127 openafs-1.4.0-rc2-doc.tar.bz2 2597077
-MD5 873d0ced47710170589ac797808a1598 openafs-gentoo-0.2b.tar.bz2 17242
diff --git a/net-fs/openafs/files/openafs-1.2.6.patch b/net-fs/openafs/files/openafs-1.2.6.patch
deleted file mode 100644
index 3af94908bd18..000000000000
--- a/net-fs/openafs/files/openafs-1.2.6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- openafs-1.2.6/src/pinstall/install.c	Fri Oct 12 23:21:46 2001
-+++ src/pinstall/install.c	Tue Oct  1 18:11:55 2002
-@@ -169,6 +169,10 @@
- 		"cp", 0, 0, 0,
- 	};
- 	
-+	static char *empty[] = {
-+	  0,
-+	};
-+	
- 	/*
- 	 * first, copy the `iname' to the `oname'
- 	 */
-@@ -180,7 +184,7 @@
- 	    case 0:			/* child	*/
- 		copy[1] = iname;
- 		copy[2] = oname;
--		execve("/bin/cp", copy, (char **)0);
-+		execve("/bin/cp", copy, empty);
- 		perror("/bin/cp");
- 		exit(1);
- 
-@@ -277,7 +281,11 @@
- 	static char *copy[] = {
- 		"cp", 0, 0, 0,
- 	};
--
-+	
-+static char *empty[] = {
-+	  0,
-+	};
-+	
- 	/*
- 	 * first, copy the `iname' to the `oname'
- 	 */
-@@ -289,7 +297,7 @@
- 	    case 0:			/* child	*/
- 		copy[1] = iname;
- 		copy[2] = oname;
--		execve("/bin/cp", copy, 0);
-+		execve("/bin/cp", copy, empty);
- 		perror("/bin/cp");
- 		exit(1);
- 
diff --git a/net-fs/openafs/files/openafs-pinstall-execve-env.patch b/net-fs/openafs/files/openafs-pinstall-execve-env.patch
deleted file mode 100644
index 4fd9c4e61cc3..000000000000
--- a/net-fs/openafs/files/openafs-pinstall-execve-env.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- openafs/src/pinstall/install.c	2003-07-25 04:40:16.000000000 +0000
-+++ openafs/src/pinstall/install.c	2003-11-17 21:47:15.000000000 +0000
-@@ -172,6 +172,9 @@
- char *iname, *oname; {
- 	int pid;
- 	pid_t status;
-+	static char *env[] = {
-+	  0,
-+	};
- 	static char *strip[] = {
- 		"strip", 0, 0,
- 	};
-@@ -190,7 +193,7 @@
- 	    case 0:			/* child	*/
- 		copy[1] = iname;
- 		copy[2] = oname;
--		execve("/bin/cp", copy, (char **)0);
-+		execve("/bin/cp", copy, env);
- 		perror("/bin/cp");
- 		exit(1);
- 
-@@ -236,7 +239,7 @@
- #else
- #define	STRIP_BIN	"/bin/strip"
- #endif
--		execve(STRIP_BIN, strip, (char **)0);
-+		execve(STRIP_BIN, strip, env);
- 		perror(STRIP_BIN);
- 		exit(1);
- 
-@@ -281,6 +284,9 @@
- quickStrip (iname, oname, ignored, copy_only)
- char *iname, *oname; {
- 	int pid, status;
-+	static char *env[] = {
-+	  0,
-+	};
- 	static char *strip[] = {
- 		"strip", 0, 0,
- 	};
-@@ -299,7 +305,7 @@
- 	    case 0:			/* child	*/
- 		copy[1] = iname;
- 		copy[2] = oname;
--		execve("/bin/cp", copy, 0);
-+		execve("/bin/cp", copy, env);
- 		perror("/bin/cp");
- 		exit(1);
- 
-@@ -337,7 +343,7 @@
- 
- 	    case 0:			/* child	*/
- 		strip[1] = oname;
--		execve("/bin/strip", strip, 0);
-+		execve("/bin/strip", strip, env);
- 		perror("/bin/strip");
- 		exit(1);
- 
diff --git a/net-fs/openafs/files/openafs-pinstall-execve.patch b/net-fs/openafs/files/openafs-pinstall-execve.patch
deleted file mode 100644
index 0f7b47d2293e..000000000000
--- a/net-fs/openafs/files/openafs-pinstall-execve.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-===================================================================
-RCS file: /cvs/openafs/src/pinstall/install.c,v
-retrieving revision 1.21
-retrieving revision 1.22
-diff -u -r1.21 -r1.22
---- openafs/src/pinstall/install.c	2003/07/25 04:38:03	1.21
-+++ openafs/src/pinstall/install.c	2003/08/08 21:00:09	1.22
-@@ -50,7 +50,7 @@
- #include <afs/param.h>
- 
- RCSID
--    ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs/files/openafs-pinstall-execve.patch,v 1.2 2004/07/18 03:54:09 dragonheart Exp $");
-+    ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs/files/openafs-pinstall-execve.patch,v 1.2 2004/07/18 03:54:09 dragonheart Exp $");
- 
- #include <stdio.h>
- #include <pwd.h>
-@@ -183,6 +183,9 @@
- {
-     int pid;
-     pid_t status;
-+    static char *env[] = { 
-+	0,
-+    };
-     static char *strip[] = {
- 	"strip", 0, 0,
-     };
-@@ -201,7 +204,7 @@
-     case 0:			/* child        */
- 	copy[1] = iname;
- 	copy[2] = oname;
--	execve("/bin/cp", copy, NULL);
-+	execve("/bin/cp", copy, env);
- 	perror("/bin/cp");
- 	exit(1);
- 
-@@ -246,7 +249,7 @@
- #else
- #define	STRIP_BIN	"/bin/strip"
- #endif
--	execve(STRIP_BIN, strip, NULL);
-+	execve(STRIP_BIN, strip, env);
- 	perror(STRIP_BIN);
- 	exit(1);
- 
-@@ -272,6 +275,9 @@
- quickStrip(char *iname, char *oname, int ignored, int copy_only)
- {
-     int pid, status;
-+    static char *env[] = { 
-+	0,
-+    };
-     static char *strip[] = {
- 	"strip", 0, 0,
-     };
-@@ -290,7 +296,7 @@
-     case 0:			/* child        */
- 	copy[1] = iname;
- 	copy[2] = oname;
--	execve("/bin/cp", copy, 0);
-+	execve("/bin/cp", copy, env);
- 	perror("/bin/cp");
- 	exit(1);
- 
-@@ -328,7 +334,7 @@
- 
-     case 0:			/* child        */
- 	strip[1] = oname;
--	execve("/bin/strip", strip, 0);
-+	execve("/bin/strip", strip, env);
- 	perror("/bin/strip");
- 	exit(1);
- 
diff --git a/net-fs/openafs/files/openafs-typechange.patch b/net-fs/openafs/files/openafs-typechange.patch
deleted file mode 100644
index 671518e18fbc..000000000000
--- a/net-fs/openafs/files/openafs-typechange.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur openafs-1.2.10-old/src/afs/LINUX/osi_groups.c openafs-1.2.10/src/afs/LINUX/osi_groups.c
---- openafs-1.2.10-old/src/afs/LINUX/osi_groups.c	2003-05-22 00:08:03.000000000 -0400
-+++ openafs-1.2.10/src/afs/LINUX/osi_groups.c	2004-02-19 17:24:45.000000000 -0500
-@@ -178,8 +178,8 @@
- 
- #if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_AMD64_LINUX20_ENV)
- /* Intercept the uid16 system call as used by 32bit programs. */
--extern long (*sys32_setgroupsp)(int gidsetsize, old_gid_t *grouplist);
--asmlinkage long afs32_xsetgroups(int gidsetsize, old_gid_t *grouplist)
-+extern long (*sys32_setgroupsp)(int gidsetsize, u16 *grouplist);
-+asmlinkage long afs32_xsetgroups(int gidsetsize, u16 *grouplist)
- {
-     long code;
-     cred_t *cr = crref();
-diff -Naur openafs-1.2.10-old/src/afs/LINUX/osi_module.c openafs-1.2.10/src/afs/LINUX/osi_module.c
---- openafs-1.2.10-old/src/afs/LINUX/osi_module.c	2003-07-28 22:01:02.000000000 -0400
-+++ openafs-1.2.10/src/afs/LINUX/osi_module.c	2004-02-19 17:23:21.000000000 -0500
-@@ -88,7 +88,7 @@
- #endif
- 
- static void *ia32_ni_syscall = 0;
--asmlinkage long (*sys32_setgroupsp)(int gidsetsize, old_gid_t *grouplist);
-+asmlinkage long (*sys32_setgroupsp)(int gidsetsize, u16 *grouplist);
- #if defined(__NR_ia32_setgroups32)
- asmlinkage long (*sys32_setgroups32p)(int gidsetsize, gid_t *grouplist);
- #endif /* __NR_ia32_setgroups32 */
diff --git a/net-fs/openafs/openafs-1.2.13-r1.ebuild b/net-fs/openafs/openafs-1.2.13-r1.ebuild
deleted file mode 100644
index a234864beb81..000000000000
--- a/net-fs/openafs/openafs-1.2.13-r1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.2.13-r1.ebuild,v 1.1 2005/09/02 00:48:27 stefaan Exp $
-
-inherit fixheadtails flag-o-matic eutils toolchain-funcs versionator
-
-PATCHVER=0.2a
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${PN}/${PV}/${P}-src.tar.bz2
-	mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~stefaan/distfiles/${PN}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~ia64"
-IUSE="pam"
-
-RDEPEND="=net-fs/openafs-kernel-${PV}*"
-
-PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
-CONFDIR=${WORKDIR}/gentoo/configs
-SCRIPTDIR=${WORKDIR}/gentoo/scripts
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-
-	ht_fix_file "acinclude.m4"
-	ht_fix_file "config.guess"
-	ht_fix_file "src/afsd/afs.rc.linux"
-	ht_fix_file "aclocal.m4"
-	ht_fix_file "configure"
-	ht_fix_file "configure-libafs"
-
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-}
-
-src_compile() {
-	econf \
-		--enable-full-vos-listvol-switch \
-		|| die econf
-
-		emake -j1 CC="$(tc-getCC) -fPIC" MT_CC="$(tc-getCC)" 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
-		dodir /$(get_libdir)/security
-		mv ${D}/usr/$(get_libdir)/pam_afs* ${D}/$(get_libdir)/security
-	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
-	mv ${D}/usr/bin/kpasswd ${D}/usr/bin/kpasswd_afs
-
-	# install manuals
-	doman src/man/*.?
-	doman src/aklog/aklog.1
-	use pam && doman src/pam/pam_afs.5
-
-	# documentation
-	dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB ${CONFDIR}/ChangeLog*
-
-	# Gentoo related scripts
-	newconfd ${CONFDIR}/afs-client
-	newconfd ${CONFDIR}/afs-server
-	newinitd ${SCRIPTDIR}/afs-client
-	newinitd ${SCRIPTDIR}/afs-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
-	keepdir /var/lib/openafs/logs
-}
-
-migrate_to_fhs() {
-	# conventions:
-	# only automatically migrate if the destination directories are
-	# as of yet non-existant
-
-	# path translations
-	local oldafsconfdir=${ROOT}usr/afs/etc
-	local newafsconfdir=${ROOT}etc/openafs/server
-	local oldviceetcdir=${ROOT}usr/vice/etc
-	local newviceetcdir=${ROOT}etc/openafs
-	local oldafslocaldir=${ROOT}usr/afs/local
-	local newafslocaldir=${ROOT}var/lib/openafs
-	local oldafsdbdir=${ROOT}usr/afs/db
-	local newafsdbdir=${ROOT}var/lib/openafs/db
-
-	# detect Transarc afsconfdir
-	local afsconfdir=0
-	[ ! -L ${oldafsconfdir} -a -d ${oldafsconfdir} -a ! -e ${newafsconfdir} ] && afsconfdir=1
-
-	# detect Transarc viceetcdir
-	local viceetcdir=0
-	local viceetcsoftlink=0
-	if [ -d ${oldviceetcdir} -a ! -e ${newviceetcdir} ]; then
-		if [ ! -L ${oldviceetcdir} ]; then
-			viceetcdir=1
-		else
-			if [ $(readlink ${oldviceetcdir}) = /etc/afs ]; then
-				viceetcdir=1
-				viceetcsoftlink=1
-			fi
-		fi
-	fi
-
-	# detect Transarc afslocaldir
-	local afslocaldir=0
-	[ ! -L ${oldafslocaldir} -a -d ${oldafslocaldir} -a ! -e ${newafslocaldir} ] && afslocaldir=1
-
-	# detect Transarc afsdbdir
-	local afsdbdir=0
-	[ ! -L ${oldafsdbdir} -a -d ${oldafsdbdir} -a ! -e ${newafsdbdir} ] && afsdbdir=1
-
-	# detect Transarc afsbosconfigdir
-	local afsbosconfigdir=0
-	[ ${afslocaldir} = 1 -a -f ${oldafslocaldir}/BosConfig ] && afsbosconfigdir=1
-
-	# any of these?
-	local any=$((${afsconfdir}+${viceetcdir}+${afsdbdir}+${afslocaldir}))
-
-	# No migration needed?  Then bail out
-	if [ ${any} = 0 ]; then
-		return 0
-	fi
-
-	# Root not / ?  Then do not attempt automatic migration
-	if [ "$ROOT" != "/" ]; then
-		ewarn Old-style configuration files found, but not migrating
-		ewarn because installation rootdir is not /
-		ebeep 5
-		return 0
-	fi
-
-	# detect whether an installation with old config files is running
-	local pid
-	if pid=$(pgrep -n -U 0 bosserver) &>/dev/null; then
-		# find location of executable
-		if ! executable=$(readlink /proc/${pid}/exe); then
-			die "Couldn't execute readlink on bosserver process"
-		fi
-		# if executable is not located in /usr/sbin, assume Transarc locations
-		if [[ $executable != ${ROOT}usr/sbin/* ]]; then
-			ewarn "Found a running process with the name \"bosserver\" and pid ${pid}"
-			ewarn "that is not located in /usr/sbin.  This suggests a running"
-			ewarn "OpenAFS-server with traditional TransARC path conventions."
-			ewarn "This installation procedure aims to migrate old"
-			ewarn "configuration files to new FHS-conform locations."
-			ewarn "Please stop the running server and reattempt the upgrade"
-			die "Installation aborted because of running OpenAFS server"
-		fi
-	fi
-
-	# warn about migration
-	ewarn
-	ewarn "OpenAFS configuration/data-files have been found in old"
-	ewarn "TransARC-style locations, for which the standard FHS equivalents"
-	ewarn "do not exist yet.  "
-	ewarn "Following procedure will copy those files to the new locations such"
-	ewarn "that, given a previously working configuration, both server"
-	ewarn "and client should restart without problems.  Files will be copied"
-	ewarn "only, and not removed from the old locations.  For assistance"
-	ewarn "in removing the old files, consult the documentation in"
-	ewarn "/usr/share/openafs/gentoo"
-	ewarn "Will continue in 30 seconds, press Ctrl-C to abort"
-	ewarn
-	ebeep 10
-	epause 20
-
-	# fortunately, there's no overlap between the old locations and the new ones
-
-	# afsconfdir: migrate /usr/afs/etc to /etc/openafs/server
-	if [ ${afsconfdir} = 1 ]; then
-		mkdir -m 755 -p ${newafsconfdir}
-		cp ${oldafsconfdir}/* ${newafsconfdir}
-	fi
-
-	# viceetcdir: migrate /usr/vice/etc (likely a link to /etc/afs) to /etc/openafs
-	if [ ${viceetcdir} = 1 ]; then
-		mkdir -m 755 -p ${newviceetcdir}
-		cp ${oldviceetcdir}/* ${newviceetcdir}
-	fi
-
-	# afslocaldir: migrate /usr/afs/local to /var/lib/openafs
-	if [ ${afslocaldir} = 1 ]; then
-		mkdir -m 700 -p ${newafslocaldir}
-		cp ${oldafslocaldir}/* ${newafslocaldir}
-
-		# afsbosconfigdir: migrate /usr/afs/local/BosConfig to /etc/openafs/BosConfig
-		if [ ${afsbosconfigdir} = 1 ]; then
-			sed -i \
-				-e 's:/usr/afs/bin/:/usr/libexec/openafs/:g' \
-				-e 's:/usr/afs/etc:/etc/openafs/server:g' \
-				-e 's:/usr/afs/bin:/usr/bin:g' \
-				${newafslocaldir}/BosConfig
-			if [ -d ${newviceetcdir} ]; then
-				mv ${newafslocaldir}/BosConfig ${newviceetcdir}
-			else
-				ewarn
-				ewarn "No ${newviceetcdir} found, couldn't move BosConfig there,"
-				ewarn "it will remain in ${newafslocaldir}.  Please investigate"
-				ewarn "before attempting to start the server"
-				ewarn
-				ebeep 3
-			fi
-		fi
-	fi
-
-	# afsdbdir: migrate /usr/afs/db to /var/lib/openafs/db
-	if [ ${afsdbdir} = 1 ]; then
-		mkdir -m 700 -p ${newafsdbdir}
-		cp ${oldafsdbdir}/* ${newafsdbdir}
-	fi
-
-	ewarn "Migration finished"
-	ewarn "Please remember to manually migrate disk-cache (if present)"
-	ewarn "Alter /etc/openafs/cacheinfo to do so"
-	ebeep 5
-}
-
-migrate_configfile() {
-	local oldconfigfile=${ROOT}etc/conf.d/afs
-	local newconfigfile=${ROOT}etc/conf.d/afs-client
-
-	if [ -f ${oldconfigfile} -a ! -e ${newconfigfile} ]; then
-		cp ${oldconfigfile} ${newconfigfile}
-	fi
-}
-
-pkg_preinst() {
-	migrate_to_fhs
-	migrate_configfile
-
-	## 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 ${IMAGE}etc/openafs
-	fi
-	# cacheinfo: use a default location cache, 50 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:50000" > ${IMAGE}etc/openafs/cacheinfo
-	fi
-	# ThisCell: default to "openafs.org"
-	if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then
-		echo "openafs.org" > ${IMAGE}etc/openafs/ThisCell
-	fi
-}
-
-pkg_postinst() {
-	# See bug 9849
-	# Create afs mountpoint
-	mkdir /afs 2>/dev/null
-
-	einfo
-	einfo "For browsing global Cells, please get CellServDB from"
-	einfo "/usr/share/doc/${PF} and put in /etc/openafs.  Then start"
-	einfo "using /etc/init.d/afs right away."
-	einfo "For more functionality, look at the limited README in the"
-	einfo "same directory, or turn to the more elaborate procedures"
-	einfo "described on http://www.openafs.org (quick beginnings)"
-	einfo "After initial server setup, you can edit /etc/conf.d/afs"
-	einfo "to enable the BOS Server."
-	einfo ""
-	einfo "To use AFS fully, you need either to start:"
-	einfo "1. kaserver, which is included with openafs but as it is"
-	einfo "based on kerberos4, it is not recommended."
-	einfo "2. app-crypt/kth-krb, but as it is also based on kerberos4 protocol,"
-	einfo "   you can keep passwords replicated in contrast to kaserver, but still"
-	einfo "   don't waste your time here."
-	einfo "3. app-crypt/heimdal, which is kerberos5 distribution written in Europe,"
-	einfo "   so no US export restrictions apply (*recommended*, compatible with"
-	einfo "   MIT krb5, see below)."
-	einfo "   BTW: if you need kerberos4 backwards compatibility,"
-	einfo "   heimdal can be compiled with --with-krb4 switch to provide it, but"
-	einfo "   app-crypt/kth-krb must be installed so that heimdal's configure"
-	einfo "   can find it. Beware that krb4 approach is not considered"
-	einfo "   safe anymore, so do not install kth-krb unless you really need it."
-	einfo "4. app-crypt/mit-krb5, if export restrictions allow you to do so."
-	einfo
-
-	epause 20
-	ebeep 5
-}
-
-pkg_prerm() {
-	# See bug 9849
-	# Remove afs mountpoint
-	rmdir /afs 2>/dev/null
-}
-
diff --git a/net-fs/openafs/openafs-1.2.13.ebuild b/net-fs/openafs/openafs-1.2.13.ebuild
deleted file mode 100644
index 90aeb9193575..000000000000
--- a/net-fs/openafs/openafs-1.2.13.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.2.13.ebuild,v 1.4 2005/07/29 18:04:50 seemant Exp $
-
-inherit linux-info fixheadtails flag-o-matic eutils toolchain-funcs versionator
-
-PATCHVER=0.1
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${PN}/${PV}/${P}-src.tar.bz2
-	mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${PN}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~ia64"
-IUSE="pam"
-
-RDEPEND="=net-fs/openafs-kernel-${PV}*"
-
-PATCHDIR=${WORKDIR}/gentoo/patches/$(get_version_component_range 1-2)
-CONFDIR=${WORKDIR}/gentoo/configs
-
-pkg_setup() {
-	if kernel_is gt 2 4; then
-		eeror "openafs-1.2 does not support kernels newer than Linux 2.4"
-		einfo "please try the openafs-1.3 series"
-		die "Kernel is too new!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-
-	ht_fix_file "acinclude.m4"
-	ht_fix_file "config.guess"
-	ht_fix_file "src/afsd/afs.rc.linux"
-	ht_fix_file "aclocal.m4"
-	ht_fix_file "configure"
-	ht_fix_file "configure-libafs"
-	epatch ${FILESDIR}/openafs-pinstall-execve-env.patch
-}
-
-src_compile() {
-	econf \
-		--enable-full-vos-listvol-switch \
-		|| die econf
-
-		emake -j1 CC="$(tc-getCC) -fPIC" MT_CC="$(tc-getCC)" 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
-		dodir /$(get_libdir)/security
-		mv ${D}/usr/$(get_libdir)/pam_afs* ${D}/$(get_libdir)/security
-	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
-	mv ${D}/usr/bin/kpasswd ${D}/usr/bin/kpasswd_afs
-
-	# install manuals
-	doman src/man/*.?
-	doman src/aklog/aklog.1
-	use pam && doman src/pam/pam_afs.5
-
-	# documentation
-	dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB ${CONFDIR}/ChangeLog*
-
-	# Gentoo related scripts
-	newconfd ${CONFDIR}/afsconfd afs
-	newinitd ${CONFDIR}/afsinitd afs
-}
-
-pkg_preinst() {
-	# conventions:
-	# only automatically migrate if the destination directories are
-	# as of yet non-existant
-
-	# path translations
-	oldafsconfdir=${ROOT}usr/afs/etc
-	newafsconfdir=${ROOT}etc/openafs/server
-	oldviceetcdir=${ROOT}usr/vice/etc
-	newviceetcdir=${ROOT}etc/openafs
-	oldafsdbdir=${ROOT}usr/afs/db
-	newafsdbdir=${ROOT}var/lib/openafs/db
-	oldafslocaldir=${ROOT}usr/afs/local
-	newafslocaldir=${ROOT}var/lib/openafs
-
-	# detect Transarc afsconfdir
-	afsconfdir=0
-	[ ! -L ${oldafsconfdir} -a -d ${oldafsconfdir} -a ! -e ${newafsconfdir} ] && afsconfdir=1
-
-	# detect Transarc viceetcdir
-	viceetcdir=0
-	viceetcsoftlink=0
-	if [ -d ${oldviceetcdir} -a ! -e ${newviceetcdir} ]; then
-		if [ ! -L ${oldviceetcdir} ]; then
-			viceetcdir=1
-		else
-			if [ $(readlink ${oldviceetcdir}) = /etc/afs ]; then
-				viceetcdir=1
-				viceetcsoftlink=1
-			fi
-		fi
-	fi
-
-	# detect Transarc afsdbdir
-	afsdbdir=0
-	[ ! -L ${oldafsdbdir} -a -d ${oldafsdbdir} -a ! -e ${newafsdbdir} ] && afsdbdir=1
-
-	# detect Transarc afslocaldir
-	afslocaldir=0
-	[ ! -L ${oldafslocaldir} -a -d ${oldafslocaldir} -a ! -e ${newafslocaldir} ] && afslocaldir=1
-
-	# detect Transarc afsbosconfigdir
-	afsbosconfigdir=0
-	[ ${afslocaldir} = 1 -a -f ${ROOT}usr/afs/local/BosConfig ] && afsbosconfigdir=1
-
-	# any of these?
-	any=$((${afsconfdir}+${viceetcdir}+${afsdbdir}+${afslocaldir}))
-
-	# No migration needed?  Then bail out
-	if [ ${any} = 0 ]; then
-		return 0
-	fi
-
-	# Root not / ?  Then do not attempt automatic migration
-	if [ "$ROOT" != "/" ]; then
-		ewarn Old-style configuration files found, but not migrating
-		ewarn because installation rootdir is not /
-		ebeep 5
-		return 0
-	fi
-
-	# detect whether an installation with old config files is running
-	if pid=$(pgrep -n -U 0 bosserver) &>/dev/null; then
-		# find location of executable
-		if ! executable=$(readlink /proc/${pid}/exe); then
-			die "Couldn't execute readlink on bosserver process"
-		fi
-		# if executable is not located in /usr/sbin, assume Transarc locations
-		if [[ $executable != ${ROOT}usr/sbin/* ]]; then
-			ewarn "Found a running process with the name \"bosserver\" and pid ${pid}"
-			ewarn "that is not located in /usr/sbin.  This suggests a running"
-			ewarn "OpenAFS-server with traditional TransARC path conventions."
-			ewarn "This installation procedure aims to migrate old"
-			ewarn "configuration files to new FHS-conform locations."
-			ewarn "Please stop the running server and reattempt the upgrade"
-			die "Installation aborted because of running OpenAFS server"
-		fi
-	fi
-
-	# warn about migration
-	ewarn
-	ewarn "OpenAFS configuration/data-files have been found in old"
-	ewarn "TransARC-style locations, for which the standard FHS equivalents"
-	ewarn "do not exist yet.  "
-	ewarn "Following procedure will copy those files to the new locations such"
-	ewarn "that, given a previously working configuration, both server"
-	ewarn "and client should restart without problems.  Files will be copied"
-	ewarn "only, and not removed from the old locations.  For assistance"
-	ewarn "in removing the old files, consult the documentation in"
-	ewarn "/usr/share/openafs/gentoo"
-	ewarn "Will continue in 30 seconds, press Ctrl-C to abort"
-	ewarn
-	ebeep 10
-	epause 20
-
-	# fortunately, there's no overlap between the old locations and the new ones
-
-	# afsconfdir: migrate /usr/afs/etc to /etc/openafs/server
-	if [ ${afsconfdir} = 1 ]; then
-		mkdir -m 755 -p ${newafsconfdir}
-		cp ${oldafsconfdir}/* ${newafsconfdir}
-	fi
-
-	# viceetcdir: migrate /usr/vice/etc (likely a link to /etc/afs) to /etc/openafs
-	if [ ${viceetcdir} = 1 ]; then
-		mkdir -m 755 -p ${newviceetcdir}
-		cp ${oldviceetcdir}/* ${newviceetcdir}
-	fi
-
-	# afsdbdir: migrate /usr/afs/db to /var/lib/openafs/db
-	if [ ${afsdbdir} = 1 ]; then
-		mkdir -m 755 -p ${newafsdbdir}
-		cp ${oldafsdbdir}/* ${newafsdbdir}
-	fi
-
-	# afslocaldir: migrate /usr/afs/local to /var/lib/openafs
-	if [ ${afslocaldir} = 1 ]; then
-		mkdir -m 755 -p ${newafslocaldir}
-		cp ${oldafslocaldir}/* ${newafslocaldir}
-
-		# afsbosconfigdir: migrate /usr/afs/local/BosConfig to /etc/openafs/BosConfig
-		if [ ${afsbosconfigdir} = 1 ]; then
-			sed -i \
-				-e 's:/usr/afs/bin/:/usr/libexec/openafs/:g' \
-				-e 's:/usr/afs/etc:/etc/openafs:g' \
-				-e 's:/usr/afs/bin:/usr/bin:g' \
-				${newafslocaldir}/BosConfig
-			if [ -d ${newviceetcdir} ]; then
-				mv ${newafslocaldir}/BosConfig ${newviceetcdir}
-			else
-				ewarn
-				ewarn "No ${newviceetcdir} found, couldn't move BosConfig there,"
-				ewarn "it will remain in ${newafslocaldir}.  Please investigate"
-				ewarn "before attempting to start the server"
-				ewarn
-				ebeep 3
-			fi
-		fi
-	fi
-
-	ewarn "Migration finished"
-	ewarn "Please remember to manually migrate disk-cache (if present)"
-	ewarn "Alter /etc/openafs/cacheinfo to do so"
-	ebeep 5
-}
-
-pkg_postinst() {
-	# See bug 9849
-	# Create afs mountpoint
-	mkdir /afs 2>/dev/null
-
-	einfo
-	einfo "For browsing global Cells, please get CellServDB from"
-	einfo "/usr/share/doc/${PF} and put in /etc/openafs.  Then start"
-	einfo "using /etc/init.d/afs right away."
-	einfo "For more functionality, look at the limited README in the"
-	einfo "same directory, or turn to the more elaborate procedures"
-	einfo "described on http://www.openafs.org (quick beginnings)"
-	einfo "After initial server setup, you can edit /etc/conf.d/afs"
-	einfo "to enable the BOS Server."
-	einfo ""
-	einfo "To use AFS fully, you need either to start:"
-	einfo "1. kaserver, which is included with openafs but as it is"
-	einfo "based on kerberos4, it is not recommended."
-	einfo "2. app-crypt/kth-krb, but as it is also based on kerberos4 protocol,"
-	einfo "   you can keep passwords replicated in contrast to kaserver, but still"
-	einfo "   don't waste your time here."
-	einfo "3. app-crypt/heimdal, which is kerberos5 distribution written in Europe,"
-	einfo "   so no US export restrictions apply (*recommended*, compatible with"
-	einfo "   MIT krb5, see below)."
-	einfo "   BTW: if you need kerberos4 backwards compatibility,"
-	einfo "   heimdal can be compiled with --with-krb4 switch to provide it, but"
-	einfo "   app-crypt/kth-krb must be installed so that heimdal's configure"
-	einfo "   can find it. Beware that krb4 approach is not considered"
-	einfo "   safe anymore, so do not install kth-krb unless you really need it."
-	einfo "4. app-crypt/mit-krb5, if export restrictions allow you to do so."
-	einfo
-
-	epause 20
-	ebeep 5
-}
-
-pkg_prerm() {
-	# See bug 9849
-	# Remove afs mountpoint
-	rmdir /afs 2>/dev/null
-}
-
diff --git a/net-fs/openafs/openafs-1.3.85.ebuild b/net-fs/openafs/openafs-1.3.85.ebuild
deleted file mode 100644
index 8a4431f9c951..000000000000
--- a/net-fs/openafs/openafs-1.3.85.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.3.85.ebuild,v 1.4 2005/07/29 10:03:24 dholm Exp $
-
-inherit flag-o-matic eutils toolchain-funcs versionator
-
-PATCHVER=0.1
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${PN}/${PV}/${P}-src.tar.bz2
-	mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${PN}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="debug kerberos pam"
-
-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
-
-pkg_setup() {
-	if use kerberos; then
-		ewarn "kerberos enabled: This is untested!"
-	fi
-}
-
-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}
-}
-
-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
-
-	econf \
-		$(use_enable pam) \
-		$(use_enable debug) \
-		${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
-		dodir /$(get_libdir)/security
-		mv ${D}/usr/$(get_libdir)/pam_afs* ${D}/$(get_libdir)/security
-	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
-	mv ${D}/usr/bin/kpasswd ${D}/usr/bin/kpasswd_afs
-
-	# install manuals
-	doman src/man/*.?
-
-	use kerberos && doman src/aklog/aklog.1
-	use pam && doman src/pam/pam_afs.5
-
-	# documentation
-	dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB ${CONFDIR}/ChangeLog*
-
-	# Gentoo related scripts
-	newconfd ${CONFDIR}/afsconfd afs
-	newinitd ${CONFDIR}/afsinitd afs
-}
-
-pkg_preinst() {
-	# conventions:
-	# only automatically migrate if the destination directories are
-	# as of yet non-existant
-
-	# path translations
-	oldafsconfdir=${ROOT}usr/afs/etc
-	newafsconfdir=${ROOT}etc/openafs/server
-	oldviceetcdir=${ROOT}usr/vice/etc
-	newviceetcdir=${ROOT}etc/openafs
-	oldafsdbdir=${ROOT}usr/afs/db
-	newafsdbdir=${ROOT}var/lib/openafs/db
-	oldafslocaldir=${ROOT}usr/afs/local
-	newafslocaldir=${ROOT}var/lib/openafs
-
-	# detect Transarc afsconfdir
-	afsconfdir=0
-	[ ! -L ${oldafsconfdir} -a -d ${oldafsconfdir} -a ! -e ${newafsconfdir} ] && afsconfdir=1
-
-	# detect Transarc viceetcdir
-	viceetcdir=0
-	viceetcsoftlink=0
-	if [ -d ${oldviceetcdir} -a ! -e ${newviceetcdir} ]; then
-		if [ ! -L ${oldviceetcdir} ]; then
-			viceetcdir=1
-		else
-			if [ $(readlink ${oldviceetcdir}) = /etc/afs ]; then
-				viceetcdir=1
-				viceetcsoftlink=1
-			fi
-		fi
-	fi
-
-	# detect Transarc afsdbdir
-	afsdbdir=0
-	[ ! -L ${oldafsdbdir} -a -d ${oldafsdbdir} -a ! -e ${newafsdbdir} ] && afsdbdir=1
-
-	# detect Transarc afslocaldir
-	afslocaldir=0
-	[ ! -L ${oldafslocaldir} -a -d ${oldafslocaldir} -a ! -e ${newafslocaldir} ] && afslocaldir=1
-
-	# detect Transarc afsbosconfigdir
-	afsbosconfigdir=0
-	[ ${afslocaldir} = 1 -a -f ${ROOT}usr/afs/local/BosConfig ] && afsbosconfigdir=1
-
-	# any of these?
-	any=$((${afsconfdir}+${viceetcdir}+${afsdbdir}+${afslocaldir}))
-
-	# No migration needed?  Then bail out
-	if [ $any = 0 ]; then
-		return 0
-	fi
-
-	# Root not / ?  Then do not attempt automatic migration
-	if [ "$ROOT" != "/" ]; then
-		ewarn Old-style configuration files found, but not migrating
-		ewarn because installation rootdir is not /
-		ebeep 5
-		return 0
-	fi
-
-	# detect whether an installation with old config files is running
-	if pid=$(pgrep -n -U 0 bosserver) &>/dev/null; then
-		# find location of executable
-		if ! executable=$(readlink /proc/${pid}/exe); then
-			die "Couldn't execute readlink on bosserver process"
-		fi
-		# if executable is not located in /usr/sbin, assume Transarc locations
-		if [[ $executable != ${ROOT}usr/sbin/* ]]; then
-			ewarn "Found a running process with the name \"bosserver\" and pid ${pid}"
-			ewarn "that is not located in /usr/sbin.  This suggests a running"
-			ewarn "OpenAFS-server with traditional TransARC path conventions."
-			ewarn "This installation procedure aims to migrate old"
-			ewarn "configuration files to new	FHS-conforming locations."
-			ewarn "Please stop the running server and reattempt the upgrade"
-			die "Installation aborted because of running OpenAFS server"
-		fi
-	fi
-
-	# warn about migration
-	ewarn
-	ewarn "OpenAFS configuration/data-files have been found in old"
-	ewarn "TransARC-style locations, for which the standard FHS equivalents"
-	ewarn "do not exist yet.  "
-	ewarn "Following procedure will copy those files to the new locations such"
-	ewarn "that, given a previously working configuration, both server"
-	ewarn "and client should restart without problems.  Files will be copied"
-	ewarn "only, and not removed from the old locations.  For assistance"
-	ewarn "in removing the old files, consult the documentation in"
-	ewarn "/usr/share/openafs/gentoo"
-	ewarn "Will continue in 30 seconds, press Ctrl-C to abort"
-	ewarn
-	ebeep 10
-	epause 20
-
-	# fortunately, there's no overlap between the old locations and the new ones
-
-	# afsconfdir: migrate /usr/afs/etc to /etc/openafs/server
-	if [ ${afsconfdir} = 1 ]; then
-		mkdir -m 755 -p ${newafsconfdir}
-		cp ${oldafsconfdir}/* ${newafsconfdir}
-	fi
-
-	# viceetcdir: migrate /usr/vice/etc (likely a link to /etc/afs) to /etc/openafs
-	if [ ${viceetcdir} = 1 ]; then
-		mkdir -m 755 -p ${newviceetcdir}
-		cp ${oldviceetcdir}/* ${newviceetcdir}
-	fi
-
-	# afsdbdir: migrate /usr/afs/db to /var/lib/openafs/db
-	if [ ${afsdbdir} = 1 ]; then
-		mkdir -m 755 -p ${newafsdbdir}
-		cp ${oldafsdbdir}/* $newafsdbdir}
-	fi
-
-	# afslocaldir: migrate /usr/afs/local to /var/lib/openafs
-	if [ ${afslocaldir} = 1 ]; then
-		mkdir -m 755 -p ${newafslocaldir}
-		cp ${oldafslocaldir}/* ${newafslocaldir}
-
-		# afsbosconfigdir: migrate /usr/afs/local/BosConfig to /etc/openafs/BosConfig
-		if [ ${afsbosconfigdir} = 1 ]; then
-			sed -i \
-				-e 's:/usr/afs/bin/:/usr/libexec/openafs/:g' \
-				-e 's:/usr/afs/etc:/etc/openafs:g' \
-				-e 's:/usr/afs/bin:/usr/bin:g' \
-				${newafslocaldir}/BosConfig
-			if [ -d ${newviceetcdir} ]; then
-				mv ${newafslocaldir}/BosConfig ${newviceetcdir}
-			else
-				ewarn
-				ewarn "No ${newviceetcdir} found, couldn't move BosConfig there,"
-				ewarn "it will remain in ${newafslocaldir}.  Please investigate"
-				ewarn "before attempting to start the server"
-				ewarn
-				ebeep 3
-			fi
-		fi
-	fi
-
-	ewarn "Migration finished"
-	ewarn "Please remember to manually migrate disk-cache (if present)"
-	ewarn "Alter /etc/openafs/cacheinfo to do so"
-	ebeep 5
-}
-
-pkg_postinst() {
-	# See bug 9849
-	# Create afs mountpoint
-	mkdir /afs 2>/dev/null
-
-	einfo
-	einfo "For browsing global Cells, please get CellServDB from"
-	einfo "/usr/share/doc/${PF} and put in /etc/openafs.  Then start"
-	einfo "using /etc/init.d/afs right away."
-	einfo "For more functionality, look at the limited README in the"
-	einfo "same directory, or turn to the more elaborate procedures"
-	einfo "described on http://www.openafs.org (quick beginnings)"
-	einfo "After initial server setup, you can edit /etc/conf.d/afs"
-	einfo "to enable the BOS Server."
-	einfo ""
-	einfo "To use AFS fully, you need either to start:"
-	einfo "1. kaserver, which is included with openafs but as it is"
-	einfo "based on kerberos4, it is not recommended."
-	einfo "2. app-crypt/kth-krb, but as it is also based on kerberos4 protocol,"
-	einfo "   you can keep passwords replicated in contrast to kaserver, but still"
-	einfo "   don't waste your time here."
-	einfo "3. app-crypt/heimdal, which is kerberos5 distribution written in Europe,"
-	einfo "   so no US export restrictions apply (*recommended*, compatible with"
-	einfo "   MIT krb5, see below)."
-	einfo "   BTW: if you need kerberos4 backwards compatibility,"
-	einfo "   heimdal can be compiled with --with-krb4 switch to provide it, but"
-	einfo "   app-crypt/kth-krb must be installed so that heimdal's configure"
-	einfo "   can find it. Beware that krb4 approach is not considered"
-	einfo "   safe anymore, so do not install kth-krb unless you really need it."
-	einfo "4. app-crypt/mit-krb5, if export restrictions allow you to do so."
-	einfo
-	epause 20
-	ebeep 5
-}
-
-pkg_prerm() {
-	# See bug 9849
-	# Remove afs mountpoint
-	rmdir /afs 2>/dev/null
-}
-
diff --git a/net-fs/openafs/openafs-1.4.0_rc2-r1.ebuild b/net-fs/openafs/openafs-1.4.0_rc2-r1.ebuild
deleted file mode 100644
index 810ec56df9ba..000000000000
--- a/net-fs/openafs/openafs-1.4.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.0_rc2-r1.ebuild,v 1.1 2005/09/02 16:50:36 stefaan Exp $
-
-inherit flag-o-matic eutils toolchain-funcs versionator
-
-PATCHVER=0.2b
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${PN}/candidate/${MY_PV}/${MY_P}-src.tar.bz2
-	doc? ( http://openafs.org/dl/${PN}/candidate/${MY_PV}/${MY_P}-doc.tar.bz2 )
-	mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~stefaan/distfiles/${PN}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~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}
-}
-
-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
-
-	econf \
-		$(use_enable pam) \
-		$(use_enable debug) \
-		--enable-largefile \
-		${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
-		dodir /$(get_libdir)/security
-		mv ${D}/usr/$(get_libdir)/pam_afs* ${D}/$(get_libdir)/security
-	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
-	mv ${D}/usr/bin/kpasswd ${D}/usr/bin/kpasswd_afs
-	mv src/man/kpasswd.1 src/man/kpasswd_afs.1
-
-	# install manuals
-	doman src/man/*.?
-
-	use kerberos && doman src/aklog/aklog.1
-	use pam && doman src/pam/pam_afs.5
-
-	# minimal documentation
-	dodoc ${CONFDIR}/README ${CONFDIR}/ChangeLog*
-
-	# documentation package
-	if use doc; then
-		cp -pPR doc/* ${D}/usr/share/doc/${P}
-	fi
-
-	# Gentoo related scripts
-	newconfd ${CONFDIR}/afs-client afs-client
-	newconfd ${CONFDIR}/afs-server afs-server
-	newinitd ${SCRIPTDIR}/afs-client afs-client
-	newinitd ${SCRIPTDIR}/afs-server afs-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
-	keepdir /var/lib/openafs/logs
-}
-
-migrate_to_fhs() {
-	# conventions:
-	# only automatically migrate if the destination directories are
-	# as of yet non-existant
-
-	# path translations
-	local oldafsconfdir=${ROOT}usr/afs/etc
-	local newafsconfdir=${ROOT}etc/openafs/server
-	local oldviceetcdir=${ROOT}usr/vice/etc
-	local newviceetcdir=${ROOT}etc/openafs
-	local oldafslocaldir=${ROOT}usr/afs/local
-	local newafslocaldir=${ROOT}var/lib/openafs
-	local oldafsdbdir=${ROOT}usr/afs/db
-	local newafsdbdir=${ROOT}var/lib/openafs/db
-
-	# detect Transarc afsconfdir
-	local afsconfdir=0
-	[ ! -L ${oldafsconfdir} -a -d ${oldafsconfdir} -a ! -e ${newafsconfdir} ] && afsconfdir=1
-
-	# detect Transarc viceetcdir
-	local viceetcdir=0
-	local viceetcsoftlink=0
-	if [ -d ${oldviceetcdir} -a ! -e ${newviceetcdir} ]; then
-		if [ ! -L ${oldviceetcdir} ]; then
-			viceetcdir=1
-		else
-			if [ $(readlink ${oldviceetcdir}) = /etc/afs ]; then
-				viceetcdir=1
-				viceetcsoftlink=1
-			fi
-		fi
-	fi
-
-	# detect Transarc afslocaldir
-	local afslocaldir=0
-	[ ! -L ${oldafslocaldir} -a -d ${oldafslocaldir} -a ! -e ${newafslocaldir} ] && afslocaldir=1
-
-	# detect Transarc afsdbdir
-	local afsdbdir=0
-	[ ! -L ${oldafsdbdir} -a -d ${oldafsdbdir} -a ! -e ${newafsdbdir} ] && afsdbdir=1
-
-	# detect Transarc afsbosconfigdir
-	local afsbosconfigdir=0
-	[ ${afslocaldir} = 1 -a -f ${oldafslocaldir}/BosConfig ] && afsbosconfigdir=1
-
-	# any of these?
-	local any=$((${afsconfdir}+${viceetcdir}+${afsdbdir}+${afslocaldir}))
-
-	# No migration needed?  Then bail out
-	if [ ${any} = 0 ]; then
-		return 0
-	fi
-
-	# Root not / ?  Then do not attempt automatic migration
-	if [ "$ROOT" != "/" ]; then
-		ewarn Old-style configuration files found, but not migrating
-		ewarn because installation rootdir is not /
-		ebeep 5
-		return 0
-	fi
-
-	# detect whether an installation with old config files is running
-	local pid
-	if pid=$(pgrep -n -U 0 bosserver) &>/dev/null; then
-		# find location of executable
-		if ! executable=$(readlink /proc/${pid}/exe); then
-			die "Couldn't execute readlink on bosserver process"
-		fi
-		# if executable is not located in /usr/sbin, assume Transarc locations
-		if [[ $executable != ${ROOT}usr/sbin/* ]]; then
-			ewarn "Found a running process with the name \"bosserver\" and pid ${pid}"
-			ewarn "that is not located in /usr/sbin.  This suggests a running"
-			ewarn "OpenAFS-server with traditional TransARC path conventions."
-			ewarn "This installation procedure aims to migrate old"
-			ewarn "configuration files to new FHS-conform locations."
-			ewarn "Please stop the running server and reattempt the upgrade"
-			die "Installation aborted because of running OpenAFS server"
-		fi
-	fi
-
-	# warn about migration
-	ewarn
-	ewarn "OpenAFS configuration/data-files have been found in old"
-	ewarn "TransARC-style locations, for which the standard FHS equivalents"
-	ewarn "do not exist yet.  "
-	ewarn "Following procedure will copy those files to the new locations such"
-	ewarn "that, given a previously working configuration, both server"
-	ewarn "and client should restart without problems.  Files will be copied"
-	ewarn "only, and not removed from the old locations.  For assistance"
-	ewarn "in removing the old files, consult the documentation in"
-	ewarn "/usr/share/openafs/gentoo"
-	ewarn "Will continue in 30 seconds, press Ctrl-C to abort"
-	ewarn
-	ebeep 10
-	epause 20
-
-	# fortunately, there's no overlap between the old locations and the new ones
-
-	# afsconfdir: migrate /usr/afs/etc to /etc/openafs/server
-	if [ ${afsconfdir} = 1 ]; then
-		mkdir -m 755 -p ${newafsconfdir}
-		cp ${oldafsconfdir}/* ${newafsconfdir}
-	fi
-
-	# viceetcdir: migrate /usr/vice/etc (likely a link to /etc/afs) to /etc/openafs
-	if [ ${viceetcdir} = 1 ]; then
-		mkdir -m 755 -p ${newviceetcdir}
-		cp ${oldviceetcdir}/* ${newviceetcdir}
-	fi
-
-	# afslocaldir: migrate /usr/afs/local to /var/lib/openafs
-	if [ ${afslocaldir} = 1 ]; then
-		mkdir -m 700 -p ${newafslocaldir}
-		cp ${oldafslocaldir}/* ${newafslocaldir}
-
-		# afsbosconfigdir: migrate /usr/afs/local/BosConfig to /etc/openafs/BosConfig
-		if [ ${afsbosconfigdir} = 1 ]; then
-			sed -i \
-				-e 's:/usr/afs/bin/:/usr/libexec/openafs/:g' \
-				-e 's:/usr/afs/etc:/etc/openafs/server:g' \
-				-e 's:/usr/afs/bin:/usr/bin:g' \
-				${newafslocaldir}/BosConfig
-			if [ -d ${newviceetcdir} ]; then
-				mv ${newafslocaldir}/BosConfig ${newviceetcdir}
-			else
-				ewarn
-				ewarn "No ${newviceetcdir} found, couldn't move BosConfig there,"
-				ewarn "it will remain in ${newafslocaldir}.  Please investigate"
-				ewarn "before attempting to start the server"
-				ewarn
-				ebeep 3
-			fi
-		fi
-	fi
-
-	# afsdbdir: migrate /usr/afs/db to /var/lib/openafs/db
-	if [ ${afsdbdir} = 1 ]; then
-		mkdir -m 700 -p ${newafsdbdir}
-		cp ${oldafsdbdir}/* ${newafsdbdir}
-	fi
-
-	ewarn "Migration finished"
-	ewarn "Please remember to manually migrate disk-cache (if present)"
-	ewarn "Alter /etc/openafs/cacheinfo to do so"
-	ebeep 5
-}
-
-migrate_configfile() {
-	local oldconfigfile=${ROOT}etc/conf.d/afs
-	local newconfigfile=${ROOT}etc/conf.d/afs-client
-
-	if [ -f ${oldconfigfile} -a ! -e ${newconfigfile} ]; then
-		cp ${oldconfigfile} ${newconfigfile}
-	fi
-}
-
-pkg_preinst() {
-	migrate_to_fhs
-	migrate_configfile
-
-	## 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 ${IMAGE}etc/openafs
-	fi
-	# cacheinfo: use a default location cache, 50 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:50000" > ${IMAGE}etc/openafs/cacheinfo
-	fi
-	# ThisCell: default to "openafs.org"
-	if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then
-		echo "openafs.org" > ${IMAGE}etc/openafs/ThisCell
-	fi
-}
-
-pkg_postinst() {
-	# See bug 9849
-	# Create afs mountpoint
-	mkdir /afs 2>/dev/null
-
-	einfo
-	einfo "For browsing global Cells, please get CellServDB from"
-	einfo "/usr/share/doc/${PF} and put in /etc/openafs.  Then start"
-	einfo "using /etc/init.d/afs right away."
-	einfo "For more functionality, look at the limited README in the"
-	einfo "same directory, or turn to the more elaborate procedures"
-	einfo "described on http://www.openafs.org (quick beginnings)"
-	einfo "After initial server setup, you can edit /etc/conf.d/afs"
-	einfo "to enable the BOS Server."
-	einfo ""
-	einfo "To use AFS fully, you need either to start:"
-	einfo "1. kaserver, which is included with openafs but as it is"
-	einfo "based on kerberos4, it is not recommended."
-	einfo "2. app-crypt/kth-krb, but as it is also based on kerberos4 protocol,"
-	einfo "   you can keep passwords replicated in contrast to kaserver, but still"
-	einfo "   don't waste your time here."
-	einfo "3. app-crypt/heimdal, which is kerberos5 distribution written in Europe,"
-	einfo "   so no US export restrictions apply (*recommended*, compatible with"
-	einfo "   MIT krb5, see below)."
-	einfo "   BTW: if you need kerberos4 backwards compatibility,"
-	einfo "   heimdal can be compiled with --with-krb4 switch to provide it, but"
-	einfo "   app-crypt/kth-krb must be installed so that heimdal's configure"
-	einfo "   can find it. Beware that krb4 approach is not considered"
-	einfo "   safe anymore, so do not install kth-krb unless you really need it."
-	einfo "4. app-crypt/mit-krb5, if export restrictions allow you to do so."
-	einfo
-
-	epause 20
-	ebeep 5
-}
-
-pkg_prerm() {
-	# See bug 9849
-	# Remove afs mountpoint
-	rmdir /afs 2>/dev/null
-}
-
diff --git a/net-fs/openafs/openafs-1.4.0_rc2.ebuild b/net-fs/openafs/openafs-1.4.0_rc2.ebuild
deleted file mode 100644
index 7b00d55bc9db..000000000000
--- a/net-fs/openafs/openafs-1.4.0_rc2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.0_rc2.ebuild,v 1.1 2005/09/02 00:48:27 stefaan Exp $
-
-inherit flag-o-matic eutils toolchain-funcs versionator
-
-PATCHVER=0.2a
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-SRC_URI="http://openafs.org/dl/${PN}/candidate/${MY_PV}/${MY_P}-src.tar.bz2
-	mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~stefaan/distfiles/${PN}-gentoo-${PATCHVER}.tar.bz2"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="debug kerberos pam"
-
-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}
-}
-
-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
-
-	econf \
-		$(use_enable pam) \
-		$(use_enable debug) \
-		--enable-largefile \
-		${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
-		dodir /$(get_libdir)/security
-		mv ${D}/usr/$(get_libdir)/pam_afs* ${D}/$(get_libdir)/security
-	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
-	mv ${D}/usr/bin/kpasswd ${D}/usr/bin/kpasswd_afs
-	mv src/man/kpasswd.1 src/man/kpasswd_afs.1
-
-	# install manuals
-	doman src/man/*.?
-
-	use kerberos && doman src/aklog/aklog.1
-	use pam && doman src/pam/pam_afs.5
-
-	# documentation
-	dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB ${CONFDIR}/ChangeLog*
-
-	# Gentoo related scripts
-	newconfd ${CONFDIR}/afs-client
-	newconfd ${CONFDIR}/afs-server
-	newinitd ${SCRIPTDIR}/afs-client
-	newinitd ${SCRIPTDIR}/afs-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
-	keepdir /var/lib/openafs/logs
-}
-
-migrate_to_fhs() {
-	# conventions:
-	# only automatically migrate if the destination directories are
-	# as of yet non-existant
-
-	# path translations
-	local oldafsconfdir=${ROOT}usr/afs/etc
-	local newafsconfdir=${ROOT}etc/openafs/server
-	local oldviceetcdir=${ROOT}usr/vice/etc
-	local newviceetcdir=${ROOT}etc/openafs
-	local oldafslocaldir=${ROOT}usr/afs/local
-	local newafslocaldir=${ROOT}var/lib/openafs
-	local oldafsdbdir=${ROOT}usr/afs/db
-	local newafsdbdir=${ROOT}var/lib/openafs/db
-
-	# detect Transarc afsconfdir
-	local afsconfdir=0
-	[ ! -L ${oldafsconfdir} -a -d ${oldafsconfdir} -a ! -e ${newafsconfdir} ] && afsconfdir=1
-
-	# detect Transarc viceetcdir
-	local viceetcdir=0
-	local viceetcsoftlink=0
-	if [ -d ${oldviceetcdir} -a ! -e ${newviceetcdir} ]; then
-		if [ ! -L ${oldviceetcdir} ]; then
-			viceetcdir=1
-		else
-			if [ $(readlink ${oldviceetcdir}) = /etc/afs ]; then
-				viceetcdir=1
-				viceetcsoftlink=1
-			fi
-		fi
-	fi
-
-	# detect Transarc afslocaldir
-	local afslocaldir=0
-	[ ! -L ${oldafslocaldir} -a -d ${oldafslocaldir} -a ! -e ${newafslocaldir} ] && afslocaldir=1
-
-	# detect Transarc afsdbdir
-	local afsdbdir=0
-	[ ! -L ${oldafsdbdir} -a -d ${oldafsdbdir} -a ! -e ${newafsdbdir} ] && afsdbdir=1
-
-	# detect Transarc afsbosconfigdir
-	local afsbosconfigdir=0
-	[ ${afslocaldir} = 1 -a -f ${oldafslocaldir}/BosConfig ] && afsbosconfigdir=1
-
-	# any of these?
-	local any=$((${afsconfdir}+${viceetcdir}+${afsdbdir}+${afslocaldir}))
-
-	# No migration needed?  Then bail out
-	if [ ${any} = 0 ]; then
-		return 0
-	fi
-
-	# Root not / ?  Then do not attempt automatic migration
-	if [ "$ROOT" != "/" ]; then
-		ewarn Old-style configuration files found, but not migrating
-		ewarn because installation rootdir is not /
-		ebeep 5
-		return 0
-	fi
-
-	# detect whether an installation with old config files is running
-	local pid
-	if pid=$(pgrep -n -U 0 bosserver) &>/dev/null; then
-		# find location of executable
-		if ! executable=$(readlink /proc/${pid}/exe); then
-			die "Couldn't execute readlink on bosserver process"
-		fi
-		# if executable is not located in /usr/sbin, assume Transarc locations
-		if [[ $executable != ${ROOT}usr/sbin/* ]]; then
-			ewarn "Found a running process with the name \"bosserver\" and pid ${pid}"
-			ewarn "that is not located in /usr/sbin.  This suggests a running"
-			ewarn "OpenAFS-server with traditional TransARC path conventions."
-			ewarn "This installation procedure aims to migrate old"
-			ewarn "configuration files to new FHS-conform locations."
-			ewarn "Please stop the running server and reattempt the upgrade"
-			die "Installation aborted because of running OpenAFS server"
-		fi
-	fi
-
-	# warn about migration
-	ewarn
-	ewarn "OpenAFS configuration/data-files have been found in old"
-	ewarn "TransARC-style locations, for which the standard FHS equivalents"
-	ewarn "do not exist yet.  "
-	ewarn "Following procedure will copy those files to the new locations such"
-	ewarn "that, given a previously working configuration, both server"
-	ewarn "and client should restart without problems.  Files will be copied"
-	ewarn "only, and not removed from the old locations.  For assistance"
-	ewarn "in removing the old files, consult the documentation in"
-	ewarn "/usr/share/openafs/gentoo"
-	ewarn "Will continue in 30 seconds, press Ctrl-C to abort"
-	ewarn
-	ebeep 10
-	epause 20
-
-	# fortunately, there's no overlap between the old locations and the new ones
-
-	# afsconfdir: migrate /usr/afs/etc to /etc/openafs/server
-	if [ ${afsconfdir} = 1 ]; then
-		mkdir -m 755 -p ${newafsconfdir}
-		cp ${oldafsconfdir}/* ${newafsconfdir}
-	fi
-
-	# viceetcdir: migrate /usr/vice/etc (likely a link to /etc/afs) to /etc/openafs
-	if [ ${viceetcdir} = 1 ]; then
-		mkdir -m 755 -p ${newviceetcdir}
-		cp ${oldviceetcdir}/* ${newviceetcdir}
-	fi
-
-	# afslocaldir: migrate /usr/afs/local to /var/lib/openafs
-	if [ ${afslocaldir} = 1 ]; then
-		mkdir -m 700 -p ${newafslocaldir}
-		cp ${oldafslocaldir}/* ${newafslocaldir}
-
-		# afsbosconfigdir: migrate /usr/afs/local/BosConfig to /etc/openafs/BosConfig
-		if [ ${afsbosconfigdir} = 1 ]; then
-			sed -i \
-				-e 's:/usr/afs/bin/:/usr/libexec/openafs/:g' \
-				-e 's:/usr/afs/etc:/etc/openafs/server:g' \
-				-e 's:/usr/afs/bin:/usr/bin:g' \
-				${newafslocaldir}/BosConfig
-			if [ -d ${newviceetcdir} ]; then
-				mv ${newafslocaldir}/BosConfig ${newviceetcdir}
-			else
-				ewarn
-				ewarn "No ${newviceetcdir} found, couldn't move BosConfig there,"
-				ewarn "it will remain in ${newafslocaldir}.  Please investigate"
-				ewarn "before attempting to start the server"
-				ewarn
-				ebeep 3
-			fi
-		fi
-	fi
-
-	# afsdbdir: migrate /usr/afs/db to /var/lib/openafs/db
-	if [ ${afsdbdir} = 1 ]; then
-		mkdir -m 700 -p ${newafsdbdir}
-		cp ${oldafsdbdir}/* ${newafsdbdir}
-	fi
-
-	ewarn "Migration finished"
-	ewarn "Please remember to manually migrate disk-cache (if present)"
-	ewarn "Alter /etc/openafs/cacheinfo to do so"
-	ebeep 5
-}
-
-migrate_configfile() {
-	local oldconfigfile=${ROOT}etc/conf.d/afs
-	local newconfigfile=${ROOT}etc/conf.d/afs-client
-
-	if [ -f ${oldconfigfile} -a ! -e ${newconfigfile} ]; then
-		cp ${oldconfigfile} ${newconfigfile}
-	fi
-}
-
-pkg_preinst() {
-	migrate_to_fhs
-	migrate_configfile
-
-	## 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 ${IMAGE}etc/openafs
-	fi
-	# cacheinfo: use a default location cache, 50 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:50000" > ${IMAGE}etc/openafs/cacheinfo
-	fi
-	# ThisCell: default to "openafs.org"
-	if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then
-		echo "openafs.org" > ${IMAGE}etc/openafs/ThisCell
-	fi
-}
-
-pkg_postinst() {
-	# See bug 9849
-	# Create afs mountpoint
-	mkdir /afs 2>/dev/null
-
-	einfo
-	einfo "For browsing global Cells, please get CellServDB from"
-	einfo "/usr/share/doc/${PF} and put in /etc/openafs.  Then start"
-	einfo "using /etc/init.d/afs right away."
-	einfo "For more functionality, look at the limited README in the"
-	einfo "same directory, or turn to the more elaborate procedures"
-	einfo "described on http://www.openafs.org (quick beginnings)"
-	einfo "After initial server setup, you can edit /etc/conf.d/afs"
-	einfo "to enable the BOS Server."
-	einfo ""
-	einfo "To use AFS fully, you need either to start:"
-	einfo "1. kaserver, which is included with openafs but as it is"
-	einfo "based on kerberos4, it is not recommended."
-	einfo "2. app-crypt/kth-krb, but as it is also based on kerberos4 protocol,"
-	einfo "   you can keep passwords replicated in contrast to kaserver, but still"
-	einfo "   don't waste your time here."
-	einfo "3. app-crypt/heimdal, which is kerberos5 distribution written in Europe,"
-	einfo "   so no US export restrictions apply (*recommended*, compatible with"
-	einfo "   MIT krb5, see below)."
-	einfo "   BTW: if you need kerberos4 backwards compatibility,"
-	einfo "   heimdal can be compiled with --with-krb4 switch to provide it, but"
-	einfo "   app-crypt/kth-krb must be installed so that heimdal's configure"
-	einfo "   can find it. Beware that krb4 approach is not considered"
-	einfo "   safe anymore, so do not install kth-krb unless you really need it."
-	einfo "4. app-crypt/mit-krb5, if export restrictions allow you to do so."
-	einfo
-
-	epause 20
-	ebeep 5
-}
-
-pkg_prerm() {
-	# See bug 9849
-	# Remove afs mountpoint
-	rmdir /afs 2>/dev/null
-}
-