Version bump per bug #467920

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xF82F92E6

3 files changed, 284 insertions, 16 deletions

diff --git a/sys-cluster/slurm/ChangeLog b/sys-cluster/slurm/ChangeLog
index 3514d10f53e8..244602cd5156 100644
--- a/sys-cluster/slurm/ChangeLog
+++ b/sys-cluster/slurm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2013/04/12 10:33:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.24 2013/06/02 19:46:40 alexxy Exp $
+
+*slurm-2.5.6 (02 Jun 2013)
+
+  02 Jun 2013; Alexey Shvetsov <alexxy@gentoo.org> +slurm-2.5.6.ebuild:
+  Version bump per bug #467920
 
   12 Apr 2013; Alexey Shvetsov <alexxy@gentoo.org>
   +files/slurm-2.5.4-nogtk.patch, -files/slurm-2.3.4-glibc2.16.patch,
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index d41cf5c0ccf0..0e442a302109 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -9,24 +9,26 @@ AUX slurmd.initd 2109 SHA256 1083215224462facd69418fdb6188246911cfe5ca8241fa3af6
 AUX slurmdbd.initd 1830 SHA256 f23e1d6fdfa935bc0830cc963cf25621c9255ef50871712742cc425ea3fb034c SHA512 4d9974f843203cb713dcc1aa5a68260593a9b802a5881980cecf887a2d6f962bb7aa73972110c9e4aad61795bae40d0130bbf0c605dda4f7ee5cfb26a7e7aed1 WHIRLPOOL 76ea5aea38e29bd47308903a0f57dd944d0f52a0df8c5096e66289de2d7ca292677b063952b33d8d75d1cc8fd543b70c0cefe06946b730547389ea0e3440d934
 DIST slurm-2.4.5.tar.bz2 5377708 SHA256 db1d2f559353e0b494cf7a29ec3f7f314cb2e6131e1b8dfe307cf189b51626a4 SHA512 5e0ed11608bfb00a0f7fa8199fc5aef4d7568fa171570b1f40a6356070f4cde7c4227be3997650d3f2c26b46fd408a2b97d48fd0d0b6aef6a3aff9ea75a22b7a WHIRLPOOL 599aa7c846ca655912711286eaadaef732c434f5bcc0ed905b6aa3bfa07be81322c8b6253bc11e7644f6a72918a2c9383682c97847e8bbd78d77c49b56f5ad9f
 DIST slurm-2.5.4.tar.bz2 5497719 SHA256 c713ea74742ce14a27b88b02f1a475bc71cde22ad3a323a4d669530d8b68f09e SHA512 46231fbf0237d6afdede1ca8ff32d5e87c1cff1bc13ceb6dd61adc58f142fb5070759e7747a4ae81a54293a2ca73caf9a4fcf535786728178ee0afba141aa7bd WHIRLPOOL bad00e2c9d42a1de3ff87426124fdc5fee1fff368907e0812007ab9bc0aec0127287afe7f77c7d5b3314caec15a9f7b3a83eaf1f6520c2f0ccdfaebd74ba201d
+DIST slurm-2.5.6.tar.bz2 5586165 SHA256 0bfcf9b5942792c149382c6f890a29ca9fdbc1a083d4ab1de8b08c6d3c6ce48f SHA512 4d8736b101380d04d67c3316f1948fb78f668c650740fbf69ad1b3a647f828b0fc97910659f006c70ab2ed6148883ce1803ff498b0edada3a2205aed10d0db94 WHIRLPOOL 1f1bad205d75ac563c19061ea3806341c78514e3eaa50aa832ffb3a91177a454377689e9bf0a77361bcaa720ac32d9dddd2c34cd3a7aa80a9602fceeac49dac5
 EBUILD slurm-2.4.5.ebuild 7986 SHA256 a90eb47942dedc1e90b659dac63854c83f9fe1fb2cd578b27c345443db985411 SHA512 f760c6f6df9231c8c74075f6c988725b3bea9364212523e74467155bc0257f88d9574240b6fa17f60ff0ebb3d1f372bc41ddb42492673144a26c4f096d9352d1 WHIRLPOOL 439a174b613f2369160978cb8c4780c23753031d52e08f59045ac99d2811fec89098d6d0efbb35e67a77aa90d03355d7d12f8495d305a441dcdc41bf48e57c4d
 EBUILD slurm-2.5.4.ebuild 8284 SHA256 25e5a79a04afd988131c12f6e950938a7bcf4fdd60d051bc27e70f3b0af8bf4b SHA512 ef8e48d34bbf9991206090b598bf141ecb6738ad10d442ab73ae69af76480b7dfca2accc9e05da675ae7c405b33ba80f68d30d75d9461b390d094b8c92b516eb WHIRLPOOL 991521fa51ba72649737dc32b6d7478899db21e163753b9f3eadf9572e5761013b45e4dcd77859b5a2dffd2589d089e1b9a4020b3c412183a042de9e7ec57d68
