From 2fab7d48e600d18ce0236d4e5c237374c64f1a73 Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Thu, 18 Nov 2010 16:53:18 +0000 Subject: 2.4 edition: add missing deps for building the drmaa docs along with other minor fixes (#345463). Thanks to Kacper Kowalik who did most of the work. (Portage version: 2.1.9.24/cvs/Linux x86_64) --- sys-cluster/torque/ChangeLog | 7 ++++- sys-cluster/torque/torque-2.4.11.ebuild | 45 +++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 9 deletions(-) (limited to 'sys-cluster') diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog index b2a84c4f6e9d..93ce04d715d5 100644 --- a/sys-cluster/torque/ChangeLog +++ b/sys-cluster/torque/ChangeLog @@ -1,6 +1,11 @@ # 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.100 2010/11/18 16:20:44 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.101 2010/11/18 16:53:18 jsbronder Exp $ + + 18 Nov 2010; Justin Bronder torque-2.4.11.ebuild: + 2.4 edition: add missing deps for building the drmaa docs along with other + minor fixes (#345463). Thanks to Kacper Kowalik + who did most of the work. 18 Nov 2010; Justin Bronder +files/0001-fix-parallel-doc-install.patch, diff --git a/sys-cluster/torque/torque-2.4.11.ebuild b/sys-cluster/torque/torque-2.4.11.ebuild index 20d5f94ab8d1..a8eb4c8f8d11 100644 --- a/sys-cluster/torque/torque-2.4.11.ebuild +++ b/sys-cluster/torque/torque-2.4.11.ebuild @@ -1,9 +1,9 @@ # 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.11.ebuild,v 1.1 2010/09/22 04:40:16 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.4.11.ebuild,v 1.2 2010/11/18 16:53:18 jsbronder Exp $ EAPI=2 -inherit flag-o-matic eutils linux-info +inherit flag-o-matic eutils linux-info autotools DESCRIPTION="Resource manager and queuing system based on OpenPBS" HOMEPAGE="http://www.clusterresources.com/products/torque/" @@ -23,6 +23,7 @@ DEPEND_COMMON="sys-libs/ncurses !games-util/qstat" DEPEND="${DEPEND_COMMON} + doc? ( drmaa? ( app-doc/doxygen[latex,-nodot] ) ) sys-apps/ed" RDEPEND="${DEPEND_COMMON} @@ -42,7 +43,7 @@ pkg_setup() { fi fi - USE_CPUSETS="--disable-cpusets" + USE_CPUSETS="--disable-cpuset" if use cpusets; then if ! use kernel_linux; then einfo @@ -61,16 +62,36 @@ pkg_setup() { elog "your kernel with CONFIG_CPUSETS enabled." einfo fi - USE_CPUSETS="--enable-cpusets" + USE_CPUSETS="--enable-cpuset" fi fi } +src_prepare() { + epatch "${FILESDIR}"/0002-fix-implicit-declaration-warnings.patch + epatch "${FILESDIR}"/0003-disable-automagic-doc-building.patch + + sed -i \ + -e 's,\(COMPACT_LATEX *=\).*,\1 NO,' \ + -e 's,\(GENERATE_MAN *=\).*,\1 NO,' \ + src/drmaa/Doxyfile.in || die + sed -i \ + -e '/INSTALL_DATA/d' \ + src/drmaa/Makefile.am || die + eautoreconf +} + src_configure() { local myconf="--with-rcp=mom_rcp" use crypt && myconf="--with-rcp=scp" + if use drmaa && use doc; then + myconf="${myconf} --enable-apidocs" + else + myconf="${myconf} --disable-apidocs" + fi + econf \ $(use_enable tk gui) \ $(use_enable syslog) \ @@ -129,18 +150,22 @@ src_install() { # Make directories first pbs_createspool "${D}" - make DESTDIR="${D}" install || die "make install failed" + emake 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" + if use drmaa; then + dohtml -r src/drmaa/doc/html/* || die + dodoc src/drmaa/drmaa.pdf || die + fi 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}" + sed -e "s/${D//\// }/ /" "${file}" > "${file}.new" || die + mv "${file}.new" "${file}" || die done if use server; then @@ -150,6 +175,9 @@ src_install() { newinitd "${FILESDIR}"/pbs_mom-init.d pbs_mom newconfd "${FILESDIR}"/torque-conf.d torque newenvd "${FILESDIR}"/torque-env.d 25torque + + [ -d "${D}"/usr/share/doc/torque-drmaa ] && \ + rm -rf "${D}"/usr/share/doc/torque-drmaa } pkg_preinst() { @@ -160,7 +188,8 @@ pkg_preinst() { 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 + sed -i "s:/var/spool/torque:${PBS_SERVER_HOME}:g" \ + "${D}"/etc/env.d/25torque || die } pkg_postinst() { -- cgit v1.2.3-65-gdbad