Fix handling of java to improve further; install the jmx plugins only with USE=java; don't install the localstart file with USE=minimal; drop useless doc USE flag; add REQUIRED_USE for cgi; update USE descriptions in metadata.xml and add myself as maintainer for 2.x series only.

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

4 files changed, 85 insertions, 49 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 895c47cd16b7..6728e10cccc6 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.74 2012/07/17 13:59:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.75 2012/07/17 15:27:05 flameeyes Exp $
+
+  17 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
+  munin-2.0.2.ebuild:
+  Fix handling of java to improve further; install the jmx plugins only with
+  USE=java; don't install the localstart file with USE=minimal; drop useless doc
+  USE flag; add REQUIRED_USE for cgi; update USE descriptions in metadata.xml
+  and add myself as maintainer for 2.x series only.
 
   17 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> munin-2.0.2.ebuild:
   Unbundle DejaVu fonts by depending on them and using a newer rrdtool as a
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 07ecc1045062..6b5141b6a1be 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -21,22 +21,22 @@ AUX munin-node_init.d_1.4.7 1114 SHA256 dc1a02c288d7f55a898baba4c1bd3294fe577594
 AUX munin-node_init.d_2.0.2 946 SHA256 56873af410a42f27b8e69230f0b0f6bf55e714e924f133c4cb00919d8827ab29 SHA512 48278f67bd45f196c301d2a60547f4add8ca09bf5ecdea83a97b2805a5476e251265544b197bee65c7972960a8c36aa28d6781794c9c6f734372eb10f61b5264 WHIRLPOOL 3c6a8670038490ab2980468387e683f60727b44bed1eb6087eab2bbb78c37a07a3b8a1580e8935f14bfd7fe75d8dceb46712902de65cf3d60b6aed807e032850
 DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 SHA512 f1ec1b79b4c90d899fc661656426b4cf7fdcc7f896d6de0938310b49b66e009cd1a85570005fd1a85a8168ce3568ea55c255c3511174cdf1d72bd88f162be5e0 WHIRLPOOL 43d2296bbbd476ffc0cf356fc5a191d723993735769e6f88f3581c0804b82781be38f78bfe34337e2b4e9680ade8c569a6006c0ea107e4a5c60a82b879e08404
 DIST munin-1.4.7.tar.gz 1236273 SHA256 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af SHA512 5a01c04a291f53e750b170e715c9f0d5e2cca5fa2a11f725ba6a81bbe7b34c34ef6459ea60177d13d1c38e9e91d374c1e227b2d4d7ba8c094353320a51f40b30 WHIRLPOOL f16ad8331b48136ec9cdd21fdab0efd2bca7800954f0160e7a09192c22f2d7f88cbba1df81a5750f5e4577ca1a93e41643e9ad1445b645f76becfa5db28a8088
-DIST munin-2.0.2-patches-3.tar.bz2 4392 SHA256 5b98a701b9fae0a601404d42fb248972a38d5e9a0dc0b7194e1354d89bd1a54e SHA512 5cd258917aea709eee268256d0a13074ca9f93cd334ef280b94f151ce088c4c04d85dd2cfa36220222a49bf6ba538c15c198e5136638acbaa30ef0aa61787ca4 WHIRLPOOL b9f0f9523baec001dc7a484f8768e052e28360a7a1a2b11b98cc8a70642c0641f7a41d3866c6e88b0a97e39efc82df1a035219bd934d9b1d5d2fea555ea9ad45
+DIST munin-2.0.2-patches-7.tar.bz2 9196 SHA256 79599c4415eb94e250883a571509e0f21aca4e4578abea966db4d064ece85bef SHA512 87c232ed79642d60402a31cab07edaff3c12bf91f90858ff8f554dabb77451182411b0b981d78e85377368c070768d5af5f1a36d1674df1cc42cd5c05f22c8a9 WHIRLPOOL 51543900e317ca1bb1473dd678ff0f5e2b56336fa0a8bd8c49548f1d2d75d48fdc54189a8bcbb51f098b17410323b5bad025bfe57f7e037e244af10a5d6a19f5
 DIST munin-2.0.2.tar.gz 1305391 SHA256 e8a5266a85cde8b89a97fb7463a56a7ac9c038035b952e36047b7d599bb9181b SHA512 db53591b1b653a5373e40899627b24e4bf12e11f71a5922c833e35ec2625e38ee1f08067317954a37dc2d342de0727182a455b682eea1388f2ddd87baa9d677c WHIRLPOOL 10851e9a2be0052a314d6756dca84da87c93ceb3037a8bffa1829899d94ca602be13b37400777add2e999aa163340d2ba9536e88a13c6ca64b8592fa5ad88b49
 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
 EBUILD munin-1.4.7-r1.ebuild 5033 SHA256 0694022f8066edb5dd52b0d77b06416ea6d51937e1866a947aa8e93a330ba704 SHA512 dea8c73d9ed715c7364c685a7a4a9e811e4dae0babb3549941344df84dc7f90cd5ca81f54ec244b67b070d4329db87ebe9b6f5d8d8efc3c82aad006530268c71 WHIRLPOOL 7cef416ae55bc0500ce6024fe61a2aa7b24d55d9d95cb219e83f4487e8ba72adf83bf1592a265086c8b943e4878911586de55c8f222b1fd4d601c97f5fcb373a
 EBUILD munin-1.4.7.ebuild 5036 SHA256 a88ec1523efbf2b2afe5392c746508defc3d01d09879d969bc84abc2997c0944 SHA512 792448bb65ece76f9d1108ad1140a4a1e6d4972904c4c2da1213b84d544b8bcf043c1b0d74e585fa904565d6c9557d91b25a97e1459f0e6284862edfa68845da WHIRLPOOL 5c64f50adbe996bf1ccd4a17d308812addde1e538533524fdfae03f4f84eb69fac83bd9bf65e45b050a7ed9998900b9eab01bed3927cd896aed5cb147c29cda3
