gentoo resync : 21.07.2018

7 files changed, 56 insertions, 52 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index a41676055af1..1537f7253aaf 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index a6c3e1d0a380..d4c822e465a5 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -9,5 +9,5 @@ AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f
 DIST collectd-5.7.2.tar.bz2 1798777 BLAKE2B 4af359a773457bb9c05b6a301d7728eea7598c200f7ca534875b07d1d011b280ab138f680d9607723f14523dd71dcbec3a41e0d8d183848c8ef809cef86c2b8f SHA512 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3
 DIST collectd-5.8.0.tar.bz2 1686017 BLAKE2B 26d995cdb9c25869bf96a056e6ba879de9f009fd4bbf1364a7dedba93b822e57c4b606ca8c84da68cc29db8e77333047695e85d7eb101080de9cee783240f5ea SHA512 1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008
 EBUILD collectd-5.7.2-r3.ebuild 19604 BLAKE2B a8029a04105fc974d7509caec64d4ac4b36cc0f4c94ab626a73a9e9097076618c26c0fc69c8b3f0af4cee6c4834bac0425fd3905caf9356cd864f0c810f2fb79 SHA512 e8359fc8644c775fe5c9158fa26fd7b0c63aef1f68d2f0dc242043a6dd223338c2544d8680377243c2939fb74b998fb5530febe4f1d0376c6ec3771d47303af7
-EBUILD collectd-5.8.0.ebuild 19356 BLAKE2B 6bfc6392609b9994345ed2bf1d51e2dfb2267ba10ceb6553f4d29c90ef64c0cbb14f53b18cfed30661639c85ce9fd435d926aa1e8bbd71d0f5d6259ab44361a3 SHA512 296426f02c9df69ea7796b182319772ca1dd55da1e0f914a1e1ecd210a5a550d27fc09554283aae8d782861e78361b667d3999406c9f2c870791676d9379c798
+EBUILD collectd-5.8.0.ebuild 19353 BLAKE2B c73debc06ed9a3633be39be1019fe75a6dee65faec7e08d787c32b5d78620f5d8ccb6175260b435341d8ec30fc6b1098df6ab20b0e14bc90f75321ce80c42a9b SHA512 ded4e1a6431679ae141a9cc1711819bf5407cc060164532996fb51e38e9590be0d5f53e770a010666961000b229ca97eed95a32469467e5f1801e6dfbe06956f
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.8.0.ebuild b/app-metrics/collectd/collectd-5.8.0.ebuild
index 1595bfd1c824..4b1009c1eba6 100644
--- a/app-metrics/collectd/collectd-5.8.0.ebuild
+++ b/app-metrics/collectd/collectd-5.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 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
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index 8a6c16e05d93..a07fd78e91e7 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -2,8 +2,6 @@ AUX node_exporter-1.initd 615 BLAKE2B 4d5d30126a1491b4771365b7db31a4849a3eeda3a0
 AUX node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4d9d82be36ea5e63d3b8fc2a861a61c62e2e899209f7293588e3e7532ffe52ecb9aab4773a3943168d5dd SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d
 DIST node_exporter-0.15.2.tar.gz 1327204 BLAKE2B ee694771ed6d736fd4bb6a10f713f31becc930fb8225499d4b3a2a2cc7416c1816605cd8f4205dc37a2264af8d9f85e3519bc01844d252b6a70d4ee5f6308ece SHA512 b39ce0801a5bf5a2a70c4034659d047d70b3763af3f18925b65c2b5f72832e261362aaeb9ce4c68cb7bf52e790d3fc710a6c8550ad7876e89fd9f5a055200a52
 DIST node_exporter-0.16.0.tar.gz 1413131 BLAKE2B 7561ae8cc4994c6772816b72d6e3ea98934cb02eee7fab6c08a58ca853e492192defbadf25ea6f992fd044d23826241a4c0fb54c423b59394210803a5fa517e3 SHA512 59a2286024de76e7213e430ba77a366190d626d3b410c8dc960ad2bf68798e8ec3aeb851396673fb402eef15b2596f6835cf0197a53b9a3d1c0f8a1a81965fc7
