Bump to make tests useful, also fixes a couple of bugs with hostnames and TLS, and finally make sure that all the limits are sent as expected.

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

3 files changed, 26 insertions, 13 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 3c174cc7fb14..6c45349c5c8f 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.120 2012/11/11 19:59:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.121 2012/11/12 02:13:28 flameeyes Exp $
+
+*munin-2.0.8-r2 (12 Nov 2012)
+
+  12 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> +munin-2.0.8-r2.ebuild,
+  -munin-2.0.8-r1.ebuild:
+  Bump to make tests useful, also fixes a couple of bugs with hostnames and TLS,
+  and finally make sure that all the limits are sent as expected.
 
 *munin-2.0.8-r1 (11 Nov 2012)
 
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index c6121bef78a4..dea0873823d5 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -25,21 +25,21 @@ AUX munin.apache.include-2.4 577 SHA256 21245e9eb7b759d2d2e65c2d1424da6d8c6fd8f4
 DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 SHA512 f1ec1b79b4c90d899fc661656426b4cf7fdcc7f896d6de0938310b49b66e009cd1a85570005fd1a85a8168ce3568ea55c255c3511174cdf1d72bd88f162be5e0 WHIRLPOOL 43d2296bbbd476ffc0cf356fc5a191d723993735769e6f88f3581c0804b82781be38f78bfe34337e2b4e9680ade8c569a6006c0ea107e4a5c60a82b879e08404
 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
-DIST munin-2.0.8-patches-1.tar.xz 8464 SHA256 8ebb8c8de5b17d7ec340ddac7184d2a8420dc198d482f1b8937f806841ca436b SHA512 1fce55c67821d63ef888aa777e78a89994dc4a751807f4f58774254a62d505c7378cba864d765abab59fe86bc910d7f2a1c401afc0807519bb6a24b081894c8c WHIRLPOOL 5d89601d0cd621c5ebe95625d85ac19cc4f2b58a634c31b814f1d0213b954aacede0c39e3faf104e5ba16d5d13d8b7fc48b4b4ed6be09c276122fc70a7b57f95
+DIST munin-2.0.8-patches-4.tar.xz 16600 SHA256 badd20ae9d7d74667b6a96764c8caaf156e34aa22be5bb08c10535270a99f3d3 SHA512 81084c9b46127f425c89ff76a0c807bbc36859b2fd7ac37734bd202cae92610333f4793aa4630595147d96ad9099da99283c7bcf107351d6ec4931e64451a415 WHIRLPOOL 7e7aed4f0e23f88b0fa2eba548af5573d3e1fab20a910a8568c641ae539c58acc9e020eec01a3323243d6f6ae6f69dd7200818df3a14b5ca3b7100557fc4c8dd
 DIST munin-2.0.8.tar.gz 1328805 SHA256 ae645daee35214c1ba3d771d990fa781df741751b7b79e9d9fe48c583890dca6 SHA512 f767e586aee68c389ce0ae250376bc43d6bfe73df8e193bb7ba8b373d887301e0c1d3574c3fe456be3b93dc86cc8ec8ce27e3c36836a0048b80afb55a3a3cc1e WHIRLPOOL 312f006c21af98f5d9e548a77d43fe7396dcc69072e06faedb3d8262e70599da91bfecdfd06e859d6ff8706506e73308cbcac38e658a28e428fd50399f3f3c3e
 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.8-r1.ebuild 11057 SHA256 2f1a81932a08e68bb1690e2eaf110a4f3e2c917493aa6038327536d3ec6edcd9 SHA512 b229725bbe81add1dbc08c51b4922f5b676e597970af77e8bb827caa2431fe6b599a52498f5b47520ac5b4447eb7bae8b932d8e50e3f33f958af7d03a5ac492f WHIRLPOOL ad355ff9665749cac4f1c27f645f0250166404c8f492faeefa249d9e7a822bb2b82368a140d7df0237fe0238e16081601cdcc647aa2c25017dd7a1f8dbb1b07a
