summaryrefslogtreecommitdiff
path: root/app-metrics
diff options
context:
space:
mode:
Diffstat (limited to 'app-metrics')
-rw-r--r--app-metrics/Manifest.gzbin5099 -> 5095 bytes
-rw-r--r--app-metrics/alertmanager/Manifest6
-rw-r--r--app-metrics/alertmanager/alertmanager-0.18.0.ebuild2
-rw-r--r--app-metrics/alertmanager/alertmanager-0.19.0.ebuild2
-rw-r--r--app-metrics/alertmanager/metadata.xml4
-rw-r--r--app-metrics/bind_exporter/Manifest4
-rw-r--r--app-metrics/bind_exporter/bind_exporter-0.2.0_p20190226.ebuild2
-rw-r--r--app-metrics/bind_exporter/metadata.xml5
-rw-r--r--app-metrics/blackbox_exporter/Manifest10
-rw-r--r--app-metrics/blackbox_exporter/blackbox_exporter-0.14.0.ebuild57
-rw-r--r--app-metrics/blackbox_exporter/blackbox_exporter-0.15.1.ebuild2
-rw-r--r--app-metrics/blackbox_exporter/blackbox_exporter-0.16.0.ebuild (renamed from app-metrics/blackbox_exporter/blackbox_exporter-0.15.0.ebuild)4
-rw-r--r--app-metrics/blackbox_exporter/metadata.xml4
-rw-r--r--app-metrics/burrow_exporter/Manifest6
-rw-r--r--app-metrics/burrow_exporter/burrow_exporter-0.0.6-r1.ebuild2
-rw-r--r--app-metrics/burrow_exporter/burrow_exporter-0.0.6.ebuild2
-rw-r--r--app-metrics/burrow_exporter/metadata.xml5
-rw-r--r--app-metrics/collectd/Manifest2
-rw-r--r--app-metrics/collectd/collectd-5.10.0.ebuild539
-rw-r--r--app-metrics/consul_exporter/Manifest2
-rw-r--r--app-metrics/consul_exporter/consul_exporter-0.4.0.ebuild2
-rw-r--r--app-metrics/dnsmasq_exporter/Manifest1
-rw-r--r--app-metrics/dnsmasq_exporter/dnsmasq_exporter-0.2.0-r1.ebuild58
-rw-r--r--app-metrics/elasticsearch_exporter/Manifest10
-rw-r--r--app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild2
-rw-r--r--app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.4_rc1.ebuild2
-rw-r--r--app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild2
-rw-r--r--app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0_rc1.ebuild2
-rw-r--r--app-metrics/elasticsearch_exporter/metadata.xml5
-rw-r--r--app-metrics/github-exporter/Manifest4
-rw-r--r--app-metrics/github-exporter/github-exporter-04-r1.ebuild2
-rw-r--r--app-metrics/github-exporter/github-exporter-04.ebuild2
-rw-r--r--app-metrics/grok_exporter/Manifest2
-rw-r--r--app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild2
-rw-r--r--app-metrics/memcached_exporter/Manifest2
-rw-r--r--app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild2
-rw-r--r--app-metrics/mongodb_exporter/Manifest4
-rw-r--r--app-metrics/mongodb_exporter/metadata.xml5
-rw-r--r--app-metrics/mongodb_exporter/mongodb_exporter-0.6.2-r1.ebuild (renamed from app-metrics/mongodb_exporter/mongodb_exporter-0.6.2.ebuild)2
-rw-r--r--app-metrics/mysqld_exporter/Manifest4
-rw-r--r--app-metrics/mysqld_exporter/mysqld_exporter-0.10.0-r1.ebuild2
-rw-r--r--app-metrics/mysqld_exporter/mysqld_exporter-0.11.0.ebuild2
-rw-r--r--app-metrics/nginx-vts-exporter/Manifest4
-rw-r--r--app-metrics/nginx-vts-exporter/metadata.xml5
-rw-r--r--app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.3.ebuild2
-rw-r--r--app-metrics/node_exporter/Manifest8
-rw-r--r--app-metrics/node_exporter/metadata.xml4
-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.ebuild2
-rw-r--r--app-metrics/openvpn_exporter/Manifest4
-rw-r--r--app-metrics/openvpn_exporter/metadata.xml5
-rw-r--r--app-metrics/openvpn_exporter/openvpn_exporter-0.2.1.ebuild2
-rw-r--r--app-metrics/postfix_exporter/Manifest4
-rw-r--r--app-metrics/postfix_exporter/metadata.xml5
-rw-r--r--app-metrics/postfix_exporter/postfix_exporter-0.1.2.ebuild2
-rw-r--r--app-metrics/postgres_exporter/Manifest4
-rw-r--r--app-metrics/postgres_exporter/metadata.xml5
-rw-r--r--app-metrics/postgres_exporter/postgres_exporter-0.4.7.ebuild2
-rw-r--r--app-metrics/prometheus/Manifest12
-rw-r--r--app-metrics/prometheus/metadata.xml4
-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.13.0.ebuild68
-rw-r--r--app-metrics/prometheus/prometheus-2.13.1.ebuild8
-rw-r--r--app-metrics/prometheus/prometheus-2.9.2.ebuild68
-rw-r--r--app-metrics/pushgateway/Manifest8
-rw-r--r--app-metrics/pushgateway/metadata.xml4
-rw-r--r--app-metrics/pushgateway/pushgateway-0.10.0.ebuild1
-rw-r--r--app-metrics/pushgateway/pushgateway-0.9.1.ebuild1
-rw-r--r--app-metrics/pushgateway/pushgateway-1.0.0.ebuild1
-rw-r--r--app-metrics/rabbitmq_exporter/Manifest2
-rw-r--r--app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0.ebuild2
-rw-r--r--app-metrics/snmp_exporter/Manifest8
-rw-r--r--app-metrics/snmp_exporter/metadata.xml4
-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.ebuild2
-rw-r--r--app-metrics/vault_exporter/Manifest4
-rw-r--r--app-metrics/vault_exporter/metadata.xml5
-rw-r--r--app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild4
81 files changed, 729 insertions, 662 deletions
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index e134fbe4dedc..6a51b4cf9909 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
Binary files differ
diff --git a/app-metrics/alertmanager/Manifest b/app-metrics/alertmanager/Manifest
index 1cc550bdfe55..ab61fdcce750 100644
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@@ -2,6 +2,6 @@ AUX alertmanager.confd 135 BLAKE2B 7a3dd341e63a73e9782d44dc59c8a65ea1c855ae0589c
AUX alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6db389a7c226b3a37d43f22f1c8c098d34f652d9b6b9cb407523b375c884e75fe3740578f26e822df21c7 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac
DIST alertmanager-0.18.0.tar.gz 5181819 BLAKE2B efcc856ccacb97646915e8d622179cf3cc7554351036cf556347ec46cdede5c9223139cb209b52376964c7b19b119f3683f82698d1e7c07b1432bb3e4bb37239 SHA512 59faec308abaac3d2b59198fef25109b208de1a807b38803dc10722ff0caf1bac9d9795005fefb3b4e2acda62be136bfcafe7b9702ae52565021a424f99fa730
DIST alertmanager-0.19.0.tar.gz 5862442 BLAKE2B a79336286ca1099dcc73cce897eccaff8d40f8d3140ebf1943a1189cf1d2ec58738cbe7fc02221826ffc0e1535954a11a461ac6ea222113c79a44d43cc9eda83 SHA512 2c21bfbb1001e07e81b1115439ad15e7c0e7089839e56a19c445177e322b8ef9aa2b85e96478f3c3d709cbbd3a5447662a8c55da370b84aa4b6b24f83848744b
-EBUILD alertmanager-0.18.0.ebuild 1367 BLAKE2B 62615ac19bc66f6245bf85e6b6d4f93343e4b303e9a7e1b67f40dce5c5c39ceb752886a2048b7bef0affe279536a6fae1eaf99e979506d6db52a1b9a411290ed SHA512 4b964437dcd48918873da9cb991bc8367c60914de05f4d5293e6b9bb818e0bfadaa9d99c037d7f3aef0177fac70059ed272b657c4241f4ea2890fe533e358d18
-EBUILD alertmanager-0.19.0.ebuild 1367 BLAKE2B cf5bb035167590396a536967525dff87a1c105aa1e275a94dc10d87bc91bbbf736bcb412fe5844a39f73861025947d432f1e2d5691068e574e0e79a04dc89c65 SHA512 089666a104bca0ff22fc0183e2d2a3b3a99868de3a8a64d1ddb66dc7cffbfda7b0e98b6c5fc009300647d21218c543f036ba89a394304f0221791c3ace07088f
-MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
+EBUILD alertmanager-0.18.0.ebuild 1389 BLAKE2B 4757558e01287f8afff1a39c04dfd1cccaaae3ee14584c8196300280acea50393a05b56e6a255cc35cca408464044273e9935e37ecfd03f86ceb17867ac814f9 SHA512 e64b174b7433b0bab0d6c549d470582737a6b138f0d79e042a9bb7e9b7220dcfe5f22652188f159b6a550622a9bd160c6dac34a910ab2f8b0a30ce5ba4910e32
+EBUILD alertmanager-0.19.0.ebuild 1389 BLAKE2B e4845bb46c400e9185c28f13b43432c177a8708bb08cbc36f27ea1c9cb90ca5c8d6172090dc84c156acd288b5f812b5a64ce1668f5aff318d4a59e60c583c329 SHA512 fa273caa4bc24e6cfb118b370605ae0513975c8184f1e14ce98f48fd036d10aa21f0e5b5c45393dbfee0e1f1002c03c3571c09ba1701c6a7fe8a2a0eb2b8802c
+MISC metadata.xml 336 BLAKE2B 2cab21f76be9803ce08848025fd889354e4595fe5195f36361a4b5a2f2bc2e8e3e0c697fef2933db48d178d10f838a960e7ad2a8ea74bae42ebe395a6d150484 SHA512 63a13c6b9bff1f75c79b2c0cf1cb16e4973d58e666e04e1ef50bb746caaea8e5358cb61a39c257c082b67264960dbcc78da5ae24dcad94d7e72f833483c8e5bd
diff --git a/app-metrics/alertmanager/alertmanager-0.18.0.ebuild b/app-metrics/alertmanager/alertmanager-0.18.0.ebuild
index 1cbc8d1add42..7909a618ac91 100644
--- a/app-metrics/alertmanager/alertmanager-0.18.0.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.18.0.ebuild
@@ -13,7 +13,7 @@ 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"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
SLOT="0"
IUSE=""
diff --git a/app-metrics/alertmanager/alertmanager-0.19.0.ebuild b/app-metrics/alertmanager/alertmanager-0.19.0.ebuild
index ec6dbaf138c1..3955cf657695 100644
--- a/app-metrics/alertmanager/alertmanager-0.19.0.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.19.0.ebuild
@@ -13,7 +13,7 @@ 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"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
SLOT="0"
IUSE=""
diff --git a/app-metrics/alertmanager/metadata.xml b/app-metrics/alertmanager/metadata.xml
index 714320b4f365..bc4cfe589089 100644
--- a/app-metrics/alertmanager/metadata.xml
+++ b/app-metrics/alertmanager/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://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 de7c35f627cb..be7ec194d44e 100644
--- a/app-metrics/bind_exporter/Manifest
+++ b/app-metrics/bind_exporter/Manifest
@@ -1,5 +1,5 @@
AUX bind_exporter.confd 57 BLAKE2B dfffea2f2859b377d5132a2c56ace0260f2d272463c104144acea0a2489141d01e35f4899d53af1526fe0ca1ae760fef62c96a0b6849c8b8678b7693a53ac20f SHA512 54c5162993d488eecec2453b06b2cbedd5eb4599074cf43fda644e2faba4c35ad481840dbb8b05979bf1a0dcdff32edd9efa56bc779f264d81056793d1d00be0
AUX bind_exporter.initd 550 BLAKE2B fcb4eb3066023024b8605a2c9787ba7c8871d05d1b11a1ea97ebab91e403e21876c8b29136b114c6ceef29e9be79056accdde7061e13f615b1f55c25998b938e SHA512 1471a0644c1c2d5a242987638b6fa0576913b9dfbcf886ade42951b3cc71f632c210060a619637988c5239a3ff934c2073e2bd34b913abd9871eb028fd71e2e1
DIST bind_exporter-0.2.0_p20190226.tar.gz 874497 BLAKE2B ce04a168be6844d43ed2c358aa6469d5dbae1730825e4c3c038805f4bbf071bfae2936a6a5341832939e3ed249e5d484f2ca0908ac0e717cd2b5ced496c44a49 SHA512 95a8ae6f7c6470345d5a5f7e4e36eae282e5ca74393dd4372342f44732b54a6cc977ae037d6d16ae4ce6a9ac526b2e01721f5468a6469c30ae60ca59dfec8d5a
-EBUILD bind_exporter-0.2.0_p20190226.ebuild 1547 BLAKE2B 3055fa2ee9dc825d9205e90c469f6c297b3f3b28b3c579daaa99caf9ca12fb0c6f26f08f4f5b3fab01b6290090f6f760ba795b41a42d975a8ce3bfb1cf92afef SHA512 c51f97306474af0d12d8c45ee1af601b1e440b8462f26a57e7293fe498900c466e87c78a4fb3fcd52cdc5e42121e8c12eaceb6fa01c526972abaf9c51b7fab12
-MISC metadata.xml 258 BLAKE2B 3e1e1a99e20e0e84744b82650f72b24662b588dc603d95d1b45258f4f0a3bfba11aa1322672adaafa0a4f505f63d6a7c2a7460612c055377ad2bd8b7a0b9fca2 SHA512 6848088d8b0b0dbb9a54a50370ca7318bf8e127e1f59712a48bdf080e623dd0bc67e42c5f98356918c34d2e1caa2daab6f24bd3e74e76d09d8449bb5895cfedb
+EBUILD bind_exporter-0.2.0_p20190226.ebuild 1555 BLAKE2B 690fa683e16713c3c6b927a658e4e5224987f55e0281bf935c4dad7c9b564f87cc7f3c28354c17cca400b21896ebf02060bf7566f0279f2046ab554d8f654866 SHA512 f525809082cb855c9d6b508cd5134fb3e3f94a0ba8945e98269482c8c21b40db99cc466d00ce8cc83202b2feab8ed67246553f43adb8f44c1ab0f7f8dcc1de12
+MISC metadata.xml 339 BLAKE2B 69da31cf1303e569cebeac7ff77b09d2cf2c0790b53a519f8bbb52df39b813704b4b7929da94b88c5aedded5048e5d33248f242d8a59eec4a7c09b91b2ebdcea SHA512 dccb1013f9acacb8a639829d46d8f71328591725086e64a043f3750f0c95502772a429e0bb6f44772322fb4087e03f021ac60f04f153372b9292e8507e18c520
diff --git a/app-metrics/bind_exporter/bind_exporter-0.2.0_p20190226.ebuild b/app-metrics/bind_exporter/bind_exporter-0.2.0_p20190226.ebuild
index 06b1f355e34f..e9417f245b26 100644
--- a/app-metrics/bind_exporter/bind_exporter-0.2.0_p20190226.ebuild
+++ b/app-metrics/bind_exporter/bind_exporter-0.2.0_p20190226.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Prometheus exporter for BIND"
HOMEPAGE="https://github.com/digitalocean/bind_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT"
SLOT="0"
IUSE=""
diff --git a/app-metrics/bind_exporter/metadata.xml b/app-metrics/bind_exporter/metadata.xml
index 4974e7b5d62e..e453c7a51e4f 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">
<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 c82ca107c674..83305ce0fece 100644
--- a/app-metrics/blackbox_exporter/Manifest
+++ b/app-metrics/blackbox_exporter/Manifest
@@ -1,10 +1,8 @@
AUX blackbox_exporter.confd 110 BLAKE2B c3cb7ed7d314ea8b347b4db9839e7c987c91c78378a6085473d687a5f3460f06ca6825567fbe832c3114906156290d00d505e15e3c2461eb844acb4e56937af0 SHA512 aa8720c03c4bf21ad5f789a4e9c6df6059fb71413cfdc605f8868bcd54eab899aa527afa9d847c7780042a8d4d72468145a97f8d732ef6aad861dcbf96bdf2ed
AUX blackbox_exporter.initd 615 BLAKE2B fce98f2c0740db2309d0395cf1e7e3f8b3b305c688cbafbf14a1787d952d49933ddebee1a688b844a66c95d02c38c38e943ff73e4dce68a1069c69c91540cc47 SHA512 f5ecc87e592fe85e4cfed759f06a1d88a4bbd05a474cb7955aae296ee29ae2ddf875a427bfcc7ff8369367eb8892c85bcc5051d273f8c2693395c8851b5f8669
AUX blackbox_exporter.logrotated 107 BLAKE2B 255c64f5f0cee8b0b7a3bf2b3a55725f87f3f8067f840a94e9c70819820d1d42b3c2a7727323edf00d32797aab45060d0033fb5d5762263d502e4f0f1ad3d492 SHA512 2bb4782f925f9f416addf9f0a20ada0f0b61d964667eb8114b5fbdc758f69c07c91bf8e6fd18758d3ec21a7e41c931bd9bf42d16d3dfc45e2718126ffb0f21a6
-DIST blackbox_exporter-0.14.0.tar.gz 670297 BLAKE2B e55186723b7877296a62840c842acb87c95f4e060b059c6a5861a6eb6a8bb8ad14c6082f466427ddf048c49fca8df79668c64b77b1dcf64b1239ed5b62c829e3 SHA512 58f379cdeef671376105532450ffb3a6fef0ea071d493fbef40d761c6cbaec47bb49c9c2e5c070f3d0e598396d7ad9b2c5af100c9a69aee04877442c7bdaf120
-DIST blackbox_exporter-0.15.0.tar.gz 2157865 BLAKE2B dee707d8cf568da01e7981a9c2879fb209fac6d640d2cc1905231d56c9e6f8007da8eec09ff89cba82e40ac159529b1a9144aa0b50094a8b798102b19502404b SHA512 dff23d51292ed7b56f403d9a70c02a4d4e1f2a43f0bd6763598b310c07c7564d39fbed29c7b2b03b1848d33c3779b4922396212a3c9252c8149fdd9208d8a3b7
DIST blackbox_exporter-0.15.1.tar.gz 2120525 BLAKE2B c21a621dce663ccbc184c87b66e894ddc6a94bee9bbd2b9fb432a4d349afb35410f07ad150e946c5f8eb9ec8e6e7f2e6d4cbcafe118e8b2efe34902fbd0bf38a SHA512 2c7d0989bc70982a0fd528c7c6ed5ec6686f5e93db0a90db2b06e4e578503443da0750aaa2d6a01ae4fcd4c722eef522c0e06b019aa59a2eb837f233e317d4e2
-EBUILD blackbox_exporter-0.14.0.ebuild 1545 BLAKE2B bc9cf8d12e453d7d5b0408d81d993c1234c5e845333c71b3e28739ba56c0b2eb1be4470e32f504a1efba688d787653cd5ffd3d5f0b7e56bdd44bbf83b12d5be7 SHA512 19e18e033b4c5ef96da1e7b8ff541633b7e631b7623f0ad213d08f7982be7288d100a2d7ee70b48277cd7e50dce3746a8907a98ac1a4b0c00935724cc6267a2a
-EBUILD blackbox_exporter-0.15.0.ebuild 1545 BLAKE2B 0e3d230602b5f6d2f6c644457b4f66cbcb753d2c6bed90d39ad741ff9fae76cb686621c4ca5ad9f047607ec5faa3839bd23b8ec3950501f7f122b42c63c3b048 SHA512 8abd474ab3291b6c4fe372ded1470d016ad7d3514939144b431254fa912d41805fa5e340e62b8f977961da1e4d592ccd831dae3effa8135eb16b572ad315fb1c
-EBUILD blackbox_exporter-0.15.1.ebuild 1545 BLAKE2B 0c160478d2705c500433e697c63b26b6bcd4057b4807c6b9852d40eaffbee20709dbd18aae02eefc916194d242c3c5f07fde6c79fc9a9e2e383d1f6d94acb992 SHA512 c50e5ab5cc210fa510ba6df00123a0fac68695e837ea1992af6dbd267ea9ffebd2748a47edc29c3965f75326c1bff016140741f875871822cf7a7499d038b380
-MISC metadata.xml 338 BLAKE2B 117f205ecdd4c05aba1ce92846f59dc7790c9fdae79db5cc1eb912d34a9e1d83eaaea26feb24245a0c5fc4394552705aa7b23171920d9023ca8e4333b3c09650 SHA512 e431b2ef89e797b9cbb290a70683a4392f07559851550dd22f5410f09c979730c8dd35c095f855565df8d72adb42c6e4b9d03882adf37240b0da28cc508ee2ad
+DIST blackbox_exporter-0.16.0.tar.gz 2121367 BLAKE2B 92c55dbc3f47d7a2d8c37ad116857dd1d7314a6684d9f228039b09cc086edf72bdf5e0c2cc770ce45d687c45a38f6de72e612c0491ec66f836bed28b75b2e5a9 SHA512 85103b62e345ab5d59626e658047ac75649f9ef991c9bbaff32b95ea75ec2da2bf916573e664520766158805c6cf24163f2850c885a594d32b4f9c4c9dbed1a8
+EBUILD blackbox_exporter-0.15.1.ebuild 1559 BLAKE2B c27b5940d73adecf5fb91c804cca2aa01ae303cf6d828ebf5af883d4b16cd7fc99ce115b29134116911e63a2ad676b6b63ed927998612d1c5825e81a20ed629c SHA512 b2b434684e1303c98ae868161cbc65814be5324c2593ba8e15988d3c1fc518e1ef0954ff369e5a3f48f1e069962985cbd60672de90068c65c9787e921a27d9f1
+EBUILD blackbox_exporter-0.16.0.ebuild 1559 BLAKE2B dbbca41eec9dd2cec880afdc6c8246e59264aa065640779621a585ae154ee3467102ef1eaf71c3efca486392f170ca43f387075a14417bf8b933fb78588003f2 SHA512 eb15af2b26b2bdbb044cbbdccc221c8d71eecb079840d0c80948b8a9d7fd6ec7d69adada283107446365337b88d6c29397b8dc288188afca247fafe9e5eccd7b
+MISC metadata.xml 341 BLAKE2B 30f7b2aac9cbea1444b1555a5a1279a07dfce5908bf507dff2d032daf3ecab8b98588d6e916d3e3e3cc04a5c70ed287504913f685e30aa87dcaad96abebff506 SHA512 65a7d67649765acc64976c511fc26f6f35c172538b03945367bcab3ed9c9766130c2a72a581a2e5b62068c7cf31d9ec2f39c3d7b5f580060a9e9c99035f7663f
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.15.1.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.15.1.ebuild
index c39fbc922b0f..52e9c480877c 100644
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.15.1.ebuild
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.15.1.ebuild
@@ -13,7 +13,7 @@ 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"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
IUSE=""
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.15.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.16.0.ebuild
index 7c9fdd3a2736..82e0d20ed7f4 100644
--- a/app-metrics/blackbox_exporter/blackbox_exporter-0.15.0.ebuild
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.16.0.ebuild
@@ -6,14 +6,14 @@ inherit fcaps user golang-build golang-vcs-snapshot
EGO_PN="github.com/prometheus/blackbox_exporter"
EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="3f726a8"
+BLACKBOX_EXPORTER_COMMIT="991f898"
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"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
IUSE=""
diff --git a/app-metrics/blackbox_exporter/metadata.xml b/app-metrics/blackbox_exporter/metadata.xml
index 5d0a20fee17b..568acee6e543 100644
--- a/app-metrics/blackbox_exporter/metadata.xml
+++ b/app-metrics/blackbox_exporter/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://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/burrow_exporter/Manifest b/app-metrics/burrow_exporter/Manifest
index 536cd729525f..822c9cdf3cd5 100644
--- a/app-metrics/burrow_exporter/Manifest
+++ b/app-metrics/burrow_exporter/Manifest
@@ -13,6 +13,6 @@ DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2
DIST github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz 58775 BLAKE2B 05173a41bfaa944e2096b4360e0974f921934b6e6ec8b34cb7322158cabaa73e60ab091d4a5bcc9696b29995e7f71bdf55cb832af140a153452cf66c85c9a3cd SHA512 9d4a937d12a738a7802102415cb061e0009ed43f901420560637e13f7952c26dab52e67011d8b1f8ffe474e223198a23becb65a6eb07cee1be9f6b1add566fd4
DIST github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz 34890 BLAKE2B f0284354e3782e07371825b3fd6136a5fc516dae97218c90ac333ce749f87b435a55c6545691a7b71f90b98563fdba5f96c238007ee8187d98297edce1124cd5 SHA512 47cafa8b7a4f9496e1cfd6e2d24ae882ed3ac21a2417eb2ece2cfaa2e391d32b60d2ec8c3860988d8fe3af8bfa6d1430e938e5da1331a7e1df2828753dac82bd
DIST github.com-urfave-cli-ab403a54a148f2d857920810291539e1f817ee7b.tar.gz 56233 BLAKE2B e65241a10240c98eae5909a29ea63036583a073c290f613cac1d081534760bb4f0e15c2e02bd5693bae036901f9b029099ebea7679655da14b415332b0a3a93b SHA512 c4af60825c3209850b6a5ce38a86ac0b8cd9bfdbe6ef83dc4a52cb2842465fb12f96a81631646135c0571f404d891867bd401a2182ab3f3586e8b86090648bcc
-EBUILD burrow_exporter-0.0.6-r1.ebuild 1918 BLAKE2B 198811c126a7f406a9cd584ed75509346b9a6a042a03393382ab74bf767cb42bee316392572f64f32137a27577c048ae583f63c392095b65510cac5cc36d4517 SHA512 632460fbefa377fb5d471100d7ded4db4e8a47408059782e239c569b2e42293ec216062c4cf874d414c81ca33bb51cbbf0a3fd517645f2057076c2995160f129
-EBUILD burrow_exporter-0.0.6.ebuild 1735 BLAKE2B 5f978575201c38acab7f45c8b501880122f847fa7d14024df6c2419ec5f2f4c5911579931a61740e197d4ca77a622e6172fac5e07df417f3155b35bd7aada5c0 SHA512 29f7a14a4ff7e0cc1047e21f198ca538e7b986ba4e6f037c0f5f44014fe5321900fdb68c3f16bc3fa2a25544213ddde217cb49e8d6ed9f7bf78d0bd69b2235f4
-MISC metadata.xml 254 BLAKE2B c40084a1267a2a6b468e8c82280e4d4be02e823f169fd4fcc351516acfb9dbc38f3ce439d04afc7c6bfd57bdb05fb0dae3ba80fccc265c6154305482d3862470 SHA512 f66ca45a248a2a62aadfb09fdcea6e2346a326924f50c6e0551cb0e9f1df319e1f976427ae92d523e629c20cc5292d8469885e7e467b92ad1be7a213035bc167
+EBUILD burrow_exporter-0.0.6-r1.ebuild 1932 BLAKE2B 7a559066e6d68cf5421db4f8b44a1e7c8716c0cf2e4345ba737635b132c2c7e1ce1412e3b499c407d4df936a8c6111639965b44cf5650ce9a613c7d68d210da9 SHA512 a06e0f7f9dc01ce6213abd8ab973672f02491e89c3e44363506c187d63b061b8bc2e098233fae19488166b3c20305c65837f506aa857c6773bf17bb837147ecb
+EBUILD burrow_exporter-0.0.6.ebuild 1749 BLAKE2B 47a9b2cae98eb5b09d80734d4e3513f639e2beaeeff6797751ec04b21521fdee65e58899a9a59bb349f32bd4d8337cce965b992c3699be043a37d1bcdc7a3c15 SHA512 dab6793635e52d9dc31fb9e4ea54dfd1944e8ccc698626af79e1c7e6189f5341218df9e858ed1afce05c121ab7f0b6f051f506beefdfa48088bf5faaec21cda3
+MISC metadata.xml 335 BLAKE2B a956c1b16a01539e266a4e96c51a78ecee11706d166a2b001e2b2c89dd7b053da4d3dbafd856004a74eef0b51ba1c0b1c67c0edf66fd4708e9495264bdc812be SHA512 035829900f199dfffff402d0febdaf8b15c1f73bfa17379d071b434bac62695ef0355bf6dcb931c8d265253c2294762e17c01008dfc6a404008a7f404b93176b
diff --git a/app-metrics/burrow_exporter/burrow_exporter-0.0.6-r1.ebuild b/app-metrics/burrow_exporter/burrow_exporter-0.0.6-r1.ebuild
index b6a97d6ef8fd..bde2fa62d7b2 100644
--- a/app-metrics/burrow_exporter/burrow_exporter-0.0.6-r1.ebuild
+++ b/app-metrics/burrow_exporter/burrow_exporter-0.0.6-r1.ebuild
@@ -25,7 +25,7 @@ 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=""
diff --git a/app-metrics/burrow_exporter/burrow_exporter-0.0.6.ebuild b/app-metrics/burrow_exporter/burrow_exporter-0.0.6.ebuild
index 8abb648aee95..93883396695a 100644
--- a/app-metrics/burrow_exporter/burrow_exporter-0.0.6.ebuild
+++ b/app-metrics/burrow_exporter/burrow_exporter-0.0.6.ebuild
@@ -25,7 +25,7 @@ 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=""
diff --git a/app-metrics/burrow_exporter/metadata.xml b/app-metrics/burrow_exporter/metadata.xml
index 9a3e876caef5..fc6b03a8a7c9 100644
--- a/app-metrics/burrow_exporter/metadata.xml
+++ b/app-metrics/burrow_exporter/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://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">jirwin/burrow_exporter</remote-id>
</upstream>
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index 1659f2b93397..3f542bd33664 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -4,9 +4,11 @@ AUX collectd.confd-r2 2001 BLAKE2B fbf1a64aab6ec60111553466c3a8b725200ab13d0e09c
AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc75e9cb36e1f2dba85b3b2b587336f976059af165ae89333d681ffe0cf53bbcd8098eaeff75228cb80b68 SHA512 8f0a73f0f2b2280c0f2e35894a9dfa38af937930eb090eab52cbe81089a146bd974f6a2a3062b7147611f9c13b770a945a1a9228a026405d31578e27a3fd3b80
AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
+DIST collectd-5.10.0.tar.bz2 1856377 BLAKE2B d4c011c5d2d9bfcf8400a35ca92f0b8c82fd58c3201b1b57a6b48c98af63efaab03c5fb1144bae28e7661743626871eaa962959929ff7fcdd5778b72c7054c4e SHA512 1296085fb19bba0c7b7d8684ec877851158b25c9f7b58fc3ae602fba7d7dc718876e730e1cdba96d39101cc5452705bb3445aaee717b219025ae816299b6a3c5
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.9.2.tar.gz 1501275 BLAKE2B f878dc9ee0d1948643dcbfcf3a427558a1c17adedcc31f02f4f4bb689e841760dcf732866c0617b8b139b4aecb094f8ca4aa5e7c7c707adf5589fc8767a1d2f9 SHA512 cbbc8d6409242108550b974f388d15c6084753dd51c6056614db34bceb3b72abb0237892ea65086093b9a5c5569087666c0430eb16021d22c3dde8e6d1ae7922
+EBUILD collectd-5.10.0.ebuild 19538 BLAKE2B 7e2c4441f3742477409df962a85f202db453b2c93b6316361ee16a404935223ab657162da5aed7220a622978c030332cb3d429180a6d03652a924e2a5643705d SHA512 9415e8f670cdfad50fdc0d24487e99e7e86393a0992afe02c0ed1738af88874a66b59148c8099aaf38c289234e22ea7fbb1ed6b020e1b53e41e53beb6dc8863e
EBUILD collectd-5.8.1-r1.ebuild 19431 BLAKE2B 970be74630e220d80bb5ad2ad59d1f82356c41d8ec3a360427ea0c0ea6f792d3698551cb2980f6020a227b656f6cd4a8d20d750404db9e7fcbceafb3f4c71796 SHA512 4f1e16610288db0be07fa89a1d32792a11d69277a71367a201013fcc92f98659fb5c3b1220e0c4bdac935b14afddbf5e78a282445b83487e9e9a8fe5f4e83284
EBUILD collectd-5.9.1-r2.ebuild 19597 BLAKE2B ae1badd06dbe8a0a756fa338440c06e9c814a45c59e657c68d56db1dc62e53e99354f6e452904e7351206b06813638f9bbd55bc646ba96789cf6be96a78c60da SHA512 ffdd05679e68dd265e1385c6ba11c2040fafa27841e8e5a0495c6a1c9d04078b829557a3c0e92194fb8136c6fb1208556152eb23d50bb714ee0922efeecc6266
EBUILD collectd-5.9.2.ebuild 19553 BLAKE2B 946259abe31b6051c143bf949d223e9d52f6aa420479415920caf445029df791b58f70522af1edff754366f649e3ba2e86c90e59f9db46dd632c8ff36a6e179b SHA512 3fb0c1f080c905787d179e6d78cc24884c6c9990e6947021341a822dc878dc546b90afb313e4b80d8cb0751e6ecfc96fb9bd63073ab498ba2f78b1f40152ae9b
diff --git a/app-metrics/collectd/collectd-5.10.0.ebuild b/app-metrics/collectd/collectd-5.10.0.ebuild
new file mode 100644
index 000000000000..f3a9f179a082
--- /dev/null
+++ b/app-metrics/collectd/collectd-5.10.0.ebuild
@@ -0,0 +1,539 @@
+# 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="https://github.com/${PN}/${PN}/releases/download/${PV}/${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
+# 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)
+# tokyotyrant: Requires tokyotyrant
+# 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 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 sysevent syslog table tail tail_csv
+ target_notification target_replace target_scale target_set tcpconns
+ teamspeak2 ted thermal threshold 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_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:= )
+ 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 )"
+
+REQUIRED_USE="
+ collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )
+ collectd_plugins_smart? ( udev )"
+
+# @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
+ if [[ "${plugin}" == 'dpdkstat' ]]; then
+ myconf+=" --without-libdpdk"
+ else
+ myconf+=" --disable-${plugin}"
+ fi
+ 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/${PN}
+ 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/consul_exporter/Manifest b/app-metrics/consul_exporter/Manifest
index 9b26edd3e42f..f6632f5d5df7 100644
--- a/app-metrics/consul_exporter/Manifest
+++ b/app-metrics/consul_exporter/Manifest
@@ -1,5 +1,5 @@
AUX consul_exporter.confd 95 BLAKE2B 11a6f462b15c57e8b97504feb1dc8070c1c6f6b1cd87d8ebd875db9b357ca858f969198d1f86ac2df4972bcfb0df3512662938540bb74fc8328b583a08fdd8b9 SHA512 ef9806127bb39a74111be4e1cf22edb3a6e04c384d11f594721e6352ee1f92499d594248926125367890e774f917fa206e461fec580fd9d28d9f1a2d46397426
AUX consul_exporter.initd 445 BLAKE2B 4b0f58b838e02b46597734580b1b409c6b2426bbd92d88278d960cd29ae3fe018a7a945bb64ac324657b7a96f13d3ff996458d1c0571c6645e9270638129e6b6 SHA512 fe26e5ea6a272143f18567600580c3cf0f557299fd39353ebaf195feee5a916333be1a779b87716810a2dd77ec6e4fb78052dcf7996065723119369c1081e3df
DIST consul_exporter-0.4.0.tar.gz 1107092 BLAKE2B 7f3d6ce797252e5895387d3bbd2a3ad41777bf4d98a4a7a4efc3e8caa0c71fd29be91675ae6fe304016f1cbf87ecf4ee3442b49d3bc08939d471326d4e5d4cd4 SHA512 faac0dfeec5b6fadf73ef68c0d24c059c89891918e498e145a50512b8c961764a02388b2bcce305e12ecf703fa76afdf5634b35aecbee0ac37926d78ce0b1e93
-EBUILD consul_exporter-0.4.0.ebuild 1246 BLAKE2B dd382e88155174584ec939c8189b7e009c623921741356ef1aeb36cc686eb45fbed4003328a0fe1a6c8cda2e6fdd401532ec7e4a6c556a1d81723d5cca17026d SHA512 37528441458595eb8570980bda86c328e0e85d402bbf4322e5a0929ddf146cd08e8a8ec8156a83b20016f69172c7e7d80f11beaa410f301f8ee448db25c91770
+EBUILD consul_exporter-0.4.0.ebuild 1268 BLAKE2B 686e280f1bd6c668a21cde74369fb7b3c0eec0650142d59af233d13277338c6a1b1756395e50d8d543450f86b8c2eb4374258f2d0bc79e5935c1915d8acbfb3c SHA512 21a16e6a2c2e5ba17db529ad3119bc5b1c16a4d1c11481e5f38df7e1783bdb5583758671ba6a0cc9ab363404393db05e71ce1f8b531bc1f5d530071cbe6113b4
MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/consul_exporter/consul_exporter-0.4.0.ebuild b/app-metrics/consul_exporter/consul_exporter-0.4.0.ebuild
index 12823ba01c9e..d713d1ae9911 100644
--- a/app-metrics/consul_exporter/consul_exporter-0.4.0.ebuild
+++ b/app-metrics/consul_exporter/consul_exporter-0.4.0.ebuild
@@ -12,7 +12,7 @@ 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"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
SLOT="0"
KEYWORDS="~amd64"
diff --git a/app-metrics/dnsmasq_exporter/Manifest b/app-metrics/dnsmasq_exporter/Manifest
index 96a878a8e7f0..667c3bab75dd 100644
--- a/app-metrics/dnsmasq_exporter/Manifest
+++ b/app-metrics/dnsmasq_exporter/Manifest
@@ -18,5 +18,6 @@ DIST github.com-prometheus-client_model-fd36f4220a90.tar.gz 57542 BLAKE2B 16f73b
DIST github.com-prometheus-common-v0.4.1.tar.gz 98631 BLAKE2B 1f2d4780c6e0bac957320ebdfb83c6ab9de28abe8b5ea6f75d76d8af76ecef37231da82a070da28c5e05886241c7db0f9538cf85e0b26d20aad610639310e9a4 SHA512 36860b02c9ed11fa02aea619e2e7bcb58f2ade54dae2210194d6b83200ea76e743b07e62d8ac8c20f31806bb0ec680c579da359d41d4400ce50ed6c902e9b534
DIST github.com-prometheus-procfs-v0.0.2.tar.gz 78550 BLAKE2B cded530ef80939cda11dde97d02289ffc1033cd90e7c7eb758468ccbad9f9bde7a259324c067c84b9d16c45be0c2971bc2652b507118045acb23b2a7b36a8f9b SHA512 93635aa795027e71cb79bbd35cf5141617634b09e2d56cad578abfb69edeb54fbda4971b9c81fccd51eb7837fc23f6773fd723b250dd6b16a25acb41aa37bcf4
DIST github.com-sirupsen-logrus-v1.2.0.tar.gz 37794 BLAKE2B 64961dca081f64cd8154a4a583b2a1cc72aeff581d9c6f0fc8786a654f5da4c17f53512f3b26f346a7d491b84f7c8aa25d02bfa08996fdd2a63118efc9ce29ad SHA512 7f582175fb13e926c172cf780409a2ef7b11ee72c4a139df6b59553068cc146a81db53243b141d998a86ec0ec0fe467d4354c7335b76192a494384865bc6ad9d
+EBUILD dnsmasq_exporter-0.2.0-r1.ebuild 1756 BLAKE2B 4b70672b92850980a591bbf62a90eebd8fd07fe57a60a01157fb9c5ea1bc5e65dba66edb894d2e2523ba68dd6908512223c6d73d3cf97cf93daba8754617d533 SHA512 18255f056c86fd303be3059495d0ce209e0e18dab629046941fffc046858f0777bb824186d3ff5dd69bafc970d1b8034fcdb7cb9e7621f7431b0ad8038add348
EBUILD dnsmasq_exporter-0.2.0.ebuild 1579 BLAKE2B 8c2f70960fa12a582b180739ebd2fa804e26945643379652604d79e66a4931b75d2514c1206c68ba4be35527008b524d910a7de6d4f6b94b3af70d0d6497cda1 SHA512 36343afb936cc25aa408b2730577f75cf8a4f18539f7e15ebf7fbaac44ad665de80acbd11a26eff6679c0934e55d30b57deff3756d8604c48faa7cddc3343f50
MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
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..479b27ae2132
--- /dev/null
+++ b/app-metrics/dnsmasq_exporter/dnsmasq_exporter-0.2.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 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"
+
+EGO_VENDOR=(
+ "github.com/alecthomas/template a0175ee3bccc"
+ "github.com/alecthomas/units 2efee857e7cf"
+ "github.com/beorn7/perks v1.0.0"
+ "github.com/golang/protobuf v1.3.1"
+ "github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.1"
+ "github.com/miekg/dns v1.1.14"
+ "github.com/prometheus/client_golang v0.9.4"
+ "github.com/prometheus/client_model fd36f4220a90"
+ "github.com/prometheus/common v0.4.1"
+ "github.com/prometheus/procfs v0.0.2"
+ "github.com/sirupsen/logrus v1.2.0"
+ "golang.org/x/crypto 0709b304e793 github.com/golang/crypto"
+ "golang.org/x/net adae6a3d119a github.com/golang/net"
+ "golang.org/x/sync 112230192c58 github.com/golang/sync"
+ "golang.org/x/sys 5ac8a444bdc5 github.com/golang/sys"
+ "gopkg.in/alecthomas/kingpin.v2 v2.2.6 github.com/alecthomas/kingpin"
+)
+SRC_URI="https://github.com/google/dnsmasq_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(go-module_vendor_uris)"
+
+LICENSE="BSD MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ acct-group/dnsmasq_exporter
+ acct-user/dnsmasq_exporter"
+ RDEPEND="${DEPEND}"
+
+src_compile() {
+ go build || die
+}
+
+src_install() {
+ dobin dnsmasq_exporter
+ keepdir /var/log/dnsmasq_exporter
+ fowners ${PN}:${PN} /var/log/dnsmasq_exporter
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+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/elasticsearch_exporter/Manifest b/app-metrics/elasticsearch_exporter/Manifest
index df0de116f1e5..e76cf726ec79 100644
--- a/app-metrics/elasticsearch_exporter/Manifest
+++ b/app-metrics/elasticsearch_exporter/Manifest
@@ -4,8 +4,8 @@ DIST elasticsearch_exporter-1.0.2.tar.gz 207764 BLAKE2B f626c53d04e05912d1db480d
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
-EBUILD elasticsearch_exporter-1.0.2.ebuild 1162 BLAKE2B 28d273015563f09be796c6a7b671cf48fcfae9e84291eaeff2b9736c5baa710f09e5c184e833a0d11468f02cf44fa76c743ae868864b566166f6efdab2c54046 SHA512 a98d977d13a3b400935c75b00133c7ea92cde165a266f75b815b874285b2328ff3fcd1d823b5d6ed524efaaa4d521071c080b8635493cf0d756506ef8156d166
-EBUILD elasticsearch_exporter-1.0.4_rc1.ebuild 1181 BLAKE2B af0d914976ad33845d50b3edede77924fab4c8a94d18effd5f50cc981019fa4de473927bb194ae8bf6c5a878a080329d51b4a81d4e84f29e0a849c3c45558e2d SHA512 16cadc60fafe481597533893382eb4c500b2f893b6acc60301029a9c2163c9aa4936c240a842939283cffab0a117d5a1e24482a3dda73fb4eb7e7a7ceb9c1b29
-EBUILD elasticsearch_exporter-1.1.0.ebuild 1178 BLAKE2B 6df12b064d5958d9ef6a8c0e77c65f075dda29b986dc596b6921c54be145f3f96a2f2c06e0447b9501db7b6100909ade339fb49b123924fad8f6b7497558e613 SHA512 9b1d9688cc25f6d813162bebab33a1b775e2dbebd2b350b788d347e6f6adb5f735b20ad105207d619027450b9f9d698688c88bc744cec6fc6a64bf2872f0c577
-EBUILD elasticsearch_exporter-1.1.0_rc1.ebuild 1178 BLAKE2B b1fef2f456e267178049fe82736c108b3d9f574cd868691224fe8b84f547574ec6c031d56974496fcb5793c40b7cf13f21ae24704c21d1d8775df14c0804d4f9 SHA512 710f9c3ebf3e042b3cbb1dd97deab1c90748d7237f414ddc36b092cc06d389ef6f45293e79676de570ae9244c378d49f05f49ec685a9be8d664c49cc8ed5aabe
-MISC metadata.xml 267 BLAKE2B 5512ed7b3219ccf423e6c395dedfc0613f941cb36ed1701ab078368298ca03ba89529037946d8cd37f5acf2fc6ef9e2a7f1771bd59a173e248ae5cdfde8d3558 SHA512 df8345b2a9b50071be48101818f7f5d270b00cc76efd6664a76a789ba24227a94c9e83fb5829e09382f9ddc4373e418b41cc8cf7147a24c2c2c9d0c0656eea1c
+EBUILD elasticsearch_exporter-1.0.2.ebuild 1170 BLAKE2B 0c4d4f884255a96c24aa5639af0cbbe4be19cb412c41feb182858d8b4aef1782033c7ea486194dc3b8c92abbb481e8ef2fc6ddc3beb6df7752677ec2853024ef SHA512 a3a6d2d52c12bf0d1494147e89e03d37a202d9e311e6bc6cff508fee519be8ecf62b80f9caa8bf73628d710758c588a1e5b37e188389f0489c526689248295ea
+EBUILD elasticsearch_exporter-1.0.4_rc1.ebuild 1189 BLAKE2B dfee20a2d0c5e9cb4941148a45585508aa0ecab57665cffea2e25730d9cd5afdafbce1c992c9aaab35fe1592c1beac9775d5bd79d54ff5d7d53976d609d964ca SHA512 dbb8aaebc071629bd5c8c356a9edfb10876755116ab8d488f63c860ec0f513b9e277e2bbf7acccbe5787bfd005a08e0d6c20bdcb41e85a85de5428eaeb8d763f
+EBUILD elasticsearch_exporter-1.1.0.ebuild 1186 BLAKE2B 9ec84f9289ea5d930c4f22b6192667060177590617aa311a784c13adc1ae8e7401d4ba5a0e6f9405b3c283557a1ce205eaad09b990f2c615b79f5cedf8205f27 SHA512 33f5b40c584de7421f06e69db5dbb49eebacd7e18079a0fbe0b922f861947c6c66f868e2884260a9f41ee3dc0ef9f9d56e65dab6d2acbf1e423dbdfd8fdd853f
+EBUILD elasticsearch_exporter-1.1.0_rc1.ebuild 1186 BLAKE2B d071fec2ae82368c6771c6a69adf8061997058f5d24e17c11ddb5f676e0cced84780b48cb07a4eb325fce21428a494f0be6f52df5bcdfb6fbbc3a364f31a6eca SHA512 4f1ee8deec35959ab73a64101f5e236f2bf2380d2f42454b374583f698c9c4cf6665fbdd0f9ca9e733963eeee53144c6eb4602ab2e16674f225c3c5d746db3f2
+MISC metadata.xml 348 BLAKE2B eb118ca7ab81d50a676c65f22924901de0daf3e47051288fe04567e0e77420f438d488ef2075265f7aadda8fd9266f642fd98e1c88bad38129e4f11412cf88a8 SHA512 ace90f324d2660bfb1ca732b36853caa323a8d1944d2a2d7631f8416e79da656cd9aff956d5019e5848fff0f1f77c6ec42ddd25a4bb6a68bb705588ca78326f8
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild
index 20be32d6cf4f..7b98a004a46d 100644
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild
+++ b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.2.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Elasticsearch stats exporter for Prometheus"
HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT"
SLOT="0"
IUSE=""
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
index f0acec60fe37..b238ed08aed5 100644
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.4_rc1.ebuild
+++ b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.0.4_rc1.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Elasticsearch stats exporter for Prometheus"
HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT"
SLOT="0"
IUSE=""
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild
index cedeaf364c0b..50bebfc26e14 100644
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild
+++ b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Elasticsearch stats exporter for Prometheus"
HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT"
SLOT="0"
IUSE=""
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
index 8ac76f6636db..ba5fb81cb6fa 100644
--- a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0_rc1.ebuild
+++ b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0_rc1.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Elasticsearch stats exporter for Prometheus"
HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT"
SLOT="0"
IUSE=""
diff --git a/app-metrics/elasticsearch_exporter/metadata.xml b/app-metrics/elasticsearch_exporter/metadata.xml
index 3bba28f75c97..ced92d3b0a4c 100644
--- a/app-metrics/elasticsearch_exporter/metadata.xml
+++ b/app-metrics/elasticsearch_exporter/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://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">justwatchcom/elasticsearch_exporter</remote-id>
</upstream>
diff --git a/app-metrics/github-exporter/Manifest b/app-metrics/github-exporter/Manifest
index 6f43c7585cf4..8422bbf90519 100644
--- a/app-metrics/github-exporter/Manifest
+++ b/app-metrics/github-exporter/Manifest
@@ -13,6 +13,6 @@ DIST github.com-prometheus-client_model-f287a10.tar.gz 57203 BLAKE2B 2d56b90ced9
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
-EBUILD github-exporter-04-r1.ebuild 1954 BLAKE2B a50a9672bfef14555fa25592501418745c7d6bfe4046cee56aef5b46bbc4ebe9d1f78992a8546866148ed0019a3219c8de9b5f6431ef57e511f71985c7974c01 SHA512 1ebbfc73d309eeedd0b48765c6b00767efd26d2d00c4edd492617dcaeb86907fe5bc60b4c236780d1736b2ab9a0d74b9c7ba1416e36770e54f042c061b54ffd3
-EBUILD github-exporter-04.ebuild 1949 BLAKE2B 4a7f826fff339b28cbbeac15b89a39848c42509010f8cd9893416075fa6f1225b48e71e5ad11245100ea8a9100e1b5ee283fe3af96dddb8da4d35eef7c5dc048 SHA512 1a4bbf6af5931bd6878142d922cdab6e53c2b1adfc0b88421eee01c8a4265dc8e7435cdf831b67a729f58d26eb981c511ccbc956b4f859258a9ed3ab9b4861ae
+EBUILD github-exporter-04-r1.ebuild 1969 BLAKE2B 8b4c0b54f271aa7d4d4fec274783b3ef5807dfc593841baa4bbd09656cc28f00f3c82fb86c536cfaa1b4211ed9160ae885ec149f65b9dc19a227321886871794 SHA512 768245f5f8c737ab82db9658a5a09ed052efabe354760e27f67951a8241fd03ebe9d12517a312b569d64a280818bbb7d7fb29c12198b67a2ebf50173f87133cd
+EBUILD github-exporter-04.ebuild 1964 BLAKE2B f8d3f3ed589c2a66b5042ff04a6421849a56e484a682d18e72d97816e086db461ba84ce904c3991cf9fa06ed5b4e6ed70b444326807c0b67b8c8a2fd29248304 SHA512 16ddcca855cbf72929228032a2aa00fd67140f5d68c8585e7ff56f2a03b24f25902153bbf17122869992d6eaa3373b9c17c3f9252754fa1b40d383e19646586f
MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/github-exporter/github-exporter-04-r1.ebuild b/app-metrics/github-exporter/github-exporter-04-r1.ebuild
index f61b022c35f9..261a18c962a0 100644
--- a/app-metrics/github-exporter/github-exporter-04-r1.ebuild
+++ b/app-metrics/github-exporter/github-exporter-04-r1.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/infinityworks/github-exporter"
SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
${EGO_VENDOR_URI}"
-LICENSE="MIT"
+LICENSE="MIT Apache-2.0 BSD"
SLOT="0"
KEYWORDS="~amd64"
diff --git a/app-metrics/github-exporter/github-exporter-04.ebuild b/app-metrics/github-exporter/github-exporter-04.ebuild
index 6bc641ecb2f1..45f9e2708a25 100644
--- a/app-metrics/github-exporter/github-exporter-04.ebuild
+++ b/app-metrics/github-exporter/github-exporter-04.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/infinityworks/github-exporter"
SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
${EGO_VENDOR_URI}"
-LICENSE="MIT"
+LICENSE="MIT Apache-2.0 BSD"
SLOT="0"
KEYWORDS="~amd64"
diff --git a/app-metrics/grok_exporter/Manifest b/app-metrics/grok_exporter/Manifest
index 2cffd04f8a51..eec9f7e465e0 100644
--- a/app-metrics/grok_exporter/Manifest
+++ b/app-metrics/grok_exporter/Manifest
@@ -8,5 +8,5 @@ DIST github.com-prometheus-client_model-56726106282f1985ea77d5305743db7231b0c0a8
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
-EBUILD grok_exporter-0.2.6.ebuild 1969 BLAKE2B d990d12db0a4fffa98a7f3f65dfc85c6528b35d66f4453b590e44036e51532287b4fe016f86aa3f42ae5fcfbcffc995578afa22d1b3c6fcb228964923b25d5b0 SHA512 1ea9751684afa57a854262c9073828e8ee28eb7d0abb5f5dc4875bdbfb8a254d1dee93c1b99d7d358d0ca08f5f33efb848f3f76f126164045b78cdc346ed35fc
+EBUILD grok_exporter-0.2.6.ebuild 1977 BLAKE2B d030fa9023e0a0dabbb847654d7538d2c9b6a552ae64758ce8091fd324dd5f91ee9f41f50377d9d50ca22b2ac63f4650e3730e5d9e0aeca9a373a7317dac1a5b SHA512 dcb554df90b76ffbb958b4f7c0047e6877aa7013c882de568de103cbb32788a356644e8d4bec1fcd84ab5e307824ee4afdf7151ffa0e6157c2fa694934fb945f
MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild b/app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild
index 328fd97b74fd..29464c26fe09 100644
--- a/app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild
+++ b/app-metrics/grok_exporter/grok_exporter-0.2.6.ebuild
@@ -22,7 +22,7 @@ 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"
+LICENSE="Apache-2.0 BSD MIT"
SLOT="0"
KEYWORDS="~amd64"
diff --git a/app-metrics/memcached_exporter/Manifest b/app-metrics/memcached_exporter/Manifest
index ec95c4928b07..67f911c2d432 100644
--- a/app-metrics/memcached_exporter/Manifest
+++ b/app-metrics/memcached_exporter/Manifest
@@ -1,5 +1,5 @@
AUX memcached_exporter.confd 62 BLAKE2B b663b955cddd850ea26292f92e8462132057424cff4292a7c95b40f79c000e90aef739652cd0ca3d419bd648b3062b5374b38bf934ce30c9c5084d6abda7e196 SHA512 8859128c27264826b665f8be1ea87d7df4f9c4731dfc065914f69efb1a3fedb1cdc09cac99a2a67ef12668b87ceda2f2ae4ccd99c30d23b9eb424bfc51406452
AUX memcached_exporter.initd 485 BLAKE2B c4e34f4ae1e43b78291f24f32857e548a9ba384f9f359962a65e2349c45096d665debad5b85f5109de4972cd957c87825d46cbedca5d954c76a1a34071e1a616 SHA512 78219e03ab100aa1fecb61ecc8bd8964eab03c1eeb0566185a6135c3fc4ce6fab07e303fb638ae6137d19fd41b6064aa9cfddc9be9739d56e1c8bd15d1e6f04f
DIST memcached_exporter-0.5.0.tar.gz 1350752 BLAKE2B e9a326ca155e0e0a89dd556f0a97ba9bbe73e3e02a905497c55a5390be2cbf211dde9dda37355dd043b711258c78cf911c79ae898b6e0934f2d4b2ddef7ae946 SHA512 62ec7f9cefc88425ea3b53a634b2d5ff1534624b6e149c962372e81a7271fc1bf3c01c7d8641dc49250b8d124bec740b3c2768e62d51cfdc025a29f71a49b428
-EBUILD memcached_exporter-0.5.0.ebuild 994 BLAKE2B feae07b3e56d55f9a74b7b2a272e929064aeb418f65b5ac272a89ac63d2dcd4afee614eab2806b09b3cdd7f5678ccd7740efd77c8b6ceff0eba0cf2ed1b98a5f SHA512 df00ab947fa07b9597e25d659506cbb01f84fda13e9d5651051912868459092b205c73b53f7c34f33676c377938d30d2c2cc5f9af518cfad9ae3a060869ab6d8
+EBUILD memcached_exporter-0.5.0.ebuild 1008 BLAKE2B e49de3104ba4dc962e543fde5cd45b4464ff68966849ac284ec9fbea20cd01bc1d1b5807a0a127f2393b77b103111100d4a8aa8a3e2bc8afab72ebfb3074d040 SHA512 36f9ca2d015a94bd8ac666eb1a4524e44ff29ab2e44c7e274ceefbde8a443c59093cf114076466ad1daca8220458b52113c830f5e3d28653c59bbe4d7ebf069f
MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild b/app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild
index b7ee78d65607..ce01e1229f09 100644
--- a/app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild
+++ b/app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild
@@ -9,7 +9,7 @@ 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"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
KEYWORDS="~amd64"
diff --git a/app-metrics/mongodb_exporter/Manifest b/app-metrics/mongodb_exporter/Manifest
index c956182674b0..609e8458fcb6 100644
--- a/app-metrics/mongodb_exporter/Manifest
+++ b/app-metrics/mongodb_exporter/Manifest
@@ -1,5 +1,5 @@
AUX mongodb_exporter.confd 94 BLAKE2B 25c98466e22b137a33f347d2c8c53fb15e0727423b6e0d8d804547a9b4220ca1c742cfdea6f6afbbb1fc6a38adafda56d1d372b5175bf3293ee5094ba2c835d5 SHA512 3ead6c80528042a436d8b0d013998e410c9a4216f532876766b7631187051b29b37bc4d834dcdc1483b1575dfa3b975baaef03e0637e63e279a5fbd9b3b75073
AUX mongodb_exporter.initd 591 BLAKE2B bc176954356a3633fc9a3ca314803e1149c14767f11da5d3d6c29cef0e0455b6e61571ca85b19628a5d6e61c653c2de37b16bed34d0d36e51aee1c3fc2ff1c7e SHA512 d81430cce189c5655c2432e5133826e73a92f04f33b3a4d632d0bcf27dc31d9fc2fcaf7a3322e9c6905606770be032647b5beaa1561c967522a4f331f43fe939
DIST mongodb_exporter-0.6.2.tar.gz 1296198 BLAKE2B 4cd04b5e69788f2bbe3e87eafe6a7cf4f0a2e72abff4784176299e46943eac2219141beed2f8d11cc8a2458737456d8edaed42a5392bedd017e85315dc75ba1d SHA512 52c1464af82c09fc79338e805e62936d4da8131cea1bb6608500fa36a2d4069676eace5da0ed1b14d82de9d626be301b42c7bc1d5c620bbecb47ae9a350ecd65
-EBUILD mongodb_exporter-0.6.2.ebuild 1068 BLAKE2B 28d809b53a9501ca8b67d939351ac84a6b264fead83dfb5f985470a69ae9d8337521e03a83f1d633612f5813ba59f11e28b76623db9929bad55b881a86d6276e SHA512 f1c4119c210821f893df8f4bc4458c73f51031a513718d21dcf0bed85e72b818d34c40323068ade2d91020ecd72337aac0ae0fdf44c3a73b6e6dcb65fba2a8f5
-MISC metadata.xml 256 BLAKE2B 61aa17e78f6de159d61992fd9bd136f0ae751cb85cd8728031408dc8fe1872c746620fcd34604770332391bbff81f34aca135b30d8bc5b558242a71d4f3bcd25 SHA512 8f0c6a1845a873568e14f9032658de049b0c255c91b5fe31c8ad6e9d53bb1c009083d7bb75ffbd86d7b69fc09d8a8775fd65cda98c47698f970dad85e346a848
+EBUILD mongodb_exporter-0.6.2-r1.ebuild 1083 BLAKE2B 4db266988c99c5698bf89e6455a622efed443ecabc51026c41ba7300482701ab4e8e2535e726c1c707f86d2448a49162dafbb634fe156c449fad422e87392364 SHA512 6619382b4b71fe31acdb68a032d64c41212aec4645d0a694d0de97299a2cc5da4efafb944d5a18e2b51faf23429a043a001b1a28c9ad60e2141918684484b4ae
+MISC metadata.xml 337 BLAKE2B fa3533a2b316cff8f853637e56b468ef32c28af3b61584b98119b51bc3c9fcef189a951dcdf64867fd5f9de15f8dbbe145891fcea84e77dd43cb059e2294fc8e SHA512 95f1209123d7cff4bc1765db88a5dbd91248a310a70f7637c71e088a1458db54b4d00d83db47899062d36036a9951f60be004104b7dd3f22f72564de7662356b
diff --git a/app-metrics/mongodb_exporter/metadata.xml b/app-metrics/mongodb_exporter/metadata.xml
index 5857176f4249..dccff6eb5d55 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">
<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.6.2.ebuild b/app-metrics/mongodb_exporter/mongodb_exporter-0.6.2-r1.ebuild
index 4f780222d44f..4343d2823685 100644
--- a/app-metrics/mongodb_exporter/mongodb_exporter-0.6.2.ebuild
+++ b/app-metrics/mongodb_exporter/mongodb_exporter-0.6.2-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+LICENSE="Apache-2.0 AGPL-3 BSD MIT"
SLOT="0"
KEYWORDS="~amd64"
diff --git a/app-metrics/mysqld_exporter/Manifest b/app-metrics/mysqld_exporter/Manifest
index 8744efac070b..684fb290a6a9 100644
--- a/app-metrics/mysqld_exporter/Manifest
+++ b/app-metrics/mysqld_exporter/Manifest
@@ -4,6 +4,6 @@ AUX mysqld_exporter.confd 891 BLAKE2B 340b8d6b5f3fdc0a52851197cfd94b1d9d20fa3cda
AUX mysqld_exporter.logrotate 68 BLAKE2B 04a9a0df5dae2a2afd3374cd6f6fd5d04df7629bc85ed63792ecc9e2b4772668d1f5b1fe4baf14b17c26a495ffa1ed3a7d748719db9a72f427587243505158d1 SHA512 3eb2e6bfa0eae0847c0b1e2e7fd990068cb0ad570d14463c88a8860d70ebc378b2e3bc4141f0a98e95304c972c765ae48dbff726b208ba825fe1f4e58765e462
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
-EBUILD mysqld_exporter-0.10.0-r1.ebuild 1564 BLAKE2B e7342d8cd4a1b80c4ab3379bc2a4167a6127685c34e520929d1095b04c348b57d9d082ff5daa87f32c46df9f3d252acb205c63fe5e8e0941d625b1b85753c2f8 SHA512 6c2d62e603163bfc42b2508765da807322cdaae0d4534a96a319c5f3751d0a52178d2e3c110fe50ed0b87e563a87c91a1d9009c881b84c64fe79699cc52c3dbf
-EBUILD mysqld_exporter-0.11.0.ebuild 1905 BLAKE2B 3c9eedb162b1d027287dd7cf65f2b7b46faaa56eb74a4c8d85fb2b479e1e0af25cea6e8751d321bf840ab9792aacae5f4bb13da29fc88967d509c0ddb532ff1a SHA512 79d0eb9bad9f183cbda132232755112e51b697d54baed096d9e73da1aa6b1450f5c0a9ee338b4bf71bcafe4f389b278947252c9f30195f44ada543100973019e
+EBUILD mysqld_exporter-0.10.0-r1.ebuild 1586 BLAKE2B 0920fe22a1505ec3e4d5efbd63e24cf619a0eb005ca64e9d1e398f8a06ab7a9afd56956a3e5aa3bae42d5ac3170d8494f3668bacab6a38cb3a83b6b949a2b56a SHA512 f4bcc367fcf0684d6633797bac733be320b97a800129a97d811e5e7eea4f110122a2b918d360b15077e30178a55e90956b142c59a8e14a8dfe76cda3d0655cda
+EBUILD mysqld_exporter-0.11.0.ebuild 1927 BLAKE2B a6b49e427c3cdf45f7f66711727e6cd9dd3dca74eac76c7642b1634e5073665491136780d95f0bbe5ae8f6157fac32f36e94fba96c83392b277c9ca294b23ceb SHA512 95e0986b93a4ace49574b95f5e62299080747c02ccee6aff8f18a2ae1070e7bf1cb7640fe380759de45390a0f2d7b0b786ef64f7c010ca07b12262f640965e54
MISC metadata.xml 342 BLAKE2B c99db8a7ba47d8b948f5e8623c98ff234a67d14485a09a412d55155b878fe2cff4594934f2e1aef749072f4f52ca8c0b660e52764cc20b40aedc3ae2280d8fdd SHA512 55dcb15bda103364487e98359157961d7859af7e38cef4030e53fe2fb50ded0e34d27a1607171e62d60dd53e93b2cd1f30becded706dcb362ce3f45052cd0203
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
index 77a69fda97f7..9c0c77a6397d 100644
--- a/app-metrics/mysqld_exporter/mysqld_exporter-0.10.0-r1.ebuild
+++ b/app-metrics/mysqld_exporter/mysqld_exporter-0.10.0-r1.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Prometheus exporter for MySQL server metrics"
HOMEPAGE="https://github.com/prometheus/mysqld_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
SLOT="0"
IUSE=""
diff --git a/app-metrics/mysqld_exporter/mysqld_exporter-0.11.0.ebuild b/app-metrics/mysqld_exporter/mysqld_exporter-0.11.0.ebuild
index 3571c885d167..2004daefc985 100644
--- a/app-metrics/mysqld_exporter/mysqld_exporter-0.11.0.ebuild
+++ b/app-metrics/mysqld_exporter/mysqld_exporter-0.11.0.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Prometheus exporter for MySQL server metrics"
HOMEPAGE="https://github.com/prometheus/mysqld_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
SLOT="0"
IUSE=""
diff --git a/app-metrics/nginx-vts-exporter/Manifest b/app-metrics/nginx-vts-exporter/Manifest
index 4597c71be908..cc5adf43289c 100644
--- a/app-metrics/nginx-vts-exporter/Manifest
+++ b/app-metrics/nginx-vts-exporter/Manifest
@@ -1,5 +1,5 @@
AUX nginx-vts-exporter.confd 138 BLAKE2B 5276947629899f4e338324d7bbfcd7afadac604fbe9d0b9bc101fbbfc5af2bccc2d9968315abcf060932defb3a054885527dd058e6ff20594ddfb77fafc8d138 SHA512 2b41b8efdef35f4beaf8b991e77a7ccf76be55290f9ddfa1262f860dc3b57411bcd1a3332f23119d87e3f72640d23da28d9080df43902f711cb1d1bff838532f
AUX nginx-vts-exporter.initd 637 BLAKE2B 9fb8c9e1908846391ef0afc4b586f40a0ae13410c9f04e0ee594874b0434fe6fc0bab029f9d5021e5ce41a67df622bd2d7dff1f014baf25deee07d3e65a22eed SHA512 75ed5cfb084022e86058e20a7daee0c9c0fed3ee68090818e6f9d9b92dd8aee86145267c6b5309ede12f0a5103f80b74c43fd2522015ec866217e927c16a3803
DIST nginx-vts-exporter-0.10.3.tar.gz 149578 BLAKE2B c73a8cfdb875fcc02d3b7d66f5b436b9e3e8d516c8a241062721e3124452722e9e30abefd5c79e89772a480fad005d0cf25d0359dd253a39d7ae5a20495f074a SHA512 0ee97be313dc829ae9e23bc836d7e11106c4843306583ff8baa38fa10bd9d56396ae3f6ce12cad4e08a383047c3179013962284aef6e627b23b89c72c564789e
-EBUILD nginx-vts-exporter-0.10.3.ebuild 1120 BLAKE2B 34e05f1a24e62e1c036ef50f0b0b8ce2256bc84f27cc5961b5b035d3d41d7194a503337b96bc90b4a7f92489536e8e48aefa97212e78883894fcf05882082114 SHA512 f02831085bc7462d9953da0135b632dfa86e2e4900a6e6c186d60c54facfc0b5baeb66a97a4720cf94cd6a61349630d4d5d8c686d6ad1578f552c1de0ef4a807
-MISC metadata.xml 258 BLAKE2B bd20ec1460d7fb49c9a758a9078a7780174ac04050f32eec89ddba7fe5d41c7fce50cd05cc2e1eb1ea1fb2b0eb33ea567de59b01d0711781f4c297098fef93e5 SHA512 ca87b9d1e5ff8a727d456d982206d9fbd0c7a6d8e6b3675e6aa5f906e1cd0b67fef1fab7c21cf0316850850e221039e929ce4060e3a4748d349522178aa3d1a4
+EBUILD nginx-vts-exporter-0.10.3.ebuild 1135 BLAKE2B 0e91a3523bdd45e6e8000f027fb07832ef7beed1524b710ebdf01d3de8b996a326e421021763dd08815307243119a5112dfb3637be305508ff969bcb3315deea SHA512 2e84e5f6c1bb58f2ef8668f9bb75e34d3d4515991fb85996278f39d14239671c8c4948b87115a0984941f698fe437396b1322037eb6cc0241951f25b3c3367ad
+MISC metadata.xml 339 BLAKE2B 1b216bbb5dfeb52eb16a2c95103ac2d04a9d28e93a48d594de97f63c75a97d02b934bb5df0f10d180b0e0f566c82b9b9e8fa324a28a93932052d0b6954b6cfd3 SHA512 e7803bea6cc496fb46cec4293fce2d7fc3dd05b93165806f57cb695184fceea78f4df2b911da2a9344000ae2de5a9ec5982a0fc2335bb2fed8fc7f45ed6d2efb
diff --git a/app-metrics/nginx-vts-exporter/metadata.xml b/app-metrics/nginx-vts-exporter/metadata.xml
index 84e9178fec4a..444d165c1f79 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">
<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.3.ebuild
index 87d75798a8d7..749b47ad1deb 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.3.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Nginx virtual host traffic stats exporter for Prometheus"
HOMEPAGE="https://github.com/hnlq715/nginx-vts-exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
+LICENSE="MIT Apache-2.0 BSD"
SLOT="0"
IUSE=""
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index af46391a2dd5..5359b8d3aa04 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,9 +1,5 @@
AUX node_exporter-1.initd 700 BLAKE2B 227144ddc11245120e4cd32d1e152509bd48a787d6b1794cd1b3e9e7507c774199fc83555a1ee48e90468d81ecffe61413e11a51d004f51c1180f9e2c8c36db5 SHA512 bc683ef0cd04e0253376d7cfaeed4b37c0b2c5152acb6f8019f78441e7dbac154f99cc32319304aa86e436f3d046fa21201232971b20f6a6effc0b6fafd0595e
AUX node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4d9d82be36ea5e63d3b8fc2a861a61c62e2e899209f7293588e3e7532ffe52ecb9aab4773a3943168d5dd SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d
-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
-EBUILD node_exporter-0.17.0-r1.ebuild 1430 BLAKE2B 02133bdaf3b0affad833eed523aad20552e1f34782d9055aa6cb9940bc18bf6e80ca39eb46100336d217224a98fefe3adaabe535f863c3782aaf8936cca93b81 SHA512 b1ac399fdac6251c965be19ae8ad93f96a8478383e2c532d8c7e0308430ebc5892adc022e8717a821007fbee2e67b5d904be68883493999bd7d83c5a10121190
-EBUILD node_exporter-0.18.0.ebuild 1439 BLAKE2B f8979790148d599ed492b91fa29eb17aa7cd762e20b2691b967cfb34b9a88acb78ad87b92f411591bb007e2d59d1efe7383ac9a2935621d633cccc9a95de31f5 SHA512 dbf6b057bb2768be849b27e209861d93adda6917340d0af6f202cc73e952da124d3a8ac26397363733943db4ba3c0e019c96914fdabe468e4c8394d44856753b
-EBUILD node_exporter-0.18.1.ebuild 1438 BLAKE2B d92140a1e5c581b08541cdbf2722cc7edde6b1dd3fac549825d6ea05b0ad3b245e584410561e5df65b55d34068db6452a7f9724f25a5f328c66031b39ed5a654 SHA512 27ff3ae013fa757447229b94d4086e98332b384c84a7347b79927f68e9e5849c5b61efe7c75d984d55c034e70163cb5d5fa22e63e46263b957a730251f7cbab5
-MISC metadata.xml 334 BLAKE2B 4152458bd76dc5a5150cf8ec6e6b967d88b89b85c7145c158d981c92dad663df3259b2ee229298727e862139215e69ac97f9aecf3b66c182a13fc9bf6e651057 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e
+EBUILD node_exporter-0.18.1.ebuild 1452 BLAKE2B 9bfd50a37838b40c36a94197ff5cd39ef38b9f553d2fe3169bdf33cbd2055f40825fd0e4645369fdf0c375d15fd82e62885316b5772556db26e4345d8cbe9149 SHA512 80791542bbbdca7b3ec58f8f25d3c84a13b52809d1981af94bb91cdf5edc0f613e93ce53c4b71da8d805a0f19935bace4c941b4f8d4f20e82e70bea3eed37699
+MISC metadata.xml 337 BLAKE2B d9d866eca2162bd2c647a92d7c2c21eea95e944d81f9f4eb0911f0b111ed4eb62f2bf2c6042afe1a12caf58694ac692498923f9da2733c4fcb4419946e3eb613 SHA512 9a616d85dc1a26ce5bdd84f6a08f5cfaed1f273ee62d3fdec395507b0cfe0cbd23db13c8380671caada62f81e202a2a9ea4793dca6b6f6a88fe6dea9bcf7b8c0
diff --git a/app-metrics/node_exporter/metadata.xml b/app-metrics/node_exporter/metadata.xml
index d758c8dfc417..afb62240e966 100644
--- a/app-metrics/node_exporter/metadata.xml
+++ b/app-metrics/node_exporter/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://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/node_exporter</remote-id>
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
index 661535b60380..05bfaba831bb 100644
--- a/app-metrics/node_exporter/node_exporter-0.18.1.ebuild
+++ b/app-metrics/node_exporter/node_exporter-0.18.1.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64"
DESCRIPTION="Prometheus exporter for machine metrics"
HOMEPAGE="https://github.com/prometheus/node_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
IUSE=""
diff --git a/app-metrics/openvpn_exporter/Manifest b/app-metrics/openvpn_exporter/Manifest
index 422fab047198..80630a6ff1a4 100644
--- a/app-metrics/openvpn_exporter/Manifest
+++ b/app-metrics/openvpn_exporter/Manifest
@@ -9,5 +9,5 @@ DIST github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
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
-EBUILD openvpn_exporter-0.2.1.ebuild 1537 BLAKE2B 54cbca7bc2b9ba49ed8dd4bee3e146a4248cc24a91a23bc69a92dbe35aeaed5a1620e50ba08daf5e03a44f621f82766437ad8569f23d3b4f8f1f70a3375ac875 SHA512 d6129d579226e17ba150d9e767c8d28ef1f87411415bb51aafb349469709a5965c49c85ebefa56bcdc8e84fe7ee596a8547d3de3678c1f304f22bfc7a17fa290
-MISC metadata.xml 255 BLAKE2B 6f57419119983e5e14d4300e02de7f4c7dbe08cdb79a9562675417518e92de2a6ac16a1a553c4b1c83cd451e5df8da68d37afcfac5017ac4a4ee56b473f893cd SHA512 98072789b42ac8c9e0b62535ce41e164c615b06543ac24f1f24d6d2a83c548fbceec4c01fba7d095c7a1e6499c9f41bd11c12727ab9b235ef8f569372f9955a7
+EBUILD openvpn_exporter-0.2.1.ebuild 1545 BLAKE2B 6745505d144b00a78e8e3991a159899842c82f97108e04b9ff00575626bec8668877648989e3165f402dce6b13a57fe65dce4a484d7fa2e457d3fffc4cadd678 SHA512 4a85121469f7aaa1175a22a3dee8b0489ef8f201305b01267f5e1b3671c8ce0bd009d3c7fc2b03d0ee0bf58dbbf6f69be16cfc743850b81840c1355e2f2c9bed
+MISC metadata.xml 336 BLAKE2B fb4eabbee6ee8a353c2024ccf23b68482a4af72fae31d6539fca9680c3d0113f56aa740abb1b545f6a607e7618c222c54e35ff74705eb33f60bb9b49e3a926b6 SHA512 aeb14e5633d68c01ce32750f3557bedce69622115cead0029dc981f13a0cb67bc00100d7c3e6b668871579f71e1f73606084f0b16b6920df4c6b7321db60f134
diff --git a/app-metrics/openvpn_exporter/metadata.xml b/app-metrics/openvpn_exporter/metadata.xml
index e8914fbd6b33..847f9fcaf827 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">
<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
index 7f7dc1158ef8..78ac7cdc785c 100644
--- a/app-metrics/openvpn_exporter/openvpn_exporter-0.2.1.ebuild
+++ b/app-metrics/openvpn_exporter/openvpn_exporter-0.2.1.ebuild
@@ -23,7 +23,7 @@ DESCRIPTION="Prometheus Exporter for OpenVPN"
HOMEPAGE="https://github.com/kumina/openvpn_exporter"
SRC_URI="${ARCHIVE_URI}
${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT"
SLOT="0"
IUSE=""
diff --git a/app-metrics/postfix_exporter/Manifest b/app-metrics/postfix_exporter/Manifest
index 5d052d65b69f..dec6bc47a7f8 100644
--- a/app-metrics/postfix_exporter/Manifest
+++ b/app-metrics/postfix_exporter/Manifest
@@ -11,5 +11,5 @@ DIST github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
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
-EBUILD postfix_exporter-0.1.2.ebuild 1800 BLAKE2B c4fea274cf1304c29cede6c6734bcb6495c2ca02caa30babcc38c2b23e6c538855009233714cfe69821556858ea7ae5aecfe1c87c2ee9da55fe4bae467324926 SHA512 18552e1caa8a58b84bd91750c1255ce2e93d2e5bbafc2b894c8716a34779660b70f439229227456352c35d5959c88d4ecd322ca24dc730f1365507981701c2fb
-MISC metadata.xml 255 BLAKE2B 1132f0657024f17717e5191a4992978685715f9abb96052db6399468506deaa85454efcaf58c7dcebfe5e1cf8948c767a7b001832d50c7d9dc162b0ff1395361 SHA512 36fb59a02d322553d6bfad2deeff884cc782c54bbb01a3fb344767fb43536905c43950df368e645d08ba9c48f3ec13c05b1d3c827fa12581c164623d2c174d73
+EBUILD postfix_exporter-0.1.2.ebuild 1808 BLAKE2B 4edaf4370c38ed0e784d3bd7626af1557d8cc09770d7781984f0b8eb8c8757c387b60b530a64f130d4ab0bec83fbd6df5e5917ac635a7eeaa4ed0c05e3bdb11f SHA512 9c994c19a7b6ea0202ad8ac64a09a5e7037caf5df08d5307083ac1595069959bb1069db45d51b40b0cef348455439ea485f377f13d7cd2b19345f82f8f3f7c5c
+MISC metadata.xml 336 BLAKE2B 71c3ba53cd28d795d4aaf5e810c09b7d146ec2b9c2aae72ef60894f642bad23308fa1547e47f41dfcf15e51a0c53a11b293253eacee9ddb144342fb6f62f18f7 SHA512 32bcfc730ce355f7fa8ce39d184f2372082c253125fb7b64b8e857d39775e4b0c9fe27f6cd92aa2fbdb6d64eaa176b222a02e9af3a02a6d5bb79a4c6e4fe432e
diff --git a/app-metrics/postfix_exporter/metadata.xml b/app-metrics/postfix_exporter/metadata.xml
index a5b8db8805ee..3cf59ee3b3d5 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">
<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
index 4eeeb08ad702..0ee3baa8187b 100644
--- a/app-metrics/postfix_exporter/postfix_exporter-0.1.2.ebuild
+++ b/app-metrics/postfix_exporter/postfix_exporter-0.1.2.ebuild
@@ -23,7 +23,7 @@ DESCRIPTION="Prometheus Exporter for Postfix"
HOMEPAGE="https://github.com/kumina/postfix_exporter"
SRC_URI="${ARCHIVE_URI}
${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT"
SLOT="0"
IUSE="systemd"
diff --git a/app-metrics/postgres_exporter/Manifest b/app-metrics/postgres_exporter/Manifest
index fb8cbb5f4817..2c069087b678 100644
--- a/app-metrics/postgres_exporter/Manifest
+++ b/app-metrics/postgres_exporter/Manifest
@@ -1,5 +1,5 @@
AUX postgres_exporter.confd 61 BLAKE2B ce1fac504bd44cd87bec492b2fc5ccc8fc7c1f1bc19b44d7c9572025f82c365655f4269679acf2b40adfbe30c624d59b1a72a2a802c50310ef3259d0c46264b4 SHA512 8792b42a98f807aab7f33ef2dd679f79b14afa3f61a41ac86e9d829199a14b1a21d116c1f921a646c460ebb568591605272fa028ef99c66d16b529ce9da66c54
AUX postgres_exporter.initd 560 BLAKE2B 2a813208d623460930d0e2288fb4102dde6add57bd9e83caa60a46cfb4770734bfcfd88a29713c881a36f2d1e20ff0c8e3ed47a23e024d865cbcc7d6cddf99ed SHA512 7ab3c8ea837e48ee776e12254a6c968ffceb6fa3f9f994aa44897f3a8fe6bea3d5ce29e8b4f85b626b690b50171feff5901952cbbad28ccc0e49333496ca7c87
DIST postgres_exporter-0.4.7.tar.gz 3699251 BLAKE2B b4232858464ae30f714dda58a414ec343aedc5972b44066aa45a85cf64d98ef40925ca77956c218a3962e22a35f3229795cc730fec9fc10565a43fc9e827200c SHA512 81afce765830a5c16597f0ac9a95d21466edb20e40cff8e26079663db75f0051a6e0eb4ff828eb825b51a6fc52b3b534e0f6ffbb2ecf2c94e2ec8656de4a2ff6
-EBUILD postgres_exporter-0.4.7.ebuild 942 BLAKE2B a97fe2eaa63d04df76749b64a38f83cd65efa84eb9868ccfabdfde601f58509384f90df305aa9e30c5748d3e34911a5881a91c7dda5c48e4b3fb0404eb1b92ea SHA512 17b42694342236fcdae3c042df8c029877bba1ce2759e6e574217e90383160d649251c60b9f73b6dace9a1e1766d44ae45a34bbb24a0010d6d8969eff56f9dea
-MISC metadata.xml 259 BLAKE2B 1da22e4138484c1f7bfee8247821b2713ae5b85e6e5a49eb5c9792eb0147e7bbb5939a6f9ebf3eae066ceb74f8c8dd91f8245e1f9e258b7a4aa56dda51d64df7 SHA512 d09f331ce43bb316cbc5a5a2c5458cea004a82e0ee214678146706a19b2eea64a30f8a2f08c6d7062189c0eb3287b2615b750fdcfd840bed935d78aaa1ae5622
+EBUILD postgres_exporter-0.4.7.ebuild 950 BLAKE2B dbeaaf062651cd8feff8b2c779d9864b64941c4a8347eb2600d0c30e461edd34c193c3f7ab8a8bd281f2fd94734f223d0e7481353108874596c7c238c8377a3c SHA512 a9940af15576cf58ede02990b9cc44da8e6a22de535190d6e45e8fa25495169cc06bd402ef75a9725a599e734daef84420eee12b6a2cd56619f03469b5612208
+MISC metadata.xml 340 BLAKE2B 441c5d6eb44d36ab70fb392e57009f6fac06cd0d12de2c8bd9506f03c62ff61aa31cd30a7d8b036a5e99741253a4d920fe0c0da69506583ce6bf36772ea5635f SHA512 f70f589802acbacc7440260370762dc1b078eeebc4aca949a786450c390f3c649c2d3f4623e29be5b8d869394595d2d44957e329bbdb2fd5cf2767049eee9523
diff --git a/app-metrics/postgres_exporter/metadata.xml b/app-metrics/postgres_exporter/metadata.xml
index 5d382f958d22..974959359b57 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">
<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.4.7.ebuild b/app-metrics/postgres_exporter/postgres_exporter-0.4.7.ebuild
index 09c01b139aab..22493575d0b5 100644
--- a/app-metrics/postgres_exporter/postgres_exporter-0.4.7.ebuild
+++ b/app-metrics/postgres_exporter/postgres_exporter-0.4.7.ebuild
@@ -11,7 +11,7 @@ KEYWORDS="~amd64"
DESCRIPTION="PostgreSQL stats exporter for Prometheus"
HOMEPAGE="https://github.com/wrouesnel/postgres_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT"
SLOT="0"
IUSE=""
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 22a672961994..b568383ae451 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1,14 +1,6 @@
AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
-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.13.0.tar.gz 15193225 BLAKE2B 4b7b5cffb916bea382e741969de5e2a97cca89055e5096d1042fc03d2c63efb95719e394c1abeeed2351afed797065d20773693987384811654bdc32b57e2c96 SHA512 1c9ae1cbbe4e96d00c804a6a891c0b93a36c633499433a7b5f88a80cba98874bb01d2a10bd9e3b42a2a4d07580e4d16e34f50d5e07636cf6d7d7c52c967dafc3
DIST prometheus-2.13.1.tar.gz 15249891 BLAKE2B 35cd3c81bdb4f3a783c2ab1f1318946db5b25c94496fe351739a59259a726bf54d418d6b29efeff44c8007353ed63368819ce89ffe6a4f380b7ae216da3c4d63 SHA512 aed3b44db97cd2a67add64d13e950246b25c2b459f6b1081a6c548862c4e85c055254a0dfb94b08ac85f83dbbe30afceb1c54a8ad6f7ff1367aeb6af6d270e8a
-DIST prometheus-2.9.2.tar.gz 11477683 BLAKE2B f0c18c57ff0fe292710174a91080a84ecf0375b4335aacaf4a8e32c842a9346b9fd48888ef8a19a597511c57eb8af7f90cca57d0cc51b9de4558c3f22953d165 SHA512 4cce1827580e49b1659ad492de946a81694c1dab90e079f3f0e56c1991254cf4ecac7f052aac75bf58a0b95d3cf4daa8c15b3e8305a3c089570da40c44a8ccc0
-EBUILD prometheus-2.11.2.ebuild 2006 BLAKE2B 9eb972c513982c3e8321b87490180b95048e4cb46aa64f879735f3e3c729d742cb3d2ced1873a6a4c24b8cab7a94ca95b5d41190a6a20a26ee778f63b194d770 SHA512 89b982df1c665375c9eaa9b43373ae725fec9d72b70087615f72f4c017557d6637353cdd57870b6eac1c5fcf3a1a1ed98c8b80d9c00197c8bfce31f6c14877ec
-EBUILD prometheus-2.12.0.ebuild 2006 BLAKE2B 7c5210d97d11e7552736f856d9ac635128cac842e2d62193acef410c44eb5defc54999f51231f3b4c9ab06ecaaa82a99bfaa447655c46606a57eb46f6d4a2b38 SHA512 86bb69a89c4449e173afb456c48d54647e1628957cc538cb95cb9eabc0f817f4afdd37c50b697f03938f2b9e93e93345d45813902119d122b85f9f98174a131f
-EBUILD prometheus-2.13.0.ebuild 2006 BLAKE2B fcace220157bde3365775b5f938a06c8b80ae4f344129c1015027b8a7f123847acfc0b0ee1468303db5873f7a1090deb1d20d840e6d60e1462693a702c455dcc SHA512 29fc25c35cb3a71ddf47ad3efb5aaa65f8196fb8a89c9a4be9371186a72daceeb07858899e1af05c996af56f33d5c9ddf927db8695675bdbc91ea73c9bbbbeac
-EBUILD prometheus-2.13.1.ebuild 2006 BLAKE2B da2448baaa817a021d2fb1c1a072649ed764b45ce662e7cdb457d020cb64a088def7c0437992154ef0c785399f9da5bdc0af69048e4ee24a2a2d7b90f2e02496 SHA512 c4b8bc6bdf2db8b3914f663b78e6c8a7d598a4acecfac01f5c35c3c95cc74d5374880436942e0f52a27739461db0fb11f9130411c97ccc070d3fe670ce8b8fdb
-EBUILD prometheus-2.9.2.ebuild 2005 BLAKE2B be44fa8627cb4ba1be2f6696bf8a7086bdf720508bf1fd47d451f7fcc0d54b7f97e6ba1c46260a71dca1a18fbca3013ae861cdf6437c6d9a25140e731d10e5d7 SHA512 937cac2265388d791b486b5131692f3d8fa30bf0fe20d76fe35f0ea44087a9fb036a5557a3deb70d8627ba4783525ce8510f9531190a097ffea6f91834161f7d
-MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
+EBUILD prometheus-2.13.1.ebuild 2030 BLAKE2B d92e41af8c98efc93b325177f0e04d6e56de70d322f917edc586e9d07badc2ea00f67e34ef3e337f0c988112098567b9b223aa93dbddf4db9ab040a0bf919450 SHA512 f40e14d641388fa1b7a7e73c3d2c4d105037f186d4c66378651580b0a677382d24b1747f5a664c698756f01f122b4fce7bcee5d7847844b26fb1b665e993e3fd
+MISC metadata.xml 334 BLAKE2B f35628a28c6087863ab4d96e1a4a3705f470845fe6c963c47457caf85e14cb1f99938b1b78bad2f87653f525c154f76c8e0e7b18d6f21d2cf10016eacc565984 SHA512 1a64169c81388848bb26d32e8706fb6d4fbcbde847b1e075f1eee297d5fd4b35ecc835e9ed16ac79825f8c17efac78271e6c8735809a57a8b4ed73b5a789300a
diff --git a/app-metrics/prometheus/metadata.xml b/app-metrics/prometheus/metadata.xml
index f4e8d75f03b9..75f83d929039 100644
--- a/app-metrics/prometheus/metadata.xml
+++ b/app-metrics/prometheus/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://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.13.0.ebuild b/app-metrics/prometheus/prometheus-2.13.0.ebuild
deleted file mode 100644
index f2b203a01227..000000000000
--- a/app-metrics/prometheus/prometheus-2.13.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="6ea4252"
-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.13.1.ebuild b/app-metrics/prometheus/prometheus-2.13.1.ebuild
index ee39a79d382d..d9614ddc2a6b 100644
--- a/app-metrics/prometheus/prometheus-2.13.1.ebuild
+++ b/app-metrics/prometheus/prometheus-2.13.1.ebuild
@@ -7,12 +7,12 @@ inherit user golang-build golang-vcs-snapshot
EGO_PN="github.com/prometheus/prometheus"
MY_PV=v${PV/_rc/-rc.}
PROMETHEUS_COMMIT="6f92ce5"
-KEYWORDS="~amd64"
+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"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
SLOT="0"
IUSE=""
@@ -36,13 +36,13 @@ src_prepare() {
src_compile() {
pushd src/${EGO_PN} || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v || die
+ GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build --prefix bin -v || die
popd || die
}
src_install() {
pushd src/${EGO_PN} || die
- dobin promtool prometheus
+ dobin bin/*
dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
insinto /etc/prometheus
doins documentation/examples/prometheus.yml
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 c8794cb06fb4..47d7d0a32c5a 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -5,7 +5,7 @@ AUX pushgateway.logrotated 95 BLAKE2B 78db6689bbfac484b13a3444ebef47180aa94bfa6f
DIST pushgateway-0.10.0.tar.gz 4776112 BLAKE2B 000711293dd2afccd77ec1e30d68bef50ce57e0113baece79b31e2a0f2d6215c4a36e147166f699a41d58f2a30a1917057f9389ae23858581cec6250664d4850 SHA512 0f66c1cf3d93a9f56dde0f10b359c7a1187ff702b418ed43d29bc18f2feafea582c98a537e536969277ee57a255b04715892e4f31244bd822522f12aff1b2a96
DIST pushgateway-0.9.1.tar.gz 4743766 BLAKE2B d0c605d562b64782c6a90e82efcfbb3866e017a61f8165632e3ee87ca1ae677d2d59192262b0086e2dd4c4210236c40666f5aff3203a1fcc208cf300b82599f1 SHA512 a3f10ab2b3fcc5c9c14b761b6bd12b9e885e5b948c540b9bd6cc0c825ef7cb6e787fcc94b204bd15fd8b2690242b43a77e5b0b85e69ddf832d0dc3ee668c7fcf
DIST pushgateway-1.0.0.tar.gz 4780753 BLAKE2B 76dc24a6130809d6f838cc6ab08ab522d8a381526688b072277e31eb6ff4fccf63bcf4317512918bf194b0b409b4f52d76d2f88fdf4297c22567420ed24660a9 SHA512 0662b3caefa053c8478b3c3fcaba3298ad69d7f7f195acc3b5b932d1f2004cd3df0276156650b0a6022dc529b4b53c2ee4d33f510937c98a1ca4c95e1c087581
-EBUILD pushgateway-0.10.0.ebuild 1345 BLAKE2B 56f5ff2ebaf1ac33a415bd47b52b2a9405cfafe797685ed3e3adada7c1f1fc38910e291f8810efd81286a1199659c72f90650c74d67ce1761b4e924a3647922c SHA512 f39908baeaebf76f4f6c90cd066dca2b4ff7d81b1a3f52363b29f40f7ccf9f301c522345eac870aac03ce9e8b9de1f92d58c4dfb68e28c7c94436b3f0e58be2d
-EBUILD pushgateway-0.9.1.ebuild 1345 BLAKE2B 7d02e607f7b44a8f586efd4998c3b6657f7a4d4f90dbf2e47f5c7f055440ee576128d7119f2aa46f3300e8c4c06be7c4a50591755ec9912afbd8b9acd15979d3 SHA512 0874eebcdb063c7e8f3bb632d71b67363a8c093f85ffa8834b0248079bc1471ee3372e996daf83f7bb7a7e4073c93cbaf547f224e03261bcde25ed1cc9ae9e20
-EBUILD pushgateway-1.0.0.ebuild 1345 BLAKE2B 2f32b565c77474a19c43a976dc12ad48fdea9111ed966bb12eb4888801ace7c5257d7cd778f38877c75b7a2fd4ce464853648d6834a94617156a25068af293f9 SHA512 c681fb1a328712146681fe14e92efaab8c9fcfe2592b38cf2c264ffa75d794fc0a5aa2d0be2558627acea5b3f85c71ed5c49b60fd09a5a9331033744307ec646
-MISC metadata.xml 437 BLAKE2B 904f35ea9287d25e5708e450715f8719004a5349ea871e9730fe36a98257cd0ba2417ec572f0d26a8d5d2de5629bca2d1b81f3e344bb8e4a52653175e8df2f3e SHA512 09284843912bc08aef77485911289fe1050f7d42e726e555650ad73b3ca51bcb62af90ccd69c3529bbdb7373b9ec317e0afd74687b84b123ac4fbbf2a3de9d7f
+EBUILD pushgateway-0.10.0.ebuild 1387 BLAKE2B df2eeeecc945598417c4ca9c026bb3cabb4103371ee5bd7b7b4ceb27d193daea8b96b26d270f32893ce7ee351df6d2c5b70ccb92c808f357331a8d47427e3c94 SHA512 2a2fa16afa81774a05ffc9311435d7631bf373cfafc1be20e44b633ce1bb3c48e651e99542adba53dc5c09c2f2121c9b38ead473c8fec9696245cb3a6ed66156
+EBUILD pushgateway-0.9.1.ebuild 1387 BLAKE2B a3b8be581efdf617ed04265be0bfe6e871a9758f2a891d26515c04b595dc1ed3f51bea584bb3ffd40bb29dc12371e9c7712e0666f0ceb34aabdaccf2e501f103 SHA512 6825836daf611ea929c03c93d43565f7300b16593daab81f19afd7b1c9e173f194ed582434a48170423c008ee821e32bc508a146f598b225b03cd0d02d9eb7f0
+EBUILD pushgateway-1.0.0.ebuild 1387 BLAKE2B 5d0e705c5f5c4b2a47543d62b96ea1ca1ad03d12136b7e0044321979e798169c68f6ebe7b239daf3731f39d3db0d97174e1c5743791e9357e851dd155604475c SHA512 a68fc494b5fb936f5748b518b722179992626b12cd0f43e7d097cdb73dea2d29f3114f629273132e812f6a3ecb73f99f5b8b2ff3fdd0fd7ac17640c1e33ffa97
+MISC metadata.xml 331 BLAKE2B 4b07a7e72e94f5a764207f0e59f1a6e8f578b83f761f2cf658ef3a554e6d3fab9725445b6a2a8adc2de990f4a156c14ae9c5d10632f28ab53d995ce4ffc86ba5 SHA512 7d59c6fdec106a6708a76e44714ff47a947fe2b85839c96dafb2768733bbeb37d04a3d936ee8f371f432055f49f54fc904ac1a214fa96da6d4a961a6fb81d599
diff --git a/app-metrics/pushgateway/metadata.xml b/app-metrics/pushgateway/metadata.xml
index f233ac35e254..5271b93ef23e 100644
--- a/app-metrics/pushgateway/metadata.xml
+++ b/app-metrics/pushgateway/metadata.xml
@@ -5,10 +5,6 @@
<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.10.0.ebuild b/app-metrics/pushgateway/pushgateway-0.10.0.ebuild
index 5ab0a518e0de..8632efe3271c 100644
--- a/app-metrics/pushgateway/pushgateway-0.10.0.ebuild
+++ b/app-metrics/pushgateway/pushgateway-0.10.0.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
}
src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME #672926
pushd src/${EGO_PN} || die
mkdir -p bin || die
GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
diff --git a/app-metrics/pushgateway/pushgateway-0.9.1.ebuild b/app-metrics/pushgateway/pushgateway-0.9.1.ebuild
index 0ec409e6c76b..3bda8444b9c4 100644
--- a/app-metrics/pushgateway/pushgateway-0.9.1.ebuild
+++ b/app-metrics/pushgateway/pushgateway-0.9.1.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
}
src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME #672926
pushd src/${EGO_PN} || die
mkdir -p bin || die
GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
diff --git a/app-metrics/pushgateway/pushgateway-1.0.0.ebuild b/app-metrics/pushgateway/pushgateway-1.0.0.ebuild
index 102cff399d1d..7a19aeed4f08 100644
--- a/app-metrics/pushgateway/pushgateway-1.0.0.ebuild
+++ b/app-metrics/pushgateway/pushgateway-1.0.0.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
}
src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME #672926
pushd src/${EGO_PN} || die
mkdir -p bin || die
GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
diff --git a/app-metrics/rabbitmq_exporter/Manifest b/app-metrics/rabbitmq_exporter/Manifest
index c5b93dac53f4..dffff40ea432 100644
--- a/app-metrics/rabbitmq_exporter/Manifest
+++ b/app-metrics/rabbitmq_exporter/Manifest
@@ -12,5 +12,5 @@ DIST github.com-prometheus-client_model-f287a105a20ec685d797f65cd0ce8fbeaef42da1
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 rabbitmq_exporter-0.29.0.tar.gz 36950 BLAKE2B c4e10acb4fb610725dfc82c227ccf79ca60ffc30cd6c3f4ff741020cd7d2a757895af046bc2ded8a9b6a8c3fec870abb746e0f363e12d5221ccbce4b0fa6ca3c SHA512 8806e4a0c62126ef3575be2d558663165c04bf9b94a865d078e1ca92c0bb2d4ab057f6c37993236ab2327c1932bcf155c90ce9729924a06066da74e68086485d
-EBUILD rabbitmq_exporter-0.29.0.ebuild 1865 BLAKE2B e270e1f73f2a81e93cb141ff11e78363e26e21939bcbec21b69d2469bf185ab682456a992b68ce2f25351dc9928891eacf6bdf4682142ee3daf83da4327a18b3 SHA512 f37b375ea9b7e61a474e8f193399d1ea69794a0b4ccd9e7a5cd41a371d19c48d19196d07baad6b6d95684be0b2cda1640ce391383aee799f36e162ad1241e3a4
+EBUILD rabbitmq_exporter-0.29.0.ebuild 1873 BLAKE2B 1cb7f995e87d961886eb707c55a8c4bb0823291301c0da860d486392230dc285d0c34e236b3590f1069670d238e5ea04cb6301fb0e19bd8cab23f74e617ef750 SHA512 07d198a133ffc1158411657fcb38be08f9aa4552cee6724ce169c27c14c2566fd0523f5044582acdd923901e63aa04d2ad92f51b6ce0d8f9f8467e98a50e1cc6
MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0.ebuild b/app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0.ebuild
index 6f5c5c9330ff..db1dbce3de09 100644
--- a/app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0.ebuild
+++ b/app-metrics/rabbitmq_exporter/rabbitmq_exporter-0.29.0.ebuild
@@ -24,7 +24,7 @@ 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"
diff --git a/app-metrics/snmp_exporter/Manifest b/app-metrics/snmp_exporter/Manifest
index 8d6f3bf996c6..605244cfd56b 100644
--- a/app-metrics/snmp_exporter/Manifest
+++ b/app-metrics/snmp_exporter/Manifest
@@ -1,10 +1,6 @@
AUX snmp_exporter.confd 98 BLAKE2B 3058ed314dd66772e0d299f135cc1ddb4f3c1f47403848fd249e949173430673991a12e794c74bfb53d0f25f313513d2d70c03d589b6d947659d03e33e6dea8a SHA512 e757dd327252ffd29a65170837aea147128d8effee3d88ac4f0474efffaa10748b51bfbecab999605284030a3026b13ce3ce2c1a7ec347a6ff191e44040d84aa
AUX snmp_exporter.initd 591 BLAKE2B 103fec1c2e4ad46bf86893faaaf23bd64c7f22ecc905b059e31199c08d610d58852f678d18826cb06f51beab65c8777f49a05a005ad35b77dcfc3e5eef398926 SHA512 903fbcf43a737d2823ab74e954f40134a64414cc1e79a14c78ad51682baa52c3443e85e94ec1abb294753c93a55483c148239e738b72c03bcdc7d4a595580f41
AUX snmp_exporter.logrotated 99 BLAKE2B b0e459df102728238b137443ced2cf717ace780d83caaa7f18117ca8605453e8f325a48f8a4375956209feac210dc452da9cd0a267cf2d663b64f0a2c80f1eb5 SHA512 c1e1264b5a5612b4794c49613b79826245d3d31db65c1541c3ddfb41872993e7039fb0a84f25260d92a78e8e20005560bdd5e41ee6373e85f8f5e866726c9af4
-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
-EBUILD snmp_exporter-0.13.0.ebuild 1394 BLAKE2B 5bf4dde1a95b79892dd6ab7ebd26e714906e5634a9cd901cbb86b58dd03f4053c955294bed84cc41e4f3c23fb415eb9ae06e20632d101aff4145001de9e421b9 SHA512 8b2ded50a44003041fe7fc0ecb6bea1ce4f21e45136ddfe3283697dcda5f26ad85f45bfb2c8a90e77226f5791d1a091f0725b91db716985eb886049ecf62bc4d
-EBUILD snmp_exporter-0.14.0-r2.ebuild 1562 BLAKE2B 03c30a5877954cf964d64ca970cab73169d4fdbf072a2c8f9dc3125855767d6b7febea3a4591e72619de6ab554908bd8b891b8ff2d8feafac6a08908aef5d1f6 SHA512 1d5dd0f289a0833ad4ab8dc188b1677bad9e7a4ddcf363e92ae4ed4613ab4b86c443b70080aca3a66f9c99add199295c439a5f8128894e033420d47016abbedf
-EBUILD snmp_exporter-0.15.0.ebuild 1562 BLAKE2B 8585f5cfb843ab34b345a1d1cb2851edf3c45ec907df0a08f7c983b84e5bf0a9e78829d69244d2d0c8e5d64689d9e10977b81f165e4de222989ee645ee4203cc SHA512 d54cdc2728b13ccabaa6f7b17632b927bf8d5fd55b791fd9bb53fefc633f6c87ef5005ce8fc39e043d9ef91fa9f54569a7268bd99f045048ef3340949551f40c
-MISC metadata.xml 334 BLAKE2B a805d1d3f519c6ac1ef9c7f2cb5a0947740e6fe9a37fc77490e2011a27dae8ff981b3e482a55c117553eaa60f0e3c8d017d867c4fe082c8ebdc4e4bdac22f750 SHA512 7fd3e4314022bf2ff86bd01f335d5c4402676970b9810575225aff3d40bd5bdc9ffc27b438c880dc0a665cf3873502b969dfb30644b3c106278fd353820d6599
+EBUILD snmp_exporter-0.15.0.ebuild 1576 BLAKE2B d5d657d3898b8acac133f0651e3f3e457909d1eb0b2f4840e727e40d7051e01368f68063f9e27e5addd4b4e357c263bffc612462e06fa832d87de3dc32458b27 SHA512 6fea24a17f4448f1fc2c02e28ec9e6a9345e4f7f2a2f1c5f973b543292eb4899ce262bdd2d08893141fe2aefa026ca7a72a415e78de792e711484be90b31eb32
+MISC metadata.xml 337 BLAKE2B 9406f48bba3dc818fa7edd066a951edacb9e15afd64fe59765cb142d4396103bfeeec8d55482a3ab90d12e53c7e105a35967bb90771daf6544dc32e4390bdc1d SHA512 051711d284e01bba8751427fc6c17f64b2b276ce2832bc7af22d55a76835164e7cbbfea4f2162866c2791695100bc750a40f11771caceb65fbce04cc32361037
diff --git a/app-metrics/snmp_exporter/metadata.xml b/app-metrics/snmp_exporter/metadata.xml
index 9ea37fba673a..7be2b809f629 100644
--- a/app-metrics/snmp_exporter/metadata.xml
+++ b/app-metrics/snmp_exporter/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://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
index 1c01a04e3bbe..aaf7c2142f37 100644
--- a/app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild
+++ b/app-metrics/snmp_exporter/snmp_exporter-0.15.0.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Prometheus exporter for snmp metrics"
HOMEPAGE="https://github.com/prometheus/snmp_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
IUSE=""
diff --git a/app-metrics/vault_exporter/Manifest b/app-metrics/vault_exporter/Manifest
index 7f67aa71e4e9..f0bc59ecb8cb 100644
--- a/app-metrics/vault_exporter/Manifest
+++ b/app-metrics/vault_exporter/Manifest
@@ -1,5 +1,5 @@
AUX vault_exporter.confd 58 BLAKE2B c34e7aa384449a3cc88592055f16111b5c23a8479cd4a8029c88002584d23c3d1bd490acebb3eba676637ab01ff733d057ee57e3a38ca7346072441173569b4b SHA512 a77f0a945ae0a42308a4d43e5de1eb02221ceef3bdd36f0fb716a7784843c35f3b00cee88fd45d477d417b297b532fc6953bf71cc86a7112bf45f872ba92f396
AUX vault_exporter.initd 549 BLAKE2B 1a8a2a35af3c851318e461176fb87f9660b5a060238cc02edde976532bb7076fcb6a100ffa196224942e30149fda2e8f8d9a0dc211e5d57fce39a8d5645b65d8 SHA512 6470aec28a3a6ffa574dfdda2947b1d16d4255d7e7921d88622043b1dfa6b756427f98c288d3437f9f06539ca156267bfba6d03c6030259281c5acda05ba4dd6
DIST vault_exporter-0.1.2.tar.gz 34555506 BLAKE2B 53178f8a16fceca442e38a756081cca438abdd786960de3dae073f3ce5f2ac2c5d06684ec56e48a2057b4a2161a25527b41c36d3705a054f0bae37357f33faee SHA512 71941c17d7146861a09ed48289efe15143d3fba18e56accdfdf977bf4443bb650e7201a4870b63793d372dcca8f53a04131c12803f019efbdcac9e0ca8909cbd
-EBUILD vault_exporter-0.1.2.ebuild 929 BLAKE2B 6d1853fb6a00503f05b69373c9dd96b03d36d2bb72d0970590cb85ea707697aa43768c91da59226fa6222d9999e82a3c447b7c5a6a57855644f343d87a17b549 SHA512 bddd7ffb3c662a6f340740bdc4bfcd7748c6863d959708e9b7ce644edcca66c23ae87e8f65a65f63381159bd7b6abf50808484f8520e6412cb5daac75001276a
-MISC metadata.xml 256 BLAKE2B ea66ae41b13f60879f180ab759c5b312f2ee7811d7210cf750d7c87a8180a041714e024eee1d31f1a75d135b2e45ab8fc5b01e4b6fdfd282b875342d96345b85 SHA512 7852a6f956e1a0d1ec5b40374da17278faa67b6626080576b4dc72717f35c57ce39b188ba4a3b94bfc7301bca6524c7207fb6c8fd48946969606ed9ea8bd0fc3
+EBUILD vault_exporter-0.1.2.ebuild 938 BLAKE2B 9dd73dfd6544d590b63732b442e7e48429b635c0d470aee9b8905c5107fae33aa9458ccaf53b1a783965826d1295954d1ce5c55971eecf15515841a45de5a722 SHA512 9f09a7ac019fe2c9fdbbe36e7f117498ff5ba616a61c6603778a0d731594f81549113ff7de837f1e55389c5fa2816307c8dcc2e0f5343a4118a07516b356a61a
+MISC metadata.xml 337 BLAKE2B a93a43447f42d1396a432970d6e557ffa893d8d04eeb4ea729356c1c77b7005f1e8635d496abbc3796ec5ef5742fe29e6f04f28a2af09b1d666d155f8a10e148 SHA512 4f4c253f23220c36ec735730a5676ff424b05f8f769e2373a720df526bc9088949eb69a3b8b1791ff5733021d3ec8b48f80518bf927d6c0036a414cca16a2808
diff --git a/app-metrics/vault_exporter/metadata.xml b/app-metrics/vault_exporter/metadata.xml
index 4eafefdd6820..d6d08d4ba9ce 100644
--- a/app-metrics/vault_exporter/metadata.xml
+++ b/app-metrics/vault_exporter/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://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>
</upstream>
diff --git a/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild b/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild
index 3c48b2307d64..eb964ab3a6c2 100644
--- a/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild
+++ b/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Vault exporter for Prometheus"
HOMEPAGE="https://github.com/grapeshot/vault_exporter"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
SLOT="0"
IUSE=""
@@ -24,7 +24,7 @@ pkg_setup() {
src_compile() {
pushd src/${EGO_PN} || die
- GOPATH="${S}" emake build || die
+ GOPATH="${S}" emake build
popd || die
}