Drop old wrt #491270

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

4 files changed, 19 insertions, 489 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 245e01715277..93198bddab63 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.183 2014/12/26 09:28:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.184 2014/12/26 16:06:44 xarthisius Exp $
+
+  26 Dec 2014; Kacper Kowalik <xarthisius@gentoo.org> -torque-2.5.12-r1.ebuild,
+  -torque-4.1.5.1-r1.ebuild:
+  Drop old wrt #491270
 
   26 Dec 2014; Agostino Sarubbo <ago@gentoo.org> torque-2.5.13.ebuild,
   torque-4.1.7.ebuild:
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 521dc5dc100d..a149d106d827 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -19,32 +19,28 @@ AUX torque-conf.d 649 SHA256 4139da44a55dbcb4a8227fd0aedede8e091971fd63c0e086447
 AUX torque-conf.d-munge 784 SHA256 7b8e47737211fd0d05dcc7938021ea5dbb1575010c53075440ef0b6b5d43d8b1 SHA512 a78634a6f2bdf3c24e8c99d3cd7a9634daa32d69244a9ddfcc26199f4d04e901abbfa79ad057f5a4e4c492c9e21bc0c65edd8465ac6935fb7c67c8c639e75d68 WHIRLPOOL 90ed407a5a98fb7b4509610c3c23dd1d38566886e4b02fa4db4a9708f8c45b500369e782c25b7b9f02fc685bdcb965049e681c829bad58206729690e6eeadbb9
 AUX torque-env.d 240 SHA256 d04eab3b1314645ee2014c718c4cf79ca74950dee1357d814b85c9faa5ef6002 SHA512 275ce5ccf9f138bcee504a9996c9d838cd34714d352d4b7ac2d631d0fca662bf38a2ef7e8745605d9b3847049015e0791c937340cfdacbf44800482ce73bb042 WHIRLPOOL b7cdc4d6752d00b315fb369f6382e1a6684c1cb8a3486545bd406270ed09811936c2735755fc01175fceed0422139e5d7d8dcd67868e2e40c8ebbb406c2eec57
 AUX trqauthd-init.d 594 SHA256 3f3d603e78a21acf88e96c7affc9bbf56ca8568ce17165d3a0e936693724f73e SHA512 6af5f698438ac7f4cee62928685187d41a64366c528fbb03f6340bdee53fd361d596c5e2e47ecb1fbc797a1139e58a20bfe8d759fd1b6d2ecac3730249309b16 WHIRLPOOL d78de5decdf9958231469ef04f5ce266ab35c76a9f28f2ccb98b0f13eafcfd02db1bd173b275606005b3aa02f72dd972dbadc8a66c0ef19fa930e1400c354a5a
-DIST torque-2.5.12.tar.gz 5862988 SHA256 436b4d84464e3be0538a4dc0a657b5ae113da6b429d449261e95e13a2a96316b SHA512 12615e412bf90b4248f76e28627ece21116969e4f009629598482ec4432a5e8b6b10ce695e3abc1e3ac43fa2325b5e04b176316ef3c21e4795cb610101f9afae WHIRLPOOL 57b636b34fd72967304babe11340852c0d06519d60705ac088483831b688517104a7ef064dd7b0375cfc35f093858754f65a9f4fd026a65ead85d0544323d682
 DIST torque-2.5.13.tar.gz 5854910 SHA256 ab59d4c8e8b45383ddd8202fa83956816175e348bb955a4ad5f7e3cd4dde5ff9 SHA512 e08ddf3950bb32177f4bc504a502fae3928a616739c28ca9687c5207606817d4589583306508a2c568cf19fc8c5617dc4a9decc81576c2875660b715c256cfcf WHIRLPOOL 29eefb89d1eb9d6a81735aa117922a1eb0b72e14eeccab7dbd70cdcf01431b7ecd9c3927e1c5c28b7f42d6739b28f45386740b92adb790ccdf9803e4c6e38534
