Merge updates from master

6 files changed, 54 insertions, 5 deletions

diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index 6de65209dc03..a88ebe2f7399 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -1,2 +1,3 @@
 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.17.0_rc0.tar.gz 1741645 BLAKE2B 483d5b100fdef9725486c62017491eb33c20df313859d2bc24a2d326324ca65cdd38412689f15d39acc22bd913ddcbd2967408f25ef2dd3ad3d09fd60ea42c3c SHA512 6df9d5e89b6ac14604530e255c68dc160a85299d93ce406137d45c0963391adc2e31260ef67e10cdbdd3299fc26ba65cc0c39999dff876927e08133250bb797e
diff --git a/app-metrics/node_exporter/node_exporter-0.17.0_rc0.ebuild b/app-metrics/node_exporter/node_exporter-0.17.0_rc0.ebuild
new file mode 100644
index 000000000000..ee86f6359021
--- /dev/null
+++ b/app-metrics/node_exporter/node_exporter-0.17.0_rc0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/node_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+NODE_EXPORTER_COMMIT="d42bd70"
+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/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 1382441eaa6b..8838c67d67d7 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,2 +1,2 @@
-DIST opera-developer_58.0.3111.0_amd64.deb 69837552 BLAKE2B 1146bb9b7e8ffe4e3e7e352957f26e8bc77194f61e6c959d24538815e11aaf448984065a55e6c0de85eca5be8a04fea4dd0da6c6f196596c1b62eac1e8bf2d2a SHA512 8228d15efe92f29908190d2bdeb819d3b5b1b734a7e7db9287b5601d4a4b4f706da9a4327ffe8066e757094ddfb4888c42f1d5a52fbd6aeb121d9657e5e0b716
 DIST opera-developer_58.0.3120.0_amd64.deb 70356546 BLAKE2B f769b8fd45edd7c17b7cd3311305c91e354f56147b548fae47127efaaba3a58d9c1e69ef2aade8a0c562cfd15c1dee6095a79078e5027c62a081e4f5635d5256 SHA512 4a6b5cd9d433ba33e0a2ca1dd36a241911ec1717e220707f26ff318bcef5ff617368491cabacb17a34cd88ba017acef1ae72af46b298c2a5ccec9bf5e13565c2
