summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-metrics')
-rw-r--r--app-metrics/alertmanager/Manifest6
-rw-r--r--app-metrics/alertmanager/alertmanager-0.18.0.ebuild53
-rw-r--r--app-metrics/alertmanager/alertmanager-0.19.0.ebuild53
-rw-r--r--app-metrics/alertmanager/alertmanager-0.24.0.ebuild46
-rw-r--r--app-metrics/alertmanager/alertmanager-0.26.0.ebuild46
-rw-r--r--app-metrics/alertmanager/files/alertmanager.service28
-rw-r--r--app-metrics/alertmanager/metadata.xml6
-rw-r--r--app-metrics/bind_exporter/Manifest3
-rw-r--r--app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild (renamed from app-metrics/bind_exporter/bind_exporter-0.2.0_p20190226.ebuild)52
-rw-r--r--app-metrics/bind_exporter/files/bind_exporter.service11
-rw-r--r--app-metrics/bind_exporter/metadata.xml7
-rw-r--r--app-metrics/blackbox_exporter/Manifest7
-rw-r--r--app-metrics/blackbox_exporter/blackbox_exporter-0.12.0.ebuild54
-rw-r--r--app-metrics/blackbox_exporter/blackbox_exporter-0.13.0-r1.ebuild57
-rw-r--r--app-metrics/blackbox_exporter/blackbox_exporter-0.13.0.ebuild55
-rw-r--r--app-metrics/blackbox_exporter/blackbox_exporter-0.14.0.ebuild57
-rw-r--r--app-metrics/blackbox_exporter/blackbox_exporter-0.21.1.ebuild56
-rw-r--r--app-metrics/blackbox_exporter/blackbox_exporter-0.24.0.ebuild55
-rw-r--r--app-metrics/blackbox_exporter/files/blackbox_exporter.service29
-rw-r--r--app-metrics/blackbox_exporter/metadata.xml6
-rw-r--r--app-metrics/buildbot-prometheus/Manifest1
-rw-r--r--app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild35
-rw-r--r--app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch52
-rw-r--r--app-metrics/buildbot-prometheus/metadata.xml9
-rw-r--r--app-metrics/burrow_exporter/burrow_exporter-0.0.6-r2.ebuild (renamed from app-metrics/burrow_exporter/burrow_exporter-0.0.6-r1.ebuild)22
-rw-r--r--app-metrics/burrow_exporter/burrow_exporter-0.0.6.ebuild57
-rw-r--r--app-metrics/burrow_exporter/metadata.xml6
-rw-r--r--app-metrics/carbonapi-booking/Manifest1
-rw-r--r--app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild58
-rw-r--r--app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-colours.patch55
-rw-r--r--app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-logfile.patch14
-rw-r--r--app-metrics/carbonapi-booking/files/carbonapi-booking.confd8
-rw-r--r--app-metrics/carbonapi-booking/files/carbonapi-booking.initd44
-rw-r--r--app-metrics/carbonapi-booking/metadata.xml11
-rw-r--r--app-metrics/carbonapi-web/Manifest1
-rw-r--r--app-metrics/carbonapi-web/carbonapi-web-1.1.ebuild24
-rw-r--r--app-metrics/carbonapi-web/files/postinstall-en.txt12
-rw-r--r--app-metrics/carbonapi-web/metadata.xml11
-rw-r--r--app-metrics/ceph_exporter/Manifest2
-rw-r--r--app-metrics/ceph_exporter/ceph_exporter-4.1.1-r1.ebuild35
-rw-r--r--app-metrics/ceph_exporter/files/ceph_exporter.confd2
-rw-r--r--app-metrics/ceph_exporter/files/ceph_exporter.initd18
-rw-r--r--app-metrics/ceph_exporter/metadata.xml11
-rw-r--r--app-metrics/collectd/Manifest3
-rw-r--r--app-metrics/collectd/collectd-5.12.0-r10.ebuild (renamed from app-metrics/collectd/collectd-5.9.1-r2.ebuild)217
-rw-r--r--app-metrics/collectd/collectd-5.8.1-r1.ebuild536
-rw-r--r--app-metrics/collectd/files/collectd-5.11.0-libsigrok-0.4+.patch157
-rw-r--r--app-metrics/collectd/files/collectd-5.12.0-clang16-configure.patch127
-rw-r--r--app-metrics/collectd/files/collectd-5.12.0-nut-c99.patch143
-rw-r--r--app-metrics/collectd/files/collectd-5.12.0-python3_11.patch33
-rw-r--r--app-metrics/collectd/files/collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch70
-rw-r--r--app-metrics/collectd/files/collectd-5.9.1-fixup.patch81
-rw-r--r--app-metrics/collectd/files/collectd.confd-r22
-rw-r--r--app-metrics/collectd/files/collectd.initd-r3 (renamed from app-metrics/collectd/files/collectd.initd-r2)1
-rw-r--r--app-metrics/collectd/metadata.xml6
-rw-r--r--app-metrics/consul_exporter/Manifest2
-rw-r--r--app-metrics/consul_exporter/consul_exporter-0.4.0.ebuild52
-rw-r--r--app-metrics/consul_exporter/consul_exporter-0.7.1.ebuild44
-rw-r--r--app-metrics/consul_exporter/metadata.xml5
-rw-r--r--app-metrics/dnsmasq_exporter/Manifest2
-rw-r--r--app-metrics/dnsmasq_exporter/dnsmasq_exporter-0.2.0-r1.ebuild38
-rw-r--r--app-metrics/dnsmasq_exporter/files/dnsmasq_exporter.confd3
-rw-r--r--app-metrics/dnsmasq_exporter/files/dnsmasq_exporter.initd15
-rw-r--r--app-metrics/dnsmasq_exporter/metadata.xml11
-rw-r--r--app-metrics/elasticsearch_exporter/Manifest6
-rw-r--r--app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild47
-rw-r--r--app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.4_rc1.ebuild49
-rw-r--r--app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild49
-rw-r--r--app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0_rc1.ebuild49
-rw-r--r--app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.3.0.ebuild42
-rw-r--r--app-metrics/elasticsearch_exporter/metadata.xml6
-rw-r--r--app-metrics/exabgp_exporter/Manifest4
-rw-r--r--app-metrics/exabgp_exporter/exabgp_exporter-1.0.0_p20200718.ebuild36
-rw-r--r--app-metrics/exabgp_exporter/exabgp_exporter-1.1.3.ebuild33
-rw-r--r--app-metrics/exabgp_exporter/files/exabgp_exporter.confd2
-rw-r--r--app-metrics/exabgp_exporter/files/exabgp_exporter.initd21
-rw-r--r--app-metrics/exabgp_exporter/files/exabgp_exporter.service14
-rw-r--r--app-metrics/exabgp_exporter/files/exabgp_exporter_at.service14
-rw-r--r--app-metrics/exabgp_exporter/metadata.xml11
-rw-r--r--app-metrics/fritzbox_smarthome_exporter/Manifest2
-rw-r--r--app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.confd35
-rw-r--r--app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.initd58
-rw-r--r--app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.logrotate5
-rw-r--r--app-metrics/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.0.8.ebuild49
-rw-r--r--app-metrics/fritzbox_smarthome_exporter/metadata.xml9
-rw-r--r--app-metrics/fusioninventory-agent/Manifest1
-rw-r--r--app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch51
-rw-r--r--app-metrics/fusioninventory-agent/files/fusioninventory-agent.confd2
-rw-r--r--app-metrics/fusioninventory-agent/files/fusioninventory-agent.initd21
-rw-r--r--app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild57
-rw-r--r--app-metrics/fusioninventory-agent/metadata.xml8
-rw-r--r--app-metrics/github-exporter/Manifest15
-rw-r--r--app-metrics/github-exporter/github-exporter-04-r1.ebuild75
-rw-r--r--app-metrics/github-exporter/github-exporter-04.ebuild75
-rw-r--r--app-metrics/github-exporter/github-exporter-1.0.3.ebuild39
-rw-r--r--app-metrics/github-exporter/metadata.xml2
-rw-r--r--app-metrics/go-carbon/Manifest2
-rw-r--r--app-metrics/go-carbon/files/go-carbon.confd8
-rw-r--r--app-metrics/go-carbon/files/go-carbon.initd44
-rw-r--r--app-metrics/go-carbon/go-carbon-0.17.1.ebuild40
-rw-r--r--app-metrics/go-carbon/go-carbon-0.17.3.ebuild40
-rw-r--r--app-metrics/go-carbon/metadata.xml11
-rw-r--r--app-metrics/grok_exporter/Manifest10
-rw-r--r--app-metrics/grok_exporter/files/grok_exporter.initd8
-rw-r--r--app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild64
-rw-r--r--app-metrics/grok_exporter/grok_exporter-1.0.0_rc5.ebuild44
-rw-r--r--app-metrics/grok_exporter/metadata.xml5
-rw-r--r--app-metrics/memcached_exporter/Manifest3
-rw-r--r--app-metrics/memcached_exporter/memcached_exporter-0.10.0.ebuild44
-rw-r--r--app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild45
-rw-r--r--app-metrics/memcached_exporter/metadata.xml5
-rw-r--r--app-metrics/metadata.xml12
-rw-r--r--app-metrics/mongodb_exporter/Manifest4
-rw-r--r--app-metrics/mongodb_exporter/metadata.xml7
-rw-r--r--app-metrics/mongodb_exporter/mongodb_exporter-0.11.1.ebuild37
-rw-r--r--app-metrics/mongodb_exporter/mongodb_exporter-0.39.0.ebuild43
-rw-r--r--app-metrics/mongodb_exporter/mongodb_exporter-0.6.2.ebuild47
-rw-r--r--app-metrics/mysqld_exporter/Manifest9
-rw-r--r--app-metrics/mysqld_exporter/files/mysqld_exporter-0.12.1-skip-tests.patch22
-rw-r--r--app-metrics/mysqld_exporter/metadata.xml5
-rw-r--r--app-metrics/mysqld_exporter/mysqld_exporter-0.10.0-r1.ebuild61
-rw-r--r--app-metrics/mysqld_exporter/mysqld_exporter-0.12.1_p20200622.ebuild (renamed from app-metrics/mysqld_exporter/mysqld_exporter-0.11.0.ebuild)55
-rw-r--r--app-metrics/mysqld_exporter/mysqld_exporter-0.14.0.ebuild93
-rw-r--r--app-metrics/mysqld_exporter/mysqld_exporter-0.14.0_p20221209.ebuild93
-rw-r--r--app-metrics/mysqld_exporter/mysqld_exporter-0.14.0_p20230328.ebuild94
-rw-r--r--app-metrics/nftables-exporter/Manifest2
-rw-r--r--app-metrics/nftables-exporter/files/nftables-exporter.initd15
-rw-r--r--app-metrics/nftables-exporter/metadata.xml11
-rw-r--r--app-metrics/nftables-exporter/nftables-exporter-0.2.7.ebuild45
-rw-r--r--app-metrics/nginx-lua-prometheus/metadata.xml5
-rw-r--r--app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610-r100.ebuild (renamed from app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild)18
-rw-r--r--app-metrics/nginx-vts-exporter/Manifest2
-rw-r--r--app-metrics/nginx-vts-exporter/metadata.xml7
-rw-r--r--app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.7-r1.ebuild (renamed from app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.3.ebuild)39
-rw-r--r--app-metrics/node_exporter/Manifest7
-rw-r--r--app-metrics/node_exporter/files/01-default-settings-1.7.0.patch133
-rw-r--r--app-metrics/node_exporter/files/node_exporter-1.7.0.logrotate9
-rw-r--r--app-metrics/node_exporter/files/node_exporter-1.7.0.service21
-rw-r--r--app-metrics/node_exporter/files/node_exporter.initd-1 (renamed from app-metrics/node_exporter/files/node_exporter-1.initd)10
-rw-r--r--app-metrics/node_exporter/metadata.xml21
-rw-r--r--app-metrics/node_exporter/node_exporter-0.17.0-r1.ebuild52
-rw-r--r--app-metrics/node_exporter/node_exporter-0.18.0.ebuild52
-rw-r--r--app-metrics/node_exporter/node_exporter-0.18.1.ebuild52
-rw-r--r--app-metrics/node_exporter/node_exporter-1.7.0-r2.ebuild75
-rw-r--r--app-metrics/node_exporter/node_exporter-1.7.0.ebuild78
-rw-r--r--app-metrics/node_exporter/node_exporter-1.8.0.ebuild74
-rw-r--r--app-metrics/node_exporter/node_exporter-9999.ebuild74
-rw-r--r--app-metrics/openvpn_exporter/Manifest10
-rw-r--r--app-metrics/openvpn_exporter/metadata.xml7
-rw-r--r--app-metrics/openvpn_exporter/openvpn_exporter-0.2.1.ebuild54
-rw-r--r--app-metrics/openvpn_exporter/openvpn_exporter-0.3.0.ebuild37
-rw-r--r--app-metrics/portage-exporter/Manifest1
-rw-r--r--app-metrics/portage-exporter/files/portage-exporter.confd (renamed from app-metrics/mysqld_exporter/files/mysqld_exporter.confd)14
-rw-r--r--app-metrics/portage-exporter/files/portage-exporter.initd49
-rw-r--r--app-metrics/portage-exporter/files/portage-exporter.service18
-rw-r--r--app-metrics/portage-exporter/metadata.xml14
-rw-r--r--app-metrics/portage-exporter/portage-exporter-0.1.0.ebuild24
-rw-r--r--app-metrics/postfix_exporter/Manifest12
-rw-r--r--app-metrics/postfix_exporter/metadata.xml7
-rw-r--r--app-metrics/postfix_exporter/postfix_exporter-0.1.2.ebuild58
-rw-r--r--app-metrics/postfix_exporter/postfix_exporter-0.3.0.ebuild42
-rw-r--r--app-metrics/postgres_exporter/Manifest5
-rw-r--r--app-metrics/postgres_exporter/metadata.xml7
-rw-r--r--app-metrics/postgres_exporter/postgres_exporter-0.10.1.ebuild43
-rw-r--r--app-metrics/postgres_exporter/postgres_exporter-0.15.0.ebuild49
-rw-r--r--app-metrics/postgres_exporter/postgres_exporter-0.4.7.ebuild40
-rw-r--r--app-metrics/process-exporter/Manifest3
-rw-r--r--app-metrics/process-exporter/metadata.xml5
-rw-r--r--app-metrics/process-exporter/process-exporter-0.4.0.ebuild32
-rw-r--r--app-metrics/process-exporter/process-exporter-0.7.10.ebuild (renamed from app-metrics/process-exporter/process-exporter-0.4.0-r1.ebuild)21
-rw-r--r--app-metrics/prom2json/Manifest2
-rw-r--r--app-metrics/prom2json/metadata.xml7
-rw-r--r--app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild38
-rw-r--r--app-metrics/prom2json/prom2json-1.3.0.ebuild39
-rw-r--r--app-metrics/prometheus-lvm-exporter/Manifest4
-rw-r--r--app-metrics/prometheus-lvm-exporter/files/prometheus-lvm-exporter.confd26
-rw-r--r--app-metrics/prometheus-lvm-exporter/files/prometheus-lvm-exporter.initd49
-rw-r--r--app-metrics/prometheus-lvm-exporter/metadata.xml10
-rw-r--r--app-metrics/prometheus-lvm-exporter/prometheus-lvm-exporter-0.3.2.ebuild64
-rw-r--r--app-metrics/prometheus-lvm-exporter/prometheus-lvm-exporter-0.3.3.ebuild49
-rw-r--r--app-metrics/prometheus-podman-exporter/Manifest4
-rw-r--r--app-metrics/prometheus-podman-exporter/metadata.xml24
-rw-r--r--app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild86
-rw-r--r--app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild86
-rw-r--r--app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.7.0.ebuild45
-rw-r--r--app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.8.0.ebuild42
-rw-r--r--app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild86
-rw-r--r--app-metrics/prometheus/Manifest12
-rw-r--r--app-metrics/prometheus/files/prometheus-3.initd28
-rw-r--r--app-metrics/prometheus/files/prometheus.confd28
-rw-r--r--app-metrics/prometheus/files/prometheus.initd11
-rw-r--r--app-metrics/prometheus/files/prometheus.service22
-rw-r--r--app-metrics/prometheus/metadata.xml6
-rw-r--r--app-metrics/prometheus/prometheus-2.11.2.ebuild68
-rw-r--r--app-metrics/prometheus/prometheus-2.12.0.ebuild68
-rw-r--r--app-metrics/prometheus/prometheus-2.40.4.ebuild72
-rw-r--r--app-metrics/prometheus/prometheus-2.43.0-r2.ebuild72
-rw-r--r--app-metrics/prometheus/prometheus-2.47.0.ebuild72
-rw-r--r--app-metrics/prometheus/prometheus-2.9.2.ebuild68
-rw-r--r--app-metrics/pushgateway/Manifest5
-rw-r--r--app-metrics/pushgateway/metadata.xml6
-rw-r--r--app-metrics/pushgateway/pushgateway-0.7.0.ebuild52
-rw-r--r--app-metrics/pushgateway/pushgateway-0.8.0.ebuild52
-rw-r--r--app-metrics/pushgateway/pushgateway-0.9.0.ebuild52
-rw-r--r--app-metrics/pushgateway/pushgateway-1.5.1.ebuild48
-rw-r--r--app-metrics/rabbitmq_exporter/metadata.xml5
-rw-r--r--app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0-r1.ebuild (renamed from app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0.ebuild)22
-rw-r--r--app-metrics/redis_exporter/Manifest6
-rw-r--r--app-metrics/redis_exporter/metadata.xml2
-rw-r--r--app-metrics/redis_exporter/redis_exporter-1.40.0.ebuild55
-rw-r--r--app-metrics/redis_exporter/redis_exporter-1.43.0.ebuild55
-rw-r--r--app-metrics/redis_exporter/redis_exporter-1.44.0.ebuild (renamed from app-metrics/redis_exporter/redis_exporter-0.20.2.ebuild)48
-rw-r--r--app-metrics/smartctl_exporter/Manifest3
-rw-r--r--app-metrics/smartctl_exporter/files/smartctl_exporter.confd2
-rw-r--r--app-metrics/smartctl_exporter/files/smartctl_exporter.initd23
-rw-r--r--app-metrics/smartctl_exporter/files/smartctl_exporter.service22
-rw-r--r--app-metrics/smartctl_exporter/metadata.xml10
-rw-r--r--app-metrics/smartctl_exporter/smartctl_exporter-0.12.0-r1.ebuild65
-rw-r--r--app-metrics/snmp_exporter/Manifest5
-rw-r--r--app-metrics/snmp_exporter/metadata.xml6
-rw-r--r--app-metrics/snmp_exporter/snmp_exporter-0.13.0.ebuild53
-rw-r--r--app-metrics/snmp_exporter/snmp_exporter-0.14.0-r2.ebuild55
-rw-r--r--app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild55
-rw-r--r--app-metrics/snmp_exporter/snmp_exporter-0.24.1.ebuild52
-rw-r--r--app-metrics/unbound-telemetry/Manifest191
-rw-r--r--app-metrics/unbound-telemetry/files/confd7
-rw-r--r--app-metrics/unbound-telemetry/files/initd17
-rw-r--r--app-metrics/unbound-telemetry/metadata.xml8
-rw-r--r--app-metrics/unbound-telemetry/unbound-telemetry-0.1.0_pre20210321-r1.ebuild154
-rw-r--r--app-metrics/unbound-telemetry/unbound-telemetry-0.1.0_pre20210920.ebuild159
-rw-r--r--app-metrics/uwsgi_exporter/Manifest4
-rw-r--r--app-metrics/uwsgi_exporter/metadata.xml2
-rw-r--r--app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild (renamed from app-metrics/uwsgi_exporter/uwsgi_exporter-0.7.0.ebuild)36
-rw-r--r--app-metrics/uwsgi_exporter/uwsgi_exporter-1.1.0.ebuild52
-rw-r--r--app-metrics/vault_exporter/metadata.xml9
-rw-r--r--app-metrics/vault_exporter/vault_exporter-0.1.2-r1.ebuild43
-rw-r--r--app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild40
237 files changed, 5433 insertions, 3156 deletions
diff --git a/app-metrics/alertmanager/Manifest b/app-metrics/alertmanager/Manifest
index 0f339d55ede0..142195778feb 100644
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@@ -1,2 +1,4 @@
-DIST alertmanager-0.18.0.tar.gz 5181819 BLAKE2B efcc856ccacb97646915e8d622179cf3cc7554351036cf556347ec46cdede5c9223139cb209b52376964c7b19b119f3683f82698d1e7c07b1432bb3e4bb37239 SHA512 59faec308abaac3d2b59198fef25109b208de1a807b38803dc10722ff0caf1bac9d9795005fefb3b4e2acda62be136bfcafe7b9702ae52565021a424f99fa730
-DIST alertmanager-0.19.0.tar.gz 5862442 BLAKE2B a79336286ca1099dcc73cce897eccaff8d40f8d3140ebf1943a1189cf1d2ec58738cbe7fc02221826ffc0e1535954a11a461ac6ea222113c79a44d43cc9eda83 SHA512 2c21bfbb1001e07e81b1115439ad15e7c0e7089839e56a19c445177e322b8ef9aa2b85e96478f3c3d709cbbd3a5447662a8c55da370b84aa4b6b24f83848744b
+DIST alertmanager-0.24.0-deps.tar.xz 194175652 BLAKE2B 01095b5a4f6edee4c30f97f2ed3f949149885118532d421da8ac87fdee58cc65278ad9cebd07defb67006ff4acc1043505017e8fcbdf1d989d054584aeb21c14 SHA512 8170c3f27691b5a59f2e9a1d7f4cfb323cd0137eb4a604f224012e9a0065dca956e2d9ee9e138cc5061b561bcdc2d8329dbbb0beafa18274eaed81cbdd73fe97
+DIST alertmanager-0.24.0.tar.gz 2135257 BLAKE2B 5726595a14da5e228cd5704dc2aa3518a86d1e07ff6ce886ddcf3b8621d3112d10899c6fa6df3004b2a46017d07f28587ac815e8f9ef03aff3e8bfcee793e96f SHA512 97147f15c8879eacc2744a11a1db0edd04f532650b3e8f397e8ab6f7f4868203f212d1c33f596aa52876e190db84247a60b39b25a72fbceabcc5b3efae0eb920
+DIST alertmanager-0.26.0-deps.tar.xz 93946412 BLAKE2B 65d0b53bdd011c12f5a78daa046e8d8e27a43f66027eaa764e6a758208ffad8c1cac890fc2a5fe8b972186d313f8f7fd1028ea0528d2e1719e0bdafaf5467dc7 SHA512 f85567c2d2c698dcf58a0669e5b501fecddc8eb4d2248d9ddc0dd3a947c0bcdeef230592f3700ee0c181823338bae2463dc064c8843f414609ba2952155b33f7
+DIST alertmanager-0.26.0.tar.gz 2176877 BLAKE2B bb22c57c39dcb00f08f4e24d09f07fce3f59e1ce31cde8b439bb44fd7c6349ab3ebf5371db9bec97574836ed941ba57f5c69d6f5857062a365fda01618d1c594 SHA512 b5568f0cebe487b5c81b56febad30bbe84918ed0e3e8be2ecd7820d13d7c5373b17e00238a9817072c59040a5618307811280ac00ef6efa3e3439f9f3378f464
diff --git a/app-metrics/alertmanager/alertmanager-0.18.0.ebuild b/app-metrics/alertmanager/alertmanager-0.18.0.ebuild
deleted file mode 100644
index 1cbc8d1add42..000000000000
--- a/app-metrics/alertmanager/alertmanager-0.18.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/alertmanager"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="1ace0f7"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
-HOMEPAGE="https://github.com/prometheus/alertmanager"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
- dev-util/promu"
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/*
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- insinto /etc/alertmanager/
- newins doc/examples/simple.yml config.yml.example
- popd || die
- keepdir /var/lib/alertmanager /var/log/alertmanager
- fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/alertmanager/alertmanager-0.19.0.ebuild b/app-metrics/alertmanager/alertmanager-0.19.0.ebuild
deleted file mode 100644
index ec6dbaf138c1..000000000000
--- a/app-metrics/alertmanager/alertmanager-0.19.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/alertmanager"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="7aa5d19"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
-HOMEPAGE="https://github.com/prometheus/alertmanager"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
- dev-util/promu"
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/*
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- insinto /etc/alertmanager/
- newins doc/examples/simple.yml config.yml.example
- popd || die
- keepdir /var/lib/alertmanager /var/log/alertmanager
- fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/alertmanager/alertmanager-0.24.0.ebuild b/app-metrics/alertmanager/alertmanager-0.24.0.ebuild
new file mode 100644
index 000000000000..3a3cce2d4491
--- /dev/null
+++ b/app-metrics/alertmanager/alertmanager-0.24.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_COMMIT=f484b17f
+MY_PV="${PV/_rc/-rc.}"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="https://github.com/prometheus/alertmanager/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+
+RESTRICT+=" test"
+
+BDEPEND="dev-util/promu"
+
+DEPEND="
+ acct-group/alertmanager
+ acct-user/alertmanager"
+ RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+ promu build -v --prefix bin || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc {README,CHANGELOG}.md
+ insinto /etc/alertmanager/
+ newins doc/examples/simple.yml config.yml
+ keepdir /var/lib/alertmanager /var/log/alertmanager
+ systemd_dounit "${FILESDIR}"/alertmanager.service
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ fowners ${PN}:${PN} /etc/alertmanager /var/lib/alertmanager /var/log/alertmanager
+}
diff --git a/app-metrics/alertmanager/alertmanager-0.26.0.ebuild b/app-metrics/alertmanager/alertmanager-0.26.0.ebuild
new file mode 100644
index 000000000000..ffa0915f63e3
--- /dev/null
+++ b/app-metrics/alertmanager/alertmanager-0.26.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_COMMIT=d7b4f0c7
+MY_PV="${PV/_rc/-rc.}"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="https://github.com/prometheus/alertmanager/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RESTRICT+=" test"
+
+BDEPEND="dev-util/promu"
+
+DEPEND="
+ acct-group/alertmanager
+ acct-user/alertmanager"
+ RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+ promu build -v --prefix bin || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc {README,CHANGELOG}.md
+ insinto /etc/alertmanager/
+ newins doc/examples/simple.yml config.yml
+ keepdir /var/lib/alertmanager /var/log/alertmanager
+ systemd_dounit "${FILESDIR}"/alertmanager.service
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ fowners ${PN}:${PN} /etc/alertmanager /var/lib/alertmanager /var/log/alertmanager
+}
diff --git a/app-metrics/alertmanager/files/alertmanager.service b/app-metrics/alertmanager/files/alertmanager.service
new file mode 100644
index 000000000000..b97976dd8dc8
--- /dev/null
+++ b/app-metrics/alertmanager/files/alertmanager.service
@@ -0,0 +1,28 @@
+[Unit]
+Description=Alertmanager for prometheus
+Documentation=https://prometheus.io/docs/alerting/alertmanager/
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=alertmanager
+ExecStart=/usr/bin/alertmanager --cluster.listen-address= --config.file=/etc/alertmanager/config.yml --storage.path=/var/lib/alertmanager/
+ExecReload=/bin/kill -HUP $MAINPID
+
+NoNewPrivileges=true
+ProtectHome=true
+ProtectSystem=full
+ProtectHostname=true
+ProtectControlGroups=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+LockPersonality=true
+PrivateTmp=true
+PrivateDevices=True
+RestrictRealtime=true
+CapabilityBoundingSet=
+SystemCallArchitectures=native
+MemoryDenyWriteExecute=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/alertmanager/metadata.xml b/app-metrics/alertmanager/metadata.xml
index 714320b4f365..aa878071e487 100644
--- a/app-metrics/alertmanager/metadata.xml
+++ b/app-metrics/alertmanager/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
</maintainer>
<upstream>
<remote-id type="github">prometheus/alertmanager</remote-id>
diff --git a/app-metrics/bind_exporter/Manifest b/app-metrics/bind_exporter/Manifest
index 89407b193389..262a8c84766b 100644
--- a/app-metrics/bind_exporter/Manifest
+++ b/app-metrics/bind_exporter/Manifest
@@ -1 +1,2 @@
-DIST bind_exporter-0.2.0_p20190226.tar.gz 874497 BLAKE2B ce04a168be6844d43ed2c358aa6469d5dbae1730825e4c3c038805f4bbf071bfae2936a6a5341832939e3ed249e5d484f2ca0908ac0e717cd2b5ced496c44a49 SHA512 95a8ae6f7c6470345d5a5f7e4e36eae282e5ca74393dd4372342f44732b54a6cc977ae037d6d16ae4ce6a9ac526b2e01721f5468a6469c30ae60ca59dfec8d5a
+DIST bind_exporter-0.6.1-vendor.tar.xz 1300068 BLAKE2B 058f4f61ff9c403a5672390dd3944dec9a6b4b1dcf8ac7bcb6943494d43c116236e23f4b0437d5b2e91cb0d936377ba896740594d90b50ce99a61963713ab70c SHA512 9fd880655ac9657d49c0d250b22e46c53a63c0a2d4097763ca8856da36f75527d515a4e4cde7dd68c2c5cbf4ea784c07d9bd5e38a01eeb2d308a585c31d5c19b
+DIST bind_exporter-0.6.1.tar.gz 48904 BLAKE2B ad2def162e0fac5e857328bb142bc20655d0d1ea4a9d90a3bd8d305a3d86f9247671ca92f90d5ccdcb1a8bd147ed56858a9782feeac019b87666b4b18b7219c1 SHA512 d710b7228587e12a101a1d626ec5e0290b0740074f3976eee02463165030b361d3b6df556ab949d632488582ef6d4a3197270afc197d6d756a99c16e55c5448c
diff --git a/app-metrics/bind_exporter/bind_exporter-0.2.0_p20190226.ebuild b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
index 06b1f355e34f..5d586670b4e6 100644
--- a/app-metrics/bind_exporter/bind_exporter-0.2.0_p20190226.ebuild
+++ b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild
@@ -1,49 +1,49 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/digitalocean/bind_exporter"
-EXPORTER_COMMIT="9289b40af62a455ebd587ed4701dd543f4cc5877"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EXPORTER_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=c34ff3d6b4817f42e74b2b05b3797cf99683b4a9
DESCRIPTION="Prometheus exporter for BIND"
-HOMEPAGE="https://github.com/digitalocean/bind_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
+HOMEPAGE="https://github.com/prometheus-community/bind_exporter"
+SRC_URI="
+ https://github.com/prometheus-community/bind_exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~robbat2/distfiles/bind_exporter-${PV}-vendor.tar.xz
+ "
-DEPEND="dev-util/promu"
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
+COMMON_DEPEND="acct-group/bind_exporter
+ acct-user/bind_exporter"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-util/promu"
src_prepare() {
default
- sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+ sed -i -e "/-s$/d" -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
}
src_compile() {
- pushd src/${EGO_PN} || die
mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
+ promu build -v --prefix bin || die
+}
+
+src_test() {
+ emake test-flags= test
}
src_install() {
- pushd src/${EGO_PN} || die
dobin bin/${PN}
dodoc {README,CHANGELOG}.md
- popd || die
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
newinitd "${FILESDIR}"/${PN}.initd ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
}
pkg_postinst() {
diff --git a/app-metrics/bind_exporter/files/bind_exporter.service b/app-metrics/bind_exporter/files/bind_exporter.service
new file mode 100644
index 000000000000..ad2a237a061a
--- /dev/null
+++ b/app-metrics/bind_exporter/files/bind_exporter.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Bind Exporter
+Documentation="https://github.com/prometheus-community/bind_exporter"
+
+[Service]
+User=bind_exporter
+EnvironmentFile=/etc/sysconfig/bind_exporter
+ExecStart=/usr/sbin/bind_exporter $OPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/bind_exporter/metadata.xml b/app-metrics/bind_exporter/metadata.xml
index 4974e7b5d62e..fc19058dde74 100644
--- a/app-metrics/bind_exporter/metadata.xml
+++ b/app-metrics/bind_exporter/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
<upstream>
<remote-id type="github">digitalocean/bind_exporter</remote-id>
</upstream>
diff --git a/app-metrics/blackbox_exporter/Manifest b/app-metrics/blackbox_exporter/Manifest
index cfe09a6e3c5e..151c9bbbec2b 100644
--- a/app-metrics/blackbox_exporter/Manifest
+++ b/app-metrics/blackbox_exporter/Manifest
@@ -1,3 +1,4 @@
-DIST blackbox_exporter-0.12.0.tar.gz 2202465 BLAKE2B e3b082f8a491b531b0caf3331ecd391bf8734df0915ccbb7988ac1e67e57436bd45169aa403d5511fbb44eb176f89836ad8c04c491f5194f90f9f8a3b686a656 SHA512 2c98c0f4127bdd04ac54eb182c5468fd38121558f85aa8b4bec860f783f266b144df3153da0b028fdb84a4131a4e374a969bb09ce3a781ddf95f0a008c11bbb6
-DIST blackbox_exporter-0.13.0.tar.gz 668255 BLAKE2B 08c772175fa911ced04576c43b03b8594a1e6d30767742cea6630561045dd0440e1cd26847f2e7e506fb4fefc603a9a3e1b4228e46735f8d559a55462c0d11e4 SHA512 49290860e5e1713cc0e1edd93fd193d6e23aebe55a6f62778da89450f5ba79787d4ac3fd6ca3aae37f4941c16976db4570f2d4888534f2ce2c86e25e250b12f1
-DIST blackbox_exporter-0.14.0.tar.gz 670297 BLAKE2B e55186723b7877296a62840c842acb87c95f4e060b059c6a5861a6eb6a8bb8ad14c6082f466427ddf048c49fca8df79668c64b77b1dcf64b1239ed5b62c829e3 SHA512 58f379cdeef671376105532450ffb3a6fef0ea071d493fbef40d761c6cbaec47bb49c9c2e5c070f3d0e598396d7ad9b2c5af100c9a69aee04877442c7bdaf120
+DIST blackbox_exporter-0.21.1-deps.tar.xz 55088548 BLAKE2B a078e62ea071df29de3d8b7cd7fc957cd0eccdf076b3257c29513b0d15deaae383fc22273731b6a382c09ce6c51f2666bcd1430bf3f5e4b017189a32889048e1 SHA512 92f46ee0382c85399fe8d4d43b38e77ea81971000dc1b4bcff2d9fbe2b55a5936b712e2345690a5005b68daddde0419c20f2ff5def4058f6eb7a2d7972e8c0af
+DIST blackbox_exporter-0.21.1.tar.gz 79415 BLAKE2B 3587b01c33c47f370d55120cf4fac5ceeabdb2e89ea14ca588def902c67b237e78bca755ea5eac102d6f081c60a7bd5e1e6e5de9c2e2df9cb78c2f6856c5ee17 SHA512 a4d5187db9c99279d01d22c42c6569be836def2a033bf60c8f0a3131d329d8ac934b5ee30d2e9f185c4743c88ca287803165f7910378eb2d1ff27ae7671ab690
+DIST blackbox_exporter-0.24.0-deps.tar.xz 44271112 BLAKE2B acda81de9f45e7558c554566cef767c25ba59788ff31859bca16bb6bb8e64a8e7405969482ce96d64ee7df425264a253b6ca5364b91795b77a785d7d304a1964 SHA512 21e2c709ee44d4aedf796fd9a8d2eccd884978ccd770e1776653e7c5cc16a885f3f985b59705f4862d71520b9e78bce7d7fdb876531c27ccf8d9cf13da14febd
+DIST blackbox_exporter-0.24.0.tar.gz 69061 BLAKE2B a82137bfe8b911468ec05360f69a612e3bf2bb4094ce0d44b7499345484159beac06fc0d7f657ff4982b839d2d90759c04590eea1f3192a1e84d3dfb9a3ccfa8 SHA512 0c2c19d5a44465838d17c46318804416d32ed229c9d882d064559c2fec41d82029d0f5b7e5c8e6fb6e3473c41b53ae2a4a6c6e65ffacac3afe4263a48c698c29
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.12.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.12.0.ebuild
deleted file mode 100644
index 24aa268f15a2..000000000000
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fcaps user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/blackbox_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="4a22506"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
-HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-FILECAPS=(
- cap_net_raw usr/bin/blackbox_exporter
-)
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${BLACKBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin blackbox_exporter/blackbox_exporter
- dodoc {README,CONFIGURATION}.md blackbox.yml
- insinto /etc/blackbox_exporter
- newins example.yml blackbox.yml.example
- popd || die
- keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
- fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0-r1.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0-r1.ebuild
deleted file mode 100644
index b2b61cadacfa..000000000000
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fcaps user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/blackbox_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="1cfb751"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
-HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
- dev-util/promu"
-
-FILECAPS=(
- cap_net_raw usr/bin/blackbox_exporter
-)
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${BLACKBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin blackbox_exporter/blackbox_exporter
- dodoc {README,CONFIGURATION}.md blackbox.yml
- insinto /etc/blackbox_exporter
- newins example.yml blackbox.yml.example
- popd || die
- keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
- fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-}
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0.ebuild
deleted file mode 100644
index 52be350e039e..000000000000
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.13.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fcaps user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/blackbox_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="1cfb751"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
-HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
- dev-util/promu"
-
-FILECAPS=(
- cap_net_raw usr/bin/blackbox_exporter
-)
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${BLACKBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin blackbox_exporter/blackbox_exporter
- dodoc {README,CONFIGURATION}.md blackbox.yml
- insinto /etc/blackbox_exporter
- newins example.yml blackbox.yml.example
- popd || die
- keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
- fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.14.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.14.0.ebuild
deleted file mode 100644
index b6b5824f40fc..000000000000
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.14.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fcaps user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/blackbox_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="bba7ef7"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
-HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
- dev-util/promu"
-
-FILECAPS=(
- cap_net_raw usr/bin/blackbox_exporter
-)
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${BLACKBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin blackbox_exporter/blackbox_exporter
- dodoc {README,CONFIGURATION}.md blackbox.yml
- insinto /etc/blackbox_exporter
- newins example.yml blackbox.yml.example
- popd || die
- keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
- fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-}
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.21.1.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.21.1.ebuild
new file mode 100644
index 000000000000..dca6860bceb1
--- /dev/null
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.21.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit fcaps go-module systemd
+GIT_COMMIT=e0d5e44
+MY_PV="v${PV/_rc/-rc.}"
+
+DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
+HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
+SRC_URI="https://github.com/prometheus/blackbox_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+COMMON_DEPEND="
+ acct-group/blackbox_exporter
+ acct-user/blackbox_exporter"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-util/promu"
+
+FILECAPS=(
+ cap_net_raw usr/bin/blackbox_exporter
+)
+
+# tests require the network
+RESTRICT+=" test "
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/{{.Branch}}/Head/" \
+ -e "s/{{.Revision}}/${GIT_COMMIT}/" \
+ -e "s/{{.Version}}/${PV}/" .promu.yml || die
+}
+
+src_compile() {
+ promu build -v --prefix bin || die
+}
+
+src_install() {
+ newbin bin/${P} ${PN}
+ dodoc {README,CHANGELOG,CONFIGURATION}.md blackbox.yml
+ insinto /etc/blackbox_exporter
+ newins example.yml blackbox.yml
+ keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
+ systemd_dounit "${FILESDIR}"/blackbox_exporter.service
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
+}
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.24.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.24.0.ebuild
new file mode 100644
index 000000000000..5ade1463090d
--- /dev/null
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.24.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit fcaps go-module systemd
+GIT_COMMIT=0dd0455
+MY_PV="v${PV/_rc/-rc.}"
+
+DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
+HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
+SRC_URI="https://github.com/prometheus/blackbox_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/dist/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/blackbox_exporter
+ acct-user/blackbox_exporter"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-util/promu"
+
+FILECAPS=(
+ cap_net_raw usr/bin/blackbox_exporter
+)
+
+# tests require the network
+RESTRICT+=" test "
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/{{.Branch}}/Head/" \
+ -e "s/{{.Revision}}/${GIT_COMMIT}/" \
+ -e "s/{{.Version}}/${PV}/" .promu.yml || die
+}
+
+src_compile() {
+ promu build -v --prefix bin || die
+}
+
+src_install() {
+ newbin bin/${P} ${PN}
+ dodoc {README,CHANGELOG,CONFIGURATION}.md blackbox.yml
+ insinto /etc/blackbox_exporter
+ newins example.yml blackbox.yml
+ keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
+ systemd_dounit "${FILESDIR}"/blackbox_exporter.service
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
+}
diff --git a/app-metrics/blackbox_exporter/files/blackbox_exporter.service b/app-metrics/blackbox_exporter/files/blackbox_exporter.service
new file mode 100644
index 000000000000..a29ee2b7c24a
--- /dev/null
+++ b/app-metrics/blackbox_exporter/files/blackbox_exporter.service
@@ -0,0 +1,29 @@
+[Unit]
+Description=Prometheus blackbox Exporter
+After=network.target
+
+[Service]
+User=blackbox_exporter
+Group=blackbox_exporter
+ExecStart=/usr/bin/blackbox_exporter --config.file="/etc/blackbox_exporter/blackbox.yml"
+ExecReload=/bin/kill -HUP $MAINPID
+DynamicUser=true
+
+NoNewPrivileges=true
+ProtectSystem=full
+ProtectKernelModules=true
+ProtectKernelTunables=true
+PrivateTmp=true
+LockPersonality=true
+ProtectHostname=true
+ProtectHome=true
+ProtectControlGroups=true
+ProtectKernelLogs=true
+PrivateDevices=true
+RestrictRealtime=true
+CapabilityBoundingSet=
+MemoryDenyWriteExecute=true
+CapabilityBoundingSet=CAP_NET_RAW
+AmbientCapabilities=CAP_NET_RAW
+
+[Install]
diff --git a/app-metrics/blackbox_exporter/metadata.xml b/app-metrics/blackbox_exporter/metadata.xml
index 5d0a20fee17b..6faf5561724a 100644
--- a/app-metrics/blackbox_exporter/metadata.xml
+++ b/app-metrics/blackbox_exporter/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
</maintainer>
<upstream>
<remote-id type="github">prometheus/blackbox_exporter</remote-id>
diff --git a/app-metrics/buildbot-prometheus/Manifest b/app-metrics/buildbot-prometheus/Manifest
deleted file mode 100644
index 0cc6923df045..000000000000
--- a/app-metrics/buildbot-prometheus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b
diff --git a/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild b/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
deleted file mode 100644
index 67323d1dbeff..000000000000
--- a/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="A Prometheus metrics exporter for Buildbot"
-HOMEPAGE="https://github.com/claws/buildbot-prometheus"
-SRC_URI="https://github.com/claws/buildbot-prometheus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
- >=dev-util/buildbot-0.9.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch"
-)
-
-python_prepare_all() {
- sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = .*/requires = ['buildbot', 'prometheus_client']/" setup.py || die
- distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
- einfo "This version has been patched to be compatible with the current buildbot releases >=0.9.0"
- einfo "For older buildbot-0.8* releases, please use dev-python/buildbot-prometheus-17.7.2-r1 version"
-}
diff --git a/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch b/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
deleted file mode 100644
index 7fbdbdd09133..000000000000
--- a/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ceddea3f55773e104c628ef6316ce74785d235f3 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <brian.dolbec@sony.com>
-Date: Tue, 6 Mar 2018 02:30:56 +0000
-Subject: [PATCH] Migrate duration calculations to >=buildbot-0.9
-
----
- buildbot_prometheus/prometheus.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/buildbot_prometheus/prometheus.py b/buildbot_prometheus/prometheus.py
-index a766f41..ebf41a1 100644
---- a/buildbot_prometheus/prometheus.py
-+++ b/buildbot_prometheus/prometheus.py
-@@ -302,7 +302,7 @@ class Prometheus(service.BuildbotService):
- build_started = msg['started_at']
- build_finished = msg['complete_at']
- build_duration = build_finished - build_started
-- duration_seconds = build_duration.total_seconds()
-+ duration_seconds = build_duration
- self.g_builds_duration.labels(**labels).set(duration_seconds)
-
- build_status = resolve_results_status(msg['results'])
-@@ -401,7 +401,7 @@ class Prometheus(service.BuildbotService):
- buildset_started = msg['submitted_at']
- buildset_finished = msg['complete_at']
- buildset_duration = buildset_finished - buildset_started
-- duration_seconds = buildset_duration.total_seconds()
-+ duration_seconds = buildset_duration
- self.g_buildsets_duration.labels(**labels).set(duration_seconds)
-
- bs_success = resolve_results_status(msg['results'])
-@@ -444,7 +444,7 @@ class Prometheus(service.BuildbotService):
- br_started = msg['submitted_at']
- br_finished = msg['complete_at']
- br_duration = br_finished - br_started
-- duration_seconds = br_duration.total_seconds()
-+ duration_seconds = br_duration
- self.g_build_requests_duration.labels(**labels).set(duration_seconds)
-
- br_success = resolve_results_status(msg['results'])
-@@ -491,7 +491,7 @@ class Prometheus(service.BuildbotService):
- step_started = msg['started_at']
- step_finished = msg['complete_at']
- step_duration = step_finished - step_started
-- duration_seconds = step_duration.total_seconds()
-+ duration_seconds = step_duration
- self.g_steps_duration.labels(**labels).set(duration_seconds)
-
- step_success = resolve_results_status(msg['results'])
---
-libgit2 0.24.6
-
diff --git a/app-metrics/buildbot-prometheus/metadata.xml b/app-metrics/buildbot-prometheus/metadata.xml
deleted file mode 100644
index 7499dcce7171..000000000000
--- a/app-metrics/buildbot-prometheus/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="pypi">buildbot-prometheus</remote-id>
- <remote-id type="github">claws/buildbot-prometheus</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-metrics/burrow_exporter/burrow_exporter-0.0.6-r1.ebuild b/app-metrics/burrow_exporter/burrow_exporter-0.0.6-r2.ebuild
index b6a97d6ef8fd..6c7b44867388 100644
--- a/app-metrics/burrow_exporter/burrow_exporter-0.0.6-r1.ebuild
+++ b/app-metrics/burrow_exporter/burrow_exporter-0.0.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
EGO_VENDOR=(
"github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
@@ -14,7 +14,7 @@ EGO_VENDOR=(
"github.com/Sirupsen/logrus ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
"github.com/urfave/cli ab403a54a148f2d857920810291539e1f817ee7b"
)
-inherit user golang-build golang-vcs-snapshot
+inherit golang-build golang-vcs-snapshot
EGO_PN="github.com/jirwin/burrow_exporter"
EXPORTER_COMMIT="01f0ef9"
@@ -25,14 +25,16 @@ DESCRIPTION="Prometheus exporter for Burrow"
HOMEPAGE="https://github.com/jirwin/burrow_exporter"
SRC_URI="${ARCHIVE_URI}
${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
IUSE=""
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
+COMMON_DEPEND="
+ acct-group/burrow_exporter
+ acct-user/burrow_exporter
+ "
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
src_prepare() {
pushd src/${EGO_PN} || die
@@ -53,10 +55,10 @@ src_install() {
dobin bin/burrow_exporter
dodoc README.md
popd || die
- keepdir /var/log/burrow_exporter
- fowners ${PN}:${PN} /var/log/burrow_exporter
newinitd "${FILESDIR}"/${PN}.initd ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotated" ${PN}
+ keepdir /var/log/burrow_exporter
+ fowners ${PN}:${PN} /var/log/burrow_exporter
}
diff --git a/app-metrics/burrow_exporter/burrow_exporter-0.0.6.ebuild b/app-metrics/burrow_exporter/burrow_exporter-0.0.6.ebuild
deleted file mode 100644
index 8abb648aee95..000000000000
--- a/app-metrics/burrow_exporter/burrow_exporter-0.0.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
- "github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
- "github.com/golang/protobuf 2bba0603135d7d7f5cb73b2125beeda19c09f4ef"
- "github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
- "github.com/prometheus/client_golang 42552c195dd3f3089fbf9cf26e139da150af35aa"
- "github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
- "github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
- "github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
- "github.com/Sirupsen/logrus ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
- "github.com/urfave/cli ab403a54a148f2d857920810291539e1f817ee7b"
-)
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/jirwin/burrow_exporter"
-EXPORTER_COMMIT="01f0ef9"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for Burrow"
-HOMEPAGE="https://github.com/jirwin/burrow_exporter"
-SRC_URI="${ARCHIVE_URI}
- ${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/0.0.4/${PV}/" src/${EGO_PN}/burrow-exporter.go || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GOPATH="${S}" go build -v -o bin/burrow_exporter || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/burrow_exporter
- dodoc README.md
- popd || die
- keepdir /var/log/burrow_exporter
- fowners ${PN}:${PN} /var/log/burrow_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/burrow_exporter/metadata.xml b/app-metrics/burrow_exporter/metadata.xml
index 9d38e68ffc15..422407b4d5bb 100644
--- a/app-metrics/burrow_exporter/metadata.xml
+++ b/app-metrics/burrow_exporter/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
</maintainer>
<upstream>
<remote-id type="github">jirwin/burrow_exporter</remote-id>
diff --git a/app-metrics/carbonapi-booking/Manifest b/app-metrics/carbonapi-booking/Manifest
new file mode 100644
index 000000000000..b7df71a38195
--- /dev/null
+++ b/app-metrics/carbonapi-booking/Manifest
@@ -0,0 +1 @@
+DIST carbonapi-booking-0.3.0.tar.gz 1395080 BLAKE2B e5ebe20a4833f17919f0a14e091b06b5270d7dd8880fa87600454ac33b7df7600d1428f0b2e06c65a1a36796e2eb026e8c47b98444dce168cec0e965ebee9d69 SHA512 327af89fd86661ccca9d7250e70b66f03089841b20e3c51128bcbb835a91d553d952928d991424f9bbe1fea235cd9e6242784d8cbd828725ba5b2cfb64328487
diff --git a/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..166f4baa33fa
--- /dev/null
+++ b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+MY_PN=${PN%-booking}
+DESCRIPTION="High-performance Graphite front-end, Booking.com fork"
+HOMEPAGE="https://github.com/bookingcom/carbonapi"
+SRC_URI="https://github.com/bookingcom/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ app-arch/bzip2
+ dev-libs/expat
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/libpng
+ x11-libs/cairo
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/pixman
+"
+RDEPEND="${DEPEND}
+ acct-group/carbon
+ acct-user/carbon"
+BDEPEND=""
+
+src_prepare() {
+ export VERSION="gentoo-${PVR}"
+
+ # bug 904051: disable data-race detection, conflicts with
+ # go-module's -buildmode=pie
+ sed -i -e 's/ -race / /' Makefile || die
+
+ eapply "${FILESDIR}"/${P}-logfile.patch
+ eapply "${FILESDIR}"/${P}-colours.patch
+
+ eapply_user
+}
+
+src_install() {
+ insinto /etc/carbonapi
+ doins -r "${S}"/config/*
+ dobin carbonapi carbonzipper
+
+ newinitd "${FILESDIR}"/${PN}.initd carbonapi
+ newconfd "${FILESDIR}"/${PN}.confd carbonapi
+}
diff --git a/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-colours.patch b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-colours.patch
new file mode 100644
index 000000000000..6fbbeeb181cb
--- /dev/null
+++ b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-colours.patch
@@ -0,0 +1,55 @@
+use colouring defaults from graphite-web-1.10
+
+--- carbonapi-0.3.0/expr/functions/cairo/png/picture_params.go
++++ carbonapi-0.3.0/expr/functions/cairo/png/picture_params.go
+@@ -351,10 +351,10 @@
+ Height: 250,
+ Margin: 10,
+ LogBase: 0,
+- FgColor: "white",
+- BgColor: "black",
+- MajorLine: "rose",
+- MinorLine: "grey",
++ FgColor: "black",
++ BgColor: "white",
++ MajorLine: "grey",
++ MinorLine: "rose",
+ FontName: "Sans",
+ FontSize: 10,
+ FontBold: FontWeightNormal,
+@@ -414,8 +414,8 @@
+ LeftDashed: false,
+ LeftColor: "",
+
+- MajorGridLineColor: "white",
+- MinorGridLineColor: "grey",
++ MajorGridLineColor: "grey",
++ MinorGridLineColor: "rose",
+ }
+
+ var templates = map[string]PictureParams{
+@@ -424,10 +424,10 @@
+ Height: 250,
+ Margin: 10,
+ LogBase: 0,
+- FgColor: "white",
+- BgColor: "black",
+- MajorLine: "rose",
+- MinorLine: "grey",
++ FgColor: "black",
++ BgColor: "white",
++ MajorLine: "grey",
++ MinorLine: "rose",
+ FontName: "Sans",
+ FontSize: 10,
+ FontBold: FontWeightNormal,
+@@ -487,7 +487,7 @@
+ LeftDashed: false,
+ LeftColor: "",
+
+- MajorGridLineColor: "white",
+- MinorGridLineColor: "grey",
++ MajorGridLineColor: "grey",
++ MinorGridLineColor: "rose",
+ },
+ }
diff --git a/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-logfile.patch b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-logfile.patch
new file mode 100644
index 000000000000..5e1015cf67dd
--- /dev/null
+++ b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-logfile.patch
@@ -0,0 +1,14 @@
+- don't log to stdout
+- change log to be under subdir so ebuild can manage its permissions
+
+--- carbonapi-0.3.0/config/carbonapi.yaml
++++ carbonapi-0.3.0/config/carbonapi.yaml
+@@ -130,7 +130,7 @@
+ - X-Real-Ip
+ - X-Webauth-User
+ loggerConfig:
+- outputPaths: ["stdout", "/var/log/carbonapi.log"]
++ outputPaths: ["/var/log/carbonapi/carbonapi.log"]
+ level: "info"
+ encoding: "json"
+
diff --git a/app-metrics/carbonapi-booking/files/carbonapi-booking.confd b/app-metrics/carbonapi-booking/files/carbonapi-booking.confd
new file mode 100644
index 000000000000..2f9ca1ba6bd5
--- /dev/null
+++ b/app-metrics/carbonapi-booking/files/carbonapi-booking.confd
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+#CONFIG_FILE=/etc/carbonapi/carbonapi.yaml
+
+# user and group to run carbonapi as
+#USER=carbon
+#GROUP=carbon
diff --git a/app-metrics/carbonapi-booking/files/carbonapi-booking.initd b/app-metrics/carbonapi-booking/files/carbonapi-booking.initd
new file mode 100644
index 000000000000..c4fbee5331a0
--- /dev/null
+++ b/app-metrics/carbonapi-booking/files/carbonapi-booking.initd
@@ -0,0 +1,44 @@
+#!/sbin/openrc-run
+# Copyright 1999-2023 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Graphite whisper metrics renderer."
+
+carbonapi_config=${CONFIG_FILE:-/etc/carbonapi/${SVCNAME}.yaml}
+
+command="/usr/bin/carbonapi"
+command_args="-config ${carbonapi_config}"
+pidfile="/run/carbonapi/${SVCNAME}.pid"
+user=${USER:-carbon}
+group=${GROUP:-carbon}
+
+depend() {
+ need net
+ use dns
+}
+
+start_pre() {
+ mkdir -p "${pidfile%/*}"
+ mkdir -p /var/log/carbonapi
+ chown ${user}:${group} "${pidfile%/*}" /var/log/carbonapi
+}
+
+stop_post() {
+ rm -f "${pidfile}"
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --pidfile "${pidfile}" \
+ --make-pidfile --background \
+ --user ${user} --group ${group} \
+ --exec ${command} -- \
+ ${command_args}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --exec ${command} --pidfile "${pidfile}"
+ eend $?
+}
diff --git a/app-metrics/carbonapi-booking/metadata.xml b/app-metrics/carbonapi-booking/metadata.xml
new file mode 100644
index 000000000000..054109ad0a1e
--- /dev/null
+++ b/app-metrics/carbonapi-booking/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>grobian@gentoo.org</email>
+ <name>Fabian Groffen</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">bookingcom/carbonapi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/carbonapi-web/Manifest b/app-metrics/carbonapi-web/Manifest
new file mode 100644
index 000000000000..9e84439323d9
--- /dev/null
+++ b/app-metrics/carbonapi-web/Manifest
@@ -0,0 +1 @@
+DIST carbonapi-web-1.1.tar.gz 1027235 BLAKE2B be56d94b680282618c74b3b332cbd85de2e7430831c1de3242b99e061f6232f404c15045b3e4990e51b20f3193564a9fa9c324774ee46abeecad084b4dc9fc79 SHA512 b60ba3d23d84051f9b5e6445117a425f36a5740e3758555c08dfe0c6b1bebb06ad665e057c570a55f6d3ab9073930026b614740cde4fe57b15b06f56f33cc042
diff --git a/app-metrics/carbonapi-web/carbonapi-web-1.1.ebuild b/app-metrics/carbonapi-web/carbonapi-web-1.1.ebuild
new file mode 100644
index 000000000000..5b854a847cc2
--- /dev/null
+++ b/app-metrics/carbonapi-web/carbonapi-web-1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="graphite-web fork for standalone usage with carbonapi"
+HOMEPAGE="https://github.com/grobian/carbonapi-web"
+SRC_URI="https://github.com/grobian/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+
+src_install() {
+ webapp_src_preinst
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r webapp/content/*
+
+ webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+ webapp_src_install
+}
diff --git a/app-metrics/carbonapi-web/files/postinstall-en.txt b/app-metrics/carbonapi-web/files/postinstall-en.txt
new file mode 100644
index 000000000000..26cd2dc8abb0
--- /dev/null
+++ b/app-metrics/carbonapi-web/files/postinstall-en.txt
@@ -0,0 +1,12 @@
+1. install and setup a Graphite resolving and rendering instance such as
+ app-metrics/carbonapi-booking
+2. setup a vhost that:
+ - uses default index file browser.html
+ - proxies these paths down to the Graphite rendering instance:
+ * /render/
+ * /metrics/
+ * /info/
+ * /functions/
+ * /tags/
+3. the combined setup should load the web browser and interact with your
+ Graphite install
diff --git a/app-metrics/carbonapi-web/metadata.xml b/app-metrics/carbonapi-web/metadata.xml
new file mode 100644
index 000000000000..d431e6b2a193
--- /dev/null
+++ b/app-metrics/carbonapi-web/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>grobian@gentoo.org</email>
+ <name>Fabian Groffen</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">grobian/carbonapi-web</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/ceph_exporter/Manifest b/app-metrics/ceph_exporter/Manifest
new file mode 100644
index 000000000000..4585422c0a4e
--- /dev/null
+++ b/app-metrics/ceph_exporter/Manifest
@@ -0,0 +1,2 @@
+DIST ceph_exporter-4.1.1-deps.tar.xz 7386488 BLAKE2B d5ccacba93ae8ee0f03f349860e02e19bb52a5bd6af7ec1b2c6209d29834a74a6934f19a9435f5be1539e6f141ec41e1219b62660aff90a529513b91a3d0649e SHA512 a6f9a8053d3a8957bd03535089c3bb3c818f153f69c2488db08d0fc9a63f7d30ff3b490b0f0fd81399153a19c853239a9744564881c159bc88f5cf91807e10b0
+DIST ceph_exporter-4.1.1.tar.gz 146022 BLAKE2B d833b59418148efb1008d7d444f27a9310d1214197abfb022f74c8fd7af15eceb04c26bab8307eca80bbb4c60b54e7469da74562e38e06cbf7c3559f01d2e0d2 SHA512 1f840d02b50c6cd55c1fb78d44a9fb0beafd241168d3c1d4ad2a9ede67a4fd67b48311de8af0b637a07b04a562938afb72a3379a3c40d765f73923024a8ddd62
diff --git a/app-metrics/ceph_exporter/ceph_exporter-4.1.1-r1.ebuild b/app-metrics/ceph_exporter/ceph_exporter-4.1.1-r1.ebuild
new file mode 100644
index 000000000000..c81f82f998d2
--- /dev/null
+++ b/app-metrics/ceph_exporter/ceph_exporter-4.1.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Prometheus exporter that scrapes metrics from a ceph cluster"
+HOMEPAGE="https://github.com/digitalocean/ceph_exporter"
+SRC_URI="https://github.com/digitalocean/ceph_exporter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ acct-group/ceph
+ acct-user/ceph
+ sys-cluster/ceph
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-lang/go-1.18"
+
+src_compile() {
+ go build -o bin/ceph_exporter || die
+}
+
+src_install() {
+ dobin bin/ceph_exporter
+ dodoc {README,CONTRIBUTING}.md exporter.yml
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ keepdir /var/lib/ceph_exporter /var/log/ceph_exporter
+ fowners ceph:ceph /var/lib/ceph_exporter /var/log/ceph_exporter
+}
diff --git a/app-metrics/ceph_exporter/files/ceph_exporter.confd b/app-metrics/ceph_exporter/files/ceph_exporter.confd
new file mode 100644
index 000000000000..46da635f4264
--- /dev/null
+++ b/app-metrics/ceph_exporter/files/ceph_exporter.confd
@@ -0,0 +1,2 @@
+# arguments for ceph exporter
+# command_args=""
diff --git a/app-metrics/ceph_exporter/files/ceph_exporter.initd b/app-metrics/ceph_exporter/files/ceph_exporter.initd
new file mode 100644
index 000000000000..980779c5f935
--- /dev/null
+++ b/app-metrics/ceph_exporter/files/ceph_exporter.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus ceph metrics exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-ceph}
+group=${group:-ceph}
+
+command="/usr/bin/ceph_exporter"
+command_background="true"
+output_log="/var/log/ceph_exporter/${RC_SVCNAME}.log"
+error_log="/var/log/ceph_exporter/${RC_SVCNAME}.log"
+start_stop_daemon_args="--user ${user} --group ${group}"
+
+depend() {
+ after net
+}
diff --git a/app-metrics/ceph_exporter/metadata.xml b/app-metrics/ceph_exporter/metadata.xml
new file mode 100644
index 000000000000..e8f6eed41f10
--- /dev/null
+++ b/app-metrics/ceph_exporter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">digitalocean/ceph_exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index cefe6b9b74f6..c3666c8289f9 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -1,2 +1 @@
-DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B 739f961172978db33bdf95c8f93bde0036a26b2ed2abd3396a734d4b97c4ae117bb26a62fcdbb3d77bd63d9f64a38f83d0c8a0665e8fa7bf5ed2efc6838b0e8e SHA512 8c75448c6e59ee1ea5c1cf486c07040d20fb36d5b7a1be2ab45facea330166e8c1d1fa38e3fa82ec905428d7b2c92c66aae35ee8e3546f67ce76f7f410739901
-DIST collectd-5.9.1.tar.gz 1501178 BLAKE2B ed0984637161427f3b354002850b7ea8c49a4aca64b637b864e5513c8057f52a4a479477b21e2a4cff436728c16d66c6d561df14308adcaeb7d597c290f543ce SHA512 424ef12a3ba6997a71e6eda1a62d73fec588c9c4d90542c2381c1f9f4e118b2c02e18c71507e8984e20fb255b69b7f42afe83085b3df5e225c576d1eee1655fb
+DIST collectd-5.12.0.tar.bz2 1902756 BLAKE2B 9567c55b47c0ea5b7836c0d858c16a637c4a2054486a9d9ca6cd9951a92381bdf4f49d7dc0be0c9c9131802120d0af2e542a3997f01484c89ba135b3c46db795 SHA512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70
diff --git a/app-metrics/collectd/collectd-5.9.1-r2.ebuild b/app-metrics/collectd/collectd-5.12.0-r10.ebuild
index 6a6e866259d1..301e390ecd45 100644
--- a/app-metrics/collectd/collectd-5.9.1-r2.ebuild
+++ b/app-metrics/collectd/collectd-5.12.0-r10.ebuild
@@ -1,68 +1,76 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
JAVA_PKG_OPT_USE="collectd_plugins_java"
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
+inherit autotools fcaps java-pkg-opt-2 linux-info lua-single perl-functions python-single-r1 systemd tmpfiles udev
DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
HOMEPAGE="https://collectd.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PN}-${PV}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
+KEYWORDS="~alpha amd64 arm ~arm64 x86"
+IUSE="contrib debug java perl selinux static-libs udev xfs"
# The plugin lists have to follow here since they extend IUSE
# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# amqp1: Requires libqpid-proton
-# aquaero: Requires aerotools-ng/libaquaero5
-# barometer: Requires libi2c (i2c_smbus_read_i2c_block_data)
-# dpdkevents: Requires dpdk
-# dpdkstat: Requires dpdk
-# grpc: Requires libgrpc
-# intel_pmu: Requires libjevents (pmu-tools)
-# intel_rdt: Requires libpqos from intel-cmt-cat project
-# lpar: Requires libperfstat (AIX only)
-# mic: Requires Intel Many Integrated Core Architecture API
-# (part of Intel's Xeon Phi software)
-# netapp: Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
-# pf: Requires BSD packet filter
-# pinba: Requires MySQL Pinba engine (http://pinba.org/)
-# tape: Requires libkstat (Solaris only)
-# write_riemann: Requires riemann-c-client
-# xmms: Requires libxmms (v1)
-# zone: Solaris only...
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors amqp1 aquaero barometer dpdkstat
- grpc intel_pmu intel_rdt lpar mic netapp pf pinba tape write_riemann
+# apple_sensors: Requires libIOKit
+# amqp1: Requires libqpid-proton
+# aquaero: Requires aerotools-ng/libaquaero5
+# barometer: Requires libi2c (i2c_smbus_read_i2c_block_data)
+# dpdkevents: Requires dpdk
+# dpdkstat: Requires dpdk
+# dpdk_telemetry: Requires dpdk
+# grpc: Requires libgrpc
+# intel_pmu: Requires libjevents (pmu-tools)
+# intel_rdt: Requires libpqos from intel-cmt-cat project
+# lpar: Requires libperfstat (AIX only)
+# mic: Requires Intel Many Integrated Core Architecture API
+# (part of Intel's Xeon Phi software)
+# netapp: Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
+# onewire: Requires sys-fs/owfs which was removed from repository
+# pf: Requires BSD packet filter
+# pinba: Requires MySQL Pinba engine (http://pinba.org/)
+# redfish: Requires libredfish
+# tape: Requires libkstat (Solaris only)
+# tokyotyrant: Requires tokyotyrant
+# write_riemann: Requires riemann-c-client
+# xmms: Requires libxmms (v1)
+# zone: Solaris only...
+COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors amqp1 aquaero barometer
+ dpdkevents dpdkstat dpdk_telemetry grpc intel_pmu intel_rdt lpar
+ mic netapp onewire pf pinba redfish tape tokyotyrant write_riemann
xmms zone"
# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
- ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
- csv curl curl_json curl_xml dbi df disk dns drbd email
- entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
- hugepages interface ipc ipmi iptables ipvs irq java lua
- load logfile log_logstash lvm madwifi match_empty_counter
- match_hashed match_regex match_timediff match_value mbmon mcelog md
- memcachec memcached memory modbus mqtt multimeter mysql netlink
- network network nfs nginx notify_desktop notify_email notify_nagios
- ntpd numa nut olsrd onewire openldap openvpn oracle ovs_events
- ovs_stats perl ping postgresql powerdns processes protocols python
- python redis routeros rrdcached rrdtool sensors serial sigrok smart
- snmp snmp_agent statsd swap syslog table tail tail_csv
+ buddyinfo capabilities ceph cgroups check_uptime chrony connectivity
+ conntrack contextswitch cpu cpufreq cpusleep csv curl curl_json
+ curl_xml dbi df disk dns drbd email entropy ethstat exec fhcount
+ filecount fscache gps gpu_nvidia hddtemp hugepages interface ipc
+ ipmi iptables ipvs irq java lua load logfile logparser log_logstash
+ madwifi match_empty_counter match_hashed match_regex match_timediff
+ match_value mbmon mcelog md memcachec memcached memory modbus mqtt
+ multimeter mysql netlink network network nfs nginx notify_desktop
+ notify_email notify_nagios ntpd numa nut olsrd onewire openldap
+ openvpn oracle ovs_events ovs_stats pcie_errors perl ping postgresql
+ powerdns procevent processes protocols python redis routeros
+ rrdcached rrdtool sensors serial sigrok smart snmp snmp_agent
+ statsd swap synproxy sysevent syslog table tail tail_csv
target_notification target_replace target_scale target_set tcpconns
- teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
- uptime users uuid varnish virt vmem vserver wireless write_graphite
- write_http write_kafka write_log write_mongodb write_prometheus
- write_redis write_sensu write_tsdb xencpu zfs_arc zookeeper"
+ teamspeak2 ted thermal threshold turbostat ubi unixsock uptime users
+ uuid varnish virt vmem vserver wireless write_graphite write_http
+ write_influxdb_udp write_kafka write_log write_mongodb write_prometheus
+ write_redis write_sensu write_stackdriver write_syslog write_tsdb
+ xencpu zfs_arc zookeeper"
COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
@@ -76,9 +84,12 @@ unset plugin
# Now come the dependencies.
COMMON_DEPEND="
+ acct-group/collectd
+ acct-user/collectd
dev-libs/libgcrypt:=
dev-libs/libltdl:0=
- perl? ( dev-lang/perl:=[ithreads] )
+ sys-libs/libcap
+ perl? ( || ( >=dev-lang/perl-5.38.2-r3[perl_features_ithreads] <dev-lang/perl-5.38.2-r3[ithreads] ) dev-lang/perl:= )
udev? ( virtual/udev )
xfs? ( sys-fs/xfsprogs )
collectd_plugins_amqp? ( net-libs/rabbitmq-c )
@@ -86,18 +97,19 @@ COMMON_DEPEND="
collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= )
collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= )
collectd_plugins_ceph? ( dev-libs/yajl:= )
+ collectd_plugins_capabilities? ( dev-libs/jansson net-libs/libmicrohttpd:= )
+ collectd_plugins_connectivity? ( dev-libs/yajl:= net-libs/libmnl )
collectd_plugins_curl? ( net-misc/curl:0= )
collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= )
collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= )
collectd_plugins_dbi? ( dev-db/libdbi )
collectd_plugins_dns? ( net-libs/libpcap )
- collectd_plugins_gmond? ( sys-cluster/ganglia )
collectd_plugins_gps? ( sci-geosciences/gpsd:= )
+ collectd_plugins_gpu_nvidia? ( dev-util/nvidia-cuda-toolkit )
collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 )
collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= )
collectd_plugins_log_logstash? ( dev-libs/yajl:= )
- collectd_plugins_lua? ( dev-lang/lua:0= )
- collectd_plugins_lvm? ( sys-fs/lvm2 )
+ collectd_plugins_lua? ( ${LUA_DEPS} )
collectd_plugins_memcachec? ( dev-libs/libmemcached )
collectd_plugins_modbus? ( dev-libs/libmodbus )
collectd_plugins_mqtt? ( app-misc/mosquitto )
@@ -105,27 +117,27 @@ COMMON_DEPEND="
collectd_plugins_netlink? ( net-libs/libmnl )
collectd_plugins_nginx? ( net-misc/curl:0= )
collectd_plugins_notify_desktop? ( x11-libs/libnotify )
- collectd_plugins_notify_email? ( net-libs/libesmtp )
+ collectd_plugins_notify_email? ( net-libs/libesmtp:= )
collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 )
- collectd_plugins_openldap? ( net-nds/openldap )
- collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= )
- collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic )
+ collectd_plugins_openldap? ( net-nds/openldap:= )
+ collectd_plugins_oracle? ( dev-db/oracle-instantclient[sdk] )
collectd_plugins_ovs_events? ( dev-libs/yajl:= )
collectd_plugins_ovs_stats? ( dev-libs/yajl:= )
- collectd_plugins_perl? ( dev-lang/perl:=[ithreads] )
+ collectd_plugins_perl? ( || ( >=dev-lang/perl-5.38.2-r3[perl_features_ithreads] <dev-lang/perl-5.38.2-r3[ithreads] ) dev-lang/perl:= )
collectd_plugins_ping? ( net-libs/liboping )
collectd_plugins_postgresql? ( dev-db/postgresql:= )
+ collectd_plugins_procevent? ( dev-libs/yajl:= )
collectd_plugins_python? ( ${PYTHON_DEPS} )
collectd_plugins_redis? ( dev-libs/hiredis:= )
collectd_plugins_routeros? ( net-libs/librouteros )
collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= )
collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= )
collectd_plugins_sensors? ( sys-apps/lm-sensors:= )
- collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
- collectd_plugins_smart? ( dev-libs/libatasmart )
- collectd_plugins_snmp? ( net-analyzer/net-snmp )
- collectd_plugins_snmp_agent? ( net-analyzer/net-snmp )
- collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant )
+ collectd_plugins_sigrok? ( >=sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
+ collectd_plugins_smart? ( dev-libs/libatasmart:0= )
+ collectd_plugins_snmp? ( net-analyzer/net-snmp:= )
+ collectd_plugins_snmp_agent? ( net-analyzer/net-snmp:= )
+ collectd_plugins_sysevent? ( dev-libs/yajl:= )
collectd_plugins_varnish? ( www-servers/varnish:= )
collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= )
collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= )
@@ -133,36 +145,35 @@ COMMON_DEPEND="
collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= )
collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= )
collectd_plugins_write_redis? ( dev-libs/hiredis:= )
+ collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= )
collectd_plugins_xencpu? ( app-emulation/xen-tools:= )
+"
- kernel_FreeBSD? (
- collectd_plugins_disk? ( sys-libs/libstatgrab:= )
- collectd_plugins_interface? ( sys-libs/libstatgrab:= )
- collectd_plugins_load? ( sys-libs/libstatgrab:= )
- collectd_plugins_memory? ( sys-libs/libstatgrab:= )
- collectd_plugins_swap? ( sys-libs/libstatgrab:= )
- collectd_plugins_users? ( sys-libs/libstatgrab:= )
- )"
+# FIXME: should virtual/jdk be here as well?
+BDEPEND="virtual/pkgconfig"
# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
DEPEND="${COMMON_DEPEND}
collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
- collectd_plugins_java? ( >=virtual/jdk-1.6 )
- virtual/pkgconfig"
+ collectd_plugins_java? ( >=virtual/jdk-1.8 )"
RDEPEND="${COMMON_DEPEND}
- collectd_plugins_java? ( >=virtual/jre-1.6 )
+ collectd_plugins_java? ( >=virtual/jre-1.8 )
collectd_plugins_syslog? ( virtual/logger )
- selinux? ( sec-policy/selinux-collectd )
- !<sys-apps/openrc-0.18.2"
+ selinux? ( sec-policy/selinux-collectd )"
REQUIRED_USE="
+ collectd_plugins_lua? ( ${LUA_REQUIRED_USE} )
collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )
- collectd_plugins_smart? ( udev )"
+ collectd_plugins_smart? ( udev )
+ contrib? ( perl )"
-PATCHES=( "${FILESDIR}"/${P}-fixup.patch )
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.11.0-libsigrok-0.4+.patch
+ "${FILESDIR}"/${PN}-5.12.0-python3_11.patch
+ "${FILESDIR}"/${PN}-5.12.0-clang16-configure.patch
+ "${FILESDIR}"/${PN}-5.12.0-nut-c99.patch
+)
# @FUNCTION: collectd_plugin_kernel_linux
# @DESCRIPTION:
@@ -277,10 +288,8 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
fi
+ use collectd_plugins_lua && lua-single_pkg_setup
use collectd_plugins_python && python-single-r1_pkg_setup
-
- enewgroup collectd
- enewuser collectd -1 -1 /var/lib/collectd collectd
}
src_prepare() {
@@ -322,9 +331,6 @@ src_configure() {
if use kernel_linux; then
einfo "Enabling Linux plugins."
myos_plugins=${linux_plugins}
- elif use kernel_FreeBSD; then
- einfo "Enabling FreeBSD plugins."
- myos_plugins=${bsd_plugins}
elif use kernel_Darwin; then
einfo "Enabling Darwin plugins."
myos_plugins=${darwin_plugins}
@@ -361,11 +367,6 @@ src_configure() {
if has ${plugin} ${myos_plugins}; then
# ... and available in this os
myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
- # ... must we link against libstatgrab? Bug #541518
- if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
- einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
- need_libstatgrab=1
- fi
else
# ... and NOT available in this os
if use collectd_plugins_${plugin}; then
@@ -405,6 +406,12 @@ src_configure() {
use collectd_plugins_smart || myconf+=" --with-libatasmart=no"
use collectd_plugins_gps || myconf+=" --with-libgps=no"
+ if use collectd_plugins_gpu_nvidia; then
+ myconf+=" --with-cuda=${EPREFIX}/opt/cuda"
+ else
+ myconf+=" --with-cuda=no"
+ fi
+
if use perl; then
myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
else
@@ -432,30 +439,34 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D%/}" install
+ emake DESTDIR="${D}" install
perl_delete_localpod
- find "${ED}"usr/ -name "*.la" -delete || die
+ find "${ED}"/usr/ -name "*.la" -delete || die
if use collectd_plugins_java; then
- java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
+ java-pkg_regjar "${ED}"/usr/share/${PN}/java/*.jar
+ fi
+
+ if use collectd_plugins_disk && use udev; then
+ udev_newrules contrib/99-storage-collectd.rules 60-persistent-storage-collectd.rules
fi
fowners root:collectd /etc/collectd.conf
fperms u=rw,g=r,o= /etc/collectd.conf
- dodoc AUTHORS ChangeLog README
+ einstalldocs
- if use contrib ; then
- insinto /usr/share/doc/${PF}
+ if use contrib; then
+ insinto /usr/share/${PN}
doins -r contrib
fi
keepdir /var/lib/${PN}
fowners collectd:collectd /var/lib/${PN}
- newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
@@ -464,10 +475,18 @@ src_install() {
newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
- sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":#PIDFile "/run/collectd.pid":' "${ED}"etc/collectd.conf || die
- sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
- sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n# Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
- sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n# Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+ sed \
+ -e 's:^.*PIDFile "/var/run/collectd.pid":#PIDFile "/run/collectd.pid":' \
+ -i "${ED}"/etc/collectd.conf || die
+ sed \
+ -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/run/collectd/collectd.socket":' \
+ -i "${ED}"/etc/collectd.conf || die
+ sed \
+ -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n# Globals true\n# </LoadPlugin>:' \
+ -i "${ED}"/etc/collectd.conf || die
+ sed \
+ -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n# Globals true\n# </LoadPlugin>:' \
+ -i "${ED}"/etc/collectd.conf || die
}
pkg_postinst() {
@@ -491,7 +510,7 @@ pkg_postinst() {
if [ ${#caps[@]} -gt 0 ]; then
local caps_str=$(IFS=","; echo "${caps[*]}")
fcaps ${caps_str} usr/sbin/collectd
- elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
+ elog "Capabilities for ${EROOT}/usr/sbin/collectd set to:"
elog " ${caps_str}+EP"
elog
@@ -538,6 +557,6 @@ pkg_postinst() {
if use contrib; then
elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
- elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
+ elog "dev-perl/CGI, dev-perl/Config-General and net-analyzer/rrdtool[perl] to be installed."
fi
}
diff --git a/app-metrics/collectd/collectd-5.8.1-r1.ebuild b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
deleted file mode 100644
index 5ab2828b9777..000000000000
--- a/app-metrics/collectd/collectd-5.8.1-r1.ebuild
+++ /dev/null
@@ -1,536 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-JAVA_PKG_OPT_USE="collectd_plugins_java"
-
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
-
-HOMEPAGE="https://collectd.org/"
-SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
-
-LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# aquaero: Requires aerotools-ng/libaquaero5
-# barometer: Requires libi2c (i2c_smbus_read_i2c_block_data)
-# dpdkevents: Requires dpdk
-# dpdkstat: Requires dpdk
-# grpc: Requires libgrpc
-# intel_pmu: Requires libjevents (pmu-tools)
-# intel_rdt: Requires libpqos from intel-cmt-cat project
-# lpar: Requires libperfstat (AIX only)
-# mic: Requires Intel Many Integrated Core Architecture API
-# (part of Intel's Xeon Phi software)
-# netapp: Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
-# pf: Requires BSD packet filter
-# pinba: Requires MySQL Pinba engine (http://pinba.org/)
-# tape: Requires libkstat (Solaris only)
-# write_riemann: Requires riemann-c-client
-# xmms: Requires libxmms (v1)
-# zone: Solaris only...
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer dpdkstat grpc
- intel_pmu intel_rdt lpar mic netapp pf pinba tape write_riemann
- xmms zone"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
- ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
- csv curl curl_json curl_xml dbi df disk dns drbd email
- entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
- hugepages interface ipc ipmi iptables ipvs irq java lua
- load logfile log_logstash lvm madwifi match_empty_counter
- match_hashed match_regex match_timediff match_value mbmon mcelog md
- memcachec memcached memory modbus mqtt multimeter mysql netlink
- network network nfs nginx notify_desktop notify_email notify_nagios
- ntpd numa nut olsrd onewire openldap openvpn oracle ovs_events
- ovs_stats perl ping postgresql powerdns processes protocols python
- python redis routeros rrdcached rrdtool sensors serial sigrok smart
- snmp snmp_agent statsd swap syslog table tail tail_csv
- target_notification target_replace target_scale target_set tcpconns
- teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
- uptime users uuid varnish virt vmem vserver wireless write_graphite
- write_http write_kafka write_log write_mongodb write_prometheus
- write_redis write_sensu write_tsdb xencpu zfs_arc zookeeper"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
-
-COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
-
-for plugin in ${COLLECTD_ALL_PLUGINS}; do
- IUSE="${IUSE} collectd_plugins_${plugin}"
-done
-unset plugin
-
-# Now come the dependencies.
-
-COMMON_DEPEND="
- dev-libs/libgcrypt:=
- dev-libs/libltdl:0=
- perl? ( dev-lang/perl:=[ithreads] )
- udev? ( virtual/udev )
- xfs? ( sys-fs/xfsprogs )
- collectd_plugins_amqp? ( net-libs/rabbitmq-c )
- collectd_plugins_apache? ( net-misc/curl:0= )
- collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= )
- collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= )
- collectd_plugins_ceph? ( dev-libs/yajl:= )
- collectd_plugins_curl? ( net-misc/curl:0= )
- collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= )
- collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= )
- collectd_plugins_dbi? ( dev-db/libdbi )
- collectd_plugins_dns? ( net-libs/libpcap )
- collectd_plugins_gmond? ( sys-cluster/ganglia )
- collectd_plugins_gps? ( sci-geosciences/gpsd:= )
- collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 )
- collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= )
- collectd_plugins_log_logstash? ( dev-libs/yajl:= )
- collectd_plugins_lua? ( dev-lang/lua:0= )
- collectd_plugins_lvm? ( sys-fs/lvm2 )
- collectd_plugins_memcachec? ( dev-libs/libmemcached )
- collectd_plugins_modbus? ( dev-libs/libmodbus )
- collectd_plugins_mqtt? ( app-misc/mosquitto )
- collectd_plugins_mysql? ( dev-db/mysql-connector-c:= )
- collectd_plugins_netlink? ( net-libs/libmnl )
- collectd_plugins_nginx? ( net-misc/curl:0= )
- collectd_plugins_notify_desktop? ( x11-libs/libnotify )
- collectd_plugins_notify_email? ( net-libs/libesmtp )
- collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 )
- collectd_plugins_openldap? ( net-nds/openldap )
- collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= )
- collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic )
- collectd_plugins_ovs_events? ( dev-libs/yajl:= )
- collectd_plugins_ovs_stats? ( dev-libs/yajl:= )
- collectd_plugins_perl? ( dev-lang/perl:=[ithreads] )
- collectd_plugins_ping? ( net-libs/liboping )
- collectd_plugins_postgresql? ( dev-db/postgresql:= )
- collectd_plugins_python? ( ${PYTHON_DEPS} )
- collectd_plugins_redis? ( dev-libs/hiredis:= )
- collectd_plugins_routeros? ( net-libs/librouteros )
- collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= )
- collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= )
- collectd_plugins_sensors? ( sys-apps/lm-sensors:= )
- collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
- collectd_plugins_smart? ( dev-libs/libatasmart )
- collectd_plugins_snmp? ( net-analyzer/net-snmp )
- collectd_plugins_snmp_agent? ( net-analyzer/net-snmp )
- collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant )
- collectd_plugins_varnish? ( www-servers/varnish:= )
- collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= )
- collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= )
- collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
- collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= )
- collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= )
- collectd_plugins_write_redis? ( dev-libs/hiredis:= )
- collectd_plugins_xencpu? ( app-emulation/xen-tools:= )
-
- kernel_FreeBSD? (
- collectd_plugins_disk? ( sys-libs/libstatgrab:= )
- collectd_plugins_interface? ( sys-libs/libstatgrab:= )
- collectd_plugins_load? ( sys-libs/libstatgrab:= )
- collectd_plugins_memory? ( sys-libs/libstatgrab:= )
- collectd_plugins_swap? ( sys-libs/libstatgrab:= )
- collectd_plugins_users? ( sys-libs/libstatgrab:= )
- )"
-
-# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
-DEPEND="${COMMON_DEPEND}
- collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
- collectd_plugins_java? ( >=virtual/jdk-1.6 )
- virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
- collectd_plugins_java? ( >=virtual/jre-1.6 )
- collectd_plugins_syslog? ( virtual/logger )
- selinux? ( sec-policy/selinux-collectd )
- !<sys-apps/openrc-0.18.2"
-
-REQUIRED_USE="
- collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )
- collectd_plugins_smart? ( udev )"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lm_sensors-4.5.0-compatibility.patch )
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plugin name> <kernel_options> <severity>
-# kernel_options is a list of kernel configurations options; the check tests whether at least
-# one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
-# is emitted.
-collectd_plugin_kernel_linux() {
- local multi_opt opt
- if has ${1} ${COLLECTD_ALL_PLUGINS}; then
- if use collectd_plugins_${1}; then
- for opt in ${2}; do
- if linux_chkconfig_present ${opt}; then
- return 0;
- fi
- done
- multi_opt=${2//\ /\ or\ }
- case ${3} in
- (info)
- elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
- ;;
- (warn)
- ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
- ;;
- (error)
- eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
- ;;
- (*)
- die "function collectd_plugin_kernel_linux called with invalid third argument"
- ;;
- esac
- fi
- fi
-}
-
-collectd_linux_kernel_checks() {
- if ! linux_chkconfig_present PROC_FS; then
- ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
- fi
-
- if ! linux_chkconfig_present SYSFS; then
- ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
- fi
-
- # battery.c: /proc/pmu/battery_%i
- # battery.c: /proc/acpi/battery
- collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
- # cgroups.c: /sys/fs/cgroup/
- collectd_plugin_kernel_linux cgroups CGROUPS warn
-
- # cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
- collectd_plugin_kernel_linux cpufreq SYSFS warn
- collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
-
- # drbd.c: /proc/drbd
- collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
-
- # conntrack.c: /proc/sys/net/netfilter/*
- collectd_plugin_kernel_linux conntrack NETFILTER warn
-
- # fscache.c: /proc/fs/fscache/stats
- collectd_plugin_kernel_linux fscache FSCACHE warn
-
- # nfs.c: /proc/net/rpc/nfs
- # nfs.c: /proc/net/rpc/nfsd
- collectd_plugin_kernel_linux nfs NFS_COMMON warn
-
- # serial.c: /proc/tty/driver/serial
- # serial.c: /proc/tty/driver/ttyS
- collectd_plugin_kernel_linux serial SERIAL_CORE warn
-
- # swap.c: /proc/meminfo
- collectd_plugin_kernel_linux swap SWAP warn
-
- # thermal.c: /proc/acpi/thermal_zone
- # thermal.c: /sys/class/thermal
- collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
-
- # turbostat.c: /dev/cpu/%d/msr
- collectd_plugin_kernel_linux turbostat X86_MSR warn
-
- # vmem.c: /proc/vmstat
- collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
-
- # vserver.c: /proc/virtual
- collectd_plugin_kernel_linux vserver VSERVER warn
-
- # uuid.c: /sys/hypervisor/uuid
- collectd_plugin_kernel_linux uuid SYSFS info
-
- # wireless.c: /proc/net/wireless
- collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
-
- # zfs_arc.c: /proc/spl/kstat/zfs/arcstats
- collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
-}
-
-pkg_setup() {
- if use kernel_linux; then
- linux-info_pkg_setup
-
- if linux_config_exists; then
- einfo "Checking your linux kernel configuration:"
- collectd_linux_kernel_checks
- else
- elog "Cannot find a linux kernel configuration. Continuing anyway."
- fi
- fi
-
- if use collectd_plugins_java; then
- java-pkg-opt-2_pkg_setup
- fi
-
- use collectd_plugins_python && python-single-r1_pkg_setup
-
- enewgroup collectd
- enewuser collectd -1 -1 /var/lib/collectd collectd
-}
-
-src_prepare() {
- default
-
- # There's some strange prefix handling in the default config file, resulting in
- # paths like "/usr/var/..."
- sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
-
- # Adjust upstream's systemd unit
- # - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
- # - Add User=collectd to run collectd as user "collectd" per default
- sed -i \
- -e '/^EnvironmentFile=.*/d' \
- -e '/^\[Service\]/aUser=collectd' \
- contrib/systemd.${PN}.service || die
-
- eautoreconf
-}
-
-src_configure() {
- # Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
- # should work independent of the operating system.
-
- local linux_plugins="barometer battery cpu cpufreq disk
- drbd entropy ethstat hugepages interface iptables
- ipvs irq ipc load memory md netlink nfs numa processes
- serial swap tcpconns thermal turbostat users vmem wireless
- zfc_arc"
-
- local need_libstatgrab=0
- local libstatgrab_plugins="cpu disk interface load memory swap users"
- local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
-
- local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
-
- local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
- local myos_plugins=""
- if use kernel_linux; then
- einfo "Enabling Linux plugins."
- myos_plugins=${linux_plugins}
- elif use kernel_FreeBSD; then
- einfo "Enabling FreeBSD plugins."
- myos_plugins=${bsd_plugins}
- elif use kernel_Darwin; then
- einfo "Enabling Darwin plugins."
- myos_plugins=${darwin_plugins}
- fi
-
- local myconf="--disable-werror"
-
- # Do we debug?
- myconf+=" $(use_enable debug)"
-
- # udev support?
- # Required for smart plugin via REQUIRED_USE; Optional for disk plugin
- if use udev; then
- myconf+=" --with-libudev"
- else
- myconf+=" --without-libudev"
- fi
-
- local plugin
-
- # Disable what needs to be disabled.
- for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
- myconf+=" --disable-${plugin}"
- done
-
- # Set enable/disable for each single plugin.
- for plugin in ${COLLECTD_ALL_PLUGINS}; do
- if has ${plugin} ${osdependent_plugins}; then
- # plugin is os-dependent ...
- if has ${plugin} ${myos_plugins}; then
- # ... and available in this os
- myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
- # ... must we link against libstatgrab? Bug #541518
- if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
- einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
- need_libstatgrab=1
- fi
- else
- # ... and NOT available in this os
- if use collectd_plugins_${plugin}; then
- ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
- ewarn "kernel. Disabling it automatically."
- fi
- myconf+=" --disable-${plugin}"
- fi
- elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
- if use collectd_plugins_perl && ! use perl; then
- ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
- myconf+= --disable-perl
- else
- myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
- fi
- else
- myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
- fi
- done
-
- if [ "${need_libstatgrab}" -eq 1 ]; then
- myconf+=" --with-libstatgrab"
- else
- myconf+=" --without-libstatgrab"
- fi
-
- # JAVA_HOME is set by eclasses.
- if use collectd_plugins_java; then
- myconf+=" --with-java"
- fi
-
- # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
- # lots of libs are only needed for plugins, if they are disabled, also disable the lib
- use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
- use collectd_plugins_openldap || myconf+=" --with-libldap=no"
- use collectd_plugins_redis || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
- use collectd_plugins_smart || myconf+=" --with-libatasmart=no"
- use collectd_plugins_gps || myconf+=" --with-libgps=no"
-
- if use perl; then
- myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
- else
- myconf+=" --without-perl-bindings"
- fi
-
- # No need for v5upgrade
- myconf+=" --disable-target_v5upgrade"
-
- # Python
- if use collectd_plugins_python; then
- myconf+=" --with-libpython=yes"
- export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
- else
- myconf+=" --with-libpython=no"
- fi
-
- # XFS support
- myconf+=" $(use_enable xfs)"
-
- # Finally, run econf.
- KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
- $(use_enable static-libs static) \
- --localstatedir=/var ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D%/}" install
-
- perl_delete_localpod
-
- find "${ED}"usr/ -name "*.la" -delete || die
-
- if use collectd_plugins_java; then
- java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
- fi
-
- fowners root:collectd /etc/collectd.conf
- fperms u=rw,g=r,o= /etc/collectd.conf
-
- dodoc AUTHORS ChangeLog README
-
- if use contrib ; then
- insinto /usr/share/doc/${PF}
- doins -r contrib
- fi
-
- keepdir /var/lib/${PN}
- fowners collectd:collectd /var/lib/${PN}
-
- newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
- systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
- sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":#PIDFile "/run/collectd.pid":' "${ED}"etc/collectd.conf || die
- sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
- sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n# Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
- sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n# Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
-}
-
-pkg_postinst() {
- tmpfiles_process "${PN}.conf"
-
- if use filecaps; then
- local caps=()
- use collectd_plugins_ceph && caps+=('CAP_DAC_OVERRIDE')
- use collectd_plugins_exec && caps+=('CAP_SETUID' 'CAP_SETGID')
- use collectd_plugins_iptables && caps+=('CAP_NET_ADMIN')
- use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
-
- if use collectd_plugins_dns || use collectd_plugins_ping; then
- caps+=('CAP_NET_RAW')
- fi
-
- if use collectd_plugins_turbostat || use collectd_plugins_smart; then
- caps+=('CAP_SYS_RAWIO')
- fi
-
- if [ ${#caps[@]} -gt 0 ]; then
- local caps_str=$(IFS=","; echo "${caps[*]}")
- fcaps ${caps_str} usr/sbin/collectd
- elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
- elog " ${caps_str}+EP"
- elog
-
- local systemd_unit="$(systemd_get_systemunitdir)/collectd.service"
- if [[ -e "${systemd_unit}" ]]; then
- caps_str="${caps[*]}"
- sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
- die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
-
- elog "CapabilityBoundingSet in '${systemd_unit}'"
- elog "updated to match capabilities set above."
- elog
- else
- if has_version "sys-apps/systemd"; then
- # Bug 596852
- ewarn "Failed to update CapabilityBoundingSet in '${systemd_unit}'"
- ewarn "because unit was not found. Please file a bug about this."
- fi
- fi
- fi
- fi
-
- elog "Note: Collectd is only the collector."
- elog " You need to install 'data' sources (applications) locally or"
- elog " remotely on your own."
-
- elog
- elog "Collectd is configured to run as unprivileged user by default."
- elog "You may want to revisit the configuration."
- elog
-
- if use collectd_plugins_email; then
- ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
- fi
-
- if use collectd_plugins_smart; then
- elog ""
- elog "If you are using smart plugin and don't run collectd as root make sure"
- elog "that the collectd user is allowed to access the disk you want to monitor"
- elog "(can be done via udev rule for example) and that collectd has the required"
- elog "capabilities set (which is the default when package was emerged with"
- elog "'filecaps' USE flag set)."
- fi
-
- if use contrib; then
- elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
- elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
- fi
-}
diff --git a/app-metrics/collectd/files/collectd-5.11.0-libsigrok-0.4+.patch b/app-metrics/collectd/files/collectd-5.11.0-libsigrok-0.4+.patch
new file mode 100644
index 000000000000..981864e81c32
--- /dev/null
+++ b/app-metrics/collectd/files/collectd-5.11.0-libsigrok-0.4+.patch
@@ -0,0 +1,157 @@
+Backport of https://github.com/u1f35c/collectd/commit/9e36cd85a2bbd6daa55f1f392f60f9c95573ae2c
+aka https://github.com/collectd/collectd/issues/1574
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -5367,7 +5367,7 @@ AC_SUBST([BUILD_WITH_LIBSENSORS_LIBS])
+ # libsigrok {{{
+ AC_SUBST([LIBSIGROK_CFLAGS])
+ AC_SUBST([LIBSIGROK_LIBS])
+-PKG_CHECK_MODULES([LIBSIGROK], [libsigrok < 0.4],
++PKG_CHECK_MODULES([LIBSIGROK], [libsigrok >= 0.4],
+ [with_libsigrok="yes"],
+ [with_libsigrok="no (pkg-config could not find libsigrok)"]
+ )
+--- a/src/sigrok.c
++++ b/src/sigrok.c
+@@ -127,22 +127,22 @@ static int sigrok_config(oconfig_item_t *ci) {
+ return 0;
+ }
+
+-static const char *sigrok_value_type(const struct sr_datafeed_analog *analog) {
++static const char *sigrok_value_type(const struct sr_analog_meaning *meaning) {
+ const char *s;
+
+- if (analog->mq == SR_MQ_VOLTAGE)
++ if (meaning->mq == SR_MQ_VOLTAGE)
+ s = "voltage";
+- else if (analog->mq == SR_MQ_CURRENT)
++ else if (meaning->mq == SR_MQ_CURRENT)
+ s = "current";
+- else if (analog->mq == SR_MQ_FREQUENCY)
++ else if (meaning->mq == SR_MQ_FREQUENCY)
+ s = "frequency";
+- else if (analog->mq == SR_MQ_POWER)
++ else if (meaning->mq == SR_MQ_POWER)
+ s = "power";
+- else if (analog->mq == SR_MQ_TEMPERATURE)
++ else if (meaning->mq == SR_MQ_TEMPERATURE)
+ s = "temperature";
+- else if (analog->mq == SR_MQ_RELATIVE_HUMIDITY)
++ else if (meaning->mq == SR_MQ_RELATIVE_HUMIDITY)
+ s = "humidity";
+- else if (analog->mq == SR_MQ_SOUND_PRESSURE_LEVEL)
++ else if (meaning->mq == SR_MQ_SOUND_PRESSURE_LEVEL)
+ s = "spl";
+ else
+ s = "gauge";
+@@ -172,7 +172,7 @@ static void sigrok_feed_callback(const struct sr_dev_inst *sdi,
+ ERROR("sigrok plugin: Received data from driver \"%s\" but "
+ "can't find a configuration / device matching "
+ "it.",
+- sdi->driver->name);
++ sr_dev_inst_driver_get(sdi)->name);
+ return;
+ }
+
+@@ -191,11 +191,11 @@ static void sigrok_feed_callback(const struct sr_dev_inst *sdi,
+
+ /* Ignore all but the first sample on the first probe. */
+ analog = packet->payload;
+- vl.values = &(value_t){.gauge = analog->data[0]};
++ vl.values = &(value_t){.gauge = ((float *) analog->data)[0]};
+ vl.values_len = 1;
+ sstrncpy(vl.plugin, "sigrok", sizeof(vl.plugin));
+ sstrncpy(vl.plugin_instance, cfdev->name, sizeof(vl.plugin_instance));
+- sstrncpy(vl.type, sigrok_value_type(analog), sizeof(vl.type));
++ sstrncpy(vl.type, sigrok_value_type(&analog->meaning[0]), sizeof(vl.type));
+
+ plugin_dispatch_values(&vl);
+ cfdev->last_dispatch = cdtime();
+@@ -207,6 +207,7 @@ static void sigrok_free_drvopts(struct sr_config *src) {
+ }
+
+ static int sigrok_init_driver(struct config_device *cfdev,
++ struct sr_session *session,
+ struct sr_dev_driver *drv) {
+ struct sr_config *src;
+ GSList *devlist, *drvopts;
+@@ -248,21 +249,22 @@ static int sigrok_init_driver(struct config_device *cfdev,
+ cfdev->sdi = devlist->data;
+ g_slist_free(devlist);
+ ssnprintf(hwident, sizeof(hwident), "%s %s %s",
+- cfdev->sdi->vendor ? cfdev->sdi->vendor : "",
+- cfdev->sdi->model ? cfdev->sdi->model : "",
+- cfdev->sdi->version ? cfdev->sdi->version : "");
++ sr_dev_inst_vendor_get(cfdev->sdi),
++ sr_dev_inst_model_get(cfdev->sdi),
++ sr_dev_inst_version_get(cfdev->sdi));
+ INFO("sigrok plugin: Device \"%s\" is a %s", cfdev->name, hwident);
+
+ if (sr_dev_open(cfdev->sdi) != SR_OK)
+ return -1;
+
+- if (sr_session_dev_add(cfdev->sdi) != SR_OK)
++ if (sr_session_dev_add(session, cfdev->sdi) != SR_OK)
+ return -1;
+
+ return 1;
+ }
+
+ static void *sigrok_read_thread(void *arg __attribute__((unused))) {
++ struct sr_session *session;
+ struct sr_dev_driver *drv, **drvlist;
+ GSList *l;
+ struct config_device *cfdev;
+@@ -277,11 +279,11 @@ static void *sigrok_read_thread(void *arg __attribute__((unused))) {
+ return NULL;
+ }
+
+- if (!sr_session_new())
++ if (!sr_session_new(sr_ctx, &session))
+ return NULL;
+
+ num_devices = 0;
+- drvlist = sr_driver_list();
++ drvlist = sr_driver_list(sr_ctx);
+ for (l = config_devices; l; l = l->next) {
+ cfdev = l->data;
+ drv = NULL;
+@@ -296,7 +298,7 @@ static void *sigrok_read_thread(void *arg __attribute__((unused))) {
+ return NULL;
+ }
+
+- if ((ret = sigrok_init_driver(cfdev, drv)) < 0)
++ if ((ret = sigrok_init_driver(cfdev, session, drv)) < 0)
+ /* Error was already logged. */
+ return NULL;
+
+@@ -305,21 +307,22 @@ static void *sigrok_read_thread(void *arg __attribute__((unused))) {
+
+ if (num_devices > 0) {
+ /* Do this only when we're sure there's hardware to talk to. */
+- if (sr_session_datafeed_callback_add(sigrok_feed_callback, NULL) != SR_OK)
++ if (sr_session_datafeed_callback_add(session, sigrok_feed_callback,
++ NULL) != SR_OK)
+ return NULL;
+
+ /* Start acquisition on all devices. */
+- if (sr_session_start() != SR_OK)
++ if (sr_session_start(session) != SR_OK)
+ return NULL;
+
+ /* Main loop, runs forever. */
+- sr_session_run();
++ sr_session_run(session);
+
+- sr_session_stop();
+- sr_session_dev_remove_all();
++ sr_session_stop(session);
++ sr_session_dev_remove_all(session);
+ }
+
+- sr_session_destroy();
++ sr_session_destroy(session);
+
+ sr_exit(sr_ctx);
+
diff --git a/app-metrics/collectd/files/collectd-5.12.0-clang16-configure.patch b/app-metrics/collectd/files/collectd-5.12.0-clang16-configure.patch
new file mode 100644
index 000000000000..578099579c47
--- /dev/null
+++ b/app-metrics/collectd/files/collectd-5.12.0-clang16-configure.patch
@@ -0,0 +1,127 @@
+https://bugs.gentoo.org/879633
+https://bugs.gentoo.org/900392
+https://github.com/collectd/collectd/pull/4106
+
+From f23164e589502ff675b3b54fa598bd9efd1422ed Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 6 Apr 2023 19:00:08 +0200
+Subject: [PATCH] Fix glibc feature macro handling for timegm
+
+The way strptime is activated using feature macros, _DEFAULT_SOURCE
+(successor to _BSD_SOURCE) is disabled implicitly, so timegm is
+hidden. Defining _DEFAULT_SOURCE at the same time as the other
+feature macros solves this, and removes the need for the
+TIMEGM_NEEDS_BSD configure macro.
+
+This avoids an implicit declaration of timegm in src/bind.c, and build
+failures with future compilers.
+---
+ configure.ac | 53 ++++++++++++----------------------------------------
+ src/bind.c | 10 +++++-----
+ 2 files changed, 17 insertions(+), 46 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bbe65a7e99..78bbff6624 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -974,6 +974,12 @@ if test "x$have_strptime" = "xyes" && test "x$c_cv_have_strptime_default" = "xno
+ #ifndef _XOPEN_SOURCE
+ # define _XOPEN_SOURCE 500
+ #endif
++ # ifndef _BSD_SOURCE
++ # define _BSD_SOURCE
++ # endif
++ # ifndef _DEFAULT_SOURCE
++ # define _DEFAULT_SOURCE
++ # endif
+ #include <time.h>
+ ]],
+ [[
+@@ -1024,6 +1030,12 @@ AC_CACHE_CHECK([for timegm],
+ # ifndef _XOPEN_SOURCE
+ # define _XOPEN_SOURCE 500
+ # endif
++# ifndef _BSD_SOURCE
++# define _BSD_SOURCE
++# endif
++# ifndef _DEFAULT_SOURCE
++# define _DEFAULT_SOURCE
++# endif
+ #endif
+ #include <time.h>
+ ]]],
+@@ -1039,50 +1051,9 @@ AC_CACHE_CHECK([for timegm],
+ )
+ )
+
+-if test "x$c_cv_have_timegm" != "xyes"
+-then
+- AC_CACHE_CHECK([for timegm with _BSD_SOURCE],
+- [c_cv_have_timegm_bsd],
+- AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM(
+-[[[
+-#if STRPTIME_NEEDS_STANDARDS
+-# ifndef _ISOC99_SOURCE
+-# define _ISOC99_SOURCE 1
+-# endif
+-# ifndef _POSIX_C_SOURCE
+-# define _POSIX_C_SOURCE 200112L
+-# endif
+-# ifndef _XOPEN_SOURCE
+-# define _XOPEN_SOURCE 500
+-# endif
+-#endif
+-#ifndef _BSD_SOURCE
+-# define _BSD_SOURCE 1
+-#endif
+-#include <time.h>
+-]]],
+-[[[
+- time_t t = timegm(&(struct tm){0});
+- if (t == ((time_t) -1)) {
+- return 1;
+- }
+-]]]
+- )],
+- [c_cv_have_timegm_bsd="yes"
+- c_cv_have_timegm="yes"],
+- [c_cv_have_timegm_bsd="no"]
+- )
+- )
+-fi
+-
+ if test "x$c_cv_have_timegm" = "xyes"
+ then
+ AC_DEFINE(HAVE_TIMEGM, 1, [Define if the timegm(3) function is available.])
+- if test "x$c_cv_have_timegm_bsd" = "xyes"
+- then
+- AC_DEFINE(TIMEGM_NEEDS_BSD, 1, [Set to true if timegm is only exported in BSD mode.])
+- fi
+ fi
+
+ CFLAGS="$SAVE_CFLAGS"
+diff --git a/src/bind.c b/src/bind.c
+index a246f1aacf..4a7c024253 100644
+--- a/src/bind.c
++++ b/src/bind.c
+@@ -33,13 +33,13 @@
+ #ifndef _XOPEN_SOURCE
+ #define _XOPEN_SOURCE 500
+ #endif
+-#endif /* STRPTIME_NEEDS_STANDARDS */
+-
+-#if TIMEGM_NEEDS_BSD
+ #ifndef _BSD_SOURCE
+-#define _BSD_SOURCE 1
++#define _BSD_SOURCE
+ #endif
+-#endif /* TIMEGM_NEEDS_BSD */
++#ifndef _DEFAULT_SOURCE
++#define _DEFAULT_SOURCE
++#endif
++#endif /* STRPTIME_NEEDS_STANDARDS */
+
+ #include "collectd.h"
+
+
diff --git a/app-metrics/collectd/files/collectd-5.12.0-nut-c99.patch b/app-metrics/collectd/files/collectd-5.12.0-nut-c99.patch
new file mode 100644
index 000000000000..0935eed070e9
--- /dev/null
+++ b/app-metrics/collectd/files/collectd-5.12.0-nut-c99.patch
@@ -0,0 +1,143 @@
+https://github.com/collectd/collectd/commit/d409ffa2a64cac3fc2abe2bb86ec3a80cb34d0a6
+
+From d409ffa2a64cac3fc2abe2bb86ec3a80cb34d0a6 Mon Sep 17 00:00:00 2001
+From: Jim Klimov <jimklimov+nut@gmail.com>
+Date: Wed, 31 Aug 2022 11:40:01 +0200
+Subject: [PATCH] configure.ac, src/nut.c: detect int types required by NUT API
+ we build against
+
+Either use the stricter int types required by NUT headers since v2.8.0 release,
+or the relaxed (arch-dependent) types required by older NUT releases - depending
+on which NUT API version the collectd is building against at the moment.
+
+Inspired by discussion at https://github.com/networkupstools/nut/issues/1638
+--- a/configure.ac
++++ b/configure.ac
+@@ -5881,6 +5881,106 @@ if test "x$with_libupsclient" = "xyes"; then
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ fi
+
++if test "x$with_libupsclient" = "xyes"; then
++ dnl The m4 script logic below is modelled after NUT_FUNC_GETNAMEINFO_ARGTYPES
++ dnl further originating in curl autoconf scripts or beyond. See there for an
++ dnl example of general-case logic to handle matching of numerous possible
++ dnl data types for each argument in supported API variants.
++ dnl Note: techically compiler complains here not about int types themselves,
++ dnl but about pointers to such data. We know "out of band" that e.g. NUT
++ dnl change to "size_t" happened at once for all arguments in the API, so
++ dnl simplify the handling here and now with that assumption.
++ AC_LANG_PUSH([C])
++ SAVE_CPPFLAGS="$CPPFLAGS"
++ SAVE_LDFLAGS="$LDFLAGS"
++ SAVE_CFLAGS="$CFLAGS"
++ CPPFLAGS="$CPPFLAGS $with_libupsclient_cflags"
++ LDFLAGS="$LDFLAGS $with_libupsclient_libs"
++ CFLAGS="$CFLAGS $with_libupsclient_cflags"
++ if test "x$GCC" = "xyes"; then
++ CFLAGS="$CFLAGS -Wall -Werror"
++ fi
++
++ dnl upscli_splitname() *is* there forever (2007 or older)
++ dnl but int types e.g. "port" changed in NUT 2.8.0
++ dnl Also this is the UPSCONN_t::port field type:
++ AC_CACHE_CHECK([int type of port argument for NUT upscli_splitname],
++ [collectd_cv_func_upscli_splitname_args], [
++ collectd_cv_func_upscli_splitname_args="unknown"
++ for port_arg in 'uint16_t' 'int' ; do
++ AC_COMPILE_IFELSE([
++ AC_LANG_PROGRAM([
++#include <upsclient.h>
++/* int upscli_splitname(const char *buf, char **upsname, char **hostname, <port_arg> *port); */
++ ],[
++const char *origname = "ups@localhost:3493";
++$port_arg port=0;
++char *hostname;
++char *upsname;
++int res = upscli_splitname(origname, &upsname, &hostname, &port);
++return(res);
++ ])
++ ],[
++ collectd_cv_func_upscli_splitname_args="$port_arg"
++ break
++ ])
++ done
++ ])
++
++ AS_IF([test x"$collectd_cv_func_upscli_splitname_args" = xunknown],
++ [AC_MSG_WARN([Can not find proper port type for upscli_splitname()])
++ with_libupsclient="no (required data types for NUT API were not detected)"],
++ [AC_DEFINE_UNQUOTED(NUT_PORT_TYPE, $collectd_cv_func_upscli_splitname_args,
++ [Define to the integer type for TCP/IP ports used by NUT API we build against])
++ ])
++
++
++ AC_CACHE_CHECK([int type of length/numbering arguments for NUT upscli_list_next],
++ [collectd_cv_func_upscli_list_next_args], [
++ collectd_cv_func_upscli_list_next_args="unknown"
++ for size_arg in 'size_t' 'unsigned int' 'int' ; do
++ AC_COMPILE_IFELSE([
++ AC_LANG_PROGRAM([
++#include <upsclient.h>
++/* int upscli_list_next(UPSCONN_t *ups, <size_arg> numq, const char **query, <size_arg> *numa, char ***answer); */
++
++#if HAVE_UPSCONN_T
++typedef UPSCONN_t collectd_upsconn_t;
++#elif HAVE_UPSCONN
++typedef UPSCONN collectd_upsconn_t;
++#else
++#error "Unable to determine the UPS connection type."
++#endif
++ ],[
++$size_arg query_num=0;
++$size_arg answer_num=0;
++const char * query;
++char** answer;
++collectd_upsconn_t ups;
++int res = upscli_list_next(&ups, query_num, &query, &answer_num, &answer);
++return(res);
++ ])
++ ],[
++ collectd_cv_func_upscli_list_next_args="$size_arg"
++ break
++ ])
++ done
++ ])
++
++ AS_IF([test x"$collectd_cv_func_upscli_list_next_args" = xunknown],
++ [AC_MSG_WARN([Can not find proper type for array sizes and string lengths used by upscli_list_next()])
++ with_libupsclient="no (required data types for NUT API were not detected)"],
++ [AC_DEFINE_UNQUOTED(NUT_SIZE_TYPE, $collectd_cv_func_upscli_list_next_args,
++ [Define to the integer type for array sizes and string lengths used by NUT API we build against])
++ ])
++
++
++ CPPFLAGS="$SAVE_CPPFLAGS"
++ LDFLAGS="$SAVE_LDFLAGS"
++ CFLAGS="$SAVE_CFLAGS"
++ AC_LANG_POP([C])
++fi
++
+ if test "x$with_libupsclient" = "xyes"; then
+ BUILD_WITH_LIBUPSCLIENT_CFLAGS="$with_libupsclient_cflags"
+ BUILD_WITH_LIBUPSCLIENT_LIBS="$with_libupsclient_libs"
+--- a/src/nut.c
++++ b/src/nut.c
+@@ -46,7 +46,7 @@ struct nut_ups_s {
+ collectd_upsconn_t *conn;
+ char *upsname;
+ char *hostname;
+- int port;
++ NUT_PORT_TYPE port;
+ nut_ups_t *next;
+ };
+
+@@ -250,7 +250,7 @@ static int nut_read(user_data_t *user_data) {
+ const char *query[3] = {"VAR", ups->upsname, NULL};
+ unsigned int query_num = 2;
+ char **answer;
+- unsigned int answer_num;
++ NUT_SIZE_TYPE answer_num;
+ int status;
+
+ /* (Re-)Connect if we have no connection */
+
diff --git a/app-metrics/collectd/files/collectd-5.12.0-python3_11.patch b/app-metrics/collectd/files/collectd-5.12.0-python3_11.patch
new file mode 100644
index 000000000000..3c0572889559
--- /dev/null
+++ b/app-metrics/collectd/files/collectd-5.12.0-python3_11.patch
@@ -0,0 +1,33 @@
+From 623e95394e0e62e7f9ced2104b786d21e9c0bf53 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Wed, 21 Sep 2022 22:21:58 +0700
+Subject: [PATCH] cpython: fix build with Python 3.11
+
+Python 3.11 moves longintrepr.h into cpython sub-directory.
+However, in this version, longintrepr.h is always included.
+---
+ src/cpython.h | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/cpython.h b/src/cpython.h
+index 11e64fa62f..bcfa406feb 100644
+--- a/src/cpython.h
++++ b/src/cpython.h
+@@ -24,9 +24,15 @@
+ * Sven Trenkel <collectd at semidefinite.de>
+ **/
+
++#include <Python.h>
+ /* Some python versions don't include this by default. */
+-
++#if PY_VERSION_HEX < 0x030B0000
++/*
++ * Python 3.11 move longintrepr.h to cpython/longintrepr.h
++ * And it's always included
++ */
+ #include <longintrepr.h>
++#endif /* PY_VERSION_HEX < 0x030B0000 */
+
+ /* These two macros are basically Py_BEGIN_ALLOW_THREADS and
+ * Py_BEGIN_ALLOW_THREADS
diff --git a/app-metrics/collectd/files/collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch b/app-metrics/collectd/files/collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch
deleted file mode 100644
index 3476d50664a5..000000000000
--- a/app-metrics/collectd/files/collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://github.com/collectd/collectd/issues/3006
-
---- old/src/sensors.c
-+++ new/src/sensors.c
-@@ -149,7 +149,7 @@
- static char *conffile = SENSORS_CONF_PATH;
- /* #endif SENSORS_API_VERSION < 0x400 */
-
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
- typedef struct featurelist {
- const sensors_chip_name *chip;
- const sensors_feature *feature;
-@@ -159,9 +159,9 @@
-
- static char *conffile = NULL;
- static _Bool use_labels = 0;
--/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-+/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */
-
--#else /* if SENSORS_API_VERSION >= 0x500 */
-+#else /* if SENSORS_API_VERSION >= 0x600 */
- #error "This version of libsensors is not supported yet. Please report this " \
- "as bug."
- #endif
-@@ -223,7 +223,7 @@
- if (IS_TRUE(value))
- ignorelist_set_invert(sensor_list, 0);
- }
--#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
- else if (strcasecmp(key, "UseLabels") == 0) {
- use_labels = IS_TRUE(value) ? 1 : 0;
- }
-@@ -353,7 +353,7 @@
- } /* while sensors_get_detected_chips */
- /* #endif SENSORS_API_VERSION < 0x400 */
-
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
- chip_num = 0;
- while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
- const sensors_feature *feature;
-@@ -410,7 +410,7 @@
- } /* while (subfeature) */
- } /* while (feature) */
- } /* while (chip) */
--#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-+#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */
-
- if (first_feature == NULL) {
- sensors_cleanup();
-@@ -485,7 +485,7 @@
- } /* for fl = first_feature .. NULL */
- /* #endif SENSORS_API_VERSION < 0x400 */
-
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
- for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
- double value;
- int status;
-@@ -528,7 +528,7 @@
-
- sensors_submit(plugin_instance, type, type_instance, value);
- } /* for fl = first_feature .. NULL */
--#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-+#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */
-
- return 0;
- } /* int sensors_read */
diff --git a/app-metrics/collectd/files/collectd-5.9.1-fixup.patch b/app-metrics/collectd/files/collectd-5.9.1-fixup.patch
deleted file mode 100644
index 93f97d95a9c4..000000000000
--- a/app-metrics/collectd/files/collectd-5.9.1-fixup.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/src/daemon/plugin.c
-+++ b/src/daemon/plugin.c
-@@ -647,7 +647,8 @@ static void start_read_threads(size_t num) /* {{{ */
- }
-
- char name[THREAD_NAME_MAX];
-- snprintf(name, sizeof(name), "reader#%" PRIu64, (uint64_t)read_threads_num);
-+ ssnprintf(name, sizeof(name), "reader#%" PRIu64,
-+ (uint64_t)read_threads_num);
- set_thread_name(read_threads[read_threads_num], name);
-
- read_threads_num++;
-@@ -836,8 +837,8 @@ static void start_write_threads(size_t num) /* {{{ */
- }
-
- char name[THREAD_NAME_MAX];
-- snprintf(name, sizeof(name), "writer#%" PRIu64,
-- (uint64_t)write_threads_num);
-+ ssnprintf(name, sizeof(name), "writer#%" PRIu64,
-+ (uint64_t)write_threads_num);
- set_thread_name(write_threads[write_threads_num], name);
-
- write_threads_num++;
---- a/src/intel_rdt.c
-+++ b/src/intel_rdt.c
-@@ -325,8 +325,12 @@ static int strlisttoarray(char *str_list, char ***names, size_t *names_num) {
- continue;
-
- if ((isdupstr((const char **)*names, *names_num, token))) {
-- ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'",
-- token, str_list);
-+ if (str_list != NULL)
-+ ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'",
-+ token, str_list);
-+ else
-+ ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token);
-+
- return -EINVAL;
- } else {
- if (0 != strarray_add(names, names_num, token)) {
---- a/src/intel_rdt.c
-+++ b/src/intel_rdt.c
-@@ -325,11 +325,7 @@ static int strlisttoarray(char *str_list, char ***names, size_t *names_num) {
- continue;
-
- if ((isdupstr((const char **)*names, *names_num, token))) {
-- if (str_list != NULL)
-- ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'",
-- token, str_list);
-- else
-- ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token);
-+ ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token);
-
- return -EINVAL;
- } else {
---- a/src/syslog.c
-+++ b/src/syslog.c
-@@ -51,8 +51,7 @@ static int sl_config(const char *key, const char *value) {
- log_level = parse_log_severity(value);
- if (log_level < 0) {
- log_level = LOG_INFO;
-- ERROR("syslog: invalid loglevel [%s] defaulting to 'info'", value);
-- return 1;
-+ WARNING("syslog: invalid loglevel [%s] defaulting to 'info'", value);
- }
- } else if (strcasecmp(key, "NotifyLevel") == 0) {
- notif_severity = parse_notif_severity(value);
---- a/src/utils/common/common.c
-+++ b/src/utils/common/common.c
-@@ -99,10 +99,7 @@ int ssnprintf(char *str, size_t sz, const char *format, ...) {
-
- va_end(ap);
-
-- if (ret < 0) {
-- return ret;
-- }
-- return (size_t)ret >= sz;
-+ return ret;
- } /* int ssnprintf */
-
- char *ssnprintf_alloc(char const *format, ...) /* {{{ */
diff --git a/app-metrics/collectd/files/collectd.confd-r2 b/app-metrics/collectd/files/collectd.confd-r2
index 835936d5bce2..38fb9a6057e6 100644
--- a/app-metrics/collectd/files/collectd.confd-r2
+++ b/app-metrics/collectd/files/collectd.confd-r2
@@ -27,7 +27,7 @@
# isn't used anymore.
# If you are going to change UNIX socket location or change COLLECTD_USER
# setting above, make sure you overwrite /usr/lib/tmpfiles.d/collectd.conf
-# via copy in /etc/tmpfiles.d/collectd.conf to match your setup.
+# via copy in /usr/lib/tmpfiles.d/collectd.conf to match your setup.
#COLLECTD_GROUP="collectd"
# You can use this configuration option to pass additional options to the
diff --git a/app-metrics/collectd/files/collectd.initd-r2 b/app-metrics/collectd/files/collectd.initd-r3
index 0a4ca71494f6..aa3396d5a451 100644
--- a/app-metrics/collectd/files/collectd.initd-r2
+++ b/app-metrics/collectd/files/collectd.initd-r3
@@ -14,6 +14,7 @@ COLLECTD_OPTS=${COLLECTD_OPTS:-""}
command="/usr/sbin/collectd"
command_args="${COLLECTD_OPTS} -C \"${COLLECTD_CONFIGFILE}\" -f"
command_background=true
+command_group="${COLLECTD_GROUP}"
command_user="${COLLECTD_USER}"
start_stop_daemon_args="${COLLECTD_SSDARGS} --nice ${COLLECTD_NICELEVEL}"
pidfile="${COLLECTD_PIDFILE}"
diff --git a/app-metrics/collectd/metadata.xml b/app-metrics/collectd/metadata.xml
index 5f027424cee4..47eeb1f98f50 100644
--- a/app-metrics/collectd/metadata.xml
+++ b/app-metrics/collectd/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
</maintainer>
<longdescription lang="en">
Collectd gathers statistics about the system it is running on and stores this
diff --git a/app-metrics/consul_exporter/Manifest b/app-metrics/consul_exporter/Manifest
index 1cf6b3f6f0c8..818784ebf4b6 100644
--- a/app-metrics/consul_exporter/Manifest
+++ b/app-metrics/consul_exporter/Manifest
@@ -1 +1 @@
-DIST consul_exporter-0.4.0.tar.gz 1107092 BLAKE2B 7f3d6ce797252e5895387d3bbd2a3ad41777bf4d98a4a7a4efc3e8caa0c71fd29be91675ae6fe304016f1cbf87ecf4ee3442b49d3bc08939d471326d4e5d4cd4 SHA512 faac0dfeec5b6fadf73ef68c0d24c059c89891918e498e145a50512b8c961764a02388b2bcce305e12ecf703fa76afdf5634b35aecbee0ac37926d78ce0b1e93
+DIST consul_exporter-0.7.1.tar.gz 1583526 BLAKE2B 8c3211f1d75a767e18e47e16eef056dc07403abbd1cdb165a45b8d0830124e3e91b7dac67301e1b5d1ed564a94dfe9ff05c43267dbeb950ca1ff9b698ebd25ce SHA512 bc5ef24151d53abefd4b975f1ca3a18c98837c6c650c4bf6851fbc1299620db6e8e79a05d2355579ee78c1d2721ceec4bc946ee76d6bf7acdecb6f76957f5984
diff --git a/app-metrics/consul_exporter/consul_exporter-0.4.0.ebuild b/app-metrics/consul_exporter/consul_exporter-0.4.0.ebuild
deleted file mode 100644
index 12823ba01c9e..000000000000
--- a/app-metrics/consul_exporter/consul_exporter-0.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/consul_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-CONSUL_EXPORTER_COMMIT=75f02d8
-
-DESCRIPTION="Prometheus exporter for consul metrics"
-HOMEPAGE="https://github.com/prometheus/consul_exporter"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-lang/go-1.11
- dev-util/promu"
-
-RESTRICT="strip test"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${CONSUL_EXPORTER_COMMIT}/" \
- -e "s/{{.Version}}/${PV}/" \
- -e "s/-tags netgo/-mod vendor -tags netgo/" \
- src/${EGO_PN}/.promu.yml || die "Sed failed"
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GO111MODULE=on GOCACHE="${T}/go-cache" promu build -v || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin consul_exporter
- dodoc {README,CONTRIBUTING}.md
- popd || die
- keepdir /var/log/consul_exporter
- fowners ${PN}:${PN} /var/log/consul_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/consul_exporter/consul_exporter-0.7.1.ebuild b/app-metrics/consul_exporter/consul_exporter-0.7.1.ebuild
new file mode 100644
index 000000000000..b081f85524e7
--- /dev/null
+++ b/app-metrics/consul_exporter/consul_exporter-0.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+CONSUL_EXPORTER_COMMIT=ae46e2e
+MY_PV="v${PV/_rc/-rc.}"
+
+DESCRIPTION="Prometheus exporter for consul metrics"
+HOMEPAGE="https://github.com/prometheus/consul_exporter"
+SRC_URI="https://github.com/prometheus/consul_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-util/promu"
+COMMON_DEPEND="acct-group/consul_exporter
+ acct-user/consul_exporter"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/{{.Revision}}/${CONSUL_EXPORTER_COMMIT}/" \
+ -e "s/{{.Version}}/${PV}/" \
+ .promu.yml || die "Sed failed"
+}
+
+src_compile() {
+ promu build -v || die
+}
+
+src_install() {
+ newbin ${P} ${PN}
+ dodoc {README,CONTRIBUTING}.md
+ keepdir /var/log/consul_exporter
+ fowners ${PN}:${PN} /var/log/consul_exporter
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/consul_exporter/metadata.xml b/app-metrics/consul_exporter/metadata.xml
index c36c37139fad..7a57065b9b93 100644
--- a/app-metrics/consul_exporter/metadata.xml
+++ b/app-metrics/consul_exporter/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">prometheus/consul_exporter</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-metrics/dnsmasq_exporter/Manifest b/app-metrics/dnsmasq_exporter/Manifest
new file mode 100644
index 000000000000..e5b773550880
--- /dev/null
+++ b/app-metrics/dnsmasq_exporter/Manifest
@@ -0,0 +1,2 @@
+DIST dnsmasq_exporter-0.2.0-deps.tar.xz 12889812 BLAKE2B d57f3a83bcab80d8fa7ca8ddcfb96897285c5dcd94d6a5631c7c308ead758a6f8bb1b43695d305bc5baf930dc3ca8073c21d99369edbf76c95d167ea0d546f1e SHA512 1967c94ee658828691194fe7495757b7adb8e7116ec58eb039b4797cfb1a8f61fc112a7c56316d1938e6185d3a66eb5082b418c649fde83e52530b1fbd0d00e8
+DIST dnsmasq_exporter-0.2.0.tar.gz 12912 BLAKE2B e4166ff1648b4f6780da767ec2b1ea144d132190d6fc53f77c0ebcc73a8515bbdc198d7f34e1ae806b8c76ae41ed90d60c69cb82294a67397022b522fc22f9d8 SHA512 5f1eb899da3b20c384c19cff0bfe0a8b09a0078b683cabacdaa78ab07153ecf35ddf94bf04cae64891eca83b18c6e027d9096afa9cf2dd2e4d3a2040e3daed0c
diff --git a/app-metrics/dnsmasq_exporter/dnsmasq_exporter-0.2.0-r1.ebuild b/app-metrics/dnsmasq_exporter/dnsmasq_exporter-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..e6392454b2e6
--- /dev/null
+++ b/app-metrics/dnsmasq_exporter/dnsmasq_exporter-0.2.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="prometheus exporter for dnsmasq"
+HOMEPAGE="https://github.com/google/dnsmasq_exporter"
+SRC_URI="https://github.com/google/dnsmasq_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="BSD MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ acct-group/dnsmasq_exporter
+ acct-user/dnsmasq_exporter"
+ RDEPEND="${DEPEND}"
+
+src_compile() {
+ ego build
+}
+
+src_install() {
+ dobin dnsmasq_exporter
+ keepdir /var/log/dnsmasq_exporter
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ fowners ${PN}:${PN} /var/log/dnsmasq_exporter
+}
+
+pkg_postinst() {
+ if [[ -e "${EROOT}"/var/log/ddnsmasq_exporter ]]; then
+ elog "The log directory is now ${EROOT}/var/log/dnsmasq_exporter"
+ elog "in order to fix a typo."
+ fi
+}
diff --git a/app-metrics/dnsmasq_exporter/files/dnsmasq_exporter.confd b/app-metrics/dnsmasq_exporter/files/dnsmasq_exporter.confd
new file mode 100644
index 000000000000..f655cc32abfe
--- /dev/null
+++ b/app-metrics/dnsmasq_exporter/files/dnsmasq_exporter.confd
@@ -0,0 +1,3 @@
+# Please set the flags you wish to pass to dnsmasq_exporter in
+# command_args
+# command_args=""
diff --git a/app-metrics/dnsmasq_exporter/files/dnsmasq_exporter.initd b/app-metrics/dnsmasq_exporter/files/dnsmasq_exporter.initd
new file mode 100644
index 000000000000..7c600efdbbaf
--- /dev/null
+++ b/app-metrics/dnsmasq_exporter/files/dnsmasq_exporter.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="dnsmasq Exporter for Prometheus"
+command="/usr/bin/dnsmasq_exporter"
+command_background=true
+command_user="${RC_SVCNAME}:${RC_SVCNAME}"
+error_log=/var/log/dnsmasq_exporter/${RC_SVCNAME}.log
+output_log=/var/log/dnsmasq_exporter/${RC_SVCNAME}.log
+pidfile=/var/run/${RC_SVCNAME}.pid
+
+depend() {
+ after dnsmasq net
+}
diff --git a/app-metrics/dnsmasq_exporter/metadata.xml b/app-metrics/dnsmasq_exporter/metadata.xml
new file mode 100644
index 000000000000..eac5fa0c8606
--- /dev/null
+++ b/app-metrics/dnsmasq_exporter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">google/dnsmasq_exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/elasticsearch_exporter/Manifest b/app-metrics/elasticsearch_exporter/Manifest
index a4e956c24c48..2ce154fb2add 100644
--- a/app-metrics/elasticsearch_exporter/Manifest
+++ b/app-metrics/elasticsearch_exporter/Manifest
@@ -1,4 +1,2 @@
-DIST elasticsearch_exporter-1.0.2.tar.gz 207764 BLAKE2B f626c53d04e05912d1db480d6078b44fb6a05e42ec1751bfc2ddd45ff2f0bc0550517e16b10064adcf8c2ab2db175011543a2953fff1624cd575318e6fad943b SHA512 f610660761d761a26b840a969008763ecb19bdc07ab4a076cec7fc40f7d00a68e863fb72b0ea3b56446621a99fa31384ab79789a2e6526fc5b12dcc20df3c684
-DIST elasticsearch_exporter-1.0.4_rc1.tar.gz 212553 BLAKE2B 9f6f8f0117af4e59a483eda378df8a2ac5419a5319a02f69210250be952dc6cd401f0c20dbc3d416446d3af183750919f190112795652180d64ea3f6c62f5a56 SHA512 073fcce3417ae2147076b0fbbe3387494f9e2e8613284f03c6761d5e81d50aba648c6b47d423d79209d0b9221963951c21b2fa44aabe29c1eb0c36546dd140eb
-DIST elasticsearch_exporter-1.1.0.tar.gz 316279 BLAKE2B 86e994ea0765a231b8ebaeaf495fa160ce53795e191e25cf82994214b53c62f03030b27040e95b770dc526ed2b772961b12ac73700b0da9f8994d532a0958789 SHA512 81cd7a44a2cd07bde7e716eac688c06ca93059de5ba7e1d3e009683b133f8c84c91a09a9e4775a558a3856389e165ce8ec2f04bd856b7b39b8f4a6072623b103
-DIST elasticsearch_exporter-1.1.0_rc1.tar.gz 314275 BLAKE2B 1548cbecb6f5a0ae70ffb7a1ccceedbc5e9f980841b9ddb47f56c522a0f0fdc4f9c0613ec95c6a8705f1affd8d713e70d6cfaeacd84cd552a21466a490cac387 SHA512 ba571fec3cdbc32279008ddfc6b72b093fef4ba4ee0eaed98000cecadf81f61adcce24989f36c8dc6abde51129ed638473267e2636ec669ac30440338001930e
+DIST elasticsearch_exporter-1.3.0-deps.tar.xz 106387304 BLAKE2B d67e8b746ecf9f05310194485ac99b95768b813a7265b3ec445261d52708551c37bc14718021ee67306c84fedc323f5ef4e87cba043354b3b49c9ba0764e5575 SHA512 0374030189927deb14c8bd34b6472e9be8f7025aea525394a5eca5d6899311296e7eeefb7d05a2b4a75549c4590b9590dd592ab3c0aaf008c311922a01ea81d5
+DIST elasticsearch_exporter-1.3.0.tar.gz 93489 BLAKE2B 33e2dbe9608bd052bc4f31fc2a38774981d96f30fd54465bd2b10d075f0fade29fe6c40d2e32370a38edc41d04b3772100c39f5670c302a0a334e2a7d5ee6463 SHA512 a88ec20cd7f2f9859d2e169f7813b84c3286b65dfc3a625545608416dbee5f96d4e223e7d2ea2f2b788be766ead1abb11b795d3059a628d0c3c56f567eebea00
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild
deleted file mode 100644
index 20be32d6cf4f..000000000000
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/justwatchcom/elasticsearch_exporter"
-EXPORTER_COMMIT="92dcbf3"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Elasticsearch stats exporter for Prometheus"
-HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/elasticsearch_exporter
- dodoc {README,CHANGELOG}.md
- popd || die
- keepdir /var/log/elasticsearch_exporter
- fowners ${PN}:${PN} /var/log/elasticsearch_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.4_rc1.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.4_rc1.ebuild
deleted file mode 100644
index f0acec60fe37..000000000000
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.4_rc1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-MY_PV=${PV/_/}
-
-EGO_PN="github.com/justwatchcom/elasticsearch_exporter"
-EXPORTER_COMMIT="68340fd"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Elasticsearch stats exporter for Prometheus"
-HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/elasticsearch_exporter
- dodoc {README,CHANGELOG}.md
- popd || die
- keepdir /var/log/elasticsearch_exporter
- fowners ${PN}:${PN} /var/log/elasticsearch_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild
deleted file mode 100644
index cedeaf364c0b..000000000000
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-MY_PV=${PV/_/}
-
-EGO_PN="github.com/justwatchcom/elasticsearch_exporter"
-EXPORTER_COMMIT="fe20e49"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Elasticsearch stats exporter for Prometheus"
-HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/elasticsearch_exporter
- dodoc {README,CHANGELOG}.md
- popd || die
- keepdir /var/log/elasticsearch_exporter
- fowners ${PN}:${PN} /var/log/elasticsearch_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0_rc1.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0_rc1.ebuild
deleted file mode 100644
index 8ac76f6636db..000000000000
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0_rc1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-MY_PV=${PV/_/}
-
-EGO_PN="github.com/justwatchcom/elasticsearch_exporter"
-EXPORTER_COMMIT="c0ec042"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Elasticsearch stats exporter for Prometheus"
-HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/elasticsearch_exporter
- dodoc {README,CHANGELOG}.md
- popd || die
- keepdir /var/log/elasticsearch_exporter
- fowners ${PN}:${PN} /var/log/elasticsearch_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.3.0.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.3.0.ebuild
new file mode 100644
index 000000000000..f0848da7b21d
--- /dev/null
+++ b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GIT_COMMIT=fe20e49
+MY_PV=${PV/_/}
+inherit go-module
+DESCRIPTION="Elasticsearch stats exporter for Prometheus"
+HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
+SRC_URI="https://github.com/justwatchcom/elasticsearch_exporter/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/elasticsearch_exporter
+ acct-user/elasticsearch_exporter"
+ RDEPEND="${DEPEND}"
+BDEPEND="dev-util/promu"
+
+src_prepare() {
+ default
+ sed -i -e "/-s$/d" -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+ promu build --prefix bin || die
+}
+
+src_test() {
+ emake test-flags= test
+}
+
+src_install() {
+ dobin bin/elasticsearch_exporter
+ dodoc {README,CHANGELOG}.md
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ keepdir /var/log/elasticsearch_exporter
+ fowners ${PN}:${PN} /var/log/elasticsearch_exporter
+}
diff --git a/app-metrics/elasticsearch_exporter/metadata.xml b/app-metrics/elasticsearch_exporter/metadata.xml
index 2e5a147e290b..a1743ac090b0 100644
--- a/app-metrics/elasticsearch_exporter/metadata.xml
+++ b/app-metrics/elasticsearch_exporter/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
</maintainer>
<upstream>
<remote-id type="github">justwatchcom/elasticsearch_exporter</remote-id>
diff --git a/app-metrics/exabgp_exporter/Manifest b/app-metrics/exabgp_exporter/Manifest
new file mode 100644
index 000000000000..b3506c54101c
--- /dev/null
+++ b/app-metrics/exabgp_exporter/Manifest
@@ -0,0 +1,4 @@
+DIST exabgp_exporter-1.0.0_p20200718-deps.tar.xz 3538492 BLAKE2B d04f31b135f6f0cab4032f00e77a5bd1543e27e589cb8665d1917014eae561a4982e7b67639d4beeec1066c038eba16203b129be8d6ca1aa2f31a98706cefd89 SHA512 0ec3b68f62afbb17586afd6b8134aff10a21b2363b99439d4e1c5175382fb87168efe3cf3ea916b45d1a25198d529db0b8d29e571f41c8b4873ff2904e4e9394
+DIST exabgp_exporter-1.0.0_p20200718.tar.gz 75858 BLAKE2B 838f445b3a18405c2d38b7b73cb0da13791d12f05b5881f196d507b44a810d28cfe01e059894c2a50063d33437f71362308a9f7543df6d85444add1e7c60c04b SHA512 0b6f468365cc2b1db2a2915d00f3b57ce34f72e8373b713ba0ff85b3d06e7075d5d8995129065dee193eaa763d63ac0b76d124902123134708f7086c505214b3
+DIST exabgp_exporter-1.1.3-deps.tar.xz 6513860 BLAKE2B 171180eac9880f23d9e26275e546234595c224dfa1f5350ce1fb196bf8360cf7818f5438b94d587470e307230b2fb8b0386bc8713e91d8be27a0ea3b81ea9e9f SHA512 00278fee0b6a214f41e0ff47879961f5092d07d4b45aa593e23b8c55f4732bd269385e692a6156c47ed1c92c1b9ee50fbf659e2e6f05c62fe1fd42e2db83bd1b
+DIST exabgp_exporter-1.1.3.tar.gz 102411 BLAKE2B 936a1aabaf52c9ee1ff02e14f899e00d481b178b492aabb53a531387c730b7fe6bbe90c3b3568c89323cb7d414b050a51cbb06d363ab0b93fdef93f71f88c1dc SHA512 55d19c5d305aa277797d3b6fe92f0a43bedf44916a24719c722316ad31079a5df6d69bca319475fcd2b6c9cbd7f7ad5b9acb10b46e188d45c84ed9bb99528c04
diff --git a/app-metrics/exabgp_exporter/exabgp_exporter-1.0.0_p20200718.ebuild b/app-metrics/exabgp_exporter/exabgp_exporter-1.0.0_p20200718.ebuild
new file mode 100644
index 000000000000..6bc1e31ca114
--- /dev/null
+++ b/app-metrics/exabgp_exporter/exabgp_exporter-1.0.0_p20200718.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+DESCRIPTION="Prometheus exporter for exabgp"
+HOMEPAGE="https://github.com/lusis/exabgp_exporter"
+EGIT_COMMIT="6fe8ef056a87881c8d7568cba83b3c18f7165d3a"
+SRC_URI="https://github.com/lusis/exabgp_exporter/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_compile() {
+ CGO_ENABLED=0 go build \
+ -ldflags "-X github.com/prometheus/common/version.Version=${PV%_*}
+ -X github.com/prometheus/common/version.Revision=${EGIT_COMMIT} \
+ -X github.com/prometheus/common/version.Branch=master \
+ -X github.com/prometheus/common/version.BuildUser=$(whoami)
+ -X github.com/prometheus/common/version.BuildDate=$(date -u +'%FT%T%z')" \
+ -o ./bin/${PN} ./cmd/exabgp_exporter/main.go || die
+}
+
+src_install() {
+ dobin ./bin/${PN}
+ dodoc README.md
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+}
diff --git a/app-metrics/exabgp_exporter/exabgp_exporter-1.1.3.ebuild b/app-metrics/exabgp_exporter/exabgp_exporter-1.1.3.ebuild
new file mode 100644
index 000000000000..87ba58aa1fa2
--- /dev/null
+++ b/app-metrics/exabgp_exporter/exabgp_exporter-1.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Prometheus exporter for exabgp"
+HOMEPAGE="https://github.com/gizmoguy/exabgp_exporter"
+SRC_URI="https://github.com/gizmoguy/exabgp_exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+ CGO_ENABLED=0 go build \
+ -ldflags "-X github.com/prometheus/common/version.Version=${PV%_*}
+ -X github.com/prometheus/common/version.Branch=master \
+ -X github.com/prometheus/common/version.BuildUser=$(whoami)
+ -X github.com/prometheus/common/version.BuildDate=$(date -u +'%FT%T%z')" \
+ -o ./bin/${PN} ./cmd/exabgp_exporter/main.go || die
+}
+
+src_install() {
+ dobin ./bin/${PN}
+ dodoc README.md
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+}
diff --git a/app-metrics/exabgp_exporter/files/exabgp_exporter.confd b/app-metrics/exabgp_exporter/files/exabgp_exporter.confd
new file mode 100644
index 000000000000..213b394ea25a
--- /dev/null
+++ b/app-metrics/exabgp_exporter/files/exabgp_exporter.confd
@@ -0,0 +1,2 @@
+#command_args="standalone"
+#command_user="exabgp:exabgp"
diff --git a/app-metrics/exabgp_exporter/files/exabgp_exporter.initd b/app-metrics/exabgp_exporter/files/exabgp_exporter.initd
new file mode 100644
index 000000000000..b54e95b46222
--- /dev/null
+++ b/app-metrics/exabgp_exporter/files/exabgp_exporter.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus exporter for exabgp"
+command="/usr/bin/exabgp_exporter"
+command_user="${command_user:-exabgp:exabgp}"
+command_args="${command_args:-standalone}"
+command_background=yes
+error_log="${error_log:-/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log}"
+output_log="${output_log:-/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log}"
+pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
+start_stop_daemon_args="--user ${command_user%:*} --group ${command_user#*:}"
+: "${supervisor:=supervise-daemon}"
+: "${respawn_delay:=5}"
+: "${respawn_max:=0}"
+
+start() {
+ checkpath --directory --owner "${command_user}" "${error_log%/*}" "${output_log%/*}"
+ default_start
+}
diff --git a/app-metrics/exabgp_exporter/files/exabgp_exporter.service b/app-metrics/exabgp_exporter/files/exabgp_exporter.service
new file mode 100644
index 000000000000..f5c7d0d6f82a
--- /dev/null
+++ b/app-metrics/exabgp_exporter/files/exabgp_exporter.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Prometheus exporter for exabgp
+Documentation=https://github.com/lusis/exabgp_exporter/blob/master/README.md
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+EnvironmentFile=-/etc/systemd/system/exabgp_exporter.service.env
+Environment=command_args="standalone"
+TimeoutStartSec=0
+Restart=always
+RestartSec=5s
+ExecStart=/usr/bin/exabgp_exporter $command_args
diff --git a/app-metrics/exabgp_exporter/files/exabgp_exporter_at.service b/app-metrics/exabgp_exporter/files/exabgp_exporter_at.service
new file mode 100644
index 000000000000..17b13f089611
--- /dev/null
+++ b/app-metrics/exabgp_exporter/files/exabgp_exporter_at.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Prometheus exporter for exabgp instance %i
+Documentation=https://github.com/lusis/exabgp_exporter/blob/master/README.md
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+EnvironmentFile=-/etc/systemd/system/exabgp_exporter@%i.service.env
+Environment=command_args="standalone"
+TimeoutStartSec=0
+Restart=always
+RestartSec=5s
+ExecStart=/usr/bin/exabgp_exporter $command_args
diff --git a/app-metrics/exabgp_exporter/metadata.xml b/app-metrics/exabgp_exporter/metadata.xml
new file mode 100644
index 000000000000..ea2e61fb8d91
--- /dev/null
+++ b/app-metrics/exabgp_exporter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zmedico@gentoo.org</email>
+ <name>Zac Medico</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">gizmoguy/exabgp_exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/fritzbox_smarthome_exporter/Manifest b/app-metrics/fritzbox_smarthome_exporter/Manifest
new file mode 100644
index 000000000000..42013366b123
--- /dev/null
+++ b/app-metrics/fritzbox_smarthome_exporter/Manifest
@@ -0,0 +1,2 @@
+DIST fritzbox_smarthome_exporter-0.0.8-deps.tar.xz 26911468 BLAKE2B 9d00a6fd0b3a94b6e7e9f53ddb7dfc08e3e7a1956fc6c251d0772aed2e34bcfa20ac3d9e51e717eb35ed977b5d7d733f61dbd57b7b540e1ec0fa8609cd654804 SHA512 4ffe8439469afa0b6d40eea7614bfc5d93d95264e3c4632889dcd1301343e6034f94d8023cf8480ab6ea3128e97a7f122a3bbbc07f5e9ecd305afe8f681a8d34
+DIST fritzbox_smarthome_exporter-0.0.8.tar.gz 27272 BLAKE2B 5ac04ffd9a80a453a73f1b5428b0afecd65e9d5166a9b6ed042d63bff64822f0e7652e12dac67146ce11e6a1c0949229c3520e172283420ed8f9cc4a9a978310 SHA512 21e2e269e1e65845cd0d767b5d50c26646e0fcdb3959f7c76aeb221c4becf40490d21dfb839aa0c60b8577c3f7839d4a12a8e92c26f6ae969a514f006e2b7ba5
diff --git a/app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.confd b/app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.confd
new file mode 100644
index 000000000000..7e70595ec3ce
--- /dev/null
+++ b/app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.confd
@@ -0,0 +1,35 @@
+# /etc/conf.d/fritzbox_smarthome_exporter
+
+# PID file
+#EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+#EXPORTER_TERMTIMEOUT="TERM/60/KILL/5"
+
+# User to run exporter as
+#EXPORTER_USER="fritzbox_smarthome_exporter"
+
+# User group to run exporter as
+#EXPORTER_GROUP="fritzbox_smarthome_exporter"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+#EXPORTER_SSDARGS="--wait 1000"
+
+# Exporter flags
+# See `fritzbox_smarthome_exporter --help` for more details.
+# For username and password use dedicated variables below.
+EXPORTER_FLAGS="-url=\"https://fritz.box\""
+EXPORTER_FLAGS="${EXPORTER_FLAGS} -cert=/path/to/your/FRITZ!box/certificate.pem"
+
+# FRITZ!Box user
+# Restricted user account for the exporter to use to connect to your FRITZ!Box.
+FRITZBOX_USERNAME="smarthome_exporter"
+
+# FRITZ!Box user password
+# Password for FRITZBOX_USERNAME (see above).
+FRITZBOX_PASSWORD="secret_smarthome_exporter_user_password"
diff --git a/app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.initd b/app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.initd
new file mode 100644
index 000000000000..fa20e7b5cc47
--- /dev/null
+++ b/app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.initd
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus exporter for FRITZ!Box Smart Home"
+
+EXPORTER_FLAGS=${EXPORTER_FLAGS:-""}
+EXPORTER_USER=${EXPORTER_USER:-"fritzbox_smarthome_exporter"}
+EXPORTER_GROUP=${EXPORTER_GROUP:-"fritzbox_smarthome_exporter"}
+EXPORTER_PIDFILE=${EXPORTER_PIDFILE:-"/run/${RC_SVCNAME}.pid"}
+EXPORTER_SSDARGS=${EXPORTER_SSDARGS:-"--wait 1000"}
+EXPORTER_TERMTIMEOUT=${EXPORTER_TERMTIMEOUT:-"TERM/60/KILL/5"}
+
+command="/usr/bin/fritzbox_smarthome_exporter"
+command_args="${EXPORTER_FLAGS}"
+command_background="true"
+start_stop_daemon_args="${EXPORTER_SSDARGS}"
+start_stop_daemon_args="${start_stop_daemon_args} --user ${EXPORTER_USER}"
+start_stop_daemon_args="${start_stop_daemon_args} --group ${EXPORTER_GROUP}"
+
+start_stop_daemon_args="${start_stop_daemon_args} --stdout /var/log/fritzbox_smarthome_exporter/${RC_SVCNAME}.log"
+start_stop_daemon_args="${start_stop_daemon_args} --stderr /var/log/fritzbox_smarthome_exporter/${RC_SVCNAME}.log"
+
+getconfig() {
+ local key="$1"
+ local value_default="$2"
+ local value=
+
+ if service_started; then
+ value="$(service_get_value "${key}")"
+ fi
+
+ if [ -z "${value}" ]; then
+ # Value not explicitly set
+ echo "${value_default}"
+ else
+ echo "${value}"
+ fi
+}
+
+pidfile="$(getconfig pidfile ${EXPORTER_PIDFILE})"
+retry="$(getconfig retry ${EXPORTER_TERMTIMEOUT})"
+
+depend() {
+ after net
+ use dns
+}
+
+start_pre() {
+ if [ -n "${FRITZBOX_USERNAME}" ] && [ -n "${FRITZBOX_PASSWORD}" ] ; then
+ export USERNAME="${FRITZBOX_USERNAME}"
+ export PASSWORD="${FRITZBOX_PASSWORD}"
+ fi
+}
+
+start_post() {
+ service_set_value retry "${EXPORTER_TERMTIMEOUT}"
+}
diff --git a/app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.logrotate b/app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.logrotate
new file mode 100644
index 000000000000..8d5ee32096c9
--- /dev/null
+++ b/app-metrics/fritzbox_smarthome_exporter/files/fritzbox_smarthome_exporter.logrotate
@@ -0,0 +1,5 @@
+/var/log/fritzbox_smarthome_exporter/*.log {
+ missingok
+ notifempty
+ size 30k
+}
diff --git a/app-metrics/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.0.8.ebuild b/app-metrics/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.0.8.ebuild
new file mode 100644
index 000000000000..4ed9c6ba19df
--- /dev/null
+++ b/app-metrics/fritzbox_smarthome_exporter/fritzbox_smarthome_exporter-0.0.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="Prometheus exporter for FRITZ!Box Smart Home"
+HOMEPAGE="https://github.com/jayme-github/fritzbox_smarthome_exporter"
+SRC_URI="https://github.com/jayme-github/fritzbox_smarthome_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD GPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-util/promu"
+
+DEPEND="acct-group/fritzbox_smarthome_exporter
+ acct-user/fritzbox_smarthome_exporter"
+
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ go build -v -o bin/${PN} || die
+}
+
+src_test() {
+ go test -v ./... || die
+}
+
+src_install() {
+ dobin bin/*
+ einstalldocs
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+ # restrict access because conf.d entry could contain
+ # FRITZ!Box credentials
+ fperms 0640 /etc/conf.d/${PN}
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
diff --git a/app-metrics/fritzbox_smarthome_exporter/metadata.xml b/app-metrics/fritzbox_smarthome_exporter/metadata.xml
new file mode 100644
index 000000000000..bce410d43d1b
--- /dev/null
+++ b/app-metrics/fritzbox_smarthome_exporter/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <bugs-to>https://github.com/jayme-github/fritzbox_smarthome_exporter/issues</bugs-to>
+ <remote-id type="github">jayme-github/fritzbox_smarthome_exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/fusioninventory-agent/Manifest b/app-metrics/fusioninventory-agent/Manifest
new file mode 100644
index 000000000000..0b2878274ac1
--- /dev/null
+++ b/app-metrics/fusioninventory-agent/Manifest
@@ -0,0 +1 @@
+DIST fusioninventory-agent-2.5.2.tar.gz 2728830 BLAKE2B c6a26c4adb6b8e6bdaf829e46dffa47cc629731411f8b6e55a17eb83bd69536ca0e07899c5e3536ee3962326e643157c60ab8825971b2f44995e42f04e689321 SHA512 5bd39652fd3b857a4364fa300b07b8a2580bdafc6b84f95ab852b60b887ce8278bd99f85b74991b6da5cc21e1636f33c7125dbc27a02df915df4ea6f0ceffaed
diff --git a/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch b/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch
new file mode 100644
index 000000000000..a3a6b439713c
--- /dev/null
+++ b/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch
@@ -0,0 +1,51 @@
+diff -urN a/lib/FusionInventory/Agent/Config.pm b/lib/FusionInventory/Agent/Config.pm
+--- a/lib/FusionInventory/Agent/Config.pm 2020-05-27 11:09:31.969999393 -0000
++++ b/lib/FusionInventory/Agent/Config.pm 2020-05-27 11:09:39.833332729 -0000
+@@ -67,7 +67,7 @@
+ my ($class, %params) = @_;
+
+ my $self = {
+- '_confdir' => undef, # SYSCONFDIR replaced here from Makefile
++ '_confdir' => '/etc/fusioninventory', # SYSCONFDIR replaced here from Makefile
+ };
+ bless $self, $class;
+ $self->_loadDefaults();
+diff -urN a/lib/setup.pm b/lib/setup.pm
+--- a/lib/setup.pm 2020-05-27 11:09:31.989999393 -0000
++++ b/lib/setup.pm 2020-05-27 11:11:02.233332727 -0000
+@@ -11,9 +11,9 @@
+ our @EXPORT = ('%setup');
+
+ our %setup = (
+- datadir => './share',
++ datadir => '/usr/share/fusioninventory',
+ libdir => './lib',
+- vardir => './var',
++ vardir => '/var/lib/fusioninventory',
+ );
+
+ # Compute directly libdir from this setup file as it should be installed
+diff -urN a/Makefile.PL b/Makefile.PL
+--- a/Makefile.PL 2020-05-27 11:09:31.966666059 -0000
++++ b/Makefile.PL 2020-05-27 11:09:39.833332729 -0000
+@@ -170,18 +170,15 @@
+ INSTALLSCRIPT => '$(PREFIX)/bin',
+ INSTALLSITESCRIPT => '$(PREFIX)/bin',
+ INSTALLVENDORSCRIPT => '$(PREFIX)/bin',
+- INSTALLLIB => '$(DATADIR)/lib',
+- INSTALLSITELIB => '$(DATADIR)/lib',
+- INSTALLVENDORLIB => '$(DATADIR)/lib',
+ INSTALLMAN1DIR => '$(PREFIX)/share/man/man1',
+ INSTALLSITEMAN1DIR => '$(PREFIX)/share/man/man1',
+ INSTALLVENDORMAN1DIR => '$(PREFIX)/share/man/man1',
+ INSTALLMAN3DIR => '$(PREFIX)/share/man/man3',
+ INSTALLSITEMAN3DIR => '$(PREFIX)/share/man/man3',
+ INSTALLVENDORMAN3DIR => '$(PREFIX)/share/man/man3',
+- SYSCONFDIR => '$(PREFIX)/etc/fusioninventory',
++ SYSCONFDIR => '/etc/fusioninventory',
+ DATADIR => '$(PREFIX)/share/fusioninventory',
+- LOCALSTATEDIR => '$(PREFIX)/var/fusioninventory',
++ LOCALSTATEDIR => '/var/lib/fusioninventory',
+ );
+
+ # allow variables defined on command line to override defaults
diff --git a/app-metrics/fusioninventory-agent/files/fusioninventory-agent.confd b/app-metrics/fusioninventory-agent/files/fusioninventory-agent.confd
new file mode 100644
index 000000000000..8a68458e346c
--- /dev/null
+++ b/app-metrics/fusioninventory-agent/files/fusioninventory-agent.confd
@@ -0,0 +1,2 @@
+# additional args for fusioninventory-agent
+FUSIONINVENTORY_OPTIONS=""
diff --git a/app-metrics/fusioninventory-agent/files/fusioninventory-agent.initd b/app-metrics/fusioninventory-agent/files/fusioninventory-agent.initd
new file mode 100644
index 000000000000..58bd3bbf2b45
--- /dev/null
+++ b/app-metrics/fusioninventory-agent/files/fusioninventory-agent.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile=${RC_PREFIX%/}/run/${SVCNAME}.pid
+
+name="fusioninventory-agent daemon"
+description="FusionInventroy agent"
+command=/usr/bin/fusioninventory-agent
+command_args="--daemon --pidfile ${pidfile} ${FUSIONINVENTORY_OPTIONS}"
+extra_started_commands="reload"
+
+depend() {
+ need net
+}
+
+reload() {
+ ebegin "Reloading ${SVCNAME}"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $?
+}
diff --git a/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
new file mode 100644
index 000000000000..9756d4073782
--- /dev/null
+++ b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module systemd
+
+DESCRIPTION="The FusionInventory agent is a generic management agent"
+HOMEPAGE="http://fusioninventory.org/"
+SRC_URI="https://github.com/fusioninventory/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-perl/libwww-perl
+ dev-perl/File-Which
+ dev-perl/Net-IP
+ dev-perl/Text-Template
+ dev-perl/UNIVERSAL-require
+ dev-perl/XML-TreePP
+ dev-perl/XML-XPath
+ virtual/perl-IO-Compress
+ virtual/perl-threads
+ dev-perl/HTTP-Daemon
+ dev-perl/IO-Socket-SSL
+ dev-perl/LWP-Protocol-https
+ dev-perl/Proc-Daemon
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-perl/Module-Install
+ dev-perl/File-Copy-Recursive
+ app-portage/gentoolkit
+"
+
+PATCHES=( "${FILESDIR}/${P}-dirs.patch" )
+
+src_prepare() {
+ # gentoo has ip under /bin/ip and ifconfig under /bin/ifconfig
+ sed \
+ -e "s:/sbin/ifconfig:/bin/ifconfig:g" \
+ -e "s:/sbin/ip:/bin/ip:g" \
+ -i lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm \
+ -i lib/FusionInventory/Agent/Tools/Linux.pm || die
+ default
+}
+
+src_install() {
+ default
+ systemd_dounit contrib/unix/fusioninventory-agent.service
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ keepdir /var/lib/fusioninventory
+}
diff --git a/app-metrics/fusioninventory-agent/metadata.xml b/app-metrics/fusioninventory-agent/metadata.xml
new file mode 100644
index 000000000000..34f42ecf020c
--- /dev/null
+++ b/app-metrics/fusioninventory-agent/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>alexxy@gentoo.org</email>
+ <name>Alexey Shvetsov</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-metrics/github-exporter/Manifest b/app-metrics/github-exporter/Manifest
index 369d2e1e9b54..d77c1c82edbb 100644
--- a/app-metrics/github-exporter/Manifest
+++ b/app-metrics/github-exporter/Manifest
@@ -1,13 +1,2 @@
-DIST github-exporter-04.tar.gz 7023 BLAKE2B a2502fab29f7d987e7fe02a739d9d3bcc34376315581830033dc99d9c16be0bca52a30b8f491682de34ded4732c9216a05e8bfc1d2ac6510a22bd752a50bb5b9 SHA512 4837d78d058e8adb110ced899a9d136eed86aa3facf7258a6d7b392a3a61aa827662e63f8bd64b0ca44e6ed78518a6ae669068018ffc18d3bb42d19f4fb364be
-DIST github.com-beorn7-perks-3a771d9.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-fatih-structs-878a968.tar.gz 14629 BLAKE2B 673a25a39cab677bd275ccaf14675a1fa7847d1a089ceaa20cc981ca01a1cbba597e94467e7accdd1a4319acd44c5d7bd0f6e2de0eebd7fe2f43cc6cc9a94271 SHA512 3c00f10e17e6dd818422a6b8e1ef5454b3dd9cc78da22c56ec3c474bd7a590bb3dd56e803c01882b52ce12a6a4deda7935bbb786c3cebc2e60b379337a884752
-DIST github.com-golang-crypto-ff983b9.tar.gz 1645106 BLAKE2B 3d7271479ef812761a02c1d20429800cd29706e802a8ccf57e916bdb8befc87a9b1b1a88d42adb764a32fa5f4c5f5a5e434af63812a5bcd3de625658792a49a3 SHA512 19746e84901c0749da544ba02c74c8ccabfee5f186a0d00509e54f20c191da9ea56844de988265f072af1fae671d78d741a44f782b8c1704c9da0441436c2122
-DIST github.com-golang-protobuf-347cf4a.tar.gz 329489 BLAKE2B 828678cee603917e7f4efee2dd0902730a73932b94b12d4f4b35f0fcecaa329cdc39c3fa9926ce3706f86cc52c0aa4984f68ee0943ecc6d9571b0175ff671ab0 SHA512 de4307b91923a6890ab2f8eaf2ed4f7f32a45a4a0cc7b0d6f53ce31c5fe3ed08f378072075456d2c99c89a3b5acbca315814b8e5ec70e6ceb0ca62f7013f618c
-DIST github.com-golang-sys-48ac38b.tar.gz 1219195 BLAKE2B b632d935ed84ace8ddad5308556ddcfcca7b572fd1f65d8b5c39e9ba2b884c79f5c150cc3efa920654661b0958d894fa23445701dcd1d35f0f49ff4dda3bccd4 SHA512 8cea014c67df943dd68bb8787719acc0925f967f2cef552ae52c595ca4eda38adeab6c92b868822e08601cca20a61f16b78426d8b9252932168ffbd0f2403859
-DIST github.com-infinityworks-go-common-7f20a14.tar.gz 4072 BLAKE2B 79a788813840c8361e80ff882fff680ed83d3fe8485c09856290f0fa183438770210be600a3d6ae0d62e1a1027a43a6eef184d5a4b5f38fec9c15d54f16d384e SHA512 a8bc3d11eead090807bd7b64a71d7b078836e807b2a18ebb8e1b1ef286e920e993d3fe734eeafeccd80c8644b4c466a73b1cf479a4932c84e0e5fc328e50fdd2
-DIST github.com-matttproud-golang_protobuf_extensions-c182aff.tar.gz 37541 BLAKE2B f78899afa1390aca6cb1b412271713c60107771d512ead83482e0bb1716d175b791b4b04bd24b7f469cc1a29176eadcf0545ac3bf166c5b350602420d3c05aec SHA512 141b1b781a4d1c59f5eb1af93c966343b80ed405a5f63774e6cda9f12c34536e892c7a84699d6cf2e9c775457a4c2ad5d5d0b4d302fc25a923ab81d46ad65580
-DIST github.com-prometheus-client_golang-d2ead25.tar.gz 131949 BLAKE2B 352e0ef2bd704f6c490e57520d415e89d950241c39f3cdf851524d4cca87c25c31bf2ffb77914981cb730cb474033f4551b50c5b6085e5e273c2d29aaab1f012 SHA512 ca89d613e8bc6cff928d9ce8d3d563c8277cb31756c66d8c0e6f6b6ce00c1405d10e465245ac63fd6889aeafae0d6914814384e94e127929fbcfd606a59e42a5
-DIST github.com-prometheus-client_model-f287a10.tar.gz 57203 BLAKE2B 2d56b90ced967f5f7a2c59bb330aaf8c56cf522091ee413ff27c22cb9e7d656080bd7d4dd2372938a873617054c7c98925e10fdc7996b136eaa4fd1b6482b734 SHA512 b4f900e725a638a7131eee1c6ff5bf550025b4d9e5bb2dd09149e91ce02a7aba458039c2162b6a1f9a6b6c7c8fc0fc29510b6c752caad51282a960d18860f960
-DIST github.com-prometheus-common-2998b13.tar.gz 87368 BLAKE2B fc6c6e197d4cc61afefa9fb8e3a8d6b36ab029f62e3cf9adf8359e4885554f94427f17218d45c90c9d7f4a6985b2e4143a4d304d39f806bd70d2c6f05de29bc2 SHA512 b2095da96596fc500ece6b331cda2558f8c813720853f2489aee3dec65de95eb13f7b0853e3812433fdc040f16990d2f05b2a6b8b41275210c504ff333ca625d
-DIST github.com-prometheus-procfs-b1a0a9a.tar.gz 61720 BLAKE2B 2f9b25506527aaf6e1bf560a1b680b958d1281acbaa2bb896bfea50b5b7de8992d10e8e812f8ae449ab67145c88179c15afe1f719851d1717b28963071088082 SHA512 5938b4a8fa9a5ee32be995fed0d0e6b26941765470aca4eda63a7c42db457e83da43fde2f33b2d4ded3545e5643f607ec7060406b0a1b15e64cc732bb2badd4a
-DIST github.com-sirupsen-logrus-eef6b76.tar.gz 38613 BLAKE2B 32ff02d46dcdf08b273c406323236b0750433bda16a5072e4161b166863f5a062817166dc871e15fb169bfdb95ff45f167bc30b2e259294e0a51111b8a78afd3 SHA512 e7ca358b72bebbf663af426a110cd8da22bf33e2ec14fb7337af75a1cdd4aecb371436b8cc83f04a52a52ced56c02a762b12c2fe5ae5e64d7aee261a7254b14e
+DIST github-exporter-1.0.3-deps.tar.xz 7786648 BLAKE2B 1dd1876f144e95602131f6f0ec11f4189a88a56821f4ee812b906a1d6d8494651465e416c409a998b19b48081ec8c53d5f11a51f8292002cb9fc50fc13fc4e81 SHA512 247b80369efe54e838868b0c94075031a4430d03f1c8ffefb686d94a6de70f5f288f79459a14f9c1331d2f1a3f9e865e5f7cbd658dc6f01bc7c6e893b5305af2
+DIST github-exporter-1.0.3.tar.gz 22089 BLAKE2B 69ac6a71fa8872c08cb24b6fa3e0aa79a8d49fdc626606f5ae1265cb654f73a320d53c1f934f3b2a116c713412f0cb278e27ed892da19b54ff09405abba5bfc4 SHA512 9b3ab36dc8c76e844afdb7f36099dca86f358072fb0ccc134e4ba6754b2a84122b700bb92607014eb2e21e1e3f3889f842e82cd612e66d223e31aef60d123220
diff --git a/app-metrics/github-exporter/github-exporter-04-r1.ebuild b/app-metrics/github-exporter/github-exporter-04-r1.ebuild
deleted file mode 100644
index f61b022c35f9..000000000000
--- a/app-metrics/github-exporter/github-exporter-04-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/infinityworks/github-exporter
-
-EGO_VENDOR=(
- "github.com/beorn7/perks 3a771d9"
- "github.com/fatih/structs 878a968"
- "github.com/golang/protobuf 347cf4a"
- "github.com/infinityworks/go-common 7f20a14"
- "github.com/matttproud/golang_protobuf_extensions c182aff"
- "github.com/prometheus/client_golang d2ead25"
- "github.com/prometheus/client_model f287a10"
- "github.com/prometheus/common 2998b13"
- "github.com/prometheus/procfs b1a0a9a"
- "github.com/sirupsen/logrus eef6b76"
- "golang.org/x/crypto ff983b9 github.com/golang/crypto"
- "golang.org/x/sys 48ac38b github.com/golang/sys"
-)
-
-inherit golang-build golang-vcs-snapshot user systemd
-
-DESCRIPTION="Github statistics exporter for prometheus"
-HOMEPAGE="https://github.com/infinityworks/github-exporter"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e 's/infinityworksltd/infinityworks/' \
- "src/${EGO_PN}/main.go" \
- "src/${EGO_PN}/config/config.go" \
- "src/${EGO_PN}/exporter/structs.go" \
- || die "sed failed"
- sed -i -e 's/Sirupsen/sirupsen/' \
- "src/${EGO_PN}/main.go" \
- "src/${EGO_PN}/config/config.go" \
- "src/${EGO_PN}/exporter/gather.go" \
- "src/${EGO_PN}/exporter/http.go" \
- "src/${EGO_PN}/exporter/prometheus.go" \
- || die "sed failed"
-}
-
-src_compile() {
- set -- env GOPATH="${S}" go build -v "${EGO_PN}"
- echo "$@"
- "$@" || die "build failed"
-}
-
-src_install() {
- dobin ${PN}
- cd "src/${EGO_PN}" || die
-dodoc *.md
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "Before you can use ${PN}, you must configure it in"
- elog "${EROOT}/etc/conf.d/${PN}"
- fi
-}
diff --git a/app-metrics/github-exporter/github-exporter-04.ebuild b/app-metrics/github-exporter/github-exporter-04.ebuild
deleted file mode 100644
index 6bc641ecb2f1..000000000000
--- a/app-metrics/github-exporter/github-exporter-04.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/infinityworks/github-exporter
-
-EGO_VENDOR=(
- "github.com/beorn7/perks 3a771d9"
- "github.com/fatih/structs 878a968"
- "github.com/golang/protobuf 347cf4a"
- "github.com/infinityworks/go-common 7f20a14"
- "github.com/matttproud/golang_protobuf_extensions c182aff"
- "github.com/prometheus/client_golang d2ead25"
- "github.com/prometheus/client_model f287a10"
- "github.com/prometheus/common 2998b13"
- "github.com/prometheus/procfs b1a0a9a"
- "github.com/sirupsen/logrus eef6b76"
- "golang.org/x/crypto ff983b9 github.com/golang/crypto"
- "golang.org/x/sys 48ac38b github.com/golang/sys"
-)
-
-inherit golang-build golang-vcs-snapshot systemd
-
-DESCRIPTION="Github statistics exporter for prometheus"
-HOMEPAGE="https://github.com/infinityworks/github-exporter"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e 's/infinityworksltd/infinityworks/' \
- "src/${EGO_PN}/main.go" \
- "src/${EGO_PN}/config/config.go" \
- "src/${EGO_PN}/exporter/structs.go" \
- || die "sed failed"
- sed -i -e 's/Sirupsen/sirupsen/' \
- "src/${EGO_PN}/main.go" \
- "src/${EGO_PN}/config/config.go" \
- "src/${EGO_PN}/exporter/gather.go" \
- "src/${EGO_PN}/exporter/http.go" \
- "src/${EGO_PN}/exporter/prometheus.go" \
- || die "sed failed"
-}
-
-src_compile() {
- set -- env GOPATH="${S}" go build -v "${EGO_PN}"
- echo "$@"
- "$@" || die "build failed"
-}
-
-src_install() {
- dobin ${PN}
- cd "src/${EGO_PN}" || die
-dodoc *.md
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "Before you can use ${PN}, you must configure it in"
- elog "${EROOT}/etc/conf.d/${PN}"
- fi
-}
diff --git a/app-metrics/github-exporter/github-exporter-1.0.3.ebuild b/app-metrics/github-exporter/github-exporter-1.0.3.ebuild
new file mode 100644
index 000000000000..52f961aa7341
--- /dev/null
+++ b/app-metrics/github-exporter/github-exporter-1.0.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+DESCRIPTION="Github statistics exporter for prometheus"
+HOMEPAGE="https://github.com/infinityworks/github-exporter"
+SRC_URI="https://github.com/infinityworks/github-exporter/archive/${PV}.tar.gz -> ${P}.tar.gz
+https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="acct-group/github-exporter
+ acct-user/github-exporter"
+
+ src_prepare() {
+ default
+ sed -i -e 's/-race//' Makefile || die 'sed failed'
+ }
+
+src_compile() {
+ ego build
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc *.md
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Before you can use ${PN}, you must configure it in"
+ elog "${EROOT}/etc/conf.d/${PN}"
+ fi
+}
diff --git a/app-metrics/github-exporter/metadata.xml b/app-metrics/github-exporter/metadata.xml
index c36c37139fad..db463f3eeb66 100644
--- a/app-metrics/github-exporter/metadata.xml
+++ b/app-metrics/github-exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
diff --git a/app-metrics/go-carbon/Manifest b/app-metrics/go-carbon/Manifest
new file mode 100644
index 000000000000..57f84fec0200
--- /dev/null
+++ b/app-metrics/go-carbon/Manifest
@@ -0,0 +1,2 @@
+DIST go-carbon-0.17.1.tar.gz 5074817 BLAKE2B 59b708ee2eeea486e3f4612efbe94e0592f920de3a194f7d89b4c92df88c65027373871a1503f9ce1027bc1695f19d86503de6da4789b7277780a08871f1c893 SHA512 d18e5768fa8942d3ad8039f2c8304797c488d892aae2d3bca64e2659d7bd432e9c8db14dae22eae86be9e6217b0ea567e2f40b4395c7123a7871f75afed82fc0
+DIST go-carbon-0.17.3.tar.gz 5426401 BLAKE2B 8f2ea61524b9fdc70c7d233d4e88c7190351c970cc787d80de14e51d4cc4ad94413774c7ca86fbf4910bffc3ad241b266772969305378afc289a146f7ad69318 SHA512 16e12099692da6a6b8df55816f5b7b91777c384ca292ea309c16513096e8601cb447e7ef4530466e6b989042efc4b31d8190290b35938d2e0e654f4ae6da70bb
diff --git a/app-metrics/go-carbon/files/go-carbon.confd b/app-metrics/go-carbon/files/go-carbon.confd
new file mode 100644
index 000000000000..41e5838dd249
--- /dev/null
+++ b/app-metrics/go-carbon/files/go-carbon.confd
@@ -0,0 +1,8 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+#CONFIG_FILE=/etc/go-carbon/go-carbon.conf
+
+# user and group to run go-carbon as
+#USER=carbon
+#GROUP=carbon
diff --git a/app-metrics/go-carbon/files/go-carbon.initd b/app-metrics/go-carbon/files/go-carbon.initd
new file mode 100644
index 000000000000..b45a1a5a5d17
--- /dev/null
+++ b/app-metrics/go-carbon/files/go-carbon.initd
@@ -0,0 +1,44 @@
+#!/sbin/openrc-run
+# Copyright 1999-2023 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Graphite whisper metrics storage and retrieval server."
+
+carbonapi_config=${CONFIG_FILE:-/etc/go-carbon/${SVCNAME}.conf}
+
+command="/usr/bin/go-carbon"
+command_args="-config ${carbonapi_config}"
+pidfile="/run/go-carbon/${SVCNAME}.pid"
+user=${USER:-carbon}
+group=${GROUP:-carbon}
+
+depend() {
+ need net
+ use dns
+}
+
+start_pre() {
+ mkdir -p "${pidfile%/*}"
+ mkdir -p /var/log/go-carbon
+ chown ${user}:${group} "${pidfile%/*}" /var/log/go-carbon
+}
+
+stop_post() {
+ rm -f "${pidfile}"
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --pidfile "${pidfile}" \
+ --make-pidfile --background \
+ --user ${user} --group ${group} \
+ --exec ${command} -- \
+ ${command_args}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --exec ${command} --pidfile "${pidfile}"
+ eend $?
+}
diff --git a/app-metrics/go-carbon/go-carbon-0.17.1.ebuild b/app-metrics/go-carbon/go-carbon-0.17.1.ebuild
new file mode 100644
index 000000000000..2402f67a999f
--- /dev/null
+++ b/app-metrics/go-carbon/go-carbon-0.17.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Golang implementation of Graphite/Carbon server"
+HOMEPAGE="https://github.com/go-graphite/go-carbon"
+SRC_URI="https://github.com/go-graphite/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ acct-group/carbon
+ acct-user/carbon"
+BDEPEND=""
+
+src_prepare() {
+ export BUILD="gentoo-${PVR}"
+
+ # bug 904050: -race conflicts with -buildmode=pie added by go-module
+ sed -i \
+ -e '/make run-test COMMAND="test -race"/d' \
+ -e '/make run-test COMMAND="vet"/d' \
+ Makefile || die
+
+ eapply_user
+}
+
+src_install() {
+ insinto /etc/go-carbon
+ doins "${S}"/go-carbon.conf.example
+ dobin go-carbon
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/go-carbon/go-carbon-0.17.3.ebuild b/app-metrics/go-carbon/go-carbon-0.17.3.ebuild
new file mode 100644
index 000000000000..2402f67a999f
--- /dev/null
+++ b/app-metrics/go-carbon/go-carbon-0.17.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Golang implementation of Graphite/Carbon server"
+HOMEPAGE="https://github.com/go-graphite/go-carbon"
+SRC_URI="https://github.com/go-graphite/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ acct-group/carbon
+ acct-user/carbon"
+BDEPEND=""
+
+src_prepare() {
+ export BUILD="gentoo-${PVR}"
+
+ # bug 904050: -race conflicts with -buildmode=pie added by go-module
+ sed -i \
+ -e '/make run-test COMMAND="test -race"/d' \
+ -e '/make run-test COMMAND="vet"/d' \
+ Makefile || die
+
+ eapply_user
+}
+
+src_install() {
+ insinto /etc/go-carbon
+ doins "${S}"/go-carbon.conf.example
+ dobin go-carbon
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/go-carbon/metadata.xml b/app-metrics/go-carbon/metadata.xml
new file mode 100644
index 000000000000..2a184bd0de98
--- /dev/null
+++ b/app-metrics/go-carbon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>grobian@gentoo.org</email>
+ <name>Fabian Groffen</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">go-graphite/go-carbon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/grok_exporter/Manifest b/app-metrics/grok_exporter/Manifest
index 87a8a5165a8c..c4f4b7215cd5 100644
--- a/app-metrics/grok_exporter/Manifest
+++ b/app-metrics/grok_exporter/Manifest
@@ -1,9 +1 @@
-DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-go-yaml-yaml-51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz 70766 BLAKE2B 3ea4412e259626b25145feacbe68b529d2bcf353bd098899c3a906d01f75bac5f93ec20967f7261feb388356d7b12fa945ec73822e21e029e38ce7c0b27855e7 SHA512 dec54681845fb5cdb159d44bf91cb703bb38a6af1821566d7b11a0668ee50247f542e3b7bfc21571198f9bda8ff31ce32cf67f98a8c906dee7ea9194643699f9
-DIST github.com-golang-protobuf-347cf4a86c1cb8d262994d8ef5924d4576c5b331.tar.gz 329489 BLAKE2B 828678cee603917e7f4efee2dd0902730a73932b94b12d4f4b35f0fcecaa329cdc39c3fa9926ce3706f86cc52c0aa4984f68ee0943ecc6d9571b0175ff671ab0 SHA512 de4307b91923a6890ab2f8eaf2ed4f7f32a45a4a0cc7b0d6f53ce31c5fe3ed08f378072075456d2c99c89a3b5acbca315814b8e5ec70e6ceb0ca62f7013f618c
-DIST github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz 37541 BLAKE2B f78899afa1390aca6cb1b412271713c60107771d512ead83482e0bb1716d175b791b4b04bd24b7f469cc1a29176eadcf0545ac3bf166c5b350602420d3c05aec SHA512 141b1b781a4d1c59f5eb1af93c966343b80ed405a5f63774e6cda9f12c34536e892c7a84699d6cf2e9c775457a4c2ad5d5d0b4d302fc25a923ab81d46ad65580
-DIST github.com-prometheus-client_golang-18d13eacc9cce330610a70daf4ed0fef2e846589.tar.gz 133489 BLAKE2B 75ba882c9378d9062ed510af425f39e81e1d980dbd183f4e1228110880b3143cac74fecaa5d224e8516afcab71886041d1fbcff0832c8ab604976bbf34977eb3 SHA512 80142c7e659c3213a0990f1f871b3578b2899b14c5082a04d8eb67048da768203bb7228b2fa33d2f49d0f57596f6ad12fed47b54790a3c16d8a4cd43eb35005d
-DIST github.com-prometheus-client_model-56726106282f1985ea77d5305743db7231b0c0a8.tar.gz 57192 BLAKE2B 83bbc3c756f993a8bbf3b3f4bd5437b466b8fddc1f434554f1138eb6a830dd76ac495ceaa8b8a324498b05513c4ae67d571f263cce2de5275d87cadc2bf9691a SHA512 531b3e185f96ef23c8d5791f3caa7ccbb78870811343a4630d79dcf3e217a1f9a176390752cbb427ba3550bebb984e31ade8529a2b56ea93af2ab6b7a2e98320
-DIST github.com-prometheus-common-2998b132700a7d019ff618c06a234b47c1f3f681.tar.gz 87368 BLAKE2B fc6c6e197d4cc61afefa9fb8e3a8d6b36ab029f62e3cf9adf8359e4885554f94427f17218d45c90c9d7f4a6985b2e4143a4d304d39f806bd70d2c6f05de29bc2 SHA512 b2095da96596fc500ece6b331cda2558f8c813720853f2489aee3dec65de95eb13f7b0853e3812433fdc040f16990d2f05b2a6b8b41275210c504ff333ca625d
-DIST github.com-prometheus-procfs-b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1.tar.gz 61720 BLAKE2B 2f9b25506527aaf6e1bf560a1b680b958d1281acbaa2bb896bfea50b5b7de8992d10e8e812f8ae449ab67145c88179c15afe1f719851d1717b28963071088082 SHA512 5938b4a8fa9a5ee32be995fed0d0e6b26941765470aca4eda63a7c42db457e83da43fde2f33b2d4ded3545e5643f607ec7060406b0a1b15e64cc732bb2badd4a
-DIST grok_exporter-0.2.6.tar.gz 478354 BLAKE2B 082331eb7606517fb103af7a74088bae75740ae77d2b1fdeaee87791c4a0be706883ca505cb723f3853d3786692477086183b303de0ad82833499b231fc55909 SHA512 5204974702a8d29cc80fb7857a46f3242c78019d8a37e18e595d4bfc2f64662dbd48f9e0d5cae7b2f4f2390c35b0d621a7212718bf3c88d675601af2977de874
+DIST grok_exporter-1.0.0_rc5.tar.gz 2324696 BLAKE2B 2042067127e18fb63d2ecc412fa75184b410e27a755fd06c3634c7b345c13b1bd1d000e323467d10cc5a0cf13363b6782c4c98532875158a793111fe56a36edd SHA512 5b4772aa4b147dadc2d8298d043cc8329cbfeb081dc9bc686c34e16ae0c8a4fa30e55478a8328293349fda2d3f785a5feeda22d5ea1722ab3fa586375b696a92
diff --git a/app-metrics/grok_exporter/files/grok_exporter.initd b/app-metrics/grok_exporter/files/grok_exporter.initd
index d38d0af63ab3..bd25c5170e9a 100644
--- a/app-metrics/grok_exporter/files/grok_exporter.initd
+++ b/app-metrics/grok_exporter/files/grok_exporter.initd
@@ -3,13 +3,13 @@
# Distributed under the terms of the GNU General Public License v2
description="Unstructured log data exporter for Prometheus"
-config_file="${config_file:-/etc/${RC_SVCNAME}/${RC_SVCNAME}.yml}"
+config_file="/etc/grok_exporter/${RC_SVCNAME}.yml"
command=/usr/bin/grok_exporter
command_background=yes
-command_user=${RC_SVCNAME}:${RC_SVCNAME}
+command_user=grok_exporter:grok_exporter
pidfile=/var/run/${RC_SVCNAME}.pid
-error_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-output_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+error_log="/var/log/grok_exporter/${RC_SVCNAME}.log"
+output_log="/var/log/grok_exporter/${RC_SVCNAME}.log"
required_files="${config_file}"
command_args="-config \"${config_file}\""
diff --git a/app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild b/app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild
deleted file mode 100644
index 328fd97b74fd..000000000000
--- a/app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN=github.com/fstab/grok_exporter
-EGO_REVISION=81c0afe
-EGO_VENDOR=(
- "github.com/prometheus/client_model 56726106282f1985ea77d5305743db7231b0c0a8"
- "github.com/prometheus/common 2998b132700a7d019ff618c06a234b47c1f3f681"
- "github.com/prometheus/client_golang 18d13eacc9cce330610a70daf4ed0fef2e846589"
- "github.com/prometheus/procfs b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1"
- "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d"
- "github.com/golang/protobuf 347cf4a86c1cb8d262994d8ef5924d4576c5b331"
- "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
- "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml" # branch v2.2.2
-)
-
-inherit user golang-build golang-vcs-snapshot
-
-DESCRIPTION="Unstructured log data exporter for Prometheus"
-HOMEPAGE="https://github.com/fstab/Grok_exporter"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-libs/oniguruma-6.9.0"
-RDEPEND=">=dev-libs/oniguruma-6.9.0:="
-
-RESTRICT="strip"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
- cd src/${EGO_PN} || die
- GOPATH="${S}" go build -ldflags="
- -X ${EGO_PN}/exporter.Version=${PV}
- -X ${EGO_PN}/exporter.BuildDate=$(date +%Y-%m-%d)
- -X ${EGO_PN}/exporter.Branch=master
- -X ${EGO_PN}/exporter.Revision=${EGO_REVISION}" || die "compile failed"
-}
-
-src_install() {
- cd src/${EGO_PN} || die
- dobin ${PN}
- dodoc -r *.md example
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
-keepdir /etc/"${PN}"
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "You need to create /etc/${PN}/${PN}.yml"
- elog "Please see /usr/share/doc/${PVR} for examples"
- fi
-}
diff --git a/app-metrics/grok_exporter/grok_exporter-1.0.0_rc5.ebuild b/app-metrics/grok_exporter/grok_exporter-1.0.0_rc5.ebuild
new file mode 100644
index 000000000000..04782b54343c
--- /dev/null
+++ b/app-metrics/grok_exporter/grok_exporter-1.0.0_rc5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+MY_PV=${PV/_rc/.RC}
+inherit go-module
+
+DESCRIPTION="Unstructured log data exporter for Prometheus"
+HOMEPAGE="https://github.com/fstab/Grok_exporter"
+SRC_URI="https://github.com/fstab/grok_exporter/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/grok_exporter
+ acct-user/grok_exporter"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/oniguruma-6.9.0"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-libs/oniguruma-6.9.0:="
+
+RESTRICT="strip"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+ ego build .
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc -r *.md example
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+keepdir /etc/"${PN}"
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "You need to create /etc/${PN}/${PN}.yml"
+ elog "Please see /usr/share/doc/${PVR} for examples"
+ fi
+}
diff --git a/app-metrics/grok_exporter/metadata.xml b/app-metrics/grok_exporter/metadata.xml
index c36c37139fad..114ebfe695bd 100644
--- a/app-metrics/grok_exporter/metadata.xml
+++ b/app-metrics/grok_exporter/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">fstab/Grok_exporter</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-metrics/memcached_exporter/Manifest b/app-metrics/memcached_exporter/Manifest
index cd83175830c9..52fb3495ac5d 100644
--- a/app-metrics/memcached_exporter/Manifest
+++ b/app-metrics/memcached_exporter/Manifest
@@ -1 +1,2 @@
-DIST memcached_exporter-0.5.0.tar.gz 1350752 BLAKE2B e9a326ca155e0e0a89dd556f0a97ba9bbe73e3e02a905497c55a5390be2cbf211dde9dda37355dd043b711258c78cf911c79ae898b6e0934f2d4b2ddef7ae946 SHA512 62ec7f9cefc88425ea3b53a634b2d5ff1534624b6e149c962372e81a7271fc1bf3c01c7d8641dc49250b8d124bec740b3c2768e62d51cfdc025a29f71a49b428
+DIST memcached_exporter-0.10.0-deps.tar.xz 24009256 BLAKE2B acdf45e6340e95601ecd5b1a7d5bc6d61ec5f323d01ebd0be54e151643a647dabe4705f70ad6b68c3df254deeb5103406809cf4f7080ca5f6c17765ed4024735 SHA512 e567b0a94d7ccc7b87b51bb08f165b88aae24338a2a28ca8f392057eda508407615d43d5d821ae7fd48ca2d50df2bf2b9d2acce3f7be23d12f79ac4ba09c7ed2
+DIST memcached_exporter-0.10.0.tar.gz 41003 BLAKE2B 497d1643ac7909cda5d82df5cb89dc09a7f961d3a6e7d60d8619f5f0ebce444e565bc00cb98843dd5f81a7618b38bc14dad9af4063bba58e24ae7e7db6a8de00 SHA512 53b913cb7f398dae5de5f3ccf6c468775a30528ff390cbd112dc7a9aba584c36cc7834b74ee1c1130e4ac19d63f01cc10ca5c6853480bdb130248ab7d0f0ba51
diff --git a/app-metrics/memcached_exporter/memcached_exporter-0.10.0.ebuild b/app-metrics/memcached_exporter/memcached_exporter-0.10.0.ebuild
new file mode 100644
index 000000000000..360145b9b2d3
--- /dev/null
+++ b/app-metrics/memcached_exporter/memcached_exporter-0.10.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=667bdef45c4e01380867f4be5bb0c7e0ece35dd6
+
+DESCRIPTION="Prometheus exporter for memcached"
+HOMEPAGE="https://github.com/prometheus/memcached_exporter"
+SRC_URI="https://github.com/prometheus/memcached_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-util/promu"
+DEPEND="acct-group/memcached_exporter
+ acct-user/memcached_exporter"
+RDEPEND="${DEPEND}"
+
+# tests require the memcached_exporter daemon to be running locally
+RESTRICT+=" test "
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/{{.Branch}}/HEAD/" \
+ -e "s/{{.Revision}}/${GIT_COMMIT}/" \
+ .promu.yml || die "sed failed"
+}
+
+src_compile() {
+ promu build -v --prefix bin || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc *.md
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild b/app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild
deleted file mode 100644
index b7ee78d65607..000000000000
--- a/app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build user
-
-EGO_PN=github.com/prometheus/memcached_exporter
-DESCRIPTION="Prometheus exporter for memcached"
-HOMEPAGE="https://github.com/prometheus/memcached_exporter"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-util/promu"
-
-RESTRICT="strip"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- mkdir -p "${HOME}/go/src/${EGO_PN%/*}" || die "mkdir failed"
- ln -snf "${S}" "${HOME}/go/src/${EGO_PN}" || die "ln failed"
- default
-}
-
-src_compile() {
- # needed since we use the default GOPATH
- unset GOPATH
- mkdir -p bin || die
- promu build -v --prefix bin || die
-}
-
-src_install() {
- newbin bin/${P} ${PN}
- dodoc *.md
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/memcached_exporter/metadata.xml b/app-metrics/memcached_exporter/metadata.xml
index c36c37139fad..0fe79eb261c2 100644
--- a/app-metrics/memcached_exporter/metadata.xml
+++ b/app-metrics/memcached_exporter/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">prometheus/memcached_exporter</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-metrics/metadata.xml b/app-metrics/metadata.xml
index 25becdd97f49..af1f84d9f1cf 100644
--- a/app-metrics/metadata.xml
+++ b/app-metrics/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
- The app-metrics category contains software generating, transforming or consuming application, service and system metrics.
+ The app-metrics category contains software generating,
+ transforming or consuming application, service and system
+ metrics.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie app-metrics enthält Software zur Erzeugung,
+ Transformation oder Verwendung von Anwendungs-, Service-
+ und Systemmetriken.
</longdescription>
</catmetadata>
-
diff --git a/app-metrics/mongodb_exporter/Manifest b/app-metrics/mongodb_exporter/Manifest
index b94ed40612d2..81cf71b6f0e8 100644
--- a/app-metrics/mongodb_exporter/Manifest
+++ b/app-metrics/mongodb_exporter/Manifest
@@ -1 +1,3 @@
-DIST mongodb_exporter-0.6.2.tar.gz 1296198 BLAKE2B 4cd04b5e69788f2bbe3e87eafe6a7cf4f0a2e72abff4784176299e46943eac2219141beed2f8d11cc8a2458737456d8edaed42a5392bedd017e85315dc75ba1d SHA512 52c1464af82c09fc79338e805e62936d4da8131cea1bb6608500fa36a2d4069676eace5da0ed1b14d82de9d626be301b42c7bc1d5c620bbecb47ae9a350ecd65
+DIST mongodb_exporter-0.11.1.tar.gz 2640277 BLAKE2B 8ae0418466462d4dfebe97d48b47d0a163435f1776bceb6d35ab50d98cefa0bf737f57fc74aadebf16c285e2dd63fe2e4719571db7c5a9f942e740dab7509d91 SHA512 81a9c5877bba6e85fcdcc9e3781bbec82b255710e8292ea377ea9c9234526b7ad521350f8bd36ae7773f76f40b650cd724d552020e17feb61210ed6197be5172
+DIST mongodb_exporter-0.39.0-deps.tar.xz 100818596 BLAKE2B 65be5f2ac1d24838f88b3c1338d5d5bba3a02f76c8edf46605104f834950961d635e736b7ab7afcaed66834853a7ff7465b36d34afa863d1caeb32c428c24ef2 SHA512 32c04138a92d63a22daada9fbe3fb3433cbc5192dbd22854275e298b7c3e37310116249e7ba86c78055a97c5c0a903a5d15cb2ae2c01cf2cc752f050daebb920
+DIST mongodb_exporter-0.39.0.tar.gz 166721 BLAKE2B 39d2dfab342119fd14fb0f90097062770e86502c8ffffb73789e356e32248efacc30c1c0cf1c0216be25fbb021e82f80435f902f1f0beba698844e14ada206e0 SHA512 103f1d8e42ddd04f8be7def199b16ad017bce79139b16bde50c1a0f6cc24c025ec26b644d9db0134ca37233d3e87b3921177445c1d863a040d817fcd4c851e75
diff --git a/app-metrics/mongodb_exporter/metadata.xml b/app-metrics/mongodb_exporter/metadata.xml
index 5857176f4249..6c4621760a0b 100644
--- a/app-metrics/mongodb_exporter/metadata.xml
+++ b/app-metrics/mongodb_exporter/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
<upstream>
<remote-id type="github">percona/mongodb_exporter</remote-id>
</upstream>
diff --git a/app-metrics/mongodb_exporter/mongodb_exporter-0.11.1.ebuild b/app-metrics/mongodb_exporter/mongodb_exporter-0.11.1.ebuild
new file mode 100644
index 000000000000..30b674765a5d
--- /dev/null
+++ b/app-metrics/mongodb_exporter/mongodb_exporter-0.11.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+COMMIT=f5e8ebea31d6fa128ae3a2fb1b747fdf4b782b2b
+BRANCH=0.11.0
+
+DESCRIPTION="Prometheus exporter for MongoDB"
+HOMEPAGE="https://github.com/percona/mongodb_exporter"
+SRC_URI="https://github.com/percona/mongodb_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 AGPL-3 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/mongodb_exporter
+ acct-user/mongodb_exporter"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+ GOFLAGS="${GOFLAGS} -mod=vendor" emake \
+ TRAVIS_TAG="${PV}" \
+ APP_REVISION=${COMMIT} \
+ TRAVIS_BRANCH=${BRANCH} \
+ build
+}
+
+src_install() {
+ dobin bin/${PN}
+ dodoc {README,CHANGELOG}.md
+ keepdir /var/log/mongodb_exporter
+ fowners ${PN}:${PN} /var/log/mongodb_exporter
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/mongodb_exporter/mongodb_exporter-0.39.0.ebuild b/app-metrics/mongodb_exporter/mongodb_exporter-0.39.0.ebuild
new file mode 100644
index 000000000000..b6e21b89f0ab
--- /dev/null
+++ b/app-metrics/mongodb_exporter/mongodb_exporter-0.39.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+# update these on every bump
+BRANCH='tags/v0.39.0^0'
+COMMIT=430098a28613273e386563a84c57b9e84dc1a298
+
+DESCRIPTION="Prometheus exporter for MongoDB"
+HOMEPAGE="https://github.com/percona/mongodb_exporter"
+SRC_URI="https://github.com/percona/mongodb_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 AGPL-3 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/mongodb_exporter
+ acct-user/mongodb_exporter"
+ DEPEND="${COMMON_DEPEND}"
+ RDEPEND="${COMMON_DEPEND}"
+
+ # tests require docker compose
+ RESTRICT="test"
+
+src_compile() {
+ emake \
+ COMPONENT_BRANCH=${BRANCH} \
+ COMPONENT_VERSION=${PV} \
+ PMM_RELEASE_FULLCOMMIT=${COMMIT} \
+ build
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc CHANGELOG {CONTRIBUTING,README,REFERENCE}.md
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ keepdir /var/log/mongodb_exporter
+ fowners ${PN}:${PN} /var/log/mongodb_exporter
+}
diff --git a/app-metrics/mongodb_exporter/mongodb_exporter-0.6.2.ebuild b/app-metrics/mongodb_exporter/mongodb_exporter-0.6.2.ebuild
deleted file mode 100644
index 4f780222d44f..000000000000
--- a/app-metrics/mongodb_exporter/mongodb_exporter-0.6.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN=github.com/percona/mongodb_exporter
-EXPORTER_COMMIT=a642618
-
-DESCRIPTION="Prometheus exporter for MongoDB"
-HOMEPAGE="https://github.com/percona/mongodb_exporter"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/mongodb_exporter
- dodoc {README,CHANGELOG}.md
- popd || die
- keepdir /var/log/mongodb_exporter
- fowners ${PN}:${PN} /var/log/mongodb_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/mysqld_exporter/Manifest b/app-metrics/mysqld_exporter/Manifest
index e9ac6d5ab2d9..a470a6d98450 100644
--- a/app-metrics/mysqld_exporter/Manifest
+++ b/app-metrics/mysqld_exporter/Manifest
@@ -1,2 +1,7 @@
-DIST mysqld_exporter-0.10.0.tar.gz 971604 BLAKE2B ec077b7b6a15f6173e5cc04e741c51c4d26a214601da8eb1aede49ee325f52bea2140b8e5b3bdbc2a1e527e40c95099dca2a57501d44a26e787cdc330f4aa8b8 SHA512 0a7b0ff537ad59a9b64aa18dfe1d1eb9253b12ae566d5c151555fbd4457b7e65890b6569632b452ae317b3acbfa94c12d96f6fb6e4f982b9b2161fc4747330f5
-DIST mysqld_exporter-0.11.0.tar.gz 1393809 BLAKE2B ac6b04d2ad24f1c083c411f10bbb6724c2458be357ff60e1950aa624955497432295726e7f739dff03aa1ed8290d852a9511e01893f5a2b293e79b3214270578 SHA512 69f39ecc1b17bfcfd3acdad9d92a70c1daf3f0c9690770fa390a818bd29f43a98bfe4856f22b48e9d2d9945ce98ded0ea54c95010755a85ebc3ebfdc353d0c24
+DIST mysqld_exporter-0.12.1_p20200622.tar.gz 1640334 BLAKE2B fa52fd7474af548bc9429026d7c92bc543cff7f2e2f5e17007a52adc647d6d022a4ec9d099376cc469b4fdc8bab285e0e699a1b10938fc6b7a6704dcc1466a50 SHA512 ccac9a718214c9ab82362deeb81949cecaa6c2fc6567ef7e3d099ca2dbf8385cb9c498837e41ad0bcdf5ec2c9d82fd159792245b97e53c182a30917e80a20cf1
+DIST mysqld_exporter-0.14.0-vendor.tar.xz 1434948 BLAKE2B 9bf1c9dc728aeae678ed42cf75e7dcca1758d1ace02159992c0e11b0c4942a6f5eacad86255225f9ffc023904731165bf7e8a845b9031306c21fa2796911790c SHA512 0bc3735108be955b4056d23df9f9ed593f5e495afeec846944eb4b2c4731db45723e1a3904fb621a4ba7c80dd93eccbcfc02657863271c6c306cf94a54a5fafc
+DIST mysqld_exporter-0.14.0.tar.gz 100413 BLAKE2B 7c995fd538c217964f4d7537961c3d16cb1d9250808832a90eaec251f20f52b5704f38a64b338067cbae2824ea07099a62e5c5083d76bceb9d3c00fed670e7e3 SHA512 91728055fd66d3ba2d8c6f48eac24dcdbe710e627cb3c28af100fec1656064aafedbcfcfcb8c2f164dab9c3870c1867728e33afd57889644b27ceaadf0c59629
+DIST mysqld_exporter-0.14.0_p20221209.tar.gz 103942 BLAKE2B c4184aea6aa3b750dfbba594725d82af6580bfe1424d1e8f9da19cbbec8c1e35f114da562a3c29799df9329df5a248bcf6788df2bdab9d0cc474eac187a395a4 SHA512 8ef068367259e643aba2295d1f087f09b0c61f1534421bfb8400d46c865750d6f115031b445f1f32864e3fb87c80462d4d755f657d289b9144dc7a030ff81b0a
+DIST mysqld_exporter-0.14.0_p20230328.tar.gz 92865 BLAKE2B 490219444b14006a356fa423b21c851693cf97f9aa6a9d20e8ee732ae8af5aed07aeda04a3419aebe26051f00c60f5655c3479c4ec3d5a2c9c18b44218cdc3b4 SHA512 a12aeb676ba81732310599344292f8cd5680abd14d8b380ae2d57198530de1969a5712619eca195e5d7b65abf518de7877789f494a9a4fbcebf42e3c8e35dac8
+DIST mysqld_exporter-530e351d293dd632f31b80947f5ca420ef17adaf-vendor.tar.xz 1441316 BLAKE2B 8d023ff291c47f30dc6216a255f050591ea585e0c58ca484a8cdb2e0be125f7daabe570b93d786936b6ea59d3996e45210c3ef41932758d05c302bfef2656e81 SHA512 6224d96223b4e38e35626f627c2de1b8ac08294d127556d0c6e73978648296f9a99f21a1aa323053ab07d17642af54ab2d8243bb3d3a9c06919612256fdc32dc
+DIST mysqld_exporter-fad2c0ccd8c0df8fed91a81463e930e4485fdfee-vendor.tar.xz 1473744 BLAKE2B 64f4f9dfee04522dbebdc9682c2619cc0f5c63b0835cfca50a37d0cce542e6a926968e23fe94a13d2e76cfbf931026cdcff74823c6c464b1b2f551bf0c70a5cf SHA512 aa10101fd5bc5a2fdef367c855f85d10ebb38b8a92969c5ebf786f011a287f9992559805b8ed24ea39da4db8aedbaf12893a2c6049ea7e90e989adf1ed13d79f
diff --git a/app-metrics/mysqld_exporter/files/mysqld_exporter-0.12.1-skip-tests.patch b/app-metrics/mysqld_exporter/files/mysqld_exporter-0.12.1-skip-tests.patch
new file mode 100644
index 000000000000..ea59067cb288
--- /dev/null
+++ b/app-metrics/mysqld_exporter/files/mysqld_exporter-0.12.1-skip-tests.patch
@@ -0,0 +1,22 @@
+--- a/collector/exporter_test.go
++++ b/collector/exporter_test.go
+@@ -71,6 +71,8 @@ func TestExporter(t *testing.T) {
+ }
+
+ func TestGetMySQLVersion(t *testing.T) {
++ t.Skip("Test requires running mysqld")
++
+ if testing.Short() {
+ t.Skip("-short is passed, skipping test")
+ }
+--- a/mysqld_exporter_test.go
++++ b/mysqld_exporter_test.go
+@@ -142,6 +142,8 @@ type bin struct {
+
+ // TestBin builds, runs and tests binary.
+ func TestBin(t *testing.T) {
++ t.Skip("Test requires network access")
++
+ var err error
+ binName := "mysqld_exporter"
+
diff --git a/app-metrics/mysqld_exporter/metadata.xml b/app-metrics/mysqld_exporter/metadata.xml
index adebc721a7e3..7fc6c5654241 100644
--- a/app-metrics/mysqld_exporter/metadata.xml
+++ b/app-metrics/mysqld_exporter/metadata.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
+ <email>robbat2@gentoo.org</email>
</maintainer>
<upstream>
<remote-id type="github">prometheus/mysqld_exporter</remote-id>
diff --git a/app-metrics/mysqld_exporter/mysqld_exporter-0.10.0-r1.ebuild b/app-metrics/mysqld_exporter/mysqld_exporter-0.10.0-r1.ebuild
deleted file mode 100644
index 77a69fda97f7..000000000000
--- a/app-metrics/mysqld_exporter/mysqld_exporter-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/mysqld_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-MYSQLD_EXPORTER_COMMIT="8068006"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for MySQL server metrics"
-HOMEPAGE="https://github.com/prometheus/mysqld_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/mysqld_exporter ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/mysqld_exporter
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- popd || die
-
- keepdir /var/lib/mysqld_exporter /var/log/mysqld_exporter
- fowners ${PN}:${PN} /var/lib/mysqld_exporter /var/log/mysqld_exporter
- fperms 0770 /var/lib/mysqld_exporter
-
- newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- elog "Create \"${EROOT%/}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file."
- fi
-}
diff --git a/app-metrics/mysqld_exporter/mysqld_exporter-0.11.0.ebuild b/app-metrics/mysqld_exporter/mysqld_exporter-0.12.1_p20200622.ebuild
index 3571c885d167..03752da0489d 100644
--- a/app-metrics/mysqld_exporter/mysqld_exporter-0.11.0.ebuild
+++ b/app-metrics/mysqld_exporter/mysqld_exporter-0.12.1_p20200622.ebuild
@@ -1,46 +1,53 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
-inherit eapi7-ver user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/mysqld_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-MYSQLD_EXPORTER_COMMIT="8068006"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+EAPI=7
+inherit go-module
+# uncomment the first setting of MY_PV for a normal release
+# MY_PV="v${PV/_rc/-rc.}"
+# set MY_PV to the full commit hash for a snapshot release
+MY_PV=f5d5289f7627016d8b53b0b3fa7615da8a73b56a
+MYSQLD_EXPORTER_COMMIT=f5d5289f
DESCRIPTION="Prometheus exporter for MySQL server metrics"
HOMEPAGE="https://github.com/prometheus/mysqld_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+SRC_URI="https://github.com/prometheus/mysqld_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
SLOT="0"
+KEYWORDS="~amd64"
IUSE=""
-DEPEND="dev-util/promu"
+BDEPEND="dev-util/promu"
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/mysqld_exporter ${PN}
-}
+DEPEND="acct-group/mysqld_exporter
+ acct-user/mysqld_exporter"
+
+RDEPEND="${DEPEND}"
+
+# Comment this for a normal release.
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-skip-tests.patch )
src_prepare() {
default
- sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+
+ sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" .promu.yml || die
}
src_compile() {
- pushd src/${EGO_PN} || die
mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
+
+ promu build --prefix bin || die
+
+ # comment this for a normal release.
+ mv bin/${PN}-${MY_PV} bin/${PN} || die
}
src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/mysqld_exporter
+ dobin bin/*
dodoc {README,CHANGELOG,CONTRIBUTING}.md
- popd || die
keepdir /var/lib/mysqld_exporter /var/log/mysqld_exporter
fowners ${PN}:${PN} /var/lib/mysqld_exporter /var/log/mysqld_exporter
@@ -56,7 +63,7 @@ src_install() {
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
# This is a new installation
- elog "Create \"${EROOT%/}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file."
+ elog "Create \"${EROOT}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file."
else
local _replacing_version=
for _replacing_version in ${REPLACING_VERSIONS}; do
diff --git a/app-metrics/mysqld_exporter/mysqld_exporter-0.14.0.ebuild b/app-metrics/mysqld_exporter/mysqld_exporter-0.14.0.ebuild
new file mode 100644
index 000000000000..b382ce4510de
--- /dev/null
+++ b/app-metrics/mysqld_exporter/mysqld_exporter-0.14.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+# uncomment the first setting of MY_PV for a normal release
+# MY_PV="v${PV/_rc/-rc.}"
+# set MY_PV to the full commit hash for a snapshot release
+MY_PV_HASH=
+if [[ -n "${MY_PV_HASH}" ]]; then
+ MY_PV=${MY_PV_HASH}
+ MYSQLD_EXPORTER_COMMIT=${MY_PV_HASH:0:8}
+ SRC_URI_UPSTREAM="https://github.com/prometheus/mysqld_exporter/archive/${MY_PV}.tar.gz"
+else
+ MY_PV=${PV}
+ MYSQLD_EXPORTER_COMMIT=
+ SRC_URI_UPSTREAM="https://github.com/prometheus/mysqld_exporter/archive/refs/tags/v${PV}.tar.gz"
+fi
+MY_P=${PN}-${MY_PV}
+SRC_URI_VENDOR="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}-vendor.tar.xz"
+
+DESCRIPTION="Prometheus exporter for MySQL server metrics"
+HOMEPAGE="https://github.com/prometheus/mysqld_exporter"
+SRC_URI="
+ ${SRC_URI_UPSTREAM} -> ${P}.tar.gz
+ ${SRC_URI_VENDOR}
+ "
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="dev-util/promu"
+
+DEPEND="acct-group/mysqld_exporter
+ acct-user/mysqld_exporter"
+
+RDEPEND="${DEPEND}"
+
+# Comment this for a normal release.
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-skip-tests.patch )
+
+src_prepare() {
+ default
+
+ if [[ -n $MYSQLD_EXPORTER_COMMIT ]]; then
+ sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" .promu.yml || die
+ fi
+}
+
+src_compile() {
+ mkdir -p bin || die
+
+ promu build --prefix bin || die
+
+ # comment this for a normal release.
+ mv bin/${PN}-${MY_PV} bin/${PN} || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc {README,CHANGELOG,CONTRIBUTING}.md
+
+ keepdir /var/lib/mysqld_exporter /var/log/mysqld_exporter
+ fowners ${PN}:${PN} /var/lib/mysqld_exporter /var/log/mysqld_exporter
+ fperms 0770 /var/lib/mysqld_exporter
+
+ newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}-r1.confd ${PN}
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ elog "Create \"${EROOT}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file."
+ else
+ local _replacing_version=
+ for _replacing_version in ${REPLACING_VERSIONS}; do
+ if ! ver_test "${_replacing_version}" -ge "0.11.0"; then
+ elog "Starting with ${PN}-0.11.0, command-line flags will require double dashes (--)."
+ elog "You must update your configuration or ${PN} won't start."
+
+ break
+ fi
+ done
+ fi
+}
diff --git a/app-metrics/mysqld_exporter/mysqld_exporter-0.14.0_p20221209.ebuild b/app-metrics/mysqld_exporter/mysqld_exporter-0.14.0_p20221209.ebuild
new file mode 100644
index 000000000000..0a23dedb6d98
--- /dev/null
+++ b/app-metrics/mysqld_exporter/mysqld_exporter-0.14.0_p20221209.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+# uncomment the first setting of MY_PV for a normal release
+# MY_PV="v${PV/_rc/-rc.}"
+# set MY_PV to the full commit hash for a snapshot release
+MY_PV_HASH=530e351d293dd632f31b80947f5ca420ef17adaf
+if [[ -n "${MY_PV_HASH}" ]]; then
+ MY_PV=${MY_PV_HASH}
+ MYSQLD_EXPORTER_COMMIT=${MY_PV_HASH:0:8}
+ SRC_URI_UPSTREAM="https://github.com/prometheus/mysqld_exporter/archive/${MY_PV}.tar.gz"
+else
+ MY_PV=$PV
+ MYSQLD_EXPORTER_COMMIT=
+ SRC_URI_UPSTREAM="https://github.com/prometheus/mysqld_exporter/archive/refs/tags/v${PV}.tar.gz"
+fi
+MY_P=${PN}-${MY_PV}
+SRC_URI_VENDOR="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}-vendor.tar.xz"
+
+DESCRIPTION="Prometheus exporter for MySQL server metrics"
+HOMEPAGE="https://github.com/prometheus/mysqld_exporter"
+SRC_URI="
+ ${SRC_URI_UPSTREAM} -> ${P}.tar.gz
+ ${SRC_URI_VENDOR}
+ "
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="dev-util/promu"
+
+DEPEND="acct-group/mysqld_exporter
+ acct-user/mysqld_exporter"
+
+RDEPEND="${DEPEND}"
+
+# Comment this for a normal release.
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-skip-tests.patch )
+
+src_prepare() {
+ default
+
+ if [[ -n $MYSQLD_EXPORTER_COMMIT ]]; then
+ sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" .promu.yml || die
+ fi
+}
+
+src_compile() {
+ mkdir -p bin || die
+
+ promu build --prefix bin || die
+
+ # comment this for a normal release.
+ mv bin/${PN}-${MY_PV} bin/${PN} || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc {README,CHANGELOG,CONTRIBUTING}.md
+
+ keepdir /var/lib/mysqld_exporter /var/log/mysqld_exporter
+ fowners ${PN}:${PN} /var/lib/mysqld_exporter /var/log/mysqld_exporter
+ fperms 0770 /var/lib/mysqld_exporter
+
+ newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}-r1.confd ${PN}
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ elog "Create \"${EROOT}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file."
+ else
+ local _replacing_version=
+ for _replacing_version in ${REPLACING_VERSIONS}; do
+ if ! ver_test "${_replacing_version}" -ge "0.11.0"; then
+ elog "Starting with ${PN}-0.11.0, command-line flags will require double dashes (--)."
+ elog "You must update your configuration or ${PN} won't start."
+
+ break
+ fi
+ done
+ fi
+}
diff --git a/app-metrics/mysqld_exporter/mysqld_exporter-0.14.0_p20230328.ebuild b/app-metrics/mysqld_exporter/mysqld_exporter-0.14.0_p20230328.ebuild
new file mode 100644
index 000000000000..8a16a9c55685
--- /dev/null
+++ b/app-metrics/mysqld_exporter/mysqld_exporter-0.14.0_p20230328.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+# uncomment the first setting of MY_PV for a normal release
+# MY_PV="v${PV/_rc/-rc.}"
+# set MY_PV to the full commit hash for a snapshot release
+MY_PV_HASH=fad2c0ccd8c0df8fed91a81463e930e4485fdfee
+: ${MY_PV_HASH_FOR_VENDOR:=${MY_PV_HASH}}
+if [[ -n "${MY_PV_HASH}" ]]; then
+ MY_PV=${MY_PV_HASH}
+ MYSQLD_EXPORTER_COMMIT=${MY_PV_HASH:0:8}
+ SRC_URI_UPSTREAM="https://github.com/prometheus/mysqld_exporter/archive/${MY_PV}.tar.gz"
+else
+ MY_PV=$PV
+ MYSQLD_EXPORTER_COMMIT=
+ SRC_URI_UPSTREAM="https://github.com/prometheus/mysqld_exporter/archive/refs/tags/v${PV}.tar.gz"
+fi
+MY_P=${PN}-${MY_PV}
+SRC_URI_VENDOR="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}-vendor.tar.xz"
+
+DESCRIPTION="Prometheus exporter for MySQL server metrics"
+HOMEPAGE="https://github.com/prometheus/mysqld_exporter"
+SRC_URI="
+ ${SRC_URI_UPSTREAM} -> ${P}.tar.gz
+ ${SRC_URI_VENDOR}
+ "
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="dev-util/promu"
+
+DEPEND="acct-group/mysqld_exporter
+ acct-user/mysqld_exporter"
+
+RDEPEND="${DEPEND}"
+
+# Comment this for a normal release.
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-skip-tests.patch )
+
+src_prepare() {
+ default
+
+ if [[ -n $MYSQLD_EXPORTER_COMMIT ]]; then
+ sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" .promu.yml || die
+ fi
+}
+
+src_compile() {
+ mkdir -p bin || die
+
+ promu build --prefix bin || die
+
+ # comment this for a normal release.
+ mv bin/${PN}-${MY_PV} bin/${PN} || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc {README,CHANGELOG,CONTRIBUTING}.md
+
+ keepdir /var/lib/mysqld_exporter /var/log/mysqld_exporter
+ fowners ${PN}:${PN} /var/lib/mysqld_exporter /var/log/mysqld_exporter
+ fperms 0770 /var/lib/mysqld_exporter
+
+ newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}-r1.confd ${PN}
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ elog "Create \"${EROOT}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file."
+ else
+ local _replacing_version=
+ for _replacing_version in ${REPLACING_VERSIONS}; do
+ if ! ver_test "${_replacing_version}" -ge "0.11.0"; then
+ elog "Starting with ${PN}-0.11.0, command-line flags will require double dashes (--)."
+ elog "You must update your configuration or ${PN} won't start."
+
+ break
+ fi
+ done
+ fi
+}
diff --git a/app-metrics/nftables-exporter/Manifest b/app-metrics/nftables-exporter/Manifest
new file mode 100644
index 000000000000..3b35b188deb9
--- /dev/null
+++ b/app-metrics/nftables-exporter/Manifest
@@ -0,0 +1,2 @@
+DIST nftables-exporter-0.2.7-deps.tar.xz 6611016 BLAKE2B c6d5593bcf29f846044fd11602eb38f7296f46394cb61c04c7877b0d100d4f33f5bbccbcb374d267fa87da600c2afe00b1c0f6acb494d078c2cb8f2fe73baa6d SHA512 0039135b52e0f77316a68f482094620531be1a7ef1cbd713905f140fea09627fde4544b0c25ed964950682be905a758f22384e0159bbcf8ee2a9f57c3a7f5f43
+DIST nftables-exporter-0.2.7.tar.gz 22061 BLAKE2B 142c834a77b563d6c57b72a5ec45c88e0542121d334c0b02a6acc18fea7902efad8080e0b3b01a2a519a4cd376938da58fc4b7b3fc2260300a5bc64469c993ee SHA512 69192df420b294b4c3b345999505111f149c00a5d68773b6f958d16b39505c937377075fe4e299688b97f5c12f0bbdac59bdb9bd0447b62f6d76c0bc55caa318
diff --git a/app-metrics/nftables-exporter/files/nftables-exporter.initd b/app-metrics/nftables-exporter/files/nftables-exporter.initd
new file mode 100644
index 000000000000..9d16ccc199ab
--- /dev/null
+++ b/app-metrics/nftables-exporter/files/nftables-exporter.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 2023 Gentoo authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus nftables metrics exporter"
+
+command="/usr/bin/nftables-exporter"
+command_background="true"
+error_log="/var/log/nftables-exporter/nftables-exporter.log"
+output_log="/var/log/nftables-exporter/nftables-exporter.log"
+pidfile=${pidfile:-"/run/nftables_exporter.pid"}
+
+depend() {
+ after net
+}
diff --git a/app-metrics/nftables-exporter/metadata.xml b/app-metrics/nftables-exporter/metadata.xml
new file mode 100644
index 000000000000..012a8ab6c6f8
--- /dev/null
+++ b/app-metrics/nftables-exporter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">metal-stack/nftables-exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/nftables-exporter/nftables-exporter-0.2.7.ebuild b/app-metrics/nftables-exporter/nftables-exporter-0.2.7.ebuild
new file mode 100644
index 000000000000..2714026e1004
--- /dev/null
+++ b/app-metrics/nftables-exporter/nftables-exporter-0.2.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+# make sure these are updated based on the Makefile in every bump.
+GITVERSION=tags/v0.2.7-0-ga173315
+SHA=a1733152
+
+DESCRIPTION="prometheus exporter for nftables metrics"
+HOMEPAGE="https://github.com/metal-stack/nftables-exporter"
+SRC_URI="https://github.com/metal-stack/nftables-exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="net-firewall/nftables"
+BDEPEND=">=dev-lang/go-1.21"
+
+src_prepare() {
+ default
+ sed -i -e '/strip bin\//d' Makefile
+}
+
+src_compile() {
+ emake \
+ GONAME=${PN} \
+ GITVERSION=${GITVERSION} \
+ SHA=${SHA} \
+ VERSION=v${PV} \
+ all
+}
+
+src_install() {
+dobin bin/${PN}
+insinto etc
+doins nftables_exporter.yaml
+systemd_dounit systemd/nftables-exporter.service
+newinitd "${FILESDIR}"/${PN}.initd ${PN}
+keepdir /var/log/${PN}
+}
diff --git a/app-metrics/nginx-lua-prometheus/metadata.xml b/app-metrics/nginx-lua-prometheus/metadata.xml
index c36c37139fad..f914d62ef5af 100644
--- a/app-metrics/nginx-lua-prometheus/metadata.xml
+++ b/app-metrics/nginx-lua-prometheus/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">knyar/nginx-lua-prometheus</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild b/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610-r100.ebuild
index b8af9afe146c..cd6f311c9ea0 100644
--- a/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild
+++ b/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610-r100.ebuild
@@ -1,13 +1,17 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+# This should be kept in sync with implementations supported
+# by www-servers/nginx
+LUA_COMPAT=( luajit )
+
# This is the upstream tag which corresponds to this release.
# It needs to be updated with every bump.
TAG="0.1-20170610"
-inherit toolchain-funcs
+inherit lua-single
DESCRIPTION="Library that exports Nginx metrics to Prometheus"
HOMEPAGE="https://github.com/knyar/nginx-lua-prometheus"
@@ -17,17 +21,19 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
-COMMON_DEPEND=">=dev-lang/lua-5.1:="
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+COMMON_DEPEND="${LUA_DEPS}"
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
- www-servers/nginx[nginx_modules_http_lua]"
+ www-servers/nginx[nginx_modules_http_lua,${LUA_SINGLE_USEDEP}]"
BDEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
- S="${WORKDIR}/${PN}-${TAG}"
+S="${WORKDIR}/${PN}-${TAG}"
src_install() {
- insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
+ insinto "$(lua_get_lmod_dir)"/${PN}
doins prometheus.lua
dodoc *.md
}
diff --git a/app-metrics/nginx-vts-exporter/Manifest b/app-metrics/nginx-vts-exporter/Manifest
index a5b7ce07890b..a3904c3213ab 100644
--- a/app-metrics/nginx-vts-exporter/Manifest
+++ b/app-metrics/nginx-vts-exporter/Manifest
@@ -1 +1 @@
-DIST nginx-vts-exporter-0.10.3.tar.gz 149578 BLAKE2B c73a8cfdb875fcc02d3b7d66f5b436b9e3e8d516c8a241062721e3124452722e9e30abefd5c79e89772a480fad005d0cf25d0359dd253a39d7ae5a20495f074a SHA512 0ee97be313dc829ae9e23bc836d7e11106c4843306583ff8baa38fa10bd9d56396ae3f6ce12cad4e08a383047c3179013962284aef6e627b23b89c72c564789e
+DIST nginx-vts-exporter-0.10.7.tar.gz 436116 BLAKE2B 0b6306f20c429fb30e166a6862d7b050f80f6fa47ef2db07d9cd883dfc92e70e2099b99bcab2e7530f1350da955abd1abbbf538613691d2ba76bcccaca2837e7 SHA512 54145aa7c4298e1ab65087c42258b690649e0e374d7bcc4abc426a128878849921afecd4bd25cca67ca2b3c65e3abb2786c09d4ffe811cbbec65e7257fe9a043
diff --git a/app-metrics/nginx-vts-exporter/metadata.xml b/app-metrics/nginx-vts-exporter/metadata.xml
index 84e9178fec4a..50f8ceb59936 100644
--- a/app-metrics/nginx-vts-exporter/metadata.xml
+++ b/app-metrics/nginx-vts-exporter/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
<upstream>
<remote-id type="github">hnlq715/nginx-vts-exporter</remote-id>
</upstream>
diff --git a/app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.3.ebuild b/app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.7-r1.ebuild
index 87d75798a8d7..73b7421fdceb 100644
--- a/app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.3.ebuild
+++ b/app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.7-r1.ebuild
@@ -1,45 +1,42 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
+EAPI=7
+inherit go-module
EGO_PN="github.com/hnlq715/nginx-vts-exporter"
-EXPORTER_COMMIT="8aa2881c7050d9b28f2312d7ce99d93458611d04"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+EXPORTER_COMMIT=b935b793fbd8478d3feea529b036e753169ddabd
DESCRIPTION="Nginx virtual host traffic stats exporter for Prometheus"
HOMEPAGE="https://github.com/hnlq715/nginx-vts-exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 BSD"
SLOT="0"
+KEYWORDS="~amd64"
IUSE=""
-DEPEND="dev-util/promu"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
+BDEPEND="dev-util/promu"
+COMMON_DEPEND="acct-group/nginx-vts-exporter
+ acct-user/nginx-vts-exporter"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
src_prepare() {
default
- sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+ sed -i \
+ -e "/-s$/d" \
+ -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" \
+ .promu.yml || die
}
src_compile() {
- pushd src/${EGO_PN} || die
mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
+ promu build -v --prefix bin || die
}
src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/${PN}
+ newbin bin/${P} ${PN}
dodoc README.md
- popd || die
keepdir /var/log/${PN}
fowners ${PN}:${PN} /var/log/${PN}
newinitd "${FILESDIR}"/${PN}.initd ${PN}
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index 16f019568051..51ab0df8392f 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,3 +1,4 @@
-DIST node_exporter-0.17.0.tar.gz 1758763 BLAKE2B 4c5d994e9b57bfd52353681b786149f6972abcdef908b872420172864b53875f26aff291ce76fe4a8b8d134ff1157e15cb45d50a4b552f1c72c8dfe55005d725 SHA512 8650fa24014f317b23cdbe2a6f12da0912ffc74cab815d1c94fdc0a3dc01ac1dff42a454af2ebbd4d402b7834d227bcf91ebdefa630ebe997cfd478e05ee01e5
-DIST node_exporter-0.18.0.tar.gz 2104908 BLAKE2B 3062e48e656f3a7b4c5b3ae8744ae9283d340b14f245a42b6de54832aaa0bfc126cf5a9eb566269237042cffd4e5afe85f85e9d7814896507d7d4d38e5d09d02 SHA512 9c6f9f82b0d3f5147cef8cc933ab9d7854065782f83b9821d4ae394a5101c45de6c8e8fcdc53d076af0c8683c47030557ec8e2bd27386a81a815d714e0f88987
-DIST node_exporter-0.18.1.tar.gz 2110072 BLAKE2B 48c73d00cba892e34e95d40bd29c9ca70bc5748590f00cb7f8adcd25d8a9504f669d887b1273cc65316ca55b06c36d97a3e19a66382f35d5768db7c315981a13 SHA512 cf2b854fbec1ba39b18432cdc11ab507ebc5b2828e6b34b4f49af9b949fcd365cb3e5eb1e265d0825783810c6b1572a8b3512ec27a46e5c83f89a505590159c0
+DIST node_exporter-1.7.0-deps.tar.xz 26490120 BLAKE2B 3177aa96a50eefaeafad73b293144772443428b8c1b90210230e3e508a678f5515aebec1c51661d47a1e021cd03c8febe9aa948cc3d955eff2b2f272a539b6af SHA512 9fe19ad0fc375f4846fddb7618de5b34ddad583b5c6b09d896c099c3218976fd337c11765699a713c66bbaa834b6cfcaee960b1b1d4014be263b99b897fb1e1c
+DIST node_exporter-1.7.0.tar.gz 328830 BLAKE2B 5f6b8101637bc0df605ea84446f905fcf8abeb68d0f2eda1e172b12aae4cffcfef54996f8725ad458671947c72a48fbbd73d4d401d8fd001e9e9d75f248230fc SHA512 4cd38b81cb54ca620a57c642a88b89d6d1ae36a752fff5f065c8848ea02066a211c6feb955bea4e311f7baafffee30a74670efe1cf4dac113c9bf7d154a1067b
+DIST node_exporter-1.8.0-deps.tar.xz 1684580 BLAKE2B 0c02ca1177444885556da08676e78a413952955bfa80d9d7a9026133059594eaddd6f43fe10783701c71d0ecf2be9ac9383d019daeb287d5d016bd1188e5b37c SHA512 7268139beec7bf088ae4819809221985d1920e38b60db75cc074e92ce4dbe573c362f5227f095b4e5d1de7005b8ec2fbf96d3dcdf565eb2c9524d71676e1752e
+DIST node_exporter-1.8.0.tar.gz 335029 BLAKE2B 639edfec973e7412620da855c997e1e50ccb5fc4afc4070c44ab3fbb9b4925103719c87f813e092db3548cd55b779233fbf71bf3affc6b779ba0e45f4767ec32 SHA512 4774ff3e146665783044769235b9d4f538ba3ff1d7c9fdfb33e5546042846371c7d26efa8a6d672e6de3c5a10107c2e72e5bbf38ed2952a5c48eda81fdc1379a
diff --git a/app-metrics/node_exporter/files/01-default-settings-1.7.0.patch b/app-metrics/node_exporter/files/01-default-settings-1.7.0.patch
new file mode 100644
index 000000000000..114c6d23423e
--- /dev/null
+++ b/app-metrics/node_exporter/files/01-default-settings-1.7.0.patch
@@ -0,0 +1,133 @@
+Grabbed from https://salsa.debian.org/go-team/packages/prometheus-node-exporter/-/tree/debian/sid/debian/patches
+Only thing changed is textFileDirectory default path adapted for Gentoo
+##############
+Description: Set defaults that make sense for Debian systems.
+ We remove the deprecated options completely because they were introduced in
+ 1.0.0 and were never part of a stable release, and are causing issues with
+ the default value setting as it then makes the code consider it a usage and
+ errors out when the legacy option is used.
+Forwarded: not-needed
+---
+ collector/filesystem_linux.go | 2 +-
+ collector/netdev_common.go | 22 +---------------------
+ collector/systemd_linux.go | 23 ++---------------------
+ collector/textfile.go | 2 +-
+ 4 files changed, 5 insertions(+), 44 deletions(-)
+
+--- a/collector/filesystem_linux.go
++++ b/collector/filesystem_linux.go
+@@ -33,7 +33,7 @@ import (
+ )
+
+ const (
+- defMountPointsExcluded = "^/(dev|proc|run/credentials/.+|sys|var/lib/docker/.+|var/lib/containers/storage/.+)($|/)"
++ defMountPointsExcluded = "^/(dev|proc|run|sys|mnt|media|var/lib/docker/.+|var/lib/containers/storage/.+)($|/)"
+ defFSTypesExcluded = "^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$"
+ )
+
+--- a/collector/netdev_common.go
++++ b/collector/netdev_common.go
+@@ -32,9 +32,7 @@ import (
+
+ var (
+ netdevDeviceInclude = kingpin.Flag("collector.netdev.device-include", "Regexp of net devices to include (mutually exclusive to device-exclude).").String()
+- oldNetdevDeviceInclude = kingpin.Flag("collector.netdev.device-whitelist", "DEPRECATED: Use collector.netdev.device-include").Hidden().String()
+- netdevDeviceExclude = kingpin.Flag("collector.netdev.device-exclude", "Regexp of net devices to exclude (mutually exclusive to device-include).").String()
+- oldNetdevDeviceExclude = kingpin.Flag("collector.netdev.device-blacklist", "DEPRECATED: Use collector.netdev.device-exclude").Hidden().String()
++ netdevDeviceExclude = kingpin.Flag("collector.netdev.device-exclude", "Regexp of net devices to exclude (mutually exclusive to device-include).").Default("^lo$").String()
+ netdevAddressInfo = kingpin.Flag("collector.netdev.address-info", "Collect address-info for every device").Bool()
+ netdevDetailedMetrics = kingpin.Flag("collector.netdev.enable-detailed-metrics", "Use (incompatible) metric names that provide more detailed stats on Linux").Bool()
+ )
+@@ -55,24 +53,6 @@ func init() {
+
+ // NewNetDevCollector returns a new Collector exposing network device stats.
+ func NewNetDevCollector(logger log.Logger) (Collector, error) {
+- if *oldNetdevDeviceInclude != "" {
+- if *netdevDeviceInclude == "" {
+- level.Warn(logger).Log("msg", "--collector.netdev.device-whitelist is DEPRECATED and will be removed in 2.0.0, use --collector.netdev.device-include")
+- *netdevDeviceInclude = *oldNetdevDeviceInclude
+- } else {
+- return nil, errors.New("--collector.netdev.device-whitelist and --collector.netdev.device-include are mutually exclusive")
+- }
+- }
+-
+- if *oldNetdevDeviceExclude != "" {
+- if *netdevDeviceExclude == "" {
+- level.Warn(logger).Log("msg", "--collector.netdev.device-blacklist is DEPRECATED and will be removed in 2.0.0, use --collector.netdev.device-exclude")
+- *netdevDeviceExclude = *oldNetdevDeviceExclude
+- } else {
+- return nil, errors.New("--collector.netdev.device-blacklist and --collector.netdev.device-exclude are mutually exclusive")
+- }
+- }
+-
+ if *netdevDeviceExclude != "" && *netdevDeviceInclude != "" {
+ return nil, errors.New("device-exclude & device-include are mutually exclusive")
+ }
+--- a/collector/systemd_linux.go
++++ b/collector/systemd_linux.go
+@@ -18,7 +18,6 @@ package collector
+
+ import (
+ "context"
+- "errors"
+ "fmt"
+ "math"
+ "regexp"
+@@ -47,13 +46,11 @@ var (
+ systemdUnitIncludeSet = true
+ return nil
+ }).String()
+- oldSystemdUnitInclude = kingpin.Flag("collector.systemd.unit-whitelist", "DEPRECATED: Use --collector.systemd.unit-include").Hidden().String()
+ systemdUnitExcludeSet bool
+- systemdUnitExclude = kingpin.Flag("collector.systemd.unit-exclude", "Regexp of systemd units to exclude. Units must both match include and not match exclude to be included.").Default(".+\\.(automount|device|mount|scope|slice)").PreAction(func(c *kingpin.ParseContext) error {
++ systemdUnitExclude = kingpin.Flag("collector.systemd.unit-exclude", "Regexp of systemd units to exclude. Units must both match include and not match exclude to be included.").Default(".+\\.(automount|device|mount|scope|slice|target)").PreAction(func(c *kingpin.ParseContext) error {
+ systemdUnitExcludeSet = true
+ return nil
+ }).String()
+- oldSystemdUnitExclude = kingpin.Flag("collector.systemd.unit-blacklist", "DEPRECATED: Use collector.systemd.unit-exclude").Hidden().String()
+ systemdPrivate = kingpin.Flag("collector.systemd.private", "Establish a private, direct connection to systemd without dbus (Strongly discouraged since it requires root. For testing purposes only).").Hidden().Bool()
+ enableTaskMetrics = kingpin.Flag("collector.systemd.enable-task-metrics", "Enables service unit tasks metrics unit_tasks_current and unit_tasks_max").Bool()
+ enableRestartsMetrics = kingpin.Flag("collector.systemd.enable-restarts-metrics", "Enables service unit metric service_restart_total").Bool()
+@@ -83,7 +80,7 @@ type systemdCollector struct {
+ var unitStatesName = []string{"active", "activating", "deactivating", "inactive", "failed"}
+
+ func init() {
+- registerCollector("systemd", defaultDisabled, NewSystemdCollector)
++ registerCollector("systemd", defaultEnabled, NewSystemdCollector)
+ }
+
+ // NewSystemdCollector returns a new Collector exposing systemd statistics.
+@@ -133,22 +130,6 @@ func NewSystemdCollector(logger log.Logg
+ prometheus.BuildFQName(namespace, subsystem, "version"),
+ "Detected systemd version", []string{"version"}, nil)
+
+- if *oldSystemdUnitExclude != "" {
+- if !systemdUnitExcludeSet {
+- level.Warn(logger).Log("msg", "--collector.systemd.unit-blacklist is DEPRECATED and will be removed in 2.0.0, use --collector.systemd.unit-exclude")
+- *systemdUnitExclude = *oldSystemdUnitExclude
+- } else {
+- return nil, errors.New("--collector.systemd.unit-blacklist and --collector.systemd.unit-exclude are mutually exclusive")
+- }
+- }
+- if *oldSystemdUnitInclude != "" {
+- if !systemdUnitIncludeSet {
+- level.Warn(logger).Log("msg", "--collector.systemd.unit-whitelist is DEPRECATED and will be removed in 2.0.0, use --collector.systemd.unit-include")
+- *systemdUnitInclude = *oldSystemdUnitInclude
+- } else {
+- return nil, errors.New("--collector.systemd.unit-whitelist and --collector.systemd.unit-include are mutually exclusive")
+- }
+- }
+ level.Info(logger).Log("msg", "Parsed flag --collector.systemd.unit-include", "flag", *systemdUnitInclude)
+ systemdUnitIncludePattern := regexp.MustCompile(fmt.Sprintf("^(?:%s)$", *systemdUnitInclude))
+ level.Info(logger).Log("msg", "Parsed flag --collector.systemd.unit-exclude", "flag", *systemdUnitExclude)
+--- a/collector/textfile.go
++++ b/collector/textfile.go
+@@ -33,7 +33,7 @@ import (
+ )
+
+ var (
+- textFileDirectory = kingpin.Flag("collector.textfile.directory", "Directory to read text files with metrics from.").Default("").String()
++ textFileDirectory = kingpin.Flag("collector.textfile.directory", "Directory to read text files with metrics from.").Default("/var/lib/node_exporter").String()
+ mtimeDesc = prometheus.NewDesc(
+ "node_textfile_mtime_seconds",
+ "Unixtime mtime of textfiles successfully read.",
diff --git a/app-metrics/node_exporter/files/node_exporter-1.7.0.logrotate b/app-metrics/node_exporter/files/node_exporter-1.7.0.logrotate
new file mode 100644
index 000000000000..82cad3ace322
--- /dev/null
+++ b/app-metrics/node_exporter/files/node_exporter-1.7.0.logrotate
@@ -0,0 +1,9 @@
+/var/log/node_exporter/node_exporter.log {
+ weekly
+ rotate 10
+ copytruncate
+ compress
+ delaycompress
+ notifempty
+ missingok
+}
diff --git a/app-metrics/node_exporter/files/node_exporter-1.7.0.service b/app-metrics/node_exporter/files/node_exporter-1.7.0.service
new file mode 100644
index 000000000000..b1723196b9db
--- /dev/null
+++ b/app-metrics/node_exporter/files/node_exporter-1.7.0.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=Prometheus exporter for machine metrics
+Documentation=https://github.com/prometheus/node_exporter
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=node_exporter
+Group=node_exporter
+Restart=on-failure
+Type=exec
+ExecStart=/usr/sbin/node_exporter --collector.textfile.directory=/var/lib/node_exporter
+ExecReload=/usr/bin/kill -HUP $MAINPID
+TimeoutStopSec=20s
+SendSIGKILL=no
+NoNewPrivileges=true
+ProtectHome=read-only
+ProtectSystem=strict
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/node_exporter/files/node_exporter-1.initd b/app-metrics/node_exporter/files/node_exporter.initd-1
index f38a9fe133d9..6e9de80da590 100644
--- a/app-metrics/node_exporter/files/node_exporter-1.initd
+++ b/app-metrics/node_exporter/files/node_exporter.initd-1
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
+# Copyright 2016-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
description="Prometheus machine metrics exporter"
@@ -7,12 +7,12 @@ pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
user=${user:-${RC_SVCNAME}}
group=${group:-${RC_SVCNAME}}
-command="/usr/bin/node_exporter"
+command="/usr/sbin/node_exporter"
command_args="${command_args:---collector.textfile.directory=/var/lib/node_exporter/}"
command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
- --stdout /var/log/node_exporter/${RC_SVCNAME}.log \
- --stderr /var/log/node_exporter/${RC_SVCNAME}.log"
+command_user="${user}:${group}"
+output_log="/var/log/node_exporter/${RC_SVCNAME}.log"
+error_log="/var/log/node_exporter/${RC_SVCNAME}.log"
depend() {
after net
diff --git a/app-metrics/node_exporter/metadata.xml b/app-metrics/node_exporter/metadata.xml
index d758c8dfc417..8e9812c67467 100644
--- a/app-metrics/node_exporter/metadata.xml
+++ b/app-metrics/node_exporter/metadata.xml
@@ -1,11 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
</maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>me@rahil.rocks</email>
+ <name>Rahil Bhimjiani</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="systemd">
+ Enables systemd collector by default
+ </flag>
+ </use>
<upstream>
<remote-id type="github">prometheus/node_exporter</remote-id>
+ <bugs-to>https://github.com/prometheus/node_exporter/issues</bugs-to>
+ <doc>https://github.com/prometheus/node_exporter/blob/master/README.md</doc>
</upstream>
</pkgmetadata>
diff --git a/app-metrics/node_exporter/node_exporter-0.17.0-r1.ebuild b/app-metrics/node_exporter/node_exporter-0.17.0-r1.ebuild
deleted file mode 100644
index 6cd46a01032a..000000000000
--- a/app-metrics/node_exporter/node_exporter-0.17.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/prometheus/node_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="f6f6194"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
- dev-util/promu"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v --prefix node_exporter || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin node_exporter/node_exporter
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- systemd_dounit examples/systemd/node_exporter.service
- insinto /etc/sysconfig/node_exporter
- doins examples/systemd/sysconfig.node_exporter
- popd || die
- keepdir /var/lib/node_exporter /var/log/node_exporter
- fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
- newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/node_exporter/node_exporter-0.18.0.ebuild b/app-metrics/node_exporter/node_exporter-0.18.0.ebuild
deleted file mode 100644
index 37e6de0eb379..000000000000
--- a/app-metrics/node_exporter/node_exporter-0.18.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/prometheus/node_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="f97f01c"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
- >=dev-util/promu-0.3.0"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v --prefix node_exporter || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin node_exporter/node_exporter
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- systemd_dounit examples/systemd/node_exporter.service
- insinto /etc/sysconfig/node_exporter
- doins examples/systemd/sysconfig.node_exporter
- popd || die
- keepdir /var/lib/node_exporter /var/log/node_exporter
- fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
- newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/node_exporter/node_exporter-0.18.1.ebuild b/app-metrics/node_exporter/node_exporter-0.18.1.ebuild
deleted file mode 100644
index 661535b60380..000000000000
--- a/app-metrics/node_exporter/node_exporter-0.18.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/prometheus/node_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="3db7773"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
- >=dev-util/promu-0.3.0"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v --prefix node_exporter || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin node_exporter/node_exporter
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- systemd_dounit examples/systemd/node_exporter.service
- insinto /etc/sysconfig/node_exporter
- doins examples/systemd/sysconfig.node_exporter
- popd || die
- keepdir /var/lib/node_exporter /var/log/node_exporter
- fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
- newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/node_exporter/node_exporter-1.7.0-r2.ebuild b/app-metrics/node_exporter/node_exporter-1.7.0-r2.ebuild
new file mode 100644
index 000000000000..9e3f1d237576
--- /dev/null
+++ b/app-metrics/node_exporter/node_exporter-1.7.0-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/prometheus/node_exporter.git"
+else
+ SRC_URI="https://github.com/prometheus/node_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 MIT"
+SLOT="0"
+IUSE="selinux systemd"
+
+COMMON_DEPEND="
+ acct-group/node_exporter
+ acct-user/node_exporter
+ selinux? ( sec-policy/selinux-node_exporter )
+ systemd? ( sys-apps/systemd )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-util/promu-0.3.0"
+
+src_unpack() {
+ if [[ ${PV} == 9999* ]]; then
+ git-r3_src_unpack
+ go-module_live_vendor
+ else
+ go-module_src_unpack
+ fi
+}
+
+src_prepare() {
+ default
+ use systemd && { sed -i -e "s|defaultDisabled|defaultEnabled|g;" collector/systemd_linux.go || die; }
+}
+
+src_compile() {
+ if use x86; then
+ #917577 pie breaks build on x86
+ GOFLAGS=${GOFLAGS//-buildmode=pie}
+ fi
+ promu build -v || die
+ ./"${PN}" --help-man > "${PN}".1 || die
+}
+
+src_test() {
+ emake test-flags= test
+}
+
+src_install() {
+ dosbin "${PN}"
+ dodoc example-rules.yml *.md
+ doman "${PN}".1
+ systemd_newunit "${FILESDIR}"/node_exporter-1.7.0.service node_exporter.service
+ newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/node_exporter-1.7.0.logrotate "${PN}"
+ keepdir /var/lib/node_exporter /var/log/node_exporter
+ fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+}
diff --git a/app-metrics/node_exporter/node_exporter-1.7.0.ebuild b/app-metrics/node_exporter/node_exporter-1.7.0.ebuild
new file mode 100644
index 000000000000..861e9355d3de
--- /dev/null
+++ b/app-metrics/node_exporter/node_exporter-1.7.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/prometheus/node_exporter.git"
+else
+ SRC_URI="https://github.com/prometheus/node_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz"
+ KEYWORDS="amd64 arm64 ~loong ~riscv ~x86"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 MIT"
+SLOT="0"
+IUSE="selinux systemd"
+
+COMMON_DEPEND="
+ acct-group/node_exporter
+ acct-user/node_exporter
+ selinux? ( sec-policy/selinux-node_exporter )
+ systemd? ( sys-apps/systemd )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-util/promu-0.3.0"
+PATCHES=(
+ "${FILESDIR}"/01-default-settings-1.7.0.patch
+)
+
+src_prepare() {
+ default
+ use !systemd && { sed -i -e "s|defaultEnabled|defaultDisabled|g;" collector/systemd_linux.go || die; }
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999* ]]; then
+ git-r3_src_unpack
+ go-module_live_vendor
+ else
+ go-module_src_unpack
+ fi
+}
+
+src_compile() {
+ if use x86; then
+ #917577 pie breaks build on x86
+ GOFLAGS=${GOFLAGS//-buildmode=pie}
+ fi
+ promu build -v || die
+ ./"${PN}" --help-man > "${PN}".1 || die
+}
+
+src_test() {
+ emake test-flags= test
+}
+
+src_install() {
+ dosbin "${PN}"
+ dodoc example-rules.yml *.md
+ doman "${PN}".1
+ systemd_newunit "${FILESDIR}"/node_exporter-1.7.0.service node_exporter.service
+ newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/node_exporter-1.7.0.logrotate "${PN}"
+ keepdir /var/lib/node_exporter /var/log/node_exporter
+ fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+}
diff --git a/app-metrics/node_exporter/node_exporter-1.8.0.ebuild b/app-metrics/node_exporter/node_exporter-1.8.0.ebuild
new file mode 100644
index 000000000000..8f35f716feb4
--- /dev/null
+++ b/app-metrics/node_exporter/node_exporter-1.8.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/prometheus/node_exporter.git"
+else
+ SRC_URI="https://github.com/prometheus/node_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 MIT"
+SLOT="0"
+IUSE="selinux"
+
+COMMON_DEPEND="
+ acct-group/node_exporter
+ acct-user/node_exporter
+ selinux? ( sec-policy/selinux-node_exporter )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-util/promu-0.3.0"
+
+src_unpack() {
+ if [[ ${PV} == 9999* ]]; then
+ git-r3_src_unpack
+ go-module_live_vendor
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ [[ ${PV} != 9999* ]] && { ln -sv ../vendor ./ || die ; }
+ default
+}
+
+src_compile() {
+ if use x86; then
+ #917577 pie breaks build on x86
+ GOFLAGS=${GOFLAGS//-buildmode=pie}
+ fi
+ promu build -v || die
+ ./"${PN}" --help-man > "${PN}".1 || die
+}
+
+src_test() {
+ emake test-flags= test
+}
+
+src_install() {
+ dosbin "${PN}"
+ dodoc example-rules.yml *.md
+ doman "${PN}".1
+ systemd_newunit "${FILESDIR}"/node_exporter-1.7.0.service node_exporter.service
+ newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/node_exporter-1.7.0.logrotate "${PN}"
+ keepdir /var/lib/node_exporter /var/log/node_exporter
+ fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+}
diff --git a/app-metrics/node_exporter/node_exporter-9999.ebuild b/app-metrics/node_exporter/node_exporter-9999.ebuild
new file mode 100644
index 000000000000..8f35f716feb4
--- /dev/null
+++ b/app-metrics/node_exporter/node_exporter-9999.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/prometheus/node_exporter.git"
+else
+ SRC_URI="https://github.com/prometheus/node_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 MIT"
+SLOT="0"
+IUSE="selinux"
+
+COMMON_DEPEND="
+ acct-group/node_exporter
+ acct-user/node_exporter
+ selinux? ( sec-policy/selinux-node_exporter )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-util/promu-0.3.0"
+
+src_unpack() {
+ if [[ ${PV} == 9999* ]]; then
+ git-r3_src_unpack
+ go-module_live_vendor
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ [[ ${PV} != 9999* ]] && { ln -sv ../vendor ./ || die ; }
+ default
+}
+
+src_compile() {
+ if use x86; then
+ #917577 pie breaks build on x86
+ GOFLAGS=${GOFLAGS//-buildmode=pie}
+ fi
+ promu build -v || die
+ ./"${PN}" --help-man > "${PN}".1 || die
+}
+
+src_test() {
+ emake test-flags= test
+}
+
+src_install() {
+ dosbin "${PN}"
+ dodoc example-rules.yml *.md
+ doman "${PN}".1
+ systemd_newunit "${FILESDIR}"/node_exporter-1.7.0.service node_exporter.service
+ newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/node_exporter-1.7.0.logrotate "${PN}"
+ keepdir /var/lib/node_exporter /var/log/node_exporter
+ fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+}
diff --git a/app-metrics/openvpn_exporter/Manifest b/app-metrics/openvpn_exporter/Manifest
index c243e611a742..effd201d2d9b 100644
--- a/app-metrics/openvpn_exporter/Manifest
+++ b/app-metrics/openvpn_exporter/Manifest
@@ -1,8 +1,2 @@
-DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz 269725 BLAKE2B a62a3f96c49d77776103a9bece69b615e00d4140c9de8b42fb7edac979c8a8d172bd21062d3d6e24ae01dba10b320ff208ff8c6916da2d84118da448afc8caf7 SHA512 f64fa42e7ed9701860e16b1cdedc9f6b029630b6f534ee403ede1223c0c7542c731735995ea9763f093b56146776902b6633e5b1691b1f1dd4ab84dea0092099
-DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
-DIST github.com-prometheus-client_golang-f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz 106949 BLAKE2B b5ee911f6d478ae21a71c2827f541ecd174dee7dbf23fff58a517e739f0e16bf91451a6aabf3f3f786b62256e2c4ee8481cc3169d01819425d56a0eb802a36c9 SHA512 234ad2fa57751901ab2a0e5843bce17689166d8fc285d63f9de0da412cfe7176e8a9f96c0bf5342184985fbb564def31087255bf11766331636c3624fe85eb62
-DIST github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz 54718 BLAKE2B 1dec6ac40fc5103117c2cf0538e138fc57c7b9795516c530b3c0dc2f5983f88c2d0eb1b094859815397fb14d50648240556fb6b11a8935586eca29eb66b4e958 SHA512 99bc72ca0887df4c7ab5a006af9c59afdc1281fe6d6d17f2897428a06da80d63d6ccd476deacb933cb208357500f14a7b96e99b9c5a7582e65a7aae87aaf2c50
-DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz 63007 BLAKE2B a62f727ef9dd42d52f495ab7449cbafbe7c7fcdb1bc171df97c40348dcb7fe12788223d7a2aea3398cae7dd17ec73ae6349b5e5f35f4785f2796cc9a16c2d420 SHA512 4f1ab6cffc309a00ed68959b9372e1d3ea4f8d597b8c462a4e365cf22737245e601b8bda0764bbd1f0172d773805d16e90a8aa90cb95e9462e35320043e04060
-DIST github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz 56873 BLAKE2B 31ae12d51b6a28c285bd5854b137d2634499d0db3c2c65c0404ca5a902ffec2e9bf689261ea51c2fe1643733f09a780c437f7a7899a5e6c3e3d100a36e07b897 SHA512 a548c6bc71456c9878cb34ad1514d92c8737e01b555e953f848cc1ae7944424b06a14a8ab0c6de4d99dbb189a0f29e2bb9ae09b5adffc327c28f5c50c2819892
-DIST openvpn_exporter-0.2.1.tar.gz 10126 BLAKE2B 06899bdc151232b6588e865ccdb69c4cc0b4f618de8b8d03240d72c7fe2acade2c65b60597f744936c19c603da0e0f924b8910a5898349a42884f91deb882e59 SHA512 9cbf859be78337e15c1e3ba0c2dc687afc18b4879af68b7b9fe823aebb415c8b430aedb7e31ffdd1685c582632db1427504a1fb874aac49c8ef11df4345ecca1
+DIST openvpn_exporter-0.3.0-deps.tar.xz 4254448 BLAKE2B 982490b250119a984a3feff7b6a7d634fc1450b71a4e859f81894708643c3cff8de93bf3d799cc34396e3f18f271f23227dac142037c5986307716fc09c02606 SHA512 d4868e1cc553506aba88cc5268faf438e8504a231851315e8c13ee9871a9582e0db787e1a8237e4250740f50336844d8f1557ae4e2521ece9f9235376f394bb7
+DIST openvpn_exporter-0.3.0.tar.gz 11505 BLAKE2B 61a991e3ea8001a9481b8207c83316c1e028a68f657f3de191b7d69d7a3fefa753663292c2d77d09ef6024f9392b0077fc5170f2e8a19c0397240281dec09482 SHA512 4bea502e7dfd32e5fea9fc21fbfdb65ddcb381d6d1b5463c361e60026f88693912b998979e9fab3e455196eb7dec1677dc9feb293f4f14609f4352eb9d238cd9
diff --git a/app-metrics/openvpn_exporter/metadata.xml b/app-metrics/openvpn_exporter/metadata.xml
index e8914fbd6b33..7f135fbe0cf0 100644
--- a/app-metrics/openvpn_exporter/metadata.xml
+++ b/app-metrics/openvpn_exporter/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
<upstream>
<remote-id type="github">kumina/openvpn_exporter</remote-id>
</upstream>
diff --git a/app-metrics/openvpn_exporter/openvpn_exporter-0.2.1.ebuild b/app-metrics/openvpn_exporter/openvpn_exporter-0.2.1.ebuild
deleted file mode 100644
index 7f7dc1158ef8..000000000000
--- a/app-metrics/openvpn_exporter/openvpn_exporter-0.2.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
- "github.com/prometheus/client_golang f504d69affe11ec1ccb2e5948127f86878c9fd57"
- "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
- "github.com/golang/protobuf e09c5db296004fbe3f74490e84dcd62c3c5ddb1b"
- "github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
- "github.com/prometheus/common 38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a"
- "github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
- "github.com/prometheus/procfs 780932d4fbbe0e69b84c34c20f5c8d0981e109ea"
- )
-
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kumina/openvpn_exporter"
-ARCHIVE_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus Exporter for OpenVPN"
-HOMEPAGE="https://github.com/kumina/openvpn_exporter"
-SRC_URI="${ARCHIVE_URI}
- ${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-rc_compile() {
- pushd src/${EGO_PN} || die
- GOPATH="${S}" \
- go build -v -o ${PN} || die
- popd || die
-}
-
-src_install() {
- dobin ${PN}
- dodoc src/${EGO_PN}/{CHANGELOG,README}.md
- local dir
- for dir in /var/{lib,log}/${PN}; do
- keepdir "${dir}"
- fowners ${PN}:${PN} "${dir}"
- done
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-}
diff --git a/app-metrics/openvpn_exporter/openvpn_exporter-0.3.0.ebuild b/app-metrics/openvpn_exporter/openvpn_exporter-0.3.0.ebuild
new file mode 100644
index 000000000000..13a0b9759eda
--- /dev/null
+++ b/app-metrics/openvpn_exporter/openvpn_exporter-0.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Prometheus Exporter for OpenVPN"
+HOMEPAGE="https://github.com/kumina/openvpn_exporter"
+SRC_URI="https://github.com/kumina/openvpn_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+ acct-user/openvpn_exporter
+ acct-group/openvpn_exporter
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+ ego build -o ${PN}
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc {CHANGELOG,README}.md
+ keepdir "/var/log/${PN}"
+ fowners ${PN}:${PN} "/var/log/${PN}"
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+}
diff --git a/app-metrics/portage-exporter/Manifest b/app-metrics/portage-exporter/Manifest
new file mode 100644
index 000000000000..187c1ee1fd0c
--- /dev/null
+++ b/app-metrics/portage-exporter/Manifest
@@ -0,0 +1 @@
+DIST portage-exporter-0.1.0.tar.gz 14931 BLAKE2B bfafe9ac71b3ca756ac621d424cf80f988c3564c3a7d28b1d87781674cca00b7e3ed0c045d3d82bf19e6ce2021135dd85001aef3fe33360760da00dc17573666 SHA512 16efcb1ae6417f0db48247468f369db76bafeace136e296724fbb517d38b0ec5cbaf7b1949b7c5fb87337eeb374535f53a4a432f8aa5b10a3bb5b418fead2a94
diff --git a/app-metrics/mysqld_exporter/files/mysqld_exporter.confd b/app-metrics/portage-exporter/files/portage-exporter.confd
index 249ed7ea4aa4..3bd24a22a809 100644
--- a/app-metrics/mysqld_exporter/files/mysqld_exporter.confd
+++ b/app-metrics/portage-exporter/files/portage-exporter.confd
@@ -1,4 +1,4 @@
-# /etc/conf.d/mysqld_exporter
+# /etc/conf.d/portage-exporter
# PID file
#EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid"
@@ -9,10 +9,10 @@
#EXPORTER_TERMTIMEOUT="TERM/60/KILL/5"
# User to run exporter as
-#EXPORTER_USER="mysqld_exporter"
+#EXPORTER_USER="portage-exporter"
# User group to run exporter as
-#EXPORTER_GROUP="mysqld_exporter"
+#EXPORTER_GROUP="portage-exporter"
# You can use this configuration option to pass additional options to the
# start-stop-daemon, see start-stop-daemon(8) for more details.
@@ -20,7 +20,7 @@
# that the daemon is really up and running.
#EXPORTER_SSDARGS="--wait 1000"
-# Exporter flags
-# See `mysqld_exporter --help` for more details
-EXPORTER_FLAGS="-log.level=info"
-#EXPORTER_FLAGS="${EXPORTER_FLAGS} -yourAdditionalFlag"
+# Exporter flags (passed via env)
+#SERVE_ADDRESS=":2112"
+#SERVE_PATH=/metrics
+VDB_UPDATE_INTERVAL=1800
diff --git a/app-metrics/portage-exporter/files/portage-exporter.initd b/app-metrics/portage-exporter/files/portage-exporter.initd
new file mode 100644
index 000000000000..9aa53f509a6e
--- /dev/null
+++ b/app-metrics/portage-exporter/files/portage-exporter.initd
@@ -0,0 +1,49 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus exporter for Portage packages"
+
+EXPORTER_FLAGS=${EXPORTER_FLAGS:-""}
+#EXPORTER_USER=${EXPORTER_USER:-"portage-exporter"}
+#EXPORTER_GROUP=${EXPORTER_GROUP:-"portage-exporter"}
+EXPORTER_PIDFILE=${EXPORTER_PIDFILE:-"/run/${RC_SVCNAME}.pid"}
+EXPORTER_SSDARGS=${EXPORTER_SSDARGS:-"--wait 1000"}
+EXPORTER_TERMTIMEOUT=${EXPORTER_TERMTIMEOUT:-"TERM/60/KILL/5"}
+
+command="/usr/bin/portage-exporter"
+command_args="${EXPORTER_FLAGS}"
+command_background="true"
+start_stop_daemon_args="${EXPORTER_SSDARGS}"
+start_stop_daemon_args="${start_stop_daemon_args} ${EXPORTER_USER:+--user }${EXPORTER_USER}"
+start_stop_daemon_args="${start_stop_daemon_args} ${EXPORTER_GROUP:+--group }${EXPORTER_GROUP}"
+
+getconfig() {
+ local key="$1"
+ local value_default="$2"
+ local value=
+
+ if service_started; then
+ value="$(service_get_value "${key}")"
+ fi
+
+ if [ -z "${value}" ]; then
+ # Value not explicitly set
+ echo "${value_default}"
+ else
+ echo "${value}"
+ fi
+
+ return 0
+}
+
+pidfile="$(getconfig pidfile ${EXPORTER_PIDFILE})"
+retry="$(getconfig retry ${EXPORTER_TERMTIMEOUT})"
+
+depend() {
+ after net.lo loopback
+}
+
+start_post() {
+ service_set_value retry "${EXPORTER_TERMTIMEOUT}"
+}
diff --git a/app-metrics/portage-exporter/files/portage-exporter.service b/app-metrics/portage-exporter/files/portage-exporter.service
new file mode 100644
index 000000000000..bec84b4c0413
--- /dev/null
+++ b/app-metrics/portage-exporter/files/portage-exporter.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Gentoo Portage Exporter
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+User=portage-exporter
+DynamicUser=yes
+Type=simple
+PassEnvironment=SERVE_ADDRESS SERVE_PATH VDB_UPDATE_INTERVAL
+ExecStart=/usr/bin/portage-exporter
+
+# Environment=SERVE_ADDRESS=:2112
+# Environment=SERVE_PATH=/metrics
+# Environment=VDB_UPDATE_INTERVAL=1800
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/portage-exporter/metadata.xml b/app-metrics/portage-exporter/metadata.xml
new file mode 100644
index 000000000000..7fe25777ee4c
--- /dev/null
+++ b/app-metrics/portage-exporter/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <!-- upstream -->
+ <email>arthurzam@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">projg2/portage-exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/portage-exporter/portage-exporter-0.1.0.ebuild b/app-metrics/portage-exporter/portage-exporter-0.1.0.ebuild
new file mode 100644
index 000000000000..a9b7cbd38c65
--- /dev/null
+++ b/app-metrics/portage-exporter/portage-exporter-0.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="Prometheus exporter for Gentoo Portage"
+HOMEPAGE="https://github.com/projg2/portage-exporter"
+SRC_URI="https://github.com/projg2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-cpp/prometheus-cpp"
+
+src_install() {
+ cmake_src_install
+
+ systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/postfix_exporter/Manifest b/app-metrics/postfix_exporter/Manifest
index 0d848ba69037..637770d42712 100644
--- a/app-metrics/postfix_exporter/Manifest
+++ b/app-metrics/postfix_exporter/Manifest
@@ -1,10 +1,2 @@
-DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-coreos-go-systemd-bebb2b01b0473b183e4624aaf8e23ae6f4b22417.tar.gz 60308 BLAKE2B 0b042dae9418cae85d258f1ba029f5edf0550971583c9389a13230b08b6a164600bc9bc36392daaf85af6cd1e1140b6c3f7a8af268be1808e0fe07b5a7223efb SHA512 3469e4db9ad335443ff8da4421e790a21cf56489f8be473fdbe36dc000f6a4497ee68d0038202ab28f5cb7655212e33988ba79ad7cac39fd49f6e35f0f6b728e
-DIST github.com-coreos-pkg-97fdf19511ea361ae1c100dd393cc47f8dcfa1e1.tar.gz 32444 BLAKE2B 2601d814407a50eb19e1413228091ecac21ad76bee643e5dfd5e6cff574ddf2dad8a09a1d366f680d48a7402d2ee73eab64dda3a50c3f1be1d594d09c21fb9ed SHA512 3212abf2ec16038d9bd9705bbdaa0f905678b7ec928065f122b54926b90d629ef456c903dd020e98ee56271c82614ca54c4690bb7b258084a0d0bf8422a39d6f
-DIST github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz 269725 BLAKE2B a62a3f96c49d77776103a9bece69b615e00d4140c9de8b42fb7edac979c8a8d172bd21062d3d6e24ae01dba10b320ff208ff8c6916da2d84118da448afc8caf7 SHA512 f64fa42e7ed9701860e16b1cdedc9f6b029630b6f534ee403ede1223c0c7542c731735995ea9763f093b56146776902b6633e5b1691b1f1dd4ab84dea0092099
-DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
-DIST github.com-prometheus-client_golang-f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz 106949 BLAKE2B b5ee911f6d478ae21a71c2827f541ecd174dee7dbf23fff58a517e739f0e16bf91451a6aabf3f3f786b62256e2c4ee8481cc3169d01819425d56a0eb802a36c9 SHA512 234ad2fa57751901ab2a0e5843bce17689166d8fc285d63f9de0da412cfe7176e8a9f96c0bf5342184985fbb564def31087255bf11766331636c3624fe85eb62
-DIST github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz 54718 BLAKE2B 1dec6ac40fc5103117c2cf0538e138fc57c7b9795516c530b3c0dc2f5983f88c2d0eb1b094859815397fb14d50648240556fb6b11a8935586eca29eb66b4e958 SHA512 99bc72ca0887df4c7ab5a006af9c59afdc1281fe6d6d17f2897428a06da80d63d6ccd476deacb933cb208357500f14a7b96e99b9c5a7582e65a7aae87aaf2c50
-DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz 63007 BLAKE2B a62f727ef9dd42d52f495ab7449cbafbe7c7fcdb1bc171df97c40348dcb7fe12788223d7a2aea3398cae7dd17ec73ae6349b5e5f35f4785f2796cc9a16c2d420 SHA512 4f1ab6cffc309a00ed68959b9372e1d3ea4f8d597b8c462a4e365cf22737245e601b8bda0764bbd1f0172d773805d16e90a8aa90cb95e9462e35320043e04060
-DIST github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz 56873 BLAKE2B 31ae12d51b6a28c285bd5854b137d2634499d0db3c2c65c0404ca5a902ffec2e9bf689261ea51c2fe1643733f09a780c437f7a7899a5e6c3e3d100a36e07b897 SHA512 a548c6bc71456c9878cb34ad1514d92c8737e01b555e953f848cc1ae7944424b06a14a8ab0c6de4d99dbb189a0f29e2bb9ae09b5adffc327c28f5c50c2819892
-DIST postfix_exporter-0.1.2.tar.gz 11552 BLAKE2B 987c81482fc984e8f6c870fdaf7ce2ef67b3fa66e5782713a645d35b76a1bde1dde97a79705569d1423a9356309d0b7240c77dba386127e8a5035990220d2a62 SHA512 579793281dedd858538ab9a931e0003cfc9989204ebf4352dd4860e5a7f62b919d77a9e0facb9daff6706771010f9e807061dace8cb88928635d55111c7c482a
+DIST postfix_exporter-0.3.0-deps.tar.xz 10261848 BLAKE2B 3ab985ae873f53019b093266df90d4593b3a1755bafb6a0df600ae84411fd73f578cfeb6749fdfade5392ec55ec4df1916cf6b86f0ea0b5e04828dda50687789 SHA512 d591ef808fd3ccc7b48f37257ae6925b8ae491decef9ac679f13af08d0c6717b162a53cc2cd2ffb98361f38eaceaac24b2fba1db958fc9fa172fbe5060b639b1
+DIST postfix_exporter-0.3.0.tar.gz 26528 BLAKE2B 9d1b17917f4a6a6e73e1477e973454d9ce774d218463f151117e8772f77ea17c00536d0262789644716992c3c6ddcbf8b26d9c92eea77f9750e971e3a7c0d1d4 SHA512 1812d2ad95803290c12615975ba6e44c0a6f73dd0e10db927a9f1c58bfce27b71c9c2928f58623e263ba2737d2780f220e6a7fe0992e2607f290478eaa080b39
diff --git a/app-metrics/postfix_exporter/metadata.xml b/app-metrics/postfix_exporter/metadata.xml
index a5b8db8805ee..30deb3908936 100644
--- a/app-metrics/postfix_exporter/metadata.xml
+++ b/app-metrics/postfix_exporter/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
<upstream>
<remote-id type="github">kumina/postfix_exporter</remote-id>
</upstream>
diff --git a/app-metrics/postfix_exporter/postfix_exporter-0.1.2.ebuild b/app-metrics/postfix_exporter/postfix_exporter-0.1.2.ebuild
deleted file mode 100644
index 4eeeb08ad702..000000000000
--- a/app-metrics/postfix_exporter/postfix_exporter-0.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/coreos/go-systemd bebb2b01b0473b183e4624aaf8e23ae6f4b22417"
- "github.com/coreos/pkg 97fdf19511ea361ae1c100dd393cc47f8dcfa1e1"
- "github.com/prometheus/client_golang f504d69affe11ec1ccb2e5948127f86878c9fd57"
- "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
- "github.com/golang/protobuf e09c5db296004fbe3f74490e84dcd62c3c5ddb1b"
- "github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
- "github.com/prometheus/common 38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a"
- "github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
- "github.com/prometheus/procfs 780932d4fbbe0e69b84c34c20f5c8d0981e109ea" )
-
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kumina/postfix_exporter"
-ARCHIVE_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus Exporter for Postfix"
-HOMEPAGE="https://github.com/kumina/postfix_exporter"
-SRC_URI="${ARCHIVE_URI}
- ${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="systemd"
-
-DEPEND="systemd? ( sys-apps/systemd )"
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GOPATH="${S}" \
- go build -tags "$(usex systemd '' 'nosystemd')" -v -o bin/${PN} || die
- popd || die
-}
-
-src_install() {
- dobin src/${EGO_PN}/bin/${PN}
- dodoc src/${EGO_PN}/{CHANGELOG,README}.md
- local dir
- for dir in /var/{lib,log}/${PN}; do
- keepdir "${dir}"
- fowners ${PN}:${PN} "${dir}"
- done
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-}
diff --git a/app-metrics/postfix_exporter/postfix_exporter-0.3.0.ebuild b/app-metrics/postfix_exporter/postfix_exporter-0.3.0.ebuild
new file mode 100644
index 000000000000..ec665dd32649
--- /dev/null
+++ b/app-metrics/postfix_exporter/postfix_exporter-0.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Prometheus Exporter for Postfix"
+HOMEPAGE="https://github.com/kumina/postfix_exporter"
+SRC_URI="
+ https://github.com/kumina/postfix_exporter/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~arthurzam/distfiles/app-metrics/${PN}/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+RESTRICT+=" test"
+
+RDEPEND="
+ acct-group/postfix_exporter
+ acct-user/postfix_exporter
+"
+DEPEND="${RDEPEND}
+ systemd? ( sys-apps/systemd )
+"
+
+src_compile() {
+ ego build -tags "$(usex systemd '' 'nosystemd')" -v -o bin/${PN}
+}
+
+src_install() {
+ dobin bin/${PN}
+ dodoc {CHANGELOG,README}.md
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+}
diff --git a/app-metrics/postgres_exporter/Manifest b/app-metrics/postgres_exporter/Manifest
index 2406f7de513d..5bc51b57b3b2 100644
--- a/app-metrics/postgres_exporter/Manifest
+++ b/app-metrics/postgres_exporter/Manifest
@@ -1 +1,4 @@
-DIST postgres_exporter-0.4.7.tar.gz 3699251 BLAKE2B b4232858464ae30f714dda58a414ec343aedc5972b44066aa45a85cf64d98ef40925ca77956c218a3962e22a35f3229795cc730fec9fc10565a43fc9e827200c SHA512 81afce765830a5c16597f0ac9a95d21466edb20e40cff8e26079663db75f0051a6e0eb4ff828eb825b51a6fc52b3b534e0f6ffbb2ecf2c94e2ec8656de4a2ff6
+DIST postgres_exporter-0.10.1-deps.tar.xz 106506900 BLAKE2B 3f32d804d9bd07a91ac623656896d23bba217e2ceed90ff2fcfa19d02093912fe35008064b1248ee98a23e02efdef2761ad7c1dfc96c636d051686ed4a58eceb SHA512 842c6d519c537989cfba36961d38b1cb0e315241a88e1f53532ebf1829d31c7c17b5986680193663e4de3c5cfab3bb25f38e5c6afe6b2ab14ce2efd47a052ae7
+DIST postgres_exporter-0.10.1.tar.gz 73157 BLAKE2B bc56dfdd50878615768fc4e4a193784b73ee48cb1b2743deae21d6caf5db60e3eabe2987cee27742081bea1c506a9c96fb11808304a0007c5e2e252a1e4cb752 SHA512 75ba08354174980d55fb1deed1035323d89f3331f0c366165a0262b4081b99d083f14dbcdd7539836399d0d69a75a296cb978a42d94ff0b1c0bcb8f3933fcabc
+DIST postgres_exporter-0.15.0-deps.tar.xz 10107168 BLAKE2B 2c63161629b7a7aa7e4ca8332f1ad140bfd4c6d496cf860964da4b1897ca67e8716f22db35df6e0558c2764442afea657f3d3e2406762f14b88bf2266f2464f7 SHA512 91a0d8b471ef06635ee3520c8b2a15e19ebb9427356602752f0b35d87efacc129709cac50873f94305edf85149d0b9bb0b2cf6d2bfa8d1ec88e6c6a6be1f4880
+DIST postgres_exporter-0.15.0.tar.gz 86818 BLAKE2B bf4b3f842c98e82c54eb8393271bd9879a93cd8f28b2fcafa09bbb907caf96c4b728139b08074f1de08295b18d61aaa29b4fb53321164c8b4fc93545f7da5b7a SHA512 332700809454dba11e1e6b9cbc46be9683925a6c692e110efa1204ce1ad1457a8d2237ee8af20f1ee6d5c663266fc1629da6f4f5ff9151faf294a26af8be7682
diff --git a/app-metrics/postgres_exporter/metadata.xml b/app-metrics/postgres_exporter/metadata.xml
index 5d382f958d22..bc27b6f16020 100644
--- a/app-metrics/postgres_exporter/metadata.xml
+++ b/app-metrics/postgres_exporter/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
<upstream>
<remote-id type="github">wrouesnel/postgres_exporter</remote-id>
</upstream>
diff --git a/app-metrics/postgres_exporter/postgres_exporter-0.10.1.ebuild b/app-metrics/postgres_exporter/postgres_exporter-0.10.1.ebuild
new file mode 100644
index 000000000000..3f393e013f2f
--- /dev/null
+++ b/app-metrics/postgres_exporter/postgres_exporter-0.10.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=6cff384d7433bcb1104efe3b496cd27c0658eb09
+
+DESCRIPTION="PostgreSQL stats exporter for Prometheus"
+HOMEPAGE="https://github.com/prometheus-community/postgres_exporter"
+SRC_URI="https://github.com/prometheus-community/postgres_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/postgres_exporter
+ acct-user/postgres_exporter"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-util/promu"
+
+RESTRICT=" test "
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/{{.Branch}}/HEAD/" \
+ -e "s/{{.Revision}}/${GIT_COMMIT}/" \
+ .promu.yml || die "sed failed"
+}
+
+src_compile() {
+ promu build -v --prefix bin || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc README.md queries.yaml
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-metrics/postgres_exporter/postgres_exporter-0.15.0.ebuild b/app-metrics/postgres_exporter/postgres_exporter-0.15.0.ebuild
new file mode 100644
index 000000000000..6ff33eff04cb
--- /dev/null
+++ b/app-metrics/postgres_exporter/postgres_exporter-0.15.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+GIT_COMMIT=68c176b8833b7580bf847cecf60f8e0ad5923f9a
+
+DESCRIPTION="PostgreSQL stats exporter for Prometheus"
+HOMEPAGE="https://github.com/prometheus-community/postgres_exporter"
+SRC_URI="https://github.com/prometheus-community/postgres_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/app-metrics/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ acct-group/postgres_exporter
+ acct-user/postgres_exporter
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-util/promu"
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/{{.Branch}}/HEAD/" \
+ -e "s/{{.Revision}}/${GIT_COMMIT}/" \
+ .promu.yml || die "sed failed"
+}
+
+src_compile() {
+ promu build -v --prefix bin || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc README.md queries.yaml
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-metrics/postgres_exporter/postgres_exporter-0.4.7.ebuild b/app-metrics/postgres_exporter/postgres_exporter-0.4.7.ebuild
deleted file mode 100644
index 09c01b139aab..000000000000
--- a/app-metrics/postgres_exporter/postgres_exporter-0.4.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/wrouesnel/postgres_exporter"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="PostgreSQL stats exporter for Prometheus"
-HOMEPAGE="https://github.com/wrouesnel/postgres_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- VERSION_SHORT="${PV}" VERSION="${PV}" GOPATH="${S}" go run mage.go binary || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin ${PN}
- dodoc README.md queries.yaml
- popd || die
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/process-exporter/Manifest b/app-metrics/process-exporter/Manifest
index 8cdb45f2e465..35f511fb0d98 100644
--- a/app-metrics/process-exporter/Manifest
+++ b/app-metrics/process-exporter/Manifest
@@ -1 +1,2 @@
-DIST process-exporter-0.4.0.tar.gz 378006 BLAKE2B 053379e8e0cb95f099cebf53289c48c39d6c8ef22c8b0dcf0bd128453e601da98be9205bb5c7cda8a05d5f50addabbcb46f6ece44926da17c1bd8616e452783a SHA512 88f6f0e07bb7f3ea6c593ba359c09ace47eb0830ff0759b1f4dd64219a6c9069dc2891a328a90bdef13ea02efc576fb71de7ff095788b4dd45c2683c90904363
+DIST process-exporter-0.7.10-deps.tar.xz 106360268 BLAKE2B a06448eb38cee7cac6c93d8dedecfbb4fc7152f25c7ff42cb440aa6162aa8daac5ddbe7e56e99d96386b70723124b59f0bd0ab9df2b3f519532ac9487ba34b9e SHA512 6982da5d9c4ecdeacaa970baf0c820e0e3053ff3dbbbb260e7f3e68bff2c1e04beffbbbe8546e1f680d0dcba2eaac256a1bce4b6eee290a847ce70fe8653b68d
+DIST process-exporter-0.7.10.tar.gz 55320 BLAKE2B 72497d513105486de9bc212f4b8af14c52afa8acbcf04f52ab8015bef78172936917cb58573a4ea16b4b3e433e90b404da6658012d904e3d3d787787c7c16c4d SHA512 fd7ff44b28a608184ee0045c2304dad6d5ba0a1b122f9098244a46dfcfd54d0a9e65bb2891e5198ecb9f4bc51a0fcc8577880a05f2e29a073d15e8b0cb5766c1
diff --git a/app-metrics/process-exporter/metadata.xml b/app-metrics/process-exporter/metadata.xml
index c36c37139fad..bcdac9073e99 100644
--- a/app-metrics/process-exporter/metadata.xml
+++ b/app-metrics/process-exporter/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">ncabatoff/process-exporter</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-metrics/process-exporter/process-exporter-0.4.0.ebuild b/app-metrics/process-exporter/process-exporter-0.4.0.ebuild
deleted file mode 100644
index 4ea9b6f62fa9..000000000000
--- a/app-metrics/process-exporter/process-exporter-0.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/ncabatoff/process-exporter
-
-inherit golang-build golang-vcs-snapshot systemd
-
-DESCRIPTION="Process exporter for prometheus"
-HOMEPAGE="https://github.com/ncabatoff/process-exporter"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-
-src_compile() {
- pushd "src/${EGO_PN}" || die
- GOPATH="${S}" emake build
-}
-
-src_install() {
- pushd "src/${EGO_PN}" || die
- dobin ${PN}
-dodoc *.md
- insinto /etc/${PN}
- doins packaging/conf/all.yaml
- systemd_dounit packaging/${PN}.service
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
diff --git a/app-metrics/process-exporter/process-exporter-0.4.0-r1.ebuild b/app-metrics/process-exporter/process-exporter-0.7.10.ebuild
index 1ce159062a86..3d4199894c57 100644
--- a/app-metrics/process-exporter/process-exporter-0.4.0-r1.ebuild
+++ b/app-metrics/process-exporter/process-exporter-0.7.10.ebuild
@@ -1,30 +1,25 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-EGO_PN=github.com/ncabatoff/process-exporter
-
-inherit golang-build golang-vcs-snapshot systemd
+EAPI=8
+inherit go-module systemd
DESCRIPTION="Process exporter for prometheus"
HOMEPAGE="https://github.com/ncabatoff/process-exporter"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ncabatoff/process-exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-LICENSE="MIT"
+LICENSE="MIT Apache-2.0 BSD BSD-2"
SLOT="0"
KEYWORDS="~amd64"
-RESTRICT="strip"
-
src_compile() {
- pushd "src/${EGO_PN}" || die
- GOPATH="${S}" emake build
+ emake build
}
src_install() {
- pushd "src/${EGO_PN}" || die
dobin ${PN}
-dodoc *.md
+ dodoc *.md
insinto /etc/${PN}
doins packaging/conf/all.yaml
systemd_dounit packaging/${PN}.service
diff --git a/app-metrics/prom2json/Manifest b/app-metrics/prom2json/Manifest
index bd8d9aa7971d..698cd6719906 100644
--- a/app-metrics/prom2json/Manifest
+++ b/app-metrics/prom2json/Manifest
@@ -1 +1 @@
-DIST prom2json-0.1.0_p20170523.tar.gz 129179 BLAKE2B ef0e42e340d53894c31bff7018b668d8575fc3568584a43dc308955665ac6f59dbabf2d4605bc2a66957df57a29ebb7b3a4eef1f99537eefc2805a5ffd86904f SHA512 824f4c43f4a167dc7dde2f11e84cf482e5cdfa26ab11caf08a5461d525543c3491180f54694c4ae61fdd5dc9763ff16f6e29b332a64dc3ac52fdb7b9c0902571
+DIST prom2json-1.3.0.tar.gz 1646893 BLAKE2B 9b8fcfa4a3e45ee08a57016fa6a7611604cbb578f162f0bf7ff8338f345f98788b75c3ac047ffca95b62020e972c302bc1c44f2f7f00240cfd978f73b8d9c829 SHA512 8f02c7b2616d915e2b4ff5f195a8c2eff89d18417f7396dc02d2aa4cf34711358b0beef6effae9b42a3d6f4b0616c5d3ab995a73ab9e37a4a0ec230adff6f249
diff --git a/app-metrics/prom2json/metadata.xml b/app-metrics/prom2json/metadata.xml
index a4d942c42b71..4f6dfe94d82a 100644
--- a/app-metrics/prom2json/metadata.xml
+++ b/app-metrics/prom2json/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
<upstream>
<remote-id type="github">prometheus/prom2json</remote-id>
</upstream>
diff --git a/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild b/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild
deleted file mode 100644
index 8bc84e323834..000000000000
--- a/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/${PN}"
-EGIT_COMMIT="4a7436442837da72f9e211d99f0145dff3246b66"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A tool to scrape a Prometheus client and dump the result as JSON"
-HOMEPAGE="https://github.com/prometheus/prom2json"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${EGIT_COMMIT:0:7}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix ${PN} || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin ${PN}/${PN}
- dodoc {README,CONTRIBUTING}.md
- popd || die
-}
diff --git a/app-metrics/prom2json/prom2json-1.3.0.ebuild b/app-metrics/prom2json/prom2json-1.3.0.ebuild
new file mode 100644
index 000000000000..ece0dcf32a9b
--- /dev/null
+++ b/app-metrics/prom2json/prom2json-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+GIT_COMMIT=9180c89ee65bde2cbbe799d06d7d09e30f629984
+
+DESCRIPTION="A tool to scrape a Prometheus client and dump the result as JSON"
+HOMEPAGE="https://github.com/prometheus/prom2json"
+SRC_URI="https://github.com/prometheus/prom2json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+BDEPEND="dev-util/promu"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/{{.Revision}}/${GIT_COMMIT}/" \
+ -e "s/{{.Version}}/${PV}/" \
+ .promu.yml || die
+}
+
+src_compile() {
+ mkdir bin || die
+ promu build --prefix bin || die
+}
+
+src_test() {
+ emake test-flags= test || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc {README,CONTRIBUTING}.md
+}
diff --git a/app-metrics/prometheus-lvm-exporter/Manifest b/app-metrics/prometheus-lvm-exporter/Manifest
new file mode 100644
index 000000000000..b944cddb2233
--- /dev/null
+++ b/app-metrics/prometheus-lvm-exporter/Manifest
@@ -0,0 +1,4 @@
+DIST prometheus-lvm-exporter-0.3.2-vendor.tar.xz 1390560 BLAKE2B ab6fe8febeb972bf2a65dd05c6060bb584638dc4250f221353b7fcc3714cd5f56b8ef69c36fae67103bf57d66ca8000c70212fa3f82ed54ad7bcf0eaae63c822 SHA512 e320cdbe27841f69fad201e52a6b5a9acdd919b57c7e067506e6829e3cf11936a0ab21e817dedc6fa0c277ddae891412a10565d6dac8f859669e1a37cc760e86
+DIST prometheus-lvm-exporter-0.3.2.tar.gz 60790 BLAKE2B f6b79627e9114140cab72d34744e5667e1174dd2bc720866d398d48be03067a29e03305e8a22ef4d706b2261083ec6f108e6c8578b9e717bf7915f2412b3da41 SHA512 75f3cc65fc9196faff0796e9df85ea8f7e5d15a97e7e46d635802049ad11e499bc5f0fd0b6833d1028dc23435fb8d0c2523e7333fb76e291f3ff16e297c37973
+DIST prometheus-lvm-exporter-0.3.3-deps.tar.xz 8813080 BLAKE2B 3fad55a4a57bd34ca29b27d2a3812f5e3f1bb4b2315bd9a10d4cb264cbacb13e3aa0385da117bc193cea12c9ea1245aa80e74a49339d25c7ed277cd681ff38ad SHA512 df93b13bc389d87d9d33bb637ca13af13cff02c411e4ba16159dd9be560e15b1f107c593a95ecb72f0d92ce5124439c42673562e5da5016b726512e5cd32c7f4
+DIST prometheus-lvm-exporter-0.3.3.tar.gz 47239 BLAKE2B 5e91e9a06090843f1637624bcde9dcf5af771fb03467d3c09affed20ccc7f8f565bcbd4b7cf97df3be5d06dbfaaeacf76af43b635b5e887cfaa4cfe7a601fc78 SHA512 84315d248310c4cd2e2a51e57026561beb813d4cdc621f545b8b285804ecc6faba28644e19fb2435fefe77552385f04fc1e604d543675ccc002f1984d92c8c21
diff --git a/app-metrics/prometheus-lvm-exporter/files/prometheus-lvm-exporter.confd b/app-metrics/prometheus-lvm-exporter/files/prometheus-lvm-exporter.confd
new file mode 100644
index 000000000000..6bcabc1df256
--- /dev/null
+++ b/app-metrics/prometheus-lvm-exporter/files/prometheus-lvm-exporter.confd
@@ -0,0 +1,26 @@
+# /etc/conf.d/prometheus-lvm-exporter
+
+# PID file
+#EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+#EXPORTER_TERMTIMEOUT="TERM/60/KILL/5"
+
+# User to run exporter as
+#EXPORTER_USER="prometheus-lvm-exporter"
+
+# User group to run exporter as
+#EXPORTER_GROUP="prometheus-lvm-exporter"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+#EXPORTER_SSDARGS="--wait 1000"
+
+# Exporter flags
+# See `prometheus-lvm-exporter --help` for more details
+EXPORTER_FLAGS="--log.level=info"
+#EXPORTER_FLAGS="${EXPORTER_FLAGS} --yourAdditionalFlag"
diff --git a/app-metrics/prometheus-lvm-exporter/files/prometheus-lvm-exporter.initd b/app-metrics/prometheus-lvm-exporter/files/prometheus-lvm-exporter.initd
new file mode 100644
index 000000000000..1fa73569ac7b
--- /dev/null
+++ b/app-metrics/prometheus-lvm-exporter/files/prometheus-lvm-exporter.initd
@@ -0,0 +1,49 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus exporter for LVM metrics"
+
+EXPORTER_FLAGS=${EXPORTER_FLAGS:-""}
+#EXPORTER_USER=${EXPORTER_USER:-"prometheus-lvm-exporter"}
+#EXPORTER_GROUP=${EXPORTER_GROUP:-"prometheus-lvm-exporter"}
+EXPORTER_PIDFILE=${EXPORTER_PIDFILE:-"/run/${RC_SVCNAME}.pid"}
+EXPORTER_SSDARGS=${EXPORTER_SSDARGS:-"--wait 1000"}
+EXPORTER_TERMTIMEOUT=${EXPORTER_TERMTIMEOUT:-"TERM/60/KILL/5"}
+
+command="/usr/bin/prometheus-lvm-exporter"
+command_args="${EXPORTER_FLAGS}"
+command_background="true"
+start_stop_daemon_args="${EXPORTER_SSDARGS}"
+start_stop_daemon_args="${start_stop_daemon_args} ${EXPORTER_USER:+--user }${EXPORTER_USER}"
+start_stop_daemon_args="${start_stop_daemon_args} ${EXPORTER_GROUP:+--group }${EXPORTER_GROUP}"
+
+getconfig() {
+ local key="$1"
+ local value_default="$2"
+ local value=
+
+ if service_started; then
+ value="$(service_get_value "${key}")"
+ fi
+
+ if [ -z "${value}" ]; then
+ # Value not explicitly set
+ echo "${value_default}"
+ else
+ echo "${value}"
+ fi
+
+ return 0
+}
+
+pidfile="$(getconfig pidfile ${EXPORTER_PIDFILE})"
+retry="$(getconfig retry ${EXPORTER_TERMTIMEOUT})"
+
+depend() {
+ after net lvm lvm-monitoring
+}
+
+start_post() {
+ service_set_value retry "${EXPORTER_TERMTIMEOUT}"
+}
diff --git a/app-metrics/prometheus-lvm-exporter/metadata.xml b/app-metrics/prometheus-lvm-exporter/metadata.xml
new file mode 100644
index 000000000000..1b74e7a99779
--- /dev/null
+++ b/app-metrics/prometheus-lvm-exporter/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">hansmi/prometheus-lvm-exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/prometheus-lvm-exporter/prometheus-lvm-exporter-0.3.2.ebuild b/app-metrics/prometheus-lvm-exporter/prometheus-lvm-exporter-0.3.2.ebuild
new file mode 100644
index 000000000000..0edb7138c79d
--- /dev/null
+++ b/app-metrics/prometheus-lvm-exporter/prometheus-lvm-exporter-0.3.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+# uncomment the first setting of MY_PV for a normal release
+# MY_PV="v${PV/_rc/-rc.}"
+# set MY_PV to the full commit hash for a snapshot release
+MY_PV_HASH=
+HOMEPAGE="https://github.com/hansmi/prometheus-lvm-exporter"
+if [[ -n "${MY_PV_HASH}" ]]; then
+ MY_PV=${MY_PV_HASH}
+ MYSQLD_EXPORTER_COMMIT=${MY_PV_HASH:0:8}
+ SRC_URI_UPSTREAM="${HOMEPAGE}/archive/${MY_PV}.tar.gz"
+else
+ MY_PV=${PV}
+ MYSQLD_EXPORTER_COMMIT=
+ SRC_URI_UPSTREAM="${HOMEPAGE}/archive/refs/tags/v${PV}.tar.gz"
+fi
+MY_P=${PN}-${MY_PV}
+SRC_URI_VENDOR="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}-vendor.tar.xz"
+
+DESCRIPTION="Prometheus exporter for LVM metrics"
+SRC_URI="
+ ${SRC_URI_UPSTREAM} -> ${P}.tar.gz
+ ${SRC_URI_VENDOR}
+ "
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+BDEPEND=""
+DEPEND=""
+# lvm is explicitly not included here; this could be installed before it safely.
+RDEPEND=""
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( )
+
+src_prepare() {
+ default
+ sed -i -e '/kingpin.Flag.*\<command\>.*/s,/usr/sbin/lvm,/sbin/lvm,g' "${S}"/main.go || die
+}
+
+src_compile() {
+ default
+ go build .
+}
+
+src_install() {
+ default
+ dobin ${PN}
+ dodoc README.md
+
+ # TODO: more secure config would be a dedicated user AND a sudo command, so
+ # the daemon can run 'sudo lvm ...'.
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+src_test() {
+ go test .
+}
diff --git a/app-metrics/prometheus-lvm-exporter/prometheus-lvm-exporter-0.3.3.ebuild b/app-metrics/prometheus-lvm-exporter/prometheus-lvm-exporter-0.3.3.ebuild
new file mode 100644
index 000000000000..28809292d70e
--- /dev/null
+++ b/app-metrics/prometheus-lvm-exporter/prometheus-lvm-exporter-0.3.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Prometheus exporter for LVM metrics"
+HOMEPAGE="https://github.com/hansmi/prometheus-lvm-exporter"
+SRC_URI="
+ https://github.com/hansmi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~arthurzam/distfiles/app-metrics/${PN}/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# lvm is explicitly not included here; this could be installed before it safely.
+# RDEPEND=""
+
+src_prepare() {
+ default
+ sed -i -e '/kingpin.Flag.*\<command\>.*/s,/usr/sbin/lvm,/sbin/lvm,g' "${S}"/main.go || die
+}
+
+src_compile() {
+ default
+ ego build .
+}
+
+src_test() {
+ ego test .
+}
+
+src_install() {
+ default
+ dobin ${PN}
+ dodoc README.md
+
+ systemd_dounit contrib/systemd/${PN}.service
+ insinto /etc/default
+ newins contrib/systemd/${PN}.default ${PN}
+
+ # TODO: more secure config would be a dedicated user AND a sudo command, so
+ # the daemon can run 'sudo lvm ...'.
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/prometheus-podman-exporter/Manifest b/app-metrics/prometheus-podman-exporter/Manifest
new file mode 100644
index 000000000000..75f6786cc292
--- /dev/null
+++ b/app-metrics/prometheus-podman-exporter/Manifest
@@ -0,0 +1,4 @@
+DIST prometheus-podman-exporter-1.10.1.tar.gz 13578778 BLAKE2B e854a61ac1ac7237f0ab4bb7d6d2f39f3ebcf9c32f45e4b44c551aa45a8a97902084f0f24180a1253d0c664907fa1dcb5dc6ac587d31387c708c83388c2c9ed9 SHA512 f8da5b88e6d88d02bc48c2fcd627aca0e88d8264aa3c971b2e251fd7641b329fbe66686d12e2dfca8fe40cc1488359caa1a345844f32e45c79a28bc172bbd501
+DIST prometheus-podman-exporter-1.11.0.tar.gz 13883834 BLAKE2B c8c7334d08c4fa86deb1c8d07cbea1468dbc815d0812fc7dd563a52a29573af8c4ae003e8d5aad80e997770187abf7c5f50ed841a1bbec327f220c676dd829a6 SHA512 f976d77940c08202e629c27ba91810f1d9b03ee6b3ebbbcd1568491aec70eba2fae70e6e5ec261105bcd503e5508a95f75eb5a0e5e7916bcbb17205d8a17f7da
+DIST prometheus-podman-exporter-1.7.0.tar.gz 12251956 BLAKE2B 91a6a217db3fd2b408344f738a7acad5c161adad6da53ef3d3750b73d9135022b0a4c18d85d0f79fc331344462e600574c8cd94477b57261adb29e5ffccdcc83 SHA512 3f9184681f1466ca4bbd32830c8fd233bb7e95af4df0b97cff606e39987d6c608b8847924d3b1c5fe98d058b32324dea86a142065bae7afdb0f99e4cfe0d9b52
+DIST prometheus-podman-exporter-1.8.0.tar.gz 12253412 BLAKE2B 673986f2acce525ab6c9d0858ca6c193bc292bc5e6c8ad50f81921a8f66673c29f724ad562efefb6fe63d556e491432b593b7581af3a01faf44279013a2ec209 SHA512 eb647d8d5c7d30a6676fe192ac2f8c3be5ee67525206c67ac9d0dc06f2fd5fb7dbad838f53fa75f550f5dcfa5c188bd2eb0e7c46b13fe2795b38187ac2fdb81a
diff --git a/app-metrics/prometheus-podman-exporter/metadata.xml b/app-metrics/prometheus-podman-exporter/metadata.xml
new file mode 100644
index 000000000000..afa282c61ad3
--- /dev/null
+++ b/app-metrics/prometheus-podman-exporter/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>me@rahil.rocks</email>
+ <name>Rahil Bhimjiani</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>zmedico@gentoo.org</email>
+ <name>Zac Medico</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="btrfs">Collect metrics for btrfs filesystem</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">containers/prometheus-podman-exporter</remote-id>
+ <bugs-to>https://github.com/containers/prometheus-podman-exporter/issues</bugs-to>
+ <doc>https://github.com/containers/prometheus-podman-exporter/blob/main/README.md</doc>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild
new file mode 100644
index 000000000000..4452311819fe
--- /dev/null
+++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.10.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Exporter for podman giving containers, pods, images, volumes & networks metrics"
+HOMEPAGE="https://github.com/containers/prometheus-podman-exporter"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git"
+else
+ SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+# Main package
+LICENSE="Apache-2.0"
+# Dependencies
+LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="btrfs systemd"
+
+# there are no test files so prevent tests
+RESTRICT="test"
+
+PATCHES=(
+ "${T}/gentoo-specific-systemd-service.patch"
+)
+
+src_prepare() {
+ cat <<-'EOF' > "${T}/gentoo-specific-systemd-service.patch"
+ --- a/contrib/systemd/system/prometheus-podman-exporter.service
+ +++ b/contrib/systemd/system/prometheus-podman-exporter.service
+ @@ -2,7 +2,7 @@
+ Description=Prometheus exporter for podman (v4) machine
+ [Service]
+ Restart=on-failure
+ -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+ +EnvironmentFile=-/etc/default/prometheus-podman-exporter
+ ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+ ExecReload=/bin/kill -HUP $MAINPID
+ TimeoutStopSec=20s
+ --- a/contrib/systemd/user/prometheus-podman-exporter.service
+ +++ b/contrib/systemd/user/prometheus-podman-exporter.service
+ @@ -2,7 +2,7 @@
+ Description=Prometheus exporter for podman (v4) machine
+ [Service]
+ Restart=on-failure
+ -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+ +EnvironmentFile=-/etc/default/prometheus-podman-exporter
+ EnvironmentFile=-%h/.config/prometheus-podman-exporter
+ ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+ ExecReload=/bin/kill -HUP $MAINPID
+ EOF
+ default
+}
+
+src_compile() {
+ export BUILDTAGS="exclude_graphdriver_devicemapper"
+ use !btrfs && BUILDTAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
+ use systemd && BUILDTAGS+=",systemd"
+ default
+}
+
+src_install() {
+ emake DESTDIR="${ED}/usr/bin" install
+ dosym -r /usr/bin/"${PN}" /usr/bin/podman_exporter
+
+ insinto /etc/default
+ newins "contrib/systemd/system/prometheus-podman-exporter.sysconfig" "${PN}"
+ systemd_dounit "contrib/systemd/system/prometheus-podman-exporter.service"
+ systemd_douserunit "contrib/systemd/user/prometheus-podman-exporter.service"
+ dosym prometheus-podman-exporter.service $(systemd_get_systemunitdir)/podman_exporter.service
+ dosym prometheus-podman-exporter.service $(systemd_get_userunitdir)/podman_exporter.service
+
+ newconfd "contrib/openrc/prometheus-podman-exporter.confd" "${PN}"
+ newinitd "contrib/openrc/prometheus-podman-exporter.initd" "${PN}"
+ dosym "${PN}" /etc/conf.d/podman_exporter
+ dosym "${PN}" /etc/init.d/podman_exporter
+
+ einstalldocs
+}
diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild
new file mode 100644
index 000000000000..4452311819fe
--- /dev/null
+++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.11.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Exporter for podman giving containers, pods, images, volumes & networks metrics"
+HOMEPAGE="https://github.com/containers/prometheus-podman-exporter"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git"
+else
+ SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+# Main package
+LICENSE="Apache-2.0"
+# Dependencies
+LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="btrfs systemd"
+
+# there are no test files so prevent tests
+RESTRICT="test"
+
+PATCHES=(
+ "${T}/gentoo-specific-systemd-service.patch"
+)
+
+src_prepare() {
+ cat <<-'EOF' > "${T}/gentoo-specific-systemd-service.patch"
+ --- a/contrib/systemd/system/prometheus-podman-exporter.service
+ +++ b/contrib/systemd/system/prometheus-podman-exporter.service
+ @@ -2,7 +2,7 @@
+ Description=Prometheus exporter for podman (v4) machine
+ [Service]
+ Restart=on-failure
+ -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+ +EnvironmentFile=-/etc/default/prometheus-podman-exporter
+ ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+ ExecReload=/bin/kill -HUP $MAINPID
+ TimeoutStopSec=20s
+ --- a/contrib/systemd/user/prometheus-podman-exporter.service
+ +++ b/contrib/systemd/user/prometheus-podman-exporter.service
+ @@ -2,7 +2,7 @@
+ Description=Prometheus exporter for podman (v4) machine
+ [Service]
+ Restart=on-failure
+ -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+ +EnvironmentFile=-/etc/default/prometheus-podman-exporter
+ EnvironmentFile=-%h/.config/prometheus-podman-exporter
+ ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+ ExecReload=/bin/kill -HUP $MAINPID
+ EOF
+ default
+}
+
+src_compile() {
+ export BUILDTAGS="exclude_graphdriver_devicemapper"
+ use !btrfs && BUILDTAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
+ use systemd && BUILDTAGS+=",systemd"
+ default
+}
+
+src_install() {
+ emake DESTDIR="${ED}/usr/bin" install
+ dosym -r /usr/bin/"${PN}" /usr/bin/podman_exporter
+
+ insinto /etc/default
+ newins "contrib/systemd/system/prometheus-podman-exporter.sysconfig" "${PN}"
+ systemd_dounit "contrib/systemd/system/prometheus-podman-exporter.service"
+ systemd_douserunit "contrib/systemd/user/prometheus-podman-exporter.service"
+ dosym prometheus-podman-exporter.service $(systemd_get_systemunitdir)/podman_exporter.service
+ dosym prometheus-podman-exporter.service $(systemd_get_userunitdir)/podman_exporter.service
+
+ newconfd "contrib/openrc/prometheus-podman-exporter.confd" "${PN}"
+ newinitd "contrib/openrc/prometheus-podman-exporter.initd" "${PN}"
+ dosym "${PN}" /etc/conf.d/podman_exporter
+ dosym "${PN}" /etc/init.d/podman_exporter
+
+ einstalldocs
+}
diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.7.0.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.7.0.ebuild
new file mode 100644
index 000000000000..5d9cfead06de
--- /dev/null
+++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.7.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Exporter for podman giving containers, pods, images, volumes & networks metrics"
+HOMEPAGE="https://github.com/containers/prometheus-podman-exporter"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git"
+else
+ SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+# Main package
+LICENSE="Apache-2.0"
+# Dependencies
+LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="btrfs"
+
+# there are no test files so prevent tests
+RESTRICT="test"
+RDEPEND="
+ app-containers/podman[btrfs?]
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ export BUILDFLAGS=" -tags exclude_graphdriver_devicemapper"
+ use !btrfs && BUILDFLAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
+ default
+}
+
+src_install() {
+ emake DESTDIR="${ED}/usr/bin" install
+ systemd_dounit "contrib/systemd/prometheus-podman-exporter.service"
+ systemd_douserunit "contrib/systemd/prometheus-podman-exporter.service"
+ einstalldocs
+}
diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.8.0.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.8.0.ebuild
new file mode 100644
index 000000000000..1547a7a4946d
--- /dev/null
+++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-1.8.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Exporter for podman giving containers, pods, images, volumes & networks metrics"
+HOMEPAGE="https://github.com/containers/prometheus-podman-exporter"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git"
+else
+ SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+# Main package
+LICENSE="Apache-2.0"
+# Dependencies
+LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="btrfs systemd"
+
+# there are no test files so prevent tests
+RESTRICT="test"
+
+src_compile() {
+ export BUILDTAGS="exclude_graphdriver_devicemapper"
+ use !btrfs && BUILDTAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
+ use systemd && BUILDTAGS+=",systemd"
+ default
+}
+
+src_install() {
+ emake DESTDIR="${ED}/usr/bin" install
+ systemd_dounit "contrib/systemd/prometheus-podman-exporter.service"
+ systemd_douserunit "contrib/systemd/prometheus-podman-exporter.service"
+ einstalldocs
+}
diff --git a/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild
new file mode 100644
index 000000000000..4452311819fe
--- /dev/null
+++ b/app-metrics/prometheus-podman-exporter/prometheus-podman-exporter-9999.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Exporter for podman giving containers, pods, images, volumes & networks metrics"
+HOMEPAGE="https://github.com/containers/prometheus-podman-exporter"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/prometheus-podman-exporter.git"
+else
+ SRC_URI="https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+# Main package
+LICENSE="Apache-2.0"
+# Dependencies
+LICENSE+=" BSD-2 BSD ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="btrfs systemd"
+
+# there are no test files so prevent tests
+RESTRICT="test"
+
+PATCHES=(
+ "${T}/gentoo-specific-systemd-service.patch"
+)
+
+src_prepare() {
+ cat <<-'EOF' > "${T}/gentoo-specific-systemd-service.patch"
+ --- a/contrib/systemd/system/prometheus-podman-exporter.service
+ +++ b/contrib/systemd/system/prometheus-podman-exporter.service
+ @@ -2,7 +2,7 @@
+ Description=Prometheus exporter for podman (v4) machine
+ [Service]
+ Restart=on-failure
+ -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+ +EnvironmentFile=-/etc/default/prometheus-podman-exporter
+ ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+ ExecReload=/bin/kill -HUP $MAINPID
+ TimeoutStopSec=20s
+ --- a/contrib/systemd/user/prometheus-podman-exporter.service
+ +++ b/contrib/systemd/user/prometheus-podman-exporter.service
+ @@ -2,7 +2,7 @@
+ Description=Prometheus exporter for podman (v4) machine
+ [Service]
+ Restart=on-failure
+ -EnvironmentFile=-/etc/sysconfig/prometheus-podman-exporter
+ +EnvironmentFile=-/etc/default/prometheus-podman-exporter
+ EnvironmentFile=-%h/.config/prometheus-podman-exporter
+ ExecStart=/usr/bin/prometheus-podman-exporter $PODMAN_EXPORTER_OPTS
+ ExecReload=/bin/kill -HUP $MAINPID
+ EOF
+ default
+}
+
+src_compile() {
+ export BUILDTAGS="exclude_graphdriver_devicemapper"
+ use !btrfs && BUILDTAGS+=",exclude_graphdriver_btrfs,btrfs_noversion"
+ use systemd && BUILDTAGS+=",systemd"
+ default
+}
+
+src_install() {
+ emake DESTDIR="${ED}/usr/bin" install
+ dosym -r /usr/bin/"${PN}" /usr/bin/podman_exporter
+
+ insinto /etc/default
+ newins "contrib/systemd/system/prometheus-podman-exporter.sysconfig" "${PN}"
+ systemd_dounit "contrib/systemd/system/prometheus-podman-exporter.service"
+ systemd_douserunit "contrib/systemd/user/prometheus-podman-exporter.service"
+ dosym prometheus-podman-exporter.service $(systemd_get_systemunitdir)/podman_exporter.service
+ dosym prometheus-podman-exporter.service $(systemd_get_userunitdir)/podman_exporter.service
+
+ newconfd "contrib/openrc/prometheus-podman-exporter.confd" "${PN}"
+ newinitd "contrib/openrc/prometheus-podman-exporter.initd" "${PN}"
+ dosym "${PN}" /etc/conf.d/podman_exporter
+ dosym "${PN}" /etc/init.d/podman_exporter
+
+ einstalldocs
+}
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 4ed98f772621..d049f5612269 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,3 +1,9 @@
-DIST prometheus-2.11.2.tar.gz 12132678 BLAKE2B 0b6b9a93b7329c124f901d0acc6130132aa187142f0416e087c12f20b0cd35f8564a27d0df8c0bc811284b9811f446344adf700d6611afac3c5c1131c208b341 SHA512 cecdaf4522885bdf62492667d92475a97c54b04c1e93f48b6078def319fe33f5e28aafbab61e3609413615d6f853e817564fc372e5d1df0d867fe9fa333f6de9
-DIST prometheus-2.12.0.tar.gz 15221347 BLAKE2B 6061562e6bafe8e2373ad676e7acd2b5d5ff8e195cf4c1abd709347992c16970b64b225e9f58f33a801ff521abc78422281d97d8c5307a80a64fb8c8a8d8d5fe SHA512 3d3b5ce3afd13714a8fa96964784fa40feb650459f657cbc695c6a7e866f89c488132b408d78ea101804532768c51c3913607bf001f27d3f05c3df9efe3cab82
-DIST prometheus-2.9.2.tar.gz 11477683 BLAKE2B f0c18c57ff0fe292710174a91080a84ecf0375b4335aacaf4a8e32c842a9346b9fd48888ef8a19a597511c57eb8af7f90cca57d0cc51b9de4558c3f22953d165 SHA512 4cce1827580e49b1659ad492de946a81694c1dab90e079f3f0e56c1991254cf4ecac7f052aac75bf58a0b95d3cf4daa8c15b3e8305a3c089570da40c44a8ccc0
+DIST prometheus-2.40.4-assets.tar.xz 45585656 BLAKE2B b187b6683c778b5e9746f1f9695e03303cf5481387bb0517afee56685edc62bbb82c515f8dfeeafeb09a74b57b540da49d1936c7ec74b3013adc7afc8f07ea5f SHA512 8a229504b66bac0ef2fa7a9caafc93fdf3e1c9aa33e892219e57a21b44355515e69a232db98ce4f5664fb98cb37cfb3ec619eb2a3ccf662474544dfdbbba580c
+DIST prometheus-2.40.4-deps.tar.xz 253189332 BLAKE2B ca2c2f3e111897ac47d71acc3046230608134c854f7af7a4c5ec1fe75dfbb61c6bf278fe00f77ecf65113b72cbd67171634a0fbf57ad09e3349a7e8f45791e33 SHA512 29bf419e45d389805b1f37256cb8a9ce9cc6cb88b3cd4a7a1681121f24158cce7aa5a949554f5344409ba4f683976866bfc766666e2a0a247996c135d2068b6f
+DIST prometheus-2.40.4.tar.gz 6156657 BLAKE2B a522b31516f5e26475afa2d59a7074b7deb2a70ffbf7cce6e3951bfeacc6dae6d8f59d1b1b591d1c59c0ac9839bc691ce315d55f7fe0a45be573e124f651764b SHA512 9b46f9f3b986929bdfe365645e43c0a3c2073b920e59cc512287f866506d7db7b83ffb2dbe24d1835fccc1b2cc781be7a373da5fb58c04521648981b19e81737
+DIST prometheus-2.43.0-assets.tar.xz 45483188 BLAKE2B 603ba713947954d5c54748cc5778d7c3f6f3ef90abbb73eb3b44269c4b2973290e408d284abe83d30d99107be6007feeb2078d70b4fba71a8b4e612cd7e923a2 SHA512 8a15a3ebbeb8ae27d20d036ee7a9eae09ca8829f8e5b96ebe662e078e57ec02c3654916f705101ea1e371d7b79a4ea9f98b3c3f0433137c7750699e6bf3e0d97
+DIST prometheus-2.43.0-deps.tar.xz 261021244 BLAKE2B b2f9af3e1f511135dd782f99aa552c6f20f2196eca95bd88643e4c29c03be81ce5e9fe8818c7700680cbac8c853a9f8c98cc10c517e28cecbf67db257a224019 SHA512 304f49997a8a466811b7a383a2512a47f15f0c0be878af1818698231d7bfbead8974bba31b30fdad59185c00915f45652a68b9f4b52950e81fe6dfa957906358
+DIST prometheus-2.43.0.tar.gz 6228230 BLAKE2B d004bb077c70849e7d9e0c28420582475f32d6b5541c12f3c79af02b897fd9df0847c27317cdffe7ccc4183a31e7d0d0535ce980dfe79b3a517a7a6d819645f3 SHA512 d84fcd064224c6b0a9306151ce96052bac53b5c08f6a69ced88e6424c65d1c6143e82a863ac5c9e348a7be97bc2caa38f64f521a5b050e710b474025f6e41014
+DIST prometheus-2.47.0-assets.tar.xz 40992964 BLAKE2B d7eff81d429a482c819269bdb7d67b76dd74b63a70112a2b34ee7eeaa9c9b4049b4c9f2c56aa6468baa9be1454028a1d7b8721bc23c057091e8c1671b266729a SHA512 a8f904a24d8243a26a71b7ab947a465713a6f9185878d0a86ed5c2c665b887f12e74daf6aef6997d290837a3da02160235aef8acb85ba401203d616c34e08e37
+DIST prometheus-2.47.0-deps.tar.xz 337362600 BLAKE2B 03d86183f55cf7ac84e6ccae91fad3bed590a9ba1bd22fbd9b0f3148c6b1367b86af29dad4988c66b28e2b69570940523b1e78ae6ec1b6bd68a744455688beaf SHA512 27edb6aad9bf134c3c061f06b6e96787cd48a19d7ae42c9fa04b86bd6c98b62c1f558030266b0882ad668da268d6794605b017f335d3ad4128a41ca6f5e0d241
+DIST prometheus-2.47.0.tar.gz 6335136 BLAKE2B 10a4d2bb53b8c6cd5f26ab28155673f1d5ea08cc6e070350af9b09d9868dd39a073f9747c0836490be0fc5f33a2d461b5eb8087c3ab469feb940a6e9795c094c SHA512 1d8d91512d3edc7f56bd0e96b398e9680dd5fd39d2ac2e7e3f52d7bccc30ead4e4d0f238886d80d41d980a89c20123e0b29ce6eec9d8799f5581b147f3ef79ea
diff --git a/app-metrics/prometheus/files/prometheus-3.initd b/app-metrics/prometheus/files/prometheus-3.initd
deleted file mode 100644
index ae151ef91fbd..000000000000
--- a/app-metrics/prometheus/files/prometheus-3.initd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus monitoring system and time series database"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${SVCNAME}}
-group=${group:-${SVCNAME}}
-
-command="/usr/bin/prometheus"
-command_args="${command_args:---config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
- --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
- --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-extra_started_commands="reload"
-
-depend() {
- after net
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP --pidfile "${pidfile}"
- eend $? "Failed to stop ${SVCNAME}"
-}
-
diff --git a/app-metrics/prometheus/files/prometheus.confd b/app-metrics/prometheus/files/prometheus.confd
index 93b41b31624c..19a286f5677a 100644
--- a/app-metrics/prometheus/files/prometheus.confd
+++ b/app-metrics/prometheus/files/prometheus.confd
@@ -1,2 +1,26 @@
-# arguments for Prometheus
-command_args=""
+# additional arguments for Prometheus
+#
+# command_args should not be set in this file. Instead, you should set
+# prometheus_args.
+#
+# The default settings are listed below.
+# If you are not changing these settings, you do
+# not need to include them in prometheus_args.
+#
+# To migrate from using command_args to prometheus_args, drop any of the
+# default settings below that you have set the same way then switch to
+# prometheus_args.
+#
+# The new behavior is that prometheus_args will be appended to these
+# defaults allowing anything you add to override them.
+#
+#The default settings are:
+#
+# --web.enable-lifecycle
+# --config.file=/etc/prometheus/prometheus.yml
+# --storage.tsdb.path=/var/lib/prometheus/data
+# --web.console.templates=/etc/prometheus/consoles
+# --web.console.libraries=/etc/prometheus/console_libraries
+# --web.enable-admin-api
+#
+prometheus_args=""
diff --git a/app-metrics/prometheus/files/prometheus.initd b/app-metrics/prometheus/files/prometheus.initd
index f7371f8ca060..00e3c25ebe84 100644
--- a/app-metrics/prometheus/files/prometheus.initd
+++ b/app-metrics/prometheus/files/prometheus.initd
@@ -9,7 +9,18 @@ group=${group:-${RC_SVCNAME}}
command_user=${user}:${group}
command="/usr/bin/prometheus"
+if [ -z "${command_args}" ]; then
+command_args="
+ --web.enable-lifecycle
+ --config.file=/etc/prometheus/prometheus.yml
+ --storage.tsdb.path=/var/lib/prometheus/data
+ --web.console.templates=/etc/prometheus/consoles
+ --web.console.libraries=/etc/prometheus/console_libraries
+ --web.enable-admin-api
+ ${prometheus_args}"
+else
command_args="${command_args:---config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data}"
+fi
command_background="true"
error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
diff --git a/app-metrics/prometheus/files/prometheus.service b/app-metrics/prometheus/files/prometheus.service
new file mode 100644
index 000000000000..ebd8a901d1fd
--- /dev/null
+++ b/app-metrics/prometheus/files/prometheus.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Prometheus
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+User=prometheus
+Group=prometheus
+ExecStart=/usr/bin/prometheus \
+ --web.enable-lifecycle \
+ --config.file=/etc/prometheus/prometheus.yml \
+ --storage.tsdb.path="/var/lib/prometheus/data" \
+ --web.console.templates=/etc/prometheus/consoles \
+ --web.console.libraries=/etc/prometheus/console_libraries \
+ --web.listen-address=0.0.0.0:9090 \
+ --web.enable-admin-api
+
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/prometheus/metadata.xml b/app-metrics/prometheus/metadata.xml
index f4e8d75f03b9..7b35109c6fd9 100644
--- a/app-metrics/prometheus/metadata.xml
+++ b/app-metrics/prometheus/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
</maintainer>
<upstream>
<remote-id type="github">prometheus/prometheus</remote-id>
diff --git a/app-metrics/prometheus/prometheus-2.11.2.ebuild b/app-metrics/prometheus/prometheus-2.11.2.ebuild
deleted file mode 100644
index 54264f899cc6..000000000000
--- a/app-metrics/prometheus/prometheus-2.11.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-MY_PV=v${PV/_rc/-rc.}
-PROMETHEUS_COMMIT="343d8d7"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- >=dev-lang/go-1.12
- >=dev-util/promu-0.3.0"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup prometheus
- enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin promtool prometheus
- dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
- insinto /etc/prometheus
- doins documentation/examples/prometheus.yml
- insinto /usr/share/prometheus
- doins -r console_libraries consoles
- dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
- dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
- popd || die
-
- newinitd "${FILESDIR}"/prometheus.initd prometheus
- newconfd "${FILESDIR}"/prometheus.confd prometheus
- keepdir /var/log/prometheus /var/lib/prometheus
- fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
- if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
- ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
- ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
- ewarn "This release requires a clean storage directory and is not compatible with"
- ewarn "files created by previous beta releases"
- fi
-}
diff --git a/app-metrics/prometheus/prometheus-2.12.0.ebuild b/app-metrics/prometheus/prometheus-2.12.0.ebuild
deleted file mode 100644
index 5a036cba4edc..000000000000
--- a/app-metrics/prometheus/prometheus-2.12.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-MY_PV=v${PV/_rc/-rc.}
-PROMETHEUS_COMMIT="43acd0e"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- >=dev-lang/go-1.12
- >=dev-util/promu-0.3.0"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup prometheus
- enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin promtool prometheus
- dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
- insinto /etc/prometheus
- doins documentation/examples/prometheus.yml
- insinto /usr/share/prometheus
- doins -r console_libraries consoles
- dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
- dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
- popd || die
-
- newinitd "${FILESDIR}"/prometheus.initd prometheus
- newconfd "${FILESDIR}"/prometheus.confd prometheus
- keepdir /var/log/prometheus /var/lib/prometheus
- fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
- if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
- ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
- ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
- ewarn "This release requires a clean storage directory and is not compatible with"
- ewarn "files created by previous beta releases"
- fi
-}
diff --git a/app-metrics/prometheus/prometheus-2.40.4.ebuild b/app-metrics/prometheus/prometheus-2.40.4.ebuild
new file mode 100644
index 000000000000..f88dcdde4212
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.40.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_COMMIT=414d31aee6586a5f29e755ae059b7d7131f1c6c8
+MY_PV=v${PV/_rc/-rc.}
+
+# To create the assets tarball run the following:
+# git checkout <tag>
+# make assets-compress
+# tar -acf <tarball> web/ui
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~riscv"
+
+COMMON_DEPEND="acct-group/prometheus
+ acct-user/prometheus"
+DEPEND="!app-metrics/prometheus-bin
+ ${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+BDEPEND=">=dev-util/promu-0.3.0"
+
+RESTRICT=" test"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/{{.Branch}}/HEAD/" \
+ -e "s/{{.Revision}}/${GIT_COMMIT}/" \
+ -e "s/{{.Version}}/${PV}/" \
+ .promu.yml || die
+ cp -a -n "${WORKDIR}"/web/ui web || die
+}
+
+src_compile() {
+ emake PROMU="${EPREFIX}"/usr/bin/promu common-build plugins
+}
+
+src_install() {
+ dobin prometheus promtool
+ dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+ insinto /usr/share/prometheus
+ doins -r console_libraries consoles
+ insinto /etc/prometheus
+ doins documentation/examples/prometheus.yml
+ dosym -r /usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+ dosym -r /usr/share/prometheus/consoles /etc/prometheus/consoles
+
+ systemd_dounit "${FILESDIR}"/prometheus.service
+ newinitd "${FILESDIR}"/prometheus.initd prometheus
+ newconfd "${FILESDIR}"/prometheus.confd prometheus
+ keepdir /var/log/prometheus /var/lib/prometheus
+ fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+ if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+ ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+ ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+ ewarn "This release requires a clean storage directory and is not compatible with"
+ ewarn "files created by previous beta releases"
+ fi
+}
diff --git a/app-metrics/prometheus/prometheus-2.43.0-r2.ebuild b/app-metrics/prometheus/prometheus-2.43.0-r2.ebuild
new file mode 100644
index 000000000000..3bf0318347f6
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.43.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_COMMIT=edfc3bcd025dd6fe296c167a14a216cab1e552ee
+MY_PV=v${PV/_rc/-rc.}
+
+# To create the assets tarball run the following:
+# git checkout <tag>
+# make assets-compress
+# tar -acf <tarball> web/ui
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~riscv"
+
+COMMON_DEPEND="acct-group/prometheus
+ acct-user/prometheus"
+DEPEND="!app-metrics/prometheus-bin
+ ${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+BDEPEND=">=dev-util/promu-0.3.0"
+
+RESTRICT=" test"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/{{.Branch}}/HEAD/" \
+ -e "s/{{.Revision}}/${GIT_COMMIT}/" \
+ -e "s/{{.Version}}/${PV}/" \
+ .promu.yml || die
+ cp -a -u "${WORKDIR}"/web/ui web || die "cp failed"
+}
+
+src_compile() {
+ emake PROMU="${EPREFIX}"/usr/bin/promu common-build plugins
+}
+
+src_install() {
+ dobin prometheus promtool
+ dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+ insinto /usr/share/prometheus
+ doins -r console_libraries consoles
+ insinto /etc/prometheus
+ doins documentation/examples/prometheus.yml
+ dosym -r /usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+ dosym -r /usr/share/prometheus/consoles /etc/prometheus/consoles
+
+ systemd_dounit "${FILESDIR}"/prometheus.service
+ newinitd "${FILESDIR}"/prometheus.initd prometheus
+ newconfd "${FILESDIR}"/prometheus.confd prometheus
+ keepdir /var/log/prometheus /var/lib/prometheus
+ fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+ if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+ ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+ ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+ ewarn "This release requires a clean storage directory and is not compatible with"
+ ewarn "files created by previous beta releases"
+ fi
+}
diff --git a/app-metrics/prometheus/prometheus-2.47.0.ebuild b/app-metrics/prometheus/prometheus-2.47.0.ebuild
new file mode 100644
index 000000000000..7903e5aa052c
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.47.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_COMMIT=efa34a5840661c29c2e362efa76bc3a70dccb335
+MY_PV=v${PV/_rc/-rc.}
+
+# To create the assets tarball run the following:
+# git checkout <tag>
+# make assets-compress
+# tar -acf <tarball> web/ui
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+
+COMMON_DEPEND="acct-group/prometheus
+ acct-user/prometheus"
+DEPEND="!app-metrics/prometheus-bin
+ ${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+BDEPEND=">=dev-util/promu-0.3.0"
+
+RESTRICT=" test"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s/{{.Branch}}/HEAD/" \
+ -e "s/{{.Revision}}/${GIT_COMMIT}/" \
+ -e "s/{{.Version}}/${PV}/" \
+ .promu.yml || die
+ cp -a -u "${WORKDIR}"/web/ui web || die "cp failed"
+}
+
+src_compile() {
+ emake PROMU="${EPREFIX}"/usr/bin/promu common-build plugins
+}
+
+src_install() {
+ dobin prometheus promtool
+ dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+ insinto /usr/share/prometheus
+ doins -r console_libraries consoles
+ insinto /etc/prometheus
+ doins documentation/examples/prometheus.yml
+ dosym -r /usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+ dosym -r /usr/share/prometheus/consoles /etc/prometheus/consoles
+
+ systemd_dounit "${FILESDIR}"/prometheus.service
+ newinitd "${FILESDIR}"/prometheus.initd prometheus
+ newconfd "${FILESDIR}"/prometheus.confd prometheus
+ keepdir /var/log/prometheus /var/lib/prometheus
+ fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+ if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+ ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+ ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+ ewarn "This release requires a clean storage directory and is not compatible with"
+ ewarn "files created by previous beta releases"
+ fi
+}
diff --git a/app-metrics/prometheus/prometheus-2.9.2.ebuild b/app-metrics/prometheus/prometheus-2.9.2.ebuild
deleted file mode 100644
index 8b6174ce2b4e..000000000000
--- a/app-metrics/prometheus/prometheus-2.9.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-MY_PV=v${PV/_rc/-rc.}
-PROMETHEUS_COMMIT="d3245f1"
-KEYWORDS="amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- >=dev-lang/go-1.12
- >=dev-util/promu-0.3.0"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup prometheus
- enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin promtool prometheus
- dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
- insinto /etc/prometheus
- doins documentation/examples/prometheus.yml
- insinto /usr/share/prometheus
- doins -r console_libraries consoles
- dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
- dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
- popd || die
-
- newinitd "${FILESDIR}"/prometheus.initd prometheus
- newconfd "${FILESDIR}"/prometheus.confd prometheus
- keepdir /var/log/prometheus /var/lib/prometheus
- fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
- if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
- ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
- ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
- ewarn "This release requires a clean storage directory and is not compatible with"
- ewarn "files created by previous beta releases"
- fi
-}
diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index a0ce15126a1e..8ba404f83dd2 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -1,3 +1,2 @@
-DIST pushgateway-0.7.0.tar.gz 1867703 BLAKE2B 588be72ba8f7b8421e36e7cb33ecc27e8f94c242e03d7a97b2f1f54c167373162a9e9e7dba63897e583331370b96723169359ebd78839a0bd1306f850dc24cc1 SHA512 2057c028e2427a9d63ad2fc47a0f367a9b075c259186659c7d20038d79aaa4f5a014a4304d36eee2e78c08af69e27f7f65e6aed2453c4fa630203fd4bf944c41
-DIST pushgateway-0.8.0.tar.gz 1869626 BLAKE2B 43c288c481160807324f4d247a9d03b1696be934e97dc852f0ee6732d56715a2c78b451247f62f5cd0d93d9ceff64b54ccb20a91d78496a915271b9080d5832c SHA512 fdb8b3e1cd11b7faa329e1b625c7d2d98635624f32623ae99a7bb1cf2222ed682cb9c031afec191a5426d6fafade7bb92add7dc607898e4a839252aca5f1d71c
-DIST pushgateway-0.9.0.tar.gz 4722706 BLAKE2B 6d024819a4729cb4e728a0d1b654be94881e4a439c734655a33f5dc7c978d09205bf97e51668c2da68319df14bf802a142342483c679f4add3bf2d0992f8bef2 SHA512 0dd98f3e35e2d13e4e5e30ee398121b663ebfde240654c49f44bb0b765065f35ecefd9ddaad706f7b9a5365ea2ef1afdebe57441fa2c18c211a8670d795719b0
+DIST pushgateway-1.5.1-deps.tar.xz 28913128 BLAKE2B dc7f352a4085ff365a3039501992e7678c1c8b59d3f56ecafa4fe7e50d5693c8399edede9f994c6fca8af739d33bc5cb627b1dbfe27bd0dd63539834290f816d SHA512 82f586be350b1d5f3169adee7e88c9522e34e37de1c9741a32b824d3f9e5b3bdc914177f1a1cff722de89eebe9bd6221ad6b9c29684a348cc7ba93d8cc3c05fd
+DIST pushgateway-1.5.1.tar.gz 4272543 BLAKE2B 01aeda87efdbbd6c7d0c1a8676fe0798c8d97f7638ca26eb8720412eb00d2abff5c7e73d21e1c2424bd375efa8878c85642a06196e933e44ea804e6e053adbf2 SHA512 01ebcdb85f059c330195f37f9466e2042311d8196948881f07d53f1ac4c7daedf343c14856f51db274df00b652b09eb52c735f04f774baf66559697864e1f93b
diff --git a/app-metrics/pushgateway/metadata.xml b/app-metrics/pushgateway/metadata.xml
index f233ac35e254..d86867e8a251 100644
--- a/app-metrics/pushgateway/metadata.xml
+++ b/app-metrics/pushgateway/metadata.xml
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
<name>Zac Medico</name>
</maintainer>
- <maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- </maintainer>
<upstream>
<remote-id type="github">prometheus/pushgateway</remote-id>
</upstream>
diff --git a/app-metrics/pushgateway/pushgateway-0.7.0.ebuild b/app-metrics/pushgateway/pushgateway-0.7.0.ebuild
deleted file mode 100644
index af0d7bd02d48..000000000000
--- a/app-metrics/pushgateway/pushgateway-0.7.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/prometheus/pushgateway"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-GIT_COMMIT="d5a56ba"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
-HOMEPAGE="https://github.com/prometheus/pushgateway"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
- dev-util/promu"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/pushgateway
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- popd || die
- keepdir /var/lib/${PN} /var/log/${PN}
- fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
- newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}-1.service"
-}
diff --git a/app-metrics/pushgateway/pushgateway-0.8.0.ebuild b/app-metrics/pushgateway/pushgateway-0.8.0.ebuild
deleted file mode 100644
index 3d1f5eba9122..000000000000
--- a/app-metrics/pushgateway/pushgateway-0.8.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/prometheus/pushgateway"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-GIT_COMMIT="d90bf32"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
-HOMEPAGE="https://github.com/prometheus/pushgateway"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
- >=dev-util/promu-0.3.0"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/pushgateway
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- popd || die
- keepdir /var/lib/${PN} /var/log/${PN}
- fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
- newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}-1.service"
-}
diff --git a/app-metrics/pushgateway/pushgateway-0.9.0.ebuild b/app-metrics/pushgateway/pushgateway-0.9.0.ebuild
deleted file mode 100644
index ba7d4f8d54e6..000000000000
--- a/app-metrics/pushgateway/pushgateway-0.9.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/prometheus/pushgateway"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-GIT_COMMIT="44d7ae6"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
-HOMEPAGE="https://github.com/prometheus/pushgateway"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
- >=dev-util/promu-0.3.0"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/pushgateway
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- popd || die
- keepdir /var/lib/${PN} /var/log/${PN}
- fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
- newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}-1.service"
-}
diff --git a/app-metrics/pushgateway/pushgateway-1.5.1.ebuild b/app-metrics/pushgateway/pushgateway-1.5.1.ebuild
new file mode 100644
index 000000000000..412c605f6115
--- /dev/null
+++ b/app-metrics/pushgateway/pushgateway-1.5.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+GIT_COMMIT="7afc96c"
+DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
+HOMEPAGE="https://github.com/prometheus/pushgateway"
+SRC_URI="
+ https://github.com/prometheus/pushgateway/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+ acct-group/pushgateway
+ acct-user/pushgateway
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND=">=dev-util/promu-0.3.0"
+
+src_prepare() {
+ default
+ sed -i -e 's|{{\.Revision}}|'${GIT_COMMIT}'|g' .promu.yml || die
+}
+
+src_compile() {
+ mkdir -p bin || die
+ promu build -v --prefix bin || die
+}
+
+src_install() {
+ newbin "bin/${P}" "${PN}"
+ dodoc {README,CHANGELOG,CONTRIBUTING}.md
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}-1.service"
+}
diff --git a/app-metrics/rabbitmq_exporter/metadata.xml b/app-metrics/rabbitmq_exporter/metadata.xml
index c36c37139fad..363b01159674 100644
--- a/app-metrics/rabbitmq_exporter/metadata.xml
+++ b/app-metrics/rabbitmq_exporter/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">kbudde/rabbitmq_exporter</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0.ebuild b/app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0-r1.ebuild
index 6f5c5c9330ff..9fede10a764d 100644
--- a/app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0.ebuild
+++ b/app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
EGO_PN=github.com/kbudde/rabbitmq_exporter
EGO_VENDOR=(
@@ -18,22 +18,22 @@ EGO_VENDOR=(
"golang.org/x/sys 2be51725563103c17124a318f1745b66f2347acb github.com/golang/sys"
)
-inherit user golang-build golang-vcs-snapshot
+inherit golang-build golang-vcs-snapshot
DESCRIPTION="Rabbitmq exporter for Prometheus"
HOMEPAGE="https://github.com/kbudde/rabbitmq_exporter"
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
+LICENSE="MIT Apache-2.0 BSD"
SLOT="0"
KEYWORDS="~amd64"
-DEPEND="dev-util/promu"
+DEPEND="acct-group/rabbitmq_exporter
+ acct-user/rabbitmq_exporter"
+ RDEPEND="${DEPEND}"
+BDEPEND="dev-util/promu"
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
+RESTRICT+=" test "
src_prepare() {
default
@@ -52,8 +52,8 @@ src_install() {
dobin bin/${PN}
dodoc *.md
popd || die
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
}
diff --git a/app-metrics/redis_exporter/Manifest b/app-metrics/redis_exporter/Manifest
index ceb2228cdb59..bc38176397ac 100644
--- a/app-metrics/redis_exporter/Manifest
+++ b/app-metrics/redis_exporter/Manifest
@@ -1 +1,5 @@
-DIST redis_exporter-0.20.2.tar.gz 970030 BLAKE2B 55bee727f196fad642944a444220d9f71958d812f5f5f4d79a0c741cada25f29690ff4f185ec4028cf5216139e5351022a134fb1b0f2b5b45b384a831dbf1802 SHA512 eee4cc9de79ea256571c9650abae6b044fc78b7683abef544d5313dad5d46d3516c55e939c33f87849cc52ed2465797d20b606e386aa4fe187dd16d30354173e
+DIST redis_exporter-1.38.0-deps.tar.xz 103185452 BLAKE2B a144d70cd20887dca660fc4f4d2d2ce16dc8463ef0906499c730acb11d717d5c5cf8ab9985ffafd4f9c0cf93c677b2e98895a3b48e9f2e1a2813de96e536d89d SHA512 31927c0dfc4c960ad3a91be387fa6b7b2603a6b9c9927b9d50ae9986beae866eb1c04cbcb2699265fecf201bda83e16746e4c8991b8f4560248c19d17c2744e4
+DIST redis_exporter-1.40.0.tar.gz 188796 BLAKE2B f2bb4d05129f4644d58fae005c13737f76222d32c08b9938a4b4fbb8c5000a6a00529204d839b96ae53f489183caf01ecb113535648cd80b0e9d3872ad35a8b1 SHA512 0909f71b32434bd2b47db505cd48cd5d34c4c7cfa04b513ff53c265bbd6b91c15f4e7bcf18e4b4e1c52940dafe53eed43ab9ae4db33071cd827a6d798878736b
+DIST redis_exporter-1.43.0.tar.gz 189579 BLAKE2B 9340ed4710c8d3277bdd562555269b18fd2691b669f507c2306534848815edda8730e0aa718c6b159ba83b91fc89f99dc4480380e950c5f8e662931621a413d3 SHA512 3d2b6d5b58347ddf826de06d60571ef8962078c8ab03647b8f1a91fcdbe2b7e9be015335d09109b21471ee06a59d5e1ad947d9e1bbc681e430c270dc01ae48f2
+DIST redis_exporter-1.44.0-deps.tar.xz 103514884 BLAKE2B 14531f87fa3c19ab791b77b39687534b66da199012337b72817f2624a7a679424f1a279a3b888eacb34c0cd7a5d0d51cc8fe3c63c92036cbc320b7e9d9d70c7c SHA512 ee8ceb663c15e18991903dab3b4a5dbf2981e040694e02bcd0ff81e5690a8fbdefb775e4ccc2bfcbb7bf757f5023f3ed5ae0c918779682c55ef4d9e11181da55
+DIST redis_exporter-1.44.0.tar.gz 190542 BLAKE2B 29228825e796def0bfe54ece2e09277fbdb614171e90f02b11b904a14a114aafe6f6810fafad19b2d56749f2edcab13bf03a0ed376310c39a5855715bfef2d53 SHA512 29dd210c23258c896e227d373b2c380a61b6a031f919b3da40ba2fb926f3fa534a2b1478e064b19496675935772bdad8ff490485625c1de4d470f377293efafb
diff --git a/app-metrics/redis_exporter/metadata.xml b/app-metrics/redis_exporter/metadata.xml
index ad438766d9bb..b38c6f1a6ffb 100644
--- a/app-metrics/redis_exporter/metadata.xml
+++ b/app-metrics/redis_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
diff --git a/app-metrics/redis_exporter/redis_exporter-1.40.0.ebuild b/app-metrics/redis_exporter/redis_exporter-1.40.0.ebuild
new file mode 100644
index 000000000000..2c43a3723319
--- /dev/null
+++ b/app-metrics/redis_exporter/redis_exporter-1.40.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+EGIT_COMMIT=3a743038c6c5a80d10ce45a3fbd49412262c300b
+
+DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
+HOMEPAGE="https://github.com/oliver006/redis_exporter"
+SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/redis_exporter-1.38.0-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="
+ acct-user/redis_exporter
+ acct-group/redis_exporter"
+DEPEND="${RDEPEND}"
+RESTRICT+=" test"
+
+src_prepare() {
+ default
+ sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
+ -e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
+ -e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
+ -i main.go || die
+}
+
+src_compile() {
+ export GOBIN="${S}/bin"
+ go install \
+ -ldflags="-X main.BuildVersion=${PV} -X main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
+ ./... || die
+}
+
+src_test() {
+ go test -work ./... || die
+}
+
+src_install() {
+ dobin "${GOBIN}/redis_exporter"
+ dodoc README.md
+ local dir
+ for dir in /var/{lib,log}/${PN}; do
+ keepdir "${dir}"
+ fowners ${PN}:${PN} "${dir}"
+ done
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/app-metrics/redis_exporter/redis_exporter-1.43.0.ebuild b/app-metrics/redis_exporter/redis_exporter-1.43.0.ebuild
new file mode 100644
index 000000000000..b0437e9d3084
--- /dev/null
+++ b/app-metrics/redis_exporter/redis_exporter-1.43.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+EGIT_COMMIT=980a9741e77c4e065faba80805f93d4694d71d67
+
+DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
+HOMEPAGE="https://github.com/oliver006/redis_exporter"
+SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/redis_exporter-1.38.0-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="
+ acct-user/redis_exporter
+ acct-group/redis_exporter"
+DEPEND="${RDEPEND}"
+RESTRICT+=" test"
+
+src_prepare() {
+ default
+ sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
+ -e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
+ -e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
+ -i main.go || die
+}
+
+src_compile() {
+ export GOBIN="${S}/bin"
+ go install \
+ -ldflags="-X main.BuildVersion=${PV} -X main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
+ ./... || die
+}
+
+src_test() {
+ go test -work ./... || die
+}
+
+src_install() {
+ dobin "${GOBIN}/redis_exporter"
+ dodoc README.md
+ local dir
+ for dir in /var/{lib,log}/${PN}; do
+ keepdir "${dir}"
+ fowners ${PN}:${PN} "${dir}"
+ done
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/app-metrics/redis_exporter/redis_exporter-0.20.2.ebuild b/app-metrics/redis_exporter/redis_exporter-1.44.0.ebuild
index e6d81a4c74df..8713b5d1d586 100644
--- a/app-metrics/redis_exporter/redis_exporter-0.20.2.ebuild
+++ b/app-metrics/redis_exporter/redis_exporter-1.44.0.ebuild
@@ -1,45 +1,47 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit user golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/oliver006/redis_exporter"
-EGIT_COMMIT="3e15af27aac37e114b32a07f5e9dc0510f4cbfc4"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+EAPI=7
+inherit go-module systemd
+EGIT_COMMIT=19f7b036bb46869858eec74d8d3fc2186d641399
DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
HOMEPAGE="https://github.com/oliver006/redis_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
+SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD"
SLOT="0"
+KEYWORDS="~amd64"
IUSE=""
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
+RDEPEND="
+ acct-user/redis_exporter
+ acct-group/redis_exporter"
+DEPEND="${RDEPEND}"
+RESTRICT+=" test"
src_prepare() {
default
sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
-e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
-e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
- -i src/${EGO_PN}/main.go || die
+ -i main.go || die
}
src_compile() {
- export -n GOCACHE XDG_CACHE_HOME #684052
- pushd src/${EGO_PN} || die
- GOPATH="${S}" \
- go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
- popd || die
+ export GOBIN="${S}/bin"
+ go install \
+ -ldflags="-X main.BuildVersion=${PV} -X main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
+ ./... || die
+}
+
+src_test() {
+ go test -work ./... || die
}
src_install() {
- dobin bin/redis_exporter
- dodoc src/${EGO_PN}/README.md
+ dobin "${GOBIN}/redis_exporter"
+ dodoc README.md
local dir
for dir in /var/{lib,log}/${PN}; do
keepdir "${dir}"
diff --git a/app-metrics/smartctl_exporter/Manifest b/app-metrics/smartctl_exporter/Manifest
new file mode 100644
index 000000000000..92c3f95cfa2d
--- /dev/null
+++ b/app-metrics/smartctl_exporter/Manifest
@@ -0,0 +1,3 @@
+DIST smartctl_exporter-0.12.0-d33b5a391f4a18b3d9c0a194e57cdd3491130099.patch 4997 BLAKE2B cf03225eeaea9553e6e0686450efc574c3c0b9b67cce0866a514cdd19ef6d91f6c5e4253fad9ac10a99bc92c6057ca27cce3bde1ebe3942e2fe0fb8070c6e199 SHA512 2ca0ad57fb4cb92a5db6cffa650a7045eb5c309e3cecf227c971262617d94e4a32cdc1d9465a7030d9b24d243f1a717d92d3b327dc494fb18e57d9da67b59002
+DIST smartctl_exporter-0.12.0-vendor.tar.xz 1400804 BLAKE2B 5c4ba0440860c86d3a3bd84308c97a6fe1eaf231776ed64840f6ebd3cad533bab5f8b97ee9f4c3d573b08442fc66f565c8b83a7f70fea889cf2e9e1337ce24cc SHA512 28e235eb6e560042ae0783a1fb1276ff07dff5e838f1f2d6a93886f0fdea85151b1c1c87c8476d42524f7e563a58ae30f354fa1138a93fcbe0f39ff7bcba0b3d
+DIST smartctl_exporter-0.12.0.tar.gz 91406 BLAKE2B 9ab0fa3e4dcee1e21a566cd9677b99f579f60e761d40d9ab1dd75380bbff9c189d9895ee2e914d1b6bdeee0c5b6d185c71ae62f4ce7585b3954192091cc96e25 SHA512 8f2cc973fd967c9ab737dcaa7456f019cb574ac3297bd5d15559167cde51f8076bcb48c7befb7efb869e056c1c5e404f4bb2774e8fe020736354ede4ae3e77f3
diff --git a/app-metrics/smartctl_exporter/files/smartctl_exporter.confd b/app-metrics/smartctl_exporter/files/smartctl_exporter.confd
new file mode 100644
index 000000000000..5a8a1d649a60
--- /dev/null
+++ b/app-metrics/smartctl_exporter/files/smartctl_exporter.confd
@@ -0,0 +1,2 @@
+# arguments for smartctl exporter
+command_args=""
diff --git a/app-metrics/smartctl_exporter/files/smartctl_exporter.initd b/app-metrics/smartctl_exporter/files/smartctl_exporter.initd
new file mode 100644
index 000000000000..b9e18a61449a
--- /dev/null
+++ b/app-metrics/smartctl_exporter/files/smartctl_exporter.initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 2016-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="smartctl metrics exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=root
+group=root
+
+command="/usr/bin/smartctl_exporter"
+command_args="${command_args}"
+command_background="true"
+command_user="${user}:${group}"
+output_log="/var/log/smartctl_exporter/${RC_SVCNAME}.log"
+error_log="/var/log/smartctl_exporter/${RC_SVCNAME}.log"
+
+depend() {
+ after net
+}
+
+start_pre() {
+ checkpath -q -d -m 0755 -o ${user}:${group} /var/log/smartctl_exporter
+}
diff --git a/app-metrics/smartctl_exporter/files/smartctl_exporter.service b/app-metrics/smartctl_exporter/files/smartctl_exporter.service
new file mode 100644
index 000000000000..c21aa5af5283
--- /dev/null
+++ b/app-metrics/smartctl_exporter/files/smartctl_exporter.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=smartctl exporter
+Documentation=https://github.com/prometheus-community/smartctl_exporter
+After=network-online.target
+
+[Service]
+# Security improvements required in future, but needs care; ideally
+# smartctl_exporter runs minimal privilege, but can invoke smartctl via sudo to
+# touch disks.
+# https://github.com/prometheus-community/smartctl_exporter/issues/146
+User=root
+Group=root
+Restart=on-failure
+Type=exec
+# TODO: find a good way to add args here
+ExecStart=/usr/sbin/smartctl_exporter
+ExecReload=/usr/bin/kill -HUP $MAINPID
+TimeoutStopSec=20s
+SendSIGKILL=no
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/smartctl_exporter/metadata.xml b/app-metrics/smartctl_exporter/metadata.xml
new file mode 100644
index 000000000000..ec7f20a9016f
--- /dev/null
+++ b/app-metrics/smartctl_exporter/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">prometheus-community/smartctl_exporter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0-r1.ebuild b/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0-r1.ebuild
new file mode 100644
index 000000000000..a538f9f1c89b
--- /dev/null
+++ b/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="Export smartctl statistics to prometheus"
+HOMEPAGE="https://github.com/prometheus-community/smartctl_exporter"
+
+# uncomment the first setting of MY_PV for a normal release
+# MY_PV="v${PV/_rc/-rc.}"
+# set MY_PV to the full commit hash for a snapshot release
+MY_PV_HASH=
+: ${MY_PV_HASH_FOR_VENDOR:=${MY_PV_HASH}}
+if [[ -n "${MY_PV_HASH}" ]]; then
+ MY_PV=${MY_PV_HASH}
+ SMARTCTL_EXPORTER_COMMIT=${MY_PV_HASH:0:8}
+ SRC_URI_UPSTREAM="${HOMEPAGE}/archive/${MY_PV}.tar.gz"
+else
+ MY_PV=$PV
+ SMARTCTL_EXPORTER_COMMIT=
+ SRC_URI_UPSTREAM="${HOMEPAGE}/archive/refs/tags/v${PV}.tar.gz"
+fi
+MY_P=${PN}-${MY_PV}
+SRC_URI_VENDOR="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}-vendor.tar.xz"
+UPSTREAM_PATCHES=(
+ 0.12.0:d33b5a391f4a18b3d9c0a194e57cdd3491130099
+)
+SRC_URI="
+ ${SRC_URI_UPSTREAM} -> ${P}.tar.gz
+ ${SRC_URI_VENDOR}
+ "
+PATCHES=()
+for p in $UPSTREAM_PATCHES; do
+ SRC_URI+=" https://github.com/prometheus-community/smartctl_exporter/commit/${p/*:}.patch -> ${PN}-${p/:/-}.patch"
+ PATCHES+=( "${DISTDIR}/${PN}-${p/:/-}.patch" )
+done
+
+# Upstream LICENSE file is wrong see https://github.com/prometheus-community/smartctl_exporter/pull/113
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+BDEPEND="dev-util/promu"
+DEPEND="dev-lang/go"
+RDEPEND="sys-apps/smartmontools"
+
+src_prepare() {
+ default
+ if [[ -n $SMARTCTL_EXPORTER_COMMIT ]]; then
+ sed -i -e "s/{{.Revision}}/${SMARTCTL_EXPORTER_COMMIT}/" .promu.yml || die
+ fi
+}
+
+src_compile() {
+ emake build PROMU='/usr/bin/promu'
+}
+
+src_install() {
+ dodoc *.md
+ dobin ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+}
diff --git a/app-metrics/snmp_exporter/Manifest b/app-metrics/snmp_exporter/Manifest
index 4ad306428b4d..f7da5777338c 100644
--- a/app-metrics/snmp_exporter/Manifest
+++ b/app-metrics/snmp_exporter/Manifest
@@ -1,3 +1,2 @@
-DIST snmp_exporter-0.13.0.tar.gz 4096479 BLAKE2B a41ad876ca73a997bc48ac6fcdbc3ca01ff1c689f2f908cf14874f948a50ecd846a2996fc0cbf7d86a473fb80e42e15a7aca1c1b57f2cb3ebfa68a62db8d13ac SHA512 6e4a607cb58e6721acfd77b570dc62589cba5b23d250c9f654659632c97039156869722e1e43bec2b0656f08021ff89b4089f6b91ef28229964f32a34e0067f3
-DIST snmp_exporter-0.14.0.tar.gz 1458373 BLAKE2B 3251022b236b1da7c675fff1119bf358a7b19bec02c552357dde689654e655f7ab5569c5580db8d8cb587860dfb18a5111220bcb07041488ff2d02fe4d204d44 SHA512 58439e9ef8f05e48ebfb4ea82d42568e40968224e609485960f8a81c6e349ca18d16ec3f4eee469dfaa0b9fd50feb28c1e6a6a988fb251485748f10dbc4f8d12
-DIST snmp_exporter-0.15.0.tar.gz 1482592 BLAKE2B f7695eb37f2d702f3a6792337de7a1e878229ec20c8f4bea17d35e174219b71958aaf09bf91daaaffe12c5d03840887ce2ef3b37ce58a56352e8bcbb418bdb5f SHA512 1050a25d12a8201deab0ab7ea95dc35e250954a321d14251c10f87b016c879cf036e01f4043e3463607200381de63f12ea6bcf094dea2939707545f978c2675b
+DIST snmp_exporter-0.24.1-deps.tar.xz 23690876 BLAKE2B 35cc65341bbae092fb88ebb42c24cf93c8e926265e5fc1fa67a4a38c99c013f704b4ce02704341bd6aca841fbd75cdcb98635b2f7856c94d9c17a8f96acc29c2 SHA512 090437acf2f66094982374f06ea889bb8694b018a1a74da7cd1275ae4ee4ed1c8147253d4d87b8916e8f397c029881f29bf5ad4d33bfec5d6a99efa7b1d2326b
+DIST snmp_exporter-0.24.1.tar.gz 168914 BLAKE2B 555136b42af1057cbd553a774ab96f00877f20b1d72b8f78dc87d85e958d14d56b8d58eb5aab829ad33acd9581fe80c4d65ae4faad1c8be0773e2205ac088cb2 SHA512 5268129a50bd255a9505b16d27957ab2e7a23321a25933c9a1a98cd9900aef3a882a59a43d92e021dfa6e732f84f8be1fe171271935a8eac1e023588f417822e
diff --git a/app-metrics/snmp_exporter/metadata.xml b/app-metrics/snmp_exporter/metadata.xml
index 9ea37fba673a..4d9bf31a2f7a 100644
--- a/app-metrics/snmp_exporter/metadata.xml
+++ b/app-metrics/snmp_exporter/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
</maintainer>
<upstream>
<remote-id type="github">prometheus/snmp_exporter</remote-id>
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.13.0.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.13.0.ebuild
deleted file mode 100644
index f4215957f69a..000000000000
--- a/app-metrics/snmp_exporter/snmp_exporter-0.13.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/snmp_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-SNMP_EXPORTER_COMMIT="84cab6d"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for snmp metrics"
-HOMEPAGE="https://github.com/prometheus/snmp_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu
- net-analyzer/net-snmp"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix bin || die
- pushd generator || die
- GOPATH="${S}" go build -o ../bin/generator . || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/*
- dodoc {README,CONTRIBUTING}.md generator/{FORMAT,README}.md generator/generator.yml
- insinto /etc/snmp_exporter
- newins snmp.yml snmp.yml.example
- popd || die
- keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
- fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.14.0-r2.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.14.0-r2.ebuild
deleted file mode 100644
index b6d3bb792c75..000000000000
--- a/app-metrics/snmp_exporter/snmp_exporter-0.14.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/snmp_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-SNMP_EXPORTER_COMMIT="da73490"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for snmp metrics"
-HOMEPAGE="https://github.com/prometheus/snmp_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
- dev-util/promu
- net-analyzer/net-snmp"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v || die
- pushd generator || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache go build -mod=vendor -o ../bin/generator . || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/generator snmp_exporter
- dodoc {README,CONTRIBUTING}.md generator/{FORMAT,README}.md generator/generator.yml
- insinto /etc/snmp_exporter
- newins snmp.yml snmp.yml.example
- popd || die
- keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
- fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-}
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild
deleted file mode 100644
index 1c01a04e3bbe..000000000000
--- a/app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/snmp_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-SNMP_EXPORTER_COMMIT="92a3da4"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for snmp metrics"
-HOMEPAGE="https://github.com/prometheus/snmp_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
- dev-util/promu
- net-analyzer/net-snmp"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v || die
- pushd generator || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache go build -mod=vendor -o ../bin/generator . || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/generator snmp_exporter
- dodoc {README,CONTRIBUTING}.md generator/{FORMAT,README}.md generator/generator.yml
- insinto /etc/snmp_exporter
- newins snmp.yml snmp.yml.example
- popd || die
- keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
- fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-}
diff --git a/app-metrics/snmp_exporter/snmp_exporter-0.24.1.ebuild b/app-metrics/snmp_exporter/snmp_exporter-0.24.1.ebuild
new file mode 100644
index 000000000000..2935cb98ccfd
--- /dev/null
+++ b/app-metrics/snmp_exporter/snmp_exporter-0.24.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+SNMP_EXPORTER_COMMIT=f8826bcf
+inherit go-module
+
+DESCRIPTION="Prometheus exporter for snmp metrics"
+HOMEPAGE="https://github.com/prometheus/snmp_exporter"
+SRC_URI="https://github.com/prometheus/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~ajak/dist/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+COMMON_DEPEND="acct-group/snmp_exporter
+ acct-user/snmp_exporter
+ net-analyzer/net-snmp"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-util/promu"
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+ promu build --prefix bin || die
+ pushd generator || die
+ ego build -o ../bin/generator
+ popd || die
+}
+
+src_test() {
+ emake test-flags= test
+}
+
+src_install() {
+ dobin bin/generator
+ newbin bin/${PN}-${PV} ${PN}
+ dodoc {README,CONTRIBUTING}.md generator/{FORMAT,README}.md generator/generator.yml
+ insinto /etc/snmp_exporter
+ newins snmp.yml snmp.yml.example
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
+ fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_exporter
+}
diff --git a/app-metrics/unbound-telemetry/Manifest b/app-metrics/unbound-telemetry/Manifest
new file mode 100644
index 000000000000..d13a037c055e
--- /dev/null
+++ b/app-metrics/unbound-telemetry/Manifest
@@ -0,0 +1,191 @@
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST approx-0.3.2.crate 14288 BLAKE2B 601eb7b83c6f0e41a4d64db5669b7058b4038319414bde74761f0b1584baf8426f9735cd0076d1dde829a056a07e8f820d85737e5b1bf371d9510551c367025c SHA512 3853684c3b1c5c63204304f2e4f1c673b92311125c1df0fc16e96bd6f765e8266079e8d4ec3c85fad933361638c7515d5be18a2fc551353c4097051d0bd96ae3
+DIST approx-0.5.0.crate 14359 BLAKE2B d1811157cb560d24b559b5f4954654dcfe4d1d418f90ed98536c0f8c72584b9cc10c93c4e89fa376f96be043338964d07bc722ef16ebf3041e8c7eb755f2941e SHA512 4c7ef7d54b6a9fac11587fd16638d36d8738e5156f5abf77cd994056377427f12170b61c03d1acf591dbb897911babc852c2a4a12b3c5277e1065d952c9e7dc6
+DIST arc-swap-0.4.4.crate 47969 BLAKE2B c307ae6cf4f3ff2b75557e9806bdc46869ee058b5c6289d051df1973d0278147016ada7e03efb851be9c62105882c74343cc2ee90bcbf9e641ed52498f913a16 SHA512 7e0045d24d82c5624b22563ddbcf150a35903d165bd3f2b71787922839cf52ad846da563b1c0d240db52c3b6405d145cbb675ead3d6cbabbf0204dd2afd474a9
+DIST async-trait-0.1.24.crate 18946 BLAKE2B bc9542e8fc30757ec0f6260b57d273ece42cd80ff36f09a1caf6ba2ad8aef26490169e2347962d2444962cfbfdb155b8e5da7596fd901c4fe4973ef150140c78 SHA512 c62ca2076e994248d052e4cb81acd2e477927641fb3f6939b67dc849d2b46c1c0c157b34c9561891b366117b0d410596e4dd42c636403b1b883259cb514d113f
+DIST async-trait-0.1.51.crate 25531 BLAKE2B b4ae85616d5f84392381539d98c1751baaa01cf936045423179538fa4e027d86c8aaf42f98d4e781e0f8ce7ee3bf95d64fc5aa624997fa4aedd06f1e9144b11b SHA512 9a0505109f984bde511a6e1543925ac447935824594fb0ae3da6af3f72fca29cbbfa0cc282f751bb2c597e73084d831fd75c202beb5998cd368eb0c13a067990
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bytes-0.5.4.crate 46813 BLAKE2B f4461d3794a9a369f62b19d2d1308573a30ac1f8e1f94cdc4275554f35324e711a1185c9515fbeaad5410772c1b8dc5688074550d32093c02902a1513e253202 SHA512 22996677ad01f8b33a943206d48ec8ff0a3917d8d0213461f4c93f6082de3b1a076e4e81298ea2b62b2b3154aeeb19358edef4b014f4b97ca29d6d94df9fdceb
+DIST bytes-0.5.6.crate 46291 BLAKE2B 6d33ab47d04f2e469db2add31db118f95cad53002be7969738923d62a4fe3605ccbe9fbcae6d8741310c543625e80d9adac7d9e9fed01b71cb3943ddd015d920 SHA512 a1caa1f58754f4d2e54b8df8d0ca0083ee5282f5e4d3bb5b1735022933dd2e66fb3f39c7a82216bf7a7e29591695c2e10c8b7144c83ac598e34193f2425a32cc
+DIST bytes-1.1.0.crate 49640 BLAKE2B b3140dd49dc222cd0405e405da9629038eb7d71dd4c22c8d6419ade041dc1118aa46df38f3426a36a44d8e5591c368ae32a89e71850dca7e810bbfff4441c37d SHA512 d34441ea146ccaf55da4d5c645f8ffbd008eeb3204dafd5961771abc85df52751dfd1af3975fb5c91eb83d9a43da4f3589bc3aa07c8d715906d8158f3092af2d
+DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
+DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
+DIST cc-1.0.70.crate 57200 BLAKE2B 196b0435c8a521a02e9877ed3ff81fbefa88cd56717556776b46366bad1835bff134a1b4fc4e31ee5497600e98d1031119d0973b420cf16aece1ff18fbdcd1bc SHA512 9158eabcb9405fa2ef41fb120821ddaa2e5c7234c02d5cfbb5b59570f7de393d1fa33942ca52f86bf9271765b3df934debdea89e7563cbfe193dc01b2dcd72f9
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST claim-0.4.0.crate 12725 BLAKE2B 8209887d271c5a036bdf5f4e60a9e1b408ad12ca4f74aaa4570f9a1887dc9a1ad88bd39189162756325be3eb0acce4f1f6440467b84c2248e61a516c18df0a83 SHA512 8598924fc71908a323f11cf5f5ebcd4113da52fd6c0cf106cd3ebe322dca31ee7e9b702a66e66b40a614162f2841bd1075dd571de4a09e7e5c13762d0ec269d7
+DIST claim-0.5.0.crate 12858 BLAKE2B 56dcf43f7b5c68924cf58bee7fcc68d1da891a37c21cbb4236b65745d3d51b15d348df5eb251ff7f4c83412dd09a97760db88f30dd9f8fd184fdd6616f505ca7 SHA512 699ca80456f54d7d1ce6e4ae34bca33839069982f011aa63679ab9570ac80a0b09caa4379a2dce2fc307f7881862442175e0548600842177eaa13d3931148d7c
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
+DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
+DIST domain-0.5.3.crate 242186 BLAKE2B 2f5edb2d16e6c24dabb661702e4239df35593f36c0c995e8e9bbb97bcd16e11ca51ec17d2fda5e119c16d03695a43ca0863dcadf1beb8d2a8c8d3b2c96ad8f61 SHA512 f8fcc7ea8d64860750ef898e71ef247d2596bb58d99c206a5781a6a8f61b2bba9c2c6473ed08ef8617256eaed2e1d454f3fa0ec3772e80d2dff0a96990d1cdf9
+DIST domain-0.6.1.crate 270027 BLAKE2B 292a619226bcd6de5d7240c1a63003b6c37ca8469cd57eede5aa37eaf059e95135b39ff4a90d75029404bedffda20f51807a92231d214fa56064ff1d893b038a SHA512 5c612ee0c52c6fb0cb7dd0cbebd2c2f463e5d3901e758be5c4685e19be0ab05de3f1d4aa0cf21ea256b1273857a2dc1430c66a2a71b2d7ea9dfdedc4ae856252
+DIST dtoa-0.4.5.crate 14840 BLAKE2B d6e46d8d53baf565931d0796cdebd030a0f6fae8c6b88f738b7dd00db35bdb130a2b3778192e90fcf06183e706db7c30cc3e2b05909dabc04472e3f6ca9fca7a SHA512 7f9cd7d2e8f143c81896f8a242b09de3384d9dd6c375659a48b4e4f0506b2eb642c8aba6d500a989668760458861f2249bd82f5f3d6fa22d0ffb68e508d059c0
+DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST futures-channel-0.3.17.crate 31765 BLAKE2B a1055de0a6b8812546442acd8acf8251168015b5f6be7bb7e223b7c61841a1a15ec1fbca3e4d40e0a552d5c3fc89ed2306a29c9ef33b1665f828ab9c8c0aa142 SHA512 884fed34839c9f73551a90fdbcdc542f88623c0d74d506febd6fb0308429e0d7df879f378b6d0bc818ce8c948da495a9dc210ca55331f4760273d51f627cc416
+DIST futures-channel-0.3.2.crate 28694 BLAKE2B e2917584c81bc2bf2d5a90c0e66fdf9ff412bb696333f866d5803f8e492440afa401a71cc848f8f27ffa00acd58aacde377f29dc2ee8b3ccb386abea17f1b4bd SHA512 cb903cc91c79b9c559073a873ba0d2d9cecd7e932eaaf44a0658bbd77679782d9db1e8bb0d3ee2a6e755d7f386e937e003c9bbb84896a684d716a6f921cab77b
+DIST futures-core-0.3.17.crate 14478 BLAKE2B bad5d1fccef7e823d52eff0db7522545c6dcc6ba94bc0cad33c013b6abe624ebc6c8ddc6a6f5a4ede5982e175eeac48113ef929cc6633a22a18bbbd4cb1cb114 SHA512 6f290620b5051a3f3a317acade5a077f502fa3ab7fdb230b6ecd4d007c63685bf343ddcb8b8d1170b5ebeb94fbf1c495dab36918490b14885361d6e53c45bf22
+DIST futures-core-0.3.2.crate 13538 BLAKE2B bf9eb4236da2abf26e4df6e8bfeb68c580f8264988103b55a68a3d7a761c1a3059be46d1b6b47129c33b1c352346744ee214d65634eac9433944dddead2b78a0 SHA512 5967244b6b062aa2ad65518f8feb42b9b0659ee737231607c0cde4d2956782e44fa1544280dac92562fbfe1e14702781f9f764cf7c1469c562c2e17b13be9860
+DIST futures-sink-0.3.17.crate 7663 BLAKE2B 598e864fb6f2f34cd72c67e5ced93d0e54d2e508319ba191a2779377d9565799226783b2009190cd6eea63c75562e209a526c724ea8616d22a1c7b4ae543ddd7 SHA512 39996fd6bf1fb5ebb0dbd5c0d18f9a34f21e65dfe998237c2e047d836a380ebfb9a2fea05a2c11e447e9a27dff0bffe4a9762e83df2f17aa90a717fc98ba5803
+DIST futures-sink-0.3.2.crate 7619 BLAKE2B a0ae842a11cca1fc57763cb013408336a11ab760c48258f5af94051fd6cd3a1da3236de1854a1ca36be07b4f032f5d5382d9bc6dc75aa30a36b84ef5ef58b317 SHA512 fa23dfb6861f63e265fab94fe2d5702f51d90306548a9a8b48208c4e732a0b15ad6186a1ea50d454cf052ee444153c16a60a91e46fe4d77a03d411ae9603c6b3
+DIST futures-task-0.3.17.crate 11712 BLAKE2B ca42fc54c3a3795e59b423fbd1235b10b4ae1903256fa61e80dc9318f35fb59fbc15ca8a3be3fed67e17809ed2d5f594f939d3f51d0d718b0dff5be069200361 SHA512 2f12d8d9d404f147b601ddc6fb9b6869e2e68a4bc55cd3851cb9f7aa8ebe6519c5cd0fa14da92e564d2003ded2ac2202f5e09e1a83e81129d1600d01ecf86844
+DIST futures-task-0.3.2.crate 10954 BLAKE2B 81c6ea44b32badcca28b8eb5f3c2c57f8cfe181fce4f2b708a2fbc2f949fdce8b2df088f465d75fe7fbc9d770de8eecb63a601194cf22fe2fa9f6a5c0e83d000 SHA512 56172e02407277c2f28da984dba9527f498445f35032aa88b27bb7b77b22ac4faa4753c0f3d0a0ef1e5298a21ec164a5c1d4c7309d13b00f81cf73b2d932f52b
+DIST futures-util-0.3.17.crate 147679 BLAKE2B e29d07117a7285fc52a390821299f55da901573a5d3df6a1845b852488f98b359ef35de0aa3fe05e613dc662247318cf3df5aebcb00149012c6a3ff24c171a57 SHA512 6a87b0510c3f8214ce14b7f333d212558647c523b5eb7da36dfe4f694e0ca4be3cbf97fdd7bfff5e0c7015644742d74d6184221482d644653a106d5564722fba
+DIST futures-util-0.3.2.crate 130636 BLAKE2B 2d9c84af34dda4a8cc9eae9f8e17596437351acfd00a1d9a959d50cc6695daa8954b5873d5d71416726062df31773e6f93008825b0cbc162605d89ac099d23ec SHA512 35a4fb3429826e876c5884aa6580b10c841be9e14a337e9ae239939389622163521eb18bb326d6c950d6eaa9b781201f90e98d9a9f3b3e98507fff80b68ba00d
+DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
+DIST h2-0.2.1.crate 157505 BLAKE2B 50d4470336cca1529d7edd3c4119e5afb5e68ea3915d39c3a2a193b43f1d231f70d5498ccbebdb8c69e9aabe400a3e03a3180c8bc9520d0f74fd320b201b84fc SHA512 a2764ba4a62afc21bde3b1ba4b1e4e334ab68f43e39eafbcfbd96914f835ce47a585a07145026ee2ce6a3aa1833663ca0a2b62a9695277de96b82c0146544e07
+DIST h2-0.2.7.crate 156989 BLAKE2B 2f75a2f82391c994299e01fae5958dc7e21b78e38b8ade83a0c90698f54d232e6f0068bed88b98314e702bff773e8753c600ecf6b638b5bc1c7e692ef636d289 SHA512 6157bcd335d303246478f45b8740dca687f693dbbb462a0ea9560af12d1fe12a9c680c57c1e7ea0b0842137ee66cde827f273e0faa619db3b6180c5587bd0fc9
+DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST hermit-abi-0.1.6.crate 6907 BLAKE2B a2c11ec832ea0110421f6be2fa0a5591e5908a74c68c5079f034908c216d6776ef0f4363b809699e58dafd98deb9ff19ee8b06b704d3159448d1b4376fc2537e SHA512 a557402a7529387832ba4014ee1a626d849eb64f873f69eaf53506362340c8f24c7456a8a04653f4ead9043768d06042aeca2aa8d95898dee37d367674854741
+DIST http-0.2.0.crate 101906 BLAKE2B 28222bf94aa61c488219dd4f7d7d6f6670b43da0e5f8a377ad180e263fcedbd5785e5e962ee1fd15064ca3a3d47d8d2a7f7a8f21eb0b40100d2c9fd50f764b91 SHA512 82ecc4bcb9c79ccf7d946c215b3cc7e01e790970c7f1f337025a90a97883d326a92ae328c590c1ae4c08ee7d0a954e35b2bb304a4a22b0e35139e1075870e12e
+DIST http-0.2.4.crate 105489 BLAKE2B 07acee6b91b6a316f3277ad324df6da1d2ac804a409983384d2fc027ab63ed05390278b21867c0096730c91a00b8f8971ab6a66d17b9764f119d245592a1cfb6 SHA512 0b5c609c12ae4020801a184dd6c751919bfd4db985844c55b53368afbe2b9f641cf9aa523ae49a0b25a251cd8f19ed634fa28990d4582cf7a27f10c4304eb465
+DIST http-body-0.3.1.crate 5394 BLAKE2B 9dd7a35cd22d22060762e17f028e9353fd66fcdc81c0fcb2f0361dc7ac86bab18b89ba774f28e2e2b451aebd01a31b01029587a3d119c5a30ff176c203482367 SHA512 0c81b2d8512be3f07d5b08534d2a27424fd6abdf175e9bad9a657b9d95a48e2916c8713bea8de3154520c7ebd097324de246a1d2ca6595f2355e1c93fd9fe6ee
+DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
+DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592
+DIST httpdate-0.3.2.crate 10768 BLAKE2B b435d0a530fcab46496a921a565c3ad8654cb39ea038bc942c8fefab8dee2576e9b157f203b376e80a10690650c1c899eaa29e5af75888c8998b07d5d049fa97 SHA512 5cb56c85aac5acc0e9e2c72fe0913d2faaaaeab10a15c0479407ab779494bd81f8e3fc9675f5990186a34689e841427e83723a87a91a5204ff57188e89be98ea
+DIST hyper-0.13.10.crate 141981 BLAKE2B 8cc13ed7579957040f19a81aa2540d4b9d453737b6e277dc65df648530673a536ba009e8b1d61f61da88dd2613d2fd5ba537271b1105eaa528ba2933cd66c9d7 SHA512 cc7c6b00e1864c44a647fcdbe6e59c7a7574169b787778b1074d102a39e092a80802383d93eb4a6d0f7f5da9449c45e5dcd1e6caf6efb946ddebd687d2c2c10a
+DIST hyper-0.13.2.crate 129993 BLAKE2B 798a393514d758b628e964533ab3f17beb5ea2bb72e171753f3d954265260668ec107b2c64cad6a69ba585d622e79fc2b03b0aa3e56d3d6b2b04c3e97cb9482c SHA512 fe6a8f81dbd44a78fee495a41477bb3d8de875154db8b1be61ad672fe599a2d4e65ff65a30933cd1a3d722b5262e6eb9c6e4895ea7c5da13e68c1163236f5874
+DIST indexmap-1.3.1.crate 46603 BLAKE2B ec7243945bc8fc5c3f1ed98874ad75ababf4d23a371d5c4136f4f8950f72a1c817ac6f160e4efe33443209b07222ba4e572f09105e861498d1627e0d9687caa2 SHA512 1f102bf25ca31fdaabaa692ce7110c12b996c016b324f04d1c9ff1c4179426e0c6bee314ba91f2fc508f4e8b96e51b361aa42c7f0926afa1f6b1e499e734c15e
+DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
+DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
+DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.102.crate 537138 BLAKE2B 2814792c4215555d5a33d4e3d21f2c78e1d9c87b3e1884d7fffa512aaed0737ed2329db6298fc074d477abfdc02f5bd30ec485f3fa7afe7d7a3e608453985c63 SHA512 cec681043b9c279e25ffbfdf2aeffe2a5fe057a8187fc2c986aca9a3fc900eac96ae3134632b124f1aaae4e5d2ecbc7122aeb40d94f83b5ec075769ede361643
+DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST memchr-2.3.0.crate 22308 BLAKE2B 1f3f1ade337b42fe643e039b9401e12fefffcca6a8369fa2a462577320f3b6d19cf8876e55db9e4a03bd350d20b0f6ebe6060efb08b9e36bf0f0b6e5fb396b53 SHA512 7ae3b3ce6a5d80e7b6c078486d5bbd5ddfea7c7aae187804f76eeb52ae02527b54f88fa6201e380b0b169f2780355ddb3012f270098373f2f2ae354a87738c74
+DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+DIST mio-0.6.21.crate 129233 BLAKE2B cb39ed9e9d3b5f456bee86e33d8f0a8cf4784bed826b7ee7f40dd66a98a12b1113fc150fa3d1ea98bf0eb2778caa367abe193dbbdcc0d82b96207ef8682ac982 SHA512 2bc68f6ff424d3ae2ef67a6a1a708b4c42b05f616cad1b0061dce3157c6a46d0666173e65c6f8b7960051e21b526ab5acbdc835833b5496fda280719ad139c77
+DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
+DIST mio-uds-0.6.7.crate 14389 BLAKE2B b01fbe5ba2e2f58d2bc513ef577c70890ab0a556313dc8e980d4f51d4622be9180215e2e9655e3f02aced40823bdf69b94a8b63c6b2624e28cd24fb5dd89b0c4 SHA512 fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04
+DIST mio-uds-0.6.8.crate 11496 BLAKE2B e52d131f292c7c09fa116ec5c760d50e8389c27fd7b79a4418f0222ae124fba0e5943b5494866e9db75407ab9f6b1a9c7aa7fdf2c4d601e8c785dacd8166f6da SHA512 b6c752ae9f25c37fc7e23e06a8843089c5291d60e53a6e9093eed1d8baf64c9e0ff14bb2ea1c0c8815b00026b28fefab2aa34104bdbce7e99549786d0f507a73
+DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
+DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
+DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
+DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
+DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
+DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
+DIST openssl-0.10.27.crate 189161 BLAKE2B b44fd701e76ae46cd8903e06706c60c457c26a8007a1f199d225f628848b0051dc1aaa99ad58542d322db7ce38d7e9c156d87d90fabf2730fbb30d5f1c5484eb SHA512 2207f2c06ef6e5f72b17989b21f773746628ea7d2c15e15935f9b6ac9f1691d546e487c52ea4c97200b62351cc92feaf4ad039b3561474998ac3f1ad7b179571
+DIST openssl-0.10.36.crate 206367 BLAKE2B d059480338da28c1e6707db85127bdd4721e931f74bf27d2c8f80315c43cf9c37a977740b9d799a03bb59a1fdf26fc1fd9ef11319863b63ac7b6ba3ddc2c1385 SHA512 bf215f7ccfe24b3f490d516541ac746785853dc61ab6cf023e303275578c206fcb14b6e5001f36de2f71b0a8c48ccb26f4f343c5b88ae38ad2cba12ccc941641
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17
+DIST openssl-src-111.16.0+1.1.1l.crate 5095644 BLAKE2B 5c0f1e5348d283355a61d2479dbef138de71cbc459f406bb6765923fd15b7a47e529567e1f10fddf56f3c6d9d1dd9358b671adb465b4f9dad3b7382a6c4df1c6 SHA512 de5723f7745fc3d445856a7e8afa0e1053afeb63d11a13973c772ff94eec9d09a69a593d24d1de0cba289eccd14a079683af554ce5752ea32e7e76c40fe78cf2
+DIST openssl-src-111.6.1+1.1.1d.crate 5076802 BLAKE2B 294df02b9b47dda162681ba2dea8df4672920de3fbf0135849b40ad5d994b14997109f356d95971acc8da718b357659df39f505bc2e46cd5d8a272b90f530ce1 SHA512 67b3eb55b2912880238777ddd2cb69beea62e6df81af0555407eb4fbf0dad2434b9c788b62f3fe0966a46d2b1dce1d761b5e8a888ab31e69cfc461c382d04886
+DIST openssl-sys-0.9.54.crate 45751 BLAKE2B 7d21482f56568cdd7f8d02063f1c9b51ff355d67d20d44397f31332dccfbad36af9d6dae3294eb28feaf607b5ffcd13437ccc28df2ff0e43589b5e51c5faa012 SHA512 3c3271ac3b3825c6b8182e3d699835a4d73d774b43e9f694f4d9f1b9644de9ea1b8d8bfc2b98c9fe7af4c652d0eb7878001cd688f797d3b81bf5c8a72fd0334e
+DIST openssl-sys-0.9.66.crate 54599 BLAKE2B 5c03c5e4a524a518885a68a7d7c9fefc0d6cb97e35368bfa49898cf5a97fdce0ce34047bc7e7ba5aff3430b51b3b546bac1bbdddb743bea1bab877df684fc1e4 SHA512 ab2d39a766df694f3985d67495d4e820bd196987571fbc229c003f441fe61bdc1aab9cd35a83ec3be9518d2b4e463f33f19bb109e9297a2d4114fe2d1d932a59
+DIST pin-project-0.4.8.crate 34756 BLAKE2B ce614f685c1a26fbbc2cb4c47bab528cef6089078a9ec0fd12802d0beb6aa25f184f7d4e2e30b75c47bbba8b7b9f601698edc1a1f160238245dde459c67d937e SHA512 1a44badfee61cc00558b59dc76f1225834a7cc59a2a42ea1f3a802c4427dd644b93f6dc6898d1009454e194f21697ccd8cb951535ec30d06ee5779e6e086a1be
+DIST pin-project-1.0.8.crate 54991 BLAKE2B 27ee86530b313e3514950e5f072367875fff4961e0f3ff635acaa3be08e0cf1b60aa96ff782651e25d1aee9abb4351262fad02ce5f90972a5188ca1b8ba30fe8 SHA512 7a838ad361025b22cfd6ef0ae600b100e673b537d499ce8cde9728520eaec11a68edc8c65e3a1532ffe8cc1efad1d7aac7d8e9f82372cc5a18a3deaeea189dbe
+DIST pin-project-internal-0.4.8.crate 23805 BLAKE2B 939382aefa36e6bc64c4835cb2e295043207ac063f1ad202b41b741d9002d53ebd6f00e13722dbb9cc1391b9cdc6ce3e4c35dcd8a10d9f0e2b48649eb762b5e1 SHA512 a7b3fc14aaa594ce0f16bd431fce97b17187fc98710cd048fe15ca5f23de6b7b5e2de93fedbecc01c4fb1fca64b590056ddd311de8a0628fbb2e68cfcda85eec
+DIST pin-project-internal-1.0.8.crate 27941 BLAKE2B 74992114d7d582282a92334d2b88f6c50083dcefc1bd62f5cfc588d5255ecbbdd8a2764a4d877051af0258ff9ae37d503e021d27f2a35ca497bfc11a12317ae4 SHA512 9bd11fbb60e3cb99d81eee590b4672d2c2616825e5aa99e01c6b310e5c6651b9e7f6097db0975542746ddf4c455f090f450ec7a588dad4031bb5d09dd91d11cd
+DIST pin-project-lite-0.1.12.crate 16854 BLAKE2B 48ecd648fd7a7694a48144e9e3f05a3e2878e52a5e5ecf2c6cc2cdc556957282bbaa3bb04f6418cbcfb254cceab5a0bca92173cf293db5cfc9c9589ec1597543 SHA512 4285eb45548b1827b54890162c68698e50d3747eba7b4c1c75a8104124846bc745a40d9acce18115bd06993d7d8f11232168e5e6f4159d3d273ff800706e5bc4
+DIST pin-project-lite-0.1.4.crate 16677 BLAKE2B 7eef320ae32c14a45b33672e5af82115a1d69c76f6232e08b9724ab49d7cbd8735524d287ae31a25892c2f9c381d3bd8d35003307ec3e54e145303fedb4feb81 SHA512 bde0f08dad4d72be89768ce6135fe0fb67258c325057be8cac310f0bcbfde11faa3072291efc325f330c19c5c0ed87a5ad65b3a3720491303357463776a2144f
+DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
+DIST pin-utils-0.1.0-alpha.4.crate 7446 BLAKE2B 0b90420f86f32201f922f4f47f9caf5eb4218a1f6380ea88f69cdd118f5d0794ad2888b55b3492490905e64d4d74389b7ae01faa748eb3dd705c869731846812 SHA512 be36fb4a8a893a0d617b2f1edef7513bf515d36e000aa0344838f138f7073c970110fc3969ff1d8eadb8f86d3ac567e5668af95044133c47c99ba5e1a901415f
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
+DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
+DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
+DIST proc-macro-error-0.4.8.crate 20929 BLAKE2B e4749a18ec6b6742516e9b2dd88b586108a43e77b2024cd36d8982a4a4b5634f484f2a8dedb98f41273f25e61b67cacaeaaa91f77ff41d0097df0dc37371f931 SHA512 fdbc7d9e67b49c94815d77bd53128c12f67d23771883781eaa8f41c403674963ae58db30146fc159c824ae37a0b86ef18efff01869605e0b94959bbfbf0b09fc
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
+DIST proc-macro-error-attr-0.4.8.crate 6747 BLAKE2B 5bed2c422ac79960ae27a901c7120bf9ff2577f4dac86f5603726876c4dcd52e8a8fbc80a506341004208a06e3cefbe66e49eb302f881b09444909a31f9586d9 SHA512 eea2fc803b30335811bd4d137819795f28ad2263a2e7f4e29fc592c810fb171e9bdac99a5f98d075912d981bee5d11da3706ad75476f70ed5298db4ad6f30c3d
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
+DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63
+DIST proc-macro2-1.0.8.crate 35657 BLAKE2B 6f53919e85028b6ca2f1d04feb7daf9bf9c2f76273ee8813d9b09807585a1da81687b880b2f23109998332bd7f5d3798d83094042a44de66413a2cebcd60a2c8 SHA512 0214a1268a733872ef1fa59ab80a1cb9ed8f160b9f3751cd70cb26c0919bb3858e63c994163c727f7c7486067ebc681017fb452d51fa314e7da90ca120892254
+DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
+DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST rust-native-tls-255dd5493b446755a9e40be3a4638afedfe67b03.crate 36375 BLAKE2B da5f3fbaa20533aa71d601e615fbb1f84f042371dbeff262719626d33f836768016317330f5c8332023c93cf9dab6e4f3694b6440b3b2e83f1f5fce541e9fa01 SHA512 454e57651aec1af76eab6c80339233479c2c6b815a82ad76927ebe25060c9f23cb5239bda623a2594a0d7cb4b831e75909f36ae63b34ea8741102e84065b5c85
+DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
+DIST rustversion-1.0.2.crate 12264 BLAKE2B 52028178251461506f66cc1e259159e0102791f22ba8b87d17a004d8b9c2e8f2956aac314d6344b858ab1c90f1d02f07896a1b3e55decb88adb15c4e4d4da075 SHA512 79e6cb23a866ecbb6024837d840169473434d21f0cd7c3536c52d17f511fb13077e4ed6566a5a8f67d087c52682b1ab7605e02b2162211c758344881f8ade60a
+DIST schannel-0.1.17.crate 40200 BLAKE2B 956887144ca8c260d1018c840abd755fc1330f92b9d7240a0e63334a5666ca57923dbf78055e1bbe9c7d93768b4734c7434cf1ec695d7ab87a111042fe15d14d SHA512 1a22c7b0a6de6a4c4d1a3007cfb4d016b32dea64b1df107224334ff86dde81a0b23c2c195a3a12728d4ac2f11b9d7414f8faf893726dd0c17e09a10d2aa5bf4e
+DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
+DIST security-framework-0.3.4.crate 48568 BLAKE2B 2502bbd48ad17114fba8cd88f9f8f2416856a7340e27c8271d70ecaeebe2b4f5dadc56e8222d1a5451bbd601581c7864211cce7987901a0c0ff805d8c983df5a SHA512 4c23e76834c0a2d013a2785030a8ce85658bbb144318eede6ea790029f8cc848045aa69f3ce8895eb2eb6708a50cf62a5dffb908d5fc5eee53bc203f9cf8ae46
+DIST security-framework-sys-0.3.3.crate 9554 BLAKE2B 851c1c7e7d972b9f74d7278fc501c3894ffa0fea31954fdd2ef5e070c28c080cce04d35acfbdec9871c4544b218ad420ebd42bf6f426142046d805ea99dadc27 SHA512 a78a9affbdff5c44e63e555970748724a4cf1fb1e47a6a5645294f70b2c0960d3ef93d3289c3695d5de31c8f7a9b093e3ffb801a1631b474b5ac68e0b68bfe22
+DIST signal-hook-registry-1.2.0.crate 14490 BLAKE2B 52c56376f5572787d78d4691201d51d219c623d2eedf912625128d6da8fb01f6930dbecbc5e5c021de098fb0a194fd6b35a9452f92a484095e9606ce96fac135 SHA512 f4552fbeb50f66a2ee1d9826fd74a8ecb3e6d242913c20ca7099d165afb55ecd359a44427b8c3eb73bfc4e3c887d972853b49a842472389454988060dd4aaa07
+DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
+DIST simple_logger-1.13.0.crate 8051 BLAKE2B c2d3280901c17f79826e6a56bf5411b52c576c75a71fca7205d69d32bfd194152adbabe0bdd5467e33612ceb4bad8b87ce45fd2840375f373509d3609f54c020 SHA512 f6dbb74a5d25895189092e567784daca9e0b4cb48a527a400b4c2ccfeed7ffcdd3f00719e8d084f82390971567b4c280bfc3c47db2356331c0107fbaef941b8c
+DIST simple_logger-1.5.0.crate 4779 BLAKE2B 5988cdb83e67e35c45ddae99eb77a32a9676ba51207ee8e19273b26065796de4d5042b6e1a0dc9c314c75253987ce41c96463676c95ff5883a78c1f2d5b58731 SHA512 5c10f5d3c876cf17d5bb65fe0860def3c651ebc6363bf20fe3c703fef68a3c0c1578745f5105bf2bb6dcaf26295d0f278f5e1c67f31cdcf4d678721afa4db04e
+DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
+DIST slab-0.4.4.crate 15725 BLAKE2B 54f3d5e4e76aee03d52f25e2927c03c10d89fb7ff62d83ba6f56003daf8a98e63ec220f564107f3282e96bdf3bd525b68e71511ba367db2550d3aed18b4bc59d SHA512 a8232c85d9693c2a417201768a5b2ecd82e3a721fee39ec80e44c769c66f8cb3ddf00a157f376ebe4c168082550ec48e63af23de2da4f30ed343b4e3bd13c3d1
+DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.3.23.crate 52029 BLAKE2B ad87f3d2da5a4a972b2ed0dbd49830038ab6b46243561cabcbc06013d7088e7a44acf1a29137af11a53ee8720aa8cd69cd7200a388b0ec626a0c513b6390ce2f SHA512 6f6cb5e2ecb7bc2e1e7c58d98e3e9f54dd4ff4698d22aa32e2fe7ab6c51a8e9e8c418260321a3f4aaae1808a68eebcc40f619de28433949aa846c27f06ff5cef
+DIST structopt-0.3.9.crate 50176 BLAKE2B 1bf41e73af09ea792482d061b35f15b323e7d50d504c3be29c824ba40818f2398ed2b0a743a77634a7dc3bb7722ae290c14672148b9c0a2cd815839dda8856eb SHA512 fba861052d343630fe207fac16f0ae643a6a7aeb46e75f173210997a645e20a0125f64d51dc6792db891a06ddab8cbd2f538cbc91f6e08d7a3e89cb5ad64d540
+DIST structopt-derive-0.4.16.crate 20996 BLAKE2B 3410095fd88bafba6d08d0aacdca295cf86f4d8f028103934c03cb16da334955c1334039d000ef7eed471eb8020046c56cafb00dbc7713ecc1f76585cdc6f22f SHA512 11c5fa7a0fdc35a02fba22c940260a4a5bb26ec431d92e032789731afd97576cfe63c988ca614747ac477433cad640c972b48f5c90cb9893be28ffc9774c247c
+DIST structopt-derive-0.4.2.crate 19374 BLAKE2B 426c032fb70b818db80b2871f894cabd21bc8b21f686c7b6178ecb439fd02dc569831ed8b2b991c8e476f6a4c775dc790af24f3f100df85cccb7d3a8b1e4f7ca SHA512 62a06acb97aa4a231b70353ca636411abd51ab0daf9af8d450593161657338c0e02841ec6885d40b9d136cf706f5fb14e9a833c25bf16b9a21db4aae0b6f0dbf
+DIST syn-1.0.14.crate 195286 BLAKE2B 8311cdc0eb8ff69d65c250eb95706cd1e74a6ba899fac02ffc0a288e978c40a03fe5a7c18e3116a767eb6e5e08299d27f5ae04021b224d71d7b492a6b87d67a8 SHA512 7b2b7562ac89d719060b35bf89f21330c02a3c1f34270e864053feba9b0f7a16b5cfd11c57d57eab7c60df8663d8ae76709ca1c48ebab960db168d2836f57340
+DIST syn-1.0.76.crate 233723 BLAKE2B 99b781b6ffa926ca71d0a09ae81dacfc6ee713e15fd057232e527761b73f088c30967eb13d624bdf34a089c5a33fa28ecf6ca069e3dfd7061932643849243967 SHA512 0f32138d219ca74fcff1ee5ee5bb89f965a30b74c10a040bd8361332cb84900322194dd85ad7571c4bce72c1f66368546db5881165939800f2587b15ce07298a
+DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST tokio-0.2.11.crate 336368 BLAKE2B 367d01eab1c7041b6f726ea4e3ab55a861a60453d05d3ac244d488c0b440317bd4ab9c135d0689bfdd2ec1597f8c733bf69291907399c0069f89e09dc36dd3a7 SHA512 33f7eeabac4a9dbe1a541ce6021c254830c39ec7662fbf97720f70df95a0e5c89755b3515a21bcbb0743f90778067e4198035fac8cd7cc4f21f5c4c2216112a7
+DIST tokio-0.2.25.crate 413390 BLAKE2B 3fc36579030bac46a733bbb061088eee56e9a172241f74d744de972065507db14202a0533a5d231bbba495404c16b5d6bec0d11ebb11e258ff0273b47b2f7d90 SHA512 19b8d46a81230be0a06d6354c2775b20fe0c108b4c504f5fe798952bf84f8ecfd9fd149ba899ee67a1158e1b0ea9eab49f6249a655eb0ab1cf418c0097b30705
+DIST tokio-macros-0.2.4.crate 5761 BLAKE2B 7780bee6c06db370c58451e18c6c254a731095ccf2c9dabb883e328f8b662e7b252d6ad88c2db28ec44236c5b278f1c8e703d5e82397968ba7a56b2020f7b0f8 SHA512 186d9ac3eb82b785259c6c3711978ed77f7359ddde253f49eac12907ef5245c28330b56bb44527b2bf9aff79383ed36889bbe1ba0ffb517780968252d3ec0334
+DIST tokio-macros-0.2.6.crate 6460 BLAKE2B 239493963b5fb28eb9ea7dd568576db4d38c7e6b8ead4d072862891ca5aa096a8ae61481f3cc256d1bba2a2ae9a62660a8a0ac3a1b0408cf33f4b204a252d095 SHA512 1e3f7f42dcece16d8785e500816768ecdef944b0297bea9ca215c15aadf1dc89030061cd4ac01fc9d3c32ee83c6471dccbf7e99ff8f2385853e831e08954a51f
+DIST tokio-tls-0.3.0.crate 17274 BLAKE2B 41401539329ca2a772cdf92a3b4b6d07c591ebeb3e400d39a024ac82b5b0986b76d2c3a61a82c3971d90f46cca660f6c8530b4ff0faed535ffc22ab033ff9df8 SHA512 2280c351138ec14cfed16cb82f77eac78ee8799ff614b8cfa9c865c6669f04587d0476d0d915b1288cde97da3a34e431c7d2835ef2288b0cf905c87b2be6707a
+DIST tokio-tls-0.3.1.crate 22517 BLAKE2B 05be1ca4abb345fc859677bb1b4e49064324ef7858c5bff7301b4a5110e4a6339857f5d85037bbd66b433a3c2439eb3c15edc63648fe04df2da9bfe1c93b8e08 SHA512 46ac00d839415a8dc9d9709967414e3812606a23c2c1e0e9dc9aa6aff70b24afb44e4c5a231d0d857ea8d06d07c254c97a459713122006cf1afbc6d4f7b7b6dd
+DIST tokio-util-0.2.0.crate 25141 BLAKE2B 3567a0078f2810b1cbc61b41b8da8bf94b3eb7d054fb967fe43c09bbd1d0e7d49b456c0f8e6161a67e5ce009fb0119fe15dd80b3ff5ae826dc9ed80133db5a09 SHA512 c9de788176a38890f6af74e72c935d5d526b37a6dcc95eccdde974140a0735f1553baf47e907a2b441f4874a620c9cef70449943d56a841a384ab59b179c0dc6
+DIST tokio-util-0.3.1.crate 27233 BLAKE2B 96e43dd3f6f6209a6436e6ef3a40739f44507312b02a83f0316c7500dd6a59b5a71af005a98818d9b1db0e33aed4a9330e4cf955855925c8a428132762985db2 SHA512 301a5d9a8a9537653e17d3360dc27d41c95aa28bcda3e0815923dca0ac735071b01b9fc8c1d53e826e0cd1e6e5f98cc233f1e9dea906ba06c6b5192608ae7ae8
+DIST tower-service-0.3.0.crate 5321 BLAKE2B 267a8276baf4dd10c168f6db5b206ab9433be45532bd7fc5389952b3492e104fbe5301857f20044d7ba0c1af9572178d51a6f3dd723a6034a25e0c3dfd48e9a8 SHA512 9b46928c2ac13c738e56a1c4e9fdb512f17aa8f4e95669ae4fb9a9f9a4b094114d7869b923186779f87b45b2915ecf778f95dba415b6d4b2e6c20c34efdc6a6b
+DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
+DIST tracing-0.1.28.crate 71369 BLAKE2B b583ef29cbd83e843794a3cf73d27999dcf085854dadff4539b08db98b401bcda67676ad0b3392045b5b1fcf85553090c138c3a475ccfefac2dac417e3e29836 SHA512 2dd9909d35f2147493e628b94bba6a1fc9a5b1557ff06d582174f71a36717393f4a6c19dbb9af5bfd5d64841d419a9db61a6fe3e81f64c0533a06379bdc931b3
+DIST tracing-core-0.1.20.crate 50446 BLAKE2B 7c665c7607d4c9f873194d0d8dd37ae84a7ac9ac424b85332669bbd4bac60274f27041199fb67fae6b8153ed09e04fd99e09e239de98846697a46a6c509fe0ec SHA512 bbf9c0802e04bf5e2fd192af7e00b2807319661212e88dae9ef4284886c34fc58ce6e9b17e77522e108b2c38f47357bed220e1832fcc6b464e0bec059b57b388
+DIST tracing-futures-0.2.5.crate 11637 BLAKE2B 2b23233705674cadf5dc8092d3990f375e780de2b9bdfcbfdd5f4bc9bd0f15a14c6bc8e36963bcd332e729b33b90ecd10b2250495e0657eaeb302e666313534e SHA512 8a437a029e18dcac3a3be7a3355a63e75432ff892316c9f2929c7557e3895b1bb5efb59a7588372bd9efc386b5cab54c2b382be99ef8fa643e66ae5656e506bb
+DIST try-lock-0.2.2.crate 3638 BLAKE2B fdd33b9760b12db5c90dd9c34980e62d061e1a691eab760ed80dafdcd1ae82055b4ccac7313babb43dc9f2f38d3cac3bbf3f586b26f407fbd035c5c3dfca168d SHA512 aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330
+DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
+DIST unbound-telemetry-0.1.0_pre20210321.tar.gz 52772 BLAKE2B 5aaf1a0dc35c4882d5555704e5d1df7b39fb65e7205a8ac0fc665e7751515ad7f08d05a3105e6b6118e8e1ef0fb08606a87b8321740ab85cefa99a035f3669e4 SHA512 0799a217985e982bb96866748fe8d1f18696f19228c1d1af4fedda56450fa9925a915cbee47215baed086b2a2bcbc50832e41983d18e3c5009ac37021b74b07a
+DIST unbound-telemetry-0.1.0_pre20210920.tar.gz 53698 BLAKE2B 5bfeda0c74836c4ed9b9723d37e31ad9a9fd8a9a81a229bbee67f4d925e62e0f7d520f57c0d5712f285df5ad99e2d34125fe2ff446ef8eb3aa7216e7469989f2 SHA512 160f13e5ea8bb4750d18e3e22cff38a47d9f01397bcf9364da68ffed2f6f864679bd36b54d6264cbedcb31d25f9b52da9e9ca5195f6d1723aef9d767f5fe702a
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
+DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
+DIST vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
diff --git a/app-metrics/unbound-telemetry/files/confd b/app-metrics/unbound-telemetry/files/confd
new file mode 100644
index 000000000000..f57920bf5bce
--- /dev/null
+++ b/app-metrics/unbound-telemetry/files/confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/unbound-telemetry: Configuration file for unbound-telemetry daemon
+
+# the args to pass to the unbound-telemetry daemon (see unbound-telemetry --help)
+unbound_telemetry_args="tcp"
+
+# example for UNIX socket (unbound needs to be set up accordingly)
+#unbound_telemetry_args="uds --bind=127.0.0.1:9167 --control-interface=/run/unbound/remote-control"
diff --git a/app-metrics/unbound-telemetry/files/initd b/app-metrics/unbound-telemetry/files/initd
new file mode 100644
index 000000000000..e4ad1684f6d6
--- /dev/null
+++ b/app-metrics/unbound-telemetry/files/initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 2021 Sony Interactive Entertainment LLC
+# Distributed under the terms of the GNU General Public License v2
+
+name="unbound-telemetry daemon"
+description="Prometheus exporter for Unbound DNS resolver"
+command=/usr/bin/unbound-telemetry
+command_args="${unbound_telemetry_args}"
+command_user="unbound-telemetry:unbound-telemetry"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t ${RC_SVCNAME}.stdout --"
+error_logger="logger -p daemon.err -t ${RC_SVCNAME}.error --"
+
+depend() {
+ use unbound
+}
diff --git a/app-metrics/unbound-telemetry/metadata.xml b/app-metrics/unbound-telemetry/metadata.xml
new file mode 100644
index 000000000000..bd6443d4a375
--- /dev/null
+++ b/app-metrics/unbound-telemetry/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-metrics/unbound-telemetry/unbound-telemetry-0.1.0_pre20210321-r1.ebuild b/app-metrics/unbound-telemetry/unbound-telemetry-0.1.0_pre20210321-r1.ebuild
new file mode 100644
index 000000000000..11f3e6f8026c
--- /dev/null
+++ b/app-metrics/unbound-telemetry/unbound-telemetry-0.1.0_pre20210321-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cargo
+
+[[ ${PV} == *_pre???????? ]] && \
+ COMMIT="7f1b6d4e9e4b6a3216a78c23df745bcf8fc84021"
+
+CRATES="
+ ansi_term-0.11.0
+ approx-0.3.2
+ arc-swap-0.4.4
+ async-trait-0.1.24
+ atty-0.2.14
+ autocfg-1.0.0
+ bitflags-1.2.1
+ bytes-0.5.4
+ c2-chacha-0.2.3
+ cc-1.0.50
+ cfg-if-0.1.10
+ claim-0.4.0
+ clap-2.33.0
+ core-foundation-0.6.4
+ core-foundation-sys-0.6.2
+ domain-0.5.3
+ dtoa-0.4.5
+ fnv-1.0.6
+ foreign-types-0.3.2
+ foreign-types-shared-0.1.1
+ fuchsia-zircon-0.3.3
+ fuchsia-zircon-sys-0.3.3
+ futures-channel-0.3.2
+ futures-core-0.3.2
+ futures-sink-0.3.2
+ futures-task-0.3.2
+ futures-util-0.3.2
+ getrandom-0.1.14
+ h2-0.2.1
+ heck-0.3.1
+ hermit-abi-0.1.6
+ http-0.2.0
+ httparse-1.3.4
+ http-body-0.3.1
+ hyper-0.13.2
+ indexmap-1.3.1
+ iovec-0.1.4
+ itoa-0.4.5
+ kernel32-sys-0.2.2
+ lazy_static-1.4.0
+ libc-0.2.66
+ log-0.4.8
+ memchr-2.3.0
+ mio-0.6.21
+ mio-uds-0.6.7
+ miow-0.2.1
+ net2-0.2.33
+ num-traits-0.2.11
+ openssl-0.10.27
+ openssl-probe-0.1.2
+ openssl-src-111.6.1+1.1.1d
+ openssl-sys-0.9.54
+ pin-project-0.4.8
+ pin-project-internal-0.4.8
+ pin-project-lite-0.1.4
+ pin-utils-0.1.0-alpha.4
+ pkg-config-0.3.17
+ ppv-lite86-0.2.6
+ proc-macro2-1.0.8
+ proc-macro-error-0.4.8
+ proc-macro-error-attr-0.4.8
+ quote-1.0.2
+ rand-0.7.3
+ rand_chacha-0.2.1
+ rand_core-0.5.1
+ rand_hc-0.2.0
+ redox_syscall-0.1.56
+ remove_dir_all-0.5.2
+ rustc-serialize-0.3.24
+ rustversion-1.0.2
+ schannel-0.1.17
+ security-framework-0.3.4
+ security-framework-sys-0.3.3
+ signal-hook-registry-1.2.0
+ simple_logger-1.5.0
+ slab-0.4.2
+ strsim-0.8.0
+ structopt-0.3.9
+ structopt-derive-0.4.2
+ syn-1.0.14
+ syn-mid-0.5.0
+ tempfile-3.1.0
+ textwrap-0.11.0
+ time-0.1.42
+ tokio-0.2.11
+ tokio-macros-0.2.4
+ tokio-tls-0.3.0
+ tokio-util-0.2.0
+ tower-service-0.3.0
+ try-lock-0.2.2
+ unicode-segmentation-1.6.0
+ unicode-width-0.1.7
+ unicode-xid-0.2.0
+ vcpkg-0.2.8
+ vec_map-0.8.1
+ want-0.3.0
+ wasi-0.9.0+wasi-snapshot-preview1
+ winapi-0.2.8
+ winapi-0.3.8
+ winapi-build-0.1.1
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-x86_64-pc-windows-gnu-0.4.0
+ ws2_32-sys-0.2.1
+"
+
+RUST_NATIVE_TLS_COMMIT="255dd5493b446755a9e40be3a4638afedfe67b03"
+DESCRIPTION="Prometheus exporter for Unbound DNS resolver"
+HOMEPAGE="https://github.com/svartalf/unbound-telemetry"
+SRC_URI="
+ https://github.com/svartalf/unbound-telemetry/archive/${COMMIT:-${PV}}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})
+ https://github.com/Goirad/rust-native-tls/archive/${RUST_NATIVE_TLS_COMMIT}.tar.gz -> rust-native-tls-${RUST_NATIVE_TLS_COMMIT}.crate
+"
+S="${WORKDIR}/${PN}-${COMMIT:-${PV}}"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ acct-group/unbound-telemetry
+ acct-user/unbound-telemetry
+"
+
+DOCS=(
+ README.md
+)
+
+src_prepare() {
+ # Ensure Cargo is satisfied with the manually downloaded rust-native-tls
+ # Upstream use a fork *and* a certain branch
+ sed -i -e '/pkcs8/d' Cargo.toml || die
+
+ default
+}
+
+src_install() {
+ cargo_src_install
+
+ dodoc "${DOCS[@]}"
+ newinitd "${FILESDIR}/initd" "${PN}"
+ newconfd "${FILESDIR}/confd" "${PN}"
+}
diff --git a/app-metrics/unbound-telemetry/unbound-telemetry-0.1.0_pre20210920.ebuild b/app-metrics/unbound-telemetry/unbound-telemetry-0.1.0_pre20210920.ebuild
new file mode 100644
index 000000000000..ae841340c866
--- /dev/null
+++ b/app-metrics/unbound-telemetry/unbound-telemetry-0.1.0_pre20210920.ebuild
@@ -0,0 +1,159 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} == *_pre???????? ]] && \
+ COMMIT="19e53b05828a43b7062b67a9cc6c84836ca26439"
+
+CRATES="
+ansi_term-0.11.0
+approx-0.5.0
+async-trait-0.1.51
+atty-0.2.14
+autocfg-1.0.1
+bitflags-1.3.2
+bytes-0.5.6
+bytes-1.1.0
+cc-1.0.70
+cfg-if-0.1.10
+cfg-if-1.0.0
+claim-0.5.0
+clap-2.33.3
+core-foundation-0.6.4
+core-foundation-sys-0.6.2
+domain-0.6.1
+dtoa-0.4.8
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-channel-0.3.17
+futures-core-0.3.17
+futures-sink-0.3.17
+futures-task-0.3.17
+futures-util-0.3.17
+getrandom-0.2.3
+h2-0.2.7
+hashbrown-0.11.2
+heck-0.3.3
+hermit-abi-0.1.19
+http-0.2.4
+http-body-0.3.1
+httparse-1.5.1
+httpdate-0.3.2
+hyper-0.13.10
+indexmap-1.7.0
+iovec-0.1.4
+itoa-0.4.8
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.102
+log-0.4.14
+memchr-2.4.1
+mio-0.6.23
+mio-uds-0.6.8
+miow-0.2.2
+net2-0.2.37
+num-traits-0.2.14
+once_cell-1.8.0
+openssl-0.10.36
+openssl-probe-0.1.4
+openssl-sys-0.9.66
+openssl-src-111.16.0+1.1.1l
+pin-project-1.0.8
+pin-project-internal-1.0.8
+pin-project-lite-0.1.12
+pin-project-lite-0.2.7
+pin-utils-0.1.0
+pkg-config-0.3.19
+ppv-lite86-0.2.10
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro2-1.0.29
+quote-1.0.9
+rand-0.8.4
+rand_chacha-0.3.1
+rand_core-0.6.3
+rand_hc-0.3.1
+redox_syscall-0.2.10
+remove_dir_all-0.5.3
+schannel-0.1.19
+security-framework-0.3.4
+security-framework-sys-0.3.3
+signal-hook-registry-1.4.0
+simple_logger-1.13.0
+slab-0.4.4
+socket2-0.3.19
+strsim-0.8.0
+structopt-0.3.23
+structopt-derive-0.4.16
+syn-1.0.76
+tempfile-3.2.0
+textwrap-0.11.0
+tokio-0.2.25
+tokio-macros-0.2.6
+tokio-tls-0.3.1
+tokio-util-0.3.1
+tower-service-0.3.1
+tracing-0.1.28
+tracing-core-0.1.20
+tracing-futures-0.2.5
+try-lock-0.2.3
+unicode-segmentation-1.8.0
+unicode-width-0.1.9
+unicode-xid-0.2.2
+vcpkg-0.2.15
+vec_map-0.8.2
+version_check-0.9.3
+want-0.3.0
+wasi-0.10.2+wasi-snapshot-preview1
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo
+
+RUST_NATIVE_TLS_COMMIT="255dd5493b446755a9e40be3a4638afedfe67b03"
+DESCRIPTION="Prometheus exporter for Unbound DNS resolver"
+HOMEPAGE="https://github.com/svartalf/unbound-telemetry"
+SRC_URI="
+ https://github.com/svartalf/unbound-telemetry/archive/${COMMIT:-${PV}}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})
+ https://github.com/Goirad/rust-native-tls/archive/${RUST_NATIVE_TLS_COMMIT}.tar.gz -> rust-native-tls-${RUST_NATIVE_TLS_COMMIT}.crate
+"
+S="${WORKDIR}/${PN}-${COMMIT:-${PV}}"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ acct-group/unbound-telemetry
+ acct-user/unbound-telemetry
+"
+
+DOCS=(
+ README.md
+)
+
+src_prepare() {
+ # Ensure Cargo is satisfied with the manually downloaded rust-native-tls
+ # Upstream use a fork *and* a certain branch
+ sed -i -e '/pkcs8/d' Cargo.toml || die
+
+ default
+}
+
+src_install() {
+ cargo_src_install
+
+ dodoc "${DOCS[@]}"
+ newinitd "${FILESDIR}/initd" "${PN}"
+ newconfd "${FILESDIR}/confd" "${PN}"
+}
diff --git a/app-metrics/uwsgi_exporter/Manifest b/app-metrics/uwsgi_exporter/Manifest
index b4a5124da24d..5e156c4c575c 100644
--- a/app-metrics/uwsgi_exporter/Manifest
+++ b/app-metrics/uwsgi_exporter/Manifest
@@ -1 +1,3 @@
-DIST uwsgi_exporter-0.7.0.tar.gz 3039893 BLAKE2B a6efdae7f9a19ad21a283b586b5667bd99456274ed419d1b64aaf4cdb4df1e1c4fb2a08edf6df2b15813d21311fe54c2f2394f0bf25ac11c49db8a924596da05 SHA512 380ef4515eaa81d4dee853682efa7a5e82af2ec00c096e7471028c9932d46e0a7406b75cb40f0f8efec15cd77b06c5477a07919d0b44720e3e194b5bb023b593
+DIST uwsgi_exporter-0.8.0.tar.gz 3040547 BLAKE2B 5b6769487b3a08752cdff9dccc727096bc6b9d49e12e8aa35d04bbd0c3534503c19a4dda882c7efd7409549f3cae750021fa7ce87d12b798a2998efcdfc9f1cf SHA512 a5a1439f554749c7db4857651a11cbbf0ad0a0a8da0ffd421e374fe08194ba289a6bb04a95e4169ba6a75d0358c7a96e5b9f3cc5813cc39004f81dce42edb3ed
+DIST uwsgi_exporter-1.1.0-deps.tar.xz 6393556 BLAKE2B ce75723b9de728560fc367c31b8f70498ffda083f1aa3ed138aaed37d540ed4b05681c022c63bd3f8aa6c1bf9d9e7fc7e6f947c556794b5d65724b1ff95ceb60 SHA512 e5140951a895981eb85be571035e017b3d3a344cb074a40b693f46e25d9355192debecb9710afb4952cbfe6beb62741ddca2c16ac5454df8643927400e3f2d6b
+DIST uwsgi_exporter-1.1.0.tar.gz 39335 BLAKE2B af7fc7ba6d2479467e4b0b90c469fd3a3de1d967b1f4130ce54b5db5bec4dcf910687cf375dcc98a6b68463831d49117e23f589d03d37579b2d83b33a74b519f SHA512 62db351903f6876efea60cc25bea1560b5061ecdf6ca1f113bfa51a745d1524b397350cc2bd0e720aab9357f4f9f6dbca0285eb41ed9cdabebeb4f4176d9c652
diff --git a/app-metrics/uwsgi_exporter/metadata.xml b/app-metrics/uwsgi_exporter/metadata.xml
index ba98a1a69cd7..f427753fdcff 100644
--- a/app-metrics/uwsgi_exporter/metadata.xml
+++ b/app-metrics/uwsgi_exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
diff --git a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.7.0.ebuild b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild
index 7c5dd6280d85..5be77e4e77ed 100644
--- a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.7.0.ebuild
+++ b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild
@@ -1,32 +1,36 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit user golang-build golang-vcs-snapshot systemd
+EAPI=7
+
+inherit golang-build golang-vcs-snapshot systemd
-EGO_PN="github.com/timonwong/uwsgi_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-UWSGI_EXPORTER_COMMIT="20e35a9"
ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+EGO_PN="github.com/timonwong/uwsgi_exporter"
+UWSGI_EXPORTER_COMMIT="ddbc18f"
DESCRIPTION="uWSGI metrics exporter for prometheus.io"
HOMEPAGE="https://github.com/timonwong/uwsgi_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+
+LICENSE="Apache-2.0 BSD ISC MIT"
SLOT="0"
-IUSE=""
+KEYWORDS="~amd64"
-DEPEND="dev-util/promu"
+RDEPEND="
+ acct-group/uwsgi_exporter
+ acct-user/uwsgi_exporter
+"
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
+DEPEND="
+ ${RDEPEND}
+ dev-util/promu
+"
src_prepare() {
default
- sed -i -e "s/{{.Revision}}/${UWSGI_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+ sed -e "s/{{.Revision}}/${UWSGI_EXPORTER_COMMIT}/" -i src/${EGO_PN}/.promu.yml || die
}
src_compile() {
@@ -42,7 +46,7 @@ src_install() {
dodoc README.md
popd || die
local dir
- for dir in /var/{lib,log}/${PN}; do
+ for dir in /var/log/${PN}; do
keepdir "${dir}"
fowners ${PN}:${PN} "${dir}"
done
diff --git a/app-metrics/uwsgi_exporter/uwsgi_exporter-1.1.0.ebuild b/app-metrics/uwsgi_exporter/uwsgi_exporter-1.1.0.ebuild
new file mode 100644
index 000000000000..88aeeefc02fa
--- /dev/null
+++ b/app-metrics/uwsgi_exporter/uwsgi_exporter-1.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+SRC_URI="https://github.com/timonwong/uwsgi_exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+UWSGI_EXPORTER_COMMIT="f04f713"
+
+DESCRIPTION="uWSGI metrics exporter for prometheus.io"
+HOMEPAGE="https://github.com/timonwong/uwsgi_exporter"
+
+LICENSE="Apache-2.0 BSD ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ acct-group/uwsgi_exporter
+ acct-user/uwsgi_exporter
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-util/promu
+"
+
+src_prepare() {
+ default
+ sed -e "s/{{.Revision}}/${UWSGI_EXPORTER_COMMIT}/" -i "${S}/.promu.yml" || die
+}
+
+src_compile() {
+ mkdir -p bin || die
+ GO111MODULE=on promu build -v --prefix bin || die
+}
+
+src_install() {
+ newbin bin/${P} uwsgi_exporter
+ dodoc README.md
+ local dir
+ for dir in /var/log/${PN}; do
+ keepdir "${dir}"
+ fowners ${PN}:${PN} "${dir}"
+ done
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/app-metrics/vault_exporter/metadata.xml b/app-metrics/vault_exporter/metadata.xml
index 4eafefdd6820..32ae9b22ca43 100644
--- a/app-metrics/vault_exporter/metadata.xml
+++ b/app-metrics/vault_exporter/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
<upstream>
- <remote-id type="github">grapeshot/vault_exporter</remote-id>
+ <remote-id type="github">Talend/vault_exporter</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-metrics/vault_exporter/vault_exporter-0.1.2-r1.ebuild b/app-metrics/vault_exporter/vault_exporter-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..4f8185cc0e8c
--- /dev/null
+++ b/app-metrics/vault_exporter/vault_exporter-0.1.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/grapeshot/vault_exporter"
+MY_PV="${PV/_/}"
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Vault exporter for Prometheus"
+HOMEPAGE="https://github.com/grapeshot/vault_exporter"
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ acct-group/vault_exporter
+ acct-user/vault_exporter
+"
+
+BDEPEND="${RDEPEND}"
+
+src_compile() {
+ pushd "src/${EGO_PN}" || die
+ GOPATH="${S}" emake build
+ popd || die
+}
+
+src_install() {
+ pushd "src/${EGO_PN}" || die
+ newbin _output/bin/vault_exporter-v${PV}* vault_exporter
+ dodoc README.md
+ popd || die
+
+ keepdir /var/log/vault_exporter
+ fowners vault_exporter:vault_exporter /var/log/vault_exporter
+
+ newinitd "${FILESDIR}"/vault_exporter.initd vault_exporter
+ newconfd "${FILESDIR}"/vault_exporter.confd vault_exporter
+}
diff --git a/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild b/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild
deleted file mode 100644
index 3c48b2307d64..000000000000
--- a/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-MY_PV=${PV/_/}
-
-EGO_PN="github.com/grapeshot/vault_exporter"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Vault exporter for Prometheus"
-HOMEPAGE="https://github.com/grapeshot/vault_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GOPATH="${S}" emake build || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- newbin _output/bin/vault_exporter-v${PV}* vault_exporter
- dodoc README.md
- popd || die
- keepdir /var/log/vault_exporter
- fowners ${PN}:${PN} /var/log/vault_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}