commit:     ea1c6d16cf48074a257adfeff88d15b4eec3d5e2
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 23:53:43 2019 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 23:54:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1c6d16

net-analyzer/nagios-plugins-linux-madrisan: avoid another collision

Rename check_uptime to avoid a collision with
net-analyzer/nagios-plugins.

Closes: https://bugs.gentoo.org/693008
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>

 ...x-madrisan-25.ebuild => nagios-plugins-linux-madrisan-25-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25.ebuild
 
b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild
similarity index 88%
rename from 
net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25.ebuild
rename to 
net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild
index ce3bc9bb46c..6367fdc2f4e 100644
--- 
a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25.ebuild
+++ 
b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild
@@ -25,7 +25,8 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
        default
        # Avoid collision with net-analyzer/monitoring-plugins
-       sed -ri "s/check_(load|swap|users)/&_madrisan/" plugins/Makefile.am || 
die
+       # and net-analyzer/nagios-plugins
+       sed -ri "s/check_(load|swap|uptime|users)/&_madrisan/" 
plugins/Makefile.am || die
        eautoreconf
 }
 

Reply via email to