+DIST opera-developer_58.0.3125.0_amd64.deb 70583880 BLAKE2B fe1f38fc2ffecbf9da8e6bb23142b086098859ce7225ec5a71729119685be14fe162cd3b82ebabb81954c21635a2ecdc622abb13243b6b277775fb70dce6d395 SHA512 96380c98937be0eb117dc562b399fe43078f6ba042afef1fd1b117e6f353ed203439afdcb60f8ef1beaff5919a532ed058c4874ebb3a09ee90830f83bb4fa3ed
diff --git a/www-client/opera-developer/opera-developer-58.0.3111.0.ebuild b/www-client/opera-developer/opera-developer-58.0.3125.0.ebuild
index c09ad3685d1c..c09ad3685d1c 100644
--- a/www-client/opera-developer/opera-developer-58.0.3111.0.ebuild
+++ b/www-client/opera-developer/opera-developer-58.0.3125.0.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 73339de2f3ec..862cd5f20bdb 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,4 +1,4 @@
-DIST vivaldi-snapshot-2.1.1337.35_p1-amd64.deb 58509442 BLAKE2B 93280316a3687718ce68019856adce591cc4d33ad27a7255e27f6771e8550bb7d679fd037043b338e35d54defacf4f787864d2b9fd55ee90fdd29b63f0832990 SHA512 7d5322e4b1d9def8438a304bbfa52229ba54614189df900f3d58db8758bc9f528fc33875260d1df26b26a2fc6c197086ef855350a09b3f67d20776a0b60eb75a
-DIST vivaldi-snapshot-2.1.1337.35_p1-arm64.deb 50313988 BLAKE2B 75540fc7581f38bb3ef5ee891983e2068c8d339a00483c41f535d5eff057893954c10677c6b633531c8048fa537351905aca2ea4b8872b5d87412c801d537cef SHA512 2aa3bb701c1cde9770fe26a95c7bf235054cb4b6b95f2280b9d6891d4c210f5a2f937472978437135db73714268000e7af2900383632dd7ed954e00f68c2c1a0
-DIST vivaldi-snapshot-2.1.1337.35_p1-armhf.deb 51222764 BLAKE2B 0d56cb8af5d0a67616570e275ce3db2034c50df7a4017c8a86c235aa06e7a9c850714d229cc44a69f65a85d33d9c0b938bd47100e68b4e0918b87a5bf3ebebdd SHA512 d9f9ce745172c9f31187186d524141a025bff46f7704085a679a9c9914ad07102f70d4e138fd1fc21918c4b4aa5eccdb501856b89bfe2539ec5f31df5c2f6c82
-DIST vivaldi-snapshot-2.1.1337.35_p1-i386.deb 57392562 BLAKE2B 3cf6b09b18a52e6cb17666ea34e565b065371c59af9a8130f3053bef31695f754d08765bf11f857ac5350ab3815f79b6819706008be1741981a03a38ab53f6e0 SHA512 236eef97e70e644a00ab39e22af7603873b3452bff07d93161079e8ab899b616f6194e64526e97f3e63e09b8132ac973a1ce5785f3086f7f83d01ab6ec20e715
+DIST vivaldi-snapshot-2.2.1350.4_p1-amd64.deb 58468342 BLAKE2B a27bb0aaa22cfaa81eed88b19860ac6d94362a503929304af9c3e6a9aa9784b9d0b3fa0ace34cce34ae668cd0991ff346ea75573da4fd444d10b958640c556bd SHA512 fe4579f6b3ae0ec989d06f2878bfbbfdaa6ae682d2ce31de41ca025010c879fe63cf8635723436f0309569cbdac0e7ca033e31a1294630c20da960d9a8916808
+DIST vivaldi-snapshot-2.2.1350.4_p1-arm64.deb 50278814 BLAKE2B 27be904f2563cbcfb85d21982cf76c14406a4ef07a4cba37014ca9c8045e3f2e67105d1891cc0642cbf0fd350ac50420e38517fe8aeed0042ddc0ce96ca41744 SHA512 d846f46a9482a60ba65ea900ba34a71afd95915501c04069e174bfc83e4e0f6ea3753b9755b18825ddb0a9ffd3d953d1292f66b9be0b9a3bb8090381c48f9192
+DIST vivaldi-snapshot-2.2.1350.4_p1-armhf.deb 51212312 BLAKE2B 26a382946d36f93a0485205d04aa17d66a3de91a717ed261a0de0a12b066eb74f4b04fba8773edc27d8d8b65f1ababbe95b7d891f0bda31f7eb1c882a53cdd75 SHA512 e86fdcc8e4b72e26294dd709226e1eccf45820646a6c7b17496d92aef142919b209b82d3135a2fbc22bbd0218bf703c63c46f68e32a50d5ec1ef09b317821b04
+DIST vivaldi-snapshot-2.2.1350.4_p1-i386.deb 57355788 BLAKE2B a6ca6cbc6b7366c1f0782d803f925c3971315f81a82cd14d383fc8443bb386eabc612eeed77392b67636199afd8cc0fb446b1b97dcdefb90c162e9e650dba5fd SHA512 b0890a7b951a6c95c3c4575e407571cdadcabcb99e116619288875c1eff83e7c5010e1cbd3e27dd29e07b3aface3b8b4f9de41534e6d12460b2c9f700ceacd77
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1337.35_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.2.1350.4_p1.ebuild
index 91b5d4fe6abf..91b5d4fe6abf 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.1.1337.35_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.2.1350.4_p1.ebuild