Version bump to 3.1.0, thanks to Matt for reporting this on IRC.

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

3 files changed, 104 insertions, 9 deletions

diff --git a/www-misc/monitorix/ChangeLog b/www-misc/monitorix/ChangeLog
index 0b625b6eef26..d51f73c3f168 100644
--- a/www-misc/monitorix/ChangeLog
+++ b/www-misc/monitorix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-misc/monitorix
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/monitorix/ChangeLog,v 1.2 2013/03/13 19:28:45 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/monitorix/ChangeLog,v 1.3 2013/04/24 19:58:53 tomwij Exp $
+
+*monitorix-3.1.0 (24 Apr 2013)
+
+  24 Apr 2013; Tom Wijsman <TomWij@gentoo.org> +monitorix-3.1.0.ebuild:
+  Version bump to 3.1.0, thanks to Matt for reporting this on IRC.
 
 *monitorix-3.0.0-r1 (13 Mar 2013)
 
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index f9f8167ded61..e68bea5ff680 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -3,17 +3,19 @@ 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
 EBUILD monitorix-3.0.0-r1.ebuild 2376 SHA256 6e18340efd656e52f858abd2866b1a49b5bbd5e15cedd368f1014d2a26c4af34 SHA512 e7fa0fb5a60290433233f90becbeddabb3a3958096321feb0852d9367ce1533eaab4bc02d7e3f552e0299c2bc321653a551bf245bffd2ac85d6b9b3ad8f36b09 WHIRLPOOL a017eaa6bb71411b89bfa329930ac8029da11204c511227c2a7ee53931f1913602d2cc3d697f6db30cf596b9851244b2f13b6a3a3804474c4ee8cc750c7a6379
-MISC ChangeLog 907 SHA256 b6d8d485e58660a5eca9ea9f0e87e7bef11862b9eb69d2678039b2b8634c4a41 SHA512 24045446567c8da3f7e14c8b947ea8b4636e808b9150e15ddf617b8caf2d99707d15d9d9e97cad547a68655addb48acd362f34f479fc19042622cb14789e3999 WHIRLPOOL 56f9e4712d256a6c5e1fa5bcb10ae53114046ff917d14a1e569e13ab584bae0f273578a3fa2a458aca76b3d079ecb11edc5bdc4a167a47de698a6319e06eb38b
+EBUILD monitorix-3.1.0.ebuild 2386 SHA256 e916cf1fd522d32b9f9882a396a0ed7a9ec17150da6abff3b946c2188423573c SHA512 d12faf077a4fd2cd30c1ec1f3d77e28f678a271223d53f2b4969d8e319d1dbe2ffae9ebcc82a1bce22292b6482a15df44b491f4d943f1314b0e3d30225d3219c WHIRLPOOL 204757b0e32a88746e0356ac1900de55b55c8db13fdc101caeef051daa24c0112a187392042817f9161e7939546a71e7d390ce77cf90b6c26904892cd5df5c4a
+MISC ChangeLog 1079 SHA256 8bd856eb7c6d6ecfd69411ef7e1b53806c02f4d7b1382e90e93771b4721be0d0 SHA512 af98c840b5f6c8d96533131f17b5131f97a3b3b12716b664e8c675925d632b44c88cf1402095c6a071c9b9972b4e6d9157d48a19ee93407af00d5ecf8b480f65 WHIRLPOOL 31a1fbf4659409e6d706a34fe5d86db93db2dc1cdc22d4ab7efe88001c6db7aad7d525848ce5bb564d1c56e33cd176936a4f259dd7b785c6299b7480fc0a6451
 MISC metadata.xml 900 SHA256 ee18bf5adc6d404474e7f6950bfc9ea52272be5dc53856d6546900538c0f8adf SHA512 2a003cf517c216b5bab2ef230960fe322f19ce52f421db8bb5f767b137e9a22fdc5a4209c196cb88c9adc819beedd7a5346d3137e5f0441ab07c16471b1ea6f7 WHIRLPOOL 8208104be32381ba1e71b7f1f0b0d6e73bb6c3e23a8617232cba095d4334b9a0acc424814a7b58ac757e2851ca063aa0a05e30abd6a607b8d8b03a93f6152cc3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRQNt/AAoJEJWyH81tNOV9jqsH/02qrA68wddliVE8rAr6A0vL
-GyCLwlFBdsGj5ONWbE78ZLNje/UhXzMMZGqqHYhOKlAM69/0T8DERqeYdqRnJ2Mj
-aGbaisbU72mSawKzSiYF+sCx7uQ4fhZN2v6XtQrSj4Prokr1LbuoFEmYqr4gb45a
-dsE8+hg+qyLwToWILlY4VY0LslL0NjPNHU9Qe3eAnhjBv4mMxC5CAS4nPPGLoo1U
-d8Gz7/j1yf7rAvPiOsUFjHKOD1hH9vSbA91pIjSLx6/HxrrhCFBnoBU3y88Xpqb5
-pYQAGC/1hv5iBjHK2E2+y7vnCoAnCgeuU+ml7RauGrYhnT7L7b4B75CQqg74ltQ=
-=/5l3
+iQEcBAEBCAAGBQJReDk2AAoJEJWyH81tNOV9Ij4IALg3Llu9xJQPyUDVcjjR+IcL
+E4npGBP5cKUM5QAYwIbVnRVsANo3ak0Z5GTEB30hOTFO2CrkKqZQh/l/FfzaNr9P
+D2Oh5LDxlzsx892/LaU0W+adk821JobmbUXYSTp8Stb11OYQPZ3USvj7rmccK1AD
+r7AbRluDNMfWOp/9+65gB8s1UAcZWZnS+VjEiOU7DNkZOZ9YpSGDgDk+B1dP9Y7H
+J2F1n2inV2p5qdmuXc4PctRBtGJrBD7km5a6hvk7UgtSy5gEuAkzCvwCU2r+CgDF
+pgp53BuqEp6+5UCS/b9haMf6AbzwCyA3Qs7B6ZAtYbbj7Ta9BQ4j3ryf0ojZPu8=
+=lHX/
 -----END PGP SIGNATURE-----
diff --git a/www-misc/monitorix/monitorix-3.1.0.ebuild b/www-misc/monitorix/monitorix-3.1.0.ebuild
new file mode 100644
index 000000000000..286167626205
--- /dev/null
+++ b/www-misc/monitorix/monitorix-3.1.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 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.1 2013/04/24 19:58:52 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils
+
+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/"
+}