version bump, drop vulnerable

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

9 files changed, 57 insertions, 769 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 8fe6206268de..153f6dbea564 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/glusterfs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.61 2014/10/08 09:10:21 ultrabug Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.62 2015/03/23 12:12:44 ultrabug Exp $
+
+*glusterfs-3.5.3 (23 Mar 2015)
+
+  23 Mar 2015; Ultrabug <ultrabug@gentoo.org> -glusterfs-3.3.0.ebuild,
+  -glusterfs-3.4.2-r1.ebuild, -glusterfs-3.4.4.ebuild,
+  -glusterfs-3.4.4-r2.ebuild, -glusterfs-3.5.1.ebuild, -glusterfs-3.5.2.ebuild,
+  +glusterfs-3.5.3.ebuild, +files/glusterd-r2.initd:
+  version bump, drop old and vulnerable wrt #541540, fix #536606 thx to Jaco
+  Kroon, fix #529676 thx to Christian Affolter
 
 *glusterfs-3.5.2 (08 Oct 2014)
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index c2717f84ff4a..33c4ad1f6437 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX 50glusterfs-mode-gentoo.el 169 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 WHIRLPOOL fb4abfc0c07ddc8805430446bd901b95a9951f53711da647e87ea8c26bece8ed9c7bb17b33cfa9b114ba2a64a055f275202d520cf37ee0c178d005d07ff80173
 AUX glusterd-3.2.0-workdir.patch 1651 SHA256 019fd1418041b98bcb5d841d19ef90a7d63483b801843876d7c5fdf54189cc80 SHA512 052496bda60b70ae8b3bd7d44cbeae093b9de80f56d8373dce4ff18fc50250a17cfeb38a00a111c5d17fed64962f48bc6d12100c0cfe0fbb83ec594a3d98b7bb WHIRLPOOL 7dafc97a1c4b17a9c4e3626f0b67e963f01adca295074e4cf80e85cf0ec096bd78a65eebb140925e092c2c5af29e4cac7e31faa5b16cfa4945f0321d95eeb6d9
 AUX glusterd-r1.initd 451 SHA256 de39e1118fa1bfcc517f711e819ec78e67c58270383372a17886ca7362a7064b SHA512 90ba1109d393df99d7cc3092862684fd9d9a84b8ff8d7c7b5c7bfdabacee6ee209aa13e7c8d6b9497967aa5b5c30e984adf231b394dfbebb5d4d1f15b9f70f28 WHIRLPOOL 630596cba4af48fcdfb94bedf7f6a609dce85ac8dda835b699fd2ad0c3af64bd0b014c6fb97fe9d6faff8fc9a9652a2636e85372384027ac013abedeb71287c1
