cleanup

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

3 files changed, 8 insertions, 228 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index eacf2a488af6..93eb47c84336 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,9 @@
 # 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.98 2010/09/27 13:41:36 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.99 2010/11/14 22:58:28 jsbronder Exp $
+
+  14 Nov 2010; Justin Bronder <jsbronder@gentoo.org> -torque-2.3.12.ebuild:
+  cleanup
 
 *torque-2.3.13 (27 Sep 2010)
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 684c7b1ae10f..02d57a91950f 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -6,22 +6,20 @@ AUX pbs_sched-init.d 1174 RMD160 d39789a7675487065094083c1ebb6da6e8246818 SHA1 c
 AUX pbs_server-init.d 1666 RMD160 e757d58142dd2abc10cee6e016744336788bca5c SHA1 f1f0a3181265e7a0c0e59cfb51c53dfaf4f93dd8 SHA256 a7e05fa7b544b46d8e8a6fc2ed4fc843dd63496597fcd32a70f45c4ddcec18d3
 AUX torque-conf.d 649 RMD160 d8a8cec80a86fdea54545d64df9276db0386d688 SHA1 115fc52661a003b69be2dfb716e29f8d86461ca3 SHA256 4139da44a55dbcb4a8227fd0aedede8e091971fd63c0e08644712f4a91e7b174
 AUX torque-env.d 260 RMD160 d16f5490599c9f2a2db493cdeedaf777e19bc6a4 SHA1 85ad40b92ec2573aae1536aa35995ca3d7deb222 SHA256 3f1c12897f3a5993a634da35a069360b0069ad189309175a0276d32b06b2d67a
-DIST torque-2.3.12.tar.gz 5466656 RMD160 98538a975b6894ad80247ec365de2ab202ff972f SHA1 58a699d85d0658f57c0ed9d4fb5f82d28d0256ef SHA256 4f3acaed30de82e69209d0b2b860cdabfdc9912dffb988cd4335a706b6fb16ab
 DIST torque-2.3.13.tar.gz 5466720 RMD160 9323be14efb5746f2290ee36ccad9381ba536d91 SHA1 1c2f5eb007f4b2e43a0491b4a85fe5e4d64df010 SHA256 18dcff32ae341281f83e0154f6e926583096ff57ec56626382b190dacc1c4054
 DIST torque-2.3.6.tar.gz 5447812 RMD160 c56c50eb6c060485ccd843a2595aa6952e465681 SHA1 43420cca1a6dcb22fb246b8b44501eed7ac5649b SHA256 95cdc2d4c61fef867caffcb20e41e614b9f8b0f4bc9d0a618546a885dd259dd3
 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.12.ebuild 6920 RMD160 476b7fce9de4c9dab1b4b6c76ba3e00601d52e71 SHA1 e9a9e4b9a1896bd3ec0aad0986c00bbf75004e75 SHA256 051cabd453554c31aa3e2abb9c177dd17e381fe0f82e6f83f7f716c2a003258d
 EBUILD torque-2.3.13.ebuild 6920 RMD160 4f81601e1c980e664259433e36de2fd22f53d51a SHA1 e0c38d8fb2557b33e7af50c8b5f0bcdc4cbd7347 SHA256 4eff34b202e98541a8b5d7f6e0778e06360e7a8f5533396187b25bccb01509d2
 EBUILD torque-2.3.6.ebuild 7076 RMD160 40be573f4bd9111216c008e24f3688f1caa13fd3 SHA1 1d6cc4055621e02fffeb78169510470a089df389 SHA256 39ad7640b0fbf6d0dbc6b1879adc647f400ca9cbfd7aa7038126b14feddeafce
 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 17267 RMD160 5bea73fcc49f26913a694f6c6acc94138cc51c34 SHA1 0df348954cb0730addae805c39f9507df0b3e0ed SHA256 6432022e5a57817654e67fd9c95f421d6f4ccad637885ce3dca4ccaa3c925795
+MISC ChangeLog 17354 RMD160 f86ce9c09f107b4f095c1d8cf3084a6c89bf82dc SHA1 2ae762ca457f6c3ea6f0f7eccd61c8f754495282 SHA256 c465db30622169b0cd51e61aefa372b0e748f0a909a13c55479da7593249f328
 MISC metadata.xml 492 RMD160 fa155296531b5137a14a4d6a121753c7a0e99141 SHA1 043e20bfe9922272af68f638a3d8335634049cbd SHA256 1ea882000c22bb26796657e5b9c707b290bfc69cc6927b95d162e41a075ee321
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkygnxsACgkQ4MrvBE1wQ8leuQCgjUghNeNqQ2OnrjROuOERKRqU
-sMsAn1jdJkWljgFI8CRgMf08m3Ps6/Ay
-=Tyy7
+iEYEARECAAYFAkzgaZwACgkQ4MrvBE1wQ8nwAQCfSCbM2ABKk684YFnMCbI+fNWJ
+PvcAoKyVlQAIO9TO9B5bxiIT3jCiBZIF
+=37i7
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/torque-2.3.12.ebuild b/sys-cluster/torque/torque-2.3.12.ebuild
deleted file mode 100644
index a035b53dd306..000000000000
--- a/sys-cluster/torque/torque-2.3.12.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.3.12.ebuild,v 1.1 2010/08/31 20:07:35 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}
-}