torque: sync with portage

Fix tk build properly.
Remove old version.

5 files changed, 90 insertions, 268 deletions

diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 2c05e2d..15445d6 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -3,16 +3,14 @@ AUX pbs_mom-init.d-munge 1148 SHA256 c8c5dc40960512f8a0410f50114d3d71f92c1781134
 AUX pbs_sched-init.d 1164 SHA256 07924a441544c0b72283e546fa5b17bb422cfeb9421fcafafedaa997268696dc SHA512 2bf9371bde2cd43c452b765498e8f5bd791c4ba93c8142a89a594ae14447c95eaeec0e87bca8877817c2e2d162cb70f8a64d9add32c175f9fb156b65964b9aeb WHIRLPOOL 16e13e0d618fef0a2d69f4b009ff2cccdc918256fe3436a3d86b83ed9dad26a9a01c6ccd9eaf285647243de8b79179d8470afdbc7b492159bfae3b608fc2db0a
 AUX pbs_server-init.d 1750 SHA256 3de5e31c59ad6b31613b770f80f5664a3de3adfacc5c18d26eca423e5e78a852 SHA512 12c4e8b73c7046d48a5967c1f4d8643129212f51ef41c1d307d842ecb94ac3adc9a187b20cd6351b230ba9b7b5ebc084f60c1989666cb86ac3172ed22cee14bd WHIRLPOOL de6b4fac1ac0c131bf70eb610c9f54937c245f445b58305bb915403a13004c5902e23fc6c91d55595537530e607046c4f9991fa1f24668899af9195c28c65e9f
 AUX pbs_server-init.d-munge 1688 SHA256 13d35f2a73fd09100a2932f6c6e4ac0befc7524769d2a20e7153e4fac6adff94 SHA512 9ec9f40f850bf917831e9cfb9ad62af7a2cf163bfb03033c5a9b34feb58a5a5564e05f181a46d17f48f130fc4f52a210ea314e82dbdc1ed6377e99196a9a2807 WHIRLPOOL 5244dccff02e8ffd3a015bc371fabd0f910068d09950f1e5528b3f0dace260f0a99def906be82b6e5365d97f399e89f3d918dd666fcc9c1795d661acae6f23aa
+AUX tcl8.6.patch 2396 SHA256 02905289c2707b2bc60b3aed513d9d4578cb597b346ee79deb89b1e72131af2b SHA512 a288526bf43cd39d0b5505938f02ee38ccd70481a1b6351a80c5cd151376604d5cdc925293d3bd7f2d4bbe50182993448da645ca42f58e3f1bdf59bce9363b4a WHIRLPOOL cbccee8ce08d3bf36bc30b49cf0740753f10d1d309558a702aa8df8f0d9ec5069e37cc3e7cb47caa686d69935f90c6b6f2dbdae55eba98864f3bbc22f4fa7ada
 AUX torque-3.0.5-cpusets.patch 5103 SHA256 84949321076f18b8822c816605b38243742cf3b2771533686f0d880e5acf0260 SHA512 e1da76f9939fce991ebaa20cf64a79f064c110452e83dc0d190bea1764ce648e2212947028c9ff0f2a4032c2e75bced9a18452633a936f6c83770f9bdbfacce0 WHIRLPOOL ca1f4aeffb6b42d831101e19fd84b6fd2136f429105e9ab86a28571e8af3d821e7f86ce15b6b617b754dcdaac3c3abcf8447294d2b496aede6de38d515ffe171
-AUX torque-3.0.5-write_pid.patch 473 SHA256 b039f7454f25d96684d4f628a7b93dd389a745f121fee25d7e05dfabfe766d59 SHA512 ee52b872463a0c694028921c29989cd4f096b794ed648bc764c88b579edd3c86b5bb1a63164367318fc68b89d60f9b23a54ccece30bcd7f6517618e23678b2ca WHIRLPOOL f8ee39ffb02ecb74aca6befddd774342d17c080116bc3e31785e49eba40f96d3e324cbc3c07d84d2f3d5edee07790eac0fc22c2af665ee098a719315739b9825
 AUX torque-3.0.6-tcl8.6.patch 1878 SHA256 5ded316ced2b7dddd20fab320af61539c8f297ece8e3af0ac16d50a167c3b4c4 SHA512 1687c00c9fdbe4215a16197177d287854569d9f527847a3f7641a2028f3669e7b4dcd146d7320894c9435c0934ba9a50f379dd4262d982a805e427c8b8d218c1 WHIRLPOOL 8619d8189d833b4443239d912abb3570c2d499f7c552b491806447f8368c588b4e278dd126c6f9ca9d6a0d99f06ad99b15e90771c4a75d2d503e55d002bfc10d
 AUX torque-conf.d 649 SHA256 4139da44a55dbcb4a8227fd0aedede8e091971fd63c0e08644712f4a91e7b174 SHA512 b82f6c1d661bed03a32c3761530c4b303715167a317e467371091b11d3ae0e19e9784b1588577ee5f65397cb0699818ed5f621aeb66d3f2d218df12d0cf39bde WHIRLPOOL 0f0db60c037400ce87013d7639a5e126b65388e914e1f3bde81548ebc1e8fcefb17972c4deec03509973973a263c5006856699d3f51fad0133b8428e13e2e04c
 AUX torque-conf.d-munge 784 SHA256 7b8e47737211fd0d05dcc7938021ea5dbb1575010c53075440ef0b6b5d43d8b1 SHA512 a78634a6f2bdf3c24e8c99d3cd7a9634daa32d69244a9ddfcc26199f4d04e901abbfa79ad057f5a4e4c492c9e21bc0c65edd8465ac6935fb7c67c8c639e75d68 WHIRLPOOL 90ed407a5a98fb7b4509610c3c23dd1d38566886e4b02fa4db4a9708f8c45b500369e782c25b7b9f02fc685bdcb965049e681c829bad58206729690e6eeadbb9
 AUX torque-env.d 240 SHA256 d04eab3b1314645ee2014c718c4cf79ca74950dee1357d814b85c9faa5ef6002 SHA512 275ce5ccf9f138bcee504a9996c9d838cd34714d352d4b7ac2d631d0fca662bf38a2ef7e8745605d9b3847049015e0791c937340cfdacbf44800482ce73bb042 WHIRLPOOL b7cdc4d6752d00b315fb369f6382e1a6684c1cb8a3486545bd406270ed09811936c2735755fc01175fceed0422139e5d7d8dcd67868e2e40c8ebbb406c2eec57
-DIST torque-3.0.5.tar.gz 5890335 SHA256 1b17d69f28fbdf8eb44dde47f6c312a47ffc7514a5ba315d005058dfa312cd42
 DIST torque-3.0.6.tar.gz 5888678 SHA256 f76736d780fc0f8ac73c54d586b4d15704e37cf191649b748b07f660186642b3 SHA512 6776302d797c718169daeb07efa31f77779d546ac6cf33edea98cd56ce800ab2547b55a8384a627f14d61abb7144b464a10a40936943b62bc4cc70823eec599f WHIRLPOOL 4950176f24e99e29d75d9808d5e223d90a2d0f1a36f7fc303506ef99e8012eb6c070a3674bbf3641c4e1dc3bbb87bb3670aa3a0ee1c957658c3f3d4c88fbb864
