1 |
commit: 7b21eb894c1ed0244bbb88bd5211fddc6b04cae6 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 3 15:29:18 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 3 15:29:18 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b21eb89 |
7 |
|
8 |
net-analyzer/flow-tools: [QA] Port to GLEP 81 |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
...1-r10.ebuild => flow-tools-0.68.5.1-r11.ebuild} | 23 ++++++---------------- |
14 |
...s-0.68.6.ebuild => flow-tools-0.68.6-r1.ebuild} | 18 ++++------------- |
15 |
2 files changed, 10 insertions(+), 31 deletions(-) |
16 |
|
17 |
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild |
18 |
similarity index 87% |
19 |
rename from net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild |
20 |
rename to net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild |
21 |
index 8656ded0568..d1f4fc95e62 100644 |
22 |
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild |
23 |
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild |
24 |
@@ -2,7 +2,6 @@ |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=7 |
28 |
-inherit user |
29 |
|
30 |
DESCRIPTION="library and programs to process reports from NetFlow data" |
31 |
HOMEPAGE="https://code.google.com/p/flow-tools/" |
32 |
@@ -13,7 +12,10 @@ SLOT="0" |
33 |
KEYWORDS="amd64 ppc x86" |
34 |
IUSE="debug libressl mysql postgres ssl static-libs" |
35 |
|
36 |
-RDEPEND="sys-apps/tcp-wrappers |
37 |
+RDEPEND=" |
38 |
+ acct-group/flows |
39 |
+ acct-user/flows |
40 |
+ sys-apps/tcp-wrappers |
41 |
sys-libs/zlib |
42 |
mysql? ( dev-db/mysql-connector-c:0= ) |
43 |
postgres? ( dev-db/postgresql:* ) |
44 |
@@ -21,8 +23,8 @@ RDEPEND="sys-apps/tcp-wrappers |
45 |
!libressl? ( dev-libs/openssl:0= ) |
46 |
libressl? ( dev-libs/libressl:0= ) |
47 |
)" |
48 |
- |
49 |
-DEPEND="${RDEPEND} |
50 |
+DEPEND="${RDEPEND}" |
51 |
+BDEPEND=" |
52 |
sys-devel/flex |
53 |
sys-devel/bison" |
54 |
|
55 |
@@ -35,10 +37,6 @@ PATCHES=( |
56 |
"${FILESDIR}"/${P}-fno-common.patch |
57 |
) |
58 |
|
59 |
-pkg_setup() { |
60 |
- pkg_douser |
61 |
-} |
62 |
- |
63 |
src_configure() { |
64 |
econf \ |
65 |
$(use_enable static-libs static) \ |
66 |
@@ -68,12 +66,3 @@ src_install() { |
67 |
fperms 0755 /var/lib/flows |
68 |
fperms 0755 /var/lib/flows/bin |
69 |
} |
70 |
- |
71 |
-pkg_preinst() { |
72 |
- pkg_douser |
73 |
-} |
74 |
- |
75 |
-pkg_douser() { |
76 |
- enewgroup flows |
77 |
- enewuser flows -1 -1 /var/lib/flows flows |
78 |
-} |
79 |
|
80 |
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild |
81 |
similarity index 91% |
82 |
rename from net-analyzer/flow-tools/flow-tools-0.68.6.ebuild |
83 |
rename to net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild |
84 |
index b95e6499011..d8ee002d2cc 100644 |
85 |
--- a/net-analyzer/flow-tools/flow-tools-0.68.6.ebuild |
86 |
+++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild |
87 |
@@ -2,7 +2,8 @@ |
88 |
# Distributed under the terms of the GNU General Public License v2 |
89 |
|
90 |
EAPI=7 |
91 |
-inherit autotools user |
92 |
+ |
93 |
+inherit autotools |
94 |
|
95 |
DESCRIPTION="library and programs to process reports from NetFlow data" |
96 |
HOMEPAGE="https://github.com/5u623l20/flow-tools/" |
97 |
@@ -14,6 +15,8 @@ KEYWORDS="~amd64 ~ppc ~x86" |
98 |
IUSE="debug libressl mysql postgres ssl static-libs" |
99 |
|
100 |
RDEPEND=" |
101 |
+ acct-group/flows |
102 |
+ acct-user/flows |
103 |
sys-apps/tcp-wrappers |
104 |
sys-libs/zlib |
105 |
mysql? ( dev-db/mysql-connector-c:0= ) |
106 |
@@ -39,15 +42,6 @@ PATCHES=( |
107 |
"${FILESDIR}"/${PN}-0.68.6-mysql.patch |
108 |
) |
109 |
|
110 |
-pkg_douser() { |
111 |
- enewgroup flows |
112 |
- enewuser flows -1 -1 /var/lib/flows flows |
113 |
-} |
114 |
- |
115 |
-pkg_setup() { |
116 |
- pkg_douser |
117 |
-} |
118 |
- |
119 |
src_prepare() { |
120 |
default |
121 |
sed -i -e 's|docbook-to-man|docbook2man|g' docs/Makefile.am || die |
122 |
@@ -83,7 +77,3 @@ src_install() { |
123 |
|
124 |
find "${ED}" -name '*.la' -delete || die |
125 |
} |
126 |
- |
127 |
-pkg_preinst() { |
128 |
- pkg_douser |
129 |
-} |