old

9 files changed, 5 insertions, 961 deletions

diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 24d1207b6871..52e16d991346 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,36 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX STABLE14-linux-flush-compare-20080402 574 RMD160 8c69e79a700d315d49fd5032e827a6ab2ac8b5fd SHA1 46e8b86c8899899c7eb7b457f797d58de70b6747 SHA256 ce4651160c62a92448fd4faa110595a9ae71370a6fc36faf59846797296f52bd
-AUX STABLE14-linux-flush-unlock-20080402 621 RMD160 fb1b4f76a5d61abd7b7a38f83eb418125cb5f846 SHA1 aad85aef5ebaf173b73b592127dabb4bd912ec98 SHA256 64e7df65937237e88f28fb30d079d59613c84236469ea2a9958a30eaa4fb19e7
 DIST openafs-1.4.10-src.tar.bz2 11553396 RMD160 f35416d1d9814a8ae9fb308429cdfe2218ba5700 SHA1 760f1d294b4d6145dd8792d7c58ada35fa34469f SHA256 9add117f0a120a02706578229bad7224f2ef1bad934712a0e7f89e09b1f1f660
 DIST openafs-1.4.11-src.tar.bz2 11556938 RMD160 e9b4d67a8ccd331745441f643863fa196f8f9220 SHA1 932c7830b747e944edd558f3dbac5636e367beb0 SHA256 acaaca5919a21e2c6b2ba666e7bcb07dc511a6611b80e378fc9e7699ec5dd6f3
-DIST openafs-1.4.6-cvs20080222.patch.bz2 284987 RMD160 de642f29f66844a5ff8fbdd3dd2ec8af41748869 SHA1 5dcf1d85df1a90fc00cf596da76fe75b7a951c14 SHA256 749f32890ffb68b2a1a8348348854140baca781e9996c8b873b7e9d97d5c068a
-DIST openafs-1.4.6-src.tar.bz2 12485179 RMD160 856fa915c7847c25dab77b450bc8b0c6f6aeb308 SHA1 39489babe20c42c16ea8f11457de423b2bcca009 SHA256 996c6b53d81bd87f754e9596e24e11e65e6402b6ddab727634e05d73f3bb0ea1
-DIST openafs-1.4.7-src.tar.bz2 11493357 RMD160 79f1d0f0c72f8e26537cd344d63ce9f18e870d6d SHA1 dbaefb0e53d1dc0fde2792d04bd6786f36ba7e7b SHA256 580cd1ba03fbdf3362f2b66c0732d3bcf02bebdf19930faa014716b214541314
-DIST openafs-1.4.8-src.tar.bz2 11538366 RMD160 8d8e34fc82d041e4a0e54d9e5324090987dd1468 SHA1 4950d91dffbaf0f7ab30310fe143622a5d3945ca SHA256 98caa0faf748e5d44d1b2722e7185e3200024e59326b6f010f37feb510bd86d7
-DIST openafs-1.4.8pre3-src.tar.bz2 11537447 RMD160 4d07a498c7bd0bf222a15923c54b5ed454ec567f SHA1 b5360d35e16bcfbde8800a8277e709ff81a32984 SHA256 9da82f6e5501d196f833e1f68944ad91d8a6df6961823ff882cc62f014a9e4a5
 DIST openafs-1.4.9-src.tar.bz2 11537589 RMD160 f5652e5576fd67a058dece1eff7481f7a9ced080 SHA1 b1816b45f09a8009a1fa19860c27aa7abdf5ee4d SHA256 e190a1b22d23cb549aa61b7dcdf2e19b1b3904c1d9a286749aca18660bc200de
 DIST openafs-1.5.34-src.tar.bz2 12151866 RMD160 188f79e90de1eaa8457f2c5612cb2512a2e996e5 SHA1 11d9526b46395397a15ea83654584aaf61c7e594 SHA256 015f448bbc05e2b774858a6adfad1a37ce4d4aa402c6f63325c638d0153912b9
 DIST openafs-gentoo-0.14.tar.bz2 18293 RMD160 2a7ed8a40395d402de2f972fe0f96154d811e2b6 SHA1 dbff67178e7eae1bdbd5af43f6bedaeb747bd25a SHA256 e27918d395d656659b6f0d288d8a4d2501bd4ca6582824b8f3bbd420b06e6f6c
-DIST openafs-gentoo-0.15.tar.bz2 20155 RMD160 40270539fe8992f76953b6ab5f133ec23b017316 SHA1 8f985eb753786c9289721cc7818d96112a5310fc SHA256 3448b50e839826f3fe09ae95a593030a8029c5a769744e74b6d8f3f52f03f940
 DIST openafs-gentoo-0.16.tar.bz2 24178 RMD160 9f201fe21b5a2f12ba2506a3e6c124a7a31c3218 SHA1 d07783ae13dfe258bb0e80cecf85c643f83ab210 SHA256 28a7f49c794a3d98054b0736ca33413fc731ecb4ec54507f8322365493031c96
 EBUILD openafs-kernel-1.4.10.ebuild 1751 RMD160 99535122f8ffcc8cc342d730252f7398752baede SHA1 c0af8542310372a7a8fa8d6a978f0ff85426424b SHA256 1a5428c25d30c33a48e73c22b42261d95fe80fb62ae8c100dd9b3f82323b49f0
 EBUILD openafs-kernel-1.4.11.ebuild 1751 RMD160 32d1eae6be9a5100a4f86f7ec544c8575cdc92ae SHA1 0aa7560b389b13c99246bf57aefda2ce2525ee26 SHA256 929fae392ea5379ec5f5694ca9196e9c0414c832a294f900db16a0fbc65047ce
-EBUILD openafs-kernel-1.4.6.ebuild 1630 RMD160 0f4f553fee8997e3b0ffd1da31e54d91fec8f017 SHA1 1f0ced079a82117b2a8c84fdf6820c35d5800b74 SHA256 d577a8543725013a99399125346d87dd4614a010f629efe0148998a5e4aa1266
-EBUILD openafs-kernel-1.4.6_p20080222.ebuild 1804 RMD160 3de19f0766f750726ccfb2df66c4f23b7ab56749 SHA1 5d5fdd588b30eb5bcdd506a18b23b70f77321e6a SHA256 51c3caacc72127e0effb48ae19e69e789806915565779f1a52eb87e4c7f2d1a0
-EBUILD openafs-kernel-1.4.7.ebuild 1678 RMD160 aeed41e5b3fbd30acf5c238d9b80736f6bd6cd18 SHA1 66fe1d9d66ba52f8f175d3ed771ef987c8a39ee4 SHA256 a1cbe67efcb2a6de86da7a8416a7fcd0bd984733dfd2a26e428ee0a3f946f78b
-EBUILD openafs-kernel-1.4.8-r1.ebuild 1726 RMD160 b09583a9f7a5ecf04473749a36f054b730aff10f SHA1 fbcfa44f6fcd06019c5804597b49f5908bfb747f SHA256 4f01786c6cb644d551ac5ba01322780179669809dff86758400cac3bdeba678c
-EBUILD openafs-kernel-1.4.8.ebuild 1721 RMD160 938439e7b3daecbdd6957e37570c1f90aa83822c SHA1 da1873df74d5fbbe1713e7267fe4f212bc7cd82f SHA256 750184cedeb5f4ff10fa082369d23d9643d44abd78881eac3aa89315c0e08614
-EBUILD openafs-kernel-1.4.8_pre3.ebuild 1765 RMD160 177c93398bc9985b46504b67d583a6734d643fcc SHA1 70210d559e179ad6ad7ea99ea5a676f5f7312aa3 SHA256 eab182d196bf3e3190e08071b0f69c589e5fd43faa1f642c822b4cda6f3dbf7f
 EBUILD openafs-kernel-1.4.9.ebuild 1721 RMD160 3ac9fa5d72c81a5b83202110cb0324d41316020e SHA1 30940cf4ef3cd2d4e73e2acd1a9e6010c61142bc SHA256 3b3629ee850332c3e166df72fa4b3f26efa21cd0eb2a2b7c7e02f16bbabf0090
 EBUILD openafs-kernel-1.5.34.ebuild 1493 RMD160 2afe0d46f9f6626349a55c245e4ea7de1e3a6e28 SHA1 ed04ea53bf39a167efd3465a364ea284ef56c210 SHA256 be2ed78a69235abf2a8cbee65c0309ef6fd13105fcc4537443761c907defb4a5
 MISC ChangeLog 19786 RMD160 71004bffffaea6e24f7687af7d5f8aeff87bfdcc SHA1 2b8d82ca27ec4f83abf6e919e9378a864c7ef059 SHA256 0e4962fac805e474ffa10b2ce902aa31b798afdfc591e513bff39d3d45b19f0f
 MISC metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 SHA1 a4ad632b650953fa9c9f203a9c55f58ddba37705 SHA256 90d7dcb6aede67bf64f610984a31fc03573512de9e241db42acb32601373db62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkttSbkACgkQOeoy/oIi7uwZegCghELpXa7TvlCG0piYdjBRwzX7
-pnAAoJ2CM427SpYHCS5g4mvjxoAzM2nY
-=v7zo
+iF4EAREIAAYFAkwf7kkACgkQTwhj9JtAlp4B4QEAieckLrtjgsIc5DtjatdOM9rs
+wJONsBaHRXSxxJPiCLIA/jVcDQNyb3+FPP9cQtRjbC5bfaMLJPfrSHzHVpHPQmAX
+=kmkj
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs/files/openafs-1.4.5-shared-libs.patch b/net-fs/openafs/files/openafs-1.4.5-shared-libs.patch
deleted file mode 100644
index fa109cf557d2..000000000000
--- a/net-fs/openafs/files/openafs-1.4.5-shared-libs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur openafs-1.4.5/src/shlibafsauthent/Makefile.in openafs-1.4.5.new/src/shlibafsauthent/Makefile.in
---- openafs-1.4.5/src/shlibafsauthent/Makefile.in	2006-08-20 15:17:25.000000000 -0500
-+++ openafs-1.4.5.new/src/shlibafsauthent/Makefile.in	2007-12-16 08:29:31.000000000 -0500
-@@ -115,7 +115,7 @@
- 	sun*_5*) \
- 		${SHLIB_LINKER} -h libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR} -o ${LIBAFSAUTHENT} ${LIBOBJS} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
- 	*_linux*) \
--		${SHLIB_LINKER} -Wl,-h,libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR} -Wl,--version-script=${srcdir}/mapfile -o ${LIBAFSAUTHENT} ${LIBOBJS} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
-+		${SHLIB_LINKER} -Wl,-h,libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR} -o ${LIBAFSAUTHENT} ${LIBOBJS} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
- 	*) \
- 		${SHLIB_LINKER} -o ${LIBAFSAUTHENT} ${LIBOBJS} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
- 	esac
-diff -Naur openafs-1.4.5/src/shlibafsrpc/Makefile.in openafs-1.4.5.new/src/shlibafsrpc/Makefile.in
---- openafs-1.4.5/src/shlibafsrpc/Makefile.in	2006-08-20 17:24:10.000000000 -0500
-+++ openafs-1.4.5.new/src/shlibafsrpc/Makefile.in	2007-12-16 06:55:18.000000000 -0500
-@@ -150,9 +150,9 @@
- 	sun*_5*) \
- 		${SHLIB_LINKER} -h libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR} -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
- 	amd64_linux*) \
--		${SHLIB_LINKER} -Wl,-h,libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR} -Wl,--version-script=${srcdir}/mapfile.afs_xdr -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
-+		${SHLIB_LINKER} -Wl,-h,libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR} -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
- 	*_linux*) \
--		${SHLIB_LINKER} -Wl,-h,libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR} -Wl,--version-script=${srcdir}/mapfile -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
-+		${SHLIB_LINKER} -Wl,-h,libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR} -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
- 	*) \
- 		${SHLIB_LINKER} -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
- 	esac
diff --git a/net-fs/openafs/files/openafs-1.4.7-uname.patch b/net-fs/openafs/files/openafs-1.4.7-uname.patch
deleted file mode 100644
index 7cedd843d77e..000000000000
--- a/net-fs/openafs/files/openafs-1.4.7-uname.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- acinclude.m4~	2007-10-31 22:05:57.000000000 +0200
-+++ acinclude.m4	2007-10-31 22:06:30.000000000 +0200
-@@ -473,7 +473,7 @@
- 			AFS_SYSNAME="ia64_linuxXX"
- 			;;
- 		powerpc-*-linux*)
--			AFS_SYSNAME="`/bin/arch`_linuxXX"
-+			AFS_SYSNAME="`uname -m`_linuxXX"
- 			;;
- 		powerpc64-*-linux*)
- 			AFS_SYSNAME="ppc64_linuxXX"
-@@ -488,7 +488,7 @@
- 			AFS_SYSNAME="s390x_linuxXX"
- 			;;
- 		sparc-*-linux*)
--			AFS_SYSNAME="`/bin/arch`_linuxXX"
-+			AFS_SYSNAME="`uname -m`_linuxXX"
- 			;;
- 		sparc64-*-linux*)
- 			AFS_SYSNAME="sparc64_linuxXX"
-
diff --git a/net-fs/openafs/openafs-1.4.6.ebuild b/net-fs/openafs/openafs-1.4.6.ebuild
deleted file mode 100644
index a1e14e41c4dd..000000000000
--- a/net-fs/openafs/openafs-1.4.6.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.4.6.ebuild,v 1.7 2010/02/06 10:50:02 ulm 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 ppc ppc64 ~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 ${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.4.6_p20080222.ebuild b/net-fs/openafs/openafs-1.4.6_p20080222.ebuild
deleted file mode 100644
index 066b67c88325..000000000000
--- a/net-fs/openafs/openafs-1.4.6_p20080222.ebuild
+++ /dev/null
@@ -1,154 +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.6_p20080222.ebuild,v 1.6 2010/02/06 10:50:02 ulm Exp $
-
-inherit flag-o-matic eutils toolchain-funcs versionator pam
-
-PATCHVER=0.14
-MY_PV_DATE=${PV#*_p}
-MY_PV=${PV%_p*}
-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}/${MY_PV}/${MY_P}-src.tar.bz2
-	doc? ( http://openafs.org/dl/${PN}/${MY_PV}/${MY_P}-doc.tar.bz2 )
-	mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2
-	mirror://gentoo/${PN}-${MY_PV}-cvs${MY_PV_DATE}.patch.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~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 ${PATCHDIR}
-
-	# patch up to the specified cvs version
-	epatch "${DISTDIR}"/${MY_P}-cvs${MY_PV_DATE}.patch.bz2
-
-	# don't use mapfiles to strip symbols (bug #202489)
-	epatch "${FILESDIR}"/openafs-1.4.5-shared-libs.patch
-
-	# 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
-
-	./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.4.7.ebuild b/net-fs/openafs/openafs-1.4.7.ebuild
deleted file mode 100644
index 07c5495edfa3..000000000000
--- a/net-fs/openafs/openafs-1.4.7.ebuild
+++ /dev/null
@@ -1,152 +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.7.ebuild,v 1.4 2010/02/06 10:50:02 ulm 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 ~ppc ~ppc64 ~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_EXCLUDE="006_all_ppc64.patch" \
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-
-	# don't use mapfiles to strip symbols (bug #202489)
-	epatch "${FILESDIR}"/openafs-1.4.5-shared-libs.patch
-	# use uname i.o. arch (bug #211378)
-	epatch "${FILESDIR}"/openafs-1.4.7-uname.patch
-
-	# 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 \
-		${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.4.8-r1.ebuild b/net-fs/openafs/openafs-1.4.8-r1.ebuild
deleted file mode 100644
index 7b74274d034c..000000000000
--- a/net-fs/openafs/openafs-1.4.8-r1.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.8-r1.ebuild,v 1.2 2010/02/06 10:50:02 ulm 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 ~ppc ~ppc64 ~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.4.8.ebuild b/net-fs/openafs/openafs-1.4.8.ebuild
deleted file mode 100644
index 9013ee21b83f..000000000000
--- a/net-fs/openafs/openafs-1.4.8.ebuild
+++ /dev/null
@@ -1,148 +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.8.ebuild,v 1.5 2010/02/06 10:50:02 ulm 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 ~ppc ~ppc64 ~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 \
-		${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.4.8_pre3.ebuild b/net-fs/openafs/openafs-1.4.8_pre3.ebuild
deleted file mode 100644
index e2d1a8db3f7f..000000000000
--- a/net-fs/openafs/openafs-1.4.8_pre3.ebuild
+++ /dev/null
@@ -1,151 +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.8_pre3.ebuild,v 1.3 2010/02/06 10:50:02 ulm Exp $
-
-inherit flag-o-matic eutils toolchain-funcs versionator pam
-
-PATCHVER=0.15
-MY_PV=${PV/_pre/pre}
-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/candidate/${MY_PV}/${MY_P}-src.tar.bz2
-	doc? ( http://openafs.org/dl/candidate/${MY_PV}/${MY_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 ~ppc ~ppc64 ~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 \
-		${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"
-}