9 files changed, 30 insertions, 1044 deletions
diff --git a/sys-cluster/slurm/ChangeLog b/sys-cluster/slurm/ChangeLog
index 6203d00c89da..3514d10f53e8 100644
--- a/sys-cluster/slurm/ChangeLog
+++ b/sys-cluster/slurm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/slurm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.22 2013/04/03 13:43:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.23 2013/04/12 10:33:40 alexxy Exp $
+
+  12 Apr 2013; Alexey Shvetsov <alexxy@gentoo.org>
+  +files/slurm-2.5.4-nogtk.patch, -files/slurm-2.3.4-glibc2.16.patch,
+  -files/slurm-2.5.0-nogtk.patch, -slurm-2.3.4.ebuild, -slurm-2.4.3.ebuild,
+  -slurm-2.5.0.ebuild, -slurm-2.5.1.ebuild, slurm-2.5.4.ebuild:
+  Update patch. Drop old versions
 
 *slurm-2.5.4 (03 Apr 2013)
 
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 8375c7bcfd34..d41cf5c0ccf0 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -2,40 +2,31 @@
 Hash: SHA256
 
 AUX logrotate 360 SHA256 22a0e4bf21c9387f34245ec3cdd3a59512e377f6a0509451088b17e6c5201f89 SHA512 f6edceef15960accbe72ddd34ff34934fa46b6d647c83e0d3a512d2ddc1ae6c60352e377cfa5332fd5cd817689e23680f7384f1b27fc49677b2e671e1bfe86b9 WHIRLPOOL f210575af8ce123646e78c05980f1953b409e19e678221e4a17d97423fae6a9bd14a7ecc6cdb046102c3439d50718349063c01ef29f507500e3259f33b85e3e4
-AUX slurm-2.3.4-glibc2.16.patch 803 SHA256 1ee8d59c8e2d2c957b13a81cfea213c9e14be3b7ced31de1159819fb8b37a0e5 SHA512 4438d6831ff220af851dc8734cf74fe892d11e0a5dc6f2cc9cc762dba2cf20ad71ed963b3091a6557ea8ebeba47d5b4cc65c46120d846b675fd505dec52a4f6d WHIRLPOOL c1fee92f594b236ebd1a6413df6a578c7fa75e36f4c5cab881ae4e80a0945cf2979492cbaa521aaddf5ebd4a0c9b3dace2e5d5f493276e19af1ad9f0c5cdd7ba
-AUX slurm-2.5.0-nogtk.patch 1435 SHA256 b08ed80a7b3c8e5fff6c1d82bcee91089afb6c32553fe4f8c27fb4990e285189 SHA512 84013f465eb07a7aaedad64a3318f6cb00b05e1838a344cd94f6bdedcaf8d1834f8127508ca28629acfa3f5b2f384c53f8a66c4fff219d94c222bd75d8e40573 WHIRLPOOL 75610e19721e706052d29a85532afd05f0d010aa4b692b3b2131cf3c6a64469cf4e83694d5a59c91c5e74a01f3b20464399aaa5c84aae23b0060946af78504f8
+AUX slurm-2.5.4-nogtk.patch 1474 SHA256 58d990ff5b804a01721785e43ccf08657dd2476c8257994ecabdfa8ee5d66a55 SHA512 1010de90b549a1078801e6a98218bab84d000c6dcbe568bb506774bf8dcc62cba8100d30cd5e92c8dbaefea0e7709862a63f4a18e20c526d52a14b9304204df6 WHIRLPOOL 9aabed452668b27829b70f9ffaaeb4d40517ee8af09dfae8bd38714f5eacff833c594c45dca9bd6a02526a946caf27a4e866000a8b682bfc13b1ad2b74053e7d
 AUX slurm.confd 155 SHA256 bc1b32f7b3c4a2fb5d97ae227ff15d40da16c346c0eed33a7956ed780a1a0d96 SHA512 e4d21cdb6a427f0beaef0e157202308f9e86a41dea4532ee98b274a5979b5e82ec2ca4ca2996f6cb59045fd8b01e815aaad71673e2011cead788de3d879aa11f WHIRLPOOL c836f20aae1fc4619757fe0db935f22736cc73077d51792427c8c629248af1e35d5f0f8c54342e41f45729ae6cdbb2b7dad2bf4db0f0689c46656a5cfc652564
 AUX slurmctld.initd 1952 SHA256 eda111fbbc9f6493d41e2942c6ca59e3e1a56034b32d4f1c2f14f127699e3a78 SHA512 4df0dacdfc9e1b0ff240c8b1c4ba392ce1d8cdffd83c81a4b7bccb257b92c41afee040e41b4e2cc6db498b9bffe09c83452866aef4098b26c6c535b9b177ecea WHIRLPOOL 9429296b22e7e962df7970874b42affafd5b81b12487ae1fadeaa32a3fa5df02309e3ef4281d434a556d8bb7f7aa166fe5080aaf94c5cf626d6e29475150bc30
 AUX slurmd.initd 2109 SHA256 1083215224462facd69418fdb6188246911cfe5ca8241fa3af65a124759bf3d1 SHA512 3f4abb168c4162763fdcb509d6706c147c4f5646e86131e6c7d10d87d4e44ca64f700305a31ca160f673efd3afb43b83a7c247f40dd7922d08b78b7392648fd7 WHIRLPOOL a010a4cabe4b938bdea0705936cbab082734f9c9307b42fc11f4574e0a0c56a5271eb2c3dcc1169aacea3a7a088552aea278175b1545de21d660bc14b69becc2
 AUX slurmdbd.initd 1830 SHA256 f23e1d6fdfa935bc0830cc963cf25621c9255ef50871712742cc425ea3fb034c SHA512 4d9974f843203cb713dcc1aa5a68260593a9b802a5881980cecf887a2d6f962bb7aa73972110c9e4aad61795bae40d0130bbf0c605dda4f7ee5cfb26a7e7aed1 WHIRLPOOL 76ea5aea38e29bd47308903a0f57dd944d0f52a0df8c5096e66289de2d7ca292677b063952b33d8d75d1cc8fd543b70c0cefe06946b730547389ea0e3440d934
-DIST slurm-2.3.4.tar.bz2 5082579 SHA256 2a221316077c4b70df42042d1c94bc552b38060fe2b775bf2827543eef63aeb4 SHA512 632758b3f47c6a51ac8a54156c56460632bd503432587f86d1d4157dabe778b8fa2cbbf47afbc9103633abda1fd9d7742e63cfe39e660dfadaed01799d895030 WHIRLPOOL 79ccb7abfa39b92bf14d23faf471a21019e51987cfb275c4bc6114f3bc0ccf8f2619d8c90359451285ce9ad07dc774eb5ab9287269d9d355b8baa8d5ce131b82
-DIST slurm-2.4.3.tar.bz2 5236537 SHA256 96a36dee1337ea1caf70cdeca2056c1aa0a7f5950800c40d898645f9d99e0e74 SHA512 f8342ac24a8744f840c09f43849503c7e8155472c97a9ad9a361af00256964f83048aec2830adcbcdc6568262d0dd05cd11e6f10cb3b0b7d4a2556a33a9942af WHIRLPOOL 61b656aba784b37990bf042f154fa4e4f04cd7b94fcb4dd985273c16dce1c5fbf0e372a9ab02800703ffbf5612a945768c04f853000b6dc774729a1fb5e5ae49
 DIST slurm-2.4.5.tar.bz2 5377708 SHA256 db1d2f559353e0b494cf7a29ec3f7f314cb2e6131e1b8dfe307cf189b51626a4 SHA512 5e0ed11608bfb00a0f7fa8199fc5aef4d7568fa171570b1f40a6356070f4cde7c4227be3997650d3f2c26b46fd408a2b97d48fd0d0b6aef6a3aff9ea75a22b7a WHIRLPOOL 599aa7c846ca655912711286eaadaef732c434f5bcc0ed905b6aa3bfa07be81322c8b6253bc11e7644f6a72918a2c9383682c97847e8bbd78d77c49b56f5ad9f
