| 1 |
commit: d99341d0768d900e70b496fd1d6cdae92e5259b2 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 2 01:14:19 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 3 16:10:25 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99341d0 |
| 7 |
|
| 8 |
net-analyzer/smokeping: eutils--, multilib--, QA fixes |
| 9 |
|
| 10 |
* Drop eutils, multilib (unused) |
| 11 |
* ${D} -> ${ED} |
| 12 |
* Sort inherits |
| 13 |
* Fix overquoting |
| 14 |
* Missing || dies |
| 15 |
|
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
net-analyzer/smokeping/smokeping-2.7.3.ebuild | 42 +++++++++++++-------------- |
| 19 |
1 file changed, 21 insertions(+), 21 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild |
| 22 |
index 1e78c595820..ec397188874 100644 |
| 23 |
--- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild |
| 24 |
+++ b/net-analyzer/smokeping/smokeping-2.7.3.ebuild |
| 25 |
@@ -2,7 +2,8 @@ |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
-inherit autotools eutils multilib user systemd tmpfiles |
| 30 |
+ |
| 31 |
+inherit autotools systemd tmpfiles user |
| 32 |
|
| 33 |
DESCRIPTION="A powerful latency measurement tool" |
| 34 |
HOMEPAGE="https://oss.oetiker.ch/smokeping/" |
| 35 |
@@ -11,7 +12,6 @@ SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz" |
| 36 |
LICENSE="GPL-2" |
| 37 |
SLOT="0" |
| 38 |
KEYWORDS="amd64 x86" |
| 39 |
- |
| 40 |
IUSE="apache2 curl dig echoping ipv6 radius" |
| 41 |
|
| 42 |
DEPEND=" |
| 43 |
@@ -45,7 +45,6 @@ DEPEND=" |
| 44 |
ipv6? ( >=dev-perl/Socket6-0.20 ) |
| 45 |
radius? ( dev-perl/Authen-Radius ) |
| 46 |
" |
| 47 |
- |
| 48 |
RDEPEND="${DEPEND}" |
| 49 |
|
| 50 |
pkg_setup() { |
| 51 |
@@ -58,8 +57,9 @@ src_prepare() { |
| 52 |
|
| 53 |
sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die |
| 54 |
sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die |
| 55 |
- rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session |
| 56 |
- echo ${PV} > VERSION |
| 57 |
+ # bundled(?) dev-perl/SNMP_Session |
| 58 |
+ rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die |
| 59 |
+ echo ${PV} > VERSION || die |
| 60 |
|
| 61 |
eautoreconf |
| 62 |
} |
| 63 |
@@ -79,14 +79,14 @@ src_install() { |
| 64 |
default |
| 65 |
|
| 66 |
newinitd "${FILESDIR}"/${PN}.init.5 ${PN} |
| 67 |
- dotmpfiles "${FILESDIR}"/"${PN}".conf |
| 68 |
- systemd_dounit "${FILESDIR}"/"${PN}".service |
| 69 |
+ dotmpfiles "${FILESDIR}"/${PN}.conf |
| 70 |
+ systemd_dounit "${FILESDIR}"/${PN}.service |
| 71 |
|
| 72 |
- mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html" |
| 73 |
- mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config" |
| 74 |
- mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail" |
| 75 |
- mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets" |
| 76 |
- mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail" |
| 77 |
+ mv "${ED}/etc/smokeping/basepage.html.dist" "${ED}/etc/smokeping/basepage.html" || die |
| 78 |
+ mv "${ED}/etc/smokeping/config.dist" "${ED}/etc/smokeping/config" || die |
| 79 |
+ mv "${ED}/etc/smokeping/smokemail.dist" "${ED}/etc/smokeping/smokemail" || die |
| 80 |
+ mv "${ED}/etc/smokeping/smokeping_secrets.dist" "${ED}/etc/smokeping/smokeping_secrets" || die |
| 81 |
+ mv "${ED}/etc/smokeping/tmail.dist" "${ED}/etc/smokeping/tmail" || die |
| 82 |
|
| 83 |
sed -i \ |
| 84 |
-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \ |
| 85 |
@@ -98,27 +98,27 @@ src_install() { |
| 86 |
-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \ |
| 87 |
-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \ |
| 88 |
-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \ |
| 89 |
- "${D}/etc/${PN}/config" || die |
| 90 |
+ "${ED}/etc/${PN}/config" || die |
| 91 |
|
| 92 |
sed -i \ |
| 93 |
-e '/^<script/{s:cropper/:/cropper/:}' \ |
| 94 |
- "${D}/etc/${PN}/basepage.html" || die |
| 95 |
+ "${ED}/etc/${PN}/basepage.html" || die |
| 96 |
|
| 97 |
sed -i \ |
| 98 |
-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \ |
| 99 |
- "${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die |
| 100 |
+ "${ED}/usr/bin/smokeping" "${ED}/usr/bin/smokeping_cgi" || die |
| 101 |
|
| 102 |
sed -i \ |
| 103 |
-e 's:etc/config.dist:/etc/smokeping/config:' \ |
| 104 |
- "${D}/usr/bin/tSmoke" || die |
| 105 |
+ "${ED}/usr/bin/tSmoke" || die |
| 106 |
|
| 107 |
sed -i \ |
| 108 |
-e 's:/usr/etc/config:/etc/smokeping/config:' \ |
| 109 |
- "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die |
| 110 |
+ "${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die |
| 111 |
|
| 112 |
dodir /var/www/localhost/cgi-bin |
| 113 |
- mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \ |
| 114 |
- "${D}/var/www/localhost/cgi-bin/smokeping.fcgi" |
| 115 |
+ mv "${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" \ |
| 116 |
+ "${ED}/var/www/localhost/cgi-bin/smokeping.fcgi" || die |
| 117 |
|
| 118 |
fperms 700 /etc/${PN}/smokeping_secrets |
| 119 |
|
| 120 |
@@ -142,6 +142,6 @@ src_install() { |
| 121 |
} |
| 122 |
|
| 123 |
pkg_postinst() { |
| 124 |
- chown smokeping:smokeping "${ROOT}/var/lib/${PN}" |
| 125 |
- chmod 755 "${ROOT}/var/lib/${PN}" |
| 126 |
+ chown smokeping:smokeping "${EROOT}"/var/lib/${PN} || die |
| 127 |
+ chmod 755 "${EROOT}"/var/lib/${PN} || die |
| 128 |
} |
Archives