Bump to latest 2.4 series and cleanup.

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

4 files changed, 14 insertions, 231 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 0199f33a22bb..80af893e98ae 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.96 2010/09/14 15:32:19 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.97 2010/09/22 04:40:16 jsbronder Exp $
+
+*torque-2.4.11 (22 Sep 2010)
+
+  22 Sep 2010; Justin Bronder <jsbronder@gentoo.org> -torque-2.4.9.ebuild,
+  -torque-2.4.10.ebuild, +torque-2.4.11.ebuild:
+  Bump to latest 2.4 series and cleanup.
 
 *torque-2.5.2 (14 Sep 2010)
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 40b30f879209..96a1b8509fbd 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -9,21 +9,19 @@ AUX torque-env.d 260 RMD160 d16f5490599c9f2a2db493cdeedaf777e19bc6a4 SHA1 85ad40
 DIST torque-2.3.11.tar.gz 5465941 RMD160 ba9b276a3f30b1f202a74fc3c1d6bd17a6e0a078 SHA1 3f0778a546a5a0658fcc0f28d2949fa21d7f2f9f SHA256 af85e141c1b9db7f8b4aefe30dbf4dde0063a6772872ae9abe0515dd68148d04
 DIST torque-2.3.12.tar.gz 5466656 RMD160 98538a975b6894ad80247ec365de2ab202ff972f SHA1 58a699d85d0658f57c0ed9d4fb5f82d28d0256ef SHA256 4f3acaed30de82e69209d0b2b860cdabfdc9912dffb988cd4335a706b6fb16ab
 DIST torque-2.3.6.tar.gz 5447812 RMD160 c56c50eb6c060485ccd843a2595aa6952e465681 SHA1 43420cca1a6dcb22fb246b8b44501eed7ac5649b SHA256 95cdc2d4c61fef867caffcb20e41e614b9f8b0f4bc9d0a618546a885dd259dd3
-DIST torque-2.4.10.tar.gz 5546040 RMD160 0ba7fa6d2e6c5ae77c47486d325ee1cd25100545 SHA1 d247f3b6fec7b51cba440d8fbdcffa05a7a2b2b7 SHA256 c88e34246cd3d3f69ec5b653a4b02b4385b17a428312d4926709505cd35085f1
-DIST torque-2.4.9.tar.gz 5543661 RMD160 176b03068cd626ee95c1000b2ea70be8a062be91 SHA1 387d2565dfd79dd16bd7d14320f4ff1c3a9aa78d SHA256 0bef01c754fc82e248b09505f1ee9d164f2a915f690efd68fb93628fbec9701f
+DIST torque-2.4.11.tar.gz 5532366 RMD160 09e72fea37d9811f780938f89a20fb8db7c26a08 SHA1 c200e0e2fe3452dbcede414cb76fe3614e4952fe SHA256 24b8a5501525c75476603cfd1eb962ef197a3e0de2530f7381bf66db66355076
 DIST torque-2.5.2.tar.gz 5777649 RMD160 2ea99efc2d22348162495d8afbe1d6820b8549d2 SHA1 d31d77a5f989d4e65699cad4a20d6287badf452b SHA256 5852700c3eedab53074f89105bb0e7ae8479583525af9256acbd75fc444d06c8
 EBUILD torque-2.3.11.ebuild 6920 RMD160 fbbaed99f3b7584a91cf7ae9dac0b6d4678e4df2 SHA1 e486633244ed12be103e78afbd81f4178e43d05d SHA256 fe3f41507f78df2022fef924811e0d77113aea3f8234ee524272cf3ee10cd520
 EBUILD torque-2.3.12.ebuild 6920 RMD160 476b7fce9de4c9dab1b4b6c76ba3e00601d52e71 SHA1 e9a9e4b9a1896bd3ec0aad0986c00bbf75004e75 SHA256 051cabd453554c31aa3e2abb9c177dd17e381fe0f82e6f83f7f716c2a003258d
 EBUILD torque-2.3.6.ebuild 7076 RMD160 40be573f4bd9111216c008e24f3688f1caa13fd3 SHA1 1d6cc4055621e02fffeb78169510470a089df389 SHA256 39ad7640b0fbf6d0dbc6b1879adc647f400ca9cbfd7aa7038126b14feddeafce
