Add blocker to slurm and add maui scheduler to rdepend

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

4 files changed, 262 insertions, 11 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index fd40d9f2e1f9..6084b321407d 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.117 2011/07/02 18:12:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.118 2011/07/03 23:37:20 alexxy Exp $
+
+*torque-2.5.6-r1 (03 Jul 2011)
+
+  03 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> +torque-2.5.6-r1.ebuild,
+  metadata.xml:
+  Add blocker to slurm and add maui scheduler to rdepend
 
   02 Jul 2011; Raúl Porcel <armin76@gentoo.org> torque-2.4.14.ebuild:
   alpha/ia64/sparc stable wrt #372959
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 0663e43b60cc..4e992966325d 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0001-fix-parallel-doc-install.patch 1510 RMD160 d1e59f8888bd5e15f563f2e40fba83739aa8d5bb SHA1 750746a9503e92451e2e2ff6c63305cef6959743 SHA256 ad576c6449e078841f8f3dad1515d74264b66d43dfe5232007aca4c467120b22
 AUX 0002-fix-implicit-declaration-warnings.patch 1325 RMD160 b20b48f93d470de63772d884c6a4f63ddb86e825 SHA1 b24e9a5c5291edc8b061241446d8e975872b9477 SHA256 e3ca220f3a30ad68eaabc2152bf5e9e60fc09347d9f61edccb755d7837ef2764
@@ -19,13 +19,24 @@ DIST torque-2.4.14.tar.gz 5705022 RMD160 7bfa41fb6648060316c58dbd01c6741a46f1fa8
 DIST torque-2.5.6.tar.gz 5832421 RMD160 917ae2fd1617c2bb4f7d4f8bed37065bf0f381af SHA1 b4433cc00679b1212960691f8f0939f3dc45b56c SHA256 7b8f4273e7b54a84bbdc9b54ba8f641e348d0592700d7b7cdad67ec28c95a116
 EBUILD torque-2.3.13.ebuild 7721 RMD160 394d879172bc72b485b37a928887045068e90977 SHA1 4a7549f0356ded5cc48d56850875628980a2f178 SHA256 05021de624a6e1c52eb2f731232588e75b2fcc04b7bbed6fe640fecd9f779b84
 EBUILD torque-2.4.14.ebuild 7652 RMD160 41473dad958187095c8c4774c8534086cf641c63 SHA1 3b38a8e66851863513c857313d9d58058c28ea9a SHA256 8532568fcd103717df61960ee59d7c6dd553bb5ad8ded4980137737bb2df7913
+EBUILD torque-2.5.6-r1.ebuild 7268 RMD160 d3dabaca8a345dcbfc3d8923f2646001a2c41346 SHA1 e8bdb7d6dc3bcacb19738023c79a8c920de8dec7 SHA256 3c876172c2bfd413d1f143eec5892116b66520df369e684c3a7c3a011560eabc
 EBUILD torque-2.5.6.ebuild 7210 RMD160 b1d10c7903884f8abd479d6aa291dab4cf99087d SHA1 556d9691dbc13772b25ac3a067839735f9d8bec5 SHA256 4de37b0c6134c81d53f33705d37107042c0d01832495c987da6be85def14f587