-DIST torque-4.1.5.1.tar.gz 6214726 SHA256 10fa10625256d26e9371abbc98ca8ecf307ccc2ef117e32a0bf806de105037dd SHA512 630b4a9c7d9d6b14bc807dfba868e78894856d24e7b10703c76b519edf78876e33ef158edd6dd8abeb3ffb6bfe8036e74eff23501d476ef9ebe817b46d2e3c5c WHIRLPOOL 6709a3eec73f39c27d4dd02ab62d74448a93a442bdf585d5f244142de8f54b42fdd841c773226589de4c3e0a9c881bdd51d4c04bf57235136086cab18dd6fa42
 DIST torque-4.1.7.tar.gz 6218108 SHA256 3c86b2d84589f54ac222e81dd1953d153e1d836163d2000412369fefd25fb2af SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 WHIRLPOOL cae9216f0cebc22927eec2d1f007b1a3c4a6cc619f2926c40a5f46e0bd0eec19691f9aafcad4fe727e2c5ed2485d11c972603cca613269f82147ff1dc41f1ba4
 DIST torque-4.2.9.tar.gz 6294022 SHA256 46f1f319683af6d3820e18cda69ce59113c9a5c192e1f07826007be69385889b SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 WHIRLPOOL e65be66b056a519ebd1c30c2c1ae2ddf43bc4e617a52d3caced1e6dfd2b0d8b2a83c26a0f2e6e41cfae791aca68b6f91424745b2baffa2085fccc8f6ae9b8e04
-EBUILD torque-2.5.12-r1.ebuild 7637 SHA256 06709db3e6a4de2c545467584813f05385b76e64350f77e9c70b3559aae068fb SHA512 ec992ccb9430bf74e85025b3d23154f2a91c2281e9b424818002d75873152940424543c7b06e70b3c2d3d58a15b4e241022b42128a189fe587833918eed0eac7 WHIRLPOOL ee89d2da1fdbd11bcc8e3012b0c4acdc895271e483e9d70ca2e7d7db65e3532f2d251b70884757861842c0708cdfdf8ceef2cd15d61f786a361ca1dc7084e8d9
 EBUILD torque-2.5.13.ebuild 7739 SHA256 a0dc10b8d9ddca69a4cb7c3332bacc40c507ae2811a88dccef057d490b6578ba SHA512 39f8682c0fcb9ca4c0801ae5eb208544f1adb4a654f9c6524f9122d2fd972b409a9c544878732895aeb7083dda2be5b3606497f431374a9e1ceffc30a8c7410c WHIRLPOOL 2af8ec693634eee2ed688298e8d6778d3cddc42018a7221773c7bd260c87287928a978c8cd27633ffbce83fe39fbaa1f835365c4e6aeea03591a140a530cc925
-EBUILD torque-4.1.5.1-r1.ebuild 7448 SHA256 1dacfc38dc7b7e9c04495e31e36afe20d84e5015b1b94ed6e2626cd5ceb3df70 SHA512 1787102e304fc4bf94a42ee2593a8e0f0cbf85d22c3879e15170ba00d2b2144db1c721a3d49d564eaaf9e5e1079bf3bc494df4c76dcc12a65453bd0d16acf886 WHIRLPOOL 4fb6f7d2392ae4cc5acdaeee30b6bc5f5d27df572f6494ccc9e21f3ac9a2c9f7ae6680fc28d2a0a4c5528473e43cd66d61ad7288c2d120718937e3f070d83c29
 EBUILD torque-4.1.7.ebuild 7389 SHA256 0869e937a7a43b76ff431cfd88e75b22e24cd69ba2310800981dc205e0515879 SHA512 9e799657b418178b3428b6927e3afe9f377ce8dfb7bc9c874659aaf86c62c4653380509f4d8561af3ead8ec69f91ce1285510025e50745bb16323eceb3e9a698 WHIRLPOOL 2719e29ec4a020d17e1d7ebd9af4cf97d36f63b5362c44b731477782a4045d09cbb2948515205066e8b14f4198f832a58f2acda234354175dabfb3ffb8ad6931
 EBUILD torque-4.2.9-r2.ebuild 7434 SHA256 1b6562586338a1e7e59fa03b4c5731507b46570725d2b14fc8f88ac9979cd4a5 SHA512 e204d45ebfe0f8bf9999749520ac8c173a704a8a360ad1e2346774ef1873b644d1eef7d7ebb03ece5c5e90ba607013a3266c020e50f6de24d06445a5a4bbe94f WHIRLPOOL cebdaad08ab882c817183bf53039c1d934a633bb251cb4ec54a68a416493d79b5fa35db90f1ff5297aaa8c61f9e44782694975200793cc2c63c44ef5a90ca297