-EBUILD munin-2.0.2.ebuild 4692 SHA256 ac3bd8603cefa5d844ff2cdeed2fdefc1b1b2d0c3474167fc8757b60d55dc2ee SHA512 b249a22f63669a0fc01bbd5a37528c0e3b4b510bc19b0e3deca0ea51396a94125023c328c521207ef25c5d97a7657ba6abbbb486f55085aca7fc45e1fbc35d06 WHIRLPOOL d7b8782c0b28cc5b603938fc81cd0096f08637a3b6382fbdee4ccbd6e9c43dfcbebf6a813f95d0a5bcd2fb286bb8d31c7cd50a50e9da5a26bdf8f4ee54714538
-MISC ChangeLog 14842 SHA256 c00dc9aced175acf1120f0d20f91d92cfb895fae7f343917f58877af896291fd SHA512 c470a14234b7d9711ba52e8afd0a14eef82e46e0def9b439d84ab1977839fbcc2f05c33c4d0adcfe966fc0832c0b36b65bb16fa361b28838d825ce66545a251e WHIRLPOOL 70f413e22c20e3613d6d7fbe56b8e5c753361d25b23ed842fa56ccab08b5bb9790ec968345d9c73e0deaca01fdc457772004ea96f74a66d832807ee58cfa02f6
-MISC metadata.xml 1249 SHA256 1a37b6137d5f3e8c9cac67754bf18a2a83ff31e553fd5123aa9abe79a4ce4883 SHA512 513b8077844fc6b327a24c8942a5de524df3e30ac1be30aebee2dcf1608bab8d5cb768d6fc862c52be03e7811b12f54e90bc4cf6fc8dc64d33575c27c88abebb WHIRLPOOL edfefd8dea1bf8d726edcf58832e5e4ee1069ff3b83383048fcf546932a8bbec4bf250518f6405ac9903ea90ef2ed3793036960d03d81046116a7d884ad67157
+EBUILD munin-2.0.2.ebuild 4782 SHA256 d90e30d65ddb5c1b5aee7d663b83a19495e466c5d84ee2f4af3c9ae25c201b49 SHA512 307b6134c055163e9d0b020dd1d23fac61578e6c139f0e22034e94ba59dddec43e4e647df6af21a5e03cc66cdfa3fe4138ec1b18d5bd07675eb698a7be754fc7 WHIRLPOOL 6489787cb0b1619c169f4f8964ea817e8aada2905debdcf3172fe23f0a2ad246a6d13383ab8c5ca9fa06611c1a9496c553e3acdfcc7c7a326ed6579558830e33
+MISC ChangeLog 15223 SHA256 e84dab1a7d121d7eb84da86bd8985bb5475476114a383109a898d40849fc6c40 SHA512 24a056e8f0cf276ccd5615a9307c66aa5bf71ad9b83fb3a51198d4a63ee4f89ca6f48219820f96a6b43372477af99204d76e4f883319fba0463a5d94338588fb WHIRLPOOL 12c6836917845c0340c5acbd494baba1db00d3b0992acf85a1b71c925efa6eac22994eea53fc4d906d78953ecd40a172bab3844833108cb273365ca09c252ae0
+MISC metadata.xml 2385 SHA256 f7a9078a3c72f3fae7d7e1f0f0f69f98d3a42fb5b66a8679fc1b54a29c6e95f2 SHA512 be7be43811ee9c925593312d36d924543d87b01a8a041050ee2bb9a7009aafad2942e864099b7561dd9a00a54e513f6cf29f7ee6c5a14b4f0597a4fe9ee4545e WHIRLPOOL 1a5607096b5fabbc19891a503f1d1a7d427d199b52210ec13139e8ffdd921d83ac669ee9c338f9a19a2b3fd86ed5c87c1f1513327e53fad03ace0413b9b48a3d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQBW/iAAoJEBzRPIrUMBNCaS4H/jRAFvCYmGWpdeQhBeEU4Lzz
-PEQWz0UuEwJFxUjxegNCFcIOYIn7Dmj3nVgywhlR/VgivPMQT5cxuvjL99da91uo
-EeU7bd3s+Sjdf/e+O6bTbENnzxeehbjAO7hR5P8cGB6WijQMyXpjFJGqjc6c/tKI
-KIX1K5Kx6yE7TIkb4MlOvd5g+JVFEWoCQFZDGdkUm8R2H+kh8U3TzhitkWynZPLh
-xl8ITw3jrQlvjDQcB3UuDSy0M+vZ3Hqy5faskqktXyeKxF0jtr5DLdfa46g1b4Eh
-O2mmL/bWfSB/A9OFmyLuS+jjhO6Qf8qG5ODkWE9ArWSdH9TRIjxVQsBGPnlHBW4=
-=MhO/
+iQEcBAEBCAAGBQJQBYRTAAoJEBzRPIrUMBNCNGcH/RkcThtpdKM1dl42qBB+jA+X
+yBX1G7lLcMsxk37MT0md7bOrWzVAw9hzvml0ziCMeNLJjuBgtcz0JkdEcFIOMieZ
+WOMHcu6HHKeGEbo4be65xk6NSN4mR5xVBZ8AItHzCaX4HqpU7Ryf7phc2LkOoTRC
+2L1DXly03bda+zle60tiHTz4hV5AVWEpVuHjZNdMiQD1GR4Xj17pLWow+urgiZxx
+wnliWGV759rpnuMd2WN18n4Kahk8Ao5oDSNbu4Vz5ExKlENKgN8tR8pZrHb4gyaj
+v2RBqatA6XLt45J7Hg01X/377a5P0kO2swT9KCiRMZOTYLcbCKsRe820qBSs5ys=
+=Undg
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
index 4bd85ae09d02..60c9803c00df 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/metadata.xml
@@ -1,25 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>robbat2@gentoo.org</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
-	<longdescription lang="en">
-		Munin the tool surveys all your computers and remembers what it saw. It
-		presents all the information in in graphs through a web interface. Its
-		emphasis is on plug and play capabilities. After completing a installation a
-		high number of monitoring plugins will be playing with no more effort. Using
-		Munin you can easily monitor the performance of your computers, networks,
-		SANs, and quite possibly applications as well. It makes it easy to determine
-		"what's different today" when a performance problem crops up. It makes it
-		easy to see how you're doing capacity wise on all limited resources. 
-	</longdescription>
-	<use>
-		<flag name='asterisk'>installs deps for monitoring Asterisk</flag>
-		<flag name='irc'>installs deps for monitoring IRC</flag>
-		<flag name='memcached'>installs deps for monitoring memcached</flag>
-		<flag name='minimal'>installs only the munin-node, applicable if the host is not the munin master installation"</flag>
-	</use>
+  <herd>netmon</herd>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <maintainer restrict="&gt;=net-analyzer/munin-2.0.2">
+    <email>flameeyes@gento.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    Munin the tool surveys all your computers and remembers what it saw. It
+    presents all the information in in graphs through a web interface. Its
+    emphasis is on plug and play capabilities. After completing a installation a
+    high number of monitoring plugins will be playing with no more effort. Using
+    Munin you can easily monitor the performance of your computers, networks,
+    SANs, and quite possibly applications as well. It makes it easy to determine
+    "what's different today" when a performance problem crops up. It makes it
+    easy to see how you're doing capacity wise on all limited resources. 
+  </longdescription>
+  <use>
+    <flag name='mysql'>
+      Install the packages required for monitoring MySQL. Disabling
+      the flag does not remove any plugin files.
+    </flag>
+    <flag name='postgres'>
+      Install the packages required for monitoring
+      PostgreSQL. Disabling the flag does not remove any plugin files.
+    </flag>
+    <flag name='asterisk'>
+      Install the packages required for monitoring Asterisk. Disabling
+      the flag does not remove any plugin files.
+    </flag>
+    <flag name='irc'>
+      Install the packages required for monitoring IRC. Disabling the
+      flag does not remove any plugin files.
+    </flag>
+    <flag name='memcached'>
+      Install the packages required for memcached
+      monitoring. Disabling the flag does not remove any plugin files.
+    </flag>
+    <flag name='java'>
+      Build the Java-based plugins to monitor JMX-compatible
+      applications. Disabling the flag removes the jmx monitoring
+      plugins.
+    </flag>
+    <flag name='minimal'>
+      Only install munin-node and its plugins. This excludes the
+      scripts to generate the web pages and the graphs.
+    </flag>
+    <flag name='cgi'>
+      Install the CGI-compatible scripts for on-the-fly generation of
+      web pages and graphs. This is only meaningful if the minimal USE
+      flag is disabled.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/net-analyzer/munin/munin-2.0.2.ebuild b/net-analyzer/munin/munin-2.0.2.ebuild
index 0cbf155e6f56..8e5c2b1ccd93 100644
--- a/net-analyzer/munin/munin-2.0.2.ebuild
+++ b/net-analyzer/munin/munin-2.0.2.ebuild
@@ -1,10 +1,10 @@
 # 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.2.ebuild,v 1.3 2012/07/17 13:59:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.2.ebuild,v 1.4 2012/07/17 15:27:05 flameeyes Exp $
 
 EAPI=4
 
