Version bump to 3.5.1, removed old, added systemd unit support. Fixed security bug #493434 (CVE-2013-7071); reported by Ago, based on a contribution by Wojciech Myrda (vojcek).

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

7 files changed, 49 insertions, 215 deletions

diff --git a/www-misc/monitorix/ChangeLog b/www-misc/monitorix/ChangeLog
index f13943d2c88a..80b357cc65c5 100644
--- a/www-misc/monitorix/ChangeLog
+++ b/www-misc/monitorix/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-misc/monitorix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/monitorix/ChangeLog,v 1.5 2014/01/08 06:11:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/monitorix/ChangeLog,v 1.6 2014/05/23 15:58:03 tomwij Exp $
+
+*monitorix-3.5.1 (23 May 2014)
+
+  23 May 2014; Tom Wijsman <TomWij@gentoo.org> +files/monitorix-3.5.1.init,
+  +monitorix-3.5.1.ebuild, -files/monitorix-3.0.0.init,
+  -monitorix-3.0.0-r1.ebuild, -monitorix-3.1.0.ebuild, -monitorix-3.2.1.ebuild,
+  metadata.xml:
+  Version bump to 3.5.1, removed old, added systemd unit support. Fixed security
+  bug #493434 (CVE-2013-7071); reported by Ago, based on a contribution by
+  Wojciech Myrda (vojcek).
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> monitorix-3.0.0-r1.ebuild,
   monitorix-3.1.0.ebuild, monitorix-3.2.1.ebuild:
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 3a81bb39b7aa..873eec54b1bd 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1,29 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX monitorix-3.0.0.init 649 SHA256 0d8af53b4b0e917a6476e1929be87fef4ceff870097727591087014460dd5778 SHA512 0b14192a2124a70f43625c3b1c70ab0787a19daf53c6b7d6ecdd6832ae69f87c46787f0cb38d6c951023870afa9b9c298a7614b4ebcca9207469d8212fb79422 WHIRLPOOL 00fc216d3aba0767a262d2130e513211a063032e50a9f689f4309c5e8eac082454cfda00a924ffae1e86a7d952faeb181d83c63658b8aaa057792d17f966b95e
-DIST monitorix-3.0.0.tar.gz 158342 SHA256 c503491d6550a99762fc636f07098fc5a66bd170f5d009a05052b4273e5ae224 SHA512 85f943e7f79a847218bd0a0748d5a52a3c458cfe25a5e67cbe42515c1333fca0b00a12dc3104aeee8420a78177ab47ee21f04c5f47b9e7ec18a28cb27cef8bc0 WHIRLPOOL 7976f8d4458c3a5bedf30ac223c14486dc4076f2e5933ac125500c42e30fa283f27611cff8f2591d9dde749dc47bb1f21d8a4bbb5af58230b6ee9904e36725bd
-DIST monitorix-3.1.0.tar.gz 161216 SHA256 5c6836fa42fd6a9d84889851cf60c79725cce999a7ad22b6b417ac38bcfd4250 SHA512 5e49bf51ca9fc7cbb871272c75ba818929f213c2ac735f5fde21bd35aed147ee7f1bc75b19265461ae867d7ab1cdb95c4b80ce173da150b3a62b4307d5c79037 WHIRLPOOL 9a5754905c5eec63963888f0a3aa768b55cbe6844f0ea923ae3b425814383301d82891fecd38e1057369037c851da6a47e4f600d10e64fb86b5ba7d88b6698af
-DIST monitorix-3.2.1.tar.gz 168852 SHA256 ef37ee4301dc76451cadfa5d1d01ade9249cc36d19e8757e024cd3b2121a7781 SHA512 bc73ce9032b695ca3fddd37671330c1450522297d12f8ffe317693b20e5b905c7295ed2a6d98e3d391d39611b2d71a73026ae34d316931cfb7347821a602c620 WHIRLPOOL 6171bfb76b645dadbba6a7b220f46bb3c7a3458999f68f48f67f5fd0736cf2e6836110c3cca98966dcfa2ea49a9305192ab80096c4e0c4b09e97fbf6b973f9e4
-EBUILD monitorix-3.0.0-r1.ebuild 2381 SHA256 4a514646da7b818c490bd5bb418aa048571ffa8f25debe745d14603f8a8fe21b SHA512 0627b30fe43d5df53f6a6b3238f9ad3b377a433e0d1ff6dcdaf116067b278b07853d88983e7020589de4f4a3c90a91634c4f807e28dd2541be0c9e1356a55593 WHIRLPOOL b8e60906801afa426523e78eb88e840023d7831fbc16dd2af5bbce251545ebed911f023ec3e521e366b62f288678f66af18965779b4ea3430d52c8c9592c5871
-EBUILD monitorix-3.1.0.ebuild 2391 SHA256 cd34bd389c994c259a8137cbfec3f1f89a388aaed68ecd268e254c7cd4a44584 SHA512 aea1720c44ef251ab92cc49a643d033289c00ca436505cbb5174ecf0edd78164b23fe470ff8cd3169d85bfbb1643a7b50be04b1ccac62b85eda06a2df7359a72 WHIRLPOOL 466bfda1165fc9d452f1f04980954f098d0085c39671d7a3830d5b3893afaa020d48f489a6f854974a57f2e9bd6301837de9da64d8d5c0a39c4bb4008f221587
-EBUILD monitorix-3.2.1.ebuild 2391 SHA256 6fa86689e045c0ca36aaeb37393fba57783068f02e8d9289fadd0eb155cc02b5 SHA512 7d43e9d518d2aff0b235efc3ac47b5ac029637489ef2a7cafaa13119a88cb2a726a798303a2536ebc7d21d21b18897aef684c19965b5c993e59da59e6e4b50df WHIRLPOOL bf3ebc70b1732b3a8d58d5b04ef81801fa1ffe777af3a92494d50b0e96d0e31ff3386462a142fa616025f69dcf4b6e875c831fee174bf87e8448ad4b1f186ee0
-MISC ChangeLog 1253 SHA256 e1673419b2fc30c6027f64b8a7b645b92b6bf6057533f47a75b90a55c08d3ed4 SHA512 ab422d0a9544fe2a6f028068fb5e34451fb2e7d8b65c3c8b3c667d876979eacbfd17ccf3581c60de42c66bb8f9ab3ed8bbda703d7ba2ea4487516fa6617deec6 WHIRLPOOL 32fac301952522057014dd16e391f7331f7929d60e44e2e37a1faa05b058a43b6f121cf374da9a98dd71ac10f84281920ba1760d9ec3def353f00f73de183483
-MISC metadata.xml 900 SHA256 ee18bf5adc6d404474e7f6950bfc9ea52272be5dc53856d6546900538c0f8adf SHA512 2a003cf517c216b5bab2ef230960fe322f19ce52f421db8bb5f767b137e9a22fdc5a4209c196cb88c9adc819beedd7a5346d3137e5f0441ab07c16471b1ea6f7 WHIRLPOOL 8208104be32381ba1e71b7f1f0b0d6e73bb6c3e23a8617232cba095d4334b9a0acc424814a7b58ac757e2851ca063aa0a05e30abd6a607b8d8b03a93f6152cc3
+AUX monitorix-3.5.1.init 659 SHA256 d3a439b525c4b7031ecd77eac2ba08b09e48e5ca55b372a01f618eb4b60cce87 SHA512 b3d2f287347d9c17f52b8dc935f1a3cdc7f8f7aa7cc569fd6ff9a6da59695b1928bdd027c4cc45df6d66c4fe2d16f62d10d2bd77562f28fc470f7d26218488a4 WHIRLPOOL 8f403d2882071a800c59acb4f20be7df88dce76cc14127465df47ae800c46f5d5a1619c9ed6441503523d3121cca756fb42e5e949cf7e4ac34ac62598b2d2864
+DIST monitorix-3.5.1.tar.gz 218548 SHA256 8cbd749153f48e17a253791c2079912e50b499026de0083e5f25b87a782f3004 SHA512 cf64f89e147f3ddf31d48e593d5a5f09be827fd9a104c5cc28b1146e491507476d4f86bf249fda24ce92d7e37a3699dd94501d441c3767d12dfbabe4d782c37c WHIRLPOOL 2b894222f4defd5396c9c82554caeaccdcb64dd387dd78a0f2beabf896c6fedbf4571b2f2822786b2dc4165946588f72b5d4e1f6f5d2f4acde17beddd57ceab7
+EBUILD monitorix-3.5.1.ebuild 2583 SHA256 4602554fecea6d5d14cb5efa4aec40c512d824fad2cf0c880c31f011f19eb660 SHA512 f0241160bed4ad2eaa11e2c0167fb517faeebd2bc793cd3818775959a63d0e447c288715ab9b752be7b87ae4e5b413d2ee08b76209257f3674e68ca3f1946b63 WHIRLPOOL f26bb311a664191632943f49317b7442259d105d89e8e98a4c636f48d5ef95dea93ce671ab075924ad50d704139255788ca1974226cd12f3b48e49095f3625c6
+MISC ChangeLog 1697 SHA256 cea346cfb30555f1ef6e7a9ca2c7bfaf4b8f1efa2a3fc2fd4cb9b28bee4b9bb2 SHA512 69a3804228ef015665fa430829b0fda559e8edca7ce7cd94f63cf31940600a99cfa4642ab7f4b8370febafe21ef9a2f89ade0ff49c5de2e19cf6ef1553f11793 WHIRLPOOL 515b02702060f51e6cd02f52bd6eaebc332239e1b2399d509974037568a2ef6dbd9616dca8d03b1a02f67e198d6261918ae6d1053fe83cee8f37a3873be75b51
+MISC metadata.xml 1012 SHA256 542c5c4a3ba27e07d20c9aa211195dbdfe1faf85325aaf2d2a9ef1882635600a SHA512 52423b41c2589c0e56b439c5c044191106b90ea8de4d420a82c27dee15e5dcc144108c1480f7c699b1c6fd9c54b27e634550c1c4189a065d71ce19151220581b WHIRLPOOL e3c5b9a2d94079dac813caa3880b221ecc6b8b55a12e969c1a2f51bfdc7d92d593b4ed7df42f07dfae734b8d5cca5250a6c2571f8466821f2309d0dc8cdd6079
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzOwyAAoJEPGu1DbS6WIARBgP/2Xq/2rPxjqBPOc5JMWqnkUJ
-KCI+0fdTpUs8nic95Saga7MLk/RHiZxF27Exyw7F+aOO38U6OTUx/H+dNMfmJlpQ
-W39RPW+iIg2FSad5B8jEmASvPUq2DxPlPEaT1CS8WzX0Rw3gpYSytnfrL3Q7r4ql
-NLqaniUUz7T+Wzx6lx5kLklRM9gfjcgT43z8bef6KxTfilTcvwpnRVw4YrFc40gV
-DqSoCKxq/UJaIcdoEzwD+3mamtpqXnTwRe+lcGj45qDn6j87daqv0aY/K0e7bhe/
-xL1TbNnN/KDkqTa///Hm3gyIuVbFa6dcOe+1UPlJo6m2/LWTF/BJYaaSV92Oz7NC
-JuKmN0EpvHQJRzRzWpkBQ7N3WiMib9rW9v+FnPwDmjqXkYJaB6sFQjIUBvNoNI6w
-PLiL07OuzHIuZ9fRU1mTs8tp47V3l6Qg70AYy6+GvcC5qzu9+gaeDIjdQYz93W57
-GCPUvz3TEwfbSe/yBnLveipMZv6GRdG4TzEgGReQCIQjPpbncR+NN/N3x9ucRPWa
-0M6VIMkgVeV3Mg5pcqN6t/bQI5kFf7wb5rCibt+WlyCkHOD4dZ2aDX6RtwMFhAw2
-aNsAy27ZsX7YQkJ9usbr8BvHJ9LVOUOEvkIq1ZUEmBBOGfPlcyzYuAWlkNq3lKfS
-mS2CAyrSluP3k02b1ezb
-=Nx77
+iQEcBAEBCAAGBQJTf2/2AAoJEJWyH81tNOV9gOQH/j4A3BZqgM8vnC7pUjLjJnrf
+HQHfif4Jv6vzvVnLTkPgTR/f421vAd6FM3dAbGUASLDYzWWmVC4gGI6h7lWMh2r/
+B43NdEmUO8OQ9xXefQsy82P7goS4CLkNSZtJNYvZiLR2baOt5vhsStjwKUX4cqqL
+SMnPkQJmwLiSnWkbxwRlzhqsY+84CTH1SjwFg6XF3YQOitp4aJOd5wgEAQOf8sHF
+CRpbxg7NiQrdGyuQkb0yDK6KsShLJYw4dlE1XVpJiy/7255hbhdgwh6wLNTUogoE
+2pgVt4LIYC1L3R5MTPNKvxu3EdLfEQiLW2/T6lUdw9YXujktyTvlHrmNY8j5HII=
+=5hTK
 -----END PGP SIGNATURE-----
