Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-misc/monitorix/
Date: Thu, 01 Feb 2018 18:52:48
Message-Id: 1517511147.8b6042b333a9e5a5644783b164c7045cd3707e38.mgorny@gentoo
1 commit: 8b6042b333a9e5a5644783b164c7045cd3707e38
2 Author: Silmano <silmano <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 29 18:58:31 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 1 18:52:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6042b3
7
8 www-misc/monitorix: removed optional dependencies
9
10 Removed optional dependencies from RDEPEND & IUSE, since the package
11 doesn't need to be compiled.
12
13 Closes: https://bugs.gentoo.org/511122
14 Closes: https://github.com/gentoo/gentoo/pull/6999
15 Reported-by: Tom Wijsman <tomwij <AT> gentoo.org>
16 Package-Manager: Portage-2.3.19, Repoman-2.3.6
17
18 ...ix-3.10.0.ebuild => monitorix-3.10.0-r1.ebuild} | 45 ++++++++++++----------
19 1 file changed, 24 insertions(+), 21 deletions(-)
20
21 diff --git a/www-misc/monitorix/monitorix-3.10.0.ebuild b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
22 similarity index 61%
23 rename from www-misc/monitorix/monitorix-3.10.0.ebuild
24 rename to www-misc/monitorix/monitorix-3.10.0-r1.ebuild
25 index 52fd90b802b..c4817155693 100644
26 --- a/www-misc/monitorix/monitorix-3.10.0.ebuild
27 +++ b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
28 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/mikaku/Monitorix/archive/v${PV}.tar.gz -> ${P}.tar.g
29 LICENSE="GPL-2+"
30 SLOT="0"
31 KEYWORDS="~amd64 ~x86"
32 -IUSE="apcupsd hddtemp httpd lm_sensors postfix"
33 +IUSE=""
34 S="${WORKDIR}/Monitorix-${PV}"
35
36 RDEPEND="dev-perl/Config-General
37 @@ -23,12 +23,7 @@ RDEPEND="dev-perl/Config-General
38 dev-perl/MIME-Lite
39 dev-perl/XML-Simple
40 net-analyzer/rrdtool[graph,perl]
41 - dev-perl/CGI
42 - apcupsd? ( sys-power/apcupsd )
43 - hddtemp? ( app-admin/hddtemp )
44 - httpd? ( virtual/httpd-cgi )
45 - lm_sensors? ( sys-apps/lm_sensors )
46 - postfix? ( net-mail/pflogsumm dev-perl/MailTools )"
47 + dev-perl/CGI"
48
49 pkg_setup() {
50 enewgroup ${PN}
51 @@ -84,18 +79,26 @@ src_install() {
52 }
53
54 pkg_postinst() {
55 - elog "WARNING: ${PN} has changed its config format twice, in versions"
56 - elog "3.0.0 and 3.4.0; this format may be incompatible with your existing"
57 - elog "config file. Please take care if upgrading from an old version."
58 - elog ""
59 -
60 - elog "${PN} includes its own web server as of version 3.0.0."
61 - elog "For this reason, the dependency on the webapp framework"
62 - elog "has been removed. If you wish to use your own web server,"
63 - elog "the ${PN} web data can be found at:"
64 - elog "${EROOT%/}/var/lib/${PN}/www/"
65 -
66 - elog ""
67 - elog "If you are not using monitorix built-in web server, please set"
68 - elog "the correct user and group ownership of ${EROOT%/}/var/lib/${PN}/www/imgs/"
69 + if has_version '<=www-misc/monitorix-3.5.1' ; then
70 + ewarn "WARNING: ${PN} has changed its config format twice, in versions"
71 + ewarn "3.0.0 and 3.4.0; this format may be incompatible with your existing"
72 + ewarn "config file. Please take care if upgrading from an old version."
73 + ewarn
74 + elog "${PN} includes its own web server as of version 3.0.0."
75 + elog "For this reason, the dependency on the webapp framework"
76 + elog "has been removed."
77 + elog
78 + fi
79 + elog "Optional dependencies:"
80 + elog " app-admin/hddtemp (disk drive temperatures and health)"
81 + elog " mail-mta/postfix (email reports/statics)"
82 + elog " mail-mta/sendmail (email reports/statics)"
83 + elog " sys-apps/lm_sensors (lm_sensors and GPU temperatures)"
84 + elog " sys-power/apcupsd (APC UPS statistics)"
85 + elog " sys-power/nut (Network UPS Tools statistics)"
86 + elog
87 + elog "If you wish to use your own web server:"
88 + elog " Web data can be found at: ${EROOT%/}/var/lib/${PN}/www/"
89 + elog " Also please check the correct user and group ownership"
90 + elog " of ${EROOT%/}/var/lib/${PN}/www/imgs/"
91 }