[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagtrap/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagtrap/

[Andreas K. Hüttel]

commit:     64e0ebbda7d8b19ce5e77c8f0c7739a0ff293413
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 23:00:38 2019 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 23:00:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64e0ebbd

net-analyzer/nagtrap: EAPI bump

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 .../nagtrap/{nagtrap-0.1.3.ebuild => nagtrap-0.1.3-r1.ebuild}      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
similarity index 94%
rename from net-analyzer/nagtrap/nagtrap-0.1.3.ebuild
rename to net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
index d1ed7bd19eb..a287f19e46b 100644
--- a/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild
+++ b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-
-inherit eutils multilib
+EAPI=7
 
 DESCRIPTION="Integrated snmptt visualization addon for the Nagios monitoring system"
 HOMEPAGE="http://www.nagtrap.org/"
@@ -34,6 +32,7 @@ src_install() {
 	insopts -m 750 -g nagios
 	doins plugin/check_snmptraps.pl
 }
+
 pkg_postinst() {
 	elog "Before running NagTrap for the first time, you will need setup its configuration"
 	elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagtrap/

[Jeroen Roovers]

commit:     40916c7137450704f28a0d4449291a9a9c7cb3bc
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 10:26:11 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 10:28:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40916c71

net-analyzer/nagtrap: Fix net-analyzer/snmptt dependency

nagtrap "magically" depended on net-analyzer/snmptt[mysql] which then
magically pulled in virtual/mysql as run-time dependency without
actually changing what snmptt installed itself. Neither explicit
dependency was ever required.

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
index a287f19e46b..203d35be9af 100644
--- a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
+++ b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ IUSE=""
 
 DEPEND="virtual/httpd-php"
 RDEPEND="dev-lang/php[mysql]
-		net-analyzer/snmptt[mysql]
+		net-analyzer/snmptt
 		net-analyzer/nagios-core
 		virtual/httpd-php"
 
@@ -26,7 +26,7 @@ src_install() {
 	fperms 640 "${D}"/usr/share/nagtrap/nagtrap/etc/config.ini.php-dist
 
 	sed -i -e 's#use lib.*#use lib "/usr/lib/nagios/plugins";#g' \
-	  plugin/check_snmptraps.pl || die "sed failed"
+		plugin/check_snmptraps.pl || die "sed failed"
 
 	insinto /usr/$(get_libdir)/nagios/plugins
 	insopts -m 750 -g nagios

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagtrap/

[Sam James]

commit:     dc2a03dedc0e1381301c33bbb44e74b2be9f1a08
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 00:16:32 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 00:27:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2a03de

net-analyzer/nagtrap: fix installation of config, ${D} usage

Closes: https://bugs.gentoo.org/782403
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
index 203d35be9af..8f20f2c8167 100644
--- a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
+++ b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,8 +22,8 @@ src_install() {
 	dodoc ChangeLog THANKS
 
 	dodir /usr/share/nagtrap
-	cp -r {db,nagtrap} "${D}"/usr/share/nagtrap/
-	fperms 640 "${D}"/usr/share/nagtrap/nagtrap/etc/config.ini.php-dist
+	cp -r {db,nagtrap} "${ED}"/usr/share/nagtrap/ || die
+	fperms 640 /usr/share/nagtrap/nagtrap/etc/config.ini.php-dist
 
 	sed -i -e 's#use lib.*#use lib "/usr/lib/nagios/plugins";#g' \
 		plugin/check_snmptraps.pl || die "sed failed"
@@ -35,10 +35,10 @@ src_install() {
 
 pkg_postinst() {
 	elog "Before running NagTrap for the first time, you will need setup its configuration"
-	elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php"
+	elog "${EROOT}/usr/share/nagtrap/nagtrap/etc/config.ini.php"
 	elog "A sample is installed in"
-	elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php-sample"
+	elog "${EROOT}/usr/share/nagtrap/nagtrap/etc/config.ini.php-sample"
 	elog
 	elog "NagTrap requires snmptt to write traps into a MySQL database."
-	elog "A database schema is available in {$D}usr/share/nagtrap/db"
+	elog "A database schema is available in ${EROOT}/usr/share/nagtrap/db"
 }