gentoo resync : 02.08.2019

14 files changed, 92 insertions, 324 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index afab5284865d..99391a2de6dd 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index 6665bf874eb7..617045da5013 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -1,11 +1,10 @@
-AUX collectd-5.8.0-disk-plugin-udev-fix.patch 2659 BLAKE2B 9b787040e34e62f06993d5bc2ccf92032b9880a1ba65f69c351300ad61ffa6e1ff5ace074285abf3e05962b61a2aa15f355f48ab9f789357197dc24d50138025 SHA512 bdac64df91de88d0cb8220a9cd5a9d303a5d9f3551484bf6319c8a2987ef69c2becc4dfb37350836767aed06704be3da9500433c21f1363c80c6d3faac13e1e5
 AUX collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch 2595 BLAKE2B cd60e42c3870611b30068d09410abc1cc80e5c2c945805d9a105050a52f3c2fc2ca2c5e10f33cd9c5063b0773a1bdad9ea7446f88632674cbd2cdd5202a69247 SHA512 6c04f6651a4bbe0c051202cfc3fae3e366cacf34c74e9ff3f09ca83887eb165e4febf8957ede66c22195c03c1f111b24a8859a56921cd42f68f938e87d784f52
 AUX collectd.confd-r2 2001 BLAKE2B fbf1a64aab6ec60111553466c3a8b725200ab13d0e09c1ba1d71e68213e8f978c3cad0dfc5eb2c536ced8213f172804f0596b3494f9b42b0cacf3432105cab5a SHA512 729f2b4e06c4a8c95d32c03c6f3f292eaa4895780ace180b74fcf139a949e9c28a2b3ae823bdebec0014f9b4d919adb399bc7f019c68c0e268b263326959edb7
 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.8.0.tar.bz2 1686017 BLAKE2B 26d995cdb9c25869bf96a056e6ba879de9f009fd4bbf1364a7dedba93b822e57c4b606ca8c84da68cc29db8e77333047695e85d7eb101080de9cee783240f5ea SHA512 1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008
 DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B 739f961172978db33bdf95c8f93bde0036a26b2ed2abd3396a734d4b97c4ae117bb26a62fcdbb3d77bd63d9f64a38f83d0c8a0665e8fa7bf5ed2efc6838b0e8e SHA512 8c75448c6e59ee1ea5c1cf486c07040d20fb36d5b7a1be2ab45facea330166e8c1d1fa38e3fa82ec905428d7b2c92c66aae35ee8e3546f67ce76f7f410739901
-EBUILD collectd-5.8.0-r1.ebuild 19412 BLAKE2B c1b044dbed47d6583330e67ab4b30dd5b788c397178617ba116d2d6ecef5769fddb6af17ed88127760a4a8be67635b1f22c4c1840e3eb423de3fc9314d6093eb SHA512 2b46a3eba0d79715ee94d34002cd8f7e6645d632221d0668e5e2fab6855859ac3d22bf9c60a7482816e0ce2c804132769a1488b591817a87233a120e7d90047f
+DIST collectd-5.9.1.tar.gz 1501178 BLAKE2B ed0984637161427f3b354002850b7ea8c49a4aca64b637b864e5513c8057f52a4a479477b21e2a4cff436728c16d66c6d561df14308adcaeb7d597c290f543ce SHA512 424ef12a3ba6997a71e6eda1a62d73fec588c9c4d90542c2381c1f9f4e118b2c02e18c71507e8984e20fb255b69b7f42afe83085b3df5e225c576d1eee1655fb
 EBUILD collectd-5.8.1.ebuild 19429 BLAKE2B b84bcdcd587f375766052acc92f3c053fac92a6c0a8750a1d558333345918fdcd7e563f705830b85cc5c76f9b14beca28297a8b1762ac6f67f66bd871c1c522f SHA512 123f88476f52f94cc5a975558889fb450e5341d6ae9ac9ec0cf4ffb5d46633d04f949b27f8408cab587d818ce27058c2d2dd53c8ea70315c9c7215c06cce61fe