-MISC ChangeLog 31161 SHA256 790f416f671e956ff402f30a89d70f3853e10e2c8f92f58ef0fc924b94ca7db6 SHA512 131ec81d4811199e8902f4b9d5bc6f80f485c4544577a0cd9c0d674e0a950cd06deff0f24cc964319859fe33cfb0694fea828c33fe6e3d34758e41a223cbf669 WHIRLPOOL 9541906498eac2cf402b5996decec89ef15b5f85ef94c6fe5b0d1410d0138d4085603977fa39f6667167dab2a4593bd8dc0fb8391952da9331005d7c78aeee43
+MISC ChangeLog 31301 SHA256 713932957cb265817e312e74cfadf7ef9f6825185ba66eaad55d3434f0d7026a SHA512 4cb248bbd1855931dad474b020c2bcfab558e65c3b1cb9ab1041cf8c9457943e7d2fcff21d97e44810f8ae3818b7747e24fbd5d47983ca124fcbafef3e248be5 WHIRLPOOL 611a82a7647321d8b655b88e949c0a09d93ef9b9b0f8d3cbcba7e641ab70d24cf983f7662f853d8cda392ae647e278f06cb17d5d401078ae293cfc70833dbb5e
 MISC metadata.xml 628 SHA256 10fab1886476e44fabbcda6e7dbbc8452d07cb0de0cefcf6e594312dfe89f7af SHA512 d1c78c4247f209eda60a61c9c611c4a4b87d52f85b112a78b96a4dee6f3cd660aef49547323074d69ffce8c1b916c3914f00282781e2f68f76658e6f9ac7ff9b WHIRLPOOL 243373e602f92a256118e6bee6c3071d5894caf3d53a663abee6929a310cf306b15a6a7bd2a0e76882cfe36cd4e8b6c06bb9e12f49f678d085883d61d4a84cf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUnSpEAAoJELp701BxlEWfz+wQAJvBIDb2wkj2y8FTEWB/oHgf
