[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/, net-analyzer/check_mk/, net-analyzer/check_mk/files/

[Michał Górny]

commit:     a69dd861c8eceb208df573afaa97e9312bdf41b7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 29 10:06:27 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 29 10:08:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69dd861

net-analyzer/check_mk: Remove last-rited pkg

Bug: https://bugs.gentoo.org/632648
Closes: https://bugs.gentoo.org/652634
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-analyzer/check_mk/Manifest                     |   2 -
 net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild  | 323 -------------------
 net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild    | 351 ---------------------
 .../check_mk/files/check_mk-1.2.4p5-setup.sh.patch |  39 ---
 .../files/check_mk-1.2.8p16-setup.sh.patch         |  35 --
 net-analyzer/check_mk/metadata.xml                 |  29 --
 profiles/base/package.use.force                    |   5 -
 profiles/base/package.use.mask                     |   6 -
 profiles/package.mask                              |   7 -
 9 files changed, 797 deletions(-)

diff --git a/net-analyzer/check_mk/Manifest b/net-analyzer/check_mk/Manifest
deleted file mode 100644
index a31e9ad7838..00000000000
--- a/net-analyzer/check_mk/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST check_mk-1.2.4p5.tar.gz 6626768 BLAKE2B d8f40405d443cf4d25cf53ac4adff4361c79c4574993c708a8699ccc8e06623f2fdc2539ccb591e74fe984f3f7824a0a961c8f994439a02edb3440089bdfa453 SHA512 ca2c06288b91f44f017ebbc45bd6712ddcbebdc4e293598b793ae1ad19ad96814983a30bd66ee2f19940dc1d1439fba2ae2b171dcbe0e670ce1b7d0a8c18d890
-DIST check_mk-1.2.8p16.tar.gz 16298683 BLAKE2B 5023719c3e2e56807900ccb204862eccb73706bb23dfa3dfb4f30cb6fa592828e2d81aef12dd5129b280c37ca8d700c982f3b29469fd5ec0328e91e414b8c624 SHA512 601c76b2b62de9176122c69b011b5f7ac6b71650d1b3e411c103f5e9c3e91256ce8d3db6fcd1edc2a11f86dcba4e8ea18ec5a1f9f3eae5b25a4bb3ba712341eb

diff --git a/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild b/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild
deleted file mode 100644
index ef7a70f9a76..00000000000
--- a/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils toolchain-funcs python-r1
-
-DESCRIPTION="General purpose Nagios/Icinga plugin for retrieving data"
-HOMEPAGE="http://mathias-kettner.de/check_mk.html"
-
-MY_P="${P/_p/p}"
-MY_PV="${MY_P/check_mk-/}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="agent-only apache_status dmi_sysinfo livestatus logwatch mysql
-	nfsexports oracle postgres smart wato xinetd zypper"
-
-DEPEND="${PYTHON_DEPS}
-	wato? ( app-admin/sudo )
-	xinetd? ( sys-apps/xinetd )
-	!agent-only? ( || ( net-analyzer/nagios-core net-analyzer/icinga ) )
-	!agent-only? ( www-servers/apache www-apache/mod_python )
-	media-libs/libpng:0
-	!!net-analyzer/check_mk_agent"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	livestatus? ( !agent-only )
-	wato? ( !agent-only )"
-
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# modify setup.sh for gentoo
-	epatch "${FILESDIR}"/${PN}-1.2.4p5-setup.sh.patch
-}
-
-src_configure() {
-	if has_version net-analyzer/nagios-core; then
-		export mydaemon=nagios
-		export nagpipe=/var/nagios/rw/nagios.cmd
-		export check_result_path=/var/nagios/spool/checkresults
-		export nagios_status_file=/var/nagios/status.dat
-		export rrd_path=/var/nagios/perfdata
-	else
-		export mydaemon=icinga
-		export nagpipe=/var/lib/icinga/rw/icinga.cmd
-		export check_result_path=/var/lib/icinga/spool/checkresults
-		export nagios_status_file=/var/lib/icinga/status.dat
-		export rrd_path=/var/lib/icinga/perfdata
-	fi
-
-	export nagiosuser=${mydaemon}
-	export nagios_binary=/usr/sbin/${mydaemon}
-	export nagios_config_file=/etc/${mydaemon}/${mydaemon}.cfg
-	export nagconfdir=/etc/${mydaemon}/check_mk.d
-	export nagios_startscript=/etc/init.d/${mydaemon}
-	export htpasswd_file=/etc/${mydaemon}/htpasswd.users
-	export nagios_auth_name="${mydaemon} Access"
-	export docdir=/usr/share/doc/${PF}
-	export checkmandir=/usr/share/doc/${PF}/checks
-	export check_icmp_path=/usr/lib/nagios/plugins/check_icmp
-	export wwwuser=apache
-	export wwwgroup=apache
-	export apache_config_dir=/etc/apache2/modules.d/
-
-	if use livestatus; then
-		export enable_livestatus=yes
-	else
-		export enable_livestatus=no
-	fi
-
-	export STRIPPROG=/bin/true
-}
-
-src_compile() {
-	DESTDIR=${S} ./setup.sh --yes || die "Error while running setup.sh"
-
-	# compile waitmax
-	cd "${S}"/usr/share/check_mk/agents || die "Couldn't cd to ${S}/usr/share/check_mk/agents"
-	if [[ -f waitmax ]]; then
-		rm waitmax || die "Couldn't delete precompiled waitmax file"
-	fi
-	sed -i -e 's#gcc -s -o waitmax waitmax\.c#gcc -o waitmax waitmax.c#' "${S}"/usr/share/check_mk/agents/Makefile || die "Couldn't modify remove strip from waitmax Makefile"
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "Couldn't compile waitmax"
-
-	# Fix broken png files
-	pngfix -q --out=out.png "${S}/usr/share/check_mk/web/htdocs/images/icons/bookcase.png"
-	mv -f out.png "${S}/usr/share/check_mk/web/htdocs/images/icons/bookcase.png" || die
-	pngfix -q --out=out.png "${S}/usr/share/check_mk/web/htdocs/images/icon_auditlog.png"
-	mv -f out.png "${S}/usr/share/check_mk/web/htdocs/images/icon_auditlog.png" || die
-	pngfix -q --out=out.png "${S}/usr/share/check_mk/web/htdocs/images/button_auditlog_lo.png"
-	mv -f out.png "${S}/usr/share/check_mk/web/htdocs/images/button_auditlog_lo.png" || die
-}
-
-src_install() {
-	if ! use agent-only; then
-		# Apache configuration
-		insinto /etc/apache2/modules.d
-		doins etc/apache2/modules.d/zzz_check_mk.conf
-
-		if use wato; then
-			# sudoers configuration
-			cat << EOF > "${T}"/check_mk || die
-# Needed for WATO - the Check_MK Web Administration Tool
-Defaults:apache !requiretty
-apache ALL = (root) NOPASSWD: /usr/bin/check_mk --automation *
-EOF
-			insinto /etc/sudoers.d
-			doins "${T}"/check_mk
-		fi
-
-		# check_mk configuration
-		keepdir /etc/check_mk
-		insinto /etc/check_mk
-		doins etc/check_mk/main.mk
-		doins etc/check_mk/main.mk-${MY_PV}
-		doins etc/check_mk/multisite.mk
-		doins etc/check_mk/multisite.mk-${MY_PV}
-		keepdir /etc/check_mk/conf.d
-		insinto /etc/check_mk/conf.d
-		doins etc/check_mk/conf.d/README
-		keepdir /etc/check_mk/conf.d/wato
-		touch "${D}"/etc/check_mk/conf.d/distributed_wato.mk
-		keepdir /etc/check_mk/multisite.d
-		keepdir /etc/check_mk/multisite.d/wato
-		touch "${D}"/etc/check_mk/multisite.d/sites.mk
-
-		insinto /etc/${mydaemon}
-		doins etc/${mydaemon}/auth.serials
-
-		# Nagios / Icinga check_mk templates
-		insinto /etc/${mydaemon}/check_mk.d
-		doins etc/${mydaemon}/check_mk.d/check_mk_templates.cfg
-
-		dobin usr/bin/check_mk
-		dobin usr/bin/mkp
-		insinto /usr/bin
-		doins usr/bin/cmk
-
-		# remove compiled agent_modbus
-		if [[ -f ${S}/usr/share/doc/${PF}/treasures/modbus/agent_modbus ]]; then
-			rm "${S}"/usr/share/doc/${PF}/treasures/modbus/agent_modbus || die "Couldn't remove precompiled agent_modbus"
-		fi
-
-		insinto /usr/share/check_mk
-		doins -r usr/share/check_mk/*
-
-		keepdir /var/lib/check_mk/autochecks
-		keepdir /var/lib/check_mk/cache
-		keepdir /var/lib/check_mk/counters
-		keepdir /var/lib/check_mk/logwatch
-		keepdir /var/lib/check_mk/notify
-		keepdir /var/lib/check_mk/packages
-		insinto /var/lib/check_mk/packages
-		doins var/lib/check_mk/packages/check_mk
-		keepdir /var/lib/check_mk/precompiled
-		keepdir /var/lib/check_mk/snmpwalks
-		keepdir /var/lib/check_mk/tmp
-		keepdir /var/lib/check_mk/wato
-		keepdir /var/lib/check_mk/web
-
-		# Update check_mk defaults
-		sed -i -e "s#^\(check_mk_automation\s*= 'sudo -u\) portage \(.*\)\$#\1 ${mydaemon} \2#" "${D}"/usr/share/check_mk/modules/defaults || die "Couldn't update check_mk defaults"
-		cp "${D}"/usr/share/check_mk/modules/defaults "${D}"/usr/share/check_mk/web/htdocs/defaults.py || die "Couldn't copy check_mk defaults"
-
-		# Change permissions
-		fowners -R ${mydaemon}:apache /etc/${mydaemon}/auth.serials
-		fperms -R 0660 /etc/${mydaemon}/auth.serials
-		fowners -R ${mydaemon}:${mydaemon} /etc/${mydaemon}/check_mk.d
-		fperms -R 0775 /etc/${mydaemon}/check_mk.d
-		fowners -R root:apache /etc/check_mk/conf.d/wato
-		fperms -R 0775 /etc/check_mk/conf.d/wato
-		fowners root:apache /etc/check_mk/conf.d/distributed_wato.mk
-		fperms 0664 /etc/check_mk/conf.d/distributed_wato.mk
-		fowners -R root:apache /etc/check_mk/multisite.d/wato
-		fperms -R 0775 /etc/check_mk/multisite.d/wato
-		fowners root:apache /etc/check_mk/multisite.d/sites.mk
-		fperms 0664 /etc/check_mk/multisite.d/sites.mk
-		fowners root:${mydaemon} /var/lib/check_mk/cache
-		fperms 0775 /var/lib/check_mk/counters
-		fowners -R root:${mydaemon} /var/lib/check_mk/counters
-		fperms 0775 /var/lib/check_mk/notify
-		fowners -R root:${mydaemon} /var/lib/check_mk/notify
-		fperms 0775 /var/lib/check_mk/logwatch
-		fowners -R root:${mydaemon} /var/lib/check_mk/logwatch
-		fperms 0775 /var/lib/check_mk/cache
-		fowners -R root:${mydaemon} /var/lib/check_mk/cache
-		fperms -R 0775 /var/lib/check_mk/tmp
-		fowners -R root:apache /var/lib/check_mk/tmp
-		fperms -R 0775 /var/lib/check_mk/web
-		fowners -R root:apache /var/lib/check_mk/web
-		fperms -R 0775 /var/lib/check_mk/wato
-		fowners -R root:apache /var/lib/check_mk/wato
-	fi
-
-	# Install agent related files
-	newbin usr/share/check_mk/agents/check_mk_agent.linux check_mk_agent
-	dobin usr/share/check_mk/agents/waitmax
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins usr/share/check_mk/agents/xinetd.conf check_mk
-	fi
-
-	keepdir /usr/lib/check_mk_agent/local
-	keepdir /usr/lib/check_mk_agent/plugins
-
-	# Install Livestatus
-	if use livestatus; then
-		cat << EOF > "${T}"/livestatus.cfg || die
-define module{
-	module_name		mk-livestatus
-	module_type		neb
-	path			/usr/lib/check_mk/livestatus.o
-	args			/var/lib/${mydaemon}/rw/live
-	}
-EOF
-
-		insinto /etc/${mydaemon}/modules
-		doins "${T}"/livestatus.cfg
-		fowners ${mydaemon}:${mydaemon} /etc/${mydaemon}/modules/livestatus.cfg
-
-		insinto /usr/lib/check_mk
-		doins usr/lib/check_mk/livestatus.o
-
-		dobin usr/bin/unixcat
-
-		keepdir /usr/share/check_mk/livestatus
-	fi
-
-	# Documentation
-	if ! use agent-only; then
-		dodoc -r usr/share/doc/${PF}/*
-		docompress -x /usr/share/doc/${PF}/checks/
-	else
-		dodoc usr/share/doc/${PF}/AUTHORS usr/share/doc/${PF}/COPYING usr/share/doc/${PF}/ChangeLog
-		docompress
-	fi
-
-	# Install the check_mk_agent logwatch plugin
-	if use logwatch; then
-		insinto /etc/check_mk
-		doins usr/share/check_mk/agents/logwatch.cfg
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_logwatch
-	fi
-
-	# Install the check_mk_agent smart plugin
-	if use smart; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/smart
-	fi
-
-	# Install the check_mk_agent mysql plugin
-	if use mysql; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_mysql
-	fi
-
-	# Install the check_mk_agent postgres plugin
-	if use postgres; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_postgres
-	fi
-
-	# Install the check_mk_agent apache_status plugin
-	if use apache_status; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/apache_status
-	fi
-
-	# Install the check_mk_agent zypper plugin
-	if use zypper; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_zypper
-	fi
-
-	# Install the check_mk_agent oracle plugin
-	if use oracle; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_oracle
-	fi
-
-	# Install the check_mk_agent nfsexports plugin
-	if use nfsexports; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/nfsexports
-	fi
-
-	# Install the check_mk_agent dmi_sysinfo plugin
-	if use dmi_sysinfo; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/dmi_sysinfo
-	fi
-}
-
-pkg_postinst() {
-	if ! use agent-only; then
-		elog "IMPORTANT: Please add the following line to your"
-		elog "/etc/${mydaemon}/${mydaemon}.cfg, so that"
-		elog "${mydaemon} can load your check_mk configuration."
-		elog
-		elog "  cfg_dir=/etc/${mydaemon}/check_mk.d"
-		elog
-	fi
-	if use wato; then
-		elog "INFO: Your webserver needs write access to"
-		elog "/etc/${mydaemon}/htpasswd.users!"
-		elog "otherwise wato will not function correctly!"
-		elog
-		elog "chown ${mydaemon}: /etc/${mydaemon}/htpasswd.users"
-		elog "chmod 660 /etc/${mydaemon}/htpasswd.users"
-		elog
-	fi
-}

diff --git a/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild b/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild
deleted file mode 100644
index cd3279356bc..00000000000
--- a/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs user systemd python-single-r1
-
-DESCRIPTION="General purpose Nagios/Icinga plugin for retrieving data"
-HOMEPAGE="http://mathias-kettner.de/check_mk.html"
-
-MY_P="${P/_p/p}"
-MY_PV="${MY_P/check_mk-/}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="agent-only apache_status livestatus logwatch mysql +nagios4
-	nfsexports oracle postgres smart wato xinetd zypper"
-
-RDEPEND="${PYTHON_DEPS}
-	wato? ( app-admin/sudo )
-	xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) )
-	!agent-only? (
-		www-servers/apache[apache2_modules_access_compat(+)]
-		www-apache/mod_python[${PYTHON_USEDEP}]
-		livestatus? ( net-analyzer/mk-livestatus[nagios4=] )
-		nagios4? ( >=net-analyzer/nagios-core-4 )
-		!nagios4? ( || ( <net-analyzer/nagios-core-4 net-analyzer/icinga ) )
-	)
-	media-libs/libpng:0
-	!!net-analyzer/check_mk_agent"
-DEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	livestatus? ( !agent-only )
-	wato? ( !agent-only )"
-
-SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# modify setup.sh for gentoo
-	eapply "${FILESDIR}"/${PN}-1.2.8p16-setup.sh.patch
-	eapply_user
-}
-
-src_configure() {
-	if has_version net-analyzer/nagios-core; then
-		einfo "Using nagios as net-analyzer/nagios-core found"
-		export mydaemon=nagios
-		export nagpipe=/var/nagios/rw/nagios.cmd
-		export check_result_path=/var/nagios/spool/checkresults
-		export nagios_status_file=/var/nagios/status.dat
-		export rrd_path=/var/nagios/perfdata
-		if use livestatus; then
-			export livesock=/var/nagios/rw/live
-		fi
-	else
-		einfo "Using icinga as net-analyzer/nagios-core not found"
-		export mydaemon=icinga
-		export nagpipe=/var/lib/icinga/rw/icinga.cmd
-		export check_result_path=/var/lib/icinga/spool/checkresults
-		export nagios_status_file=/var/lib/icinga/status.dat
-		export rrd_path=/var/lib/icinga/perfdata
-		if use livestatus; then
-			export livesock=/var/lib/icigna/rw/live
-		fi
-	fi
-
-	export nagiosuser=${mydaemon}
-	export nagios_binary=/usr/sbin/${mydaemon}
-	export nagios_config_file=/etc/${mydaemon}/${mydaemon}.cfg
-	export nagconfdir=/etc/${mydaemon}/check_mk.d
-	export nagios_startscript=/etc/init.d/${mydaemon}
-	export htpasswd_file=/etc/${mydaemon}/htpasswd.users
-	export nagios_auth_name="${mydaemon} Access"
-	export docdir=/usr/share/doc/${PF}
-	export checkmandir=/usr/share/doc/${PF}/checks
-	export check_icmp_path=/usr/lib/nagios/plugins/check_icmp
-	export wwwuser=apache
-	export wwwgroup=apache
-	export apache_config_dir=/etc/apache2/modules.d/
-	export enable_livestatus=no
-	export STRIPPROG=/bin/true
-
-	mkdir -p "${S}"/usr/share/check_mk/agents || die
-	cat <<EOF >"${S}"/usr/share/check_mk/agents/Makefile
-all: waitmax
-
-waitmax: waitmax.c
-	\$(CC) \$(CFLAGS) \$< -o \$@ \$(LDFLAGS)
-
-EOF
-}
-
-src_compile() {
-	DESTDIR=${S} ./setup.sh --yes || die "Error while running setup.sh"
-
-	# compile waitmax
-	pushd "${S}"/usr/share/check_mk/agents &>/dev/null || die
-	if [[ -f waitmax ]]; then
-		rm waitmax || die "Couldn't delete precompiled waitmax file"
-	fi
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
-	popd &>/dev/null || die
-
-	# Fix broken png files
-	einfo "Fixing broken png files."
-	local x=0;
-	for png in "${S}"/usr/share/check_mk/web/htdocs/images/icons/*.png ; do
-		echo ${png#${S}}
-		pngfix -q --out="${T}"/out.png "${png}" && \
-		mv -f "${T}"/out.png "${png}" || die
-		x=$((x+1))
-	done
-	einfo "$x png files processed."
-
-	# enforce the correct python in these wrapper scripts
-	sed -i -e "/exec/s/python /${EPYTHON} /" usr/bin/{check_mk,mkp} || die
-	sed -i -e "/command_line/s#python /var#${EPYTHON} /var#" \
-		usr/share/check_mk/check_mk_templates.cfg || die
-
-	# fix all shebangs
-	find usr -type f -name \*.py |while read py ; do
-		grep '^#!' ${py} &>/dev/null && \
-		python_fix_shebang ${py}
-	done
-}
-
-src_install() {
-	if ! use agent-only; then
-		# Apache configuration
-		insinto /etc/apache2/modules.d
-		doins etc/apache2/modules.d/zzz_check_mk.conf
-
-		if use wato; then
-			# sudoers configuration
-			cat << EOF > "${T}"/check_mk || die
-# Needed for WATO - the Check_MK Web Administration Tool
-Defaults:apache !requiretty
-apache ALL = (root) NOPASSWD: /usr/bin/check_mk --automation *
-EOF
-			insinto /etc/sudoers.d
-			doins "${T}"/check_mk
-		fi
-
-		# check_mk configuration
-		#keepdir /etc/check_mk
-		insinto /etc/check_mk
-		doins etc/check_mk/main.mk
-		doins etc/check_mk/main.mk-${MY_PV}
-		doins etc/check_mk/multisite.mk
-		doins etc/check_mk/multisite.mk-${MY_PV}
-		#keepdir /etc/check_mk/conf.d
-		insinto /etc/check_mk/conf.d
-		doins etc/check_mk/conf.d/README
-		dodir /etc/check_mk/conf.d/wato
-		touch "${D}"/etc/check_mk/conf.d/distributed_wato.mk
-		#keepdir /etc/check_mk/multisite.d
-		dodir /etc/check_mk/multisite.d/wato
-		touch "${D}"/etc/check_mk/multisite.d/sites.mk
-
-		insinto /etc/${mydaemon}
-		doins etc/${mydaemon}/auth.serials
-
-		# Nagios / Icinga check_mk templates
-		insinto /etc/${mydaemon}/check_mk.d
-		doins etc/${mydaemon}/check_mk.d/check_mk_templates.cfg
-
-		dobin usr/bin/check_mk
-		dobin usr/bin/mkp
-		dosym /usr/bin/check_mk /usr/bin/cmk
-
-		# remove compiled agent_modbus
-		if [[ -f ${S}/usr/share/doc/${PF}/treasures/modbus/agent_modbus ]]; then
-			rm "${S}"/usr/share/doc/${PF}/treasures/modbus/agent_modbus || die "Couldn't remove precompiled agent_modbus"
-		fi
-
-		insinto /usr/share/check_mk
-		doins -r usr/share/check_mk/*
-
-		keepdir /var/lib/check_mk/autochecks
-		keepdir /var/lib/check_mk/cache
-		keepdir /var/lib/check_mk/counters
-		keepdir /var/lib/check_mk/inventory
-		keepdir /var/lib/check_mk/log
-		keepdir /var/lib/check_mk/logwatch
-		keepdir /var/lib/check_mk/notify
-		keepdir /var/lib/check_mk/precompiled
-		keepdir /var/lib/check_mk/snmpwalks
-		keepdir /var/lib/check_mk/tmp
-		keepdir /var/lib/check_mk/wato
-		keepdir /var/lib/check_mk/web
-
-		insinto /var/lib/check_mk/packages
-		doins var/lib/check_mk/packages/check_mk
-
-		# Update check_mk defaults
-		sed -i -e "s#^\(check_mk_automation\s*= 'sudo -u\) portage \(.*\)\$#\1 ${mydaemon} \2#" "${D}"/usr/share/check_mk/modules/defaults || die "Couldn't update check_mk defaults"
-		cp "${D}"/usr/share/check_mk/modules/defaults "${D}"/usr/share/check_mk/web/htdocs/defaults.py || die "Couldn't copy check_mk defaults"
-
-		# Change permissions
-		fowners -R ${mydaemon}:apache /etc/${mydaemon}/auth.serials
-		fperms -R 0660 /etc/${mydaemon}/auth.serials
-		fowners -R ${mydaemon}:${mydaemon} /etc/${mydaemon}/check_mk.d
-		fperms -R 0775 /etc/${mydaemon}/check_mk.d
-		fowners -R root:apache /etc/check_mk/conf.d/wato
-		fperms -R 0775 /etc/check_mk/conf.d/wato
-		fowners root:apache /etc/check_mk/conf.d/distributed_wato.mk
-		fperms 0664 /etc/check_mk/conf.d/distributed_wato.mk
-		fowners -R root:apache /etc/check_mk/multisite.d/wato
-		fperms -R 0775 /etc/check_mk/multisite.d/wato
-		fowners root:apache /etc/check_mk/multisite.d/sites.mk
-		fperms 0664 /etc/check_mk/multisite.d/sites.mk
-		fowners root:${mydaemon} /var/lib/check_mk/cache
-		fperms 0775 /var/lib/check_mk/counters
-		fowners -R root:${mydaemon} /var/lib/check_mk/counters
-		fperms 0775 /var/lib/check_mk/notify
-		fowners -R root:${mydaemon} /var/lib/check_mk/notify
-		fperms 0775 /var/lib/check_mk/inventory
-		fowners -R root:${mydaemon} /var/lib/check_mk/inventory
-		fperms 0775 /var/lib/check_mk/log
-		fowners -R root:${mydaemon} /var/lib/check_mk/log
-		fperms 0775 /var/lib/check_mk/logwatch
-		fowners -R root:${mydaemon} /var/lib/check_mk/logwatch
-		fperms 0775 /var/lib/check_mk/cache
-		fowners -R root:${mydaemon} /var/lib/check_mk/cache
-		fperms -R 0775 /var/lib/check_mk/tmp
-		fowners -R root:apache /var/lib/check_mk/tmp
-		fperms -R 0775 /var/lib/check_mk/web
-		fowners -R root:apache /var/lib/check_mk/web
-		fperms -R 0775 /var/lib/check_mk/wato
-		fowners -R root:apache /var/lib/check_mk/wato
-		fperms -R 0775 /var/lib/check_mk/
-		fowners -R ${mydaeon}:apache /var/lib/check_mk/
-	fi
-
-	# Install agent related files
-	newbin usr/share/check_mk/agents/check_mk_agent.linux check_mk_agent
-	dobin usr/share/check_mk/agents/waitmax
-
-	if use xinetd; then
-		pushd "${S}"/usr/share/check_mk/agents/cfg_examples &>/dev/null || die
-		insinto /etc/xinetd.d
-		newins xinetd.conf check_mk
-		systemd_dounit systemd/check_mk@.service systemd/check_mk.socket
-		popd &>/dev/null || die
-	fi
-
-	keepdir /usr/lib/check_mk_agent/local
-	keepdir /usr/lib/check_mk_agent/plugins
-
-	# Documentation
-	if ! use agent-only; then
-		dodoc -r usr/share/doc/${PF}/*
-		docompress -x /usr/share/doc/${PF}/checks/
-	else
-		dodoc usr/share/doc/${PF}/AUTHORS usr/share/doc/${PF}/COPYING usr/share/doc/${PF}/ChangeLog
-		docompress
-	fi
-
-	# Install the check_mk_agent logwatch plugin
-	if use logwatch; then
-		insinto /etc/check_mk
-		doins usr/share/check_mk/agents/cfg_examples/logwatch.cfg
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_logwatch
-	fi
-
-	# Install the check_mk_agent smart plugin
-	if use smart; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/smart
-	fi
-
-	# Install the check_mk_agent mysql plugin
-	if use mysql; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_mysql
-	fi
-
-	# Install the check_mk_agent postgres plugin
-	if use postgres; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_postgres
-	fi
-
-	# Install the check_mk_agent apache_status plugin
-	if use apache_status; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/apache_status
-	fi
-
-	# Install the check_mk_agent zypper plugin
-	if use zypper; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_zypper
-	fi
-
-	# Install the check_mk_agent oracle plugin
-	if use oracle; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/mk_oracle
-	fi
-
-	# Install the check_mk_agent nfsexports plugin
-	if use nfsexports; then
-		exeinto /usr/lib/check_mk_agent/plugins
-		doexe usr/share/check_mk/agents/plugins/nfsexports
-	fi
-}
-
-pkg_postinst() {
-	if ! use agent-only; then
-		elog "IMPORTANT: Please add the following line to your"
-		elog "/etc/${mydaemon}/${mydaemon}.cfg, so that"
-		elog "${mydaemon} can load your check_mk configuration."
-		elog
-		elog "  cfg_dir=/etc/${mydaemon}/check_mk.d"
-		elog
-	fi
-	if use wato; then
-		elog "INFO: Your webserver needs write access to"
-		elog "/etc/${mydaemon}/htpasswd.users!"
-		elog "otherwise wato will not function correctly!"
-		elog
-		elog "chown ${mydaemon}: /etc/${mydaemon}/htpasswd.users"
-		elog "chmod 660 /etc/${mydaemon}/htpasswd.users"
-		elog
-		elog "Alternatively with ACLs:"
-		elog "setfacl -m u:apache:rw /etc/${mydaemon}/htpasswd.users"
-		elog "setfacl -m g:apache:rw /etc/${mydaemon}/htpasswd.users"
-		elog
-	fi
-	if use livestatus; then
-		elog "In order for livestatus to work, you need to make sure that"
-		if has_version net-analyzer/nagios-core; then
-			elog "nagios is loading the livestatus broker module.  Please"
-			elog "ensure to add to your nagios.cfg the lines in"
-			elog "/usr/share/mk-livestatus/nagios.cfg"
-		else
-			elog "icigna is loading the livestatus broker module.  Please"
-			elog "include /usr/share/mk-livestatus/icigna.cfg in your"
-			elog "icigna configuration."
-		fi
-	fi
-}

diff --git a/net-analyzer/check_mk/files/check_mk-1.2.4p5-setup.sh.patch b/net-analyzer/check_mk/files/check_mk-1.2.4p5-setup.sh.patch
deleted file mode 100644
index 07dffa35b2d..00000000000
--- a/net-analyzer/check_mk/files/check_mk-1.2.4p5-setup.sh.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- check_mk-1.2.4p5.orig/setup.sh	2014-07-04 09:24:45.000000000 +0200
-+++ check_mk-1.2.4p5/setup.sh	2015-08-28 13:22:19.986733809 +0200
-@@ -572,6 +572,11 @@
-            CONFIGURE_OPTS="--with-nagios4"
-         fi
-    fi
-+   # disable stripping to get meaningful backtraces
-+   sed -i -e 's/^INSTALL_STRIP_PROGRAM="\\\$(install_sh) -c -s"$/INSTALL_STRIP_PROGRAM="\\\$(install_sh) -c"/' configure
-+   sed -i -e 's/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \\$/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" \\/' Makefile.in
-+   sed -i -e 's/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \\$/install_sh_PROGRAM="\$(INSTALL_STRIP_PROGRAM)" \\/' src/Makefile.in
-+   sed -i -e 's/\$(CXX) \$(LDFLAGS) -s -fPIC -shared \$(livestatus_so_OBJECTS) -o \$@ -lpthread -lstdc++/\$(CXX) \$(LDFLAGS) -fPIC -shared \$(livestatus_so_OBJECTS) -o \$@ -lpthread -lstdc++/' src/Makefile.in
-    ./configure --libdir=$libdir --bindir=$bindir $CONFIGURE_OPTS &&
-    make clean &&
-    cat <<EOF > src/livestatus.h &&
-@@ -581,7 +586,8 @@
- #endif // livestatus_h
- EOF
-    make -j 8  2>&1 &&
--   strip src/livestatus.o &&
-+   # disable stripping to get meaningful backtraces
-+   #strip src/livestatus.o &&
-    mkdir -p $DESTDIR$libdir &&
-    install -m 755 src/livestatus.o $DESTDIR$libdir &&
-    mkdir -p $DESTDIR$bindir &&
-@@ -1018,9 +1024,11 @@
-            # WATO. Also create an empty and Apache-writable auth.serials
-            serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials &&
-            touch "$serials_file" &&
--           (chown $wwwuser "$serials_file" || true) &&
--           (chown $wwwuser "$htpasswd_file" || true) &&
--	   create_sudo_configuration &&
-+           # Permissions will be set within src_install
-+           #(chown $wwwuser "$serials_file" || true) &&
-+           #(chown $wwwuser "$htpasswd_file" || true) &&
-+	   # disable sudo configuration as this will be done within src_install
-+	   #create_sudo_configuration &&
-            if [ "$enable_mkeventd" = yes ]
-            then
- 	       if [ -z "$YES" ] ; then echo -n "(Compiling Event Console binaries..." ; fi

diff --git a/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch b/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch
deleted file mode 100644
index b30d1ad1dad..00000000000
--- a/net-analyzer/check_mk/files/check_mk-1.2.8p16-setup.sh.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/setup.sh	2014-07-04 09:24:45.000000000 +0200
-+++ b/setup.sh	2015-08-28 13:22:19.986733809 +0200
-@@ -564,6 +564,17 @@
- 
- compile_livestatus ()
- {
-+   echo "Skipping internal compile of livestatus, do it in ebuild instead"
-+   cat <<EOF > $SRCDIR/livestatus.src/src/livestatus.h 
-+#ifndef livestatus_h
-+#define livestatus_h
-+#define DEFAULT_SOCKET_PATH "$livesock"
-+#endif // livestatus_h
-+EOF
-+}
-+
-+avoid_compile_livestatus ()
-+{
-    local D=$SRCDIR/livestatus.src
-    rm -rf $D
-    mkdir -p $D
-@@ -1018,9 +1029,11 @@
-            # WATO. Also create an empty and Apache-writable auth.serials
-            serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials &&
-            touch "$serials_file" &&
--           (chown $wwwuser "$serials_file" || true) &&
--           (chown $wwwuser "$htpasswd_file" || true) &&
--	   create_sudo_configuration &&
-+           # Permissions will be set within src_install
-+           #(chown $wwwuser "$serials_file" || true) &&
-+           #(chown $wwwuser "$htpasswd_file" || true) &&
-+	   # disable sudo configuration as this will be done within src_install
-+	   #create_sudo_configuration &&
-            if [ "$enable_mkeventd" = yes ]
-            then
- 	       if [ -z "$YES" ] ; then echo -n "(Compiling Event Console binaries..." ; fi

diff --git a/net-analyzer/check_mk/metadata.xml b/net-analyzer/check_mk/metadata.xml
deleted file mode 100644
index e7ef436d115..00000000000
--- a/net-analyzer/check_mk/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<longdescription lang="en">
-		General purpose Nagios/Icinga plugin for retrieving data.
-		Check_MK is a collection of extensions for the IT-Monitoring-Kernel 
-		of Nagios/Icinga and together with this, and ideally also with 
-		PNP4Nagios and NagVis constitutes a complete IT-Monitoring-System.
-	</longdescription>
-	<use>
-		<flag name="agent-only">Install only the check_mk agent.</flag>
-		<flag name="logwatch">Install check_mk-agent logwatch plugin.</flag>
-		<flag name="smart">Install check_mk-agent S.M.A.R.T plugin.</flag>
-		<flag name="mysql">Install check_mk-agent mysql plugin.</flag>
-		<flag name="nagios4">Depend on <pkg>net-analyzer/nagios-core</pkg>-4</flag>
-		<flag name="postgres">Install check_mk-agent postgres plugin.</flag>
-		<flag name="apache_status">Install check_mk-agent apache-status plugin.</flag>
-		<flag name="nfsexports">Install check_mk-agent nfsexports plugin.</flag>
-		<flag name="dmi_sysinfo">Install check_mk-agent dmi_sysinfo plugin.</flag>
-		<flag name="zypper">Install check_mk-agent zypper plugin.</flag>
-		<flag name="livestatus">Enable livestatus.</flag>
-		<flag name="wato">Enable check_mk WATO - check_mk's Web Administration Tool.</flag>
-	</use>
-	<upstream>
-		<changelog>http://mathias-kettner.com/check_mk_download.html</changelog>
-		<doc>http://mathias-kettner.com/checkmk.html</doc>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index e437d8d4a1d..a43023cc367 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -19,11 +19,6 @@ sys-cluster/glusterfs libtirpc
 # to avoid automagic deps.
 >=x11-apps/intel-gpu-tools-9999 alsa chamelium doc glib gsl sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv
 
-# Michał Górny <mgorny@g.o> (05 Jun 2017)
-# (on behalf of Treecleaner project)
-# www-apache/mod_python is masked for removal, force agent-only builds.
-net-analyzer/check_mk agent-only
-
 # NP-Hardass <NP-Hardass@g.o> (10 Apr 2017)
 # Always force patch on appropriate variant to ensure
 # similar experience when using app-emulation/wine-any

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index a11b641539c..911da73221c 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -176,12 +176,6 @@ sys-boot/refind custom-cflags
 # Needs patch to even build, subs are broken and not supported anymore.
 media-video/mpv libav
 
-# Michał Górny <mgorny@g.o> (05 Jun 2017)
-# (on behalf of Treecleaner project)
-# www-apache/mod_python is masked for removal, mask flags that
-# require it.
-net-analyzer/check_mk livestatus wato
-
 # Andreas K. Hüttel <dilfridge@g.o> (29 May 2017)
 # Does not build
 sci-libs/linux-gpib php

diff --git a/profiles/package.mask b/profiles/package.mask
index 1f376a9e2ac..dcc497c656c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -210,13 +210,6 @@ media-plugins/vdr-videosystem
 # packages.  Bug #664658.  Removal in 30 days.
 net-im/hangups
 
-# Michał Górny <mgorny@g.o> (26 Aug 2018)
-# mod_python removal caused it to be reduced to agent-only, which is
-# apparently redundant to net-analyzer/check_mk_agent.  The package
-# is unmaintained and potentially vulnerable.  Bug #632648.
-# Removal in 30 days.
-net-analyzer/check_mk
-
 # Virgil Dupras <vdupras@g.o> (23 Aug 2018)
 # Vulnerable and can't be removed yet because of alpha. Bug #664346
 <dev-python/paramiko-2.4.1