bump, remove old

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0x4D7043C9

5 files changed, 18 insertions, 512 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 735e51e87fff..d9bfb5916149 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,12 @@
 # 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.143 2012/07/27 03:41:50 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.144 2012/11/02 06:09:52 jsbronder Exp $
+
+*torque-3.0.6 (02 Nov 2012)
+
+  02 Nov 2012; Justin Bronder <jsbronder@gentoo.org> -torque-3.0.3.ebuild,
+  -torque-3.0.4.ebuild, -torque-3.0.5.ebuild, +torque-3.0.6.ebuild:
+  bump, remove old
 
   27 Jul 2012; Justin Bronder <jsbronder@gentoo.org> files/pbs_mom-init.d,
   files/pbs_mom-init.d-munge, files/pbs_sched-init.d, files/pbs_server-init.d,
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index ffd105aa33c4..fa78dc23125d 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 SHA256 ad576c6449e078841f8f3dad1515d74264b66d43dfe5232007aca4c467120b22 SHA512 bdb4599d54b3f9768d5fc2a0f12879d6828e434b7fd1121e74313b65ae4eb920337b3a897bae08cebf46836a69eb7c9b1da109a5918a00e442790302f34fd5df WHIRLPOOL 39e738de637f802ab2e968611e2b19d76c9cba4995374c17c6e5e49b93170548f844e55d0128409648c11edf070d4ce2779f8904e28d44ae96531f4d255d1ac3
 AUX 0002-fix-implicit-declaration-warnings.patch 1325 SHA256 e3ca220f3a30ad68eaabc2152bf5e9e60fc09347d9f61edccb755d7837ef2764 SHA512 2edb5ce8a3cc5dd33c68e4b016a18a63ee576dfbe2e99aee0b0254c673f6bf5af9a6be40bd2a9d3ce8f7bc53b16e8b078d521929690ead3b5b4f6dfc8edc433c WHIRLPOOL 8a4f23c42edbab177915d3b02963120d4ae646c2cf2a13f31556762135efbf14263aa2d3b8268afeff668373344bdf2d55b6a82a72d4477b17f5528dd260ef76
@@ -13,24 +13,20 @@ AUX pbs_server-init.d-munge 1688 SHA256 13d35f2a73fd09100a2932f6c6e4ac0befc75247
 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-2.3.13.tar.gz 5466720 RMD160 9323be14efb5746f2290ee36ccad9381ba536d91 SHA1 1c2f5eb007f4b2e43a0491b4a85fe5e4d64df010 SHA256 18dcff32ae341281f83e0154f6e926583096ff57ec56626382b190dacc1c4054