-EBUILD torque-3.0.5-r1.ebuild 8075 SHA256 fe2bbd0bbe7f53eb515f3c902772ae2aead86015b3d2fe4424ef08005f71c16e SHA512 37a1b90cbadf1238a34db4b82d70118064a2651b988b6e9ef5eb24eaf7faf7e5b771a2d41bc36ff10d5aae165fd62ebc1546e18ed82d86bf0c540136316bb74b WHIRLPOOL 44eaeac618295d5251015635dd8ed373c06a27eed974f4ce9e56f94bb987ef2e7506963ce813f4eb719d86ee9e93dca560fd3d20a372c42622a4baade8b52855
-EBUILD torque-3.0.6-r1.ebuild 8047 SHA256 ddf1b8e93a18473f533353d1c3a557be93d63a0377d8e2c3ca6a8c5acb7b6496 SHA512 65560f6328c5c7ddcde12221ed5e9a5cb327b4628ca16c5fd032db2004f612fbca2eb4e279def2d0b9f5beecbe2837fc14da80c4255a6483c026746428ce0e8f WHIRLPOOL fffa03b8b5fe9dc6644bf281a2300152f134efa1ea02c6847c5d373f7f45b6149f7fcea035611c4219985f8662ce7da10e752c1735e266c894add1e227b31f67
+EBUILD torque-3.0.6-r1.ebuild 8076 SHA256 eadca0c922b00b084d7e9c8411ba3d6236005478fa7f96974502c30a0f05c99d SHA512 017c7078df99f0443ad20908f32f57e57de35e0f321a5a6d75c5784c542c1948fbfec4c732cf4e8812ad1ce867f851fdc4faaa5c10273811360ab53afc9d9dec WHIRLPOOL aa4f4c1290a7bcf2508af7f8de26033bebc817ac1d4ee8bc663dd159c2eee02619bfe305b715da461982bda2b9b571db7f3a75d4bb94b9de5f20de771285e9b4
 EBUILD torque-3.0.6.ebuild 8039 SHA256 9c97f863f7733282ddb37926d3f47bf2132ed9da1a4ef6e45c32e8506a025261 SHA512 e737fe3aee32c029c1d5587874ad6d297f695ea62dc83eae87caafc3353239366d273f4ef2ed13013bee3bd1056781b1c26ff13556b03894401ff7fdf3d98b9c WHIRLPOOL c5e05fe4f97eb4e44a980fc7543cae6056ecee565cfec17a081659bbd3e5d2ff678c51469b038f45e09c8eed4d0ffddd457b0cefdfefb008b8fda01de5ca3b63
 MISC ChangeLog 24806 SHA256 266082e70ad8b460b084eb519e9cef842f65ee8973af99915370cdfbfa02a866 SHA512 74d213049b1d0878a41f5a6bab25a625e17a89c1b2352faab707d4a5a062a4fe7d13b5ef14cd035762f940137d39e180464bd042c0d4f6e51dc960702bc435ad WHIRLPOOL 35c81f30815c90624bba9d87415c45c4b09fd684283beed722aee33bd8c535ef2eb33dd40672b86adf2fe8af1b570353159d50b53bbe8509239ba51b359a27ab
 MISC metadata.xml 628 SHA256 10fab1886476e44fabbcda6e7dbbc8452d07cb0de0cefcf6e594312dfe89f7af SHA512 d1c78c4247f209eda60a61c9c611c4a4b87d52f85b112a78b96a4dee6f3cd660aef49547323074d69ffce8c1b916c3914f00282781e2f68f76658e6f9ac7ff9b WHIRLPOOL 243373e602f92a256118e6bee6c3071d5894caf3d53a663abee6929a310cf306b15a6a7bd2a0e76882cfe36cd4e8b6c06bb9e12f49f678d085883d61d4a84cf9
diff --git a/sys-cluster/torque/files/tcl8.6.patch b/sys-cluster/torque/files/tcl8.6.patch
new file mode 100644
index 0000000..0361dbf
--- /dev/null
+++ b/sys-cluster/torque/files/tcl8.6.patch
@@ -0,0 +1,87 @@
+From 061f15e06d6cf85e951cd321360067de5f0b2ce0 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Thu, 7 Mar 2013 22:33:04 -0500
+Subject: [PATCH] support tcl-8.6
+
+---
+ src/cmds/qstat.c                | 13 +++++++++----
+ src/scheduler.tcl/pbs_tclWrap.c |  6 +++---
+ 2 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/src/cmds/qstat.c b/src/cmds/qstat.c
+index 5f85de7..7f289ba 100644
+--- a/src/cmds/qstat.c
++++ b/src/cmds/qstat.c
+@@ -88,6 +88,11 @@
+ #if TCL_QSTAT
+ #include <sys/stat.h>
+ #include <tcl.h>
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
++#define Tcl_GetStringResult(x) x->result
++#define Tcl_GetErrorLine(x) x->errorLine
++#define Tcl_SetResult(x, y, z) x->result = y
++#endif
+ #if TCLX
+ #include <tclExtend.h>
+ #endif
+@@ -1856,7 +1861,7 @@ tcl_init(void)
+   if (Tcl_Init(interp) == TCL_ERROR)
+     {
+     fprintf(stderr, "Tcl_Init error: %s",
+-            interp->result);
++            Tcl_GetStringResult(interp));
+     }
+ 
+ #if TCLX
+@@ -1869,7 +1874,7 @@ tcl_init(void)
+     {
+ #endif
+     fprintf(stderr, "Tclx_Init error: %s",
+-            interp->result);
++            Tcl_GetStringResult(interp));
+     }
+ 
+ #endif /* TCLX */
+@@ -1980,10 +1985,10 @@ void tcl_run(
+     trace = (char *)Tcl_GetVar(interp, "errorInfo", 0);
+ 
+     if (trace == NULL)
+-      trace = interp->result;
++      trace = Tcl_GetStringResult(interp);
+ 
+     fprintf(stderr, "%s: TCL error @ line %d: %s\n",
+-            script, interp->errorLine, trace);
++            script, Tcl_GetErrorLine(interp), trace);
+     }
+ 
+   Tcl_DeleteInterp(interp);
+diff --git a/src/scheduler.tcl/pbs_tclWrap.c b/src/scheduler.tcl/pbs_tclWrap.c
+index e859ae5..194c24b 100644
+--- a/src/scheduler.tcl/pbs_tclWrap.c
++++ b/src/scheduler.tcl/pbs_tclWrap.c
+@@ -924,7 +924,7 @@ char *argv[];
+ 
+   if (argc != 2)
+     {
+-    sprintf(interp->result,
++    sprintf(Tcl_GetStringResult(interp),
+             "%s: wrong # args: job_id", argv[0]);
+     return TCL_ERROR;
+     }
+@@ -936,11 +936,11 @@ char *argv[];
+     return TCL_OK;
+     }
+ 
+-  interp->result = "0";
++  Tcl_SetResult(interp, "0", TCL_STATIC);
+ 
+   if (pbs_rerunjob(connector, argv[1], extend))
+     {
+-    interp->result = "-1";
++    Tcl_SetResult(interp, "-1", TCL_STATIC);
+     msg = pbs_geterrmsg(connector);
+     sprintf(log_buffer, "%s (%d)", msg ? msg : fail, pbs_errno);
+     log_err(-1, argv[0], log_buffer);
+-- 
+1.7.12.4
+
diff --git a/sys-cluster/torque/files/torque-3.0.5-write_pid.patch b/sys-cluster/torque/files/torque-3.0.5-write_pid.patch
deleted file mode 100644
index 1aa3667..0000000
--- a/sys-cluster/torque/files/torque-3.0.5-write_pid.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/lib/Libifl/tm.c
-===================================================================
---- src/lib/Libifl/tm.c	(revision 6091)
-+++ src/lib/Libifl/tm.c	(working copy)
-@@ -1739,8 +1739,7 @@
-     return TM_ENOTCONNECTED;
- 
-   /* write the pid so the adopted process can be part of the cpuset if needed */
--
--  if (diswsi(local_conn,sid) != DIS_SUCCESS)
-+  if (diswsi(local_conn, pid) != DIS_SUCCESS)
-     return TM_ENOTCONNECTED;
- 
-   /* send job or alternative id */
diff --git a/sys-cluster/torque/torque-3.0.5-r1.ebuild b/sys-cluster/torque/torque-3.0.5-r1.ebuild
deleted file mode 100644
index 4eeffae..0000000
--- a/sys-cluster/torque/torque-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-3.0.4.ebuild,v 1.3 2012/04/25 16:43:11 jlec 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() {
-	epatch "${FILESDIR}/${P}-cpusets.patch"
-	epatch "${FILESDIR}/${P}-write_pid.patch"
-	# 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}
-}
diff --git a/sys-cluster/torque/torque-3.0.6-r1.ebuild b/sys-cluster/torque/torque-3.0.6-r1.ebuild
index ba46db5..16a25eb 100644
--- a/sys-cluster/torque/torque-3.0.6-r1.ebuild
+++ b/sys-cluster/torque/torque-3.0.6-r1.ebuild
@@ -93,6 +93,7 @@ src_configure() {
 
 	myeconfargs+=(
 		$(use_enable tk gui)
+		$(use_enable tk tcl-qstat)
 		$(use_enable syslog)
 		$(use_enable server)
 		$(use_enable drmaa)