-MISC ChangeLog 26457 SHA256 1e371f1ea193639557e30ac6914b194c624ec6ce07ff59ce1401570399dd2db9 SHA512 9df0c6523c72590584ce59eaec078a70f552dcb52eabeadb08f8587ad85a2b2102b86d92346ff49d520f659cc460e5b0cc90b353a115f1f4057959991862205a WHIRLPOOL c50a824edcf3d2bedca43ef8d5a0c1a8b9108c3fa643f65ec186fa956810987da8a49aff382f62312076991a1c13a446dddf6c4dc3f4ce86da70529476911771
+EBUILD munin-2.0.8-r2.ebuild 11205 SHA256 336368d1cee121ed0e77db6eefd73b59536a9cffbc4d6ba53aa9ff94c5c95ec6 SHA512 10dc9bf3db09359e538c701ef820ed9de781d06e7b5387da234bb9c34a3f14c6fd6aad898d55ac70edd9d5bd757822bc076752c19708d2a067e73aece4dd3ceb WHIRLPOOL d88ffc019ae98d0ad13c7db44f2a9f59b8b9bee37684d87ece4c0577d79c8150a502b546c6ebfc66abf54e9ba11ec5a570956f6c800696ebcad11cae5d96adcc
+MISC ChangeLog 26742 SHA256 1feb8f54ea70755d066a4e54869519407de323c8a62d3941d69622373207e655 SHA512 dcbfb4bd090fdcba514e393d3b7a160b69389fde1bef7609f09611d3a05a70e56fd722573399fbbdd98a3809396cfcfb386938094d4217346e31f2fa8da212a0 WHIRLPOOL 02757560e0c6afe3e42d4bd62c8ee67c849cf3445f38d0971408e0f95d5683461ca949f541ced84533a49ebb81efb493381cb361c5d8e1ee0eee3a1ca1fd7a8e
 MISC metadata.xml 3824 SHA256 5b838f6ccb778750cbcc41052480daaa9ebcbee5ee38ab66b054472b6313d177 SHA512 277f3ab9589982617b60ce8ea63802288dc4ff5368416a942f3670804a8e0a4cd481b2d0ff91302be040d2aba4f66a2e11b0c181164e6285dc33b150b263da60 WHIRLPOOL 7486ffd90f12e32a9feb557b4937397317cfd4325e5ffdf1dbaa749a90f3c47f797baea306585ac4a200e4a23901da1de10a9f0b951a15bd27f8a7c876c504a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQoAPJAAoJEBzRPIrUMBNCtDsH/iZBmgWojhn9qxknwgGWxxpa
-HVRDjjQ7l5qmqcT0tPNcrWKuMuwAsWTPx9z7ctgrbG4LoZISRTkwhflk4vJeH+cR
-NHMv9W2Sb3z7GpYymTGhk8IPUaZA3ey9EBx8Xsv6CfjTw5/7vtk4iKRPSRgoGLzD
-5c5XlaHTVHyJfzgiRMc3o03QILniynOsT5hZNciOca1D20WMnquD1uInVVwsTi6z
-W2fqekcZ7/Sb9EnBsa9eoNSkHLZDO+jJgS4IclmsyPqkM2i1oICq1CMBwNgrATqg
-vVKt+y6Vn8E4nA3vilkFJ2zfg/pP07TvnZGc/wOkWyDYhRouJ5EBtXVxNTWLq3M=
-=S05P
+iQEcBAEBCAAGBQJQoFtdAAoJEBzRPIrUMBNC+nUH/3FNBxqXJ5JJADcZ+KiSejSF
+TPPgIq45Jxwha5QWN5EneSgqwX7S2TS/dInpbNhXPlPn0do4t1Wh1/i6wW/iGJwn
+iUoyvQgwRB+tyXoytLkxUkSLuMvt7ga9i3JQ7rHE4ru2+x+LVfEiKUeJlu8SS1+O
+739Zah5BAu2tyh4zb+p+hKA6w6KmMx6QNaSSFN9yD31SyiJWCwNZVSgGrYXDnFhH
+UOcypBxOfZ+n8TTOnxV6oZ3wVQo+fR0Brf7pNYOrVftINkxPr//W+l80b3iwwsoy
+4JGagsmBfPHUA4GvliAXUevCSCZ+4PZvACNXyYlCgZRluWNIURr7dycMoj9fcUA=
+=gvTX
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/munin-2.0.8-r1.ebuild b/net-analyzer/munin/munin-2.0.8-r2.ebuild
index dc296c5b129a..9f82f9960d3d 100644
--- a/net-analyzer/munin/munin-2.0.8-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.8-r2.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.8-r1.ebuild,v 1.1 2012/11/11 19:59:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.8-r2.ebuild,v 1.1 2012/11/12 02:13:28 flameeyes Exp $
 
 EAPI=4
 
-PATCHSET=1
+PATCHSET=4
 
 inherit eutils user java-pkg-opt-2
 
@@ -142,6 +142,12 @@ src_compile() {
 }
 
 src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
 	local testtargets="test-common test-node test-plugins"
 	use minimal || testtargets+=" test-master"