-DIST torque-2.4.16.tar.gz 5705768 RMD160 cd08cc44e9f5c9ce7202d50ee11cb2801ac3a8ab SHA1 11cec0cd980ab0652876e37ece607ff120b383e8 SHA256 48b1344e13baf974053dbd2faea3e2d24bb6ea8d785805d78623ae06747c0a0d
-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
+DIST torque-2.3.13.tar.gz 5466720 SHA256 18dcff32ae341281f83e0154f6e926583096ff57ec56626382b190dacc1c4054
+DIST torque-2.4.16.tar.gz 5705768 SHA256 48b1344e13baf974053dbd2faea3e2d24bb6ea8d785805d78623ae06747c0a0d SHA512 481d76b08f4d22704f858d490fd7cd1f8be2d41e2b5969df299c50f0acdf6a1763be2d0debb8a6bd77bd8b9747b9c3c666d701b2b75d8aaf150e10c1081c3be5 WHIRLPOOL 6e89a4e9ac3fd7fdf8b3d38568302a02bfb1aea0203786bade4bb03aaa2fda7f4bbfb2664be5d203d6984f5676980e77035140f41bf00065bd27e9acd38f227c
+DIST torque-2.5.9.tar.gz 5853931 SHA256 c68beb4b4e24042e4a8f4d84226e5d91aeb09a3d700d00f2c476559313597fe9
+DIST torque-3.0.6.tar.gz 5888678 SHA256 f76736d780fc0f8ac73c54d586b4d15704e37cf191649b748b07f660186642b3 SHA512 6776302d797c718169daeb07efa31f77779d546ac6cf33edea98cd56ce800ab2547b55a8384a627f14d61abb7144b464a10a40936943b62bc4cc70823eec599f WHIRLPOOL 4950176f24e99e29d75d9808d5e223d90a2d0f1a36f7fc303506ef99e8012eb6c070a3674bbf3641c4e1dc3bbb87bb3670aa3a0ee1c957658c3f3d4c88fbb864
 EBUILD torque-2.3.13.ebuild 7761 SHA256 d628682ff14defd39cb4bd302bfc765b2355da5e1654c35e3290e1cd67c64df2 SHA512 c87f53e79cdee43c6cbf4f22521cb1a05d00d339423b10f237b9229f9474082f791f9670c885373040a850574e9909a05d69596f23959d1e8822643edd45997e WHIRLPOOL 6c5c84c5c769aa1043f618d6b1fa130ea33d10d410d3d9fc1aa9016f03275db3dbbd375f19128c60ca34bc5213fde67390b85f3133b75f0ee73ac101f1de6d9d
 EBUILD torque-2.4.16.ebuild 7693 SHA256 9d8237aa82be7bada391f7523d14077d84913a1edd02f7264a794d277a3dcc77 SHA512 168c0c04968436b73fb451e46955a19776c6eb2ca9c55f996cb4e2df7d72c6640e878ab887c660e1d1073d41dc83633ea14be33b5cb900de41e4d9a0a35359d0 WHIRLPOOL a4aeecb97453b01ea74d13b0128fa07d9aab500a8941a98a625c97dc0d364595fbc84fdf0d6890050bdea9ce6c709980c4d8fad29f7c65b121968c44399527a0
 EBUILD torque-2.5.9.ebuild 7361 SHA256 5b5475de517fe28b8648f2e08d3f99639c33449561d0ec7789e83a1a096e63d0 SHA512 6962d981763aae0e094971bd5c76b3de1d27cfc2e8bfa41f0b941452dc8e695a99e351c46746924b42d213eabc33f6b48f3428df47554455da25f3b7fca3dcf0 WHIRLPOOL 1a61afda2268852cb67e890ec42c29ef9bf2a6869937487886e4d312b917500e92f30ef47d7972fcbc4f5e1f634b67aebd8bee6fda0e32957452b2ec25bfa85e
