public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/mk-livestatus/files/, net-analyzer/mk-livestatus/
@ 2016-10-27 22:12 Patrice Clement
  0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2016-10-27 22:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f677a8aa7e37536c3403068ef406788455ed133b
Author:     Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Mon Sep 12 21:22:37 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 22:12:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f677a8aa

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 <AT> 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 <AT> gentoo.org>

 net-analyzer/mk-livestatus/Manifest                |  2 +-
 .../1.2.8_p10-MEDIUM-Drop-default-strip.patch      | 24 +++++++++++
 ...Remove-the-usage-of-Perl-Critic-Policy-Mo.patch | 34 +++++++++++++++
 .../files/mk-livestatus-1.2.2_p3-no-strip.diff     | 23 ----------
 ...ivestatus-1.2.2_p3-test-RequireRcsKeywords.diff | 18 --------
 net-analyzer/mk-livestatus/metadata.xml            | 16 ++++++-
 ....2_p3.ebuild => mk-livestatus-1.2.8_p10.ebuild} | 49 ++++++++++++----------
 7 files changed, 102 insertions(+), 64 deletions(-)

diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
index 69d35d5..7a1c8c7 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 00000000..5b5009b
--- /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 00000000..264d9bb
--- /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 a3f81a5..00000000
--- 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 95b2830..00000000
--- 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 6f49eba..2e8625f 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
similarity index 76%
rename from net-analyzer/mk-livestatus/mk-livestatus-1.2.2_p3.ebuild
rename to net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
index a1e49d2..762d851 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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/mk-livestatus/files/, net-analyzer/mk-livestatus/
@ 2020-01-13  6:26 Jeroen Roovers
  0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2020-01-13  6:26 UTC (permalink / raw
  To: gentoo-commits

commit:     23b789c312b096b2e0adad5ed8406441ffcc974b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 06:11:56 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 06:26:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b789c3

net-analyzer/mk-livestatus: Version 1.5.0_p22

- Update HOMEPAGE/SRC_URI and use HTTPS
- EAPI=7
- Add USE=boost
- Add USE=re2
- Move SRC_TEST out of global scope
- Drop failing test api/perl/t/20-Monitoring-Livestatus-test_socket.t
- Export CC/CXX (or it will default to anything it can find)
- icigna => icinga(!)
- Drop python_foreach_impl as the build system supports only one
  implementation anyway

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Bug: https://bugs.gentoo.org/show_bug.cgi?id=671792
Closes: https://bugs.gentoo.org/show_bug.cgi?id=358565
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/mk-livestatus/Manifest                |   1 +
 .../files/mk-livestatus-1.5.0_p22-rm.patch         |  10 ++
 net-analyzer/mk-livestatus/metadata.xml            |   2 +
 .../mk-livestatus/mk-livestatus-1.5.0_p22.ebuild   | 166 +++++++++++++++++++++
 4 files changed, 179 insertions(+)

diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
index f76e15d2407..fef9de860f0 100644
--- a/net-analyzer/mk-livestatus/Manifest
+++ b/net-analyzer/mk-livestatus/Manifest
@@ -1,3 +1,4 @@
 DIST mk-livestatus-1.2.8p10.tar.gz 453496 BLAKE2B 5c6cb41dff2d3cc29837088c18c6f7e4bfa6a5a9a3802adafe86fb28523bfc8037fc0c69770861612568db5fc8b61569663c3033201c6293b6da2dba3de55100 SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d
 DIST mk-livestatus-1.2.8p16.tar.gz 453565 BLAKE2B 73b4f2d245740e9427af391691a3873b2930bbef1de2b147cefdde1b84f24e7acf61aa748a8adaad4290c77d9b1c7aef7540c69d44c420522c5d56115127b49b SHA512 32d4bc014c008ac7afbdca53e6b3e0d71f8eee5f41f4a0299a8e14cee2a1ea93216fe04c4ff9aa7d7b927dde8e63d186f09a2847665851f1063e699cf73a8df4
 DIST mk-livestatus-1.2.8p26.tar.gz 453508 BLAKE2B 75338c65b2c323d4ef2637ef2507f6f213bd3b58a32c0bd377a3c0c0ead34c75394539eaec08d40ee9ea16ca2534158ee4c6823387f3fc3648a02a22d86e0395 SHA512 8afeb6e750d7eb310380153af91f9c6f889f6e350e26dc97f923a49b2e3cc6c0b866f893664ad5d9fd9c0e8671b0a69e1267e464e4de9faf75a2eb24536ae014
+DIST mk-livestatus-1.5.0p22.tar.gz 477418 BLAKE2B fcb33852fafd6ddbbae5fc2989dd694200dc046386e3add07afed0051c2299828afdd13c7e13a862edf10ecd25d522817d1248b05b0bc73cce4e6f4962ec0f1d SHA512 a689d20230651e4cc6708f678fda9c34a4834b68580bff3b012eb7ec7ff2bbd70dff85121e73665ab0266831f36338bd0976731f7d4a68a2595757dccbcac9b6

diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch
new file mode 100644
index 00000000000..5c267ae2f4c
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch
@@ -0,0 +1,10 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -201,7 +201,6 @@
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+ 	$(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir)
+-	rm -f $(DESTDIR)$(pkglibdir)/liblivestatus.a
+ 
+ clean-local:
+ 	rm -rf *~ compile_commands.json cppcheck-result.xml html

diff --git a/net-analyzer/mk-livestatus/metadata.xml b/net-analyzer/mk-livestatus/metadata.xml
index 29e9ad4c81c..4a90a3fdc4d 100644
--- a/net-analyzer/mk-livestatus/metadata.xml
+++ b/net-analyzer/mk-livestatus/metadata.xml
@@ -15,5 +15,7 @@
 	</maintainer>
 	<use>
 		<flag name="nagios4">Generate a <pkg>net-analyzer/nagios</pkg>-4 compatible plugin</flag>
+		<flag name="boost">Use <pkg>dev-libs/boost</pkg> for ASIO support</flag>
+		<flag name="re2">Use <pkg>dev-libs/re2</pkg> for regex support</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22.ebuild
new file mode 100644
index 00000000000..4ad850f4877
--- /dev/null
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+inherit autotools perl-module python-single-r1 toolchain-funcs
+
+DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
+HOMEPAGE="https://checkmk.com/"
+SRC_URI="https://checkmk.com/support/${PV/_}/${P/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="boost examples nagios4 perl python re2 test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	!sys-apps/ucspi-unix:0
+	boost? ( dev-libs/boost )
+	perl? (
+		dev-lang/perl:0
+		virtual/perl-Digest-MD5:0
+		virtual/perl-Scalar-List-Utils:0
+		>=virtual/perl-Thread-Queue-2.11:0
+		virtual/perl-Encode:0
+		dev-perl/JSON-XS:0
+	)
+	python? ( ${PYTHON_DEPS} )
+	re2? ( dev-libs/re2:= )
+"
+DEPEND="
+	${RDEPEND}
+	perl? (
+		dev-perl/Module-Install:0
+		virtual/perl-ExtUtils-MakeMaker:0
+		virtual/perl-File-Path:0
+		virtual/perl-File-Spec:0
+		virtual/perl-File-Temp:0
+		test? (
+			dev-perl/File-Copy-Recursive:0
+			dev-perl/Test-Pod:0
+			dev-perl/Test-Perl-Critic:0
+			dev-perl/Test-Pod-Coverage:0
+			dev-perl/Perl-Critic:0
+			dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0
+			dev-perl/Perl-Critic-Deprecated:0
+			dev-perl/Perl-Critic-Nits:0
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
+	"${FILESDIR}"/${PN}-1.5.0_p22-rm.patch
+)
+S=${WORKDIR}/${P/_}
+
+src_prepare() {
+	default
+
+	# Use system Module::Install instead, it will be copied to $S by
+	# Module::install itself.
+	rm -rf api/perl/inc || die
+
+	# failing test
+	rm -rf api/perl/t/20-Monitoring-Livestatus-test_socket.t || die
+
+	if use perl; then
+		# Ensure patches are not applied twice
+		unset PATCHES
+		perl-module_src_prepare
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	econf \
+		$(use_with boost boost-asio) \
+		$(use_with nagios4) \
+		$(use_with re2)
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_compile
+	fi
+}
+
+src_test() {
+	if use perl; then
+		cd api/perl || die
+
+		SRC_TEST="parallel"
+		export TEST_AUTHOR="Test Author"
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/$(get_libdir)/${PN}/liblivestatus.a || die
+
+	# install a config file showing whats needed to enable livestatus for nagios
+	cat <<EOF >"${T}"/nagios.cfg
+# Ensure all data is set to event brokers
+event_broker_options=-1
+broker_module=${EPREFIX%/}/usr/$(get_libdir)/${PN}/livestatus.o
+EOF
+	# same for icinga
+	cat <<EOF >"${T}"/icinga.cfg
+define module{
+        module_name             ${PN}
+        module_type             neb
+        path                    /usr/$(get_libdir)/${PN}/livestatus.o
+        args                    /var/lib/icinga/rw/live
+        }
+EOF
+	insinto /usr/share/${PN}
+	doins "${T}"/{nagios,icinga}.cfg
+
+	if use perl; then
+		cd api/perl || die
+		perl-module_src_install
+		cd "${S}"
+
+		if use examples; then
+			docinto /
+			newdoc api/perl/README README.perl
+
+			docinto examples
+			dodoc api/perl/examples/dump.pl
+		fi
+	fi
+
+	if use python; then
+		python_domodule api/python/livestatus.py
+
+		if use examples; then
+			docinto /
+			newdoc api/python/README README.python
+
+			docinto examples
+			dodoc api/python/{example,example_multisite,make_nagvis_map}.py
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Sample configurations for icinga and nagios are available in"
+	elog "/usr/share/${PN}"
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-01-13  6:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-13  6:26 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/mk-livestatus/files/, net-analyzer/mk-livestatus/ Jeroen Roovers
  -- strict thread matches above, loose matches on Subject: below --
2016-10-27 22:12 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox