gentoo resync : 03.02.2018

3 files changed, 25 insertions, 22 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 0fca1706ee38..ee85a7c5ab8d 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index ba16e769f550..de383ebc0de2 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -3,7 +3,7 @@ DIST monitorix-3.10.0.tar.gz 309688 BLAKE2B 58345fbe02e24be48baecb1b91b4c24de8be
 DIST monitorix-3.5.1.tar.gz 218548 BLAKE2B 3424e391fed25cf9dd400abe7c2acbba3ad7103fb4bb9c464e921ed6b8ef320639b98956afe0aeaff9522857eef31ba0e55b755de9a21f8b7dbde2755f33e3fc SHA512 cf64f89e147f3ddf31d48e593d5a5f09be827fd9a104c5cc28b1146e491507476d4f86bf249fda24ce92d7e37a3699dd94501d441c3767d12dfbabe4d782c37c
 DIST monitorix-3.8.1.tar.gz 270985 BLAKE2B 554b391aa4427f194eecde22f70a99fd45f7d295c381eb14d85cda795b9a0f4cd1647231882ede84919d0a1e35f15dd1df8abe2bcd4016b51b0a353c2030da1a SHA512 d07f6b2fc69efffd3fccd76db7ca94640d68fd016979b41fd19f1aa5951c0da7dd5513fe82482c020d4b60ab5187e3c7b704cca80331bd826d050f2ac8538b02
 DIST monitorix-3.9.0.tar.gz 288443 BLAKE2B 6203f2950e0061d1ff268a2c42c31e7e14b5103e09ec82411f3ee3b957212c8799ba00710b269e0097ed0a3c060eb2d6972dd7b2c1af820bb09de2281113238c SHA512 599f3fa004c2e9657f255ca0ef0ae69ca63623976d17ebf8883a8c19b8a76193916634844f794da508439336edc37e424263aa6ccd8e06bb3584b6cf3cda783b
-EBUILD monitorix-3.10.0.ebuild 2654 BLAKE2B 13bd911e0323a50fda071571fe2a30aa241542a3c3cdf0081dab069422da60a3532d1e42caa2163b301bfea3524c6d1c25e250d0e16a8b566521e8a6cd14a3cc SHA512 2cea6e2f3327a3a45b9cd5568df0acec9cef36656158bc7c0528552450ba4a062910cd01f98e8583c3ca6e3db31fa8df80e161993f16bd352b4e93da5d3e328d
+EBUILD monitorix-3.10.0-r1.ebuild 2830 BLAKE2B 8333778ed32910fc047d5d33b7ad0fad3beb8f78fdc31eecc5478c68782bdeaa971fdd412855e2adee81cea30234d6a6df40fbd453f13392fb27fa1d3371b037 SHA512 6f13fdca50255078b67460b41c6ef1da2f2f27be62717971392fd8a2bcdd647c5f8c49262d9b3557b1fb32e9965b33ff1e2cd9e7cb68cbc2e3c8c844adb74d33
 EBUILD monitorix-3.5.1.ebuild 2446 BLAKE2B d92d145d1e008bf1e2e1762339e11f5b282fd0c20a87dee0ee0b5bbab3299862757e5a19bdf80bd75d17bea146ff14faa396fa09061558b7cd59808efab27367 SHA512 1465b39ed3cadd34d347bf6297b53de7f71598144b7bbde4e688f6023e011beebfceb7c5156b34abe4ba66751ea743875faca45c8ae3bd3f9c44e36c29b6923e
 EBUILD monitorix-3.8.1-r1.ebuild 2614 BLAKE2B 10cdc025e0bf1cec51620a8bddd8b0f5a40cd2431f9fc942bb639eed692a3df385aadf8cbdb2247c74b1106b87f23a5a6b253dfc4387c451fd875c75877b4801 SHA512 0b5681b3328bd6802bf8439409dfa02a14dd299b16d49440a75f5f9b927823548d6b6f8d46df971eb9c56a9cd696bddfd54da5fd09b80e9ec7c42b6881b63808
 EBUILD monitorix-3.9.0.ebuild 2654 BLAKE2B 6cc43f4fb9538b44dd57dc51ecc7d2a399b90fa0ff86484dc805eb28d7b959905aafffbbdecbc7d40ff4d67243710d3b20832d479a7ce88b94b9bb6041bd80e1 SHA512 c43839a7b5d16f45cdf0fadcab14c223cfe1e052bcfb73750257e471df7352a8ac79a64f9f9ad1a8562d2b1d31a13c4ffa37f597b18120698a6219b52b5055d8
diff --git a/www-misc/monitorix/monitorix-3.10.0.ebuild b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
index 52fd90b802b0..c4817155693b 100644
--- a/www-misc/monitorix/monitorix-3.10.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mikaku/Monitorix/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="apcupsd hddtemp httpd lm_sensors postfix"
+IUSE=""
 S="${WORKDIR}/Monitorix-${PV}"
 
 RDEPEND="dev-perl/Config-General
@@ -23,12 +23,7 @@ RDEPEND="dev-perl/Config-General
 	dev-perl/MIME-Lite
 	dev-perl/XML-Simple
 	net-analyzer/rrdtool[graph,perl]
-	dev-perl/CGI
-	apcupsd? ( sys-power/apcupsd )
-	hddtemp? ( app-admin/hddtemp )
-	httpd? ( virtual/httpd-cgi )
-	lm_sensors? ( sys-apps/lm_sensors )
-	postfix? ( net-mail/pflogsumm dev-perl/MailTools )"
+	dev-perl/CGI"
 
 pkg_setup() {
 	enewgroup ${PN}
@@ -84,18 +79,26 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "WARNING: ${PN} has changed its config format twice, in versions"
-	elog "3.0.0 and 3.4.0; this format may be incompatible with your existing"
-	elog "config file. Please take care if upgrading from an old version."
-	elog ""
-
-	elog "${PN} includes its own web server as of version 3.0.0."
-	elog "For this reason, the dependency on the webapp framework"
-	elog "has been removed. If you wish to use your own web server,"
-	elog "the ${PN} web data can be found at:"
-	elog "${EROOT%/}/var/lib/${PN}/www/"
-
-	elog ""
-	elog "If you are not using monitorix built-in web server, please set"
-	elog "the correct user and group ownership of ${EROOT%/}/var/lib/${PN}/www/imgs/"
+	if has_version '<=www-misc/monitorix-3.5.1' ; then
+		ewarn "WARNING: ${PN} has changed its config format twice, in versions"
+		ewarn "3.0.0 and 3.4.0; this format may be incompatible with your existing"
+		ewarn "config file. Please take care if upgrading from an old version."
+		ewarn
+		elog "${PN} includes its own web server as of version 3.0.0."
+		elog "For this reason, the dependency on the webapp framework"
+		elog "has been removed."
+		elog
+	fi
+	elog "Optional dependencies:"
+	elog "  app-admin/hddtemp   (disk drive temperatures and health)"
+	elog "  mail-mta/postfix    (email reports/statics)"
+	elog "  mail-mta/sendmail   (email reports/statics)"
+	elog "  sys-apps/lm_sensors (lm_sensors and GPU temperatures)"
+	elog "  sys-power/apcupsd   (APC UPS statistics)"
+	elog "  sys-power/nut       (Network UPS Tools statistics)"
+	elog
+	elog "If you wish to use your own web server:"
+	elog "  Web data can be found at: ${EROOT%/}/var/lib/${PN}/www/"
+	elog "  Also please check the correct user and group ownership"
+	elog "  of ${EROOT%/}/var/lib/${PN}/www/imgs/"
 }