-EBUILD torque-3.0.3.ebuild 7998 SHA256 8faee008fd88a1d7f69696cb6fe0233f4266bb0f4e5a991ca77e6259beed6ed3 SHA512 e7a3917349a16a171b6f5be71a9fb5d4f7bcc6e9f7f3c1145c28f5626d5e6f6f3e10f14ac081dbfcf0ebe4da55c332f1fd4b4a2246a573427fb496eb6d2bf6e4 WHIRLPOOL a8534d262cc2792680a841bb3c9308ea5a16f53f9b3117833d7cbfae7281ce63a111168590bfbf42594fb1aa73df47198979b4df4269ca948e23a89159ed789f
-EBUILD torque-3.0.4.ebuild 7991 SHA256 25555be7b5baf932c89725e80388ef10f75fe23d018e36bce0c2471a73526e62 SHA512 4e4c3e2a09338ee1a4e06529449663450a03cdf7d4050fc5acd332ab8cf855b75330356d520a83a83054cf32bcace1b0b140a776d7f4af3efce3ce877f2422f9 WHIRLPOOL 104bb832a7c0c1285c590a19dfe3bbf4d02b8b509283f0136b865376ee3758cf0039a6f0528084e2b1b37b85557e395fdd26a8866a1f4279167d4bde301a9ba2
-EBUILD torque-3.0.5.ebuild 7996 SHA256 0da79888838e012ca223472e0326758b4f8ae8c12e01fa93ea8bfbbacecc42ee SHA512 439ce21ad423bce44f29aa139e83dcac79faea14be6331b34d5da6707b3c02681c40e63a2146ff5ef728b8407c6005d1426d93c4ef0d7c90e88b793fc228091d WHIRLPOOL 657af3232e8184a34b1f03ceb97db66e549c6d6b63c844aa5288240aa1ccad8a2b8cc1cdc21f0cbb4050f1d4926bfcd7876b925fc05bb7e4f68fe82250a081e0
-MISC ChangeLog 23754 SHA256 968f4b3843f746c06c97395e7f4d9a27c7bb4d5d90f13878a6e93c773e62aebe SHA512 c74e90941759ecb67934e9dd6d427e1d27d2cb08db9c69cb3e0c3eb7ed5ca5492de8c1f74a14a4a1ec656e20525271cc244a5892edba0c2cf00ac600132a2e83 WHIRLPOOL 1c1fd090b719a6718d39cabbf4bd8e790904e2b43c1b3c6d20159885bb02b1160ccc1545ef00d09c781d59185fa831f0251c104830772fdef1078cc7b26356cc
+EBUILD torque-3.0.6.ebuild 7996 SHA256 d612e9d85898ec90e980cb8b622f85a8b1196f142073bddabac5b7801d1b6c55 SHA512 358611a129124b90bb8e175492f772e6ad4808ce8b340ee22465bd8afb5ab481c2497e3f31bdcd12171ebe87b44865300c6c9c9ea44cc7503e915aeb972ea75e WHIRLPOOL 59595b938b08208c0169278be775b37e88983afebde107e6bc1a8ef441da40cf5e10882cb78dcf5ad97c9127ea33ca3c8a961c14c1397eb9644e875ec9bb47bf
+MISC ChangeLog 23946 SHA256 ee57077d8841cfff56f5f4d99b61cc0713ff401ce750f95cf580a682f5b5aeae SHA512 43b0208575dab256d37b66601305bb8cf8331740d7a26f29392602e1f7413b7c2210f7c59b503fe9f10e9484435da16da89da84e0e89e158238783dbd7380fea WHIRLPOOL a1ec415b2ed36c9937de62b04eb75e2267a49e76567f2b10b0c8103d2f23d17ab5c433a6acc991a3a25d22f592ceedcc2c992e4fbce16185ac72ab0536d70f3e
 MISC metadata.xml 611 SHA256 80f22bc514020233d34ae83f25dd84b1696d053f0eeb32e924b55b8437ac1734 SHA512 e89dbbbee81da38856b73eccd1785fee2b0bd0a7527c6ed55819147050a2aa6bd7d4d8d1133da3d060a5956177dbe7233ff15e502b85a43fdda9774a3673c9a1 WHIRLPOOL 7f098de8484a034d9aca759fdd5de3e351e53493fcf4044e758a307db1cbb7887c9b1e1b25e9e4ff1ee8784e52f7431aa135987a9d4b24df39942816138aaa01
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlASDgkACgkQ4MrvBE1wQ8nEOACgtDtXvofQYTSXvrkH8yhTaH0y
-8/IAn0Q63rRJGOpEpYrXJl8FiqEdpV/P
-=Imbc
+iEYEAREIAAYFAlCTY7IACgkQ4MrvBE1wQ8k3UQCePSHEo9JxHeFbMwzYxlZ1F4qd
+gAEAoKwRbG7Mvibir7tgpNtQL9MEQWTr
+=RmuX
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-3.0.3.ebuild b/sys-cluster/torque/torque-3.0.3.ebuild
deleted file mode 100644
index f2262e0e8ea8..000000000000
--- a/sys-cluster/torque/torque-3.0.3.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# 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.3.ebuild,v 1.5 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 server +syslog threads tk"
-
-# 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 )"
-
-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"
-
-	# Note:  Nvidia GPU support is currently disabled pending user
-	# interest and ability to test.
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		$(use_enable drmaa) \
-		$(use_enable threads high-availability) \
-		$(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}
-}
-
-# 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.5.ebuild b/sys-cluster/torque/torque-3.0.5.ebuild
deleted file mode 100644
index ec5e541d7b8a..000000000000
--- a/sys-cluster/torque/torque-3.0.5.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# 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}
-}
diff --git a/sys-cluster/torque/torque-3.0.4.ebuild b/sys-cluster/torque/torque-3.0.6.ebuild
index 8015c7148ee3..126dfb368282 100644
--- a/sys-cluster/torque/torque-3.0.4.ebuild
+++ b/sys-cluster/torque/torque-3.0.6.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.3 2012/04/25 16:43:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-3.0.6.ebuild,v 1.1 2012/11/02 06:09:52 jsbronder Exp $
 
 EAPI=2
 inherit flag-o-matic eutils linux-info autotools