diff --git a/www-misc/monitorix/files/monitorix-3.0.0.init b/www-misc/monitorix/files/monitorix-3.5.1.init
index 5cf2408b511e..1c21d21818cb 100644
--- a/www-misc/monitorix/files/monitorix-3.0.0.init
+++ b/www-misc/monitorix/files/monitorix-3.5.1.init
@@ -6,7 +6,7 @@ depend() {
 
 start() {
         ebegin "Starting monitorix"
-        start-stop-daemon --start --exec /usr/sbin/monitorix --pidfile /var/run/monitorix.pid -- -c /etc/monitorix.conf -p /var/run/monitorix.pid
+        start-stop-daemon --start --exec /usr/sbin/monitorix --pidfile /var/run/monitorix.pid -- -c /etc/monitorix/monitorix.conf -p /var/run/monitorix.pid
         local i=0
         local timeout=5
         while [ ! -f /var/run/monitorix.pid ] && [ $i -le $timeout ]; do
diff --git a/www-misc/monitorix/metadata.xml b/www-misc/monitorix/metadata.xml
index 4a72c3eecb9c..9c497d524bef 100644
--- a/www-misc/monitorix/metadata.xml
+++ b/www-misc/monitorix/metadata.xml
@@ -9,6 +9,7 @@
     A lightweight system monitoring tool.
   </longdescription>
   <use>
+    <flag name='apcupsd'>Make use of a daemon that controls APC UPSes with <pkg>sys-power/apcupsd</pkg>.</flag>
     <flag name='evms'>Make use of utilities for the IBM Enterprise Volume Management System with <pkg>sys-fs/evms</pkg>.</flag>
     <flag name='hddtemp'>Use SMART to monitor the temperature of hard drives with <pkg>app-admin/hddtemp</pkg>.</flag>
     <flag name='httpd'>Enables the CGI webserver with any package that satisfies <pkg>virtual/httpd-cgi</pkg>.</flag>
diff --git a/www-misc/monitorix/monitorix-3.1.0.ebuild b/www-misc/monitorix/monitorix-3.1.0.ebuild
deleted file mode 100644
index da87eb9ae656..000000000000
--- a/www-misc/monitorix/monitorix-3.1.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/monitorix/monitorix-3.1.0.ebuild,v 1.2 2014/01/08 06:11:54 vapier Exp $
-
-EAPI="5"
-
-inherit eutils user
-
-DESCRIPTION="A lightweight system monitoring tool"
-HOMEPAGE="http://www.${PN}.org/"
-SRC_URI="http://www.${PN}.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="evms hddtemp httpd lm_sensors postfix"
-
-DEPEND="sys-apps/sed"
-RDEPEND="net-analyzer/rrdtool[perl]
-	dev-perl/DBI
-	dev-perl/libwww-perl
-	dev-perl/XML-Simple
-	dev-perl/config-general
-	dev-perl/HTTP-Server-Simple
-	evms? ( sys-fs/evms )
-	hddtemp? ( app-admin/hddtemp )
-	httpd? ( virtual/httpd-cgi )
-	lm_sensors? ( sys-apps/lm_sensors )
-	postfix? ( net-mail/pflogsumm )"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	# Put better Gentoo defaults in the configuration file.
-	sed -i "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" ${PN}.conf
-	sed -i "s|\(secure_log.*\)/var/log/secure|\1/var/log/auth.log|" ${PN}.conf
-	sed -i "s|nobody|${PN}|g" ${PN}.conf
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-3.0.0.init ${PN}
-
-	insinto /etc
-	doins ${PN}.conf
-
-	insinto /etc/logrotate.d
-	newins docs/${PN}.logrotate ${PN}
-
-	dodoc Changes README{,.nginx} docs/${PN}.service docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
-	doman man/man5/${PN}.conf.5
-	doman man/man8/${PN}.8
-
-	insinto /usr/share/${PN}/htdocs
-	doins logo_bot.png logo_top.png ${PN}ico.png
-
-	dodir /var/lib/${PN}/imgs
-	dosym /var/lib/${PN}/imgs /usr/share/${PN}/htdocs/imgs
-
-	exeinto /usr/share/${PN}/htdocs/cgi
-	doexe ${PN}.cgi
-
-	dodir /usr/lib/${PN}
-	exeinto /usr/lib/${PN}
-	doexe lib/*.pm
-
-	dodir /var/lib/${PN}/usage
-	insinto /var/lib/${PN}/reports
-	doins -r reports/*
-}
-
-pkg_postinst() {
-	chown monitorix:monitorix /var/lib/${PN}/imgs
-
-	elog "WARNING: ${PN} includes a brand new config format since version"
-	elog "3.0.0, that may be incompatible with your existing config"
-	elog "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 "/usr/share/${PN}/htdocs/"
-}
diff --git a/www-misc/monitorix/monitorix-3.2.1.ebuild b/www-misc/monitorix/monitorix-3.2.1.ebuild
deleted file mode 100644
index e330e10af279..000000000000
--- a/www-misc/monitorix/monitorix-3.2.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/monitorix/monitorix-3.2.1.ebuild,v 1.2 2014/01/08 06:11:54 vapier Exp $
-
-EAPI="5"
-
-inherit eutils user
-
-DESCRIPTION="A lightweight system monitoring tool"
-HOMEPAGE="http://www.${PN}.org/"
-SRC_URI="http://www.${PN}.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="evms hddtemp httpd lm_sensors postfix"
-
-DEPEND="sys-apps/sed"
-RDEPEND="net-analyzer/rrdtool[perl]
-	dev-perl/DBI
-	dev-perl/libwww-perl
-	dev-perl/XML-Simple
-	dev-perl/config-general
-	dev-perl/HTTP-Server-Simple
-	evms? ( sys-fs/evms )
-	hddtemp? ( app-admin/hddtemp )
-	httpd? ( virtual/httpd-cgi )
-	lm_sensors? ( sys-apps/lm_sensors )
-	postfix? ( net-mail/pflogsumm )"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare() {
-	# Put better Gentoo defaults in the configuration file.
-	sed -i "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" ${PN}.conf
-	sed -i "s|\(secure_log.*\)/var/log/secure|\1/var/log/auth.log|" ${PN}.conf
-	sed -i "s|nobody|${PN}|g" ${PN}.conf
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-3.0.0.init ${PN}
-
-	insinto /etc
-	doins ${PN}.conf
-
-	insinto /etc/logrotate.d
-	newins docs/${PN}.logrotate ${PN}
-
-	dodoc Changes README{,.nginx} docs/${PN}.service docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
-	doman man/man5/${PN}.conf.5
-	doman man/man8/${PN}.8
-
-	insinto /usr/share/${PN}/htdocs
-	doins logo_bot.png logo_top.png ${PN}ico.png
-
-	dodir /var/lib/${PN}/imgs
-	dosym /var/lib/${PN}/imgs /usr/share/${PN}/htdocs/imgs
-
-	exeinto /usr/share/${PN}/htdocs/cgi
-	doexe ${PN}.cgi
-
-	dodir /usr/lib/${PN}
-	exeinto /usr/lib/${PN}
-	doexe lib/*.pm
-
-	dodir /var/lib/${PN}/usage
-	insinto /var/lib/${PN}/reports
-	doins -r reports/*
-}
-
-pkg_postinst() {
-	chown monitorix:monitorix /var/lib/${PN}/imgs
-
-	elog "WARNING: ${PN} includes a brand new config format since version"
-	elog "3.0.0, that may be incompatible with your existing config"
-	elog "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 "/usr/share/${PN}/htdocs/"
-}
diff --git a/www-misc/monitorix/monitorix-3.0.0-r1.ebuild b/www-misc/monitorix/monitorix-3.5.1.ebuild
index de297412a86f..1f1cba7303b2 100644
--- a/www-misc/monitorix/monitorix-3.0.0-r1.ebuild
+++ b/www-misc/monitorix/monitorix-3.5.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/monitorix/monitorix-3.0.0-r1.ebuild,v 1.2 2014/01/08 06:11:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/monitorix/monitorix-3.5.1.ebuild,v 1.1 2014/05/23 15:58:03 tomwij Exp $
 
 EAPI="5"
 
-inherit eutils user
+inherit eutils systemd user
 
 DESCRIPTION="A lightweight system monitoring tool"
 HOMEPAGE="http://www.${PN}.org/"
@@ -13,20 +13,24 @@ SRC_URI="http://www.${PN}.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="evms hddtemp httpd lm_sensors postfix"
+IUSE="apcupsd evms hddtemp httpd lm_sensors postfix"
 
 DEPEND="sys-apps/sed"
-RDEPEND="net-analyzer/rrdtool[perl]
+RDEPEND="dev-perl/config-general
 	dev-perl/DBI
+	dev-perl/HTTP-Server-Simple
+	dev-perl/IO-Socket-SSL
 	dev-perl/libwww-perl
+	dev-perl/MIME-Lite
 	dev-perl/XML-Simple
-	dev-perl/config-general
-	dev-perl/HTTP-Server-Simple
+	net-analyzer/rrdtool[perl]
+	virtual/perl-CGI
+	apcupsd? ( sys-power/apcupsd )
 	evms? ( sys-fs/evms )
 	hddtemp? ( app-admin/hddtemp )
 	httpd? ( virtual/httpd-cgi )
 	lm_sensors? ( sys-apps/lm_sensors )
-	postfix? ( net-mail/pflogsumm )"
+	postfix? ( net-mail/pflogsumm dev-perl/MailTools )"
 
 pkg_setup() {
 	enewgroup ${PN}
@@ -45,9 +49,11 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${P}.init ${PN}
 
-	insinto /etc
+	insinto /etc/monitorix
 	doins ${PN}.conf
 
+	dodir /etc/${PN}/conf.d
+
 	insinto /etc/logrotate.d
 	newins docs/${PN}.logrotate ${PN}
 
@@ -55,13 +61,13 @@ src_install() {
 	doman man/man5/${PN}.conf.5
 	doman man/man8/${PN}.8
 
-	insinto /usr/share/${PN}/htdocs
+	insinto /var/lib/${PN}/www
 	doins logo_bot.png logo_top.png ${PN}ico.png
 
 	dodir /var/lib/${PN}/imgs
-	dosym /var/lib/${PN}/imgs /usr/share/${PN}/htdocs/imgs
+	dosym /var/lib/${PN}/imgs /var/lib/${PN}/www/imgs
 
-	exeinto /usr/share/${PN}/htdocs/cgi
+	exeinto /var/lib/${PN}/www/cgi
 	doexe ${PN}.cgi
 
 	dodir /usr/lib/${PN}
@@ -71,18 +77,21 @@ src_install() {
 	dodir /var/lib/${PN}/usage
 	insinto /var/lib/${PN}/reports
 	doins -r reports/*
+
+	systemd_dounit docs/${PN}.service
 }
 
 pkg_postinst() {
 	chown monitorix:monitorix /var/lib/${PN}/imgs
 
-	elog "WARNING: ${PN} version 3.0.0 includes a brand new config"
-	elog "format, that may be incompatible with your existing config"
-	elog "file. Please take care if upgrading from an old version."
+	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 "/usr/share/${PN}/htdocs/"
+	elog "/var/lib/${PN}/www/"
 }