Old #435990 by Andrej Filipcic.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 32 insertions, 487 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 06ce4848d259..5dbfbe1a081b 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/openafs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.181 2012/09/25 00:16:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.182 2012/09/25 00:18:43 vapier Exp $
+
+  25 Sep 2012; Mike Frysinger <vapier@gentoo.org> -openafs-1.4.14-r1.ebuild,
+  -openafs-1.6.0.ebuild, -openafs-1.6.1_pre1.ebuild:
+  Old #435990 by Andrej Filipcic.
 
   25 Sep 2012; Mike Frysinger <vapier@gentoo.org> openafs-1.4.14.1.ebuild,
   openafs-1.6.1.ebuild:
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 985286d62326..3bc346af1412 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,42 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST openafs-1.4.14-doc.tar.bz2 3719301 RMD160 9fd37c8d94b71e963aabdd27cca3534759abcf2f SHA1 ca20ab9434639545df88eeb22a868e61dbc50eab SHA256 9627f1e4492318f5140469576c0e42bb7ef93e89c4e98424ac9f4e0aa0c3c41b
-DIST openafs-1.4.14-patches-2.tar.bz2 12912 RMD160 8bbdc47c00bd231da05af36b7fd1e801a76e0247 SHA1 349f3082d03dc9550cec97b4ae8d1ff449725bc3 SHA256 381755cd88b8171a8c605f3bf4acc5bb1cb37093aa01d9e96ad11f0eb32dd239
-DIST openafs-1.4.14-src.tar.bz2 11813993 RMD160 ecc038d7f9068d420cf1c94f9c01db5ecd1accac SHA1 2b4e7c839bbf8f577fdd4831e7a3b3ebb9c41926 SHA256 64ee97cfad067c24d0e5413d4bc650cfa82152e9a6acfdf9707d1320e09dd594
-DIST openafs-1.4.14.1-doc.tar.bz2 3721857 RMD160 ee4c623df3d3a26bd5067306a28968cdf5804d42 SHA1 d72c1ddc6b28612d48e20b545b98d3570396ed31 SHA256 2d9eb2059de2828dbfa51499559b024b86e00d0e0c02d84340946d48baed028c
-DIST openafs-1.4.14.1-patches-1.tar.bz2 12912 RMD160 8bbdc47c00bd231da05af36b7fd1e801a76e0247 SHA1 349f3082d03dc9550cec97b4ae8d1ff449725bc3 SHA256 381755cd88b8171a8c605f3bf4acc5bb1cb37093aa01d9e96ad11f0eb32dd239
-DIST openafs-1.4.14.1-src.tar.bz2 11812593 RMD160 18998d39871c9cbac20cdf20c2f4dc38f1c50541 SHA1 0778c09fae13ad45f118e7d05237a71bad50a1a8 SHA256 49eda1f6cad3d425426deb72c91a1cffd2273917dc28f82da0a46234bb99af3b
-DIST openafs-1.6.0-doc.tar.bz2 3477311 RMD160 fc733af785b801a5a58433a2b65867bdaf863bed SHA1 26f02b4b0de675601fa5bdb7d5e7e8b5d2dc2028 SHA256 326bcae377c74bfed5b09b5a52c3d18a317e42c30c3d76726c91b253d65b0659
-DIST openafs-1.6.0-patches-1.tar.bz2 9794 RMD160 74a886fce47161e40e567f82a7334e2c35d18893 SHA1 89506aea53f8408ecf07b5c1aa605ec4d70ec34e SHA256 e25faf670e5ca68484b98a07304ce0cc1c86579fadd0edc0ce344ab4e026177b
-DIST openafs-1.6.0-src.tar.bz2 14308072 RMD160 3239c148924273550d3ec3c85ac81d607c9b4286 SHA1 fa9f0c3778426d38a56023e316e39823de953d67 SHA256 e722a3b817655fe9b4e0d6e2c31ab1eb3d74947f51267311c85c43302e0644e6
-DIST openafs-1.6.1-doc.tar.bz2 3481865 RMD160 06aac565802b5e100a280fdce106dede1bac1719 SHA1 081f2588b0ab6e67eb82666550629c2376215421 SHA256 c41006ca12368b028f2108c972bd3de1881b5f78941bc831ff238a0344a3bec6
-DIST openafs-1.6.1-patches-1.tar.bz2 9897 RMD160 9e0868b4843fb62a334485af3bde3a4708df096b SHA1 e9ec50f678350d4f1b704993a664380f3fac62c1 SHA256 d1fa13b60eaa0e755e379c2e0b05fe08eeb2f9a0c247e036139930969bfd4fde
-DIST openafs-1.6.1-src.tar.bz2 14356434 RMD160 027e58101300e29a307b451095e72754f0ae11d5 SHA1 85d25d20c406ee4e6a1cac4580ddfb42676b215d SHA256 d05ef7f8e89b6939726d93bb46d4353e20a459890b9c3ca3065d50de408bf5b0
-DIST openafs-1.6.1_pre1-patches-1.tar.bz2 9897 RMD160 9e0868b4843fb62a334485af3bde3a4708df096b SHA1 e9ec50f678350d4f1b704993a664380f3fac62c1 SHA256 d1fa13b60eaa0e755e379c2e0b05fe08eeb2f9a0c247e036139930969bfd4fde
-DIST openafs-1.6.1pre1-doc.tar.bz2 3479160 RMD160 23096a237f2cf81b623ea62285368539d1fb0a46 SHA1 e443b62bb62271ba1166047216ad06c422c1a3c5 SHA256 671664a9e7bf203eecfa4d7bfc414c73e563302f6057790f5ff6afafdcc891a1
-DIST openafs-1.6.1pre1-src.tar.bz2 14305294 RMD160 fdda5a393f9710fe2eda47db1d0a0e3415dfcc3a SHA1 9ec7c590e45602ce683dfecc6d4ed9740ec6f64e SHA256 ad8da846f25fe0b25d329f608ba88d7ecf1eb070549a3f576169d39e04ca1162
-EBUILD openafs-1.4.14-r1.ebuild 4320 RMD160 2f6f4a721ccecae4395691c9edd1d26569c55c28 SHA1 d9062019d5386aa1a3e6936d805aafc8bf0dc0a8 SHA256 a306a3ad9f2a658d68dd62143452e3e5d0de478c6a3753890da3c950ba38c7b8
-EBUILD openafs-1.4.14.1.ebuild 4321 RMD160 871f4ec64c4df24b91eba1ac68b3aec1a1e271a5 SHA1 e92dadddf197521826fe93588b96fb6d0df8fd93 SHA256 ca78e2275baf92c7d7e4cfa1f57c7071a553d19b24a5b6027a41d45a3f87266a
-EBUILD openafs-1.6.0.ebuild 4439 RMD160 69978d3a831dfc5edcd82faecd7878aa0fadd725 SHA1 0a29ac618bee3e6a2582b95b0f53984551354eb3 SHA256 74c5a573732abc74c2ad69d85c5de69d6ed7e6796efcc90195268dda39b7c769
-EBUILD openafs-1.6.1.ebuild 4439 RMD160 a5598a237f7c72a544c85a62875f4f9832e16387 SHA1 b3775845ba03a54a31c06feac4c7b9442c6184fc SHA256 7a75169f972503dcc9f1aaf67abf84510723ccbcb4acc5aa8e764e0416ddfb23
-EBUILD openafs-1.6.1_pre1.ebuild 4448 RMD160 376753e83a1d414b16e810f302c27d6afdf8511d SHA1 5aa822474320800cca3d2b641dcb0b4b979a1041 SHA256 c9ae10d522b5b429797b9078839dedde384eea0c42398e1e44a1dc51ac7454d3
-MISC ChangeLog 28822 RMD160 bbf3dcc5925ab727af09d533c34d070b25939cdd SHA1 0c037a01b1e48ded4a254416a498eb699da1a462 SHA256 36e49941cd893362722f96bbc42c9c49ef4bb8ffc94716edc8b1b0fc9ee50c3b
-MISC metadata.xml 255 RMD160 44bc10395ea82ae07fe546389b0951ddf6208417 SHA1 637b1935e0823a9c7dd89a5c99da4f75287ac4a1 SHA256 de102ec27cffb1c6a78bd1e8c26372d8c616fc55e9412a8dcc45e30986669909
+DIST openafs-1.4.14.1-doc.tar.bz2 3721857 SHA256 2d9eb2059de2828dbfa51499559b024b86e00d0e0c02d84340946d48baed028c SHA512 e00fc588e01bd4a841333b5ba8ed9b305d3052b4c64af35c2f32067aa8df7d4943088dbfa9f61ef845dd74197233bd1266499d869e195dd7262c21fa69af64e0 WHIRLPOOL 937b8bfc12d869f57d0be6a8609a9b612d724adf1c8c666ed098a3dbd564a07160e4bf32ed0a1220e731320363d3f64e6550163e099fef614a7bcdc3c17bc732
+DIST openafs-1.4.14.1-patches-1.tar.bz2 12912 SHA256 381755cd88b8171a8c605f3bf4acc5bb1cb37093aa01d9e96ad11f0eb32dd239 SHA512 424ae7bc40dcdaeaf89d5c27a7e93f1f62451c3a110c4183fbfb239a037d6ca9e099a879fe104ec42ebfdfa770b1f358b7dc355f7dc2f7cb3dde0571a5184e15 WHIRLPOOL ea1d945a7edd4b5dd2008dc48d7da854fab011b52b2a3297264d4a1af5586241d8a00bb99a445195a14d5f7085faf6890f1687120d990f5ca1f7f433560c7af1
+DIST openafs-1.4.14.1-src.tar.bz2 11812593 SHA256 49eda1f6cad3d425426deb72c91a1cffd2273917dc28f82da0a46234bb99af3b SHA512 93137416903340775f0253224f8da7beac958ef76e418892d24adf190ab9513cf1fc5b93ee34d83a7feb41e17e3cd89cd6d98e2c057eb1313ca2d42cd33d3370 WHIRLPOOL d48b49a991c740fb4f6fca9829fc45051ba9356dfda407b6d31ddd2ba6773a661d6c6a09dbe3a0dd1aed57e0c3951ed991cd6bea3e44bded036ff96521e8da43
+DIST openafs-1.6.1-doc.tar.bz2 3481865 SHA256 c41006ca12368b028f2108c972bd3de1881b5f78941bc831ff238a0344a3bec6 SHA512 42dc24c7c6f202d1604fdfab753a39a14ae7196bf51fdaeb3b06ace74a360aaa5e37eae340e243ea295fecb0ec65192c61315a39461c3fdc7de7097ff9bc2647 WHIRLPOOL 12ca58f37f8230532d18207feff2bbaf82801b3b110e5bb9f3d810305e6838760afee9dfb62b16a03c96fba9bd99d5c83156c5f47bc7adfed62dd3db45be4788
+DIST openafs-1.6.1-patches-1.tar.bz2 9897 SHA256 d1fa13b60eaa0e755e379c2e0b05fe08eeb2f9a0c247e036139930969bfd4fde SHA512 898a9e3533e2708b8c966713becf5c9e7d8773dae3dd63d6e8392355aeafaa45e7626b1f25be7b2a059b49bbdabfe23a2ce44304d22c6e589460b118343b7cb0 WHIRLPOOL f967b9d4f0cf9c1232067a51dd84fa724c3b3ce40d02227fdb05b5d76e478a53f03a7fed619af5c6b3a4d0f842da057b1aeb5fa86767d5e55a0253250d243a44
+DIST openafs-1.6.1-patches-2.tar.bz2 12656 SHA256 d38a720bd7c37c833ddef5daa9fdc11fca36ea0cb080b3a7db7a06aa0106d31d SHA512 ba9f95b9d65e3841a26067f530c6a900303c1ef73ce25bf050c75c62210d480b9e33ae598c5383fd088e0ccf70de30dbc863af4d2704cf2dda04651f33763d2e WHIRLPOOL 23751400d088180daf15c5aefcf8d897c8b8ade85a16d60596203565ab15e44e89b523d1166a8daf30a92c9078a27afecdd0b650e26692ee7df6d88e25ca4965
+DIST openafs-1.6.1-src.tar.bz2 14356434 SHA256 d05ef7f8e89b6939726d93bb46d4353e20a459890b9c3ca3065d50de408bf5b0 SHA512 c0781a8d64fa9a816f043056ffa93531d0a5ee854821503cd07a07d6a2de9123681f9ed6a478101837ce101cd260a5a093664a90a0054caad87ad683911829cc WHIRLPOOL 87803bbc559dd4b0d56d0217b84d46fea1375cb006b74df31b13a55e80ab5023b2c5cc001dc70def608841b56933b1da86bbda6da4e04abd241957d75d644ea4
+EBUILD openafs-1.4.14.1.ebuild 4318 SHA256 bdbc9d28926a061be892a92c8e5c89028d7f268b5194f8ec76d953ada146c365 SHA512 5326d2cdaad9a9b095e2044d0edc4894c88e9c76b56396dd1417694d322102b3de2ce696290581679afabef53e2a679a3478b8652f627e9550a1ce367dc88863 WHIRLPOOL b49753408754704580da37fa4d320a77f6b7fbd9cb7abf49e5f0094216a6af0fa63a82e09d225422ebdb5eec5a82f46be3006a8b72c29f8b0d8a9e48ddd495c0
+EBUILD openafs-1.6.1-r1.ebuild 4445 SHA256 cd9fa5ee2a55d0e157e3abb66e7775f68f789531b3ed34c071c0ef00bb9b514b SHA512 b7ed891fffefd1a690d7696d497b2a18ce7a02a37562a6bfa4823352e5d2951961cff2d4cbf64dca15ad020762f592a09e23ed2b87941b48f887ac6853dfda4c WHIRLPOOL 73cb0925291e8f7359cd9f3db7ac04de9bd8184d486a0615fb968b354ee3f0ac172e7ea14defd248f2feb4f00c8e41eacefea913a6c11cc4f3ca4ea224e1746b
+EBUILD openafs-1.6.1.ebuild 4436 SHA256 2fd32a7c2cd15a2ea55afb0f20e8ad2eba8353d54c1d9539b312da4dc948c5c3 SHA512 78cd410fd84dc135e9cd7d07b571564b823bd4a1b5aa498e6a89c73fb4f6aae43c39400ccb712a33280b9de685527a18339c2a2541067922516b608ad9cadf5b WHIRLPOOL d178135fba0f2aa9effeb638fe03f0d3e89fdf1eb7a6fce732b2eb335aa51e430f30ef14882ae13d85a601466642eb2716f5555337aa95c351357d4f82dc4c87
+MISC ChangeLog 29280 SHA256 e5b85d6f3031da7d6549538853ab81df064a767442c6c8752f8f30240d6c99ee SHA512 6b2e7b177dfe3dfbef30b7e22299fb0ddd583839e1ddc8c14cd357dedfcbaf06ae42e46cd97aa484210afad0900e740c4fce93f1cf1bdc7da66eb8baa3f9ed7c WHIRLPOOL 92a345c29c5d2d05c64da70bcfd8194ab1bc423c557b08ddc9c1869c02c3d08f229c93c3c2d130922a6514c488bea4f8517d96d425896791eb1196e98d4da17a
+MISC metadata.xml 255 SHA256 de102ec27cffb1c6a78bd1e8c26372d8c616fc55e9412a8dcc45e30986669909 SHA512 41336c2e66dd1f0ef990f3166b9ed43e8208b6607f310f7dbd23e12f6a4e645a679cebf6ae9838f5ee7beef1a04de7ffbcd0fbca802cff2f5fff38c18ff020ac WHIRLPOOL e3ecc5b6cfd7bdba276ca2851f0939938802a423b3d8e4c10b6c5d3afbe5a8212023d89035cdc62dad4bcf3171a776ee1afe0bae881ab1bf9c381dc2855330ae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPfOUwAAoJELEHsLL7fEFWAZ0QAMkxS43RE6twYYS07KS0dc0h
-/8Id2gk3BRcalT+ir62TDQu6fPvmJQEjePPTIWDdllgZoubAWF32rDGZRRzAH4cc
-B1BsTDsHs4ewpL2ObunS5LjqR6qr8CRPi2h4PSal7T+/3RmULVe36gcLshAjGTk5
-//H3SeQ9KCHdur1T5oUm9Pnww5xkuy868cusQw5T1VjEZLVeVuqDpqaA2pzqRBA+
-qWPa++CuMEwQiYqKhJkR1ssMJ/1RL9t6nb+1f2zd96jeoSWCYFr/p3tN+9AkVLqO
-GWHUtNgYI5xlKrGzhLoecWskfX1PaIWbzGnhsycqTzwZbPH3h9QjOGtRcKNPLebR
-1eEDYjLWVaw8+Z0WdEozSBXB4cjnxJw72ufdsMUD6C7eA5oOkayrRP8hjsYaYAKo
-y2irHNj2yWnWvHpcHnEPM4Dqpca4zuq3xNHK5oT3jDg0QpGBNAYQJv6LntBw7TYU
-MuvT4f+dYdrbcXpUTMf77m1gNVPxtXX2aowZPtjBAAXp+cL9AEqLtJvnvJCYVeGj
-HB0POS0PTfj+ryoEFmg9oW+d+VSGqox6NaNceOEmoGwAzDXYG0FlQTz6UkumG3KQ
-XGLmnFKG0dPKkIzo63+WfVgJG2rZS78J+bJElVVEq+Sm41sk+OgD3gPWkr0ZBbkF
-NYpfYn27YVFnpI3L9beH
-=2zvb
+iQIcBAEBCAAGBQJQYPhuAAoJELEHsLL7fEFWzcoP/i7pHaI5lffCeU89sG2o4usZ
+y7J7//ck3intfPL6sEjuG4WG6l5QoHnYBM/Dcc1d3Wjy2FcKGFUMYDuvlTHam/uu
+NhFfSDiOnmfuSJJab9XqMCZHgmYY9UaCB3xKn5yDswzFR8L9oEqzFzHRWx4QtXcE
+MbX8ni4OR2cyoLUQcBkvK+B+uBUAxGfb0l3adGJU8B6ODeqRn5VPa5GkLrBFfdct
+cl9DHl9WVSvL/EoNv4VU19RdwTrFOHxnIdeB7vTH7SmiVbgG2T1BENFPcBZRFdvG
+AZ8YJMbPdVTKKyYTv8s5UkBXdRPHCfYuRgPjVJiFvz87LJsYAGTLoVwFCqxPO5wB
+zx5zy4fYQLTFSfLEm9CmwyeCO0Qs904T/Wn346umux7imMAySk7z9AxtInM0pivV
+7uYLdnckL7RVr5dWUMjLCDMwm/bF2p1rWLe/IODxx1bzz1KwCFbZFm9W+6SntLAk
+Yny+FiH8cTPj8NXv9TLyUVPj+85f9SeHmosfOIMrmxdqZ8NtP7fYAovcP7ymk6Ql
+z6CcHVRj8prEJ4TqM0P9LV+7s6pYnq//Dut5lK4bZQ9103ZBDA6f5WbxFWjlZxWB
+LsqyCHDk+Yjzy4XefCZT6YrBwSj9/BuJmbi0p6NRgpkxMr9qjSSUAo86ctD0KqCo
+p4TpAhQK/clsuw4W9PVR
+=KA23
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs/openafs-1.4.14-r1.ebuild b/net-fs/openafs/openafs-1.4.14-r1.ebuild
deleted file mode 100644
index 3b6d5eb866ca..000000000000
--- a/net-fs/openafs/openafs-1.4.14-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.14-r1.ebuild,v 1.2 2011/09/18 21:30:29 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
-
-MY_PV=$(get_version_component_range 1-3)
-PVER="2"
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/${MY_PV}/${P}-src.tar.bz2
-	http://openafs.org/dl/${MY_PV}/${P}-doc.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE="doc kerberos pam"
-
-RDEPEND="~net-fs/openafs-kernel-${PV}
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-src_prepare() {
-	EPATCH_EXCLUDE="012_all_kbuild.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-
-	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
-	sed -i '/^a/s:^:e:' regen.sh
-	skipman=1
-	. regen.sh
-}
-
-src_configure() {
-	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
-	local myconf=""
-	if use kerberos; then
-		myconf="--with-krb5-conf=$(type -p krb5-config)"
-	fi
-
-	AFS_SYSKVERS=26 \
-	XCFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable pam) \
-		--enable-largefile-fileserver \
-		--enable-supergroups \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 all_nolibafs || die
-}
-
-src_install() {
-	local CONFDIR=${WORKDIR}/gentoo/configs
-	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
-
-	emake -j1 DESTDIR="${D}" install_nolibafs || die
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB || die
-	echo "/afs:/var/cache/openafs:200000" > "${D}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${D}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${D}"/usr/$(get_libdir)/pam_afs* || die
-	fi
-	rm -f "${D}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${D}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${D}"/usr/bin/kpasswd{,_afs} || die
-	mv "${D}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${D}"/usr/include/{lwp,lock,timer}.h "${D}"/usr/include/afs/ || die
-	mv "${D}"/usr/$(get_libdir)/liblwp* "${D}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${D}"/usr/include/*.h \
-		"${D}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${CONFDIR}"/README src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc doc/{arch,examples,pdf,protocol,txt}/*
-		dohtml -A xml -r doc/{html,xml}/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
-	newconfd "${CONFDIR}"/openafs-client openafs-client || die
-	newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
-	newconfd "${CONFDIR}"/openafs-server openafs-server || die
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/openafs
-
-	# used directories: server
-	keepdir /etc/openafs/server
-	diropts -m0700
-	keepdir /var/lib/openafs
-	keepdir /var/lib/openafs/db
-	diropts -m0755
-	keepdir /var/lib/openafs/logs
-
-	# link logfiles to /var/log
-	dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
-	## Somewhat intelligently install default configuration files
-	## (when they are not present)
-	local x
-	for x in cacheinfo CellServDB ThisCell ; do
-		if [ -e "${ROOT}"/etc/openafs/${x} ] ; then
-			cp "${ROOT}"/etc/openafs/${x} "${D}"/etc/openafs/
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This installation should work out of the box (at least the"
-	elog "client part doing global afs-cell browsing, unless you had"
-	elog "a previous and different configuration).  If you want to"
-	elog "set up your own cell or modify the standard config,"
-	elog "please have a look at the Gentoo OpenAFS documentation"
-	elog "(warning: it is not yet up to date wrt the new file locations)"
-	elog
-	elog "The documentation can be found at:"
-	elog "  http://www.gentoo.org/doc/en/openafs.xml"
-}
diff --git a/net-fs/openafs/openafs-1.6.0.ebuild b/net-fs/openafs/openafs-1.6.0.ebuild
deleted file mode 100644
index 7730268370a2..000000000000
--- a/net-fs/openafs/openafs-1.6.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.0.ebuild,v 1.1 2011/09/18 21:35:28 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc kerberos pam"
-
-RDEPEND="~net-fs/openafs-kernel-${PV}
-	sys-libs/ncurses
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	EPATCH_EXCLUDE="012_all_kbuild.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-
-	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
-	sed -i 's/^\(\s*\)a/\1ea/' regen.sh
-	: # this line makes repoman ok with not calling eautoconf etc. directly
-	skipman=1
-	. regen.sh
-}
-
-src_configure() {
-	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
-	local myconf=""
-	if use kerberos; then
-		myconf="--with-krb5-conf=$(type -p krb5-config)"
-	fi
-
-	AFS_SYSKVERS=26 \
-	XCFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable pam) \
-		--enable-supergroups \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		${myconf}
-}
-
-src_compile() {
-	emake all_nolibafs || die
-}
-
-src_install() {
-	local CONFDIR=${WORKDIR}/gentoo/configs
-	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
-
-	emake DESTDIR="${D}" install_nolibafs || die
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB || die
-	echo "/afs:/var/cache/openafs:200000" > "${D}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${D}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${D}"/usr/$(get_libdir)/pam_afs* || die
-	fi
-	rm -f "${D}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${D}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${D}"/usr/bin/kpasswd{,_afs} || die
-	mv "${D}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${D}"/usr/include/{lwp,lock,timer}.h "${D}"/usr/include/afs/ || die
-	mv "${D}"/usr/$(get_libdir)/liblwp* "${D}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${D}"/usr/include/*.h \
-		"${D}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${CONFDIR}"/README src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc doc/{arch,examples,pdf,protocol,txt}/*
-		dohtml -A xml -r doc/{html,xml}/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
-	newconfd "${CONFDIR}"/openafs-client openafs-client || die
-	newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
-	newconfd "${CONFDIR}"/openafs-server openafs-server || die
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/openafs
-
-	# used directories: server
-	keepdir /etc/openafs/server
-	diropts -m0700
-	keepdir /var/lib/openafs
-	keepdir /var/lib/openafs/db
-	diropts -m0755
-	keepdir /var/lib/openafs/logs
-
-	# link logfiles to /var/log
-	dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
-	## Somewhat intelligently install default configuration files
-	## (when they are not present)
-	local x
-	for x in cacheinfo CellServDB ThisCell ; do
-		if [ -e "${ROOT}"/etc/openafs/${x} ] ; then
-			cp "${ROOT}"/etc/openafs/${x} "${D}"/etc/openafs/
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This installation should work out of the box (at least the"
-	elog "client part doing global afs-cell browsing, unless you had"
-	elog "a previous and different configuration).  If you want to"
-	elog "set up your own cell or modify the standard config,"
-	elog "please have a look at the Gentoo OpenAFS documentation"
-	elog "(warning: it is not yet up to date wrt the new file locations)"
-	elog
-	elog "The documentation can be found at:"
-	elog "  http://www.gentoo.org/doc/en/openafs.xml"
-}
diff --git a/net-fs/openafs/openafs-1.6.1_pre1.ebuild b/net-fs/openafs/openafs-1.6.1_pre1.ebuild
deleted file mode 100644
index f867d304a7f3..000000000000
--- a/net-fs/openafs/openafs-1.6.1_pre1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.1_pre1.ebuild,v 1.1 2012/01/07 21:44:17 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-src.tar.bz2
-	http://openafs.org/dl/candidate/${MY_PV}/${MY_P}-doc.tar.bz2
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc kerberos pam"
-
-RDEPEND="~net-fs/openafs-kernel-${PV}
-	sys-libs/ncurses
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	EPATCH_EXCLUDE="012_all_kbuild.patch" \
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/gentoo/patches
-
-	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
-	sed -i 's/^\(\s*\)a/\1ea/' regen.sh
-	: # this line makes repoman ok with not calling eautoconf etc. directly
-	skipman=1
-	. regen.sh
-}
-
-src_configure() {
-	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
-	local myconf=""
-	if use kerberos; then
-		myconf="--with-krb5-conf=$(type -p krb5-config)"
-	fi
-
-	AFS_SYSKVERS=26 \
-	XCFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable pam) \
-		--enable-supergroups \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		${myconf}
-}
-
-src_compile() {
-	emake all_nolibafs || die
-}
-
-src_install() {
-	local CONFDIR=${WORKDIR}/gentoo/configs
-	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
-
-	emake DESTDIR="${D}" install_nolibafs || die
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB || die
-	echo "/afs:/var/cache/openafs:200000" > "${D}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${D}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${D}"/usr/$(get_libdir)/pam_afs* || die
-	fi
-	rm -f "${D}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${D}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${D}"/usr/bin/kpasswd{,_afs} || die
-	mv "${D}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${D}"/usr/include/{lwp,lock,timer}.h "${D}"/usr/include/afs/ || die
-	mv "${D}"/usr/$(get_libdir)/liblwp* "${D}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${D}"/usr/include/*.h \
-		"${D}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	dodoc "${CONFDIR}"/README src/afsd/CellServDB
-
-	# documentation package
-	if use doc ; then
-		dodoc doc/{arch,examples,pdf,protocol,txt}/*
-		dohtml -A xml -r doc/{html,xml}/*
-	fi
-
-	# Gentoo related scripts
-	newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
-	newconfd "${CONFDIR}"/openafs-client openafs-client || die
-	newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
-	newconfd "${CONFDIR}"/openafs-server openafs-server || die
-
-	# used directories: client
-	keepdir /etc/openafs
-	keepdir /var/cache/openafs
-
-	# used directories: server
-	keepdir /etc/openafs/server
-	diropts -m0700
-	keepdir /var/lib/openafs
-	keepdir /var/lib/openafs/db
-	diropts -m0755
-	keepdir /var/lib/openafs/logs
-
-	# link logfiles to /var/log
-	dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
-	## Somewhat intelligently install default configuration files
-	## (when they are not present)
-	local x
-	for x in cacheinfo CellServDB ThisCell ; do
-		if [ -e "${ROOT}"/etc/openafs/${x} ] ; then
-			cp "${ROOT}"/etc/openafs/${x} "${D}"/etc/openafs/
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This installation should work out of the box (at least the"
-	elog "client part doing global afs-cell browsing, unless you had"
-	elog "a previous and different configuration).  If you want to"
-	elog "set up your own cell or modify the standard config,"
-	elog "please have a look at the Gentoo OpenAFS documentation"
-	elog "(warning: it is not yet up to date wrt the new file locations)"
-	elog
-	elog "The documentation can be found at:"
-	elog "  http://www.gentoo.org/doc/en/openafs.xml"
-}