-DIST slurm-2.5.0.tar.bz2 5389388 SHA256 ecccb03752a1def4194c88bbd36e782dd6025024eb8ef0cb31f1c9f4e7fd73c7 SHA512 657a148e365cbabf54154e78ac155f09a7751ae985dae42b3ed5d4c143a7305ccce9476ae0cb87caa4d22f007534791daf403b55af8dabf8069ac54f3b783b52 WHIRLPOOL 72bcf724ef9e1b588242f3b1ed14462565ee3eeb44c1493c084f3897f0d542861044dcd0cecf2fb0c834b9b3167b4b508949e4deca1c0d009880fab32c18304c
-DIST slurm-2.5.1.tar.bz2 5394385 SHA256 7161508690ab395220caf8eef15b7e5194e7ce9cc71a5766508e8d60a3118540 SHA512 4af462b57478bac65b2d3aa143a2a8a09052eecaa568fdb57b362487660152eeea061b9566a2c56d78c778c8c1a562ae30ba939d061e0983561702be39eedd87 WHIRLPOOL fba06ac2a611cc00b80290f9b20d4e9047d918d86761d2732cd3e244a8233bdec8f78b80e235114d9c273587f6a4d5da640c310bc8ff0591ea3a52e7c5bc4be0
 DIST slurm-2.5.4.tar.bz2 5497719 SHA256 c713ea74742ce14a27b88b02f1a475bc71cde22ad3a323a4d669530d8b68f09e SHA512 46231fbf0237d6afdede1ca8ff32d5e87c1cff1bc13ceb6dd61adc58f142fb5070759e7747a4ae81a54293a2ca73caf9a4fcf535786728178ee0afba141aa7bd WHIRLPOOL bad00e2c9d42a1de3ff87426124fdc5fee1fff368907e0812007ab9bc0aec0127287afe7f77c7d5b3314caec15a9f7b3a83eaf1f6520c2f0ccdfaebd74ba201d
-EBUILD slurm-2.3.4.ebuild 7623 SHA256 ffb70250a95e6963cd13adece239647ed78cea24482fa1a33de6e4a5fa5ebcd5 SHA512 07149d1ada09b2188ff7d9de33d74223ef32e5a7cc3fdc16d6a38fd40ebc3e6a82d287f134ed6825c075239f312621e1bc44d12c2a506de655b172ba14c5e95b WHIRLPOOL f416eab4b3bfd1e60d52d6b3b17518fb1ce5f3bef39ee1b3c38588997e95b2214dad8991c103bfa4a9381f76113fde324de2d1e66a3c30b24b773d34838651e4
-EBUILD slurm-2.4.3.ebuild 7646 SHA256 21108f4470c8beb8620fc70b7b6b22bf599f0a66beff3e7904e95233e4cb1971 SHA512 b20e9f6ea0581d00c530325030eff5a3245ee42a30002158147af0e8ab39cb4ebb747a7e6c7bb3b1bc74618d90d3e7f023ec3710c47b52cdf508da60bda8d7fb WHIRLPOOL fa473396415b5aac875cd99099534a6c29a8372ff3e9396bc90672bc907542c289bbf582d9c6b36c96866ce55d2489a70eb9a48670f6379df211a417823f054c
 EBUILD slurm-2.4.5.ebuild 7986 SHA256 a90eb47942dedc1e90b659dac63854c83f9fe1fb2cd578b27c345443db985411 SHA512 f760c6f6df9231c8c74075f6c988725b3bea9364212523e74467155bc0257f88d9574240b6fa17f60ff0ebb3d1f372bc41ddb42492673144a26c4f096d9352d1 WHIRLPOOL 439a174b613f2369160978cb8c4780c23753031d52e08f59045ac99d2811fec89098d6d0efbb35e67a77aa90d03355d7d12f8495d305a441dcdc41bf48e57c4d
-EBUILD slurm-2.5.0.ebuild 8284 SHA256 7d3e0da5943f411179d1d2ae9356914fea7d2da025f48d245e050c246706513c SHA512 77f8bb36e8cd4a94e8dc30890cd1ef1e7f48026976f394cd4bb4bd1b0e98de0cebc27fd92212fea2a088dca530d1d2d6124fa6a4472696da719d44522ae780f8 WHIRLPOOL 2ea41ca79ea69b0641e7475218300f0dbd1e1931a634ea7692e5a3537333cc0884f7e8cb27d73ece012e49fda94d96a9f001a58c494c254c87d945469c3fe66d
-EBUILD slurm-2.5.1.ebuild 8284 SHA256 2dd1d4b0e5c7f3bf61d4e2149d504642801aa93e3235664040623188525cc2ef SHA512 f87c5b449f7e91789015ad5d1d84e62c3a085cc69afd18a643a58a6187e11aefb01399fed4b7973b21446fb2df6e37da7bf38b5261dbb7b094aa64075ffc3236 WHIRLPOOL c7f3ad9d1ff57ce1a65de473d3ed421ba02d7a3eda71617b050b323c15c574241d1a51178ff369f0cb521fa23cfd0f747ae5ea64e8cadf2228186965f494676f
-EBUILD slurm-2.5.4.ebuild 8284 SHA256 7a34dce522d42b8f5960a56718cf9c6e61b12e9cd115ef04aabe3006c15eca14 SHA512 3f1e5b5a71e32daf0f27a71978ac2a53463de64c593c87104a74078423a78b5eeaee08b42ba4940548bf4e97c28a8fcede03d9015068b3b17aab7ba272a65895 WHIRLPOOL 24508a2380f7b9da89b84495c5022ccfc8838684dc6a08cd747ce92ddd14072959bf9ccb0ae685013d3f1f917e5b21c3540228196d1ae3cf4ed1431a9a619380
-MISC ChangeLog 3698 SHA256 74c974e6715f9b387576b734ea515101dd7d0b4f352a7ffb3c79eec60e002555 SHA512 3e0074844c73844ec2d0a7f1dfac33d6c647d530195d4103586f3ac4b617b7288c52e516188df3da4449300c84b7883df3ab45d9a3c92e969e28ede7b6db94f8 WHIRLPOOL 741a27a90f8e1fc98c8381663d7d93542ba9852087efbe1af455280f385455535c94291fed8a8285b9809c17e84af320b86e1d1baf74408aab859277f9f0377f
+EBUILD slurm-2.5.4.ebuild 8284 SHA256 25e5a79a04afd988131c12f6e950938a7bcf4fdd60d051bc27e70f3b0af8bf4b SHA512 ef8e48d34bbf9991206090b598bf141ecb6738ad10d442ab73ae69af76480b7dfca2accc9e05da675ae7c405b33ba80f68d30d75d9461b390d094b8c92b516eb WHIRLPOOL 991521fa51ba72649737dc32b6d7478899db21e163753b9f3eadf9572e5761013b45e4dcd77859b5a2dffd2589d089e1b9a4020b3c412183a042de9e7ec57d68
+MISC ChangeLog 3994 SHA256 c2b334b48e00a3ee73bd48172a071caefa0de2ebba37d24f041bf0f30efbc849 SHA512 27a9c7cf177e2f164cb861ba00a9da60afbb9151064a046e9dfc11db33467b1c0cf17844fe9db50e182694f20f0a5c355f8a8fe32dafcd0ed7f7f6632f8e6d77 WHIRLPOOL dcaefd965578db6b9f48a917094ba3334ac81727b178482e3729204d4e08416be818929d47020830e4176a4c788759e4d0432337a09667bf1c6a6ccb15f70f56
 MISC metadata.xml 564 SHA256 9f06f3b57990b43d1373d5895f59a73f3d371ed78fe5eff0eacbb143d15a15ca SHA512 bfb5b67ddb87cfcb3fc5dceeb32fed1b801f256cb898cdfd27722123abddcd34bd300c7c3599014ac0d89048645a7fec2f1cfe68a0a06817018a83953555ad54 WHIRLPOOL 9cbe2ec2eaa364467ab660f04bbdaa3199f778b9788cb66aef90c47f09853eb53fce5728571f5c15feae6bd9dfd16b0aa850e44f4c1118da9db9af331b6d369d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRXDIBAAoJEOf+E+/4L5Lmp5IP/jQy+Ij094m4PHI3Fx5w3k8m