-DIST node_exporter-0.16.0_rc3.tar.gz 1411536 BLAKE2B 24c38fb607d68718298df84db0e903d2a35d21d2edbe5e79c917cd2a32d76708a7e9f25750fd0c52c7eec4bbb90ee089dc60769e05f0265cb08c4a27dff20d96 SHA512 fc80738ba6bedd4a9a28374c6ea52c6471be14849b0120fd322397c179e0f0043bc616585d2b251a817bb7af8af16cc5a7f41de989943b9b87805dac4446a61f
 EBUILD node_exporter-0.15.2.ebuild 1225 BLAKE2B 3e5633734ba2be8f83953b4851a17ba76a619aae1490348f4f0fdf83e34a26e07c561a5fce9e41bb6f86aef9cc537f48cea6bba74082821fbd7fe4395aec8e39 SHA512 54286e2c5957524374885335e512bfed3b609e8e2e293fb7e0d842603e1bbc026536a96a6a75ea141baed7a96fbe57f9fcb8067968ae162745c813855b9d7976
 EBUILD node_exporter-0.16.0.ebuild 1226 BLAKE2B be97741e0fe9334c14b5c39d7fc6171a4abc963029987fb2f489f31a88bb283507dc7950c1adda41cf6ca473370b9f3ee4d12b29624614903754c1458557d31a SHA512 e826701a4091faa7cdab11ef4092aaae6858eff9af96e1f698e1a224b9710c395b1fd99770d6872138bbd39460c800e41e24a41ca42ab50b26d5c06a2685c7ed
-EBUILD node_exporter-0.16.0_rc3.ebuild 1226 BLAKE2B 7beaa72239619203cc167d64f2ad22dcf18133a0cf30d8cb33c0cdac836bc2d044bcf9ceeddb5dbbd9c4b22cba75acd9fd75b0e3bc75eb98a58466d5058dbc19 SHA512 1b5b3623f1a13a3b5e7a1cb3dee9b35ca6ca78114bfe1cae82836ab177c6178646974648ad242bed795406f947aefb85beb56ad0688f361b2aaaefdbfc0694e6
 MISC metadata.xml 334 BLAKE2B 4152458bd76dc5a5150cf8ec6e6b967d88b89b85c7145c158d981c92dad663df3259b2ee229298727e862139215e69ac97f9aecf3b66c182a13fc9bf6e651057 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e
diff --git a/app-metrics/node_exporter/node_exporter-0.16.0_rc3.ebuild b/app-metrics/node_exporter/node_exporter-0.16.0_rc3.ebuild
deleted file mode 100644
index 62f4a8eceeb2..000000000000
--- a/app-metrics/node_exporter/node_exporter-0.16.0_rc3.ebuild
+++ /dev/null
@@ -1,48 +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/node_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="575d895"
-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-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
-	GOPATH="${S}" 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
-	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/redis_exporter/Manifest b/app-metrics/redis_exporter/Manifest
index c7aaf29bc1bd..0ed343de3997 100644
--- a/app-metrics/redis_exporter/Manifest
+++ b/app-metrics/redis_exporter/Manifest
@@ -3,5 +3,7 @@ AUX redis_exporter.initd 618 BLAKE2B 15e68da38f7644013ffafc94de4740912918fcfb5c0
 AUX redis_exporter.logrotated 101 BLAKE2B 323e088953e483d4138836bd67db896f1b9aa9df37e0b56267a40c9543138668c92a9fde38856f2a3ed5f28156badc3a287c8be85a81acef9c5c36d178d14826 SHA512 6070dcf0f588f20a3225471db56737e96660820e9f18de6bae1921caa7fd6ee7408c03a969139f55f594fcfdcaa0f96d9ff4e597e68bd58154929f434c3f1082
 AUX redis_exporter.service 445 BLAKE2B 40b006933b7c221171872c7f5f50eb07db0a551169eddd6aca5848e06bac78a6db6683b177e04caff91e3c52bf7e8bdbbd96ff98b6489b6b1abe2a8973b75a2f SHA512 aee1651eeaa61a9a46fcd041c8616e3db85e160f270da69272a18ec5e2e664baf8bc6dc321c04e87e527a6fef63d54f36bb6903e58e376b76c104c3e1ce3818b
 DIST redis_exporter-0.15.0.tar.gz 1232990 BLAKE2B ade899ef0f21594d3bb59c379f44d941e2a42f06a5c2ba5b304cc0b8b83def12eb036e6011a7d88abe7d97104ae663cb025ca60287ec9aba7be93a734d84c959 SHA512 8892306500943ec18d8fa5110fc6f4954ec886fca4d0023cdc2134ee2498c6f39ab06bec8f998ecde796cc2053b66103146503b76a185db3da5cbab81ebd9f2a