+AUX glusterd-r2.initd 870 SHA256 fc01eeca03af6dae5ccfe1cc19ecd149234b8923d13ce90dcc5d9bbe67a96fb4 SHA512 4b9d34fd4ef81485452479d08630cbe3f8d1b05086a2a9e78021d43491c6d758e129b3b756c3df5df8f752df8093127d065eb0eef21e6eb84cd2ea5ee9ce02a1 WHIRLPOOL 2b9a6e0bc92bd4cb3ab865f00a05c855ce3783ffdb0175f2488b9f7fcc496b3288df4003d412f88920466284a0c0971cf8c7f7b6a4ac14a6f5b2a941e6840477
 AUX glusterd-workdir.patch 1528 SHA256 b614c90279fd0546d353f017616dff798e73a20c45fa846d57a35bf4569389df SHA512 767ff40ba6ac41568925eb1eae3d6af384b0e5ac3a1c45bc3e4a1819ab195af66053aae5cd4719d2ec75a768094853a1dd1fb42dee3013b680bef2c8088fde58 WHIRLPOOL 15bbe5044bf2c963b3c68a6d68ea7f85a68a893aa426ebe46eff04668367e9df4b326cec632728a3fdf2a5ae8a83ed5ad92d9991947d4efd38a7b7652445a64f
 AUX glusterd.initd 833 SHA256 cd6d277236a9bc22cb3872269d1454c2c5a140cea6a9badb3b6ba2d88ae52232 SHA512 d1eb3fe843a66850143e6cf66f1e66f33f6124d18e7a342f85a4bb6b3ff0c9a88d449aec00b3f1ec8305487b47686ff7cc323ecfc98f6a4340dd0d63c3b81dee WHIRLPOOL 1b89343f2993b719ccdacdab7233606c6dfee0823a7221658c4712248e421d87a3079334f546ff53cc736008a5c8dbe7c02680c5aee0adc711c26d444caa03e1
 AUX glusterfs-3.1.0-parallel-build.patch 659 SHA256 7aeb616d41bf898d1df2cf4773802e88e41e13271184eab03c46034a9c22027c SHA512 9bfa0572beda5d132a47d9a52c2f6c3149abec36054a5d20203acf01e624721a7e9f9dd603b43a724f0eb5e01ecf45696de8b5a3b6204ff9871cefaae85c5bf8 WHIRLPOOL 8d7037a6ec21d4e099d696628428747182a1c416bc6a158dd7c55633a009cbaa81aed919a3108ba35f30d1593b4027bfcd2662ee457b43c28122ade91a1688cc
@@ -26,27 +27,18 @@ AUX glusterfs.logrotate 611 SHA256 ec29f5830f6108fca793d6ac90bb49e644a991a073a73
 AUX glusterfs.vim 139 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7 WHIRLPOOL 3006d9fea924fe274ac00dc5d711cfe642f347808889c3d5dbde764f0f0cd2ab27509fa75d37b95ccd98c33bc1db8d082e5d16a26e0f888b7189f9738b6ff963
 DIST glusterfs-3.1.2.tar.gz 2086469 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838 SHA512 69b61af7c6cd9f54f615f7cd50c6ffda670800c6045604449b130eaa43c90c9adcb518c1312134890cccf3a301066a5af3e97bd7ec9775b7f70ea6d0a4a67cd6 WHIRLPOOL 0ecc86ac943f4c8d9575b8b0ae2ef72002d6510945e1a687409277165eb7688c2e4db50532ae10777828646b782561dfd4314fa766d7a3bcf4762e8be7c34c79
 DIST glusterfs-3.2.7.tar.gz 2424292 SHA256 464c089ff9da5a8e17f7caeae48f1cad59973489dfe940a9f0d8db8bc14cd6c4 SHA512 c4a286e1ddfec6c92d011b5abe4f96321e39dff57294141fc44cda4578fa11582095362733092af9042b38528cb328208e9e46a33c40c70e672ffb4e38dcc013 WHIRLPOOL 843a615b334e1ee84c3bcef1a8aceb113eb6976656ae09c6cbf4dcb201f4d37d9cc8ef3ccd3cc4aeb879bffde556b9f6f7105c3c39afed94a19b9613cd8c4284
-DIST glusterfs-3.3.0.tar.gz 2599586 SHA256 76d80ded9ecc5146131e9d59b03cbe09a18338ff0b32922b12fd453da6104f17 SHA512 d450c91e6326a89c39e5c7a17b0e7493318a642fbccf8c729a841adcc422388a300b8fd852f9f978098dc87d956a697b681be5287502b5dc0ab29c71e6b8b9c7 WHIRLPOOL 4836a6aa17de011d2fa94121934972e6d15e434f392f713edc2b9b1e7ef8648a31f209c9dc85fc7a5e0ae0f1e902797ae49726304390b7d14596103958ea58d9
 DIST glusterfs-3.3.1.tar.gz 2636698 SHA256 19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519 SHA512 c32e95a0e4568a62fabcf0c52ad3d6a173b62c5536006c3680e3efd1240e2a68177e14891e11d1d16eff5eb67bf60108dbd44151c26241203d8ddb58f0270c69 WHIRLPOOL 30316bbdb7087dd32d35f0f017ea461711830f5450984edb6d6c527d7f9cae5ee307601887cf489a2d675180d1f21a77ac7901f37f44cc860cccbe510c5a18bf
-DIST glusterfs-3.4.2.tar.gz 3856046 SHA256 4fcd42b13b60a67587de98e60ff679803433bbb0c11aa2b40c4135e2358cedef SHA512 5d207e2d9437dacc5c53a205684419fb627c70870f7d2c4851b5a48f705886a04180a90a456bf6d7789b2a62fb6039c80a632d08629224b9594565b453085f50 WHIRLPOOL 8af9e92880b8c378d7329225666ef3347ba5a5510f3a6a513e340dd3b897339ab0817b93e50b20bd04c1b9438b3c5337b750737a2f51f1c76a727c110809b488
-DIST glusterfs-3.4.4.tar.gz 3864438 SHA256 802d374ba96f38a8bf09d1cf4445306f8904bf7de6ddf2dd81745bb10621d330 SHA512 2ee5d7c30e92bcff38ac7bf7fadd156108cfb143c3154585eec43597cc67f29e75cffe4752e60941ffcd6969ac0dc8c6e9418c1d15bd8242223c7f9f8c949f1c WHIRLPOOL 4c2436b7e6180248a91fb579fe43ba52c51eccb6f537a45baf8e432db597f436a5dc520c91f25792a0deb5b3a03425ccbf232aa0d5eafaff2801252af1406502
-DIST glusterfs-3.5.1.tar.gz 4950607 SHA256 eeff8399a1b83fc57f79bacccee8360845785bc67f1683bdbaff8d0493f5377b SHA512 a6e1f7e7860a27cad7941d71d95ddcb77776b068d8d3f5ba62756ce1cae30bbd17dc3a7a4b4f37e56700ccff564264df9923a271981d2c3480261eee81956611 WHIRLPOOL ac264a714e9902d13e214725199a88c811c6c32830232a5663a32f3c804eefb973a4d7a4bf07694e56251a028bae08d65c7db3f30deaa6ef79de700c67c45f84
-DIST glusterfs-3.5.2.tar.gz 4972250 SHA256 ef58b467a60fd6bd0685d4167a45f0860895414285b3908167b264aa63d276c3 SHA512 7950cf0faa8c2a04825b980f5e29ce24c9493777b14b5385c8db7981e930ebee36b19576ad5f9bd49cf723a2762333a4949c6bc72ae357add46e9a0a28a68dda WHIRLPOOL 000257f762f80f2eda95778867b6573e26a2b2dfef4610a4eef97037a9b23febfe20fa9d65508d51211d4edfdce148c33bd28f49bc8e1e3d6924a20cf690cc35
+DIST glusterfs-3.5.3.tar.gz 5021529 SHA256 d805d77da721e6fcb839f1208a9315b4f37b9d2a12c375dd47e5db4a60f5b6c2 SHA512 5a360c9d5180d1e59b8cac9900e4cf776aebf59fd59cca6a0ef27a84cae3781c8c5640b253c73888af751344dce9fd19c1b26bd9aa590ba4fc860143c990f30a WHIRLPOOL a08d3fc6f66dd4191d95611e1b626d8b393e2b8620800039cde20fcebe1643dc2cfe9e7eb3ce3be31aa4f17b8fc881060d40e3493ce189b93668716e2c7ae86d
 EBUILD glusterfs-3.1.2.ebuild 3661 SHA256 c0327f028964502d30ee865560ddcd88b031abc27eb4e36ea59934f001f0022a SHA512 6f4e7cbfd306e33f310e863805a4787c1263c3743869bddc2fee81bf95e0a2fa7b7fdfde5e8d4a5f34d28cc0ba3a44c4da2fb1e77aaf2895eba95da6e49076bd WHIRLPOOL c1caff294f0211c9eb99856691c05e5c6dbdded30e016ae5b6ca8777097ac68e9e68ea6441bfd8e4392293a44ee3150be60d3d906becd2b52e1e09058239216d
 EBUILD glusterfs-3.2.7.ebuild 3712 SHA256 db5392864be95d5247e7db80ade55cfe45c8bd1c376b202412e04c3ea8bc9689 SHA512 05b9e465d6d79a5202adc2fcffa361d90999aaad15cba1797cc3e6f242c0e96ee75d3fed2c2fc6919a7332ca8f20e892f88800dc1aa495b6076eacfaae9fa5b7 WHIRLPOOL 03d6c3892d9e3771665332d1a0e94470f3f74a36efc272825f645263ec46577ecdae4f0434b3169cb4b8a8305ceaf41fd6bf7e9b36a09e26e89087c7bd2fab25
