sys-cluster/torque: cleanup old

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

3 files changed, 8 insertions, 235 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index dc8fb65b63ba..ce06bab948b7 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.186 2015/08/05 17:23:36 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.187 2015/08/05 17:32:08 jsbronder Exp $
+
+  05 Aug 2015; Justin Bronder <jsbronder@gentoo.org> -torque-4.2.9-r3.ebuild:
+  sys-cluster/torque: cleanup old
 
 *torque-4.2.9-r4 (05 Aug 2015)
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 4c00f57ba39e..44cf45dfe5b1 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -24,14 +24,13 @@ DIST torque-4.1.7.tar.gz 6218108 SHA256 3c86b2d84589f54ac222e81dd1953d153e1d8361
 DIST torque-4.2.9.tar.gz 6294022 SHA256 46f1f319683af6d3820e18cda69ce59113c9a5c192e1f07826007be69385889b SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 WHIRLPOOL e65be66b056a519ebd1c30c2c1ae2ddf43bc4e617a52d3caced1e6dfd2b0d8b2a83c26a0f2e6e41cfae791aca68b6f91424745b2baffa2085fccc8f6ae9b8e04
 EBUILD torque-2.5.13.ebuild 7739 SHA256 a0dc10b8d9ddca69a4cb7c3332bacc40c507ae2811a88dccef057d490b6578ba SHA512 39f8682c0fcb9ca4c0801ae5eb208544f1adb4a654f9c6524f9122d2fd972b409a9c544878732895aeb7083dda2be5b3606497f431374a9e1ceffc30a8c7410c WHIRLPOOL 2af8ec693634eee2ed688298e8d6778d3cddc42018a7221773c7bd260c87287928a978c8cd27633ffbce83fe39fbaa1f835365c4e6aeea03591a140a530cc925
 EBUILD torque-4.1.7.ebuild 7389 SHA256 0869e937a7a43b76ff431cfd88e75b22e24cd69ba2310800981dc205e0515879 SHA512 9e799657b418178b3428b6927e3afe9f377ce8dfb7bc9c874659aaf86c62c4653380509f4d8561af3ead8ec69f91ce1285510025e50745bb16323eceb3e9a698 WHIRLPOOL 2719e29ec4a020d17e1d7ebd9af4cf97d36f63b5362c44b731477782a4045d09cbb2948515205066e8b14f4198f832a58f2acda234354175dabfb3ffb8ad6931
-EBUILD torque-4.2.9-r3.ebuild 7431 SHA256 4078503ae4ea7dba6e5dde2e61624c6eb3ac98dc37f69032b900f1a5611b2648 SHA512 d163f33e282d10015032827c3774e30fe9f3e15626909944241d12c151d30925d2234160d6031202d3c21abf8f7d0450410baa7db04cbf64a5ed41c87bf213c0 WHIRLPOOL 97bf72d7136aaa2df01d89e0e70bb9c534f8b22512756c97d5561b34a9bd67e6d0835af7c40e10b756e7617ad2a98b7dd217d5e5099466473c15cb2d6cf216d4
 EBUILD torque-4.2.9-r4.ebuild 5592 SHA256 b3b3906cfa12c2141dde70cf5bd47030db35b9356f6122787159ef22b44ce2bb SHA512 8927d9e2b61b33c3bb8292b940921c7ade7677aabf3f6288dc940a899508ecce6ce8697636ca5fd39f4cea92e688452be2e179b801ddbf7710c0defc6ca862b6 WHIRLPOOL 38cabad9a9fb98a5a0052606a7ee316fad1632b306199ffff9917167c6abe96152b67dca89f3dbe3eebd87638a195b4c7130747fa7fb29b7b6313e771558b770