+EBUILD collectd-5.9.1.ebuild 19563 BLAKE2B 99704cccf28dfbfb29085fa99f586efa15dcc0702d542927931cef723d583a6e988fadbdce96a4e69976f2e21a5404566ffd98c30f2362e793e4119ef96c535d SHA512 d4ca49e401ee7b92e7422e0cd3fc09d73ebaf4a5d0432c9f8836e0e859f7c3ee527b700c35d871b83651242cf76f8aa92baadac9f3549ea3e8860b6852940d78
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.8.0-r1.ebuild b/app-metrics/collectd/collectd-5.9.1.ebuild
index 64b897cee82b..e79b4d6e0e41 100644
--- a/app-metrics/collectd/collectd-5.8.0-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.9.1.ebuild
@@ -11,17 +11,18 @@ inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-fun
 DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
 
 HOMEPAGE="https://collectd.org/"
-SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PN}-${PV}.tar.gz"
 
 LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm x86"
+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
@@ -39,8 +40,8 @@ IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux
 # write_riemann: Requires riemann-c-client
 # xmms:          Requires libxmms (v1)
 # zone:          Solaris only...
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer dpdkstat grpc
-	intel_pmu intel_rdt lpar mic netapp pf pinba tape write_riemann
+COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors amqp1 aquaero barometer dpdkstat
+	grpc intel_pmu intel_rdt lpar mic netapp pf pinba tape write_riemann
 	xmms zone"
 
 # Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
@@ -159,7 +160,9 @@ REQUIRED_USE="
 	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
 	collectd_plugins_smart?			( udev )"
 
-PATCHES=( "${FILESDIR}"/${P}-disk-plugin-udev-fix.patch )
+PATCHES=()
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
 
 # @FUNCTION: collectd_plugin_kernel_linux
 # @DESCRIPTION:
@@ -344,7 +347,11 @@ src_configure() {
 
 	# Disable what needs to be disabled.
 	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
-		myconf+=" --disable-${plugin}"
+		if [[ "${plugin}" == 'dpdkstat' ]]; then
+			myconf+=" --without-libdpdk"
+		else
+			myconf+=" --disable-${plugin}"
+		fi
 	done
 
 	# Set enable/disable for each single plugin.
diff --git a/app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch b/app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch
deleted file mode 100644
index 1a96f06df0a8..000000000000
--- a/app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From ed696c1b3adcb42d55759efe6f8034337f0fd243 Mon Sep 17 00:00:00 2001
-From: Dylan Stephano-Shachter <dylan@wopr.nasuni.net>
-Date: Thu, 15 Feb 2018 16:37:33 -0500
-Subject: [PATCH] change HAVE_UDEV_H to HAVE_LIBUDEV_H for bug 2651
-
----
- src/disk.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/disk.c b/src/disk.c
-index 004ce9e2d7..04f337415f 100644
---- a/src/disk.c
-+++ b/src/disk.c
-@@ -139,7 +139,7 @@ static int pnumdisk;
- #error "No applicable input method."
- #endif
- 
--#if HAVE_UDEV_H
-+#if HAVE_LIBUDEV_H
- #include <libudev.h>
- 
- static char *conf_udev_name_attr = NULL;
-@@ -173,7 +173,7 @@ static int disk_config(const char *key, const char *value) {
-             "on Mach / Mac OS X and will be ignored.");
- #endif
-   } else if (strcasecmp("UdevNameAttr", key) == 0) {
--#if HAVE_UDEV_H
-+#if HAVE_LIBUDEV_H
-     if (conf_udev_name_attr != NULL) {
-       free(conf_udev_name_attr);
-       conf_udev_name_attr = NULL;
-@@ -209,7 +209,7 @@ static int disk_init(void) {
- /* #endif HAVE_IOKIT_IOKITLIB_H */
- 
- #elif KERNEL_LINUX
--#if HAVE_UDEV_H
-+#if HAVE_LIBUDEV_H
-   if (conf_udev_name_attr != NULL) {
-     handle_udev = udev_new();
-     if (handle_udev == NULL) {
-@@ -217,7 +217,7 @@ static int disk_init(void) {
-       return -1;
-     }
-   }
--#endif /* HAVE_UDEV_H */
-+#endif /* HAVE_LIBUDEV_H */
- /* #endif KERNEL_LINUX */
- 
- #elif KERNEL_FREEBSD
-@@ -260,10 +260,10 @@ static int disk_init(void) {
- 
- static int disk_shutdown(void) {
- #if KERNEL_LINUX
--#if HAVE_UDEV_H
-+#if HAVE_LIBUDEV_H
-   if (handle_udev != NULL)
-     udev_unref(handle_udev);
--#endif /* HAVE_UDEV_H */
-+#endif /* HAVE_LIBUDEV_H */
- #endif /* KERNEL_LINUX */
-   return 0;
- } /* int disk_shutdown */
-@@ -325,7 +325,7 @@ static counter_t disk_calc_time_incr(counter_t delta_time,
- }
- #endif
- 
--#if HAVE_UDEV_H
-+#if HAVE_LIBUDEV_H
- /**
-  * Attempt to provide an rename disk instance from an assigned udev attribute.
-  *
-@@ -841,7 +841,7 @@ static int disk_read(void) {
- 
-     output_name = disk_name;
- 
--#if HAVE_UDEV_H
-+#if HAVE_LIBUDEV_H
-     char *alt_name = NULL;
-     if (conf_udev_name_attr != NULL) {
-       alt_name =
-@@ -852,7 +852,7 @@ static int disk_read(void) {
- #endif
- 
-     if (ignorelist_match(ignorelist, output_name) != 0) {
--#if HAVE_UDEV_H
-+#if HAVE_LIBUDEV_H
-       /* release udev-based alternate name, if allocated */
-       sfree(alt_name);
- #endif
-@@ -878,7 +878,7 @@ static int disk_read(void) {
-         submit_io_time(output_name, io_time, weighted_time);
-     } /* if (is_disk) */
- 
--#if HAVE_UDEV_H
-+#if HAVE_LIBUDEV_H
-     /* release udev-based alternate name, if allocated */
-     sfree(alt_name);
- #endif
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 002c7ebd87ae..98d2439550a2 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -3,8 +3,10 @@ AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915
 AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
 DIST prometheus-2.10.0.tar.gz 11752395 BLAKE2B add59b45e3823d6ab8dcef8f00ba3dda4bb01f8edf891ee142ab790b7145fb2190ee98386dce6aae6afc3ea7bfba3c69749944828c62ed40169e56cda3f53c1c SHA512 eb67fc8a1ecd95689de0aae7e822c40395f82ec4b7f711457d7d504ffaf9a240ad9015a0c568dc93d350cea12cc3db2492bb5fe6300f6193be410b0e00d4463a
 DIST prometheus-2.11.0.tar.gz 12133603 BLAKE2B 0036777f95b3e0f6d187129b1ab06c0ead70cd6763a3ace96bd61830e92282072978f04b264bcecf45dc3be78cfffa843a7f3caf6fb5eaecd49e41aecd376cfb SHA512 c6d292f658c99fa6a1e1a9baf0fbcb32e1da7c61bdae1dac1e77385813248c2573c1ac9533dd7b01608b6093d4753454c0f9a2167434fb26c8436ddfc7d97cd2
+DIST prometheus-2.11.1.tar.gz 12133604 BLAKE2B 78370f85f9997f776b8acdbdad9db45cc34c8a18a8d467a1a839daca41cbf8ba1e50d5b359282f7062a4d9ba90d7989e13163018ac5043556be5a06dae28dbf9 SHA512 3d238466aad16faecd654f87cab45fe1097119acb241d5f8859d4d8bbeeb007e2c074eb9dc82569e3e1a9ae22a4b9cc0f40160c231d230f2f3f52b4ebf77035c
 DIST prometheus-2.9.2.tar.gz 11477683 BLAKE2B f0c18c57ff0fe292710174a91080a84ecf0375b4335aacaf4a8e32c842a9346b9fd48888ef8a19a597511c57eb8af7f90cca57d0cc51b9de4558c3f22953d165 SHA512 4cce1827580e49b1659ad492de946a81694c1dab90e079f3f0e56c1991254cf4ecac7f052aac75bf58a0b95d3cf4daa8c15b3e8305a3c089570da40c44a8ccc0
 EBUILD prometheus-2.10.0.ebuild 2006 BLAKE2B 6ca787542ee4f0360352dcc7f9bfaae190f6f2d6132b4c749942b979bb3a2304cc1a5b3b361c1cf014cef6d363561b20329ff371e58b4645526c3ce47ca81180 SHA512 66f860e92ba1a7054b2ec72aa60128a3a2d983091fdfae766406694ef44c34b303fe4a94efdf6f139cf221670acaaa9a92ac6477951457c4afd7c5ae2f245e37
 EBUILD prometheus-2.11.0.ebuild 2006 BLAKE2B 48e0b9fb67a2ace32ab8eb390a475fbd1264bc47965662ef2018799522465da57126767cc679fc86cf9eca0c6159f4657c1254fd7b37be93008486c2818fb169 SHA512 79589b7e746204d83f65494ccbee0019ae32968c6cf549cccd446958592e5792d68ba58537a70363863edcbba34187da5b4c6a8a80b5cecf005aa1f2b67c3d8a
+EBUILD prometheus-2.11.1.ebuild 2006 BLAKE2B 3a60f2bc2ecba6ac8e86057f67cde8262dab374a7e01122a3aad80e5c0e062c349ea8fd38bf7b4b067773cd26a73c92ac5092d9b62d04c7c7c55c7884138a92d SHA512 2cffd8817a1edf23f214781802d23db1092f3a455dd373f85f3124b5f449cc4d2ce1426ad9416f878188af686f3b91ebea5d1cb8ed635321ec3db2321c19e0f1
 EBUILD prometheus-2.9.2.ebuild 2005 BLAKE2B be44fa8627cb4ba1be2f6696bf8a7086bdf720508bf1fd47d451f7fcc0d54b7f97e6ba1c46260a71dca1a18fbca3013ae861cdf6437c6d9a25140e731d10e5d7 SHA512 937cac2265388d791b486b5131692f3d8fa30bf0fe20d76fe35f0ea44087a9fb036a5557a3deb70d8627ba4783525ce8510f9531190a097ffea6f91834161f7d
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/app-metrics/prometheus/prometheus-2.11.1.ebuild b/app-metrics/prometheus/prometheus-2.11.1.ebuild
new file mode 100644
index 000000000000..7a86debe75b1
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.11.1.ebuild
@@ -0,0 +1,68 @@
+# 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="e5b2249"
+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 924f6ecced4a..d6740d014a73 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -1,20 +1,11 @@
 AUX pushgateway-1.confd 827 BLAKE2B b1a089d29ef99f692c4b38a8fb8c2d48ac018e5141fd700d160b944287670eba674035c3929e175bf131a71f2edbd594d2cbdae43a1f6be30dc455784286ce85 SHA512 c83cce3088b426f30b90a50ee507e93f1c8ff3ea4f54ddf4d5da90d4f895e8aa02550952243d044d9e2c819798d8ee6f231206405f61dd350b1ca541e535361f
 AUX pushgateway-1.initd 664 BLAKE2B f24a389eb6f968d63a21ab0e8740604bcae440d3797ff1640c4e5cd09c9bba398db10c385321a6a50da78518ed341ba654baffb2671106e8ae04eb303bedb3a1 SHA512 515a49e4b1aa6934611f86f85e2132004d234d312c13be23887709fbcaad86280034942967b25d7e355ab491ac4c09e7c88221a95279f2f751cbd2387eba9ad5
 AUX pushgateway-1.service 477 BLAKE2B 123c630e40ca47626cf1d6bc93e8556ab1fccb1dd799cd72c245e5a937aff1a5c1b5ad9280d8680a8643d055376960012e36691f9e4f6a8d64bbdc91a749b876 SHA512 0985e8e45b1557adefe5f36ed163440c81f432b95198819d3e46c3f946f255954e5cbe41cf378b33cd3dcb75c457970877f2f6a7585bfc90b58ac2df9abb2970
-AUX pushgateway.confd 819 BLAKE2B 9c42a6d012f70a2ac03d4b90999d94683bc62f6d203ef8d2bf59019e30aea59c3beceae34f2579a2958acfaf882c275453aa5e46e488c5afebaebfc3f17b896b SHA512 c941bc2350bbda14d49effbc0a7988869fc38ccf2236951a88721bd15397c9e5b5d5a98d58285610b33eedc7a26f6cca51e3ec6f4909bdabf0658afd51b99feb
-AUX pushgateway.initd 662 BLAKE2B 652c58309ce31f7a37cb92beb128848ef28118b9b05278e79765b8c6555b6020266c062ef58463488dd39389f6bf0e2d1e0a9b5371ec4b5c26b821d6fac8877e SHA512 7bb32a7848607d939f3343c8d3fc88454b9ffc9d8d89f2af992d9f6f9fafe266c965b068cc466adbcf0ab014f1e5ca9214b567feacce09b73c8c2212e12aab00
 AUX pushgateway.logrotated 95 BLAKE2B 78db6689bbfac484b13a3444ebef47180aa94bfa6fa0c6b4fe273f415713b539116c1c05fc5348d504b9c6de270449a422fa7f49e63854a65d4ef6d25c3bf8c3 SHA512 615a8d105d97412b6819f65b9e34e28cb326457765ec9426f33d71cc4794aa1cbfff0abbcee14dbf94b6ae3f622c95d087ad485250c48b3e3efa8edcfe997069
-AUX pushgateway.service 476 BLAKE2B 1634abf2aebcc5423654bb70855d46917569e687c2b545590dbee5a99cb11ebe0744aff53969c9e20685e4c7fa8bb81bfd354e907fdd6c913c34ba43e1eb3588 SHA512 6564ba12bdda356b8dd368191e19383f2363f997a443e93c754ea1f6b1485deaf200167ede550d9a1d49d6c3787f215fb24d88cbcb05f3e4ce179ab0c7d9576b
-DIST pushgateway-0.4.0.tar.gz 1140644 BLAKE2B ea82e2e7f6fd817de02044e5aafde724a4089e4f2961f0b581f90df7e04e65af5a3c3e044ef94bd600a92468a8aed791c838a8fdc64b05b7a91d6288e7e96fb3 SHA512 67f25e5f7fdc54143c5d10720f27bd256f22695ced93088cf2b72fe3197e45324d4353357ae40d7d3e92019480c0bec009e38ed3f583724d46411d76adbdc927
-DIST pushgateway-0.5.0.tar.gz 1566969 BLAKE2B 255592d172ba910cd4c031f33045ee92fa02b8ba04c69a844e1a81d0fb4c0425f4a71931c917cb70f90422e25ad8761892cde344acb3fa7465e682ff8671f31b SHA512 d0a96aa8b1a59266a8864ab760ad6fdbdc131c49b08aa3bf89f54ed9c6ced6a4b7ab2f8c70d15dad1605ec7b46c5e784dc77be10f26ebd56a3a0f16f7285d607
-DIST pushgateway-0.5.2.tar.gz 1567286 BLAKE2B b62092b349ca8248937795f868e32fbd130df0b23de8b0c81a780102f8df3930db97a86061cf409d658c3e29e8d2eb6e350e18b9101a0bc9a0ba7b77a7fd79fc SHA512 4d6dcbc0199a83fe0469540ec70dbe230cf7c1d3efa66c55679b40e8882736b54af40423c7a2c1ab8693edca839bc67b4cd7125d52f9beab296c55f220e51482
-DIST pushgateway-0.6.0.tar.gz 1768979 BLAKE2B 50c9a6a00a207787795402ca1198849f38d658233918bb4a34f6b0ac9ccef993ce4ff8060ffd20dc9f0d23b861f953d7e3f7785bbf5d88ffc5ed97342a05c530 SHA512 209e5349d0aeb584dcf45c842923b5280d11ce8af2ff2236454182d1a42554a9d1b7d7add363f31203caf081424187f6bac243f43efb916d90803c6e1de4f76a
 DIST pushgateway-0.7.0.tar.gz 1867703 BLAKE2B 588be72ba8f7b8421e36e7cb33ecc27e8f94c242e03d7a97b2f1f54c167373162a9e9e7dba63897e583331370b96723169359ebd78839a0bd1306f850dc24cc1 SHA512 2057c028e2427a9d63ad2fc47a0f367a9b075c259186659c7d20038d79aaa4f5a014a4304d36eee2e78c08af69e27f7f65e6aed2453c4fa630203fd4bf944c41
 DIST pushgateway-0.8.0.tar.gz 1869626 BLAKE2B 43c288c481160807324f4d247a9d03b1696be934e97dc852f0ee6732d56715a2c78b451247f62f5cd0d93d9ceff64b54ccb20a91d78496a915271b9080d5832c SHA512 fdb8b3e1cd11b7faa329e1b625c7d2d98635624f32623ae99a7bb1cf2222ed682cb9c031afec191a5426d6fafade7bb92add7dc607898e4a839252aca5f1d71c
-EBUILD pushgateway-0.4.0.ebuild 1301 BLAKE2B 328b451698ceec2cd6f6020cadba897836c66513fcc25169be9e92ca7715e97e52fd245c51e7cb5f58a56967c486294f0164501dfbc9099d1d0144452f379c1a SHA512 81b652f6f3a78a39aa1604a7fa1209fd73595ea318736a735ddb00cd7d35ec48575eb4106c12efbacb3ac095c8280ec96fb9a0decc60631847079dcbf805bcec
-EBUILD pushgateway-0.5.0.ebuild 1291 BLAKE2B 267e67938461d4b8461822f9986ad1782ebb66e4e01fb623f265d07c9f47b4af7041ff07ba11660596ac6e3452c53eeed941679ab47690979173bf660a7ae822 SHA512 c2d44c055d5aa6f871f05ac459fa88c2f4321c4977ef07073b16ccbc72b5fc1199adaedffd0d5e70d4df05920596066282f8eb91cca4d0fd4f4a17f02b2ef16e
-EBUILD pushgateway-0.5.2.ebuild 1291 BLAKE2B 2ac140c425dc74dfb9163522c45d827a99a63a03565e4b51228857bbe96bb973ec18ad452ba8790e330ba1c51f3c48e361e20c1d28c99e83f9f8ba6a8e04ca3d SHA512 848ae6f60ab5cf26a9b6eda1619eae7120725581594d069dc3be4fadd0ca1ff1cff6ca2aca84ff8e155cb3b63f1d5daff8c21c79129cc4c631daf92592a801d7
-EBUILD pushgateway-0.6.0.ebuild 1288 BLAKE2B c73e413b0765e51dbf57822de0282ca6d8b2c1c9a72d2d92182f436e2af70415c097f474aacec1105926f4fcbfaf74a430c0da9b26b16999c86952a9c4bba28d SHA512 462e4ba66c24920f8da44d452c1a240d06da2b72778b3b34a529a01c9fb06809a38d77836bc05506d3c4356ceed45ba1835f32b6c281c0a085887299295c6a64
+DIST pushgateway-0.9.0.tar.gz 4722706 BLAKE2B 6d024819a4729cb4e728a0d1b654be94881e4a439c734655a33f5dc7c978d09205bf97e51668c2da68319df14bf802a142342483c679f4add3bf2d0992f8bef2 SHA512 0dd98f3e35e2d13e4e5e30ee398121b663ebfde240654c49f44bb0b765065f35ecefd9ddaad706f7b9a5365ea2ef1afdebe57441fa2c18c211a8670d795719b0
 EBUILD pushgateway-0.7.0.ebuild 1323 BLAKE2B a27919dcf4d086567e6c64dc760b2102b21b062a859d15d4f0c9e5cf00442bb2ddb988ef380db7feaef7a26ce6735ae4ed9049dff39034bcb0639cec9ba17966 SHA512 20ee0ea96335bad0060a3eaed11b0ea18c18d64330e5acd66488f5e971363cc3e1711f600838eb4c5df000a4f4c32a71486f8e3d8fdf4e51cf332cfaf8cd4083
 EBUILD pushgateway-0.8.0.ebuild 1331 BLAKE2B 90883388cc67b375a836e1c9c1957d1f91a51b76c33da6a8374b9ccad589641c1bc49a818febc13fef6f94ee725e2c73811ec572773c768ef005b7e6032bd8be SHA512 c34814100b7c3b758d84c3ab9409689b4d9aeaff8f91a4789d53e35dfea203c614340de2fd0a27db162a44a3a8d6b9cf46bf15e10b0d78aa7d33ecdbb62f047b
+EBUILD pushgateway-0.9.0.ebuild 1331 BLAKE2B 1adeebfd5d8aec3d4709a07756d30ef5d0bebe127a993264d8442f4d4667e92d83d16d9bb3111fe2897309d8cec62ab808470c53c00ffa602b6a2d76c2a2e2a2 SHA512 c3ce00955a5074a4100fa27a02a303b51e7ed2a8b6624972dca4793ab597f6c47bdd6017f502ab1538d28f5feef8d7a77e7b306ab73d889356a008a57fddc195
 MISC metadata.xml 437 BLAKE2B 904f35ea9287d25e5708e450715f8719004a5349ea871e9730fe36a98257cd0ba2417ec572f0d26a8d5d2de5629bca2d1b81f3e344bb8e4a52653175e8df2f3e SHA512 09284843912bc08aef77485911289fe1050f7d42e726e555650ad73b3ca51bcb62af90ccd69c3529bbdb7373b9ec317e0afd74687b84b123ac4fbbf2a3de9d7f
diff --git a/app-metrics/pushgateway/files/pushgateway.confd b/app-metrics/pushgateway/files/pushgateway.confd
deleted file mode 100644
index de9ef483723f..000000000000
--- a/app-metrics/pushgateway/files/pushgateway.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# -log.format value
-#   	If set use a syslog logger or JSON logging. Example: logger:syslog?appname=bob&local=7 or logger:stdout?json=true. Defaults to stderr.
-# -log.level value
-#   	Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal].
-# -persistence.file string
-#   	File to persist metrics. If empty, metrics are only kept in memory.
-# -persistence.interval duration
-#   	The minimum interval at which to write out the persistence file. (default 5m0s)
-# -web.listen-address string
-#   	Address to listen on for the web interface, API, and telemetry. (default ":9091")
-# -web.telemetry-path string
-#   	Path under which to expose metrics. (default "/metrics")
-
-#command_args="-web.listen-address localhost:9091 -persistence.file=/var/lib/${RC_SVCNAME}/persistence.gob"
diff --git a/app-metrics/pushgateway/files/pushgateway.initd b/app-metrics/pushgateway/files/pushgateway.initd
deleted file mode 100644
index a187e57897ed..000000000000
--- a/app-metrics/pushgateway/files/pushgateway.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus push acceptor for ephemeral and batch jobs"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/pushgateway"
-command_args="${command_args:--web.listen-address localhost:9091 -persistence.file=/var/lib/${RC_SVCNAME}/persistence.gob}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
-	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-depend() {
-	need net
-}
diff --git a/app-metrics/pushgateway/files/pushgateway.service b/app-metrics/pushgateway/files/pushgateway.service
deleted file mode 100644
index 3915fdb5b337..000000000000
--- a/app-metrics/pushgateway/files/pushgateway.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Prometheus exporter for ephemereal jobs
-Documentation=https://prometheus.io/docs/instrumenting/pushing/
-After=network-online.target
-
-[Service]
-User=pushgateway
-Restart=on-failure
-Environment=PUSHGATEWAY_ARGS="-web.listen-address localhost:9091 --persistence.file=/var/lib/pushgateway/persistence.gob"
-ExecStart=/usr/bin/pushgateway $PUSHGATEWAY_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-TimeoutStopSec=20s
-SendSIGKILL=no
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-metrics/pushgateway/pushgateway-0.4.0.ebuild b/app-metrics/pushgateway/pushgateway-0.4.0.ebuild
deleted file mode 100644
index c701fc15d869..000000000000
--- a/app-metrics/pushgateway/pushgateway-0.4.0.ebuild
+++ /dev/null
@@ -1,51 +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 systemd
-
-EGO_PN="github.com/prometheus/pushgateway"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-pushgateway_COMMIT="6ceb4a1"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
-HOMEPAGE="https://github.com/prometheus/pushgateway"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${pushgateway_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/pushgateway
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	keepdir /var/lib/${PN} /var/log/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
diff --git a/app-metrics/pushgateway/pushgateway-0.5.0.ebuild b/app-metrics/pushgateway/pushgateway-0.5.0.ebuild
deleted file mode 100644
index 80fde6225b68..000000000000
--- a/app-metrics/pushgateway/pushgateway-0.5.0.ebuild
+++ /dev/null
@@ -1,51 +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 systemd
-
-EGO_PN="github.com/prometheus/pushgateway"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-GIT_COMMIT="3965d2a"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
-HOMEPAGE="https://github.com/prometheus/pushgateway"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/pushgateway
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	keepdir /var/lib/${PN} /var/log/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}-1.service"
-}
diff --git a/app-metrics/pushgateway/pushgateway-0.6.0.ebuild b/app-metrics/pushgateway/pushgateway-0.6.0.ebuild
deleted file mode 100644
index 846402c8f22a..000000000000
--- a/app-metrics/pushgateway/pushgateway-0.6.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/prometheus/pushgateway"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-GIT_COMMIT="290ff86"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
-HOMEPAGE="https://github.com/prometheus/pushgateway"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/pushgateway
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	keepdir /var/lib/${PN} /var/log/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}-1.service"
-}
diff --git a/app-metrics/pushgateway/pushgateway-0.5.2.ebuild b/app-metrics/pushgateway/pushgateway-0.9.0.ebuild
index 48c3741c2232..ba7d4f8d54e6 100644
--- a/app-metrics/pushgateway/pushgateway-0.5.2.ebuild
+++ b/app-metrics/pushgateway/pushgateway-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit user golang-build golang-vcs-snapshot systemd
 
 EGO_PN="github.com/prometheus/pushgateway"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
-GIT_COMMIT="231071b"
+GIT_COMMIT="44d7ae6"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
@@ -17,7 +17,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-util/promu"
+DEPEND=">=dev-lang/go-1.12
+	>=dev-util/promu-0.3.0"
 
 pkg_setup() {
 	enewgroup ${PN}
@@ -32,7 +33,7 @@ src_prepare() {
 src_compile() {
 	pushd src/${EGO_PN} || die
 	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
+	GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
 	popd || die
 }