1 |
commit: f677a8aa7e37536c3403068ef406788455ed133b |
2 |
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh> |
3 |
AuthorDate: Mon Sep 12 21:22:37 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 27 22:12:06 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f677a8aa |
7 |
|
8 |
net-analyzer/mk-livestatus: version bump, move to EAPI 6 and a |
9 |
|
10 |
bunch of improvements. |
11 |
|
12 |
This commit: |
13 |
* drops unneeded Perl variables. |
14 |
* adds nagios4 USE flag. |
15 |
* blocks sys-apps/ucspi-unix |
16 |
* refreshes patches set with proper git patches. |
17 |
* uses standard emake install. |
18 |
* adds perl README. |
19 |
* installs python README in the right place. |
20 |
* sets Bertrand Jacquin <betrand <AT> jacquin.bzh> as the de-facto maintainer. |
21 |
|
22 |
Gentoo-Bug: https://bugs.gentoo.org/574700 |
23 |
Gentoo-Bug: https://bugs.gentoo.org/574716 |
24 |
|
25 |
Package-Manager: portage-2.2.28 |
26 |
Closes: https://github.com/gentoo/gentoo/pull/2315 |
27 |
|
28 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
29 |
|
30 |
net-analyzer/mk-livestatus/Manifest | 2 +- |
31 |
.../1.2.8_p10-MEDIUM-Drop-default-strip.patch | 24 +++++++++++ |
32 |
...Remove-the-usage-of-Perl-Critic-Policy-Mo.patch | 34 +++++++++++++++ |
33 |
.../files/mk-livestatus-1.2.2_p3-no-strip.diff | 23 ---------- |
34 |
...ivestatus-1.2.2_p3-test-RequireRcsKeywords.diff | 18 -------- |
35 |
net-analyzer/mk-livestatus/metadata.xml | 16 ++++++- |
36 |
....2_p3.ebuild => mk-livestatus-1.2.8_p10.ebuild} | 49 ++++++++++++---------- |
37 |
7 files changed, 102 insertions(+), 64 deletions(-) |
38 |
|
39 |
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest |
40 |
index 69d35d5..7a1c8c7 100644 |
41 |
--- a/net-analyzer/mk-livestatus/Manifest |
42 |
+++ b/net-analyzer/mk-livestatus/Manifest |
43 |
@@ -1 +1 @@ |
44 |
-DIST mk-livestatus-1.2.2p3.tar.gz 382030 SHA256 edceb13675ed3375fd867216e2ffe31c350d5860509f9fb0abd182148e270616 SHA512 ee3468de5a61c4aa904d8d0df8e4a66c56a04e2f99d92237957100dc7ecb28e8e1f403488298b5a92ce78874e176384eca02eeb9b0a99c1bbf9799a9c2fcaa01 WHIRLPOOL 7fe080bbfc2d04a037248a94a202137cdc0ca40689800e51c273bd83dfe4e5c2e5d54ca6ff525d6ffb5015ff6032b8cfe65739896a63adaf01a7d550f771d8e4 |
45 |
+DIST mk-livestatus-1.2.8p10.tar.gz 453496 SHA256 af21c393a17b783f8ca83ffe6e5eea884c74557c4f2bd8899720ced0b443b35e SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d WHIRLPOOL c3354b04eac1eb8907eb781cdc785136ea4aac0c9d9a2e66d89291d4eeb89f3cd6efcfb2e554295140157b0d7099f1621cd4258e3cd7fa9c0459cd8c7c373d7e |
46 |
|
47 |
diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch |
48 |
new file mode 100644 |
49 |
index 00000000..5b5009b |
50 |
--- /dev/null |
51 |
+++ b/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch |
52 |
@@ -0,0 +1,24 @@ |
53 |
+From 1798492a27a1ac3819cb366e1a3e789d663f55a0 Mon Sep 17 00:00:00 2001 |
54 |
+From: Bertrand Jacquin <bertrand@×××××××.bzh> |
55 |
+Date: Wed, 21 Aug 2013 23:00:21 +0200 |
56 |
+Subject: [PATCH 1/2] MEDIUM: Drop default strip |
57 |
+ |
58 |
+See: https://bugs.gentoo.org/show_bug.cgi?id=482026 |
59 |
+ |
60 |
+--- |
61 |
+ src/Makefile.am | 2 +- |
62 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
63 |
+ |
64 |
+diff --git a/src/Makefile.am b/src/Makefile.am |
65 |
+index deab289..126b503 100644 |
66 |
+--- a/src/Makefile.am |
67 |
++++ b/src/Makefile.am |
68 |
+@@ -55,7 +55,7 @@ livestatus_so_CFLAGS = -fPIC |
69 |
+ |
70 |
+ livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES) |
71 |
+ -rm -f plugin.so |
72 |
+- $(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++ |
73 |
++ $(CXX) $(LDFLAGS) -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++ |
74 |
+ |
75 |
+ all-local: livestatus.o |
76 |
+ |
77 |
|
78 |
diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch |
79 |
new file mode 100644 |
80 |
index 00000000..264d9bb |
81 |
--- /dev/null |
82 |
+++ b/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch |
83 |
@@ -0,0 +1,34 @@ |
84 |
+From 39cc57667a93f1cf18f935fdfda4d602667c89c8 Mon Sep 17 00:00:00 2001 |
85 |
+From: Bertrand Jacquin <bertrand@×××××××.bzh> |
86 |
+Date: Wed, 21 Aug 2013 23:00:21 +0200 |
87 |
+Subject: [PATCH 2/2] MINOR: test: Remove the usage of |
88 |
+ Perl::Critic::Policy::Modules::ProhibitAutomaticExportation |
89 |
+ |
90 |
+This does not exist since |
91 |
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-perl/Perl-Critic/metadata.xml?r1=1.3&r2=1.4 |
92 |
+ |
93 |
+See: https://bugs.gentoo.org/show_bug.cgi?id=482026 |
94 |
+--- |
95 |
+ api/perl/t/perlcriticrc | 4 +--- |
96 |
+ 1 file changed, 1 insertion(+), 3 deletions(-) |
97 |
+ |
98 |
+diff --git a/api/perl/t/perlcriticrc b/api/perl/t/perlcriticrc |
99 |
+index f7e4721..f686dca 100644 |
100 |
+--- a/api/perl/t/perlcriticrc |
101 |
++++ b/api/perl/t/perlcriticrc |
102 |
+@@ -133,8 +133,6 @@ severity = 3 |
103 |
+ [Perl::Critic::Policy::Miscellanea::ProhibitTies] |
104 |
+ severity = 4 |
105 |
+ |
106 |
+-[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords] |
107 |
+- |
108 |
+ [Perl::Critic::Policy::Modules::ProhibitAutomaticExportation] |
109 |
+ severity = 4 |
110 |
+ |
111 |
+@@ -283,4 +281,4 @@ severity = 5 |
112 |
+ severity = 5 |
113 |
+ |
114 |
+ [Perl::Critic::Policy::Variables::RequireNegativeIndices] |
115 |
+-severity = 4 |
116 |
+\ No newline at end of file |
117 |
++severity = 4 |
118 |
|
119 |
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-no-strip.diff b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-no-strip.diff |
120 |
deleted file mode 100644 |
121 |
index a3f81a5..00000000 |
122 |
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-no-strip.diff |
123 |
+++ /dev/null |
124 |
@@ -1,23 +0,0 @@ |
125 |
---- src/Makefile.am 2013-08-20 14:24:46.000000000 +0200 |
126 |
-+++ src/Makefile.am 2013-08-20 14:25:20.000000000 +0200 |
127 |
-@@ -54,9 +54,9 @@ |
128 |
- |
129 |
- livecheck$(EXEEXT): livecheck.c strutil.c check_icmp.c |
130 |
- if HAVE_DIET |
131 |
-- diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ |
132 |
-+ diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -o $@ $^ |
133 |
- else |
134 |
-- $(CC) -x c -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ |
135 |
-+ $(CC) -x c -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -o $@ $^ |
136 |
- endif |
137 |
- |
138 |
- livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC |
139 |
-@@ -64,7 +64,7 @@ |
140 |
- |
141 |
- livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES) |
142 |
- -rm -f plugin.so |
143 |
-- $(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -lstdc++ |
144 |
-+ $(CXX) $(LDFLAGS) -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -lstdc++ |
145 |
- |
146 |
- all-local: livestatus.o |
147 |
- |
148 |
|
149 |
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-test-RequireRcsKeywords.diff b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-test-RequireRcsKeywords.diff |
150 |
deleted file mode 100644 |
151 |
index 95b2830..00000000 |
152 |
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-test-RequireRcsKeywords.diff |
153 |
+++ /dev/null |
154 |
@@ -1,18 +0,0 @@ |
155 |
---- ./api/perl/t/perlcriticrc 2013-08-21 22:37:57.791099241 +0200 |
156 |
-+++ ./api/perl/t/perlcriticrc 2013-08-21 22:38:02.943210061 +0200 |
157 |
-@@ -133,8 +133,6 @@ severity = 3 |
158 |
- [Perl::Critic::Policy::Miscellanea::ProhibitTies] |
159 |
- severity = 4 |
160 |
- |
161 |
--[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords] |
162 |
-- |
163 |
- [Perl::Critic::Policy::Modules::ProhibitAutomaticExportation] |
164 |
- severity = 4 |
165 |
- |
166 |
-@@ -283,4 +281,4 @@ severity = 5 |
167 |
- severity = 5 |
168 |
- |
169 |
- [Perl::Critic::Policy::Variables::RequireNegativeIndices] |
170 |
--severity = 4 |
171 |
-\ No newline at end of file |
172 |
-+severity = 4 |
173 |
|
174 |
diff --git a/net-analyzer/mk-livestatus/metadata.xml b/net-analyzer/mk-livestatus/metadata.xml |
175 |
index 6f49eba..2e8625f 100644 |
176 |
--- a/net-analyzer/mk-livestatus/metadata.xml |
177 |
+++ b/net-analyzer/mk-livestatus/metadata.xml |
178 |
@@ -1,5 +1,19 @@ |
179 |
<?xml version="1.0" encoding="UTF-8"?> |
180 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
181 |
<pkgmetadata> |
182 |
-<!-- maintainer-needed --> |
183 |
+ <maintainer type="person"> |
184 |
+ <email>bertrand@×××××××.bzb</email> |
185 |
+ <name>Bertrand Jacquin</name> |
186 |
+ </maintainer> |
187 |
+ <maintainer type="project"> |
188 |
+ <email>netmon@g.o</email> |
189 |
+ <name>Gentoo network monitoring and analysis project</name> |
190 |
+ </maintainer> |
191 |
+ <maintainer type="project"> |
192 |
+ <email>proxy-maint@g.o</email> |
193 |
+ <name>Proxy Maintainers</name> |
194 |
+ </maintainer> |
195 |
+ <use> |
196 |
+ <flag name="nagios4">Generate a <pkg>net-analyzer/nagios</pkg>-4 compatible plugin</flag> |
197 |
+ </use> |
198 |
</pkgmetadata> |
199 |
|
200 |
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p3.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild |
201 |
similarity index 76% |
202 |
rename from net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p3.ebuild |
203 |
rename to net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild |
204 |
index a1e49d2..762d851 100644 |
205 |
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p3.ebuild |
206 |
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild |
207 |
@@ -2,13 +2,11 @@ |
208 |
# Distributed under the terms of the GNU General Public License v2 |
209 |
# $Id$ |
210 |
|
211 |
-EAPI=5 |
212 |
+EAPI=6 |
213 |
|
214 |
GENTOO_DEPEND_ON_PERL=no |
215 |
-PERL_EXPORT_PHASE_FUNCTIONS=no |
216 |
PYTHON_COMPAT=( python2_7 ) |
217 |
- |
218 |
-inherit autotools perl-module python-r1 eutils |
219 |
+inherit autotools perl-module python-r1 |
220 |
|
221 |
MY_PV="${PV/_p/p}" |
222 |
MY_P="${PN}-${MY_PV}" |
223 |
@@ -20,9 +18,10 @@ SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz" |
224 |
LICENSE="GPL-2" |
225 |
SLOT="0" |
226 |
KEYWORDS="~amd64 ~ppc ~x86" |
227 |
-IUSE="examples perl python test" |
228 |
+IUSE="examples nagios4 perl python test" |
229 |
|
230 |
-RDEPEND="perl? ( |
231 |
+RDEPEND="!sys-apps/ucspi-unix:0 |
232 |
+ perl? ( |
233 |
dev-lang/perl:0 |
234 |
virtual/perl-Digest-MD5:0 |
235 |
virtual/perl-Scalar-List-Utils:0 |
236 |
@@ -54,29 +53,33 @@ SRC_TEST="parallel" |
237 |
|
238 |
S="${WORKDIR}/${MY_P}" |
239 |
|
240 |
+PATCHES=( |
241 |
+ "${FILESDIR}/${PV}-MEDIUM-Drop-default-strip.patch" |
242 |
+ "${FILESDIR}/${PV}-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch" |
243 |
+) |
244 |
+ |
245 |
src_prepare() { |
246 |
+ default |
247 |
+ |
248 |
# Use system Module::Install instead, it will be copied to $S by |
249 |
# Module::install itself. |
250 |
- rm -rf api/perl/inc |
251 |
+ rm -rf api/perl/inc || die |
252 |
|
253 |
if use perl; then |
254 |
+ # Ensure patches are not applied twice |
255 |
+ unset PATCHES |
256 |
perl-module_src_prepare |
257 |
fi |
258 |
|
259 |
- epatch "${FILESDIR}/${P}-no-strip.diff" |
260 |
- epatch "${FILESDIR}/${P}-test-RequireRcsKeywords.diff" |
261 |
- |
262 |
- # Script too old |
263 |
- rm -f missing |
264 |
- |
265 |
eautoreconf |
266 |
} |
267 |
|
268 |
src_configure() { |
269 |
- econf |
270 |
+ econf \ |
271 |
+ $(use_with nagios4) |
272 |
|
273 |
if use perl; then |
274 |
- cd api/perl/ |
275 |
+ cd api/perl || die |
276 |
perl-module_src_configure |
277 |
fi |
278 |
} |
279 |
@@ -85,14 +88,14 @@ src_compile() { |
280 |
emake |
281 |
|
282 |
if use perl; then |
283 |
- cd api/perl |
284 |
+ cd api/perl || die |
285 |
perl-module_src_compile |
286 |
fi |
287 |
} |
288 |
|
289 |
src_test() { |
290 |
if use perl; then |
291 |
- cd api/perl |
292 |
+ cd api/perl || die |
293 |
|
294 |
export TEST_AUTHOR="Test Author" |
295 |
perl-module_src_test |
296 |
@@ -100,15 +103,18 @@ src_test() { |
297 |
} |
298 |
|
299 |
src_install() { |
300 |
- emake -C src/ DESTDIR="${ED}" install-binPROGRAMS install-data-local |
301 |
+ emake install DESTDIR="${ED}" |
302 |
|
303 |
if use perl; then |
304 |
- cd api/perl |
305 |
+ cd api/perl || die |
306 |
perl-module_src_install |
307 |
cd "${S}" |
308 |
|
309 |
if use examples; then |
310 |
- docinto examples/ |
311 |
+ docinto / |
312 |
+ newdoc api/perl/README README.perl |
313 |
+ |
314 |
+ docinto examples |
315 |
dodoc api/perl/examples/dump.pl |
316 |
fi |
317 |
fi |
318 |
@@ -117,9 +123,10 @@ src_install() { |
319 |
python_foreach_impl python_domodule api/python/livestatus.py |
320 |
|
321 |
if use examples; then |
322 |
+ docinto / |
323 |
newdoc api/python/README README.python |
324 |
|
325 |
- docinto examples/ |
326 |
+ docinto examples |
327 |
dodoc api/python/{example,example_multisite,make_nagvis_map}.py |
328 |
fi |
329 |
fi |