bump to 3.0.5 re #400991

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

3 files changed, 262 insertions, 7 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index bc1596ab416d..98cb05624447 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.141 2012/04/25 16:43:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.142 2012/06/22 21:58:33 jsbronder Exp $
+
+*torque-3.0.5 (22 Jun 2012)
+
+  22 Jun 2012; Justin Bronder <jsbronder@gentoo.org> +torque-3.0.5.ebuild:
+  bump to 3.0.5 re #400991
 
   25 Apr 2012; Justin Lecher <jlec@gentoo.org> torque-2.3.13.ebuild,
   torque-2.4.16.ebuild, torque-3.0.3.ebuild, torque-3.0.4.ebuild:
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index a3cc150eee7a..19cdd5880c72 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 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
@@ -18,17 +18,19 @@ DIST torque-2.4.16.tar.gz 5705768 RMD160 cd08cc44e9f5c9ce7202d50ee11cb2801ac3a8a
 DIST torque-2.5.9.tar.gz 5853931 RMD160 87ebf548d9a5cf6e56b7bdd9ec8d6c9082e1de99 SHA1 d0375b739854a545782f358d59029046066a59a2 SHA256 c68beb4b4e24042e4a8f4d84226e5d91aeb09a3d700d00f2c476559313597fe9
 DIST torque-3.0.3.tar.gz 5882061 RMD160 ee89a38039f9387deb0e8ecd815a886ecdb5c883 SHA1 031d118f213112d7dcf66c7c083ce5aa10608285 SHA256 76c9d672704fd6cf7742a32187e86a64034178411cbe011060e2fe3855604a2a
 DIST torque-3.0.4.tar.gz 5885721 RMD160 8679da928c00c7cf569a35cf7cce83e994626329 SHA1 074329b17b46eac3991bddbfeca4d646a5383d11 SHA256 f73780adf897a18b6e45a17bace3d4ad0091a20de51275c2ef770f1ce1243852
+DIST torque-3.0.5.tar.gz 5890335 RMD160 032185f0de962635c8110e632dc232c1f011045e SHA1 4da5b97f1cd3b7316f02559f6bb3fb70ba969b59 SHA256 1b17d69f28fbdf8eb44dde47f6c312a47ffc7514a5ba315d005058dfa312cd42
 EBUILD torque-2.3.13.ebuild 7761 RMD160 e3a481c9896923ccf71843b95b8bfbf8a0eff150 SHA1 a2a1f58fb520688d4eab094d1d795c399a89c348 SHA256 d628682ff14defd39cb4bd302bfc765b2355da5e1654c35e3290e1cd67c64df2
 EBUILD torque-2.4.16.ebuild 7693 RMD160 1e2329e09cbf2649cb9d32981d4a9429e2d3980e SHA1 225705e8bf25dd1a63c19ba931d12b02c50051dd SHA256 9d8237aa82be7bada391f7523d14077d84913a1edd02f7264a794d277a3dcc77
 EBUILD torque-2.5.9.ebuild 7361 RMD160 6db18b500d263bcc8934a270deb2d4b63c33a44f SHA1 a1140389dec248678ba67ba3732acd9f7d34e15c SHA256 5b5475de517fe28b8648f2e08d3f99639c33449561d0ec7789e83a1a096e63d0
 EBUILD torque-3.0.3.ebuild 7998 RMD160 1647e572c4b98a2800d9fb353fced3e2916266f1 SHA1 81c52b3503b7a619f3f9a37eb3b38808ba552fcf SHA256 8faee008fd88a1d7f69696cb6fe0233f4266bb0f4e5a991ca77e6259beed6ed3
 EBUILD torque-3.0.4.ebuild 7991 RMD160 4644d720e8a15fc397318d86413f111c2ecffa70 SHA1 5c2a23d6fb0306b8d061a91a782f20e9aab614b9 SHA256 25555be7b5baf932c89725e80388ef10f75fe23d018e36bce0c2471a73526e62
