[gentoo-commits] gentoo-x86 commit in net-analyzer/munin: metadata.xml munin-2.0.3.ebuild ChangeLog

[Diego Petteno (flameeyes)]

flameeyes    12/07/28 00:44:43

  Modified:             metadata.xml munin-2.0.3.ebuild ChangeLog
  Log:
  Remove the .htaccess file; remove plugins for apt and yum; make sure to require at least freeipmi-1 for the freeipmi_ plugin; add an http USe flag to drop libwww-perl harddep.
  
  (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

Revision  Changes    Path
1.12                 net-analyzer/munin/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/metadata.xml?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/metadata.xml?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/metadata.xml?r1=1.11&r2=1.12

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/metadata.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- metadata.xml	26 Jul 2012 18:21:51 -0000	1.11
+++ metadata.xml	28 Jul 2012 00:44:43 -0000	1.12
@@ -45,6 +45,11 @@
       IPMI sensors. Disabling the flag does not remove any plugin
       file.
     </flag>
+    <flag name="http">
+      Install <pkg>dev-perl/libwww-perl</pkg> required for monitoring
+      HTTP-based services such as Apache and nginx. Disabling the flag
+      does not remove any plugin file.
+    </flag>
     <flag name="java">
       Build the Java-based plugins to monitor JMX-compatible
       applications. Disabling the flag removes the jmx monitoring



1.5                  net-analyzer/munin/munin-2.0.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/munin-2.0.3.ebuild?r1=1.4&r2=1.5

Index: munin-2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- munin-2.0.3.ebuild	26 Jul 2012 20:10:10 -0000	1.4
+++ munin-2.0.3.ebuild	28 Jul 2012 00:44:43 -0000	1.5
@@ -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.3.ebuild,v 1.4 2012/07/26 20:10:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.3.ebuild,v 1.5 2012/07/28 00:44:43 flameeyes Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="asterisk irc java memcached minimal mysql postgres ssl test +cgi ipv6 syslog ipmi"
+IUSE="asterisk irc java memcached minimal mysql postgres ssl test +cgi ipv6 syslog ipmi http"
 REQUIRED_USE="cgi? ( !minimal )"
 
 # Upstream's listing of required modules is NOT correct!
@@ -41,8 +41,9 @@
 			syslog? ( virtual/perl-Sys-Syslog )
 			ipmi? (
 				sys-apps/ipmitool sys-apps/gawk
-				sys-libs/freeipmi virtual/awk
+				>=sys-libs/freeipmi-1 virtual/awk
 			)
+			http? ( dev-perl/libwww-perl )
 			dev-perl/DBI
 			dev-perl/DateManip
 			dev-perl/File-Copy-Recursive
@@ -50,7 +51,6 @@
 			dev-perl/Net-CIDR
 			dev-perl/Net-Netmask
 			dev-perl/Net-SNMP
-			dev-perl/libwww-perl
 			dev-perl/net-server[ipv6(-)?]
 			virtual/perl-Digest-MD5
 			virtual/perl-Getopt-Long
@@ -135,6 +135,7 @@
 		/etc/munin/plugin-conf.d/
 		/etc/munin/plugins/"
 	keepdir ${dirs}
+	fowners munin:munin ${dirs}
 	use minimal || dirs+=" /etc/munin/munin-conf.d/"
 
 	local install_targets="install-common-prime install-node-prime install-plugins-prime"
@@ -144,7 +145,9 @@
 	# parallel install doesn't work and it's also pointless to have this
 	# run in parallel for now (because it uses internal loops).
 	emake -j1 DESTDIR="${D}" ${install_targets}
-	fowners munin:munin ${dirs}
+
+	# remove the plugins for non-Gentoo package managers
+	rm "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
 
 	insinto /etc/munin/plugin-conf.d/
 	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
@@ -214,6 +217,9 @@
 ## Update HTML pages every 15 minutes
 #@ 15	nice /usr/libexec/munin/munin-html
 EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
 	fi
 }
 



1.85                 net-analyzer/munin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/munin/ChangeLog?r1=1.84&r2=1.85

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ChangeLog	26 Jul 2012 20:10:10 -0000	1.84
+++ ChangeLog	28 Jul 2012 00:44:43 -0000	1.85
@@ -1,6 +1,12 @@
 # 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.84 2012/07/26 20:10:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.85 2012/07/28 00:44:43 flameeyes Exp $
+
+  28 Jul 2012; Diego E. Pettenò <flameeyes@g.o> metadata.xml,
+  munin-2.0.3.ebuild:
+  Remove the .htaccess file; remove plugins for apt and yum; make sure to
+  require at least freeipmi-1 for the freeipmi_ plugin; add an http USe flag to
+  drop libwww-perl harddep.
 
   26 Jul 2012; Diego E. Pettenò <flameeyes@g.o> munin-2.0.3.ebuild:
   Fix git diff problem.