Add 2.4 series finally.

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

3 files changed, 234 insertions, 5 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index b2aa56c65143..2bca6e292764 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.89 2010/03/02 02:06:21 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.90 2010/03/02 02:15:25 jsbronder Exp $
+
+*torque-2.4.6 (02 Mar 2010)
+
+  02 Mar 2010; Justin Bronder <jsbronder@gentoo.org> +torque-2.4.6.ebuild:
+  Add 2.4 series finally. Users should be aware bugs are frequently reported
+  upstream.
 
 *torque-2.3.10 (02 Mar 2010)
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 053759e4a757..ae8c7d245fa8 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -9,16 +9,18 @@ AUX torque-env.d-2.2.1-r1 260 RMD160 d16f5490599c9f2a2db493cdeedaf777e19bc6a4 SH
 DIST torque-2.3.10.tar.gz 5465239 RMD160 cd35c11100454d8c055880e8bf0df8960e51daa7 SHA1 b807e25c72353c64fd1e1858581ab3e4c93d898e SHA256 8228089bc01e1d77a00208aa9fb14591d270877097fb145ac33502a9dea4fd2f
 DIST torque-2.3.6.tar.gz 5447812 RMD160 c56c50eb6c060485ccd843a2595aa6952e465681 SHA1 43420cca1a6dcb22fb246b8b44501eed7ac5649b SHA256 95cdc2d4c61fef867caffcb20e41e614b9f8b0f4bc9d0a618546a885dd259dd3
 DIST torque-2.3.7.tar.gz 5456607 RMD160 2dc59650397e23f3439ed057024114f9f54536a2 SHA1 4280343ed794c2b6a549c6b04ec691dab4149551 SHA256 802e2f3b5489e32c44d27a76861df94eb791f42f4e13283cf90431194a48d4d0
+DIST torque-2.4.6.tar.gz 5537109 RMD160 e3fab9634cb17b98eebd4613101b54b061c98182 SHA1 f2901bd54f8b554a5cd26ac1c68d2ab6b65f2f1d SHA256 84c6f96bd034dc8766fc28a1e0f641c6c01d3c00712f05adb81c37b2be988975
 EBUILD torque-2.3.10.ebuild 6965 RMD160 39c8d04016d5599a9ddde05d8f5d4f04324dadde SHA1 147b24810a5f0b4b6f7a7a2d1b0e53d938586059 SHA256 a86419b1dcc48d4a004876431264af3933571f6191599765b0e5e15bffd9815d
 EBUILD torque-2.3.6.ebuild 7118 RMD160 b7ee60a7e9e46c21158485287508ea03543f5cce SHA1 d6d107a851600d9ba67d5a3ca96c0ad75e1eca76 SHA256 568aa7e924a72e51362e7531be136463392c947e6038143a3147661174b57c2d
 EBUILD torque-2.3.7-r1.ebuild 6987 RMD160 0121e9a50a8f1a56428ea7422208b691b0e8c943 SHA1 ca2c5c4621471831c5f1629a6fe50c96cd138f14 SHA256 48d4ce4793375d80f9fba48c5a2a7a826a9662516c28ee16afa41613c338e2f6
 EBUILD torque-2.3.7.ebuild 7095 RMD160 3ec52c16ef114231cdedee518dc366a2b7c68c33 SHA1 ad46fe4a07897f44089acd8e72fb65e6fd820d81 SHA256 36563ebad0a0ffec38a2d6891f0879dd2788180b84d6eec35d388c37ae6e3c85
-MISC ChangeLog 15466 RMD160 62cebc8995f29c8c3f85576a5dac048d3bf5853d SHA1 d8fd5dc1488f3e28cdaf19d9be0f3047bc412ea5 SHA256 69c7f143edf384b4439d1fabdde23f251647d7ed538729856f63837c7af54c1b
+EBUILD torque-2.4.6.ebuild 6964 RMD160 ec79d33583cd8a2e33c1554cadb86bc97066d6c5 SHA1 3fac245e2a38fac255f277e0f81af9110b69c405 SHA256 f90b0114813d74f21397a1fe6ab51abf5d6eda8264dce6f45c2459976f3df88d
+MISC ChangeLog 15660 RMD160 ae4c11f201a101eb29c72966d1fd3683b59093eb SHA1 e6d45d461e94c30b5d56413b1e2e76c78631d6aa SHA256 0691dd9be7d0e86bce66ecaa7cd745c3df27738c061be950d33a3d701a64e356
 MISC metadata.xml 495 RMD160 ed5f4dcf6030235e74f01c992a4b94340d1abcf8 SHA1 b8aace94549c40750ac998296695d80e52bf8634 SHA256 145bd4f19406de8d0168d48652203c30f19607b79c6a58a9b0709618f44e37db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkuMcqMACgkQ4MrvBE1wQ8nMZwCfbyFLG+41vj1rVEJr48bzZrbo
-qc4An3S6fDcnYTYUfMbeZ18Rmes/ufJK
-=+XEv
+iEYEARECAAYFAkuMdMYACgkQ4MrvBE1wQ8k1hACggrzQOVHJgLHTWJZeOxGF8VC3
+zlQAoK3wyJExLSytGGVtrvVxxo7d78Io
+=bCoj
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-2.4.6.ebuild b/sys-cluster/torque/torque-2.4.6.ebuild
new file mode 100644
index 000000000000..143b5931715c
--- /dev/null
+++ b/sys-cluster/torque/torque-2.4.6.ebuild
@@ -0,0 +1,221 @@
+# 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.6.ebuild,v 1.1 2010/03/02 02:15:25 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-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
+
+	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}
+}