From: "Diego Petteno (flameeyes)" <flameeyes@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/munin: metadata.xml munin-2.0.7-r2.ebuild ChangeLog
Date: Thu, 18 Oct 2012 19:06:33 +0000 (UTC) [thread overview]
Message-ID: <20121018190634.09B1B21600@flycatcher.gentoo.org> (raw)
flameeyes 12/10/18 19:06:33
Modified: metadata.xml munin-2.0.7-r2.ebuild ChangeLog
Log:
Introduce a doc USE flag to build and install the HTML documentation.
(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)
Revision Changes Path
1.16 net-analyzer/munin/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/metadata.xml?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/metadata.xml?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/metadata.xml?r1=1.15&r2=1.16
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/metadata.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- metadata.xml 20 Sep 2012 21:39:38 -0000 1.15
+++ metadata.xml 18 Oct 2012 19:06:33 -0000 1.16
@@ -76,5 +76,10 @@
version 2.0.2, the master scripts only log to file, and not to
syslog.
</flag>
+ <flag name="doc">
+ Build and install a local copy of the HTML documentation for the
+ whole software. This requires <pkg>dev-python/sphinx</pkg> to
+ process the documentation sources.
+ </flag>
</use>
</pkgmetadata>
1.2 net-analyzer/munin/munin-2.0.7-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.7-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.7-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.7-r2.ebuild?r1=1.1&r2=1.2
Index: munin-2.0.7-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.7-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- munin-2.0.7-r2.ebuild 18 Oct 2012 18:47:16 -0000 1.1
+++ munin-2.0.7-r2.ebuild 18 Oct 2012 19:06:33 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.7-r2.ebuild,v 1.1 2012/10/18 18:47:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.7-r2.ebuild,v 1.2 2012/10/18 19:06:33 flameeyes Exp $
EAPI=4
@@ -18,7 +18,7 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd"
+IUSE="asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc"
REQUIRED_USE="cgi? ( !minimal )"
# Upstream's listing of required modules is NOT correct!
@@ -27,6 +27,7 @@
# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
DEPEND_COM="dev-lang/perl
sys-process/procps
+ doc? ( dev-python/sphinx )
asterisk? ( dev-perl/Net-Telnet )
irc? ( dev-perl/Net-IRC )
mysql? ( virtual/mysql
@@ -127,6 +128,9 @@
# gotten around to do so yet.
src_compile() {
emake -j1
+ if use doc; then
+ emake -C doc html
+ fi
}
src_install() {
@@ -161,6 +165,11 @@
newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
dodoc README ChangeLog INSTALL
+ if use doc; then
+ cd "${S}"/doc/_build/html
+ dohtml -r *
+ cd "${S}"
+ fi
# bug 254968
insinto /etc/logrotate.d/
1.109 net-analyzer/munin/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.109&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.109&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?r1=1.108&r2=1.109
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- ChangeLog 18 Oct 2012 18:47:16 -0000 1.108
+++ ChangeLog 18 Oct 2012 19:06:33 -0000 1.109
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/munin
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.108 2012/10/18 18:47:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.109 2012/10/18 19:06:33 flameeyes Exp $
+
+ 18 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
+ munin-2.0.7-r2.ebuild:
+ Introduce a doc USE flag to build and install the HTML documentation.
*munin-2.0.7-r2 (18 Oct 2012)
reply other threads:[~2012-10-18 19:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121018190634.09B1B21600@flycatcher.gentoo.org \
--to=flameeyes@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox