Add missing inherit of user.eclass for enew{group,user}. Fix building with glibc-2.16 wrt #430252 by Diego Elio Pettenò <flameeyes@gentoo.org>

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 69 insertions, 17 deletions

diff --git a/sys-cluster/slurm/ChangeLog b/sys-cluster/slurm/ChangeLog
index 076c000cdae0..9e67e6d0da8c 100644
--- a/sys-cluster/slurm/ChangeLog
+++ b/sys-cluster/slurm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/slurm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.12 2012/05/09 07:37:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.13 2012/08/23 09:36:49 xarthisius Exp $
+
+  23 Aug 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/slurm-2.3.4-glibc2.16.patch, slurm-2.3.4.ebuild:
+  Add missing inherit of user.eclass for enew{group,user}. Fix building with
+  glibc-2.16 wrt #430252 by Diego Elio Pettenò <flameeyes@gentoo.org>
 
   09 May 2012; Zac Medico <zmedico@gentoo.org> slurm-2.3.4.ebuild:
   Move EAPI assignment to top of ebuild, bug 411875.
@@ -57,4 +62,3 @@
   +files/slurm.confd, +files/slurmctld.initd, +files/slurmd.initd,
   +files/slurmdbd.initd, +metadata.xml:
   Initial import
-
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 503a827e12e3..9a71805bcc9e 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,19 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX logrotate 360 RMD160 80cd0bcd242413dc2e69dfca7ccd6698b02e82ae SHA1 eac0e307c40f7575060662d4d570d66f135e06fe SHA256 22a0e4bf21c9387f34245ec3cdd3a59512e377f6a0509451088b17e6c5201f89
-AUX slurm.confd 155 RMD160 73a90f9f7fa3fe02a77ac10fbb81c337fa3f2469 SHA1 937e5a3898b7102bac37ee8540c2b3105073d2f5 SHA256 bc1b32f7b3c4a2fb5d97ae227ff15d40da16c346c0eed33a7956ed780a1a0d96
-AUX slurmctld.initd 1952 RMD160 780eab8a019e1b3cf984e1a1bcb349d9ab04ec1f SHA1 b58efc209c5f0e62791863342aa878ce2dae1d09 SHA256 eda111fbbc9f6493d41e2942c6ca59e3e1a56034b32d4f1c2f14f127699e3a78
-AUX slurmd.initd 2109 RMD160 871a020158f99501d223f2799c24c57af495885e SHA1 e289687ff005b4abdb7cc4261f31117b91f1bfb3 SHA256 1083215224462facd69418fdb6188246911cfe5ca8241fa3af65a124759bf3d1
-AUX slurmdbd.initd 1830 RMD160 a7910486720458d8c24cdba297064100059bd972 SHA1 95d10303b0aa4a2796b36de7a4333c0100c7389d SHA256 f23e1d6fdfa935bc0830cc963cf25621c9255ef50871712742cc425ea3fb034c
-DIST slurm-2.3.4.tar.bz2 5082579 RMD160 5dbad2f6b2535366ee47fad0b6a192a4c38881d6 SHA1 198ef06298f6f46edad097a0b6e7be63cff61914 SHA256 2a221316077c4b70df42042d1c94bc552b38060fe2b775bf2827543eef63aeb4
-EBUILD slurm-2.3.4.ebuild 7550 RMD160 8187f3714518a580a29a8706f0ccadc4bf7db715 SHA1 568fb6d8551447806daa660a9b5fe8226cf6d4ed SHA256 058d3c872fa845b29f1d8bf25a5f72c44bc7667da0e596e64d6327384a5cf86d
-MISC ChangeLog 2157 RMD160 a801afd1bcd79199a3f8a7d91d3acbf478612574 SHA1 0ad4bfa4e04b60f3cc08540e80741d9b728c3e28 SHA256 8aaa24393326294f67f83657193b4882734b60119f810246974421cb068b62b4
-MISC metadata.xml 497 RMD160 c7cea24c46cbba00b9d9f6a5b227067941f44f59 SHA1 01cfa11a96fbbd63bdea8806b32693f12dd259da SHA256 3cff82ac54ff70daf04862ee4ef12c7684563244af8d4996b04937654b155c38
+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.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
+EBUILD slurm-2.3.4.ebuild 7602 SHA256 60b0fbb85836071ead8bc63a88a103ba67b24b17a24e8a8a1ce9968d905d9d1d SHA512 5e8c151e609bea65c2c102dd3072740cde3227b28093041fdbb9833aa2f120140f46c3496438852c93adab9e974a2a1affd970c460eefc861b41284239492cc6 WHIRLPOOL 35aa29648369fda933f93a61536c716cc43a1cd25072ef3b7b2afde594b6b0588409e36d7d9ac9af3be0b9497104a42fd15b1c92a0a350c7408b531e878ed493
+MISC ChangeLog 2420 SHA256 4bbd35b01c2e60d12f044e290be3e8d4973ec19fcf9fa0113f43d459e820badd SHA512 40c82a39a510b0a96cb76014441feee506c49abd3070f79ede7603d236b1f0228f552ac333522d72b9bc65a1775432b12b26b60be591dc646e489b181c0e035d WHIRLPOOL de2730de2a4749747791fea4b77b2b0604e9119539609b2d498f5d2d40b356bcc6bb37e55712854651a7378ea9fa182997fe35c085a3961081698e7e8ec04bc8
+MISC metadata.xml 497 SHA256 3cff82ac54ff70daf04862ee4ef12c7684563244af8d4996b04937654b155c38 SHA512 fb8e0aaf08171e6bfa3653c98559747f630863f918577f8a8eca314dd7451205601ada305b1f0c0758332ef205aab5a6eee55737aa48d0743af519ff1689d5b4 WHIRLPOOL 05f963e3acb1241209864fb5785120ad133990d72d3c5d10e7c0886d8f5f0bb7e840a3dc6be14f22afc8392663b5622ff8311b13f636282e159776326c169fbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+qHrcACgkQ/ejvha5XGaP10wCdEKfhufx1RotiCkauiTmzNelN
-JYQAoMP114/WSAowNPY4cI4EbJljrZvS
-=zDiV
+iQIcBAEBCAAGBQJQNfm6AAoJEF0huFKJUZL5LXsP+wRY+pLyyYKLTAOGsMAZcAp+
+BrB1VPa7yGMqjXdt7qChHFiUS1VYW0Ne1lK3XHQJ1Kyj/x3U4YzxSPbCXIzgMR6U
+lxdwFRMK9m1HI/s7LdAC9jETzxpjYB/kbY8hVwaw/cEbqVfVVKwdLBF3bTia9h5a
+vpKj5SG7RhcyNMB4HVTN+D7EeqbwXkPh7eAcyC2c5GNbyygNvb6fzYK6uc0eFs6W
+fUS/yp67WotqIEAZS3XXXhGdVfuXOQL0pYvvpO4E24JLwjHFePFjL61cnxbzLwJo
+27zm1tB8hMsUO5WpJO9om87vafFG+MSwEZm12XpA/q2aJo8VxlXJ6Rn3XJD6F2iv
+YuHNoZCTl/Ez/Q2YWofebAbjO30BXzAnoyn6k0DXOC99xCmmA844WAQiUuwt6geB
+OMhckp9/hxALkf3o0/wX70uPIOhRmEpYlNqk2wr44HeBs6bOSCXjjr1CvuFhdNhZ
+Fsd9QOunJM6RQuJeQphXqmSDMT421acViSTS3wVBAXR8E5jSGXl6c8OS0g1HG+vi
+E+581cnB7PXLvN18NkTx+uYNGRWhqB9xR1LWWRWek+i4K23e9xBUV2hY5zgv0zj4
+3oa3JAlY3wNacFgb3l1sb2FF5zOvmbmceD1vD3fvag4qMEauVtiKuD8spfTfzRBA
+y//zlN0I0CybGUr3P24s
+=8V6U
 -----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
new file mode 100644
index 000000000000..34e8e59f2124
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm-2.3.4-glibc2.16.patch
@@ -0,0 +1,35 @@
+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/slurm-2.3.4.ebuild b/sys-cluster/slurm/slurm-2.3.4.ebuild
index 4a5494b99dd6..39f9ab362565 100644
--- a/sys-cluster/slurm/slurm-2.3.4.ebuild
+++ b/sys-cluster/slurm/slurm-2.3.4.ebuild
@@ -1,11 +1,11 @@
 # 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.3 2012/05/09 07:37:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/slurm-2.3.4.ebuild,v 1.4 2012/08/23 09:36:49 xarthisius Exp $
 
 EAPI=4
 RESTRICT="primaryuri"
 
-inherit eutils versionator pam perl-module
+inherit eutils versionator pam perl-module user
 
 MY_PV=$(replace_version_separator 3 '-') # stable releases
 #MY_PV=$(replace_version_separator 3 '-0.') # pre-releases
@@ -71,6 +71,8 @@ src_prepare() {
 	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() {