Version bump, update doc patch.

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

4 files changed, 319 insertions, 5 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 4c3046be2ce3..413ff7d28725 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.111 2011/06/26 01:01:14 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.112 2011/06/26 01:56:27 jsbronder Exp $
+
+*torque-2.4.14 (26 Jun 2011)
+
+  26 Jun 2011; Justin Bronder <jsbronder@gentoo.org> +torque-2.4.14.ebuild,
+  +files/disable-automagic-doc-building-2.4.14.patch:
+  Version bump, update doc patch.
 
   26 Jun 2011; Justin Bronder <jsbronder@gentoo.org> -torque-2.5.2.ebuild:
   Remove old
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index d1fcf47c69b0..9509c3a758df 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -5,6 +5,7 @@ AUX 0001-fix-parallel-doc-install.patch 1510 RMD160 d1e59f8888bd5e15f563f2e40fba
 AUX 0002-fix-implicit-declaration-warnings.patch 1325 RMD160 b20b48f93d470de63772d884c6a4f63ddb86e825 SHA1 b24e9a5c5291edc8b061241446d8e975872b9477 SHA256 e3ca220f3a30ad68eaabc2152bf5e9e60fc09347d9f61edccb755d7837ef2764
 AUX 0003-disable-automagic-doc-building-2.4.12.patch 1525 RMD160 99a620bb80a28e371d9eae0749f20ad304514811 SHA1 f8b7a6aa997c53a9e02e316b9379ae1f831e283d SHA256 79659bb7aecaa04dc0ab400cf26bb8c4b5561b3c5ebf3b814496cff369f08ea2
 AUX 0003-disable-automagic-doc-building.patch 1424 RMD160 8eaf6adf00166f80341d586dcfdabb25638db157 SHA1 6a67ced0605cb6301dbf9f1b921152cd41403819 SHA256 e76ffde27da8d1ef456f7b728be83a148f8d69a217dd16cedb0a33d39c1d183b
+AUX disable-automagic-doc-building-2.4.14.patch 1610 RMD160 5ca3f57e2a4aeaac65437d5e919664ff56cf070a SHA1 d9baa27d314e3bc209178dfa4f6e7b6d33707c6b SHA256 bc795f22f4c152e27954223f790d341dab06a78aa390c382511b9013d94e965c
 AUX pbs_mom-init.d 1093 RMD160 ade6389bcda7974fd17c56c5f6f7a1c5b19c7fda SHA1 051455da4526b908ddb2346c912b68ba22245209 SHA256 ce5dfb1db62de8611974dcf15698dce75ef289f2a13d6a95039aec724748e64d
 AUX pbs_mom-init.d-munge 1158 RMD160 ffc102972f3b635ae548af78f2e2e103448ccc45 SHA1 998c9c6eb89cee8f5707b36ea268462445febaee SHA256 ddd9f28a4c32bf09005ee2af0b7b930777dd46a95067b012ee4908b3ec5c3f92
 AUX pbs_sched-init.d 1174 RMD160 d39789a7675487065094083c1ebb6da6e8246818 SHA1 c550cd7606da18a74e736c7f0d26d04deea3d34b SHA256 b1edba8149cc3962e147d8e16148113ad629c5c7ab54ea629d5c106aea337afe
@@ -15,16 +16,18 @@ AUX torque-conf.d-munge 784 RMD160 3cd95c08d31e54286fc57e24a93b800327f5abc3 SHA1
 AUX torque-env.d 260 RMD160 d16f5490599c9f2a2db493cdeedaf777e19bc6a4 SHA1 85ad40b92ec2573aae1536aa35995ca3d7deb222 SHA256 3f1c12897f3a5993a634da35a069360b0069ad189309175a0276d32b06b2d67a
 DIST torque-2.3.13.tar.gz 5466720 RMD160 9323be14efb5746f2290ee36ccad9381ba536d91 SHA1 1c2f5eb007f4b2e43a0491b4a85fe5e4d64df010 SHA256 18dcff32ae341281f83e0154f6e926583096ff57ec56626382b190dacc1c4054
 DIST torque-2.4.12.tar.gz 5706041 RMD160 0d73b66ce6f8f27beb422dc40e79329c06255e4c SHA1 25dae778dd936f16b296a6f7f50de0145923f189 SHA256 ad9a6a50ae96b68f3db323045527d5c37ecf254459d4ad3fb5acb05621548a1c
