Version bumps #460646 by Andrej Filipcic.

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 478 insertions, 17 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 34210cb3e1ed..610314ee3143 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/openafs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.188 2013/03/17 15:55:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.189 2013/03/24 04:24:06 vapier Exp $
+
+*openafs-1.6.1-r3 (24 Mar 2013)
+*openafs-1.4.14.1-r1 (24 Mar 2013)
+*openafs-1.6.2 (24 Mar 2013)
+
+  24 Mar 2013; Mike Frysinger <vapier@gentoo.org> +openafs-1.4.14.1-r1.ebuild,
+  +openafs-1.6.1-r3.ebuild, +openafs-1.6.2.ebuild:
+  Version bumps #460646 by Andrej Filipcic.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index a0f76f460eeb..1d71fbfcad8a 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -3,36 +3,42 @@ Hash: SHA256
 
 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-patches-2.tar.bz2 14074 SHA256 8fc914a22729a1fa61a979e1cdae45ec12fdf3d28f8ee6abf471faf08a61739c SHA512 54f5443634f15f28c2e8ae7a4e1a00fd2ff505c6b6eef743de4f6fb4919e66f7d95fc052d5214d5dd6d4cc7d7512fe3c9f0ec62a1874a84a2e5361a6a2bc53c5 WHIRLPOOL 6d751c9e14e49a20e70161dd38998dbe5f7bd9b358cbe0fb9a03676d61579a8f3b9d85923bcba57bae0507d0d0ccf6de8b24ed020b469907f14f58a5751b8d0b
 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-3.tar.bz2 18030 SHA256 76920804618bf09bba2d847ed280c3efb1de52a31f417bc0f8a50b2ca8a9aa30 SHA512 751192ebb3bdea43d67d584a250e4dd7ef9414e7fd43f596bd6f0bf5094654d53716621170c7f5b0892423d2c98693c40a056bff4b35118866000a50e9ba94f5 WHIRLPOOL ab44bd977a8b49bc01b6433d6d468e918fbe73accaf92351daf341dac0ea8d0e3f6b63b4480aae67d833f251e5ec91820e5d9280d0c98c985052d10e33d1fd3c
+DIST openafs-1.6.1-patches-4.tar.bz2 12085 SHA256 4acb7853e8f7c590c14e725ee1baac4d42ec89465d44c4ef349a347e8504b92d SHA512 b031ad18544fa8ae305769f5c3980dfbf28b72756f6aca0348261cfb3d3ea4966568a6385389f7f92e2ac9b91f94a31889a11f7cc3d6b3d32a70a5a56d4b9a3d WHIRLPOOL f5011b55def2d1de8d29a1e757bc331ec649a1833a688e84bec55b2ba97681ec6d46230f1351523be5d9543ab2a2feb72349d4931a3faf97bd535ecaaa7b8d99
 DIST openafs-1.6.1-src.tar.bz2 14356434 SHA256 d05ef7f8e89b6939726d93bb46d4353e20a459890b9c3ca3065d50de408bf5b0 SHA512 c0781a8d64fa9a816f043056ffa93531d0a5ee854821503cd07a07d6a2de9123681f9ed6a478101837ce101cd260a5a093664a90a0054caad87ad683911829cc WHIRLPOOL 87803bbc559dd4b0d56d0217b84d46fea1375cb006b74df31b13a55e80ab5023b2c5cc001dc70def608841b56933b1da86bbda6da4e04abd241957d75d644ea4
+DIST openafs-1.6.2-doc.tar.bz2 3483994 SHA256 3b1fecde4cea104d62fde9d4ac78bc4f28c64bc2c4f527bfefd27789facaae1e SHA512 0fcee6fbc46f4df53f8abd875346e9a52bb07d539096b666a06c99b9194800eb44ef2358a8637c94154545fb2f7719ecf8a410c6fb6020b97bbb8d231b31a7a4 WHIRLPOOL d30a1b371ddaa88531d6f5ceccff9f80b23b9ddf4538be794772eb5b7e91044757fcb0ccbd1a7f4b05d60b37bde351319d676901eb5198f04fb12b37b4f575ba
+DIST openafs-1.6.2-patches-1.tar.bz2 10880 SHA256 bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512 f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56 WHIRLPOOL 93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
+DIST openafs-1.6.2-src.tar.bz2 14378378 SHA256 0db0877cd42131a744472ad0abfa26a4402a5bad94adb4d1eada75c8b6895bc9 SHA512 769b82d4ba8fe391f7dacc1f422d0bca564450ee3e05da34296aa461fecab825956e2bea4849af65af8592ffe50853e725ee0a700c1afaea67652adf8a93c01c WHIRLPOOL 61947ee3f0e3d7107f3611add14bd90ca1f5744986f75a92a28f6ccda8936f16441ec819640eebbd0cfaffaaa716c3077980b28512a84e9be770a4320a19997a
 DIST openafs-1.6.2_pre3-patches-1.tar.bz2 10880 SHA256 bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512 f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56 WHIRLPOOL 93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
 DIST openafs-1.6.2pre3-doc.tar.bz2 3486762 SHA256 5255fe1dabbb18ce213cfee8e1f182b72d21ed8acb2f21051883271f38cbdef6 SHA512 a44fdf1539b8d7aed6d6f275ad5b13bbc1c754374929a3f69f8279f62464a328feeeded43b729291d59ef9cfb799d027bb25c3d456c3ce9a87253f381db37aac WHIRLPOOL 7a9974f879d68aa01ae6b1821fed05e7deec9b624c9cb078c547e6b510f32071fabfc2486c405b554a92a8a21d432acafd6fb7894e77ddf4cedfe9e290a4fbf9
 DIST openafs-1.6.2pre3-src.tar.bz2 14555926 SHA256 f9f7fe6924a40597be0199fd5d67636fd8cb6110df7e5d5510e46c509ce5603b SHA512 25b3ef26753caf8e492c2b10b574a1c8d8f7ace4ac049ea2ebef7188ce36d16a18e2d9d82246643974ba860e1b6e937cf0dc86f199636c3a885d8e097ab1086c WHIRLPOOL 470783823605b5c7092e752d2ad2b0d999ef06713e4abe487c5a1566562b6e568a8c4c5496a4932d7699c53c88303e6169fe2f48828a9bb3309df4c22869bc10
+EBUILD openafs-1.4.14.1-r1.ebuild 4316 SHA256 18c9587a585b586c69cf6ec4a915af07627abf5953005615e09147b8da519d9a SHA512 5116f4ac531f82645d47db30a763f7d522b901f5ed41f8cc600aeaae95d5f542e918a5d9c431d9ecbfd74da0c5f2bf0708d1f857307fc8b1c8fa8213f1d37458 WHIRLPOOL 0fc26bfe3f23055cfbb73ad75c82637b66685d33f59cdaeba51d6fb8c0cbeaf4b4b2d6bc3019e5128d433e452eb9c16fc62a5dfe0165dceb23a93915100549cc
 EBUILD openafs-1.4.14.1.ebuild 4307 SHA256 95e559085db764d8a4150b9f292698b351730a2a70d56899c3c92676de9ca9e8 SHA512 7067519f64a730e3023157c52acd115744933e8abcbe171964e3035880d151e48467e214e13eb2f47e16f5cdcd6d12d75c96d8fafb0eb73d87d07f0083c3cdec WHIRLPOOL 438f69db3d315f68200e132795dbee3b0e98ed4221f0496d33a89516a841366aa2dc09f2e3d2d7ae109d8174edb78c308939ba3bb57c6d2c2e09d8b7b40457f9
 EBUILD openafs-1.6.1-r2.ebuild 4412 SHA256 22c45f0b6e0992a2f0dfbf21417e304a87f33d2a5a7a2234ede048ba5a0ad78d SHA512 1a54579aecc1a0793e64f52cfea933ff3ce1441cc145cf1aaa2be5d798f7af091d96272587dbbda1ad731cb596e7e590e1efba45f9d121c000066c33d36ea176 WHIRLPOOL 5b8249253eaeeb940518bd23f7198401d08796ee8c13e6f9127bfb43d5a73a053b5a1519fa380ac5f004681f5b06751e114201cbe94c187c46da707654b6abe0
+EBUILD openafs-1.6.1-r3.ebuild 4438 SHA256 509de9c2e8917a1288299a0a428f17479d72d241f49aec03da07e68cde67e45e SHA512 b84796c683fae3cd4ef069f4f3be94c5f31f906f34d204f1ea9d28674e625ce41bd6d697f53699e065ef340f720a30d8c4c40d5aa21d47ff9811aaf5109a6610 WHIRLPOOL 9674255a2dbd9c18920fa8d43cbfdccd640cacc6d342cdb68bba0caf79888f24bf4f802211f75b38d18900a23b7e854510715514907267c9df763292dab12857
 EBUILD openafs-1.6.1.ebuild 4425 SHA256 981f7cd767e0ebdcf968536a58563d5582ea5261ebf6dfec17dd5bba2aaff2fc SHA512 06a1280d5da5c7219df4413839be4616d4dfe29d7f798aee5eb37b0b81f94710f08e3cdb22989ef7d8a851f8bb0e0749134360b49782b8dc69aab14bbfe376a1 WHIRLPOOL d39fc44de8487ed0e061559c6648151cbc7164f4f692e15aca0d32fc831fb3f9a064adebd47e83be0a8d2e23b6b51593a6d9509d7351a3f94ce8260c3fe4de1f