-EBUILD glusterfs-3.3.0.ebuild 3806 SHA256 6801173e381eb698b9873ac72408354c9826774f5b7f196be593aaea19671852 SHA512 9dddf92f9ed1c742e44078dd1190a16ceb751c943a232a982661e1fc9c444455c58a330ee31f06d3d725c0096366b14d0eb19b5cd368e15e7ccf9f65a6dcc751 WHIRLPOOL 729fa922fc5d83b963b53676a1a79e6788a20f7d6f903f02e5f340239e2fc41eba9cca15f1a6b54612d31cec871e3177c4d94701a3a62b79c8db739137e5223b
 EBUILD glusterfs-3.3.1-r2.ebuild 4081 SHA256 caee41b6bcd94bc59bd47cfcb0423c3e996240779d6af6d90605150cc86c1bbc SHA512 ee8ae41ac90c37e6dc24ec52f5cfef88dacaeefb019976d4b531c2c5eb1cf94368b5741444635d6ad4d780ee924af650cdaa599e15597727d645094d08fd8e13 WHIRLPOOL 42940d858b36dfc3f25e4d5654d36d82304780af738af07fc1f419b83edbd612fed4d2c1ce66f6f2b7156edfc788c0f56d715cc9e955a66002aa23ce78f9329a
-EBUILD glusterfs-3.4.2-r1.ebuild 4648 SHA256 a9644f1475051215a690c927bee5aa0d9a6e1e47ebebef3393f27dd43d0d33a7 SHA512 b15b024e93a116ccb2b888cbf359b99ea19a5ccb3356f22cc9e0ddaf57cdde2f1be9ef237164b85b9b7a0b33791478b2a8c75ed955f47507c07c097da615356d WHIRLPOOL 74c7702e0d54bfd3467f9311ebe92fba3ef9e7c55354f26a977b53c11410d04794e98ea11f5a4262f86e2fa6feed5afa61c2ec31e87baefe0491783221cc3f24
-EBUILD glusterfs-3.4.4-r2.ebuild 4765 SHA256 dcbe7df11bec36bf3319f4502c104238a4584dfc7b3356349947647e76b65291 SHA512 55870713a47d3f44ea7e1504c95874dcf00c990806b093d6b422646efb2c2f3afc3c1ed8e118f0b8b252318b55a2fb00ec83544337e35998ef06213ae947f401 WHIRLPOOL 0ebd1d0ef0ccd15286905c840a6e468f65b80e0b891a54f34338b8f9c4f00cfbfdd6614d243e3e4d6787a163a9390d245794e210c7191d1922e2cfb5f74888a6
-EBUILD glusterfs-3.4.4.ebuild 4605 SHA256 799fa0af03815efe19b382dc09ecfb609ea4b91c143d3dcb1a7afd4a94699dcd SHA512 d153c1989084c3ed88a28badcfbdce4eac925fd1fd2418cb5e65a6b6f9550ba7f50bfa7364d27ad80ead27c575f0dad33618a9acd0be85388bb59490480bc8d8 WHIRLPOOL fa25f05ceb69ebf22d6b8e9d636a9024a0f9cf8af91bf4ac1522e0c3a2e5d132d9f7dae96483e7b7055f9e5fff4c41af567da7bd4a8bab2b4205b29387c7ba6e
-EBUILD glusterfs-3.5.1.ebuild 5511 SHA256 ac0a3a73cce7b323af1b7ce5e00fee31337e5561a952a6eda90f9094efbfc42e SHA512 b394a63a6074a26b92c3eeb9d2e77cace01402e639f2bbc5e9c5bb2c43f14dd12772e5b21e5c131e5514dbe9ba5ff9c3de6a5c500535d0bb0e79c82b073ea1b2 WHIRLPOOL f9536b48600963325f202d004441f096295eb6953be9913dd286f6c5f6b2f915638094ff1b832e2aa40ac6bf273de1a604d16b348e0b9f6eafca6ee3b7b314ad
-EBUILD glusterfs-3.5.2.ebuild 5511 SHA256 17a456494794867439ac03a9ca6b781907ba227fe784b3ec5cfd3ba31d486130 SHA512 7d2b0e6b7ca0ffeb30531d19412fa4ff6a806c8c46f5a90e84e82a3048f774236fe7029fcb0c063eaff713788959d050eff6f868828107be9b4c21d3861203c6 WHIRLPOOL e2f73135c4c2162c0ad5881e08c3a9a8f899e5c3445670232f7a847350affb185f7d8d5d676f0b017b3e3691036f2a0d758f117be34c6bd78b6f085000b1b96b
-MISC ChangeLog 12595 SHA256 ed578f7d3f06ef3a8e5679075c4efb2843b222a58bba5454cd17b24638ff90b6 SHA512 054a88446fd2c11f25420d11a1020c3033cc2c9ee34a5912f170a4bbd3123290bbdbf2d4b7435ef494bc165e034a5d38e807e64efe6203ec2a6e1bd2cfb04356 WHIRLPOOL e0a819fc2bb2bf6fc28072dfccb8df65be221886925a4e9b5e775226c57e897c8e86ebd5719a873a421e836e2f9761f7dfc14b8c15223877e7da56d42656ceec
+EBUILD glusterfs-3.5.3.ebuild 5519 SHA256 89a1dc790f2a6b5cf23d84e0e3288c4633b418482a836bccb551b305eccf5634 SHA512 4e8a33b2b0e75c3fe8aaf079b06215992f7b8ae3ea514f68b531775f8ef1f55d6b49f00e0c25a1334ab785386094f92b5da2623a5fe6837a060d9fde9d13f3de WHIRLPOOL 3cb0102f15e1710879cc238e86117c54135d9ff0fcf48bfd08e078d366ef04095fd89b12bea23776e9850d771594dbc618a2d4fc943750edbf8a4f287f3190e1
+MISC ChangeLog 13011 SHA256 78cadb5312fd120f643c067575fdd829abcf9f982cbc6e8990d099606b1f7000 SHA512 81ddf0cb7e5fdf67fb77ca7e22b4f9a1b7bce4bab0bd8a061192cb91597c7e1b64c444bf143ebb03be947496f35e1ed7dfb8b6b758c608f33af65cd08baa8d94 WHIRLPOOL 9147912b1437f78a8c3ec47809ddbfeed684a30907e679ca281754128514f229a04bd8c5bccbb150974734f3e46ae7e3325b9c44703b0b0304c8fb7e307e0509
 MISC metadata.xml 1434 SHA256 6b06ad02c5e50e33dbf3135fe5fd752b379a995b35887f1be899a1845540f84c SHA512 5c774c6a99663a4da155e46f31d31784a9f53ce171909a0e6af96a6bdeea80c15803111bfc7721d1442f3fdc4ca532485063bc1a4552cb15c38c08fd054ff327 WHIRLPOOL a01703c3ec564795a1f48448de70883b48d1db8e8c5c14b9d21ecb037ba95fcd9b27cc848edef0d1c968662ab2f6199db6839ce98280ae051f05d8898a8c2722
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQ0/4MACgkQKiQSS7ZY+hMWawD+MEs1IAg/EWmIrH/XZe1H75p2
-fmnQ+UPdrcOlAk2FEFEA/1piuQyDvBXOPcbYQc48DDtVegutJLXwCA0AO9A36PLX
-=uXWG
+iF4EAREIAAYFAlUQA0AACgkQKiQSS7ZY+hO5PAD/dBXNFMxZqXTUk9CrSUzewS8d
+ZXUJD2FyJTJ5MVthuhwA/iYorHGAAQPIIjCEsUL3IuPHrxomyZHQiRF2dQmcIlK6
+=MM9I
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/files/glusterd-r2.initd b/sys-cluster/glusterfs/files/glusterd-r2.initd
new file mode 100644
index 000000000000..4993f6355993
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-r2.initd
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/files/glusterd-r2.initd,v 1.1 2015/03/23 12:12:44 ultrabug Exp $
+
+description="Gluster elastic volume management daemon"
+command="/usr/sbin/glusterd"
+pidfile="/var/run/${SVCNAME}.pid"
+command_args="-N"
+
+command_background="yes"
+
+depend() {
+	need net
+	before netmount
+}
+
+start_pre() {
+	# Ensure that the GlusterFS auxiliary mount parent directory exists
+	checkpath --directory --owner root:root --mode 0700 /var/run/gluster
+}
+
+start_post() {
+	local c=0
+	ebegin "Waiting for glusterd to start up"
+	while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
+		(( ++c ))
+	done
+	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
+	eend $?
+
+	return 0
+}
diff --git a/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild
deleted file mode 100644
index ffa0c83ab5bd..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild,v 1.5 2014/08/11 22:28:30 blueness Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
-
-RDEPEND="emacs? ( virtual/emacs )
-	fuse? ( >=sys-fs/fuse-2.7.0 )
-	infiniband? ( sys-infiniband/libibverbs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${P}-parallel-build.patch"
-	"${FILESDIR}/${P}-docdir.patch"
-	"${FILESDIR}/${P}-silent_rules.patch"
-	"${FILESDIR}/${P}-avoid-version.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s/ -ggdb3//g" \
-		-i argp-standalone/configure.ac || die
-	autotools-utils_src_prepare
-	cd argp-standalone && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		$(use_enable fuse fuse-client)
-		$(use_enable infiniband ibverbs)
-		$(use_enable static-libs static)
-		--enable-georeplication
-		--docdir=/usr/share/doc/${PF}
-		--localstatedir=/var
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use emacs ; then
-		elisp-compile extras/glusterfs-mode.el || die
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el* || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	if use extras ; then
-		newbin extras/backend-xattr-sanitize.sh ${PN}-backend-xattr-sanitize
-		newbin extras/backend-cleanup.sh ${PN}-backend-cleanup
-		newbin extras/migrate-unify-to-distribute.sh ${PN}-migrate-unify-to-distribute
-		newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync
-	fi
-
-	newinitd "${FILESDIR}/${PN}.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-
-	python_convert_shebangs -r 2 "${ED}"
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	elog
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	elog
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	elog
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	elog
-	elog "You are upgrading from a previous version of ${PN}, please read:"
-	elog "http://vbellur.wordpress.com/2012/05/31/upgrading-to-glusterfs-3-3/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.2-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.2-r1.ebuild
deleted file mode 100644
index 60423a0ac7d6..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.2-r1.ebuild,v 1.2 2014/08/11 22:28:30 blueness Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bd-xlator debug emacs extras +fuse +georeplication infiniband static-libs systemtap vim-syntax"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="bd-xlator? ( sys-fs/lvm2 )
-	emacs? ( virtual/emacs )
-	fuse? ( >=sys-fs/fuse-2.7.0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
-	systemtap? ( dev-util/systemtap )
-	sys-libs/readline
-	dev-libs/libaio
-	dev-libs/libxml2
-	dev-libs/openssl
-	|| ( sys-libs/glibc sys-libs/argp-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
-	"${FILESDIR}/${PN}-3.4.0-build-shared-only.patch"
-	"${FILESDIR}/${PN}-3.4.0-nfs-exit-when-all-volumes-are-disabled.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	 use georeplication && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--disable-fusermount
-		$(use_enable debug)
-		$(use_enable bd-xlator )
-		$(use_enable fuse fuse-client)
-		$(use_enable georeplication)
-		$(use_enable infiniband ibverbs)
-		$(use_enable static-libs static)
-		$(use_enable systemtap)
-		--docdir=/usr/share/doc/${PF}
-		--localstatedir=/var
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	if use extras ; then
-		sed -i -e "s|quota-remove-xattr.sh|${PN}-quota-remove-xattr|" extras/quota-metadata-cleanup.sh || die "sed failed"
-		for e in backend-xattr-sanitize backend-cleanup migrate-unify-to-distribute quota-metadata-cleanup quota-remove-xattr ; do
-			newbin extras/${e}.sh ${PN}-${e}
-		done
-		newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r1.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-
-	use georeplication && python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	elog
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	elog
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	elog
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	elog
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  https://vbellur.wordpress.com/2013/07/15/upgrading-to-glusterfs-3-4/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild
deleted file mode 100644
index a5f9b7ecb547..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.4-r2.ebuild,v 1.2 2014/08/11 22:28:30 blueness Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bd-xlator debug emacs extras +fuse +georeplication infiniband static-libs systemtap vim-syntax"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="bd-xlator? ( sys-fs/lvm2 )
-	emacs? ( virtual/emacs )
-	fuse? ( >=sys-fs/fuse-2.7.0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
-	systemtap? ( dev-util/systemtap )
-	sys-libs/readline
-	dev-libs/libaio
-	dev-libs/libxml2
-	dev-libs/openssl
-	|| ( sys-libs/glibc sys-libs/argp-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
-	"${FILESDIR}/${PN}-3.4.0-build-shared-only.patch"
-	"${FILESDIR}/${PN}-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch"
-	"${FILESDIR}/${PN}-3.4.4-cluster-dht-Don-t-do-extra-unref-in-dht-migration-ch.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	 use georeplication && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--disable-fusermount
-		$(use_enable debug)
-		$(use_enable bd-xlator )
-		$(use_enable fuse fuse-client)
-		$(use_enable georeplication)
-		$(use_enable infiniband ibverbs)
-		$(use_enable static-libs static)
-		$(use_enable systemtap)
-		--docdir=/usr/share/doc/${PF}
-		--localstatedir=/var
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	if use extras ; then
-		sed -i -e "s|quota-remove-xattr.sh|${PN}-quota-remove-xattr|" extras/quota-metadata-cleanup.sh || die "sed failed"
-		for e in backend-xattr-sanitize backend-cleanup migrate-unify-to-distribute quota-metadata-cleanup quota-remove-xattr ; do
-			newbin extras/${e}.sh ${PN}-${e}
-		done
-		newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r1.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-
-	# QA
-	rm -rf "${ED}/var/run/"
-
-	use georeplication && python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	elog
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	elog
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	elog
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	elog
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  https://vbellur.wordpress.com/2013/07/15/upgrading-to-glusterfs-3-4/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.4.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.4.ebuild
deleted file mode 100644
index fc456d1fea81..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.4.4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.4.ebuild,v 1.2 2014/08/11 22:28:30 blueness Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bd-xlator debug emacs extras +fuse +georeplication infiniband static-libs systemtap vim-syntax"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="bd-xlator? ( sys-fs/lvm2 )
-	emacs? ( virtual/emacs )
-	fuse? ( >=sys-fs/fuse-2.7.0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
-	systemtap? ( dev-util/systemtap )
-	sys-libs/readline
-	dev-libs/libaio
-	dev-libs/libxml2
-	dev-libs/openssl
-	|| ( sys-libs/glibc sys-libs/argp-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
-	"${FILESDIR}/${PN}-3.4.0-build-shared-only.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	 use georeplication && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--disable-fusermount
-		$(use_enable debug)
-		$(use_enable bd-xlator )
-		$(use_enable fuse fuse-client)
-		$(use_enable georeplication)
-		$(use_enable infiniband ibverbs)
-		$(use_enable static-libs static)
-		$(use_enable systemtap)
-		--docdir=/usr/share/doc/${PF}
-		--localstatedir=/var
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	if use extras ; then
-		sed -i -e "s|quota-remove-xattr.sh|${PN}-quota-remove-xattr|" extras/quota-metadata-cleanup.sh || die "sed failed"
-		for e in backend-xattr-sanitize backend-cleanup migrate-unify-to-distribute quota-metadata-cleanup quota-remove-xattr ; do
-			newbin extras/${e}.sh ${PN}-${e}
-		done
-		newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r1.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-
-	# QA
-	rm -rf "${ED}/var/run/"
-
-	use georeplication && python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	elog
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	elog
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	elog
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	elog
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  https://vbellur.wordpress.com/2013/07/15/upgrading-to-glusterfs-3-4/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.5.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.5.2.ebuild
deleted file mode 100644
index 8e99bfffe5ba..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.5.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.5.2.ebuild,v 1.1 2014/10/08 09:10:21 ultrabug Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	glupy? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="bd-xlator? ( sys-fs/lvm2 )
-	emacs? ( virtual/emacs )
-	fuse? ( >=sys-fs/fuse-2.7.0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
-	qemu-block? ( dev-libs/glib:2 )
-	systemtap? ( dev-util/systemtap )
-	xml? ( dev-libs/libxml2 )
-	sys-libs/readline
-	dev-libs/libaio
-	dev-libs/openssl
-	|| ( sys-libs/glibc sys-libs/argp-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
-	"${FILESDIR}/${PN}-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-3.5.1-build-shared-only.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	( use georeplication || use glupy ) && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--disable-fusermount
-		$(use_enable debug)
-		$(use_enable bd-xlator)
-		$(use_enable crypt-xlator)
-		$(use_enable fuse fuse-client)
-		$(use_enable georeplication)
-		$(use_enable glupy)
-		$(use_enable infiniband ibverbs)
-		$(use_enable qemu-block)
-		$(use_enable static-libs static)
-		$(use_enable syslog)
-		$(use_enable systemtap)
-		$(use_enable xml xml-output)
-		--docdir=/usr/share/doc/${PF}
-		--localstatedir=/var
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm \
-		"${D}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${D}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${D}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r1.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-
-	# QA
-	rm -rf "${ED}/var/run/" || die
-
-	use georeplication && python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	elog
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.5"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.5.1.ebuild b/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild
index 00a2c700563a..ef2ad325f161 100644
--- a/sys-cluster/glusterfs/glusterfs-3.5.1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.5.1.ebuild,v 1.3 2014/08/11 22:28:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.5.3.ebuild,v 1.1 2015/03/23 12:12:44 ultrabug Exp $
 
 EAPI=5
 
@@ -25,13 +25,13 @@ RDEPEND="bd-xlator? ( sys-fs/lvm2 )
 	emacs? ( virtual/emacs )
 	fuse? ( >=sys-fs/fuse-2.7.0 )
 	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
+	infiniband? ( sys-infiniband/libibverbs:* sys-infiniband/librdmacm:* )
 	qemu-block? ( dev-libs/glib:2 )
 	systemtap? ( dev-util/systemtap )
 	xml? ( dev-libs/libxml2 )
-	sys-libs/readline
+	sys-libs/readline:=
 	dev-libs/libaio
-	dev-libs/openssl
+	dev-libs/openssl:=
 	|| ( sys-libs/glibc sys-libs/argp-standalone )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -131,7 +131,7 @@ src_install() {
 	fi
 
 	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r1.initd" glusterd
+	newinitd "${FILESDIR}/glusterd-r2.initd" glusterd
 	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
 
 	keepdir /var/log/${PN}