-dUqsDVw6CCvUblB7aknQuSrF9UOf96qVNCP1BE11fKuTpvCQ/v0P1DrnnKdIYiMY
-cbDHMKgi66ld1DLP1N+0epzWP5JGzroj64Xv0jDXzzE+k861W8v2Tb0YuKk9Dasm
-4ggU4ATqXJT7YOZF62EI9Z8wKm7IHsju0CjKjkf2LgTnmBpbL74olugYw+amrN6W
-kcyVgH59N+3egJxVI2kDIv7KbNAyUWZSDNF3PhkmQIyBcstGcTFAuezDhi/CkBLl
-+v+Q8VwlcWqtnlsJneI8TDzjxqlO5x7c1ioSCQ3DJQ4oQzKiAKI//L7YxPL7BS+D
-lRP6pU2JxRTnCEXCZkwMu6JxShZstpUA9FFbQbAiFcWsBGCduTRum9qpD2XS6jV9
-dSCAAT1CN3eYuYs2shjFmP5+YVSJhaUEMTxtLbMZvvkV7n2oon61pNqf0i+i4ry7
-T6H10IelcJqkYAi0gyBsk2JABM0dyvmrCDygYlD+H1RLgqsGDarosNiDK1wiNlfM
-3sk0AQGTzPAtJQesDIhrZQxc0nqr+DhvTkK8zGG4jBn5LNw6vN4t3gQAegy/HmzX
-crmZ/dPv6ZMOcAIzxPadYOv/+UzCgqB5JPSPtagovgBzLhqossHJnZSW3OWt7Ls+
-8jyhmRDga7q4vJavwmjY
-=NYQs
+iQIcBAEBCAAGBQJUnYeYAAoJEF0huFKJUZL5bvUP/1+BTl6N8MuwABFxVlwJBHa7
+oUa7fOzMUoXk7NrdElnJXvcssRfxpahV4czWl0m9tJ8BZXYxmzi6HP703UexFbdL
+mJgP/229eBBrnCck9N7f7iuARN+1aCuT4ujefLEFYMf4Q12nIvNhmkL0EuzRH7IJ
+EECX2W7BP8Mn2Oa7dJG8Ltf8CAOrPjSGmi2VxEuXLOXHjdEQzOWPIUB3yNwVh7DN
+Qps1bIgFKoGvs27/sAcz/Hszz2AH4VwPg6Z9giqgyQW7bgtHSB5lQMl0e/qxpekj
+YraE5d+FE5ApEfql32IRJhJnpYEY0iFZA+SULYJlUBkUW5/96HQot1dJQqlwl6pC
+wyZbmUKCFEkjrN6wOvhKuTdw5kF5hym7vImtr/8Z9mfDDDbkJkLJWUoEjMnBX2Wi
+xriuDQXI4TVprRHV/uz56bJPjFEamp768TFs0gnUYBRHiOO0Zd0Rwge3KQHXLkHe
+9VRC/QIPYu0dVgUhCvjSLIjmUkg7+tUF+kHh2qvtmXJuB548RIAosHP4/7ly08ZE
+bKfPAzBvLx0+682cmybyLM2Is1nDVy/eVRTvPNpRTTa0I7eArJPqBkM3Etb8erDI
+Kdy7MW4FbUOAlMSN2TuP2JueH46Kl1zIYZSfqjJUWL9tYqdst4IqA6vmRM+UkYe+
+Jb1QTlJ9NWfqOTUt55Ls
+=8Kh1
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-2.5.12-r1.ebuild b/sys-cluster/torque/torque-2.5.12-r1.ebuild
deleted file mode 100644
index a12e3978cec2..000000000000
--- a/sys-cluster/torque/torque-2.5.12-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.5.12-r1.ebuild,v 1.9 2014/01/19 13:46:43 ago Exp $
-
-EAPI=4
-
-inherit autotools-utils eutils flag-o-matic linux-info
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-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 static-libs +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 )"
-
-DOCS=( Release_Notes )
-
-PATCHES=( "${FILESDIR}"/tcl8.6.patch )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-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}"/CVE-2013-4319-2.x-root-submit-fix.patch
-
-	# Unused and causes breakage when switching from glibc to tirpc.
-	# https://github.com/adaptivecomputing/torque/pull/148
-	sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
-}
-
-src_configure() {
-	local myeconfargs=( --with-rcp=mom_rcp )
-
-	use crypt && myeconfargs=( --with-rcp=scp )
-
-	myeconfargs+=(
-		$(use_enable tk gui)
-		$(use_enable tk tcl-qstat)
-		$(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}
-		)
-	autotools-utils_src_configure
-}
-
-# 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}
-		fi
-	done
-}
-
-src_install() {
-	# Make directories first
-	pbs_createspool "${D}"
-
-	autotools-utils_src_install
-
-	use doc && dodoc doc/admin_guide.ps doc/*.pdf
-
-	# 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
-		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 || 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"
-	echo
-	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 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-4.1.5.1-r1.ebuild b/sys-cluster/torque/torque-4.1.5.1-r1.ebuild
deleted file mode 100644
index b76e696f5da7..000000000000
--- a/sys-cluster/torque/torque-4.1.5.1-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.5.1-r1.ebuild,v 1.11 2014/10/17 03:59:14 jsbronder Exp $
-
-EAPI=4
-inherit flag-o-matic eutils linux-info
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-# TODO:  hopefully moving to github tags soon
-# http://www.supercluster.org/pipermail/torquedev/2013-May/004519.html
-SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1058 -> ${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 tk"
-
-DEPEND_COMMON="sys-libs/ncurses
-	sys-libs/readline
-	cpusets? ( sys-apps/hwloc )
-	munge? ( sys-auth/munge )
-	nvidia? ( >=x11-drivers/nvidia-drivers-275 )
-	tk? ( dev-lang/tk )
-	syslog? ( virtual/logger )
-	!games-util/qstat"
-
-DEPEND="${DEPEND_COMMON}
-	!sys-cluster/slurm"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )
-	!dev-libs/uthash"
-
-# Torque should depend on dev-libs/uthash but that's pretty much impossible
-# to patch in as they ship with a broken configure such that files referenced
-# by the configure.ac and Makefile.am are missing.
-# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html
-
-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
-			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() {
-	# Unused and causes breakage when switching from glibc to tirpc.
-	# https://github.com/adaptivecomputing/torque/pull/148
-	sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
-
-	# We install to a valid location, no need to muck with ld.so.conf
-	# --without-loadlibfile is supposed to do this for us...
-	sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die
-
-	epatch "${FILESDIR}"/${P}-tcl8.6.patch
-	epatch "${FILESDIR}"/CVE-2013-4319-4.x-root-submit-fix.patch
-}
-
-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 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 \
-		--without-loadlibfile \
-		${USE_CPUSETS} \
-		${myconf}
-}
-
-src_install() {
-	local dir
-
-	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
-
-	for dir in $(find "${D}/${PBS_SERVER_HOME}" -type d); do
-		keepdir "${dir#${D}}"
-	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
-	newinitd "${FILESDIR}"/trqauthd-init.d trqauthd || 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
-
-	if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
-		cp "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
-			"${D}"/${PBS_SERVER_HOME}/server_priv/nodes || 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() {
-	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}"
-
-	elog "Important 4.0+ updates"
-	elog "  - The on-wire protocol version has been changed."
-	elog "    Versions of Torque before 4.0.0 are no longer able to communicate."
-	elog "  - pbs_iff has been replaced by trqauthd, you will now need to add"
-	elog "    trqauthd to your default runlevel."
-}
-
-# 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}
-}