Add missing deps for building the drmaa docs along with other minor fixes (#345463). Thanks to Kacper Kowalik <xarthisius@gentoo.org> who did most of the work.

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

6 files changed, 194 insertions, 14 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 93eb47c84336..b2a84c4f6e9d 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,14 @@
 # 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.99 2010/11/14 22:58:28 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.100 2010/11/18 16:20:44 jsbronder Exp $
+
+  18 Nov 2010; Justin Bronder <jsbronder@gentoo.org>
+  +files/0001-fix-parallel-doc-install.patch,
+  +files/0002-fix-implicit-declaration-warnings.patch,
+  +files/0003-disable-automagic-doc-building.patch, torque-2.3.13.ebuild:
+  Add missing deps for building the drmaa docs along with other minor fixes
+  (#345463). Thanks to Kacper Kowalik <xarthisius@gentoo.org> who did most
+  of the work.
 
   14 Nov 2010; Justin Bronder <jsbronder@gentoo.org> -torque-2.3.12.ebuild:
   cleanup
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 02d57a91950f..05430cf7f224 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0001-fix-parallel-doc-install.patch 1510 RMD160 d1e59f8888bd5e15f563f2e40fba83739aa8d5bb SHA1 750746a9503e92451e2e2ff6c63305cef6959743 SHA256 ad576c6449e078841f8f3dad1515d74264b66d43dfe5232007aca4c467120b22
+AUX 0002-fix-implicit-declaration-warnings.patch 1325 RMD160 b20b48f93d470de63772d884c6a4f63ddb86e825 SHA1 b24e9a5c5291edc8b061241446d8e975872b9477 SHA256 e3ca220f3a30ad68eaabc2152bf5e9e60fc09347d9f61edccb755d7837ef2764
+AUX 0003-disable-automagic-doc-building.patch 1424 RMD160 8eaf6adf00166f80341d586dcfdabb25638db157 SHA1 6a67ced0605cb6301dbf9f1b921152cd41403819 SHA256 e76ffde27da8d1ef456f7b728be83a148f8d69a217dd16cedb0a33d39c1d183b
 AUX pbs_mom-init.d 1093 RMD160 ade6389bcda7974fd17c56c5f6f7a1c5b19c7fda SHA1 051455da4526b908ddb2346c912b68ba22245209 SHA256 ce5dfb1db62de8611974dcf15698dce75ef289f2a13d6a95039aec724748e64d
 AUX pbs_sched-init.d 1174 RMD160 d39789a7675487065094083c1ebb6da6e8246818 SHA1 c550cd7606da18a74e736c7f0d26d04deea3d34b SHA256 b1edba8149cc3962e147d8e16148113ad629c5c7ab54ea629d5c106aea337afe
 AUX pbs_server-init.d 1666 RMD160 e757d58142dd2abc10cee6e016744336788bca5c SHA1 f1f0a3181265e7a0c0e59cfb51c53dfaf4f93dd8 SHA256 a7e05fa7b544b46d8e8a6fc2ed4fc843dd63496597fcd32a70f45c4ddcec18d3
@@ -10,16 +13,16 @@ DIST torque-2.3.13.tar.gz 5466720 RMD160 9323be14efb5746f2290ee36ccad9381ba536d9
 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.13.ebuild 6920 RMD160 4f81601e1c980e664259433e36de2fd22f53d51a SHA1 e0c38d8fb2557b33e7af50c8b5f0bcdc4cbd7347 SHA256 4eff34b202e98541a8b5d7f6e0778e06360e7a8f5533396187b25bccb01509d2
+EBUILD torque-2.3.13.ebuild 7728 RMD160 0414a85920b40806e9e70278f50e38d8e8c310af SHA1 7eb0bdf09750c5dbffc21346ea8bbe15b3ad5d7c SHA256 2a480b9381766248f870308cceffb8bb19daefaec1eb97657d319858e8ce5a3a
 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 17354 RMD160 f86ce9c09f107b4f095c1d8cf3084a6c89bf82dc SHA1 2ae762ca457f6c3ea6f0f7eccd61c8f754495282 SHA256 c465db30622169b0cd51e61aefa372b0e748f0a909a13c55479da7593249f328
+MISC ChangeLog 17750 RMD160 0920b3263a20d974054ad7d9b70a9e3dde3e3710 SHA1 4ea98054f5dd8435d9b3ea478fb843d34024e514 SHA256 214a0cf16c8e8e3ed1d838ac06ce62cb607bd16aefbc9648118a67d9a5f8a118
 MISC metadata.xml 492 RMD160 fa155296531b5137a14a4d6a121753c7a0e99141 SHA1 043e20bfe9922272af68f638a3d8335634049cbd SHA256 1ea882000c22bb26796657e5b9c707b290bfc69cc6927b95d162e41a075ee321
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzgaZwACgkQ4MrvBE1wQ8nwAQCfSCbM2ABKk684YFnMCbI+fNWJ
-PvcAoKyVlQAIO9TO9B5bxiIT3jCiBZIF
-=37i7
+iEYEARECAAYFAkzlUmYACgkQ4MrvBE1wQ8mW7gCffx/IEpkleivRwt7S4y/ebOEo
+VUoAn1NthDZ9uttGiIVjHrt79UmZvYNU
+=ZnTX
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch b/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch
new file mode 100644
index 000000000000..8505787062ab
--- /dev/null
+++ b/sys-cluster/torque/files/0001-fix-parallel-doc-install.patch
@@ -0,0 +1,35 @@
+From d29ba6daadde49d4e2325b415f2fe614bd2cbad1 Mon Sep 17 00:00:00 2001
+From: Kacper Kowalik <xarthisius@gentoo.org>
+Date: Tue, 16 Nov 2010 16:23:14 -0500
+Subject: [PATCH 1/4] fix parallel doc install
+
+man7/pbs_resources_irix5.7 was defined twice.
+
+Thanks to Kacper Kowalik <xarthisius@gentoo.org>
+---
+ doc/Makefile.am |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 797b4d6..d4b474c 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -33,7 +33,6 @@ EXTRA_DIST = man1/qalter.1.in man1/qdel.1.in man1/qhold.1.in man1/qmove.1.in \
+ 	     man7/pbs_resources_fujitsu.7.in \
+ 	     man7/pbs_resources_hpux10.7.in man7/pbs_resources_irix5.7.in \
+ 	     man7/pbs_resources_hpux11.7.in \
+-	     man7/pbs_resources_irix5.7.in \
+ 	     man7/pbs_resources_irix6.7.in man7/pbs_resources_irix6array.7.in \
+ 	     man7/pbs_resources_linux.7.in man7/pbs_resources_netbsd.7.in \
+ 	     man7/pbs_resources_solaris5.7.in man7/pbs_resources_solaris7.7.in \
+@@ -79,7 +78,6 @@ nodist_man7_MANS = man7/pbs_job_attributes.7 man7/pbs_queue_attributes.7 \
+ 		   man7/pbs_resources_freebsd.7 man7/pbs_resources_fujitsu.7 \
+ 		   man7/pbs_resources_hpux10.7 man7/pbs_resources_irix5.7 \
+ 		   man7/pbs_resources_hpux11.7 \
+-		   man7/pbs_resources_irix5.7 \
+ 		   man7/pbs_resources_irix6.7 man7/pbs_resources_irix6array.7 \
+ 		   man7/pbs_resources_linux.7 man7/pbs_resources_netbsd.7 \
+ 		   man7/pbs_resources_solaris5.7 man7/pbs_resources_solaris7.7 \
+-- 
+1.7.2.2
+
diff --git a/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch b/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch
new file mode 100644
index 000000000000..49bf1f9a8602
--- /dev/null
+++ b/sys-cluster/torque/files/0002-fix-implicit-declaration-warnings.patch
@@ -0,0 +1,53 @@
+From 7a60464264bafb27c4bbaab39744b267d671f41b Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Tue, 16 Nov 2010 16:31:25 -0500
+Subject: [PATCH 2/3] fix implicit declaration warnings
+
+vasprintf and asprintf require _GNU_SOURCE.
+
+Thanks to Kacper Kowalik <xarthisius@gentoo.org>
+---
+ src/drmaa/src/error.c  |    1 +
+ src/drmaa/src/submit.c |    1 +
+ src/drmaa/src/wait.c   |    1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/drmaa/src/error.c b/src/drmaa/src/error.c
+index b848041..4a65b47 100644
+--- a/src/drmaa/src/error.c
++++ b/src/drmaa/src/error.c
+@@ -23,6 +23,7 @@
+ # include <pbs_config.h>
+ #endif
+ 
++#define _GNU_SOURCE // asprintf
+ #include <unistd.h>
+ 
+ #include <stdio.h>
+diff --git a/src/drmaa/src/submit.c b/src/drmaa/src/submit.c
+index e9b404c..9f06620 100644
+--- a/src/drmaa/src/submit.c
++++ b/src/drmaa/src/submit.c
+@@ -23,6 +23,7 @@
+ # include <pbs_config.h>
+ #endif
+ 
++#define _GNU_SOURCE
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <limits.h>
+diff --git a/src/drmaa/src/wait.c b/src/drmaa/src/wait.c
+index ecb2ed4..2ef7600 100644
+--- a/src/drmaa/src/wait.c
++++ b/src/drmaa/src/wait.c
+@@ -23,6 +23,7 @@
+ # include <pbs_config.h>
+ #endif
+ 
++#define _GNU_SOURCE // vasprintf
+ #include <assert.h>
+ #include <limits.h>
+ #include <signal.h>
+-- 
+1.7.2.2
+
diff --git a/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch b/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch
new file mode 100644
index 000000000000..43632c3f2115
--- /dev/null
+++ b/sys-cluster/torque/files/0003-disable-automagic-doc-building.patch
@@ -0,0 +1,51 @@
+From 7351d31442fcf324b7f7769911af8a98368506e2 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Tue, 16 Nov 2010 17:03:13 -0500
+Subject: [PATCH 3/3] disable automagic doc building
+
+Instead of unconditionally building docs if doxygen is found, only build
+at the request of the user.
+---
+ configure.ac |   19 +++++++++++++------
+ 1 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 480e23e..a8182cd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1237,8 +1237,6 @@ dnl
+ if test "$build_drmaa" = "yes" ;then
+ AC_MSG_NOTICE([Configuring DRMAA ...])
+ AC_PATH_PROG(GPERF, "gperf")
+-AX_PROG_DOT
+-AC_PATH_PROG(DOXYGEN, "doxygen", "none")
+ AC_C_BIGENDIAN_CROSS
+ ACX_PTHREAD(,[AC_MSG_ERROR([POSIX threads library is required by DRMAA.])])
+ 
+@@ -1282,10 +1280,19 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]],
+   AC_MSG_RESULT([no])
+ ])
+ 
+- build_drmaa_docs=yes
+-else  
+-  DOXYGEN=none
+- build_drmaa_docs=no
++AC_ARG_ENABLE([apidocs],
++    AS_HELP_STRING([--enable-apidocs],[Build DRMAA documentation])
++)
++AS_IF([test "x$enable_apidocs" = "xyes"],
++    [ AX_PROG_DOT
++      AC_PATH_PROG(DOXYGEN, "doxygen", "none")
++      build_drmaa_docs=yes ],
++    [ build_drmaa_docs=no
++      DOXYGEN=none ]
++)
++else
++    DOXYGEN="none"
++    build_drmaa_docs=no
+ fi
+ AM_CONDITIONAL(DRMAA_DOCS, [test "$DOXYGEN" != "none"])
+ AC_SUBST(build_drmaa_docs)
+-- 
+1.7.2.2
+
diff --git a/sys-cluster/torque/torque-2.3.13.ebuild b/sys-cluster/torque/torque-2.3.13.ebuild
index d3b64bb12c63..a968401a0cbd 100644
--- a/sys-cluster/torque/torque-2.3.13.ebuild
+++ b/sys-cluster/torque/torque-2.3.13.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.3.13.ebuild,v 1.1 2010/09/27 13:41:36 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.3.13.ebuild,v 1.2 2010/11/18 16:20:44 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,37 @@ 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}"/0001-fix-parallel-doc-install.patch
+	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 +151,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 +176,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 +189,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() {