Add a dependency over virtual/ssh for non-minimal installs (it's used by pkg_config), and require berkdb USE flag enabled on Perl (required for munin-asyncd).

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

3 files changed, 18 insertions, 12 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 3349070bd791..95fa56afc35a 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.116 2012/10/22 04:17:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.117 2012/10/25 18:52:48 flameeyes Exp $
+
+  25 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> munin-2.0.7-r5.ebuild:
+  Add a dependency over virtual/ssh for non-minimal installs (it's used by
+  pkg_config), and require berkdb USE flag enabled on Perl (required for munin-
+  asyncd).
 
   22 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   files/munin-asyncd.init.2:
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 85134dcba04b..479f567cf70b 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -26,17 +26,17 @@ DIST munin-2.0.7-patches-6.tar.xz 10172 SHA256 ba9c9361c3728b0c751ea9f127354c967
 DIST munin-2.0.7.tar.gz 1326773 SHA256 3daf42722ebd74a6269aa290b9f5821e2206df7b0fd6a39876863ff1a9b50c2e SHA512 51bf57fd5d8bdd92c091548dda540af6b355c8fe821db06ba92eb7402b623afcac570b3e1e0816580e6ec962a791835dd845734207556731636003d01b492c3f WHIRLPOOL bfc9de2ec0421ba66109ca77396a35bdf9c7ef6bd82dad1fe1c05144d79d0d9c923a641feca5d78e566015561172704898c1ec3a57da49d67492e335439ef982
 EBUILD munin-1.4.6-r4.ebuild 5033 SHA256 032e77091eb5e3776b79fd6857965ae8de3050b8fae6622bd311cc073b9882a9 SHA512 aa041a841d3e86686e4cb2137ce1237ac9d656f67ff4d97a75651345392ca5566b5ca46dd2d76d54a8228c5c4634d1a1205da3f7458598b337cdeb0af62d09f3 WHIRLPOOL 4118ebdff6f61ce32d1d273d71125cb71e994eceb78c8fd89987aa0bba8906d1c825fd03721d84ac61930758a401353f788b069f739a54c44888c1876aba6e2d
 EBUILD munin-2.0.5-r1.ebuild 7562 SHA256 2eed40d2d81907b4d6347ecaa9d20ae4c858c4e7c6f353051e1576afaf6b4b2f SHA512 e7d5339acf39f39e50df7f92541767643e1f76be4564bdfcb5b3bc1ed4170f80a3f153cd5994e6b559761b22cd4015e64c2671aa9b76244df07d3f76aaf0fa08 WHIRLPOOL a40a3688837c018a486af91ca20e6841a3b17afa4991f6e40d784c45c99ed6fbcced7d0bdfac187882f3d147a0be00b1c60a282e05a6b1becd82288a13f6ee63
-EBUILD munin-2.0.7-r5.ebuild 9509 SHA256 0ad5d33adc9e4e25582364880144e1d7cad043a7fcf8688944a4285f8d8fa268 SHA512 176157efc52ab4d8aa8a7d6e33c97b07dcd223e394c5d8ea250e7e5bf1b389b7c9ce9e4154e41d2ec35632a0c9e0c10ff0076d459b83bcdab1ff56c8ad3c5feb WHIRLPOOL 99439bbc648c989e1e50fe3c2c78cb634f5905c351ffb727f8f6c17db3df86cd93a2fb85a19d0728c7f234d774123cf84f645537d7b7b0046d30f5cb81fee8e6
-MISC ChangeLog 25347 SHA256 05436d7cba28366978634959a2dee81af6f1a2ed584c9c59dc944f20095cb37c SHA512 f14d9c4f7890a9c6f8be8f0e018e19cfa00881698b9aff85e69fcd69f47b092378253abaf6625118b7a7befaf4056e70613d7d54140d4d2dd4001edfdac77c02 WHIRLPOOL 5fcbb879f983f97ab5b2a11e989ea68b08f96c2174f34ec511a143b889a4f21fdc2c2adcd03ceea3d5b61e0ff2c6d872539d39085065212c7be1a0826c0fe384
+EBUILD munin-2.0.7-r5.ebuild 9533 SHA256 92367eff6ea866488cbc1321f09fde12312e9d321fe8a05827b3fcf0015f963b SHA512 8c229f4becb2b0bc85b0359a0e809aaceda779f8d49921089956d862ead1fae150503efd3faf84eb11f8146996640bf93a77f65d7088dff7f8139af357963e05 WHIRLPOOL 825d72d44aac5e983b9bd5b469218f9ca8dae9090034dda2128284369152334ea252702ef074fa37415dae5cd217c5310da458632b32a3e7d74269814400aa92
+MISC ChangeLog 25593 SHA256 a00912d2649eafd65a9080eeff0f685931aa481f2fe8e6e85e85e39b06960d41 SHA512 3efdff3856b33b62eaef125b6c63eb78ac13db6a17c7741829af31cf2022c4fce63e26a2379281bfa12d273166955b6c5affa389af8bdfc05d4cb196626a9ba5 WHIRLPOOL 4739950c0ad4016219072acb4bfba9aff0d281aa8e8f55594e062f7b5f3421b7188db11c34e379154036b93e99071cfa6db6a5223e34b0c3618de7f8ddde6e05
 MISC metadata.xml 3628 SHA256 6c4260bcdcd3def7df5664bc8a298a65de3662f7ba485962a66fd65403de3db3 SHA512 62483575bb2eaa4c8a210853ed6a7a3913946f03f7b36f92843fe60e3be998236f92f38e8d42f62104d0756e4f3206e9e6e7da2c966a7c2ef134ec2d4401f69d WHIRLPOOL 938da8e50a4be76cb469052852e4b1e5a6f2253bf3dd5037e0448b420036ffc4385ad99bf41942f4e19c48900c5298fc1086725ca0b6a102b30d0f4f62d6c34d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQhMjQAAoJEBzRPIrUMBNCvCIH/RJD8JOPjVUMVI1U30ihHtBV
-RliPD79rR5IVpsoF53KJYv/XEREe8ON4SGWQx7hixRAzkzXE8RQb1PxJh8Jm4Qtb
-hWc2aylvihQjhMWWP26n0n7dC7BITuMDdZyhOZ4+RfqIj460Ga9URwj972mpmDUg
-p/JI7Madio6Udu/3waYsVgmG/FForrHJRLwWADNCYXcQwcC8s3ThPj7ge7X1aQDi
-d7LDXS56iex9ljLkv8eWeN8FZwzvJGjoGt5wi+HbSvmy/CrWUJg9PvD3h7N5Mm+P
-hAKQ3udqEHcawVwTyn73uTADYrv1YfPh5BRvDtBzImVAmOjT0y/J05lP70vyOpk=
-=jOQm
+iQEcBAEBCAAGBQJQiYqVAAoJEBzRPIrUMBNCkrwH/jIOWE7xs38hwfV64/rmynhq
+tCj1BhZNz0tP861PY7Fb5x+qHdBDGmVkKYa5pO3E3J3znLmTl0NiIvXXAyKBavxS
+ohNrSkm4Wn/MfKHM7OFSdbecXk5PfAMnYxi3hNnGaxU14atKOfEFAzay5ip5lf6z
+cIgcSzl9JX2NULNooafNESgW9t4ASFeMuPP1Lhs/mNQdsC3Xqfzj2INxyhDgx4U/
+Dc36SmRZzG6C15rMFiKWvm6jNO0fZfydYF1k7iNS83S7tDaZgNL8tqjhM5VQBu9d
+vDvhY3S0DpnNGtIviYGYtW5CjeELjqDrgHrwxb32eK64mECykBftBZ0qdpE7PuU=
+=xRD9
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/munin-2.0.7-r5.ebuild b/net-analyzer/munin/munin-2.0.7-r5.ebuild
index c4f9c4026d80..d6772343eee4 100644
--- a/net-analyzer/munin/munin-2.0.7-r5.ebuild
+++ b/net-analyzer/munin/munin-2.0.7-r5.ebuild
@@ -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-r5.ebuild,v 1.1 2012/10/22 01:57:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.7-r5.ebuild,v 1.2 2012/10/25 18:52:48 flameeyes Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ REQUIRED_USE="cgi? ( !minimal )"
 # Some of the postgres plugins use DBD::Pg, while others call psql directly.
 # Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
 # We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="dev-lang/perl
+DEPEND_COM="dev-lang/perl[berkdb]
 			sys-process/procps
 			doc? ( dev-python/sphinx )
 			asterisk? ( dev-perl/Net-Telnet )
@@ -63,6 +63,7 @@ DEPEND_COM="dev-lang/perl
 				dev-perl/IO-Socket-INET6
 				dev-perl/URI
 				>=net-analyzer/rrdtool-1.3[perl]
+				virtual/ssh
 			)"
 
 # Keep this seperate, as previous versions have had other deps here