-EBUILD torque-2.4.10.ebuild 6920 RMD160 031dba5b9da0e72ce224e24fe57e7d21c93e7788 SHA1 03cb6f649e1774b6952a317b3dba4a2f185692de SHA256 6cb61e20553d4c6bf5a759a08101d6b3d2fd57b90fa27324d745a153a467d4f7
-EBUILD torque-2.4.9.ebuild 6919 RMD160 646c9871bee12b074336c6bfe4052d0d0188b95c SHA1 dc7c399da4050e5031488960fa6a3a6ca4377e3e SHA256 b2def6f019b63f3223906fa42d302ebde6ac17023eaadfb4be5361f8abc718dc
+EBUILD torque-2.4.11.ebuild 6920 RMD160 e703c29dc05abd669e66782ad5a1631f9714b9b0 SHA1 a963540d8a826bdb1b7c2b469cbe82148aa18294 SHA256 401ad22d0ae4e31d0275aa79d5e5f8e868350189cc0308c5a94054ed48a65ff2
 EBUILD torque-2.5.2.ebuild 6959 RMD160 bf0ce2eaa5c1b3c3d42d78c2ced40372a9622bba SHA1 4ad7beaa4b3435476ead689af57de50b681984c1 SHA256 7bd290c3593385f8e44209c5e63a07b491e218e66f4e77cc2dd8fa50df366080
-MISC ChangeLog 16916 RMD160 6cecbf5fe729a24a129c104a74734b66d50cbce8 SHA1 40e88ef178abf6d714864ff0884598d76bf0ddb4 SHA256 a6d1d3653b7b3563e064b6e858e020fb51b0c8bb32bb814956ce57349cec127d
+MISC ChangeLog 17111 RMD160 c19fa2ea280f8068747e0db0986c761719630e22 SHA1 efa905593017d6387f876813745509c4c64edcc0 SHA256 079d6a2108c104a95fdbb179db2eb5098ce52d8815b956c77eda86993c119045
 MISC metadata.xml 492 RMD160 fa155296531b5137a14a4d6a121753c7a0e99141 SHA1 043e20bfe9922272af68f638a3d8335634049cbd SHA256 1ea882000c22bb26796657e5b9c707b290bfc69cc6927b95d162e41a075ee321
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyPlX8ACgkQ4MrvBE1wQ8mjqQCfQWDhB1I9vZgJGaSPvFGjhfW5
-d1MAn3K7z1NJ1uZR2XfL4G7u+GhNcfnU
-=DXsh
+iEYEARECAAYFAkyZiL0ACgkQ4MrvBE1wQ8l96ACfZYRSyT3kKw7YP/TkH7S0Cihu
+N/sAn3aEqwfkZu6ADrQPH5iTwW+mZbSy
+=h4Bd
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-2.4.10.ebuild b/sys-cluster/torque/torque-2.4.11.ebuild
index cb587a88c4e9..20d5f94ab8d1 100644
--- a/sys-cluster/torque/torque-2.4.10.ebuild
+++ b/sys-cluster/torque/torque-2.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.4.10.ebuild,v 1.1 2010/08/31 20:07:35 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.4.11.ebuild,v 1.1 2010/09/22 04:40:16 jsbronder Exp $
 
 EAPI=2
 inherit flag-o-matic eutils linux-info
diff --git a/sys-cluster/torque/torque-2.4.9.ebuild b/sys-cluster/torque/torque-2.4.9.ebuild
deleted file mode 100644
index 0e33249b1369..000000000000
--- a/sys-cluster/torque/torque-2.4.9.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.4.9.ebuild,v 1.2 2010/08/05 03:18:42 jsbronder Exp $
-
-EAPI=2
-inherit 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="~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}
-	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-cpusets"
-	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-cpusets"
-		fi
-	fi
-}
-
-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) \
-		--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}"
-
-	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 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
-}
-
-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
-}
-
-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}
-}