2.4 edition: 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

3 files changed, 48 insertions, 14 deletions

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 <jsbronder@gentoo.org> 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 <xarthisius@gentoo.org>
+  who did most of the work.
 
   18 Nov 2010; Justin Bronder <jsbronder@gentoo.org>
   +files/0001-fix-parallel-doc-install.patch,
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 05430cf7f224..50032f9672a3 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -15,14 +15,14 @@ DIST torque-2.4.11.tar.gz 5532366 RMD160 09e72fea37d9811f780938f89a20fb8db7c26a0
 DIST torque-2.5.2.tar.gz 5777649 RMD160 2ea99efc2d22348162495d8afbe1d6820b8549d2 SHA1 d31d77a5f989d4e65699cad4a20d6287badf452b SHA256 5852700c3eedab53074f89105bb0e7ae8479583525af9256acbd75fc444d06c8
 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.4.11.ebuild 7670 RMD160 1d764e11f501c60a1f17b69345b5c1e5377038cb SHA1 855226553e5e09f561e736dc22d8e1ee8cdde2ce SHA256 709525f54492eed5b188592394f41acd4dbde1cf4c29c5d63244595e0b90500b
 EBUILD torque-2.5.2.ebuild 6959 RMD160 bf0ce2eaa5c1b3c3d42d78c2ced40372a9622bba SHA1 4ad7beaa4b3435476ead689af57de50b681984c1 SHA256 7bd290c3593385f8e44209c5e63a07b491e218e66f4e77cc2dd8fa50df366080
-MISC ChangeLog 17750 RMD160 0920b3263a20d974054ad7d9b70a9e3dde3e3710 SHA1 4ea98054f5dd8435d9b3ea478fb843d34024e514 SHA256 214a0cf16c8e8e3ed1d838ac06ce62cb607bd16aefbc9648118a67d9a5f8a118
+MISC ChangeLog 18005 RMD160 fc64a7db7210191b37d2ce7ae9549778d0af2665 SHA1 e73dd2cfe67e2d3ee053dcceb7d9ef3495f048cc SHA256 9532a113d2a6c611fd8e868d3aeeffd38f82320a3f0ab2b055ce796dcc41e81d
 MISC metadata.xml 492 RMD160 fa155296531b5137a14a4d6a121753c7a0e99141 SHA1 043e20bfe9922272af68f638a3d8335634049cbd SHA256 1ea882000c22bb26796657e5b9c707b290bfc69cc6927b95d162e41a075ee321
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzlUmYACgkQ4MrvBE1wQ8mW7gCffx/IEpkleivRwt7S4y/ebOEo
-VUoAn1NthDZ9uttGiIVjHrt79UmZvYNU
-=ZnTX
+iEYEARECAAYFAkzlWgQACgkQ4MrvBE1wQ8nd6QCfaP/Q0mZcy7biZHoCWIrdPqih
+kH8An1q6dt7zlaDL93TYitPeUcGoHaqG
+=t6gp
 -----END PGP SIGNATURE-----
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() {