From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D44F51382C5 for ; Thu, 1 Feb 2018 18:52:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DBEFE09C8; Thu, 1 Feb 2018 18:52:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00A43E09C8 for ; Thu, 1 Feb 2018 18:52:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 565FE335C63 for ; Thu, 1 Feb 2018 18:52:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19AAB1C0 for ; Thu, 1 Feb 2018 18:52:45 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1517511147.8b6042b333a9e5a5644783b164c7045cd3707e38.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-misc/monitorix/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-misc/monitorix/monitorix-3.10.0-r1.ebuild www-misc/monitorix/monitorix-3.10.0.ebuild X-VCS-Directories: www-misc/monitorix/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8b6042b333a9e5a5644783b164c7045cd3707e38 X-VCS-Branch: master Date: Thu, 1 Feb 2018 18:52:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 962e75c1-3c96-4c02-88b6-a05b1152162d X-Archives-Hash: 90ce8da97f7ed7ac6b4d97556f5138ac commit: 8b6042b333a9e5a5644783b164c7045cd3707e38 Author: Silmano gmail com> AuthorDate: Mon Jan 29 18:58:31 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Feb 1 18:52:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6042b3 www-misc/monitorix: removed optional dependencies Removed optional dependencies from RDEPEND & IUSE, since the package doesn't need to be compiled. Closes: https://bugs.gentoo.org/511122 Closes: https://github.com/gentoo/gentoo/pull/6999 Reported-by: Tom Wijsman gentoo.org> Package-Manager: Portage-2.3.19, Repoman-2.3.6 ...ix-3.10.0.ebuild => monitorix-3.10.0-r1.ebuild} | 45 ++++++++++++---------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/www-misc/monitorix/monitorix-3.10.0.ebuild b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild similarity index 61% rename from www-misc/monitorix/monitorix-3.10.0.ebuild rename to www-misc/monitorix/monitorix-3.10.0-r1.ebuild index 52fd90b802b..c4817155693 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/" }