Merge updates from master

10 files changed, 195 insertions, 5 deletions

diff --git a/app-admin/certmgr/Manifest b/app-admin/certmgr/Manifest
index 11f6a3f2d340..c296cbba25ad 100644
--- a/app-admin/certmgr/Manifest
+++ b/app-admin/certmgr/Manifest
@@ -1 +1,2 @@
 DIST certmgr-1.6.0.tar.gz 31187831 BLAKE2B a1269aac2817f077fa2aae3d14f692aa5c83b0f53ffe041b9436754a93c7970dcc24bed94259e05b99105de5400b3b8c5e22bde087fe365a1c21b8eaf4b3e4a3 SHA512 65b0cb8d5b7a3b76698b3b3aa8c2b9db88d08fed209044668cb19f13eca69714a7a4bc8a20bbf60af05f5c9e39b221801a36e90c8b1c647dbf07952ac385e6ea
+DIST certmgr-2.0.1.tar.gz 2696154 BLAKE2B 0267c82dcf89297495bd46930bb53a176b0329aa933dd8a8b8a96b377133741f45e1a16e0beccb36540ef3c25d28f2af324a976ccac7c769c0cad06d2fb4d20c SHA512 b0de0fff3af435631b26ad4f3b0c1178b3f2e784545939b8dd4a90ee29918c879aea1afc774a23655e7e10526d7a8d13f95cb0740e407eb60110dabc56fdeeb5
diff --git a/app-admin/certmgr/certmgr-2.0.1.ebuild b/app-admin/certmgr/certmgr-2.0.1.ebuild
new file mode 100644
index 000000000000..eeb5ddc69b9e
--- /dev/null
+++ b/app-admin/certmgr/certmgr-2.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/cloudflare/${PN}"
+inherit golang-build golang-vcs-snapshot
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Automated certificate management using a CFSSL CA"
+HOMEPAGE="https://github.com/cloudflare/certmgr"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${S}" go install -v ${EGO_PN}/cmd/... || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	pushd src/${EGO_PN} || die
+	dodoc README.md
+	popd || die
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 6ac9921ba08c..25fe7d7c19c9 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -2,3 +2,4 @@ DIST consul-1.4.4.tar.gz 22736827 BLAKE2B a1b973a303f77d84993e4879aa92072d4f2d36
 DIST consul-1.5.0.tar.gz 20830405 BLAKE2B e64fbc22ade0c737db4f2f1b0e3966dbe617456a35d18a7a3cfa1b0f6ce2e335542b3add06c8b8e49995135b5a1576c824840030ac8dd46019bee915689bc5e2 SHA512 8cefb77b56b27995bba38517144bf42585bd1d9ad9a10fc0c9b6bc1a87bfbd042e336ed5e945cfce1fb8eb4b8162dbc8246e2b4109dea5767b8745a7b2159ef8
 DIST consul-1.5.1.tar.gz 21123963 BLAKE2B 4fe6a45f442d849196a7b9961110cdcc6f92931626ab583859efabe62038f6b2c356b27b37ea41b27755cca138c567be5c81854794a1ba0ccae3f9e0dfd10749 SHA512 7486d24bf1fa9fe94175abf9e008dc4fe4277c509381a524a9ee20e17bc4959f621e39be29e33622cb672ef3a04f9161e575009197bcd35c78b45f1d2637a2ea
 DIST consul-1.5.2.tar.gz 21697719 BLAKE2B 782d6fe02cda097db9256a7e508cf19cf4d514d7936022d339fa62db705f6c60468cea907cd22338bb61c3287bfccb3a4d435a4f9222aa7558999553909e5d40 SHA512 e0820592abc5e119f74c8bf3d11a23726ee6dda7d193864a4486d64deef0bfd6ae4c9170b57d6f978e7ddfeb425229a019c45a8edcdea0938bce9315f2444fd6
+DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9
diff --git a/app-admin/consul/consul-1.5.3.ebuild b/app-admin/consul/consul-1.5.3.ebuild
new file mode 100644
index 000000000000..13ebbc13a381
--- /dev/null
+++ b/app-admin/consul/consul-1.5.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="a42ded4"
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.11:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" \
+	GOBIN="${S}/bin" \
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake -C "src/${EGO_PN}" dev-build
+}
+
+src_install() {
+	local x
+
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index 6cd689595516..a0ce15126a1e 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -1,2 +1,3 @@
 DIST pushgateway-0.7.0.tar.gz 1867703 BLAKE2B 588be72ba8f7b8421e36e7cb33ecc27e8f94c242e03d7a97b2f1f54c167373162a9e9e7dba63897e583331370b96723169359ebd78839a0bd1306f850dc24cc1 SHA512 2057c028e2427a9d63ad2fc47a0f367a9b075c259186659c7d20038d79aaa4f5a014a4304d36eee2e78c08af69e27f7f65e6aed2453c4fa630203fd4bf944c41
 DIST pushgateway-0.8.0.tar.gz 1869626 BLAKE2B 43c288c481160807324f4d247a9d03b1696be934e97dc852f0ee6732d56715a2c78b451247f62f5cd0d93d9ceff64b54ccb20a91d78496a915271b9080d5832c SHA512 fdb8b3e1cd11b7faa329e1b625c7d2d98635624f32623ae99a7bb1cf2222ed682cb9c031afec191a5426d6fafade7bb92add7dc607898e4a839252aca5f1d71c
+DIST pushgateway-0.9.0.tar.gz 4722706 BLAKE2B 6d024819a4729cb4e728a0d1b654be94881e4a439c734655a33f5dc7c978d09205bf97e51668c2da68319df14bf802a142342483c679f4add3bf2d0992f8bef2 SHA512 0dd98f3e35e2d13e4e5e30ee398121b663ebfde240654c49f44bb0b765065f35ecefd9ddaad706f7b9a5365ea2ef1afdebe57441fa2c18c211a8670d795719b0
diff --git a/app-metrics/pushgateway/pushgateway-0.9.0.ebuild b/app-metrics/pushgateway/pushgateway-0.9.0.ebuild
new file mode 100644
index 000000000000..ba7d4f8d54e6
--- /dev/null
+++ b/app-metrics/pushgateway/pushgateway-0.9.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot systemd
+
+EGO_PN="github.com/prometheus/pushgateway"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+GIT_COMMIT="44d7ae6"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
+HOMEPAGE="https://github.com/prometheus/pushgateway"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12
+	>=dev-util/promu-0.3.0"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GO111MODULE=on GOPATH="${S}" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/pushgateway
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	popd || die
+	keepdir /var/lib/${PN} /var/log/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}-1.service"
+}
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index 365da24bea62..f50a0fcab408 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -3,3 +3,4 @@ DIST drone-cli-1.0.8.tar.gz 2724807 BLAKE2B f8bdbd90687e59cf104d3506957616c13ddf
 DIST drone-cli-1.1.0.tar.gz 2725959 BLAKE2B 684d03de78c07fd3a901132734c0e8f9fef129f4443b9af33a1b2205168289e3bfb357faf21e5d5e63f6fae21d864a475575cb3d1f60a499b846963cde7814e0 SHA512 ba059250cf73982b662e5fb9f4570381ca4ff2618a759dc497f793e7bba7d7094cc28fb90390c61b642caab0ee5d33ddc1c5a25cea13c6aaea8e50ac24868927
 DIST drone-cli-1.1.1.tar.gz 2840804 BLAKE2B 393e4f0cabc30c322dd31b5d3c7bdd846a3960eaab532669020e55a7b83ca7884125a0c47c5a1540101b0ad6dbc3f147470e18164cbe4f79dbc93dc033081abe SHA512 bc75683a6aea1d11c22a635a4386c3c0ead17f15f0b59ebc692fa0a5a346e90b3e6d1b16bdc21f807c91080f3c969d254db2cefb07113b3e4b3409425eebacc3
 DIST drone-cli-1.1.3.tar.gz 2841895 BLAKE2B 8e44ed377064d7e08184f56457390caef7861bb1ab5512e4ec679cd6e9a0ca018311b2d8abe0df2323eaa9ceada89323517d5c934781093905121c3f6eb52123 SHA512 423c0907499119137fea014b4f6d51154f98b82f4fadf69852bbb0722ae29d9a8e62ff49aa19f92dfcaa676385acc03ef3fd2a51553369d607473dd29b1453cc
+DIST drone-cli-1.1.4.tar.gz 2843182 BLAKE2B 395501216d09f907897d3d5f7a64e93956786030a354365400e8ec73e2ecb361958f7f9468c3819a77908251450954c91db7369f803516ff2fbeb2050ad6efe7 SHA512 6a0df849f4086913137e36248925fea70e106b95225708bfd37b9a23199d4bed35c6fa18757311cfe23e8c8eef5d66acde207827a7220cec868ffe515539471f
diff --git a/dev-util/drone-cli/drone-cli-1.1.4.ebuild b/dev-util/drone-cli/drone-cli-1.1.4.ebuild
new file mode 100644
index 000000000000..ca7f0b0fdc7f
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-1.1.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone-cli"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Command-line interface for Drone"
+HOMEPAGE="https://github.com/drone/drone-cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="!!<dev-util/drone-0.7"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}"\
+		go install -ldflags "-X main.version=${PV}" ${EGO_PN}/drone || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/drone
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/eclass/user.eclass b/eclass/user.eclass
index 9dc15fa75d23..a3cacb6d5f10 100644
--- a/eclass/user.eclass
+++ b/eclass/user.eclass
@@ -157,10 +157,10 @@ enewuser() {
 		euid="next"
 	fi
 	if [[ ${euid} == "next" ]] ; then
-		for ((euid = 101; euid <= 999; euid++)); do
+		for ((euid = 999; euid >= 101; euid--)); do
 			[[ -z $(egetent passwd ${euid}) ]] && break
 		done
-		[[ ${euid} -le 999 ]] || die "${FUNCNAME}: no free UID found"
+		[[ ${euid} -ge 101 ]] || die "${FUNCNAME}: no free UID found"
 	fi
 	opts+=( -u ${euid} )
 	einfo " - Userid: ${euid}"
@@ -318,10 +318,10 @@ enewgroup() {
 	_enewgroup_next_gid() {
 		if [[ ${egid} == *[!0-9]* ]] ; then
 			# Non numeric
-			for ((egid = 101; egid <= 999; egid++)) ; do
+			for ((egid = 999; egid >= 101; egid--)) ; do
 				[[ -z $(egetent group ${egid}) ]] && break
 			done
-			[[ ${egid} -le 999 ]] || die "${FUNCNAME}: no free GID found"
+			[[ ${egid} -ge 101 ]] || die "${FUNCNAME}: no free GID found"
 		fi
 	}
 
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.30.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.30.2.ebuild
index 892a9381351f..6385e4054654 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.30.2.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.30.2.ebuild
@@ -11,7 +11,7 @@ IUSE="cups python"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Note to developers:
 # This is a wrapper for the core libraries used by GNOME 3