-e8zqGxK1e4mi1XPF+Xf0vypbaYzrEjWKA0WoGDnMQiNXa98RpsoQGgkQhq/fRxOa
-ErsScNXIY2L3C590wONF74L9iL3pkZHV0obOZIjxKAASkx1a1/s7savosZ8894PD
-HVOcqD1U8YDlxSso8VqHsirEWjHZ1SfOitdOahT7t7OdTrSHCormOcdw0ouGGuk0
-jaq98pkudEtzlkfj3Rf4pWNVpLSHVi1YuNLm1q7nbdBgks4J4fTnCyMtPtqIgSlN
-stGbbm4Q22pA55sLEyTNRn/2DiytEC14fszM+Hfx3xDO7vU5R/hDTgx1K6f4p6Tt
-TvjvbrxqcbgiE3Ag40U3KX8b+TZq+q1p0CyQg1/kk5NhUOjh5FyBsvWuo+mMylgB
-8bVGoM2qpP9h32BZlrpAOLc9Iv9Z6O9JMqnLujVffp/ZC/ULHiRBGQnvFQlNplaG
-1U/MU47Q0GEG72JbJEDQpcitSPPQZf6NXwvXHNG20+8IIYI6Dv0SPV3CZ3O8ZHSJ
-gVvx+ZisXl4ZGk4C6APJVmfUarxecEGk4Fqz2GHJpM0Bx/r7+Vwl7Jdzybv933lT
-jGPGebEzLh4joTUx1v29xmwo6YDSGA2BadMKm6zb1ExfcJKbgHbMIgZD47h8x4Sp
-lK3bwnMRRM4kSruK6bDd
-=0nUj
+iQIcBAEBCAAGBQJRZ+MOAAoJEOf+E+/4L5LmiKIP/0qOz/TOHhTh6OnE9AcMLwUz
+Bm/SPIfXkXthbwbRrjmgOFeEBh57lQkFvyDwcTcVTKadMLzhsr8WqOgaP/lDUIxg
+qAFHHjERKXfF6dGVjcObgnRGTZSN5o3C5YBMgqXDHCPgXVeNGQqxajhS5Az+muWe
+JOohi3YcYWzXITxJVacBXkq8xLXEw8zuhrPD+zFXVW+K/5JaoD+PVHM5PYFCAC7t
+Pt55cWV6RASP+L57nDBRWvgi/qEgO0ztAdTmr+bngCgtn0GdPrDfDn8CZuDL2EiI
+37GojQ9mcp9DyvH2Jvgxoo5RDmUfgDJMbSOtiWrBLSzo6/d1WH3uXOgcmOjo+ekn
+gF1wMVR3t0mEpr5jIbDNjV4KnhGX3WLPVyEhyYFj64XFJMoxtKqMTV6P/zyfKvEq
+EZPPVjv5kB8ASoe/ZL6m7RkCXfC5ix+OGqHWPMXzEo8y4B9XOFKRdhliOG/2paqf
+zdWTv3Gk4IiQGd5+LtrIzAFVCQa/WeGFC2GJQPc3O3rzyST4lIMZPRsqmOczEXsS
+HoYbzC1KqlUjM/eH7Ew2Nm7Ynzw0XpSnAHCKAPUKhDEzMVuhzhniskVC0hSZ9XPp
+wmoCy4ehpq0BDof60oWT4tGes5a/XMkEzsMsCWE2t8+Ls3YH4RKgd/diPYYOMN2d
+Pw3is/gPgHOX03Xt5ML/
+=AeTH
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/slurm/files/slurm-2.3.4-glibc2.16.patch b/sys-cluster/slurm/files/slurm-2.3.4-glibc2.16.patch
deleted file mode 100644
index 34e8e59f2124..000000000000
--- a/sys-cluster/slurm/files/slurm-2.3.4-glibc2.16.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix building with glibc-2.16
-
-https://bugs.gentoo.org/show_bug.cgi?id=430252
-
-Patch written by Kacper Kowalik <xarthisius@gentoo.org>
---- a/src/common/jobacct_common.h
-+++ b/src/common/jobacct_common.h
-@@ -55,6 +55,7 @@
- 
- #include <dirent.h>
- #include <sys/stat.h>
-+#include <sys/resource.h>
- 
- #include "slurm/slurmdb.h"
- 
---- a/src/salloc/salloc.c
-+++ b/src/salloc/salloc.c
-@@ -49,6 +49,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/param.h>
-+#include <sys/resource.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <termios.h>
---- a/src/sbatch/sbatch.c
-+++ b/src/sbatch/sbatch.c
-@@ -48,6 +48,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/param.h>               /* MAXPATHLEN */
-+#include <sys/resource.h>
- #include <fcntl.h>
- 
- #include "slurm/slurm.h"
diff --git a/sys-cluster/slurm/files/slurm-2.5.0-nogtk.patch b/sys-cluster/slurm/files/slurm-2.5.4-nogtk.patch
index 3a8003c28626..12741f53b449 100644
--- a/sys-cluster/slurm/files/slurm-2.5.0-nogtk.patch
+++ b/sys-cluster/slurm/files/slurm-2.5.4-nogtk.patch
@@ -1,6 +1,6 @@
---- slurm-2.5.0/configure.ac.orig	2012-12-18 08:20:19.403190646 +0400
-+++ slurm-2.5.0/configure.ac	2012-12-18 08:20:48.293190615 +0400
-@@ -229,39 +229,6 @@
+--- slurm-2.5.4/configure.ac.orig	2013-04-11 12:58:24.971724348 +0400
++++ slurm-2.5.4/configure.ac	2013-04-11 12:59:00.921724309 +0400
+@@ -229,40 +229,6 @@
  AM_CONDITIONAL(HAVE_SOME_CURSES, test "x$ac_have_some_curses" = "xyes")
  AC_SUBST(HAVE_SOME_CURSES)
  
