2.4 series version bump.

(Portage version: 2.1.9.33/cvs/Linux x86_64)

3 files changed, 66 insertions, 5 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 80b877b51568..68be9891a458 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.108 2011/01/22 23:18:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.109 2011/03/14 20:30:21 jsbronder Exp $
+
+*torque-2.4.12 (14 Mar 2011)
+
+  14 Mar 2011; Justin Bronder <jsbronder@gentoo.org> -torque-2.4.11.ebuild,
+  +torque-2.4.12.ebuild,
+  +files/0003-disable-automagic-doc-building-2.4.12.patch:
+  2.4 series version bump.
 
   22 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> -torque-2.3.6.ebuild:
   Drop old.
diff --git a/sys-cluster/torque/files/0003-disable-automagic-doc-building-2.4.12.patch b/sys-cluster/torque/files/0003-disable-automagic-doc-building-2.4.12.patch
new file mode 100644
index 000000000000..b98a6ac99dd4
--- /dev/null
+++ b/sys-cluster/torque/files/0003-disable-automagic-doc-building-2.4.12.patch
@@ -0,0 +1,54 @@
+From 04aa4597a88c1fae7836b3bda547856ba57d81bf Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Mon, 14 Mar 2011 16:18:16 -0400
+Subject: [PATCH] disable automagic doc building 2.4.12
+
+---
+ configure.ac |   24 +++++++++++++++---------
+ 1 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1a98312..f6095bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1321,8 +1321,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.])])
+ 
+@@ -1365,13 +1363,21 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]],
+   ], [
+   AC_MSG_RESULT([no])
+ ])
+-
+-  build_drmaa_docs=yes
+-  RPM_AC_OPTS="$RPM_AC_OPTS --with drmaa"
+-else  
+-  DOXYGEN=none
+-  build_drmaa_docs=no
+-  RPM_AC_OPTS="$RPM_AC_OPTS --without drmaa"
++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")
++      RPM_AC_OPTS="$RPM_AC_OPTS --with drmaa"
++      build_drmaa_docs=yes ],
++    [ build_drmaa_docs=no
++      DOXYGEN=none ]
++)
++else
++    DOXYGEN="none"
++    build_drmaa_docs=no
++    RPM_AC_OPTS="$RPM_AC_OPTS --without drmaa"
+ fi
+ AM_CONDITIONAL(DRMAA_DOCS, [test "$DOXYGEN" != "none"])
+ AC_SUBST(build_drmaa_docs)
+-- 
+1.7.3.4
+
diff --git a/sys-cluster/torque/torque-2.4.11.ebuild b/sys-cluster/torque/torque-2.4.12.ebuild
index a8eb4c8f8d11..aca4543cde86 100644
--- a/sys-cluster/torque/torque-2.4.11.ebuild
+++ b/sys-cluster/torque/torque-2.4.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2 2010/11/18 16:53:18 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.4.12.ebuild,v 1.1 2011/03/14 20:30:21 jsbronder Exp $
 
 EAPI=2
 inherit flag-o-matic eutils linux-info autotools
@@ -69,7 +69,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/0002-fix-implicit-declaration-warnings.patch
-	epatch "${FILESDIR}"/0003-disable-automagic-doc-building.patch
+	epatch "${FILESDIR}"/0003-disable-automagic-doc-building-2.4.12.patch
 
 	sed -i \
 		-e 's,\(COMPACT_LATEX *=\).*,\1 NO,' \
@@ -152,7 +152,7 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	dodoc CHANGELOG DEVELOPMENT README.* Release_Notes || die "dodoc failed"
+	dodoc CHANGELOG README.* Release_Notes || die "dodoc failed"
 	if use doc; then
 		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
 		if use drmaa; then