+DIST torque-2.4.14.tar.gz 5705022 RMD160 7bfa41fb6648060316c58dbd01c6741a46f1fa85 SHA1 88ac7d00c7a09ff5a91c82a08dd19ceb1f55faaa SHA256 4ce2cdac450ab1f05f89169700364180067778535e7d5fa6d4ca576c0ca1c5f8
 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.12.ebuild 7665 RMD160 f9bb3c5675bc3286918b9031fa19c0539d97f506 SHA1 b270b0e6069db6c64e8b242cde79d5bc004c447f SHA256 2c232ab0b87be19d3a3e7552a5d26082b8022e7409c9de5404f6d06aa9c4034e
+EBUILD torque-2.4.14.ebuild 7660 RMD160 cfd280c8a81513d9be6c878a8c64336f6b224bf0 SHA1 7a33cb16cf533c09f693db3a69302da4a00c4bac SHA256 0ce0003ee84e6aa365ebc566acd3d7f1710fc46d934d6f7f2b59a68a8af85edc
 EBUILD torque-2.5.6.ebuild 7210 RMD160 b1d10c7903884f8abd479d6aa291dab4cf99087d SHA1 556d9691dbc13772b25ac3a067839735f9d8bec5 SHA256 4de37b0c6134c81d53f33705d37107042c0d01832495c987da6be85def14f587
-MISC ChangeLog 19272 RMD160 d702c76c149a77150345ec818e667ebb79ddd658 SHA1 50f3a2ce3a0e0560510abbdaa6d0e4d9c59d4597 SHA256 5c656666aa4df46d7eb9dbd79907f6ccfd561d85891b828071792131ec23d094
+MISC ChangeLog 19467 RMD160 4769687bb652c73c9130001d2b76cc7577ff3e96 SHA1 1fc4d5215258e5b5df4728a4d45c2333033da6a9 SHA256 cde9badb72a89556cfbadaea064dabd976add18e6d92ded2dab55c99104e1556
 MISC metadata.xml 553 RMD160 daf765f9ef4f42572cab45458d862e6be34422f2 SHA1 59b8ab62a8101f744de073fa38a72796da8a1fb5 SHA256 73c903923564e2736d7fcd0f91d3e54293fb9a9865b5010f2a50bbbbae98d522
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4GhN8ACgkQ4MrvBE1wQ8ksDgCeNqReA5dgLVvANiT+qRgfu5lJ
-qOAAn2AbeFuNzRrd/RpN4nd4jJjun37s
-=z+ra
+iEYEARECAAYFAk4GkdEACgkQ4MrvBE1wQ8ljvwCfSPGahK6abeasPbw2gOM2b6fC
+QhoAnRz/3m5tettKmLpxooLVfkZsqwTu
+=mLMT
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/files/disable-automagic-doc-building-2.4.14.patch b/sys-cluster/torque/files/disable-automagic-doc-building-2.4.14.patch
new file mode 100644
index 000000000000..1b57fe6133b1
--- /dev/null
+++ b/sys-cluster/torque/files/disable-automagic-doc-building-2.4.14.patch
@@ -0,0 +1,55 @@
+From 301ac38e30138b2b337391a64d0770ca6a6eb468 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Sat, 25 Jun 2011 21:07:41 -0400
+Subject: [PATCH] disable automagic doc building
+
+Instead of unconditionally building docs if doxygen is found, only build
+at the request of the user.
+---
+ configure.ac |   23 +++++++++++++++--------
+ 1 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8624a5f..2999094 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1323,8 +1323,6 @@ dnl
+ if test "$build_drmaa" = "yes" ;then
+ AC_MSG_NOTICE([Configuring DRMAA ...])
+ AC_PATH_PROG(GPERF, "gperf")
+-AX_PROG_DOT
+-AC_PATH_PROG(DOXYGEN, "doxygen", "none")
+ AC_C_BIGENDIAN_CROSS
+ ACX_PTHREAD(,[AC_MSG_ERROR([POSIX threads library is required by DRMAA.])])
+ 
+@@ -1368,12 +1366,21 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]],
+   AC_MSG_RESULT([no])
+ ])
+ 
+-  build_drmaa_docs=yes
+-  RPM_AC_OPTS="$RPM_AC_OPTS --with drmaa"
+-else  
+-  DOXYGEN=none
+-  build_drmaa_docs=no
+-  RPM_AC_OPTS="$RPM_AC_OPTS --without drmaa"
++AC_ARG_ENABLE([apidocs],
++    AS_HELP_STRING([--enable-apidocs],[Build DRMAA documentation])
++)
++AS_IF([test "x$enable_apidocs" = "xyes"],
++    [ AX_PROG_DOT
++      AC_PATH_PROG(DOXYGEN, "doxygen", "none")
++      RPM_AC_OPTS="$RPM_AC_OPTS --with drmaa"
++      build_drmaa_docs=yes ],
++    [ build_drmaa_docs=no
++      DOXYGEN=none ]
++)
++else
++    DOXYGEN="none"
++    build_drmaa_docs=no
++    RPM_AC_OPTS="$RPM_AC_OPTS --without drmaa"
+ fi
+ AM_CONDITIONAL(DRMAA_DOCS, [test "$DOXYGEN" != "none"])
+ AC_SUBST(build_drmaa_docs)
+-- 
+1.7.3.4
+
diff --git a/sys-cluster/torque/torque-2.4.14.ebuild b/sys-cluster/torque/torque-2.4.14.ebuild
new file mode 100644
index 000000000000..7a02f6a52d77
--- /dev/null
+++ b/sys-cluster/torque/torque-2.4.14.ebuild
@@ -0,0 +1,250 @@
+# 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.4.14.ebuild,v 1.1 2011/06/26 01:56:27 jsbronder Exp $
+
+EAPI=2
+inherit flag-o-matic eutils linux-info autotools
+
+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="openpbs"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="tk +crypt drmaa server +syslog doc cpusets kernel_linux"
+
+# ed is used by makedepend-sh
+DEPEND_COMMON="sys-libs/ncurses
+	sys-libs/readline
+	tk? ( dev-lang/tk )
+	syslog? ( virtual/logger )
+	!games-util/qstat"
+
+DEPEND="${DEPEND_COMMON}
+	doc? ( drmaa? ( app-doc/doxygen[latex,-nodot] ) )
+	sys-apps/ed"
+
+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() {
+	epatch "${FILESDIR}"/0002-fix-implicit-declaration-warnings.patch
+	epatch "${FILESDIR}"/disable-automagic-doc-building-2.4.14.patch
+
+	sed -i \
+		-e 's,\(COMPACT_LATEX *=\).*,\1 NO,' \
+		-e 's,\(GENERATE_MAN *=\).*,\1 NO,' \
+		src/drmaa/Doxyfile.in || die
+	sed -i \
+		-e '/INSTALL_DATA/d' \
+		src/drmaa/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--with-rcp=mom_rcp"
+
+	use crypt && myconf="--with-rcp=scp"
+
+	if use drmaa && use doc; then
+		myconf="${myconf} --enable-apidocs"
+	else
+		myconf="${myconf} --disable-apidocs"
+	fi
+
+	econf \
+		$(use_enable tk gui) \
+		$(use_enable syslog) \
+		$(use_enable server) \
+		$(use_enable drmaa) \
+		--with-server-home=${PBS_SERVER_HOME} \
+		--with-environ=/etc/pbs_environment \
+		--with-default-server=${PBS_SERVER_NAME} \
+		--disable-gcc-warnings \
+		${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}"
+
+	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"
+		if use drmaa; then
+			dohtml -r src/drmaa/doc/html/* || die
+			dodoc src/drmaa/drmaa.pdf || die
+		fi
+	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" || die
+		mv "${file}.new" "${file}" || die
+	done
+
+	if use server; then
+		newinitd "${FILESDIR}"/pbs_server-init.d pbs_server
+		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
+	fi
+	newinitd "${FILESDIR}"/pbs_mom-init.d pbs_mom
+	newconfd "${FILESDIR}"/torque-conf.d torque
+	newenvd "${FILESDIR}"/torque-env.d 25torque
+
+	[ -d "${D}"/usr/share/doc/torque-drmaa ] && \
+		rm -rf "${D}"/usr/share/doc/torque-drmaa
+}
+
+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 || die
+}
+
+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}
+}