Improvement related to node autoconfiguration: depend on netcat if java is enabled (required for JMX's autoconfiguration); drop munin_stats if not installing master; update patches to fix autoconf for more plugins.

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

3 files changed, 32 insertions, 16 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 49a273dede46..40b10543d8cc 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.92 2012/08/14 21:45:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.93 2012/08/17 15:24:27 flameeyes Exp $
+
+*munin-2.0.5-r1 (17 Aug 2012)
+
+  17 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> +munin-2.0.5-r1.ebuild,
+  -munin-2.0.5.ebuild:
+  Improvement related to node autoconfiguration: depend on netcat if java is
+  enabled (required for JMX's autoconfiguration); drop munin_stats if not
+  installing master; update patches to fix autoconf for more plugins.
 
   14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> -munin-2.0.4-r2.ebuild,
   munin-2.0.5.ebuild:
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index a2cb67e4ed6f..e3e437811906 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -19,21 +19,21 @@ AUX munin-node_init.d_2.0.2 946 SHA256 56873af410a42f27b8e69230f0b0f6bf55e714e92
 DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 SHA512 f1ec1b79b4c90d899fc661656426b4cf7fdcc7f896d6de0938310b49b66e009cd1a85570005fd1a85a8168ce3568ea55c255c3511174cdf1d72bd88f162be5e0 WHIRLPOOL 43d2296bbbd476ffc0cf356fc5a191d723993735769e6f88f3581c0804b82781be38f78bfe34337e2b4e9680ade8c569a6006c0ea107e4a5c60a82b879e08404
 DIST munin-1.4.7-patches-1.tar.xz 10208 SHA256 7429c949ebfe3fbeaf50f54401a3119915cf4f3c520e7925d5118fbf576f8d61 SHA512 7588df8eb4528f56e34bdf925a534d8b46f1fee09a2a7ec5ccb411b2a15353f8a769664347019a2fe490611aee52f6b878518662a6965b840f667a7d460da185 WHIRLPOOL 3b14f5ba9c5c86539b1dfcd363df655e3bd7b6be8e873c1243d527aad58d68a83dff4f53ff58b0177e7c94b64f900a556a67e0dda8a82bbb83d13f9a403daccf
 DIST munin-1.4.7.tar.gz 1236273 SHA256 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af SHA512 5a01c04a291f53e750b170e715c9f0d5e2cca5fa2a11f725ba6a81bbe7b34c34ef6459ea60177d13d1c38e9e91d374c1e227b2d4d7ba8c094353320a51f40b30 WHIRLPOOL f16ad8331b48136ec9cdd21fdab0efd2bca7800954f0160e7a09192c22f2d7f88cbba1df81a5750f5e4577ca1a93e41643e9ad1445b645f76becfa5db28a8088
-DIST munin-2.0.5-patches-1.tar.xz 7704 SHA256 04ba9bb56d9b39cf34c03cf957ac76252c6897a8d933871078e1ab603cdbd14e SHA512 3f1c1acb0a6b2c7989937f82a631c84c7e394da27192a6edb554742dba02cba3a3ca1625a2d433cbd53bb8305491d657c2688636338a9224b3b9ad74c688daad WHIRLPOOL 17ee7a565fb409aa316dff90927dd3e7662610416a45e2a543fad35ebfbb8b709470f793ba7c6a8547e1ea49b8515c199c301e14a35aaae1bbd4afdd5790aeca
+DIST munin-2.0.5-patches-2.tar.xz 9448 SHA256 9a58ff84e33cf5c912eb504f176d689fa8531da01b3541396a03f05fde19d079 SHA512 7f75c6f4a7034327a99820bd0c1fd2272f2cd2a5bc037096e6a142a317a068ffb4217b162578da089cb0f83667d35aee413ecaeb58fdb548dfbff78b97d36e07 WHIRLPOOL 0d128cbc9955e174902670c2a66e5e0c66d4262bd20832065ed220a227a9efba25a93e192a4cd08c85819df91d1552870e6dfc2cd1bd0f3870b0154d6c0f294a
 DIST munin-2.0.5.tar.gz 1319398 SHA256 927b9b557343ad031b55b401eb1542db03d78a48a64797f5fed6ad58fc2c8785 SHA512 e52ce2f44a4322000dc38d0b8ae6e5f406211b7a081e1f4300938dfe10bff1559d9e84f454885c70bae9aabfa4b7fde8c3b3d8b239d35596f678baaba6d7d7bc WHIRLPOOL 7751eee653a0b80a9a3283a8940a270db0c5ece7de67f1b253004901db2fd06f6d8c104497ced6d3659ac6a45f4d8e37bbb362f6dec6f7181cb2d30ca115f495
 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
 EBUILD munin-1.4.7-r2.ebuild 5641 SHA256 95617a67832cb43f739112e95656476ff3d6822ceffd6ba15315237e7355fe20 SHA512 3c943a4d2dc46f69b4cd78919ab3285619d6ea16270e1a053b1f47551f8a0a175693e53a6877d74926715ac7a627a1572e7e0c12dc7bb59feec944f1edaf16e7 WHIRLPOOL 68599e60247d47310a7a1dacd7d474d241f31d8bc80a8c35f4383d3a19df48cc68938cf702a9033131516e2382df1c697f3a92f0794d2f3806463cbf26d576ef
-EBUILD munin-2.0.5.ebuild 7332 SHA256 464167affa5852147f50281af3d2d3d4d51180141c4e9016190d80d4c18e237f SHA512 c97e1141dd0f24d111c602c14f13b59580dedd86576cd628dda574254a5c58236d0b3a4a1f43a28d1a97ae268483b3821c899305901f6d422112a1f192e3cb46 WHIRLPOOL f4f94099b10090b9fd49c08f85d25528551325b814472a2e45862fbe147f7a23bbc153f7d2d4a2c47b032a244a1853a4900c39de2718062dc7745549c653a042
-MISC ChangeLog 20005 SHA256 fe1e09d2f08c72fdf5318f477e69b4902799a4325f88914528b2a6d49d39cd2f SHA512 be8f268d7debb59576a0bc34e1555f175938c018034a6e67f0a56070d67842f9a03c06bb5137d171d828869eeff867718e0cc71684dff4940431618b39805c8f WHIRLPOOL 28dc5d1f84f220d8d22a478aab4d7fbf5ebf7e95ad6a1043c9ecd46fc9d267ad108f696fdcb02b78ed0dd94cefacc00d77af5f670c6d1247993eef68d7d3d801
+EBUILD munin-2.0.5-r1.ebuild 7542 SHA256 bfcf8bf1d92915e0f05feda803ee23c0543cbfd8fd9354c3b33c31e24ad2271e SHA512 5fff0c19de65bda50031eb1a714209c2c39c00b2f65f3b462ef7f886a5517fab3682fb019becef305f54ed56cd112d6ed27dcb4b2aa484a6dbef4bf77d1cbc32 WHIRLPOOL 287dbbd25b5fbb66511d1ab10e82e1fc2d8ad5a975a81cb3dd7e83c6a5ef1aa3f23b1af77508a224f542d6ceed5ccca2e346bf8872c5051dc93d966fc3d06cd8
+MISC ChangeLog 20361 SHA256 023382862fab26cefa02565976594459d9bbdc6b18f8f600019564a7e82b33b4 SHA512 38d39f7cef0a4b36b51142d8bfcd700e68adb10c77249df4e44d9539b3ca30cffd2a05944b6dd83d980a9d590a30586061dba1bcaaecfc53cbaeb5e7fe73b58b WHIRLPOOL 22b7bcb0b658050f9b5f703d202dfc78682e8a85cd9fea7b64b252be443f705e10706169c32144cb4a6bf1136f94497f7f43f8b82c3e1c7e6aa1e587c3a0f72d
 MISC metadata.xml 3286 SHA256 42296aea0f20a9d1e4736941c8cab0d5ea30a8a6b63485714483056d3f5d670c SHA512 ed8881e77486d5c50ae2577aecf6ebeac3cfab09d75ca284f67436ac35337bbaa00374af4f2829ca9d65e283d506460fcbb3e58bf8751cbf1bd2f1432db21cab WHIRLPOOL eba5c5ead917e8983d15dcb13745067f786d5a933426553702309850285ac380a3c88a7a60625d6bcd16f8ae692f9bcc1638f4c8610aa20c8d3e1ecff12dfff1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQKscPAAoJEBzRPIrUMBNCdisIAKNIsH8EjFTCTR6SHXCeY26n
-6ynduArcFOb8SYpYGK+ctloFjFbVbWYb7IxKgclMW4kgKwzb+othkDdgHsfMHPzN
-ToQoJ1xc8lcZYPxtr26DmtQuTTcGSORKeQOVErOS3I7NZ5kszSza/0HxR4dQKvRP
-1Yc1cy/daNWNPyZ1/eEmtBSHW9Izy4QamQjZSZsCC5hhHj+1h4NvMUJ+DzHn8jEn
-c3MpFhaKeT3SuFtz1bYy2nmRohAKZybiW4q4Y1mjPkSemUQTgw4yfNx6Ut9X2NCO
-8R5mR/N62lAZDoefa420oCbSzplQgDkLh6qhqmvBnOnFyV4Y2EimIv/b1QP1cZ4=
-=TNFx
+iQEcBAEBCAAGBQJQLmJgAAoJEBzRPIrUMBNCduIIAJmGjspDKiJ3XYXaKtsq0D3x
+UUaks9KOh1+D+0awL1v5U0z6GWQHrb2YEUYOfleCVy9k2sdmnJrHUw/sVYMVLk9s
+UopCumirXi1iPp9xFf6wRoj4uLtzzCWpeUPHh7qneSTXf6JD/Gd6svAl5Bem2OoP
+xmfNsPSRF05w1HqP7umJYzuho3p7PIYUnHrzX+lL3s4N52ZPtDSE7SRt8t6tAalu
+5mrLdldVJq72wQZ9YfqfEDufQRx5M9HnR5SYDlJJidC2yeo69lkN+ExWVF6GpM25
+wYVZ1/TA12ot8yuAvEv6x67k6Dc2AvwasAF0MhdRmFewuQLkTPnsbV2eahaENw8=
+=1dGe
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/munin-2.0.5.ebuild b/net-analyzer/munin/munin-2.0.5-r1.ebuild
index 966399dede25..151f543ad35f 100644
--- a/net-analyzer/munin/munin-2.0.5.ebuild
+++ b/net-analyzer/munin/munin-2.0.5-r1.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.5.ebuild,v 1.2 2012/08/14 21:45:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.5-r1.ebuild,v 1.1 2012/08/17 15:24:27 flameeyes Exp $
 
 EAPI=4
 
-PATCHSET=1
+PATCHSET=2
 
 inherit eutils user java-pkg-opt-2
 
@@ -75,7 +75,10 @@ DEPEND="${DEPEND_COM}
 		dev-perl/IO-Socket-INET6
 	)"
 RDEPEND="${DEPEND_COM}
-		java? ( >=virtual/jre-1.5 )
+		java? (
+			>=virtual/jre-1.5
+			|| ( net-analyzer/netcat6 net-analyzer/netcat )
+		)
 		!minimal? (
 			virtual/cron
 			media-fonts/dejavu
@@ -130,11 +133,12 @@ src_install() {
 		/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"
 	use java && install_targets+=" install-plugins-java"
+
 	use minimal || install_targets=install
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
 
 	# parallel install doesn't work and it's also pointless to have this
 	# run in parallel for now (because it uses internal loops).
@@ -164,7 +168,11 @@ src_install() {
 			"${D}"/etc/munin/munin-node.conf || die
 	fi
 
-	if ! use minimal; then
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
 		exeinto /etc/local.d/
 		newexe "${FILESDIR}"/localstart-munin 50munin.start