| 1 |
commit: 6a04a7a0e844fa890bb24a1c8a4faf29b14a73fd |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 5 20:28:06 2019 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 5 20:29:55 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a04a7a0 |
| 7 |
|
| 8 |
net-analyzer/iptraf-ng: Update live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 12 |
|
| 13 |
net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild | 3 ++- |
| 14 |
net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild | 20 ++++++++------------ |
| 15 |
2 files changed, 10 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild |
| 18 |
index 2d069e16ad8..b068ef51aeb 100644 |
| 19 |
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild |
| 20 |
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild |
| 21 |
@@ -47,7 +47,7 @@ src_prepare() { |
| 22 |
} |
| 23 |
|
| 24 |
src_configure() { |
| 25 |
- # configure does not do very much we do not already control |
| 26 |
+ # The configure script does not do very much we do not already control |
| 27 |
append-cppflags '-DLOCKDIR=\"/run/lock/iptraf-ng\"' |
| 28 |
tc-export CC |
| 29 |
} |
| 30 |
@@ -57,6 +57,7 @@ src_install() { |
| 31 |
|
| 32 |
doman src/*.8 |
| 33 |
dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES |
| 34 |
+ |
| 35 |
if use doc; then |
| 36 |
docinto html |
| 37 |
dodoc -r Documentation/* |
| 38 |
|
| 39 |
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild |
| 40 |
index 284d4bb322e..4c2ce0db62b 100644 |
| 41 |
--- a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild |
| 42 |
+++ b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild |
| 43 |
@@ -2,7 +2,7 @@ |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
|
| 46 |
EAPI=7 |
| 47 |
-inherit git-r3 toolchain-funcs |
| 48 |
+inherit flag-o-matic git-r3 toolchain-funcs |
| 49 |
|
| 50 |
DESCRIPTION="A console-based network monitoring utility" |
| 51 |
HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng" |
| 52 |
@@ -13,8 +13,6 @@ SLOT="0" |
| 53 |
KEYWORDS="" |
| 54 |
IUSE="doc" |
| 55 |
|
| 56 |
-RESTRICT="test" |
| 57 |
- |
| 58 |
RDEPEND=" |
| 59 |
>=sys-libs/ncurses-5.7-r7:0= |
| 60 |
" |
| 61 |
@@ -23,10 +21,9 @@ DEPEND=" |
| 62 |
virtual/os-headers |
| 63 |
!net-analyzer/iptraf |
| 64 |
" |
| 65 |
+RESTRICT="test" |
| 66 |
|
| 67 |
src_prepare() { |
| 68 |
- default |
| 69 |
- |
| 70 |
sed -i \ |
| 71 |
-e '/^CC =/d' \ |
| 72 |
-e '/^CFLAGS/s:= -g -O2:+= :' \ |
| 73 |
@@ -40,15 +37,14 @@ src_prepare() { |
| 74 |
-e 's|rvnamed|&-ng|g' \ |
| 75 |
-e 's|RVNAMED|&-NG|g' \ |
| 76 |
src/*.8 || die |
| 77 |
-} |
| 78 |
|
| 79 |
-# configure does not do very much we do not already control |
| 80 |
-src_configure() { :; } |
| 81 |
+ default |
| 82 |
+} |
| 83 |
|
| 84 |
-src_compile() { |
| 85 |
+src_configure() { |
| 86 |
+ # The configure script does not do very much we do not already control |
| 87 |
+ append-cppflags '-DLOCKDIR=\"/run/lock/iptraf-ng\"' |
| 88 |
tc-export CC |
| 89 |
- CFLAGS+=' -DLOCKDIR=\"/run/lock/iptraf-ng\"' |
| 90 |
- default |
| 91 |
} |
| 92 |
|
| 93 |
src_install() { |
| 94 |
@@ -59,7 +55,7 @@ src_install() { |
| 95 |
|
| 96 |
if use doc; then |
| 97 |
docinto html |
| 98 |
- dodoc -r Documentation |
| 99 |
+ dodoc -r Documentation/* |
| 100 |
fi |
| 101 |
|
| 102 |
keepdir /var/{lib,log}/iptraf-ng #376157 |
Archives