+DIST redis_exporter-0.20.2.tar.gz 970030 BLAKE2B 55bee727f196fad642944a444220d9f71958d812f5f5f4d79a0c741cada25f29690ff4f185ec4028cf5216139e5351022a134fb1b0f2b5b45b384a831dbf1802 SHA512 eee4cc9de79ea256571c9650abae6b044fc78b7683abef544d5313dad5d46d3516c55e939c33f87849cc52ed2465797d20b606e386aa4fe187dd16d30354173e
 EBUILD redis_exporter-0.15.0.ebuild 1456 BLAKE2B 4efc6a890875ce7619d4ec1f88b3eba6f1bc3c10d2ada7ba7fbe8339e9a829aa51ccbea95fbb7a3cb4241589ccabd762de28b1e8018af8856cf191c2472db8c5 SHA512 8d9e3275bdc72a21615c71549eefa1b20ac31f128e3d83d6911b103ef0a281efa2e5c52a32557307c9ddbbd94352d87d17944ea468f7e71074d85e015777e342
+EBUILD redis_exporter-0.20.2.ebuild 1456 BLAKE2B 7848ead4b6922f56efd1862e38a49dd5e25b6253f5c61284e28b65e6a77421703de4c0016385237a9e87cd8d3c414528ec59a50d6ba445f8b9c8c289f94c1502 SHA512 9361e7cb7acb8df5a7aab132bc6cc768ed3a0b0a6e76e611170aea8103dfd6ee10ae18bdb5ca96e4c68ef3c865d39236f575c726d2754171da86eb4ef9fb1c29
 MISC metadata.xml 333 BLAKE2B 8eb8199bafb906f2b58072cf9765c7c44a4daeb54216db95f25a6c1545bf30720d73314fafe5d129dbbc200990e7a553e0ddc1486c22aa5d24c8616d21d4af80 SHA512 b1a040dc4cc2762aea081dc99209191da6f0d3d77c343148e3eb539bbc6527586e46de1b97e7cbec9f5098adb2f655059aa8609542353ddd88d19febb43c6fec
diff --git a/app-metrics/redis_exporter/redis_exporter-0.20.2.ebuild b/app-metrics/redis_exporter/redis_exporter-0.20.2.ebuild
new file mode 100644
index 000000000000..8ead2d2063de
--- /dev/null
+++ b/app-metrics/redis_exporter/redis_exporter-0.20.2.ebuild
@@ -0,0 +1,52 @@
+# 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/oliver006/redis_exporter"
+EGIT_COMMIT="3e15af27aac37e114b32a07f5e9dc0510f4cbfc4"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
+HOMEPAGE="https://github.com/oliver006/redis_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
+		-e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
+		-e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
+		-i src/${EGO_PN}/main.go || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+	popd || die
+}
+
+src_install() {
+	dobin bin/redis_exporter
+	dodoc src/${EGO_PN}/README.md
+	local dir
+	for dir in /var/{lib,log}/${PN}; do
+		keepdir "${dir}"
+		fowners ${PN}:${PN} "${dir}"
+	done
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}