Remove blocker on x11-misc/qterm (Bug #176533). Add blocker on games-util/qstat (Bug #207059). Drop old version

Package-Manager: portage-2.1.4.4

6 files changed, 26 insertions, 234 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 981e89279e78..be8a5df034ef 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.65 2008/04/08 09:42:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.66 2008/04/08 14:18:49 jsbronder Exp $
+
+  08 Apr 2008; Justin Bronder <jsbronder@gentoo.org> torque-2.1.6.ebuild,
+  torque-2.2.1-r2.ebuild, -torque-2.3.0.ebuild, torque-2.3.0-r1.ebuild:
+  Remove blocker on x11-misc/qterm (Bug #176533). Add blocker on
+  games-util/qstat (Bug #207059).  Drop old version.
 
   08 Apr 2008; Raúl Porcel <armin76@gentoo.org> torque-2.2.1-r2.ebuild:
   ia64 stable wrt #216116
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index f911e7f280f4..297dd8d974f7 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.3.0-fixes_r2031.patch 8484 RMD160 58429355795ed3304c986b7b667d86486bb1c8cf SHA1 2a47b277277fcfc97a26ccad7c967c9f8bf72932 SHA256 9f847cc8273b2b227d7163299ea856830c4d333527e1566b13e989d980866398
 AUX pbs_mom-init.d-2.2.1 1003 RMD160 97be9b485fabd022ff209c910ae3974a73ebbc30 SHA1 cf50bac5a12a07535104ff7f7dcdfd054c995b2b SHA256 ef010854efc7a5c310c34bc53d1d927b7928bfa0d48bb5d8ae76bd3453f37a25
 AUX pbs_mom-init.d-2.2.1-r1 1093 RMD160 ade6389bcda7974fd17c56c5f6f7a1c5b19c7fda SHA1 051455da4526b908ddb2346c912b68ba22245209 SHA256 ce5dfb1db62de8611974dcf15698dce75ef289f2a13d6a95039aec724748e64d
@@ -14,9 +17,15 @@ AUX torque-setuid-safety.patch 1020 RMD160 199a8d543c6f0de0934211ca248b637f61f1a
 DIST torque-2.1.6.tar.gz 2708793 RMD160 6802c2d49a36624d34fce7b96b29551da3ff1106 SHA1 f0437e3f429c5cecb44a7f991f2b7bd58baa7a0a SHA256 e5ac494859df9951ca34149ae56b93fbfc83d7d4ba015bc8b67514b190e51c36
 DIST torque-2.2.1.tar.gz 5370260 RMD160 219e5a4234a1bbf0241c15f568a720752e48587c SHA1 fafa9d66aa8bf8daa9e8f660903aa1105ff14bda SHA256 6d2674d471e300df6ebda56ef80c2a7be0de33fc619f98ee78eee69af1d179b8
 DIST torque-2.3.0.tar.gz 5419629 RMD160 7dd4885cda583aa8ba16dce7b9001c009f264881 SHA1 e600b121aa6dae8e872935907311913cf8631d75 SHA256 eb5e694b6acdfe84249dfdf71552cb38d26e29fcda7ba09574b041e06290ec57
-EBUILD torque-2.1.6.ebuild 4046 RMD160 8f86e25570708f5b654ddbaf457e63e3b6216d2a SHA1 da6d4c28dc8e4bd3602c774077e8105ad53dc138 SHA256 e50485f520e7f986daee2bee32a9c1a8bb5d5ad39a98c0a339b3935c0584d4af
-EBUILD torque-2.2.1-r2.ebuild 7208 RMD160 438ce2698908ada76822714570e684b46e7273d6 SHA1 38499da7aad88e867bec8a904a6a569c518e591d SHA256 d5e91b8fc0941678dcb1b2cb0ccf11bd1bf431b806a221c808cda90ba48f6137
-EBUILD torque-2.3.0-r1.ebuild 7316 RMD160 a1ba883231ee7e4f47093590f5366477cb66cfa8 SHA1 680dbb0d2eb713450efdc7994e7d88dc84194692 SHA256 af5ef050b5395a4c6cb08aafb0f5c323689d1868ce9215c0a7edbd55d6300596
-EBUILD torque-2.3.0.ebuild 7096 RMD160 6a333db5fead5a53805ea5424d061f20876d96f4 SHA1 f3ff1056ce34bfbb8f94b4a459dfb5aee1c0a1ce SHA256 a750f5a14bd4d22bdb7d1d94ddd3c61c843e4f2e5f296c0060a368af83df5798
-MISC ChangeLog 11658 RMD160 b684b0f162cb2db7669da7e9c131736a92dc6850 SHA1 ef6749b6d5ae95a4e7de85f3ca1a203a0190e4d1 SHA256 c893a56e81f99424ab82134f5f49b69e2c2bacfbd8d3338bb9dfcae7b7ae47e2
+EBUILD torque-2.1.6.ebuild 4038 RMD160 b6c85175b08ec7fc389ad4503e7844c7aebf6402 SHA1 51784cd28f3dd838d52b502b123cb81cacdf4c1a SHA256 1d2fbc09c5ee0a7658f10c813d8f0015656930887ab28f2109a57da7a11e67d0
+EBUILD torque-2.2.1-r2.ebuild 7202 RMD160 091f3503e9c5db05bd64af1b9656c653b91fbc24 SHA1 06c2464373964df53b7fd0fba85ccca731cc0b47 SHA256 b1b097dd2963ff472d5589c71dcab6caf5712b125189152133c83104729bbbb6
+EBUILD torque-2.3.0-r1.ebuild 7309 RMD160 d3600603fff95b0c8e1ae6ac762b67646b7ee5c0 SHA1 307e0ed85d315dc3e7ae3de7f058df50e4ac251f SHA256 f6ddeb6f99a65196e0482abf27d926802d153ee807505b06413f93ea1d763648
+MISC ChangeLog 11925 RMD160 a730bb10d99c9699174a8837d8b0f2f3e9465b5d SHA1 b1c1b5a43e687ed62ec14d91898d69092aeba29a SHA256 60775a625f9438a63ff916114cec39efaad432b01aa4a2f3ee75d281dd237a32
 MISC metadata.xml 231 RMD160 37dd476ccaceaa37796cf29fd01af8fcfa2b4c61 SHA1 87cab1ccad4db7724c4292e4f32dd19accdcf2fa SHA256 b5305a12d2e3e9f9fdf645e98b0108c1bd8f5b5da32589a25bf7b0f0d74f1213
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH+34T4MrvBE1wQ8kRAkdKAJ9D3rBVj5LlkPokYl9ICSeZmxlRJQCeNL/V
++RqvVFO/MmfSBTn7P8YOnZo=
+=nDCp
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-2.1.6.ebuild b/sys-cluster/torque/torque-2.1.6.ebuild
index b8340add2e47..1aeafd4e1193 100644
--- a/sys-cluster/torque/torque-2.1.6.ebuild
+++ b/sys-cluster/torque/torque-2.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.1.6.ebuild,v 1.11 2008/01/02 16:07:25 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.1.6.ebuild,v 1.12 2008/04/08 14:18:49 jsbronder Exp $
 
 inherit autotools flag-o-matic eutils
 
@@ -22,7 +22,7 @@ DEPEND_COMMON="virtual/libc
 	sys-libs/readline
 	tk? ( dev-lang/tk )
 	!virtual/pbs
-	!<x11-misc/qterm-0.4.0-r1"
+	!games-util/qstat"
 
 DEPEND="${DEPEND_COMMON}
 	sys-apps/ed"
diff --git a/sys-cluster/torque/torque-2.2.1-r2.ebuild b/sys-cluster/torque/torque-2.2.1-r2.ebuild
index a75d914b51ff..4d69032bab55 100644
--- a/sys-cluster/torque/torque-2.2.1-r2.ebuild
+++ b/sys-cluster/torque/torque-2.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1-r2.ebuild,v 1.7 2008/04/08 09:42:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1-r2.ebuild,v 1.8 2008/04/08 14:18:49 jsbronder Exp $
 
 inherit autotools flag-o-matic eutils
 
@@ -23,7 +23,7 @@ DEPEND_COMMON="virtual/libc
 	syslog? ( virtual/logger )
 	!virtual/pbs
 	!sys-cluster/openpbs-common
-	!<x11-misc/qterm-0.4.0-r1"
+	!games-util/qstat"
 
 DEPEND="${DEPEND_COMMON}
 	sys-apps/ed"
diff --git a/sys-cluster/torque/torque-2.3.0-r1.ebuild b/sys-cluster/torque/torque-2.3.0-r1.ebuild
index 4dffccab1f51..f9df23aed316 100644
--- a/sys-cluster/torque/torque-2.3.0-r1.ebuild
+++ b/sys-cluster/torque/torque-2.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.0-r1.ebuild,v 1.2 2008/04/07 18:30:47 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.0-r1.ebuild,v 1.3 2008/04/08 14:18:49 jsbronder Exp $
 
 inherit autotools flag-o-matic eutils linux-info
 
@@ -23,7 +23,7 @@ DEPEND_COMMON="virtual/libc
 	syslog? ( virtual/logger )
 	!virtual/pbs
 	!sys-cluster/openpbs-common
-	!<x11-misc/qterm-0.4.0-r1"
+	!games-util/qstat"
 
 DEPEND="${DEPEND_COMMON}
 	sys-apps/ed"
diff --git a/sys-cluster/torque/torque-2.3.0.ebuild b/sys-cluster/torque/torque-2.3.0.ebuild
deleted file mode 100644
index 8d1f0b75ddfa..000000000000
--- a/sys-cluster/torque/torque-2.3.0.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.0.ebuild,v 1.1 2008/03/12 17:55:19 jsbronder Exp $
-
-inherit autotools flag-o-matic eutils linux-info
-
-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="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="tk crypt server syslog doc cpusets kernel_linux"
-PROVIDE="virtual/pbs"
-
-# ed is used by makedepend-sh
-DEPEND_COMMON="virtual/libc
-	sys-libs/ncurses
-	sys-libs/readline
-	tk? ( dev-lang/tk )
-	syslog? ( virtual/logger )
-	!virtual/pbs
-	!sys-cluster/openpbs-common
-	!<x11-misc/qterm-0.4.0-r1"
-
-DEPEND="${DEPEND_COMMON}
-	sys-apps/ed"
-
-RDEPEND="${DEPEND_COMMON}
-	crypt? ( net-misc/openssh )
-	!crypt? ( net-misc/netkit-rsh )"
-
-[ -n "${PBS_SERVER_HOME}" ] || PBS_SERVER_HOME="/var/spool/torque"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if use cpusets && ! 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
-	elif use cpusets; then
-		einfo
-		elog "    Torque support for cpusets is still in development, you may"
-		elog "wish to disable it for production use."
-		einfo
-		if ! 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
-	fi
-}
-
-src_compile() {
-	local myconf="--with-rcp=mom_rcp"
-
-	use crypt && myconf="--with-rcp=scp"
-
-	if use cpusets && use kernel_linux; then
-		myconf="${myconf} --enable-cpusets"
-	fi
-
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-
-	econf \
-		$(use_enable tk gui) \
-		$(use_enable syslog) \
-		$(use_enable server) \
-		--with-server-home=${PBS_SERVER_HOME} \
-		--with-environ=/etc/pbs_environment \
-		--with-default-server=${PBS_SERVER_NAME} \
-		--disable-gcc-warnings \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake 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}"
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc CHANGELOG DEVELOPMENT 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}"
-	done
-
-	if use server; then
-		newinitd "${FILESDIR}"/pbs_server-init.d-2.2.1-r1 pbs_server
-		newinitd "${FILESDIR}"/pbs_sched-init.d-2.2.1-r1 pbs_sched
-	fi
-	newinitd "${FILESDIR}"/pbs_mom-init.d-2.2.1-r1 pbs_mom
-	newconfd "${FILESDIR}"/torque-conf.d-2.2.1-r1 torque
-	newenvd "${FILESDIR}"/torque-env.d-2.2.1-r1 25torque
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
-	fi
-
-	if [ -n "${PBS_SERVER_NAME}" ]; then
-		echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name"
-	elif [[ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]]; then
-		cp "${ROOT}${PBS_SERVER_HOME}/server_name" "${D}${PBS_SERVER_HOME}/server_name"
-	fi
-
-	# 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
-}
-
-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}"
-}
-
-# Either the correct PBS_SERVER_HOME and PBS_SERVER_NAME are set
-# or we use the default HOME and the localhost as the server.
-# 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="${ROOT}/${PBS_SERVER_HOME}"
-	local rc=0
-
-	ebegin "Configuring Torque"
-	[ -n "${PBS_SERVER_NAME}" ] || PBS_SERVER_NAME=$(hostname -f)
-	einfo "Using ${PBS_SERVER_HOME} 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"
-		if ! echo "y" | "${ROOT}"/usr/sbin/pbs_server \
-			-d "${ROOT}${PBS_SERVER_HOME}" -t create &>/dev/null; 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}
-}