-MISC ChangeLog 23346 RMD160 25ff8b89e6c8b046334148e767ee1e19ef6b14c5 SHA1 776415a9d98e765ca3f57d995ce4bc541ef581d5 SHA256 59b54a12f18b82e0e65b5aa82020324afe97e196f8d424fb13a5b296f86183b0
+EBUILD torque-3.0.5.ebuild 7996 RMD160 0d7704f02fcbaddffd2ca0acdb7cfc3a8df257fb SHA1 db31e3dddc5f17c2e86037b2dd167f1170155ab5 SHA256 0da79888838e012ca223472e0326758b4f8ae8c12e01fa93ea8bfbbacecc42ee
+MISC ChangeLog 23483 RMD160 16ad6b1159bbe15581baa30f67bc9f46b2673c54 SHA1 a0ab8c773c59cd82395658b1d43f36e9b73426a3 SHA256 e8f2dc8f4e88494ee743ad61947cd9d4d031bffca36b1667edd05e0e62fbdbc5
 MISC metadata.xml 611 RMD160 6c342bd97b85abd6b673d74da3d268510b911ce9 SHA1 b71810fc0a447a6651c505caf189a66791e0face SHA256 80f22bc514020233d34ae83f25dd84b1696d053f0eeb32e924b55b8437ac1734
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+YKaUACgkQgAnW8HDreRZEtACdFOLVnYhqXN3PHANLPumaVJAe
-eeEAnRZAedZf6fA50du3Ehw4Lt3WkeR8
-=5lcR
+iEYEARECAAYFAk/k6pcACgkQ4MrvBE1wQ8ndHACfbOJosvbJoP30BRk7sRQDofqL
+2g4AoI3bN2a4jtTtTsXLQC4AzLU4Lec3
+=JCPu
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-3.0.5.ebuild b/sys-cluster/torque/torque-3.0.5.ebuild
new file mode 100644
index 000000000000..ec5e541d7b8a
--- /dev/null
+++ b/sys-cluster/torque/torque-3.0.5.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-3.0.5.ebuild,v 1.1 2012/06/22 21:58:33 jsbronder Exp $
+
+EAPI=2
+inherit flag-o-matic eutils linux-info autotools
+
+DESCRIPTION="Resource manager and queuing system based on OpenPBS"
+HOMEPAGE="http://www.adaptivecomputing.com/products/torque.php"
+SRC_URI="http://www.adaptivecomputing.com/resources/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 munge nvidia server +syslog threads tk"
+
+# ed is used by makedepend-sh
+DEPEND_COMMON="sys-libs/ncurses
+	sys-libs/readline
+	munge? ( sys-auth/munge )
+	nvidia? ( >=x11-drivers/nvidia-drivers-275 )
+	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 )"
+
+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-cpuset"
+	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-cpuset"
+		fi
+	fi
+}
+
+src_prepare() {
+	# as-needed fix, libutils.a needs librt.
+	sed -i 's,^\(LDADD = .*\)$(MOMLIBS) $(PBS_LIBS),\1$(PBS_LIBS) $(MOMLIBS),' \
+		src/resmom/Makefile.am || die
+	eautoreconf
+}
+
+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 munge munge-auth) \
+		$(use_enable nvidia nvidia-gpus) \
+		--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}
+}
+
+# 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}" || die
+		else
+			chmod ${m} "${root}${d}" || die
+		fi
+		# (#149226) If we're running in src_*, then keepdir
+		if [[ "${root}" = "${D}" ]]; then
+			keepdir ${d} || die
+		fi
+	done
+}
+
+src_install() {
+	# Make directories first
+	pbs_createspool "${D}"
+
+	emake 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}" || die
+	done
+
+	if use server; then
+		newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server || die
+		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched || die
+	fi
+	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom || die
+	newconfd "${FILESDIR}"/torque-conf.d-munge torque || die
+	newenvd "${FILESDIR}"/torque-env.d 25torque || die
+}
+
+pkg_preinst() {
+	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
+		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment || die
+	fi
+
+	echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name" || die
+
+	# 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 \
+		|| die
+
+	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}"
+	if use server; then
+		elog "    The format for the serverdb is now xml only.  If you do not want"
+		elog "this, reverting to 2.4.x is your only option.  The upgrade will"
+		elog "happen automatically when pbs_server is restarted"
+	fi
+	elog "    The on-wire protocol version has been bumped from 1 to 2."
+	elog "Versions of Torque before 3.0.0 are no longer able to communicate."
+}
+
+# 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 Enter to"
+		ewarn "continue or Control-C to abort now"
+		read
+	fi
+
+	# pbs_mom configuration.
+	echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config" || die
+	echo "\$logevent 255" >> "${h}/mom_priv/config" || die
+
+	if use server; then
+		local qmgr="${ROOT}/usr/bin/qmgr -c"
+		# pbs_server bails on repeated backslashes.
+		if ! "${ROOT}"/usr/sbin/pbs_server -f -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} \
+				|| die
+
+			"${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" || die
+		fi
+	fi
+	eend ${rc}
+}