summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Jacquin <bertrand@jacquin.bzh>2016-09-12 22:22:37 +0100
committerPatrice Clement <monsieurp@gentoo.org>2016-10-28 00:12:06 +0200
commitf677a8aa7e37536c3403068ef406788455ed133b (patch)
tree77b5c5ed0d1b4efb9eab57c804898643be65bc6b /net-analyzer/mk-livestatus
parentsys-apps/systemd: Raise libseccomp min. version dependency. (diff)
downloadgentoo-f677a8aa7e37536c3403068ef406788455ed133b.tar.gz
gentoo-f677a8aa7e37536c3403068ef406788455ed133b.tar.bz2
gentoo-f677a8aa7e37536c3403068ef406788455ed133b.zip
net-analyzer/mk-livestatus: version bump, move to EAPI 6 and a
bunch of improvements. This commit: * drops unneeded Perl variables. * adds nagios4 USE flag. * blocks sys-apps/ucspi-unix * refreshes patches set with proper git patches. * uses standard emake install. * adds perl README. * installs python README in the right place. * sets Bertrand Jacquin <betrand@jacquin.bzh> as the de-facto maintainer. Gentoo-Bug: https://bugs.gentoo.org/574700 Gentoo-Bug: https://bugs.gentoo.org/574716 Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/2315 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'net-analyzer/mk-livestatus')
-rw-r--r--net-analyzer/mk-livestatus/Manifest2
-rw-r--r--net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch24
-rw-r--r--net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch34
-rw-r--r--net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-no-strip.diff23
-rw-r--r--net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-test-RequireRcsKeywords.diff18
-rw-r--r--net-analyzer/mk-livestatus/metadata.xml16
-rw-r--r--net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild (renamed from net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p3.ebuild)49
7 files changed, 102 insertions, 64 deletions
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
index 69d35d5a746..7a1c8c7e4e7 100644
--- a/net-analyzer/mk-livestatus/Manifest
+++ b/net-analyzer/mk-livestatus/Manifest
@@ -1 +1 @@
-DIST mk-livestatus-1.2.2p3.tar.gz 382030 SHA256 edceb13675ed3375fd867216e2ffe31c350d5860509f9fb0abd182148e270616 SHA512 ee3468de5a61c4aa904d8d0df8e4a66c56a04e2f99d92237957100dc7ecb28e8e1f403488298b5a92ce78874e176384eca02eeb9b0a99c1bbf9799a9c2fcaa01 WHIRLPOOL 7fe080bbfc2d04a037248a94a202137cdc0ca40689800e51c273bd83dfe4e5c2e5d54ca6ff525d6ffb5015ff6032b8cfe65739896a63adaf01a7d550f771d8e4
+DIST mk-livestatus-1.2.8p10.tar.gz 453496 SHA256 af21c393a17b783f8ca83ffe6e5eea884c74557c4f2bd8899720ced0b443b35e SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d WHIRLPOOL c3354b04eac1eb8907eb781cdc785136ea4aac0c9d9a2e66d89291d4eeb89f3cd6efcfb2e554295140157b0d7099f1621cd4258e3cd7fa9c0459cd8c7c373d7e
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
new file mode 100644
index 00000000000..5b5009bfaa0
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch
@@ -0,0 +1,24 @@
+From 1798492a27a1ac3819cb366e1a3e789d663f55a0 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Wed, 21 Aug 2013 23:00:21 +0200
+Subject: [PATCH 1/2] MEDIUM: Drop default strip
+
+See: https://bugs.gentoo.org/show_bug.cgi?id=482026
+
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index deab289..126b503 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -55,7 +55,7 @@ livestatus_so_CFLAGS = -fPIC
+
+ livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES)
+ -rm -f plugin.so
+- $(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++
++ $(CXX) $(LDFLAGS) -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++
+
+ all-local: livestatus.o
+
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
new file mode 100644
index 00000000000..264d9bb899b
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
@@ -0,0 +1,34 @@
+From 39cc57667a93f1cf18f935fdfda4d602667c89c8 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Wed, 21 Aug 2013 23:00:21 +0200
+Subject: [PATCH 2/2] MINOR: test: Remove the usage of
+ Perl::Critic::Policy::Modules::ProhibitAutomaticExportation
+
+This does not exist since
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-perl/Perl-Critic/metadata.xml?r1=1.3&r2=1.4
+
+See: https://bugs.gentoo.org/show_bug.cgi?id=482026
+---
+ api/perl/t/perlcriticrc | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/api/perl/t/perlcriticrc b/api/perl/t/perlcriticrc
+index f7e4721..f686dca 100644
+--- a/api/perl/t/perlcriticrc
++++ b/api/perl/t/perlcriticrc
+@@ -133,8 +133,6 @@ severity = 3
+ [Perl::Critic::Policy::Miscellanea::ProhibitTies]
+ severity = 4
+
+-[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords]
+-
+ [Perl::Critic::Policy::Modules::ProhibitAutomaticExportation]
+ severity = 4
+
+@@ -283,4 +281,4 @@ severity = 5
+ severity = 5
+
+ [Perl::Critic::Policy::Variables::RequireNegativeIndices]
+-severity = 4
+\ No newline at end of file
++severity = 4
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
deleted file mode 100644
index a3f81a5054c..00000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-no-strip.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/Makefile.am 2013-08-20 14:24:46.000000000 +0200
-+++ src/Makefile.am 2013-08-20 14:25:20.000000000 +0200
-@@ -54,9 +54,9 @@
-
- livecheck$(EXEEXT): livecheck.c strutil.c check_icmp.c
- if HAVE_DIET
-- diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^
-+ diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -o $@ $^
- else
-- $(CC) -x c -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^
-+ $(CC) -x c -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -o $@ $^
- endif
-
- livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC
-@@ -64,7 +64,7 @@
-
- livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES)
- -rm -f plugin.so
-- $(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -lstdc++
-+ $(CXX) $(LDFLAGS) -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -lstdc++
-
- all-local: livestatus.o
-
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
deleted file mode 100644
index 95b2830fecc..00000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-test-RequireRcsKeywords.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./api/perl/t/perlcriticrc 2013-08-21 22:37:57.791099241 +0200
-+++ ./api/perl/t/perlcriticrc 2013-08-21 22:38:02.943210061 +0200
-@@ -133,8 +133,6 @@ severity = 3
- [Perl::Critic::Policy::Miscellanea::ProhibitTies]
- severity = 4
-
--[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords]
--
- [Perl::Critic::Policy::Modules::ProhibitAutomaticExportation]
- severity = 4
-
-@@ -283,4 +281,4 @@ severity = 5
- severity = 5
-
- [Perl::Critic::Policy::Variables::RequireNegativeIndices]
--severity = 4
-\ No newline at end of file
-+severity = 4
diff --git a/net-analyzer/mk-livestatus/metadata.xml b/net-analyzer/mk-livestatus/metadata.xml
index 6f49eba8f49..2e8625faa14 100644
--- a/net-analyzer/mk-livestatus/metadata.xml
+++ b/net-analyzer/mk-livestatus/metadata.xml
@@ -1,5 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>bertrand@jacquin.bzb</email>
+ <name>Bertrand Jacquin</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="nagios4">Generate a <pkg>net-analyzer/nagios</pkg>-4 compatible plugin</flag>
+ </use>
</pkgmetadata>
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
index a1e49d2dc67..762d85179bd 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p3.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
@@ -2,13 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
GENTOO_DEPEND_ON_PERL=no
-PERL_EXPORT_PHASE_FUNCTIONS=no
PYTHON_COMPAT=( python2_7 )
-
-inherit autotools perl-module python-r1 eutils
+inherit autotools perl-module python-r1
MY_PV="${PV/_p/p}"
MY_P="${PN}-${MY_PV}"
@@ -20,9 +18,10 @@ SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples perl python test"
+IUSE="examples nagios4 perl python test"
-RDEPEND="perl? (
+RDEPEND="!sys-apps/ucspi-unix:0
+ perl? (
dev-lang/perl:0
virtual/perl-Digest-MD5:0
virtual/perl-Scalar-List-Utils:0
@@ -54,29 +53,33 @@ SRC_TEST="parallel"
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}/${PV}-MEDIUM-Drop-default-strip.patch"
+ "${FILESDIR}/${PV}-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
+)
+
src_prepare() {
+ default
+
# Use system Module::Install instead, it will be copied to $S by
# Module::install itself.
- rm -rf api/perl/inc
+ rm -rf api/perl/inc || die
if use perl; then
+ # Ensure patches are not applied twice
+ unset PATCHES
perl-module_src_prepare
fi
- epatch "${FILESDIR}/${P}-no-strip.diff"
- epatch "${FILESDIR}/${P}-test-RequireRcsKeywords.diff"
-
- # Script too old
- rm -f missing
-
eautoreconf
}
src_configure() {
- econf
+ econf \
+ $(use_with nagios4)
if use perl; then
- cd api/perl/
+ cd api/perl || die
perl-module_src_configure
fi
}
@@ -85,14 +88,14 @@ src_compile() {
emake
if use perl; then
- cd api/perl
+ cd api/perl || die
perl-module_src_compile
fi
}
src_test() {
if use perl; then
- cd api/perl
+ cd api/perl || die
export TEST_AUTHOR="Test Author"
perl-module_src_test
@@ -100,15 +103,18 @@ src_test() {
}
src_install() {
- emake -C src/ DESTDIR="${ED}" install-binPROGRAMS install-data-local
+ emake install DESTDIR="${ED}"
if use perl; then
- cd api/perl
+ cd api/perl || die
perl-module_src_install
cd "${S}"
if use examples; then
- docinto examples/
+ docinto /
+ newdoc api/perl/README README.perl
+
+ docinto examples
dodoc api/perl/examples/dump.pl
fi
fi
@@ -117,9 +123,10 @@ src_install() {
python_foreach_impl python_domodule api/python/livestatus.py
if use examples; then
+ docinto /
newdoc api/python/README README.python
- docinto examples/
+ docinto examples
dodoc api/python/{example,example_multisite,make_nagvis_map}.py
fi
fi