[sys-cluster/slurm] Version bump to 2.3.x series

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

3 files changed, 176 insertions, 17 deletions

diff --git a/sys-cluster/slurm/ChangeLog b/sys-cluster/slurm/ChangeLog
index 434c2ab50559..b428e674035d 100644
--- a/sys-cluster/slurm/ChangeLog
+++ b/sys-cluster/slurm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/slurm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.7 2011/10/26 16:00:57 alexxy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.8 2012/02/09 19:41:58 alexxy Exp $
+
+*slurm-2.3.3 (09 Feb 2012)
+
+  09 Feb 2012; Alexey Shvetsov <alexxy@gentoo.org> +slurm-2.3.3.ebuild:
+  Version bump
 
   26 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> slurm-2.2.7-r2.ebuild:
   Fix build if no previos slurm was insatlled
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 6fc65b8399c7..bde8c4cfe7aa 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -6,24 +6,26 @@ AUX slurmctld.initd 1161 RMD160 5a5c8c8e2cf467467e7ba1858109789a750cc423 SHA1 c0
 AUX slurmd.initd 1125 RMD160 1b5f8a9a719ebfa05125c597cb5d3bf149e9a6e0 SHA1 08b8265c0a4727b0bba04c1eae37fb6f4a47f1a7 SHA256 6dbd921451209bdd62c3354e5e5c0c000de3af7cf4e4f809bac7fda59bff663b
 AUX slurmdbd.initd 1046 RMD160 dd897cbdc0a5e64a24ad43b76c2b85b8a7515824 SHA1 b7ba92782a5010e6bca4b5b4903e9f57f16ca921 SHA256 ddf8c11886a1bce77b7ce8e73f6b91ceb5a994fbb3665e9e3f51468eae02fe48
 DIST slurm-2.2.7.tar.bz2 4454740 RMD160 37ee3ef3382e3ca00cff99901020825bbf0c0b03 SHA1 b5e62504f31007f593d6ce6d90415579273a7b0f SHA256 8dfd8ec1b447caa1c8d83817a90414e19bc5b8cc9caf2c7ec4b6d2cb6bcd0a7e
+DIST slurm-2.3.3.tar.bz2 5079379 RMD160 9a6584a23afbadbf6e307ea9efa583478475e53a SHA1 d307747c1ab3ba5f8908e4ac466e4f094255f5dd SHA256 75baa014e2ca569644c37b5cd5c4c599aa57a6fbb73c81b1272a00678050e3d2
 EBUILD slurm-2.2.7-r1.ebuild 3545 RMD160 1a3caa7458e44254cdef1b968b5a95d03045723a SHA1 1e6eaacb65c00a8041d4c5503ec93b35c594d8b2 SHA256 7d246aa7a8685a02b6cd3915a811020360b8b8893c054ee4cbc611de9faac063
 EBUILD slurm-2.2.7-r2.ebuild 4759 RMD160 4bdef83b56c928f76306ad4b5e8f3b5da9f6c3ee SHA1 98ea9cf3a27f6a9da78f82da1ee9df0cc85fabf1 SHA256 293090530af8db24db6192f1101f347e9088386b8f0e64d710eed74559f0fedd
-MISC ChangeLog 1246 RMD160 b33660133e6999448adf38d14bf89537e07ec01a SHA1 28534d2bc11b10e4ec1811dc87eb6e6bf9e33701 SHA256 684bc97d22be0fdae03b92c1eb06569d6eac66d14dd3d3164daed5d60981e38e
+EBUILD slurm-2.3.3.ebuild 4413 RMD160 a5b4b5e1d31d85c5e1c0528f92c9827b5259593d SHA1 9cbf9cfe3ab75f5711c600779aa3746cbb6f1229 SHA256 e1cff011ebd2cea452769c0aadc56ce7f0b42f76813514c8678e1c674f574c50
+MISC ChangeLog 1362 RMD160 8a20b71edf7de09e243b9501983e0f201243bc31 SHA1 f079bd65f2aad822ebf175b66773ba883ae8462c SHA256 fa27f022d5c1d429ffd3f7686a4e6ad4947706985c57bf60d1e0ec86fecc828b
 MISC metadata.xml 443 RMD160 0a1990a76e09e35f4828dd4d354386fb0466f863 SHA1 18f4c31746d23a579bb56dbc0bd3a341cd3bc1b3 SHA256 d72c661300e641a22f67fed77fa1c9ffc8a4723222fd785df11a2ca1249e065a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOqC7GAAoJEOf+E+/4L5LmYwcQAIOkcAGD2fGkX5N4ktbFYPz8
-RyXt8KxYUqm1d0h7IKVUqRThCgJRAKTLTl5ejZTFP95Ya47DhLxF2fH7AmpzLGj2
-Qt7ER0FSlrweH3ZUxD6oUpZdS0FxAOMwZa9Xm8xgb2Vks4pZ7tJ+2d7sqp0D6PET
-eHUE7XRpfoK/45b8zCKRywkJ7n3zrH4M8Ggb9Tf+f2weOuUPQwD24bFDWaZJmOzI
-nV8XilTt5jtiYdS+N2bX7YoVfymMFq2I8X3tRBtmHRchdlzxVRR+ZuPcXy/pW1Ny
-/FwoIOMojDEBUYVAttIqFc4BLFLA8QZXOQESC9GE3WyGovV12vvh6p3ZRvjkaqfK
-GSj9dg+Y4BYVeCGlZzcbjVxw1IuyEzTQoFyGfyU2ZODp6MQzJoxTcWmYb0ZppJBO
-B3n2ufV8HsYm1nu/4c2ScF/+rHXBgvJuguV/wnDZ/sL8Guh9DKPsafwu4oEZ8Kpo
-h6YimVJ1BUWpLUqoRZLzo13S2WPV+FeAyhuZlMsxAmKSkxi0sNw1C2zeuILEM37B
-tOI6v+0ifjyWMez/fxz+XJc2LK0r/R5yJiTNwBBbgbX8mrA71k3ZiAo0TNtAamvs
-030oUN7NpnB4ILnapI6b+2QKDjkWNvQLcGWo60JXrbuCZC2yj24xT8JA528K/snW
-3qyBsinT7DAtAzTpTptx
-=BSlT
+iQIcBAEBCAAGBQJPNCGRAAoJEOf+E+/4L5LmV14P/RasE3SCZ7l9d2SXSDLEPBwC
+gb1QsG0AW90eMpdnKHupTCOn+aNj9mevQojL9EskPLyBRLpiOKulsnUdTdUmq00P
+rjdPsx6TlyzhArBbSMEnVK/EsrOA56hDAN6O3SIE05vdIGWn7QaYCtM7+8pxjc9K
+XHpSbYQMVp9WrCYj5/Qjc68bvnGutej+b8rFushDfdTlW1wtBQrxvpzJJfHjceF+
+jxK5MS8r+/2pgBdj8TjDdgpkxOd+uAO2+CiOy0fomOEdQxYfuCPg3lAKn1HSv1te
+1eC3s8FaMzaAX+OMKCwnOuVS1Rpls3YLZVxIQOAoKyfcB1HmjFB7iKPovBGku9Nr
+f2iBBYDyveQEoSjAohC1Dlvn2giyJEZzOBVdDdns7c2FhREOzvOrRaP4entAHa4W
+UMwfp2SKHlI7tAW486YrXywzzW3n/jC9Xxt0Hjdwd32Reg9heahdSlRuqOQh2+mr
+OC+Cs6Q+15VBQHwlrSaqpbSl7w7QC8h/togLtZrLkfUvjmBGGUa4n6PkPSCEyO/U
+BiExv9jS5V4Prt1EMEq6yJyyv3O7EAGHKgYmIfvA4ikIgusAjbGT8Bq493g+DwYW
+Q82Tc98dhOHm8LaCpe2gVAoAG+7JhIe1Srh0etiPR/MVIv5/A2T2nhfK7Td2bNEz
+8pJQv3NpM/W33610iRUz
+=HXYd
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/slurm/slurm-2.3.3.ebuild b/sys-cluster/slurm/slurm-2.3.3.ebuild
new file mode 100644
index 000000000000..906d8f7023c7
--- /dev/null
+++ b/sys-cluster/slurm/slurm-2.3.3.ebuild
@@ -0,0 +1,152 @@
+# 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.3.ebuild,v 1.1 2012/02/09 19:41:58 alexxy Exp $
+
+EAPI=4
+
+inherit eutils pam perl-module
+
+DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
+HOMEPAGE="https://computing.llnl.gov/linux/slurm/"
+SRC_URI="
+		http://www.schedmd.com/download/latest/${P}.tar.bz2
+		http://www.schedmd.com/download/archive/${P}.tar.bz2
+		"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="maui +munge mysql pam +perl postgres ssl static-libs +torque"
+
+DEPEND="
+	!net-analyzer/slurm
+	mysql? ( dev-db/mysql )
+	munge? ( sys-auth/munge )
+	pam? ( virtual/pam )
+	perl? ( perl-core/Switch )
+	postgres? ( dev-db/postgresql-base )
+	ssl? ( dev-libs/openssl )
+	torque? ( !sys-cluster/torque )
+	>=sys-apps/hwloc-1.1.1-r1
+	"
+RDEPEND="${DEPEND}
+	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"
+
+pkg_setup() {
+	enewgroup slurm 500
+	enewuser slurm 500 -1 /var/spool/slurm slurm
+}
+
+src_prepare() {
+	# 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"
+	# also state dirs are in /var/spool/slurm
+	sed -e 's:StateSaveLocation=/tmp:StateSaveLocation=/var/spool/slurm:g' \
+		-e 's:SlurmdSpoolDir=/tmp/slurmd:SlurmdSpoolDir=/var/spool/slurm/slurmd:g' \
+		-i "${S}/etc/slurm.conf.example"
+}
+
+src_configure() {
+	local myconf=(
+			--sysconfdir="${EPREFIX}/etc/${PN}"
+			--with-hwloc="${EPREFIX}/usr"
+			)
+	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)
+	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
+	emake DESTDIR="${D}" -C contribs/torque install || die
+	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
+	fi
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	# we dont need it
+	rm "${ED}/usr/bin/mpiexec" || die
+	# install sample configs
+	keepdir /etc/slurm
+	keepdir /var/log/slurm
+	keepdir /var/spool/slurm
+	keepdir /var/run/slurm
+	insinto /etc/slurm
+	doins etc/*.example
+	exeinto /etc/slurm
+	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
+}
+
+pkg_preinst() {
+	if use munge; then
+		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/slurm || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "Fixing permissions in /var/spool/${PN}"
+	chown -R ${PN}:${PN} /var/spool/${PN}
+	einfo "Fixing permissions in /var/run/${PN}"
+	chown -R ${PN}:${PN} /var/run/${PN}
+	einfo "Fixing permissions in /var/log/${PN}"
+	chown -R ${PN}:${PN} /var/log/${PN}
+	echo
+
+	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.conf on all nodes (including the headnode) of your cluster."
+}