summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-10-09 09:23:07 +0200
committerMichał Górny <mgorny@gentoo.org>2020-10-09 09:23:07 +0200
commit3e77be52575c16d0a827c141e9639b3c11c2c0cc (patch)
treec7fbb17236b28bbaff0bdcd02648a6a739692aee
parentsci-biology/vienna-rna: Remove last-rited pkg (diff)
downloadgentoo-3e77be52575c16d0a827c141e9639b3c11c2c0cc.tar.gz
gentoo-3e77be52575c16d0a827c141e9639b3c11c2c0cc.tar.bz2
gentoo-3e77be52575c16d0a827c141e9639b3c11c2c0cc.zip
net-analyzer/mk-livestatus: Remove last-rited pkg
Closes: https://bugs.gentoo.org/735394 Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--net-analyzer/mk-livestatus/Manifest4
-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.8_p26-fno-common.patch29
-rw-r--r--net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch10
-rw-r--r--net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch10
-rw-r--r--net-analyzer/mk-livestatus/metadata.xml21
-rw-r--r--net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild135
-rw-r--r--net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild158
-rw-r--r--net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild160
-rw-r--r--net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild167
-rw-r--r--profiles/package.mask8
12 files changed, 0 insertions, 760 deletions
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
deleted file mode 100644
index fef9de860f0a..000000000000
--- a/net-analyzer/mk-livestatus/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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/1.2.8_p10-MEDIUM-Drop-default-strip.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch
deleted file mode 100644
index 5b5009bfaa01..000000000000
--- a/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 264d9bb899b6..000000000000
--- a/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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.8_p26-fno-common.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch
deleted file mode 100644
index e0dc8469c15a..000000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/logger.h
-+++ b/src/logger.h
-@@ -27,6 +27,7 @@
-
- #include "config.h" // IWYU pragma: keep
- #include <syslog.h>
-+#include <pthread.h>
-
- #ifdef CMC
- #define LG_DEBUG LOG_INFO
-@@ -49,6 +50,8 @@
- extern "C" {
- #endif
-
-+extern pthread_t g_mainthread_id;
-+
- void logger(int priority, const char *loginfo, ...)
- __attribute__((format(printf, 2, 3)));
- void open_logfile();
---- a/src/module.c
-+++ b/src/module.c
-@@ -95,7 +95,6 @@
- char g_logfile_path[4096];
- int g_debug_level = 0;
- int g_should_terminate = false;
--pthread_t g_mainthread_id;
- pthread_t *g_clientthread_id;
- unsigned long g_max_cached_messages = 500000;
- unsigned long g_max_lines_per_logfile =
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch
deleted file mode 100644
index abdb2e01691b..000000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -62,7 +62,6 @@
- install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- $(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir)
-- rm -f $(DESTDIR)$(pkglibdir)/livestatus.so
-
- clean-local:
- rm -f *~
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
deleted file mode 100644
index 5c267ae2f4cd..000000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 4a90a3fdc4d8..000000000000
--- a/net-analyzer/mk-livestatus/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bertrand@jacquin.bzh</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>
- <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.2.8_p10.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
deleted file mode 100644
index b36094f1ee3e..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools perl-module python-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
-HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nagios4 perl python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!sys-apps/ucspi-unix:0
- 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} )"
-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
- )
- )"
-
-# For perl test
-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 || die
-
- if use perl; then
- # Ensure patches are not applied twice
- unset PATCHES
- perl-module_src_prepare
- fi
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with nagios4)
-
- if use perl; then
- cd api/perl || die
- perl-module_src_configure
- fi
-}
-
-src_compile() {
- emake
-
- if use perl; then
- cd api/perl || die
- perl-module_src_compile
- fi
-}
-
-src_test() {
- if use perl; then
- cd api/perl || die
-
- export TEST_AUTHOR="Test Author"
- perl-module_src_test
- fi
-}
-
-src_install() {
- emake install DESTDIR="${ED}"
-
- 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_foreach_impl 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
-}
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
deleted file mode 100644
index f0e770a07ddb..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools perl-module python-single-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
-HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nagios4 perl python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!sys-apps/ucspi-unix:0
- 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} )"
-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
- )
- )"
-
-# For perl test
-SRC_TEST="parallel"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch"
- "${FILESDIR}/1.2.8_p10-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 || die
-
- if use perl; then
- # Ensure patches are not applied twice
- unset PATCHES
- perl-module_src_prepare
- fi
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with nagios4)
-
- if use perl; then
- cd api/perl || die
- perl-module_src_configure
- fi
-}
-
-src_compile() {
- emake
-
- if use perl; then
- cd api/perl || die
- perl-module_src_compile
- fi
-}
-
-src_test() {
- if use perl; then
- cd api/perl || die
-
- export TEST_AUTHOR="Test Author"
- perl-module_src_test
- fi
-}
-
-src_install() {
- emake install DESTDIR="${ED}"
-
- # 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)/mk-livestatus/livestatus.o
-EOF
- # same for icigna
- cat <<EOF >"${T}"/icigna.cfg
-define module{
- module_name mk-livestatus
- module_type neb
- path /usr/$(get_libdir)/mk-livestatus/livestatus.o
- args /var/lib/icigna/rw/live
- }
-EOF
- insinto /usr/share/mk-livestatus
- doins "${T}"/{nagios,icigna}.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_foreach_impl 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 icigna and nagios are available in"
- elog "/usr/share/${PN}"
-}
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
deleted file mode 100644
index 071250a73b6b..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools perl-module python-single-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data"
-HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html"
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nagios4 perl python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!sys-apps/ucspi-unix:0
- 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} )"
-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
- )
- )"
-
-# For perl test
-SRC_TEST="parallel"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch"
- "${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
- "${FILESDIR}"/${PN}-1.2.8_p26-fno-common.patch
- "${FILESDIR}"/${PN}-1.2.8_p26-rm.patch
-)
-
-src_prepare() {
- default
-
- # Use system Module::Install instead, it will be copied to $S by
- # Module::install itself.
- rm -rf api/perl/inc || die
-
- if use perl; then
- # Ensure patches are not applied twice
- unset PATCHES
- perl-module_src_prepare
- fi
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with nagios4)
-
- if use perl; then
- cd api/perl || die
- perl-module_src_configure
- fi
-}
-
-src_compile() {
- emake
-
- if use perl; then
- cd api/perl || die
- perl-module_src_compile
- fi
-}
-
-src_test() {
- if use perl; then
- cd api/perl || die
-
- export TEST_AUTHOR="Test Author"
- perl-module_src_test
- fi
-}
-
-src_install() {
- emake install DESTDIR="${ED}"
-
- # 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 icigna
- cat <<EOF >"${T}"/icigna.cfg
-define module{
- module_name ${PN}
- module_type neb
- path /usr/$(get_libdir)/${PN}/livestatus.o
- args /var/lib/icigna/rw/live
- }
-EOF
- insinto /usr/share/${PN}
- doins "${T}"/{nagios,icigna}.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 icigna and nagios are available in"
- elog "/usr/share/${PN}"
-}
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
deleted file mode 100644
index a0d42e5b3a7e..000000000000
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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}"
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index e017a399cbf9..894a8822a8a6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -523,14 +523,6 @@ sci-physics/rivet
sys-cluster/heartbeat
x11-misc/dsx
-# Michał Górny <mgorny@gentoo.org> (2020-09-09)
-# These packages are stuck on Python 2.7. While the Python dependency
-# is optional, I can't test removing it because the packages fail
-# to build anyway.
-#
-# net-analyzer/mk-livestatus: py3 bug #735394, build failure bug #705430
-net-analyzer/mk-livestatus
-
# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-09-01)
# Mismatched version (bug #695022). Masked to force upgrade to 2.0.4_pre20200306162733.
# (Mask should remain after ebuilds are deleted, until 2021-03-01 or