@@ -18,7 +18,6 @@
 -fi
 -
 -AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"], [gthread])
--AM_CONDITIONAL(BUILD_SVIEW, test "x$ac_glib_test" = "xyes")
 -
 -if test ${glib_config_minor_version=0} -ge 32 ; then
 -       AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or higher])
@@ -37,6 +36,8 @@
 -       AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0 or higher])
 -fi
 -
+-AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"])
+-
  X_AC_DATABASES
  
  dnl Cray ALPS/Basil support depends on mySQL
diff --git a/sys-cluster/slurm/slurm-2.3.4.ebuild b/sys-cluster/slurm/slurm-2.3.4.ebuild
deleted file mode 100644
index ae16fbe89e9b..000000000000
--- a/sys-cluster/slurm/slurm-2.3.4.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.3.4.ebuild,v 1.5 2012/10/07 10:09:34 xarthisius Exp $
-
-EAPI=4
-RESTRICT="primaryuri"
-
-inherit eutils versionator pam perl-module user
-
-MY_PV=$(replace_version_separator 3 '-') # stable releases
-#MY_PV=$(replace_version_separator 3 '-0.') # pre-releases
-MY_P="${PN}-${MY_PV}"
-MY_branch="latest"
-#MY_branch="development"
-
-DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
-HOMEPAGE="https://computing.llnl.gov/linux/slurm/"
-SRC_URI="http://www.schedmd.com/download/${MY_branch}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="maui +munge mysql pam perl postgres ssl static-libs torque ypbind"
-
-DEPEND="
-	!sys-cluster/torque
-	!net-analyzer/slurm
-	!net-analyzer/sinfo
-	mysql? ( dev-db/mysql )
-	munge? ( sys-auth/munge )
-	ypbind? ( net-nds/ypbind )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	ssl? ( dev-libs/openssl )
-	>=sys-apps/hwloc-1.1.1-r1"
-RDEPEND="${DEPEND}
-	maui? ( sys-cluster/maui[slurm] )"
-
-REQUIRED_USE="torque? ( perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
-
-pkg_setup() {
-	enewgroup slurm 500
-	enewuser slurm 500 -1 /var/spool/slurm slurm
-}
-
-src_prepare() {
-	# Gentoo uses /sys/fs/cgroup instead of /cgroup
-	# FIXME: Can the "^/cgroup" and "\([ =\"]\)/cgroup" patterns be merged?
-	sed \
-		-e 's|\([ =\"]\)/cgroup|\1/sys/fs/cgroup|g' \
-		-e "s|^/cgroup|/sys/fs/cgroup|g" \
-		-i "${S}/doc/man/man5/cgroup.conf.5" \
-		-i "${S}/etc/cgroup.release_common.example" \
-		-i "${S}/src/common/xcgroup_read_config.c" \
-			|| die "Can't sed /cgroup for /sys/fs/cgroup"
-	# and pids should go to /var/run/slurm
-	sed -e 's:/var/run/slurmctld.pid:/var/run/slurm/slurmctld.pid:g' \
-		-e 's:/var/run/slurmd.pid:/var/run/slurm/slurmd.pid:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed for /var/run/slurmctld.pid"
-	# also state dirs are in /var/spool/slurm
-	sed -e 's:StateSaveLocation=*.:StateSaveLocation=/var/spool/slurm:g' \
-		-e 's:SlurmdSpoolDir=*.:SlurmdSpoolDir=/var/spool/slurm/slurmd:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed ${S}/etc/slurm.conf.example for StateSaveLocation=*. or SlurmdSpoolDir=*"
-	# and tmp should go to /var/tmp/slurm
-	sed -e 's:/tmp:/var/tmp:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed for StateSaveLocation=*./tmp"
-
-	epatch "${FILESDIR}"/${P}-glibc2.16.patch
-}
-
-src_configure() {
-	local myconf=(
-			--sysconfdir="${EPREFIX}/etc/${PN}"
-			--with-hwloc="${EPREFIX}/usr"
-			--docdir="${EPREFIX}/usr/share/doc/${P}"
-			--htmldir="${EPREFIX}/usr/share/doc/${P}"
-			)
-	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
-	use mysql || myconf+=( --without-mysql_config )
-	use postgres || myconf+=( --without-pg_config )
-	econf "${myconf[@]}" \
-		$(use_enable pam) \
-		$(use_with ssl) \
-		$(use_with munge) \
-		$(use_enable static-libs static)
-
-	# --htmldir does not seems to propagate... Documentations are installed
-	# in /usr/share/doc/slurm-2.3.0/html
-	# instead of /usr/share/doc/slurm-2.3.0.2/html
-	sed -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" -i doc/html/Makefile || die
-	if use perl ; then
-		# small hack to make it compile
-		mkdir -p "${S}/src/api/.libs"
-		mkdir -p "${S}/src/db_api/.libs"
-		touch "${S}/src/api/.libs/libslurm.so"
-		touch "${S}/src/db_api/.libs/libslurmdb.so"
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}"
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs"
-	fi
-}
-
-src_compile() {
-	default
-	use pam && emake -C contribs/pam || die
-	if use perl ; then
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}"
-	fi
-	if use torque ; then
-		emake -C contribs/torque || die
-	fi
-}
-
-src_install() {
-	default
-	use pam && emake DESTDIR="${D}" -C contribs/pam install || die
-	if use perl; then
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}"
-	fi
-	if use torque; then
-		emake DESTDIR="${D}" -C contribs/torque || die
-		rm -f "${ED}/usr/bin/mpiexec" || die
-	fi
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-	# install sample configs
-	keepdir /etc/slurm
-	insinto /etc/slurm
-	doins etc/cgroup.conf.example
-	doins etc/federation.conf.example
-	doins etc/slurm.conf.example
-	doins etc/slurmdbd.conf.example
-	exeinto /etc/slurm
-	doexe etc/cgroup.release_common.example
-	doexe etc/slurm.epilog.clean
-	# install init.d files
-	newinitd "${FILESDIR}/slurmd.initd" slurmd
-	newinitd "${FILESDIR}/slurmctld.initd" slurmctld
-	newinitd "${FILESDIR}/slurmdbd.initd" slurmdbd
-	# install conf.d files
-	newconfd "${FILESDIR}/slurm.confd" slurm
-	# Install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" slurm || die
-	# cgroups support
-	exeinto /etc/slurm/cgroup
-	doexe etc/cgroup.release_common.example
-	mv "${D}"/etc/slurm/cgroup/cgroup.release_common.example "${D}"/etc/slurm/cgroup/release_common || die "Can't move cgroup.release_common.example"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_cpuset  || die "Can't create symbolic link release_cpuset"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_devices || die "Can't create symbolic link release_devices"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_freezer || die "Can't create symbolic link release_freezer"
-}
-
-pkg_preinst() {
-	if use munge; then
-		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/slurm || die
-	fi
-	if use ypbind; then
-		sed -i 's,\(SLURM_USE_YPBIND=\).*,\11,' "${D}"etc/conf.d/slurm || die
-	fi
-}
-
-create_folders_and_fix_permissions() {
-	einfo "Fixing permissions in ${@}"
-	mkdir -p ${@}
-	chown -R ${PN}:${PN} ${@}
-}
-
-pkg_postinst() {
-	paths=(
-		/var/${PN}/checkpoint
-		/var/${PN}
-		/var/spool/${PN}/slurmd
-		/var/spool/${PN}
-		/var/run/${PN}
-		/var/log/${PN}
-		/var/tmp/${PN}/${PN}d
-		/var/tmp/${PN}
-		)
-	for folder_path in ${paths[@]}; do
-		create_folders_and_fix_permissions $folder_path
-	done
-	einfo
-
-	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
-	elog "through a (javascript enabled) browser to create a configureation file."
-	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
-	einfo
-	elog "For cgroup support, please see http://www.schedmd.com/slurmdocs/cgroup.conf.html"
-	elog "Your kernel must be compiled with the wanted cgroup feature:"
-	elog "    General setup  --->"
-	elog "        [*] Control Group support  --->"
-	elog "            [*]   Freezer cgroup subsystem"
-	elog "            [*]   Device controller for cgroups"
-	elog "            [*]   Cpuset support"
-	elog "            [*]   Simple CPU accounting cgroup subsystem"
-	elog "            [*]   Resource counters"
-	elog "            [*]     Memory Resource Controller for Control Groups"
-	elog "            [*]   Group CPU scheduler  --->"
-	elog "                [*]   Group scheduling for SCHED_OTHER"
-	elog "Then, set these options in /etc/slurm/slurm.conf:"
-	elog "    ProctrackType=proctrack/cgroup"
-	elog "    TaskPlugin=task/cgroup"
-	einfo
-	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
-	for folder_path in ${paths[@]}; do
-		ewarn "    ${folder_path}"
-	done
-}
diff --git a/sys-cluster/slurm/slurm-2.4.3.ebuild b/sys-cluster/slurm/slurm-2.4.3.ebuild
deleted file mode 100644
index 816869c6e53d..000000000000
--- a/sys-cluster/slurm/slurm-2.4.3.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.4.3.ebuild,v 1.2 2012/10/14 18:27:42 alexxy Exp $
-
-EAPI=4
-RESTRICT="primaryuri"
-
-inherit eutils versionator pam perl-module user
-
-MY_PV=$(replace_version_separator 3 '-') # stable releases
-#MY_PV=$(replace_version_separator 3 '-0.') # pre-releases
-MY_P="${PN}-${MY_PV}"
-MY_branch="latest"
-#MY_branch="development"
-
-DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
-HOMEPAGE="https://computing.llnl.gov/linux/slurm/"
-SRC_URI="http://www.schedmd.com/download/${MY_branch}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="maui +munge mysql pam perl postgres ssl static-libs torque ypbind"
-
-DEPEND="
-	!sys-cluster/torque
-	!net-analyzer/slurm
-	!net-analyzer/sinfo
-	mysql? ( dev-db/mysql )
-	munge? ( sys-auth/munge )
-	ypbind? ( net-nds/ypbind )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	ssl? ( dev-libs/openssl )
-	>=sys-apps/hwloc-1.1.1-r1"
-RDEPEND="${DEPEND}
-	dev-libs/libcgroup
-	maui? ( sys-cluster/maui[slurm] )"
-
-REQUIRED_USE="torque? ( perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
-
-pkg_setup() {
-	enewgroup slurm 500
-	enewuser slurm 500 -1 /var/spool/slurm slurm
-}
-
-src_prepare() {
-	# Gentoo uses /sys/fs/cgroup instead of /cgroup
-	# FIXME: Can the "^/cgroup" and "\([ =\"]\)/cgroup" patterns be merged?
-	sed \
-		-e 's|\([ =\"]\)/cgroup|\1/sys/fs/cgroup|g' \
-		-e "s|^/cgroup|/sys/fs/cgroup|g" \
-		-i "${S}/doc/man/man5/cgroup.conf.5" \
-		-i "${S}/etc/cgroup.release_common.example" \
-		-i "${S}/src/common/xcgroup_read_config.c" \
-			|| die "Can't sed /cgroup for /sys/fs/cgroup"
-	# and pids should go to /var/run/slurm
-	sed -e 's:/var/run/slurmctld.pid:/var/run/slurm/slurmctld.pid:g' \
-		-e 's:/var/run/slurmd.pid:/var/run/slurm/slurmd.pid:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed for /var/run/slurmctld.pid"
-	# also state dirs are in /var/spool/slurm
-	sed -e 's:StateSaveLocation=*.:StateSaveLocation=/var/spool/slurm:g' \
-		-e 's:SlurmdSpoolDir=*.:SlurmdSpoolDir=/var/spool/slurm/slurmd:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed ${S}/etc/slurm.conf.example for StateSaveLocation=*. or SlurmdSpoolDir=*"
-	# and tmp should go to /var/tmp/slurm
-	sed -e 's:/tmp:/var/tmp:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed for StateSaveLocation=*./tmp"
-
-	epatch "${FILESDIR}"/${PN}-2.3.4-glibc2.16.patch
-}
-
-src_configure() {
-	local myconf=(
-			--sysconfdir="${EPREFIX}/etc/${PN}"
-			--with-hwloc="${EPREFIX}/usr"
-			--docdir="${EPREFIX}/usr/share/doc/${P}"
-			--htmldir="${EPREFIX}/usr/share/doc/${P}"
-			)
-	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
-	use mysql || myconf+=( --without-mysql_config )
-	use postgres || myconf+=( --without-pg_config )
-	econf "${myconf[@]}" \
-		$(use_enable pam) \
-		$(use_with ssl) \
-		$(use_with munge) \
-		$(use_enable static-libs static)
-
-	# --htmldir does not seems to propagate... Documentations are installed
-	# in /usr/share/doc/slurm-2.3.0/html
-	# instead of /usr/share/doc/slurm-2.3.0.2/html
-	sed -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" -i doc/html/Makefile || die
-	if use perl ; then
-		# small hack to make it compile
-		mkdir -p "${S}/src/api/.libs"
-		mkdir -p "${S}/src/db_api/.libs"
-		touch "${S}/src/api/.libs/libslurm.so"
-		touch "${S}/src/db_api/.libs/libslurmdb.so"
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}"
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs"
-	fi
-}
-
-src_compile() {
-	default
-	use pam && emake -C contribs/pam || die
-	if use perl ; then
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}"
-	fi
-	if use torque ; then
-		emake -C contribs/torque || die
-	fi
-}
-
-src_install() {
-	default
-	use pam && emake DESTDIR="${D}" -C contribs/pam install || die
-	if use perl; then
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}"
-	fi
-	if use torque; then
-		emake DESTDIR="${D}" -C contribs/torque || die
-		rm -f "${ED}/usr/bin/mpiexec" || die
-	fi
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-	# install sample configs
-	keepdir /etc/slurm
-	insinto /etc/slurm
-	doins etc/cgroup.conf.example
-	doins etc/federation.conf.example
-	doins etc/slurm.conf.example
-	doins etc/slurmdbd.conf.example
-	exeinto /etc/slurm
-	doexe etc/cgroup.release_common.example
-	doexe etc/slurm.epilog.clean
-	# install init.d files
-	newinitd "${FILESDIR}/slurmd.initd" slurmd
-	newinitd "${FILESDIR}/slurmctld.initd" slurmctld
-	newinitd "${FILESDIR}/slurmdbd.initd" slurmdbd
-	# install conf.d files
-	newconfd "${FILESDIR}/slurm.confd" slurm
-	# Install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" slurm || die
-	# cgroups support
-	exeinto /etc/slurm/cgroup
-	doexe etc/cgroup.release_common.example
-	mv "${D}"/etc/slurm/cgroup/cgroup.release_common.example "${D}"/etc/slurm/cgroup/release_common || die "Can't move cgroup.release_common.example"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_cpuset  || die "Can't create symbolic link release_cpuset"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_devices || die "Can't create symbolic link release_devices"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_freezer || die "Can't create symbolic link release_freezer"
-}
-
-pkg_preinst() {
-	if use munge; then
-		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/slurm || die
-	fi
-	if use ypbind; then
-		sed -i 's,\(SLURM_USE_YPBIND=\).*,\11,' "${D}"etc/conf.d/slurm || die
-	fi
-}
-
-create_folders_and_fix_permissions() {
-	einfo "Fixing permissions in ${@}"
-	mkdir -p ${@}
-	chown -R ${PN}:${PN} ${@}
-}
-
-pkg_postinst() {
-	paths=(
-		/var/${PN}/checkpoint
-		/var/${PN}
-		/var/spool/${PN}/slurmd
-		/var/spool/${PN}
-		/var/run/${PN}
-		/var/log/${PN}
-		/var/tmp/${PN}/${PN}d
-		/var/tmp/${PN}
-		)
-	for folder_path in ${paths[@]}; do
-		create_folders_and_fix_permissions $folder_path
-	done
-	einfo
-
-	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
-	elog "through a (javascript enabled) browser to create a configureation file."
-	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
-	einfo
-	elog "For cgroup support, please see http://www.schedmd.com/slurmdocs/cgroup.conf.html"
-	elog "Your kernel must be compiled with the wanted cgroup feature:"
-	elog "    General setup  --->"
-	elog "        [*] Control Group support  --->"
-	elog "            [*]   Freezer cgroup subsystem"
-	elog "            [*]   Device controller for cgroups"
-	elog "            [*]   Cpuset support"
-	elog "            [*]   Simple CPU accounting cgroup subsystem"
-	elog "            [*]   Resource counters"
-	elog "            [*]     Memory Resource Controller for Control Groups"
-	elog "            [*]   Group CPU scheduler  --->"
-	elog "                [*]   Group scheduling for SCHED_OTHER"
-	elog "Then, set these options in /etc/slurm/slurm.conf:"
-	elog "    ProctrackType=proctrack/cgroup"
-	elog "    TaskPlugin=task/cgroup"
-	einfo
-	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
-	for folder_path in ${paths[@]}; do
-		ewarn "    ${folder_path}"
-	done
-}
diff --git a/sys-cluster/slurm/slurm-2.5.0.ebuild b/sys-cluster/slurm/slurm-2.5.0.ebuild
deleted file mode 100644
index eeba69a390af..000000000000
--- a/sys-cluster/slurm/slurm-2.5.0.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.5.0.ebuild,v 1.3 2012/12/18 04:31:29 alexxy Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://github.com/SchedMD/slurm.git"
-	INHERIT_GIT="git-2"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	inherit versionator
-	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
-		MY_PV=$(replace_version_separator 3 '-0.') # pre-releases or release-candidate
-	else
-		MY_PV=$(replace_version_separator 3 '-') # stable releases
-	fi
-	MY_P="${PN}-${MY_PV}"
-	INHERIT_GIT=""
-	SRC_URI="http://www.schedmd.com/download/total/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-inherit autotools base eutils pam perl-module user ${INHERIT_GIT}
-
-DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
-HOMEPAGE="http://www.schedmd.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="lua maui multiple-slurmd +munge mysql pam perl postgres ssl static-libs torque ypbind"
-
-DEPEND="
-	!sys-cluster/torque
-	!net-analyzer/slurm
-	!net-analyzer/sinfo
-	mysql? ( dev-db/mysql )
-	munge? ( sys-auth/munge )
-	ypbind? ( net-nds/ypbind )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	ssl? ( dev-libs/openssl )
-	lua? ( dev-lang/lua )
-	!lua? ( !dev-lang/lua )
-	>=sys-apps/hwloc-1.1.1-r1"
-RDEPEND="${DEPEND}
-	dev-libs/libcgroup
-	maui? ( sys-cluster/maui[slurm] )"
-
-REQUIRED_USE="torque? ( perl )"
-
-LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
-
-RESTRICT="primaryuri"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.0-nogtk.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-pkg_setup() {
-	enewgroup slurm 500
-	enewuser slurm 500 -1 /var/spool/slurm slurm
-}
-
-src_prepare() {
-	# Gentoo uses /sys/fs/cgroup instead of /cgroup
-	# FIXME: Can the "^/cgroup" and "\([ =\"]\)/cgroup" patterns be merged?
-	sed \
-		-e 's|\([ =\"]\)/cgroup|\1/sys/fs/cgroup|g' \
-		-e "s|^/cgroup|/sys/fs/cgroup|g" \
-		-i "${S}/doc/man/man5/cgroup.conf.5" \
-		-i "${S}/etc/cgroup.release_common.example" \
-		-i "${S}/src/common/xcgroup_read_config.c" \
-			|| die "Can't sed /cgroup for /sys/fs/cgroup"
-	# and pids should go to /var/run/slurm
-	sed -e 's:/var/run/slurmctld.pid:/var/run/slurm/slurmctld.pid:g' \
-		-e 's:/var/run/slurmd.pid:/var/run/slurm/slurmd.pid:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed for /var/run/slurmctld.pid"
-	# also state dirs are in /var/spool/slurm
-	sed -e 's:StateSaveLocation=*.:StateSaveLocation=/var/spool/slurm:g' \
-		-e 's:SlurmdSpoolDir=*.:SlurmdSpoolDir=/var/spool/slurm/slurmd:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed ${S}/etc/slurm.conf.example for StateSaveLocation=*. or SlurmdSpoolDir=*"
-	# and tmp should go to /var/tmp/slurm
-	sed -e 's:/tmp:/var/tmp:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed for StateSaveLocation=*./tmp"
-	# disable sview since it need gtk+
-	sed -e '/sview/d' \
-		-i configure.ac
-	sed -e 's:sview::g' \
-		-i src/Makefile.am
-	# apply patches
-	epatch "${PATCHES[@]}"
-	elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-			--sysconfdir="${EPREFIX}/etc/${PN}"
-			--with-hwloc="${EPREFIX}/usr"
-			--docdir="${EPREFIX}/usr/share/doc/${P}"
-			--htmldir="${EPREFIX}/usr/share/doc/${P}"
-			)
-	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
-	use mysql || myconf+=( --without-mysql_config )
-	use postgres || myconf+=( --without-pg_config )
-	econf "${myconf[@]}" \
-		$(use_enable pam) \
-		$(use_with ssl) \
-		$(use_with munge) \
-		$(use_enable static-libs static) \
-		$(use_enable multiple-slurmd)
-
-	# --htmldir does not seems to propagate... Documentations are installed
-	# in /usr/share/doc/slurm-2.3.0/html
-	# instead of /usr/share/doc/slurm-2.3.0.2/html
-	sed -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" -i doc/html/Makefile || die
-	if use perl ; then
-		# small hack to make it compile
-		mkdir -p "${S}/src/api/.libs"
-		mkdir -p "${S}/src/db_api/.libs"
-		touch "${S}/src/api/.libs/libslurm.so"
-		touch "${S}/src/db_api/.libs/libslurmdb.so"
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}"
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs"
-	fi
-}
-
-src_compile() {
-	default
-	use pam && emake -C contribs/pam || die
-	if use perl ; then
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}"
-	fi
-	if use torque ; then
-		emake -C contribs/torque || die
-	fi
-}
-
-src_install() {
-	default
-	use pam && emake DESTDIR="${D}" -C contribs/pam install || die
-	if use perl; then
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}"
-	fi
-	if use torque; then
-		emake DESTDIR="${D}" -C contribs/torque || die
-		rm -f "${ED}/usr/bin/mpiexec" || die
-	fi
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-	# install sample configs
-	keepdir /etc/slurm
-	insinto /etc/slurm
-	doins etc/bluegene.conf.example
-	doins etc/cgroup.conf.example
-	doins etc/cgroup_allowed_devices_file.conf.example
-	doins etc/slurm.conf.example
-	doins etc/slurmdbd.conf.example
-	exeinto /etc/slurm
-	doexe etc/cgroup.release_common.example
-	doexe etc/slurm.epilog.clean
-	# install init.d files
-	newinitd "${FILESDIR}/slurmd.initd" slurmd
-	newinitd "${FILESDIR}/slurmctld.initd" slurmctld
-	newinitd "${FILESDIR}/slurmdbd.initd" slurmdbd
-	# install conf.d files
-	newconfd "${FILESDIR}/slurm.confd" slurm
-	# Install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" slurm || die
-	# cgroups support
-	exeinto /etc/slurm/cgroup
-	doexe etc/cgroup.release_common.example
-	mv "${D}"/etc/slurm/cgroup/cgroup.release_common.example "${D}"/etc/slurm/cgroup/release_common || die "Can't move cgroup.release_common.example"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_cpuset  || die "Can't create symbolic link release_cpuset"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_devices || die "Can't create symbolic link release_devices"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_freezer || die "Can't create symbolic link release_freezer"
-}
-
-pkg_preinst() {
-	if use munge; then
-		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/slurm || die
-	fi
-	if use ypbind; then
-		sed -i 's,\(SLURM_USE_YPBIND=\).*,\11,' "${D}"etc/conf.d/slurm || die
-	fi
-}
-
-create_folders_and_fix_permissions() {
-	einfo "Fixing permissions in ${@}"
-	mkdir -p ${@}
-	chown -R ${PN}:${PN} ${@}
-}
-
-pkg_postinst() {
-	paths=(
-		/var/${PN}/checkpoint
-		/var/${PN}
-		/var/spool/${PN}/slurmd
-		/var/spool/${PN}
-		/var/run/${PN}
-		/var/log/${PN}
-		/var/tmp/${PN}/${PN}d
-		/var/tmp/${PN}
-		)
-	for folder_path in ${paths[@]}; do
-		create_folders_and_fix_permissions $folder_path
-	done
-	einfo
-
-	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
-	elog "through a (javascript enabled) browser to create a configureation file."
-	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
-	einfo
-	elog "For cgroup support, please see http://www.schedmd.com/slurmdocs/cgroup.conf.html"
-	elog "Your kernel must be compiled with the wanted cgroup feature:"
-	elog "    General setup  --->"
-	elog "        [*] Control Group support  --->"
-	elog "            [*]   Freezer cgroup subsystem"
-	elog "            [*]   Device controller for cgroups"
-	elog "            [*]   Cpuset support"
-	elog "            [*]   Simple CPU accounting cgroup subsystem"
-	elog "            [*]   Resource counters"
-	elog "            [*]     Memory Resource Controller for Control Groups"
-	elog "            [*]   Group CPU scheduler  --->"
-	elog "                [*]   Group scheduling for SCHED_OTHER"
-	elog "Then, set these options in /etc/slurm/slurm.conf:"
-	elog "    ProctrackType=proctrack/cgroup"
-	elog "    TaskPlugin=task/cgroup"
-	einfo
-	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
-	for folder_path in ${paths[@]}; do
-		ewarn "    ${folder_path}"
-	done
-}
diff --git a/sys-cluster/slurm/slurm-2.5.1.ebuild b/sys-cluster/slurm/slurm-2.5.1.ebuild
deleted file mode 100644
index 080ab504d27d..000000000000
--- a/sys-cluster/slurm/slurm-2.5.1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.5.1.ebuild,v 1.1 2013/01/20 13:13:53 alexxy Exp $
-
-EAPI=4
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://github.com/SchedMD/slurm.git"
-	INHERIT_GIT="git-2"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	inherit versionator
-	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
-		MY_PV=$(replace_version_separator 3 '-0.') # pre-releases or release-candidate
-	else
-		MY_PV=$(replace_version_separator 3 '-') # stable releases
-	fi
-	MY_P="${PN}-${MY_PV}"
-	INHERIT_GIT=""
-	SRC_URI="http://www.schedmd.com/download/total/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-inherit autotools base eutils pam perl-module user ${INHERIT_GIT}
-
-DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
-HOMEPAGE="http://www.schedmd.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="lua maui multiple-slurmd +munge mysql pam perl postgres ssl static-libs torque ypbind"
-
-DEPEND="
-	!sys-cluster/torque
-	!net-analyzer/slurm
-	!net-analyzer/sinfo
-	mysql? ( dev-db/mysql )
-	munge? ( sys-auth/munge )
-	ypbind? ( net-nds/ypbind )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	ssl? ( dev-libs/openssl )
-	lua? ( dev-lang/lua )
-	!lua? ( !dev-lang/lua )
-	>=sys-apps/hwloc-1.1.1-r1"
-RDEPEND="${DEPEND}
-	dev-libs/libcgroup
-	maui? ( sys-cluster/maui[slurm] )"
-
-REQUIRED_USE="torque? ( perl )"
-
-LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
-
-RESTRICT="primaryuri"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.0-nogtk.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-pkg_setup() {
-	enewgroup slurm 500
-	enewuser slurm 500 -1 /var/spool/slurm slurm
-}
-
-src_prepare() {
-	# Gentoo uses /sys/fs/cgroup instead of /cgroup
-	# FIXME: Can the "^/cgroup" and "\([ =\"]\)/cgroup" patterns be merged?
-	sed \
-		-e 's|\([ =\"]\)/cgroup|\1/sys/fs/cgroup|g' \
-		-e "s|^/cgroup|/sys/fs/cgroup|g" \
-		-i "${S}/doc/man/man5/cgroup.conf.5" \
-		-i "${S}/etc/cgroup.release_common.example" \
-		-i "${S}/src/common/xcgroup_read_config.c" \
-			|| die "Can't sed /cgroup for /sys/fs/cgroup"
-	# and pids should go to /var/run/slurm
-	sed -e 's:/var/run/slurmctld.pid:/var/run/slurm/slurmctld.pid:g' \
-		-e 's:/var/run/slurmd.pid:/var/run/slurm/slurmd.pid:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed for /var/run/slurmctld.pid"
-	# also state dirs are in /var/spool/slurm
-	sed -e 's:StateSaveLocation=*.:StateSaveLocation=/var/spool/slurm:g' \
-		-e 's:SlurmdSpoolDir=*.:SlurmdSpoolDir=/var/spool/slurm/slurmd:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed ${S}/etc/slurm.conf.example for StateSaveLocation=*. or SlurmdSpoolDir=*"
-	# and tmp should go to /var/tmp/slurm
-	sed -e 's:/tmp:/var/tmp:g' \
-		-i "${S}/etc/slurm.conf.example" \
-			|| die "Can't sed for StateSaveLocation=*./tmp"
-	# disable sview since it need gtk+
-	sed -e '/sview/d' \
-		-i configure.ac
-	sed -e 's:sview::g' \
-		-i src/Makefile.am
-	# apply patches
-	epatch "${PATCHES[@]}"
-	elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-			--sysconfdir="${EPREFIX}/etc/${PN}"
-			--with-hwloc="${EPREFIX}/usr"
-			--docdir="${EPREFIX}/usr/share/doc/${P}"
-			--htmldir="${EPREFIX}/usr/share/doc/${P}"
-			)
-	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
-	use mysql || myconf+=( --without-mysql_config )
-	use postgres || myconf+=( --without-pg_config )
-	econf "${myconf[@]}" \
-		$(use_enable pam) \
-		$(use_with ssl) \
-		$(use_with munge) \
-		$(use_enable static-libs static) \
-		$(use_enable multiple-slurmd)
-
-	# --htmldir does not seems to propagate... Documentations are installed
-	# in /usr/share/doc/slurm-2.3.0/html
-	# instead of /usr/share/doc/slurm-2.3.0.2/html
-	sed -e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" -i doc/html/Makefile || die
-	if use perl ; then
-		# small hack to make it compile
-		mkdir -p "${S}/src/api/.libs"
-		mkdir -p "${S}/src/db_api/.libs"
-		touch "${S}/src/api/.libs/libslurm.so"
-		touch "${S}/src/db_api/.libs/libslurmdb.so"
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}"
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs"
-	fi
-}
-
-src_compile() {
-	default
-	use pam && emake -C contribs/pam || die
-	if use perl ; then
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}"
-	fi
-	if use torque ; then
-		emake -C contribs/torque || die
-	fi
-}
-
-src_install() {
-	default
-	use pam && emake DESTDIR="${D}" -C contribs/pam install || die
-	if use perl; then
-		cd "${LIBSLURM_PERL_S}"
-		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}"
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}"
-	fi
-	if use torque; then
-		emake DESTDIR="${D}" -C contribs/torque || die
-		rm -f "${ED}/usr/bin/mpiexec" || die
-	fi
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-	# install sample configs
-	keepdir /etc/slurm
-	insinto /etc/slurm
-	doins etc/bluegene.conf.example
-	doins etc/cgroup.conf.example
-	doins etc/cgroup_allowed_devices_file.conf.example
-	doins etc/slurm.conf.example
-	doins etc/slurmdbd.conf.example
-	exeinto /etc/slurm
-	doexe etc/cgroup.release_common.example
-	doexe etc/slurm.epilog.clean
-	# install init.d files
-	newinitd "${FILESDIR}/slurmd.initd" slurmd
-	newinitd "${FILESDIR}/slurmctld.initd" slurmctld
-	newinitd "${FILESDIR}/slurmdbd.initd" slurmdbd
-	# install conf.d files
-	newconfd "${FILESDIR}/slurm.confd" slurm
-	# Install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" slurm || die
-	# cgroups support
-	exeinto /etc/slurm/cgroup
-	doexe etc/cgroup.release_common.example
-	mv "${D}"/etc/slurm/cgroup/cgroup.release_common.example "${D}"/etc/slurm/cgroup/release_common || die "Can't move cgroup.release_common.example"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_cpuset  || die "Can't create symbolic link release_cpuset"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_devices || die "Can't create symbolic link release_devices"
-	ln -s release_common "${D}"/etc/slurm/cgroup/release_freezer || die "Can't create symbolic link release_freezer"
-}
-
-pkg_preinst() {
-	if use munge; then
-		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/slurm || die
-	fi
-	if use ypbind; then
-		sed -i 's,\(SLURM_USE_YPBIND=\).*,\11,' "${D}"etc/conf.d/slurm || die
-	fi
-}
-
-create_folders_and_fix_permissions() {
-	einfo "Fixing permissions in ${@}"
-	mkdir -p ${@}
-	chown -R ${PN}:${PN} ${@}
-}
-
-pkg_postinst() {
-	paths=(
-		/var/${PN}/checkpoint
-		/var/${PN}
-		/var/spool/${PN}/slurmd
-		/var/spool/${PN}
-		/var/run/${PN}
-		/var/log/${PN}
-		/var/tmp/${PN}/${PN}d
-		/var/tmp/${PN}
-		)
-	for folder_path in ${paths[@]}; do
-		create_folders_and_fix_permissions $folder_path
-	done
-	einfo
-
-	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
-	elog "through a (javascript enabled) browser to create a configureation file."
-	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
-	einfo
-	elog "For cgroup support, please see http://www.schedmd.com/slurmdocs/cgroup.conf.html"
-	elog "Your kernel must be compiled with the wanted cgroup feature:"
-	elog "    General setup  --->"
-	elog "        [*] Control Group support  --->"
-	elog "            [*]   Freezer cgroup subsystem"
-	elog "            [*]   Device controller for cgroups"
-	elog "            [*]   Cpuset support"
-	elog "            [*]   Simple CPU accounting cgroup subsystem"
-	elog "            [*]   Resource counters"
-	elog "            [*]     Memory Resource Controller for Control Groups"
-	elog "            [*]   Group CPU scheduler  --->"
-	elog "                [*]   Group scheduling for SCHED_OTHER"
-	elog "Then, set these options in /etc/slurm/slurm.conf:"
-	elog "    ProctrackType=proctrack/cgroup"
-	elog "    TaskPlugin=task/cgroup"
-	einfo
-	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
-	for folder_path in ${paths[@]}; do
-		ewarn "    ${folder_path}"
-	done
-}
diff --git a/sys-cluster/slurm/slurm-2.5.4.ebuild b/sys-cluster/slurm/slurm-2.5.4.ebuild
index 24da0062ebb0..75eaeecfe6dc 100644
--- a/sys-cluster/slurm/slurm-2.5.4.ebuild
+++ b/sys-cluster/slurm/slurm-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.5.4.ebuild,v 1.1 2013/04/03 13:43:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.5.4.ebuild,v 1.2 2013/04/12 10:33:40 alexxy Exp $
 
 EAPI=4
 
@@ -57,7 +57,7 @@ LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
 RESTRICT="primaryuri"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.5.0-nogtk.patch"
+	"${FILESDIR}/${PN}-2.5.4-nogtk.patch"
 )
 
 src_unpack() {