-MISC ChangeLog 3994 SHA256 c2b334b48e00a3ee73bd48172a071caefa0de2ebba37d24f041bf0f30efbc849 SHA512 27a9c7cf177e2f164cb861ba00a9da60afbb9151064a046e9dfc11db33467b1c0cf17844fe9db50e182694f20f0a5c355f8a8fe32dafcd0ed7f7f6632f8e6d77 WHIRLPOOL dcaefd965578db6b9f48a917094ba3334ac81727b178482e3729204d4e08416be818929d47020830e4176a4c788759e4d0432337a09667bf1c6a6ccb15f70f56
+EBUILD slurm-2.5.6.ebuild 8284 SHA256 a5ce375f8102b5078f78bd22f4460c25eb4ac49f1c105e62172dc8b4fac39410 SHA512 0ce39a3b14169206a25c992b52fde06c90026d349beb18e14826e5635a2859ad4bf0ebfeb353641ca5282457d56bac77b628b470ab64039e73041fb493855d4b WHIRLPOOL 51727b8b62fce2fdd6e3d3eaa28b66a698c450b59c1ca3e6a9c8587befb6b40193c53d79df94639feaad68b3638d4ba0fcf97912fb3ce61d5d5425643a3db965
+MISC ChangeLog 4126 SHA256 125b3e9f4b3cebe5fc908b76ebeb5635bd8737820106b569c9536bfdedc896a1 SHA512 8c2dd5ebde7612c440412c9cfd9f063fcecb3763b2542d0514079e47180bc1cce5af16ecd3846c4564192b014418208f1513cd100c97670ebcfbab3cedd21de3 WHIRLPOOL 0036052d00180694578fb73456e2884d7da09a48de0929c7a77a60e9b76ce6783a2696beff491a9a248c33595f63b75d4326f8282e9f907e6cd3febfaa251fde
 MISC metadata.xml 564 SHA256 9f06f3b57990b43d1373d5895f59a73f3d371ed78fe5eff0eacbb143d15a15ca SHA512 bfb5b67ddb87cfcb3fc5dceeb32fed1b801f256cb898cdfd27722123abddcd34bd300c7c3599014ac0d89048645a7fec2f1cfe68a0a06817018a83953555ad54 WHIRLPOOL 9cbe2ec2eaa364467ab660f04bbdaa3199f778b9788cb66aef90c47f09853eb53fce5728571f5c15feae6bd9dfd16b0aa850e44f4c1118da9db9af331b6d369d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJRq6EgAAoJEOf+E+/4L5Lm9D0QAK/+atDqBKGICbBIZ54INYS9
+AmJ5YwGfTtD1T2i38h1Izr584AoFotBciPPKJi5KH/ZD96arxJJgTXGWxA3se+2X
+Y0QvGVjGCnBFVVWqIycXUOKOqBQEp44xVVdGZOLvVsvlFjpeOnoxKFx3StR7nDi6
+jk7zj5YF/NBE+SxSZZ4At8DhkmvTJujXf0r/TVncJYlV4S0+O8pfgl2MP34RXtgU
+EaPn1eSsKWFuoB0r/IX25xZhMTTf2XVuwFmP5Tksla0Y5IXO1US5Is/AnF4KdQDu
+MJMck8F2F2W3ui0DTpyErSW1mAtIoDbk9qbxeAHNQSNyOrS6AeFXuPyBh9GfsgEu
+VKIOs10ml9t5xctrphos7FUReIR5dKFqTlDE0KVVrRVU3huayP4Q+YjAVQd38rgy
+/fsgLV2a2O+ev5mm8Ntz9t6/uaRFTLKu3Fq33sWZd9psixrcKSt0s4RWzoEP3Lv2
+Jqm2AwopvIYYcgbLImPIBgFcgr6++MrLbet53AXW8kqIhn2jYUaVw74xoFkO5Lml
+D/gJw2bOTAye7M5fuPhp5aXZ2ar+oEkQ+ThQgm0KWq8Evj6yqOrh0e5bJWadwOdq
+2MlG6BbJK+URsCiNCvqfzYlHrnhOIBQdmXNWpuwCoEcVe3Bn0O1apIksw1ZCFLxY
+QHipGQyTMuQRdrbkADQ3
+=diTN
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/slurm/slurm-2.5.6.ebuild b/sys-cluster/slurm/slurm-2.5.6.ebuild
new file mode 100644
index 000000000000..b1a867e1e548
--- /dev/null
+++ b/sys-cluster/slurm/slurm-2.5.6.ebuild
@@ -0,0 +1,261 @@
+# 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.6.ebuild,v 1.1 2013/06/02 19:46:40 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.4-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
+}