Adds quite a lot of new things

pg_activity, nagios analyzers
moves highlight to the right parent
compiler versions for distccing

15 files changed, 98 insertions, 88 deletions

diff --git a/net-analyzer/check_crm/Manifest b/net-analyzer/check_crm/Manifest
new file mode 100644
index 0000000..22f8e1f
--- /dev/null
+++ b/net-analyzer/check_crm/Manifest
@@ -0,0 +1,3 @@
+AUX monitoring-plugin.patch 1054 BLAKE2B b3be54b2edf856659e187e4af6115fa16519c5cbd77bc21a08b0e7a3c53514cde0f8a6a38750a923a4b4d4769dd533833139484f6447359e0a196be02cf30e5a SHA512 6eaff63e57433b57dd5d16d0739422b4d9f4b904b3ea70c0f001107a177819fc941dc20a08d52cd81242fd84eb48b40e4750addd220be35e61f1eb30558261af
+DIST check_crm-0.7 6622 BLAKE2B 36c6026c34c788495bd10a7188de3e14cab86d8b4d19bd7ac87904c402b834a169ad2868f768c74f2fa11aecb394dc3dc887d34ae68e90615fc24cc47d2b52bf SHA512 4b2dcbb352c2f894a8238bf90ffe725b1743807e84ad949624f802652dda4174ade3b99e3f71f5d319946fd42a6fbe906301b831c52259208fde48abdee60d3b
+EBUILD check_crm-0.7.ebuild 709 BLAKE2B 6d7269545aaf824066091a90a0e26ccb9eeb641dda60b852777a23f5b6acb3d477580c4c43d6445563bb9bd6677a047b531901e934d689e9fd1650b356af2687 SHA512 419c9518620499297cd59a81aa098bc268ba4992aa172f088b1039a6e620246b955e9290832495f1b4d09d25b46b07feecba638b0adedc4e65b85b6fc2d49871
diff --git a/net-analyzer/check_crm/check_crm-0.7.ebuild b/net-analyzer/check_crm/check_crm-0.7.ebuild
new file mode 100644
index 0000000..fb06b03
--- /dev/null
+++ b/net-analyzer/check_crm/check_crm-0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Checks the status of a Pacemaker based Cluster using crm_mon"
+HOMEPAGE="https://exchange.nagios.org/directory/Plugins/Clustering-and-High-2DAvailability/Check-CRM/details"
+SRC_URI="https://exchange.nagios.org/components/com_mtree/attachment.php?link_id=2403&cf_id=30 -> ${P}"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.8
+dev-perl/Monitoring-Plugin"
+BDEPEND=""
+PATCHES="${FILESDIR}/monitoring-plugin.patch"
+
+src_unpack() {
+	mkdir -p ${S}
+	cp ${DISTDIR}/${A} ${S}
+}
+src_install() {
+	exeinto /usr/lib/nagios/plugins/
+	newexe ${S}/${A} ${PN}
+}
+
diff --git a/net-analyzer/check_crm/files/monitoring-plugin.patch b/net-analyzer/check_crm/files/monitoring-plugin.patch
new file mode 100644
index 0000000..fb494d5
--- /dev/null
+++ b/net-analyzer/check_crm/files/monitoring-plugin.patch
@@ -0,0 +1,29 @@
+--- a/check_crm-0.7	2020-10-30 18:45:30.000000000 +0000
++++ a/check_crm-0.7	2020-10-30 19:02:12.967447548 +0000
+@@ -32,7 +32,7 @@
+ #		    constraints check (Boris Wesslowski). Adds fail count 
+ #		    threshold ( Zoran Bosnjak & Marko Hrastovec )
+ #
+-# NOTES: Requires Perl 5.8 or higher & the Perl Module Nagios::Plugin
++# NOTES: Requires Perl 5.8 or higher & the Perl Module Monitoring::Plugin
+ #        Nagios user will need sudo acces - suggest adding line below to
+ #        sudoers
+ #	     nagios  ALL=(ALL) NOPASSWD: /usr/sbin/crm_mon -1 -r -f
+@@ -47,7 +47,7 @@
+ 
+ use warnings;
+ use strict;
+-use Nagios::Plugin;
++use Monitoring::Plugin;
+ 
+ # Lines below may need changing if crm_mon or sudo installed in a
+ # different location.
+@@ -56,7 +56,7 @@
+ my $crm_mon            = '/usr/sbin/crm_mon -1 -r -f';
+ my $crm_configure_show = '/usr/sbin/crm configure show';
+ 
+-my $np = Nagios::Plugin->new(
++my $np = Monitoring::Plugin->new(
+     shortname => 'check_crm',
+     version   => '0.7',
+     usage     => "Usage: %s <ARGS>\n\t\t--help for help\n",
diff --git a/net-analyzer/check_service/Manifest b/net-analyzer/check_service/Manifest
new file mode 100644
index 0000000..d25a2a3
--- /dev/null
+++ b/net-analyzer/check_service/Manifest
@@ -0,0 +1,2 @@
+DIST check_service-1.1.tar.gz 774 BLAKE2B a16a13f894e2527f8fa17baa0ecb5a4a7f3f01c0f65e642fc6ea0c829ff2a11857fb4c0f510121c12d4cb58be937f221d8908db360e84dbda592bb1c688ba053 SHA512 f867ff1d972c0a987aa107c6693207fa2f4b0e7a1f3b6e665dc4bc955d0b4a56ff359ce1078f34ec7e99adb648d5d9759fe6b20e27ab9db6beb608b62778cea7
+EBUILD check_service-1.1.ebuild 505 BLAKE2B 92eaa05f68504d85ef6a7c2358d86f977c4e5c09651ebc40a0c9167a01b811463a0552a06e210a1e9cfc7cbbe7e68c13d3f82fc289cd1065c556dd1400187acd SHA512 2063dbce6c2a391e817a48fb68330a498152de0def4a9f8cedfb85acb0cafc1acc028d0c86bdbffd139d3ac1c4d0c478761e835bf4b5250fa3b6317c511a6b53
diff --git a/net-analyzer/check_service/check_service-1.1.ebuild b/net-analyzer/check_service/check_service-1.1.ebuild
new file mode 100644
index 0000000..377b632
--- /dev/null
+++ b/net-analyzer/check_service/check_service-1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Check status of systemd service"
+HOMEPAGE="https://github.com/duffycop/nagios_plugins"
+SRC_URI="https://github.com/duffycop/nagios_plugins/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+S="${WORKDIR}/nagios_plugins-${PV}"
+
+src_install() {
+	exeinto /usr/lib/nagios/plugins/
+	newexe ${S}/plugins/${PN} ${PN}
+}
diff --git a/virtual/miller-dev/Manifest b/virtual/miller-dev/Manifest
index 05befbc..4f46bc8 100644
--- a/virtual/miller-dev/Manifest
+++ b/virtual/miller-dev/Manifest
@@ -1 +1 @@
-EBUILD miller-dev-10.2.4.ebuild 2342 BLAKE2B 8ee9df5df5b03f6e4ac1cfc62a61daf4ea12d277d6cf769f1f2d1c7cd6a607a51f9a418eb5b32bd8c6cddebec0c3d9674fcc660c6c3ea0b0859fa4536a3ce999 SHA512 0a54d778c93aafd4c2bc6fc45f23d80351955d1140955f99356b9101b9ee893d4283d53842ad810188c6d8588c05de067339a3d5663ce1feb104d3dc0977f521
+EBUILD miller-dev-10.2.5.ebuild 2364 BLAKE2B 6eccc7bee62b01470436990f27a4d9644d037f6c93e861912ab3d6aac7dcb1eb3c2d97770e0f0cb3ab4ee71544e7a85e793b6b6b5289f57f6891f94540abb2ab SHA512 1d81b1674d6dc60fe508ced3f317c2cb1ecc93891016d3f9f965dd5cd5e8eb59479e03d6e91ee06f05aeb3c4cc8ae0f5434b73366ca03bd7750fe8816011ece6
diff --git a/virtual/miller-dev/miller-dev-10.2.4.ebuild b/virtual/miller-dev/miller-dev-10.2.5.ebuild
index 235d8ae..54f2578 100644
--- a/virtual/miller-dev/miller-dev-10.2.4.ebuild
+++ b/virtual/miller-dev/miller-dev-10.2.5.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	app-admin/webapp-config
 	postgres? (
 			dev-db/apgdiff
+			dev-db/pg_activity
 			dev-db/postgresql_autodoc )
 	dev-util/uncrustify
 	dev-util/cproto
diff --git a/virtual/miller-postgresql/Manifest b/virtual/miller-postgresql/Manifest
index b28003a..386c764 100644
--- a/virtual/miller-postgresql/Manifest
+++ b/virtual/miller-postgresql/Manifest
@@ -1 +1 @@
-EBUILD miller-postgresql-12.ebuild 227 BLAKE2B 5ed26f3be15e4d6ee2c47c7fefc3d7b7c3470690087a89a3314b009b85e44407bdf456c0f256cceef40868ea1b85d73b1a1f072c0c073516c974221ae4f280de SHA512 0a5016a06d37c25cd4b84c2d86730357906d768593c3aaa5f690e02d2ceb339e01123c89c0eac3e90d19c14539dc3237f99fefcdefe62f065f046f3d0ced6ed2
+EBUILD miller-postgresql-12.1.ebuild 247 BLAKE2B 249054b35b3508f6f21aa1df9ee4a2b639bd302b5f58043aebd2b1585e18fcbc3d0aaf0b411e318a00e00d6754cca3df57433aea150328cb5f040b5464467bf0 SHA512 c2c819d25111b7161a199198172baf8a0453f3599fd6d637c385222e5a3db7d75a452f3d06288b5c173ac697f3ef5d710a306c68dbc33af302d3de6cdc51e75b
diff --git a/virtual/miller-postgresql/miller-postgresql-12.ebuild b/virtual/miller-postgresql/miller-postgresql-12.1.ebuild
index b662584..1831616 100644
--- a/virtual/miller-postgresql/miller-postgresql-12.ebuild
+++ b/virtual/miller-postgresql/miller-postgresql-12.1.ebuild
@@ -7,6 +7,7 @@ IUSE=""
 
 RDEPEND="
 	virtual/miller-base
+	dev-db/pg_activity
 	=dev-db/postgresql-12*[server]
 "
 
diff --git a/virtual/miller-webappserver/Manifest b/virtual/miller-webappserver/Manifest
index 6662e68..5a089b3 100644
--- a/virtual/miller-webappserver/Manifest
+++ b/virtual/miller-webappserver/Manifest
@@ -1,2 +1 @@
-EBUILD miller-webappserver-3.2.ebuild 358 BLAKE2B 84e8169acf739b84cda25a2b73f2ba9f717efe890be719822663af531631686646dfe64d7acf3fb9daf2b0d78c17c814de744a08a2c5fed3c2d8424bcbc62e78 SHA512 bc7e578b68fca6b3f4706950e26d92b8d1be319f15170b466002276c899798fb8d4244becbf53d0277ab827d0b2f2cf453537f0ae0b43d2b24adb196b9245ec4
-EBUILD miller-webappserver-3.3.1.ebuild 399 BLAKE2B 18506bd0196341f63d858500062aac3d42c7319fd3012c98fb922a6c83ceb8d535f0b1b62042695616b79db91885e85c6ee8102f881a910bb5f1fd86f1746dbc SHA512 be2dec93d6000c7c17fec49852b8bfe0da7536fcd8c84ca85f1c6dce85958403a3d32b0d291ecd76aa50d1c4001de0b1d1a6033f55ba2aab19b1f0321de4c3c5
+EBUILD miller-webappserver-3.3.2.ebuild 399 BLAKE2B 18506bd0196341f63d858500062aac3d42c7319fd3012c98fb922a6c83ceb8d535f0b1b62042695616b79db91885e85c6ee8102f881a910bb5f1fd86f1746dbc SHA512 be2dec93d6000c7c17fec49852b8bfe0da7536fcd8c84ca85f1c6dce85958403a3d32b0d291ecd76aa50d1c4001de0b1d1a6033f55ba2aab19b1f0321de4c3c5
diff --git a/virtual/miller-webappserver/miller-webappserver-3.2.ebuild b/virtual/miller-webappserver/miller-webappserver-3.2.ebuild
deleted file mode 100644
index c111219..0000000
--- a/virtual/miller-webappserver/miller-webappserver-3.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-EAPI="7"
-DESCRIPTION="Virtual for Miller webapp servers"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	virtual/miller-base
-	www-apps/gentoobrowse
-	www-apps/bugzilla
-	www-apps/mythweb
-	|| ( media-tv/mythtv media-tv/mythtv-bindings )
-	virtual/httpd-php:7.2
-	www-apps/cgit
-	dev-python/markdown
-"
diff --git a/virtual/miller-webappserver/miller-webappserver-3.3.1.ebuild b/virtual/miller-webappserver/miller-webappserver-3.3.2.ebuild
index 41022f0..41022f0 100644
--- a/virtual/miller-webappserver/miller-webappserver-3.3.1.ebuild
+++ b/virtual/miller-webappserver/miller-webappserver-3.3.2.ebuild
diff --git a/virtual/random-server/Manifest b/virtual/random-server/Manifest
index 28a25ff..82cfe9e 100644
--- a/virtual/random-server/Manifest
+++ b/virtual/random-server/Manifest
@@ -1,2 +1 @@
-EBUILD random-server-0.1.10.2.ebuild 1288 BLAKE2B 5b2c5221f12c52658be39cde7ded683d3e69a1939c27a5dc0a46af6fd76dd083caa391c9960977f66234a78ae282ac2dbb36f8b93965d6421371180e36882f48 SHA512 e376be5a5edc7aaee4d53b1aceea90e08867b2b204f8dcc08017ab87cb929ee95ad0b330ca76640a9d34dff0afccabf601ee0a2c8f51f6ce473b2626442490a9
-EBUILD random-server-0.1.10.ebuild 1293 BLAKE2B c922865fe3057fa0fccf739d59202a8192160d56d639f87fea9018e1c4dc36b2b7bd595cfefab73ae42e729fcb04373d51db49da224810765a5d5640cced31c7 SHA512 5f269559bca670495e23dc441111f2db59615cd7ae950a9d7bdd4758fca54a51a4b3613274a75573b95054ec0ce83a949d4de83cccedfdede4b3e647cf805f01
+EBUILD random-server-0.1.10.3.ebuild 1452 BLAKE2B ed9216e2ace29050b8f5789ed6007d00ece10d3cd7c3e98c175d678e230416151a11755e802c9264cf52d914ec66cab898d36266b3409f587ff0279e424b51b0 SHA512 ba6927a987c11cf41c29ff23b9375c77eba1f355dd31d8a29767621e13f5052ed34c0e18053285ad52946fd98fda6f49c7c8244450bef86eb2ee6af028a122e6
diff --git a/virtual/random-server/random-server-0.1.10.2.ebuild b/virtual/random-server/random-server-0.1.10.3.ebuild
index 3cf2a7d..3db5971 100644
--- a/virtual/random-server/random-server-0.1.10.2.ebuild
+++ b/virtual/random-server/random-server-0.1.10.3.ebuild
@@ -13,7 +13,10 @@ RDEPEND="
 	=net-misc/unison-2.48*
 	=dev-lang/ocaml-4.09*
 	sys-devel/distcc
-	app-text/highlight
+	sys-devel/distcc
+	sys-devel/gcc:8.4.0[cxx]
+	sys-devel/gcc:10[cxx]
+	sys-devel/clang:11
 	net-dns/bind
 	net-firewall/iptables
 	net-fs/samba
@@ -39,10 +42,13 @@ RDEPEND="
 	net-misc/openntpd
 	net-analyzer/nagios
 	net-analyzer/nagios-plugin-check_raid
+	net-analyzer/nagios-plugin-check_lm_sensors
 	net-analyzer/nrpe
+	net-analyzer/check_crm
 	net-analyzer/check_drbd
 	net-analyzer/check_haproxy_stats
 	net-analyzer/check_ice
+	net-analyzer/check_service
 	ci? (
 			virtual/ci-server
 		)
diff --git a/virtual/random-server/random-server-0.1.10.ebuild b/virtual/random-server/random-server-0.1.10.ebuild
deleted file mode 100644
index a1bed09..0000000
--- a/virtual/random-server/random-server-0.1.10.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-EAPI=7
-
-DESCRIPTION="Virtual for Random servers"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="mediaserver dosfs ocfs2 ci"
-
-RDEPEND="
-	sys-apps/tuned
-	=net-misc/unison-2.48*
-	=dev-lang/ocaml-4.09*
-	sys-devel/distcc
-	app-text/highlight
-	net-dns/bind
-	net-firewall/iptables
-	net-fs/samba
-	net-misc/dhcp
-	net-proxy/haproxy
-	net-nds/smbldap-tools
-	net-nds/shelldap
-	virtual/miller-base
-	virtual/miller-mailserver
-	virtual/miller-postgresql
-	virtual/miller-mysql
-	virtual/miller-webappserver
-	virtual/miller-webserver
-	virtual/miller-proxy
-	sys-apps/logwatch
-	sys-apps/glacier2-service
-	net-misc/gentoobrowse-api
-	www-apps/mirrorsearch
-	dev-util/ccache
-	>=sys-cluster/heartbeat-3.0.6
-	net-analyzer/fail2ban
-	net-misc/openntpd
-	net-analyzer/nagios
-	net-analyzer/nagios-plugin-check_raid
-	net-analyzer/nrpe
-	net-analyzer/check_drbd
-	net-analyzer/check_haproxy_stats
-	net-analyzer/check_ice
-	ci? (
-			virtual/ci-server
-		)
-	dosfs? (
-			sys-fs/dosfstools
-	)
-	ocfs2? (
-			sys-cluster/drbd-utils
-			sys-apps/ocfs2-service
-			sys-fs/ocfs2-tools )
-	mediaserver? (
-			net-misc/minidlna
-			media-tv/mythtv
-			x11-misc/xkeyboard-config
-			media-tv/mythfs
-			media-tv/p2pvr
-			net-misc/youtube-dl
-			net-p2p/transmission )
-"