gentoo resync : 15.01.2020

4 files changed, 183 insertions, 1 deletions

diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
index 789b00d77409..d2f922c2e752 100644
--- a/net-analyzer/mk-livestatus/Manifest
+++ b/net-analyzer/mk-livestatus/Manifest
@@ -1,9 +1,12 @@
 AUX 1.2.8_p10-MEDIUM-Drop-default-strip.patch 812 BLAKE2B f02aee31116dede718ef3671fe86b228ce3031f01fad987ed8622e7e434747e07fc535798f9c5122125f951257a7446f76fc42f7b1f063cc1b5897eeca0cfbf2 SHA512 6fc48bbda7b235e50fb7cfa1298b9c7a2c6730e14639371a811febf84c2f7ed30d43cef6e54c794c50dc2e78fba5ead8a3a5c852bc1d605d5d202c92527242cf
 AUX 1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch 1111 BLAKE2B fb036de5371602ad2ef36ad4916d2f6193a8e8fef4ea2adebe1ace6225ae9c76ffc3ec72ec6649b3ed45e423e3cf6351f86d82d0f524c1a6842066f1e43be99e SHA512 162daa81e2122dfd806e3227b3d22775fa3c36d97e92ce638328e46b99d54d2ff9c1ee51b525677a48a40c180ee0cac2c5c8fbcf50bebdb2f6a18ff836310404
+AUX mk-livestatus-1.5.0_p22-rm.patch 306 BLAKE2B ac45ad1c89a8a067cf780ae13d24a50e4a983c619846ee1e6dcc5a56e3fe8d541b82b8a3f14e7b32f934acefdaa8890635e1745a6e7f17e04f46dd603e461803 SHA512 b172fbd35f7d9b06017bf9df56f8c8ec106f1d71e77dbf6a6a55d974dcf4ccf3548379164c7b4fdac8c1b28456268433d061049c0d2781d9cf3434682e32ebb7
 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
 EBUILD mk-livestatus-1.2.8_p10.ebuild 2680 BLAKE2B 728452886719f88780462c99d9f946028b5d19efeae9b9838bc4a65bc6b3d8237938cb7b6d7dd499c442ace03390aee0f93932409ab9f92afcf73c69abfa0bea SHA512 ccf4d955a9d2e250e4c6b2f1619ced6eb54486a45f4f19a47717eae2217d2372a177caa6e45b85de3711bd15c977700a2d6fc9860f1a640c1e3f049c07d78d8b
 EBUILD mk-livestatus-1.2.8_p16.ebuild 3422 BLAKE2B b74281fdd86bb819ead989d84c3feb3dbf3d7d24fdd4dd8ff723445dfe94e30b3cf3daf25acb8da3549d5c907524df1605cfe51679cf02d17fbc12b6552dfbc3 SHA512 af5de45ec84d07af5c10b47b74e2e4f752cb85a913981d3c4a0ed4202c781506148314959dc8e360d92c94d944dc956b5e5c2268f563d26e3432fc33c644edab
 EBUILD mk-livestatus-1.2.8_p26.ebuild 3390 BLAKE2B 380082a961401822aa98abc221becf7bc7fae44bf2064e41f4847ee218f746b82bf83b79533e4a6061ad869e79674acd3f1468f11df4fc99c13db60183e9559a SHA512 fe3029d2dc50db99c3be8407befca9023bb83cdcbffdab82fe671cbbc60cb71c17fd32257f752b4f93be8f728f3698a76273d316409dffc9ae314e48141bb156
-MISC metadata.xml 617 BLAKE2B d334e2ab6cf614f4c1a8c5ab0c4d5f14e4b841618548cb1e621cd8adc2f5e9565d4c7b640313841f0bc6f906dd8204939119d5b1e2ab2737fb6355e9f11846d6 SHA512 227a4ec9dad38a0be74140697b5095c694ca6837d1bf6fc396f6de28781eba572164e9c8cf7273a8b7286f2d68e5b8efe2facde4b705901d4d675936ccd9d87e
+EBUILD mk-livestatus-1.5.0_p22-r1.ebuild 3564 BLAKE2B ab61245038fdd308462b21281e73670bcd0ec64a7e18a6afffdcc3df1fc3bbb8d1e93b13967626b8bd5721faa8777df29ecde3a1a75b75dd141746e789cf2a7f SHA512 ab4458b4797ba6171314863018b4020538e85d355197fb760f557ef249bdc2eb66f724d727fe1bb9e482bba5dbe7eb9785a319d3ba2bc342722cf46aafb798d6
+MISC metadata.xml 764 BLAKE2B 6cdc02ae09a5f2ee8264648a31feaddce015eaa21824d2466462dc359ca4b9eff656d6714e6e7bed8b6312d10a8e89712287417fee55cd8bf1707f5837849298 SHA512 a113631d9036af5c65ecd6ab393ecd14af3c05511f8c99adac6106a7f54ec172c2bd86eaa5289021baebdb65c62d1f26e72a13ae47aab8245e4e4da8f19142e2
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 000000000000..5c267ae2f4cd
--- /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 29e9ad4c81c5..4a90a3fdc4d8 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-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
new file mode 100644
index 000000000000..658d951078ac
--- /dev/null
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
@@ -0,0 +1,167 @@
+# 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
+	net-analyzer/rrdtool:=
+	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}"
+}