-MISC ChangeLog 19974 RMD160 d466045e2bf230972913f0971ffa2ef24078a8bb SHA1 4567b3e720fedb13b7cefb2206db29ff724fb4d4 SHA256 77ee3cc9ab784635210b5df3ce0544f300264c3eac708406928e30c127da0066
-MISC metadata.xml 553 RMD160 daf765f9ef4f42572cab45458d862e6be34422f2 SHA1 59b8ab62a8101f744de073fa38a72796da8a1fb5 SHA256 73c903923564e2736d7fcd0f91d3e54293fb9a9865b5010f2a50bbbbae98d522
+MISC ChangeLog 20155 RMD160 4285b67a0680daa0934a11531c429db62d8aef05 SHA1 38531de8e58dffc79016d3af2ce24f5825842870 SHA256 a37bc84e7ff07cc5c8e7ef0e9ef4bc675e02e2fbea601f54a975790430aa4013
+MISC metadata.xml 606 RMD160 32d794833d6e1d738a360aff235cd0397ef8faa8 SHA1 5db8a495f7a1aaedce670335a9a7170a25c22863 SHA256 ad8cda198d3ad1e98ed41a522c997a31983c8a738fea60e7e19c505472c55ac1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4PZRUACgkQuQc30/atMkAzhgCgjG2rahZnP7i8c2CqDNjm2xze
-MZsAoJo2mAK4rUUf1vAwH88A2sidBeqV
-=YIrG
+iQIcBAEBCAAGBQJOEP0yAAoJEOf+E+/4L5LmQcIP/RGKRdXMwKz5eINyHc41h4Lh
+GPF4lavR2oW+awSciS1RImCpnifs7GUnzhbJ54biy7wxLNXJLDKfTd56TBhqfkmH
+XNwYnVE3STMgj05ExdivAtCQfoWUuBU2/92Rb81F8VPfeITqrQ6rBAXgfBSUF2Sj
+Xbnk8gYtsS4yq2mJYd1vCtpu0cEV1Pb9xM2MEd2rg14pViKdjPnDBCaG1CuJjdYw
+rv7TR/AgAXp401YhmniLeEzGql17BLYxOVCKL4V0mddMoz1UMkCxl/gNUee3TM9D
+vijUMbgWlVfH8cAFP4ydtsjzBgjHCoJAH1XmzNv/HmmBCsdL7lV6HOq/e4HGSCK2
+2kE0bcvVZO5s/ZC4VXAPebbuPKdHMEmlvHL+eA7zp7f3TUAxbWzjez3zHADplc3H
+oW0v52jIhbm7CM3UT7UPiyPuu4m6kR5KSoVvb/vS0fpxsSUDekdk4ecZ/LNzsRTB
+s7ZdB3XPd2BkFRSNLn5cdoBhjHC91OnmtqZSHmZb08La+qxMkqSTm0LfOMNvt4wx
+uIGfRpCIACoLzyFy/leONIGOmLjs43HVsZCdw0DP44e5ijypYojQaZwYsXJJ4Qdr
+gtuSgRCqKOQP0pfIM94M0QvnR7kvcCOL/OzCPRQ24JK063IIDJy9M0xZX/286Na5
+kT6jDjNwTN5sJkdFbXIv
+=DHFo
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml
index f4414d402e5c..d041ab0b5b78 100644
--- a/sys-cluster/torque/metadata.xml
+++ b/sys-cluster/torque/metadata.xml
@@ -6,9 +6,10 @@
 		<email>jsbronder@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='cpusets'>Enable pbs_mom to utilize linux cpusets if available.</flag>