-MISC ChangeLog 31718 SHA256 57869537747496582b93f6cd931694269a9e6a53e6d70e5f900fa01a40d69026 SHA512 5bbeea7bc32bbab8b74a3f74259d96a4f4897cb7ba22ce2750a5e05e3874377b1c4ad3ab6dcb9e0888339d9ef8456290383c75376704289aa8554cb762fd287c WHIRLPOOL 11acf1fe88d1eef1a484f000ac3b909d237f7d373759e15f588d5fb27a068364b7c146cd01b7f9e3a0c09270c3fd02203882376374a42847d687afd27b771991
+MISC ChangeLog 31831 SHA256 9a80be6b4d5f69bc06868c662837fa8ed096a189915e1a52d9aef0cd725ae169 SHA512 e9b4a758ffc0885198672e7130a861c9b7cdb5db58223ce5a3844cc1899bf5eb8ad8dc16e52aaf49b81cb715c99632994a1c304b0ec597a1f4b761318b22f5cd WHIRLPOOL e476dc9e22479b6821ce724f5956ff665ce978d519bc8a75e214ef69e03bacc8fe24ece6079b69526f38a4dce036fcb1391c7e9090c90d33d0f52a54c55dd892
 MISC metadata.xml 628 SHA256 10fab1886476e44fabbcda6e7dbbc8452d07cb0de0cefcf6e594312dfe89f7af SHA512 d1c78c4247f209eda60a61c9c611c4a4b87d52f85b112a78b96a4dee6f3cd660aef49547323074d69ffce8c1b916c3914f00282781e2f68f76658e6f9ac7ff9b WHIRLPOOL 243373e602f92a256118e6bee6c3071d5894caf3d53a663abee6929a310cf306b15a6a7bd2a0e76882cfe36cd4e8b6c06bb9e12f49f678d085883d61d4a84cf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlXCRpkACgkQ4MrvBE1wQ8m+wQCeOVPVEszLjAow3sJqENTsoLzW
-Y3MAnRew8xfVgkLmtFs5swd+SDzGvxY4
-=MMeA
+iEYEAREIAAYFAlXCSJkACgkQ4MrvBE1wQ8kglACfTX9IYBNafpt+fRWPD7Xo1vMu
+6tUAoI3C6Go8Xqs2NDjWdGfsyOH6hJqH
+=qbfe
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-4.2.9-r3.ebuild b/sys-cluster/torque/torque-4.2.9-r3.ebuild
deleted file mode 100644
index 32a004751aad..000000000000
--- a/sys-cluster/torque/torque-4.2.9-r3.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.2.9-r3.ebuild,v 1.1 2015/04/30 18:07:29 jsbronder Exp $
-
-EAPI=5
-
-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=2849 -> ${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/${PN}}"
-
-	# 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
-
-	# 524362
-	epatch "${FILESDIR}"/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.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
-
-	DOCS=( CHANGELOG README.* Release_Notes )
-	use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf )
-
-	default
-
-	# 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 "${ED}" -iname tclIndex); do
-		sed \
-			-e "s/${ED//\// }/ /" \
-			-i "${file}" || die
-	done
-
-	for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do
-		keepdir "${dir#${ED}}"
-	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}"/${PN}-conf.d-munge ${PN}
-	newinitd "${FILESDIR}"/trqauthd-init.d trqauthd
-	newenvd "${FILESDIR}"/${PN}-env.d 25${PN}
-}
-
-pkg_preinst() {
-	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
-		cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die
-	fi
-
-	if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
-		cp \
-			"${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
-			"${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die
-	fi
-
-	echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die
-
-	# Fix up the env.d file to use our set server home.
-	sed \
-		-e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \
-		-i "${ED}"/etc/env.d/25${PN} || die
-
-	if use munge; then
-		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || 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"
-	echo ""
-	elog "    For a basic setup, you may use emerge --config ${PN}"
-	echo ""
-	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
-		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."
-	fi
-}
-
-# 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="${EROOT}/usr/bin/qmgr -c"
-		# pbs_server bails on repeated backslashes.
-		if ! "${EROOT}"/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
-
-			"${EROOT}"/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}
-}