+EBUILD openafs-1.6.2.ebuild 4435 SHA256 338cf43ba7b6dae26ed4667b1a736aa390e46085d189ec3a26753056aa6dcef1 SHA512 d9ae14fb4f7072473c713ad4d16c2ea68c275d3374fc3881868cbfea1ea8b42da340ceaf072cf23279fbc55b99f8e6464023fc0acbb6ffa55c1ff6eb1a418fad WHIRLPOOL d543fb3fffbd00d6f02f3c32f36afac7ec90dd5dbf94378013653984d8da33d752bb26b9732d6e47ec07a7e906cc6ba5b672909d700af98b527c594df7668efb
 EBUILD openafs-1.6.2_pre3.ebuild 4421 SHA256 ddac2dce7f8a474cc9057a79729aba10eaa0a8f44037e7eb9b9e843f0fb0783c SHA512 d9563d625395be2e56a2e97fec2d5397f5380419569ceaa3d50ad5af40799d35339263645061f03858aa1973ecb7a31b1e4127a4f157ac1b009d223902887c99 WHIRLPOOL 7ad22028d35e64012c739399d33de9ae887db610fb32d783cf938bbbc6f11a457ce26ba623515936581cc57098a0982964f0b5ffef3b23af8abbfcf81089737b
-MISC ChangeLog 30207 SHA256 bd6dde51809486517ace3409ff9572752aef4211e5de8c041f06de078f89bdca SHA512 de0cc3a90403125b8ee9e08e2f110afb9b330a7a822fdc1b698d776cd846f74835512560039f4a122f50d9b8681e7e03b577d693cb6890ff6d7ab850c1e3fee2 WHIRLPOOL f4369f2e4161077a19a7dc73f3e10d1269e7d03a3ef805f1f724283682427df4907c06e0221973b86469872598670e5d2573ebc8fb28f0ee2a60b7ade78c6105
+MISC ChangeLog 30477 SHA256 520b4b0e61395f26bbf3f8285c409739767ec1035184888d198d0f28fd8b5247 SHA512 541eaf420f5cf9f8bfc2200c187b4f4a658e278750509f96efde9b50bffb0e40915224480a916a36515c8f184e435191c623fc6212e6123832c7aff4cc3672c1 WHIRLPOOL 656e901b64bf957226e14d4a9f4d4c26a16b9e8b66416743d0bbae2863a4fd7be93f55ed98498482da04bbf51a8cfee82365b6416f549cb393e46c7120315b93
 MISC metadata.xml 286 SHA256 b3e704b0f9a832001902f16472eafe5d2aa59afbf04b1eb6cf87f927316d87d3 SHA512 203f23847bccc6104cd62343070b5ead629a5033bf88b5468420628189d260f435606f7185c555a9849cee50ca855c370dfcb19426c6bc11b5c2da1b331e693e WHIRLPOOL 3fe5d977e05abd548bc36fa5f9be966e4cc5813f37c7052a57ba921b2540b61fd15d664c385e710ad857615a5643e599fb66fa623a29cb67420ab38a2e1d8730
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRReeKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88QWcQANR7UUW5UcM+faZ4M2VE+WEj
-1euk+4x4564bFD8W8VQRIlmP+IhrXWuXKQ1CA7giGjUeqZM3RIuFbe2uRZa3yltI
-oUZ9hKF21xZQPVHZUHnrgORJzAGdkfmOo+992PSBHO10fZrBHe5utRaHQd/luYC8
-ELBEk0TDIDZMJ38GeGqbvmCVSKle2e4MH8wh5YRNMS7LbeuvrL6Nsxk4NLkEUylu
-gRN4ueqVr48rIfF2EQAfaDyWaqRpVW3wk0W3pxk5jtBuPHwc9oYAqSdm+I1KvIGb
-A9xFWViory9D9j06ZrC1kKS35804G+T55qiH+Lmhtp3GjsfXpYz4XYBrfb1PVL7p
-YubHxjY8ialuGgGE8sU3UA4zUc1w9pzlTAvGSVYHCVFs7w0mY9voCmBykf1tZIWI
-bFGTBorsdXIqJGH3MOsmsaKLdZKcKzldLBR9iB4bZAdRJTa0Shi3cQSyC+6uRj5r
-ABuFzlr6umeSEYcar3Vv7xDHpQpCwv3mDkIIkqKnDEuyQUKgXeeDeNwj1GlM3al0
-GYoNwqzDxQtxYaWlBu0lS7UYBBHCbOG9HJS/QBaPXVii3yvQbzG1D1d+VZcc3Lfh
-tGa6XRfGRIH8J4fjxGyDTgjWEJ3ZeXeZXLOeRdk4eCKwjTz7V78N1aTcx8WkwMxc
-Tp8uop6KU/QtFbjRnezK
-=9MTU
+iQIcBAEBCAAGBQJRToDkAAoJELEHsLL7fEFWhrgQAMTv1XtuiO+FnGnDJDgyrLZH
+I1ta2yHL/j66RRBT7kG1JT20swJ2IZNWMbw50vgJHy41bQ+aE2OEH+C5baDbZVSY
+zi30EzRm7gvHzT9OU7nN5ydg9bJmHKjpphYNMmUdn5ey6QbmMChbxmFC703dfy0W
+gGEiD4L1M8i7ftRQPdEM6lf+GsEeryKoSs2/Y/qA7WO7YA/Hg9LdHXuer+g8Go4m
+a15WE51b8KWk2h65Fk+2cGq7WACln5+XnFsoTrm9osHIEPJVE4qshBSOqCbiFeMx
+nJWd5sbe9/LnXsGtSn17CYGF6liI1b6pF6RdOG1jKK3AezQGoEgR+hpGeNIjZSPS
+0rBjFHVWngoMz5sF6pCWul2Ouf6SF6Np6ZZTbmipuev0frr91346pBgXfnYUhThE
+573FV4B3XenDY2KNNEqLcOyD35verc9Lb5QNTB6G4I9IiDfhI8ReleReCIkJ7wcO
+ZSBRoBNBQAgByccj2KDmy7MsgWRyqq7Is8sFBL65srAPWbDBfzxSICH5qNx2qlKF
+z0eKEkGVaag2Uvl7cVmdUvlPZmbIiQZGwX2dxjgnze68xOtdmI5HjIrlL+bx/P3J
+Sx9rXgZMramfnUTGGur8d/4V7bM46ELUDfydVbW1fJtVTkLEdGO10KHZHcjxKu15
+LR9bXOcA7ve5eu8JT/GW
+=2uAp
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs/openafs-1.4.14.1-r1.ebuild b/net-fs/openafs/openafs-1.4.14.1-r1.ebuild
new file mode 100644
index 000000000000..5a241241d7ce
--- /dev/null
+++ b/net-fs/openafs/openafs-1.4.14.1-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2013 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.1-r1.ebuild,v 1.1 2013/03/24 04:24:06 vapier Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
+
+MY_PV=$(get_version_component_range 1-4)
+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"
+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.1-r3.ebuild b/net-fs/openafs/openafs-1.6.1-r3.ebuild
new file mode 100644
index 000000000000..40dd21df7b22
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.1-r3.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/03/24 04:24:06 vapier Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils autotools multilib toolchain-funcs versionator pam
+
+MY_PV=$(delete_version_separator '_')
+MY_P="${PN}-${MY_PV}"
+PVER="4"
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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_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
+}
+
+src_install() {
+	local CONFDIR=${WORKDIR}/gentoo/configs
+	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam ; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump*
+
+	# avoid collision with mit_krb5's version of kpasswd
+	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/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
+		find doc/{arch,examples,pdf,protocol,txt}/ -type f -exec dodoc {} +
+		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 "${EROOT}"/etc/openafs/${x} ] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/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.2.ebuild b/net-fs/openafs/openafs-1.6.2.ebuild
new file mode 100644
index 000000000000..d7b0a00fdcc4
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.2.ebuild,v 1.1 2013/03/24 04:24:06 vapier Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils autotools multilib 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"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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_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
+}
+
+src_install() {
+	local CONFDIR=${WORKDIR}/gentoo/configs
+	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam ; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump*
+
+	# avoid collision with mit_krb5's version of kpasswd
+	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/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
+		find doc/{arch,examples,pdf,protocol,txt}/ -type f -exec dodoc {} +
+		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 "${EROOT}"/etc/openafs/${x} ] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/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"
+}