-		<flag name='drmaa'>Enable the Distributed Resource Management Application API.</flag>
-		<flag name='munge'>Enable authentication via munge.</flag>
-		<flag name='server'>Enable compilation of pbs_server and pbs_sched.</flag>
+		<flag name='cpusets'>Enable pbs_mom to utilize linux cpusets if available</flag>
+		<flag name='drmaa'>Enable the Distributed Resource Management Application API</flag>
+		<flag name='maui'>Enable maui scheduler support</flag>
+		<flag name='munge'>Enable authentication via munge</flag>
+		<flag name='server'>Enable compilation of pbs_server and pbs_sched</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/torque/torque-2.5.6-r1.ebuild b/sys-cluster/torque/torque-2.5.6-r1.ebuild
new file mode 100644
index 000000000000..5f6e0ae97941
--- /dev/null
+++ b/sys-cluster/torque/torque-2.5.6-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.5.6-r1.ebuild,v 1.1 2011/07/03 23:37:20 alexxy Exp $
+
+EAPI=2
+inherit flag-o-matic eutils linux-info
+
+DESCRIPTION="Resource manager and queuing system based on OpenPBS"
+HOMEPAGE="http://www.clusterresources.com/products/torque/"
+SRC_URI="http://www.clusterresources.com/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="torque-2.5"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpusets +crypt doc drmaa kernel_linux maui munge server +syslog threads tk xml"
+
+# ed is used by makedepend-sh
+DEPEND_COMMON="sys-libs/ncurses
+	sys-libs/readline
+	munge? ( sys-auth/munge )
+	tk? ( dev-lang/tk )
+	syslog? ( virtual/logger )
+	!games-util/qstat"
+
+DEPEND="${DEPEND_COMMON}
+	sys-apps/ed
+	!sys-cluster/slurm"
+
+RDEPEND="${DEPEND_COMMON}
+	crypt? ( net-misc/openssh )
+	!crypt? ( net-misc/netkit-rsh )
+	maui? ( sys-cluster/maui[pbs] )"
+
+pkg_setup() {
+	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}"
+
+	# Find a Torque server to use.  Check environment, then
+	# current setup (if any), and fall back on current hostname.
+	if [ -z "${PBS_SERVER_NAME}" ]; then
+		if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
+			PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
+		else
+			PBS_SERVER_NAME=$(hostname -f)
+		fi
+	fi
+
+	USE_CPUSETS="--disable-cpusets"
+	if use cpusets; then
+		if ! use kernel_linux; then
+			einfo
+			elog "    Torque currently only has support for cpusets in linux."
+			elog "Assuming you didn't really want this USE flag."
+			einfo
+		else
+			linux-info_pkg_setup
+			einfo
+			elog "    Torque support for cpusets is still in development, you may"
+			elog "wish to disable it for production use."
+			einfo
+			if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
+				einfo
+				elog "    Torque support for cpusets will require that you recompile"
+				elog "your kernel with CONFIG_CPUSETS enabled."
+				einfo
+			fi
+			USE_CPUSETS="--enable-cpusets"
+		fi
+	fi
+}
+
+src_configure() {
+	local myconf="--with-rcp=mom_rcp"
+
+	use crypt && myconf="--with-rcp=scp"
+
+	econf \
+		$(use_enable tk gui) \
+		$(use_enable syslog) \
+		$(use_enable server) \
+		$(use_enable drmaa) \
+		$(use_enable threads high-availability) \
+		$(use_enable xml server-xml) \
+		$(use_enable munge munge-auth) \
+		--with-server-home=${PBS_SERVER_HOME} \
+		--with-environ=/etc/pbs_environment \
+		--with-default-server=${PBS_SERVER_NAME} \
+		--disable-gcc-warnings \
+		--with-tcp-retry-limit=2 \
+		${USE_CPUSETS} \
+		${myconf} \
+		|| die "econf failed"
+}
+
+# WARNING
+# OpenPBS is extremely stubborn about directory permissions. Sometimes it will
+# just fall over with the error message, but in some spots it will just ignore
+# you and fail strangely. Likewise it also barfs on our .keep files!
+pbs_createspool() {
+	local root="$1"
+	local s="$(dirname "${PBS_SERVER_HOME}")"
+	local h="${PBS_SERVER_HOME}"
+	local sp="${h}/server_priv"
+	einfo "Building spool directory under ${D}${h}"
+	local a d m
+	local dir_spec="
+			0755:${h}/aux 0700:${h}/checkpoint
+			0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs
+			1777:${h}/spool 1777:${h}/undelivered"
+
+	if use server; then
+		dir_spec="${dir_spec} 0755:${h}/sched_logs
+			0755:${h}/sched_priv/accounting 0755:${h}/server_logs
+			0750:${h}/server_priv 0755:${h}/server_priv/accounting
+			0750:${h}/server_priv/acl_groups 0750:${h}/server_priv/acl_hosts
+			0750:${h}/server_priv/acl_svr 0750:${h}/server_priv/acl_users
+			0750:${h}/server_priv/jobs 0750:${h}/server_priv/queues"
+	fi
+
+	for a in ${dir_spec}; do
+		d="${a/*:}"
+		m="${a/:*}"
+		if [[ ! -d "${root}${d}" ]]; then
+			install -d -m${m} "${root}${d}"
+		else
+			chmod ${m} "${root}${d}"
+		fi
+		# (#149226) If we're running in src_*, then keepdir
+		if [[ "${root}" = "${D}" ]]; then
+			keepdir ${d}
+		fi
+	done
+}
+
+src_install() {
+	# Make directories first
+	pbs_createspool "${D}"
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc CHANGELOG README.* Release_Notes || die "dodoc failed"
+	if use doc; then
+		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
+	fi
+
+	# The build script isn't alternative install location friendly,
+	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
+	for file in `find "${D}" -iname tclIndex`; do
+		sed -e "s/${D//\// }/ /" "${file}" > "${file}.new"
+		mv "${file}.new" "${file}"
+	done
+
+	if use server; then
+		newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server
+		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
+	fi
+	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
+	newconfd "${FILESDIR}"/torque-conf.d-munge torque
+	newenvd "${FILESDIR}"/torque-env.d 25torque
+}
+
+pkg_preinst() {
+	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
+		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
+	fi
+
+	echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name"
+
+	# Fix up the env.d file to use our set server home.
+	sed -i "s:/var/spool/torque:${PBS_SERVER_HOME}:g" "${D}"/etc/env.d/25torque
+
+	if use munge; then
+		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/torque || die
+	fi
+}
+
+pkg_postinst() {
+	pbs_createspool "${ROOT}"
+	elog "    If this is the first time torque has been installed, then you are not"
+	elog "ready to start the server.  Please refer to the documentation located at:"
+	elog "http://www.clusterresources.com/wiki/doku.php?id=torque:torque_wiki"
+
+	elog "    For a basic setup, you may use emerge --config ${PN}"
+
+}
+
+# root will be setup as the primary operator/manager, the local machine
+# will be added as a node and we'll create a simple queue, batch.
+pkg_config() {
+	local h="$(echo "${ROOT}/${PBS_SERVER_HOME}" | sed 's:///*:/:g')"
+	local rc=0
+
+	ebegin "Configuring Torque"
+	einfo "Using ${h} as the pbs homedir"
+	einfo "Using ${PBS_SERVER_NAME} as the pbs_server"
+
+	# Check for previous configuration and bail if found.
+	if [ -e "${h}/server_priv/acl_svr/operators" ] \
+		|| [ -e "${h}/server_priv/nodes" ] \
+		|| [ -e "${h}/mom_priv/config" ]; then
+		ewarn "Previous Torque configuration detected.  Press any key to"
+		ewarn "continue or press Control-C to abort now"
+		read
+	fi
+
+	# pbs_mom configuration.
+	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config"
+	echo "\$logevent 255" >> "${h}/mom_priv/config"
+
+	if use server; then
+		local qmgr="${ROOT}/usr/bin/qmgr -c"
+		# pbs_server bails on repeated backslashes.
+		if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server -d "${h}" -t create; then
+			eerror "Failed to start pbs_server"
+			rc=1
+		else
+			${qmgr} "set server operators = root@$(hostname -f)" ${PBS_SERVER_NAME}
+			${qmgr} "create queue batch" ${PBS_SERVER_NAME}
+			${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME}
+			${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME}
+			${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME}
+			${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME}
+			${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME}
+			${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME}
+
+			"${ROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1
+
+			# Add the local machine as a node.
+			echo "$(hostname -f) np=1" > "${h}/server_priv/nodes"
+		fi
+	fi
+	eend ${rc}
+}