-PATCHSET=3
+PATCHSET=7
 
 inherit eutils user versionator java-pkg-opt-2
 
@@ -18,7 +18,8 @@ SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="asterisk doc irc java memcached minimal mysql postgres ssl test cgi"
+IUSE="asterisk irc java memcached minimal mysql postgres ssl test +cgi"
+REQUIRED_USE="cgi? ( !minimal )"
 
 # Upstream's listing of required modules is NOT correct!
 # Some of the postgres plugins use DBD::Pg, while others call psql directly.
@@ -91,7 +92,7 @@ src_configure() {
 	cat - >> "${S}"/Makefile.config <<EOF
 PREFIX=\$(DESTDIR)/usr
 CONFDIR=\$(DESTDIR)/etc/munin
-DOCDIR=\$(DESTDIR)/usr/share/doc/${PF}
+DOCDIR=${T}/useless/doc
 MANDIR=\$(PREFIX)/share/man
 LIBDIR=\$(PREFIX)/libexec/munin
 HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
@@ -100,14 +101,8 @@ DBDIR=\$(DESTDIR)/var/lib/munin
 LOGDIR=\$(DESTDIR)/var/log/munin
 PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
 JCVALID=$(usex java yes no)
-JAVALIBDIR=${T}/java
 EOF
 }
-
-src_compile() {
-	emake default $(use doc && echo build-doc)
-}
-
 src_install() {
 	local dirs
 	dirs="/var/log/munin/ /var/lib/munin/"
@@ -118,9 +113,12 @@ src_install() {
 	keepdir ${dirs}
 
 	local install_targets="install-common-prime install-node-prime install-plugins-prime"
+	use java && install_targets+=" install-plugins-java"
 	use minimal || install_targets=install
 
-	emake DESTDIR="${D}" ${install_targets}
+	# 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 font files so that we don't have to keep them around
@@ -140,11 +138,9 @@ src_install() {
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}"/logrotate.d-munin munin
 
-	exeinto /etc/local.d/
-	newexe "${FILESDIR}"/localstart-munin 50munin.start
-
-	if use java; then
-		java-pkg_dojar "${T}"/java/*.jar
+	if ! use minimal; then
+		exeinto /etc/local.d/
+		newexe "${FILESDIR}"/localstart-munin 50munin.start
 	fi
 }