gentoo resync : 24.07.2021

6 files changed, 33 insertions, 82 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index ab2736dc53c4..06fc14634c89 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index c99cc133efed..fcbc210b52d1 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -444,5 +444,5 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918
 DIST pushgateway-1.4.1.tar.gz 4264820 BLAKE2B 88fb916831a441478b5e03fdf6fccb32b33746569c109d17d9bcc0a76cbe0d0322399605118456b83bdffe7617f098c2e2188ddee9dc08568607e3bde2c7cc72 SHA512 4687836c6361d6c1a7e672018b1212a31a749af575707ac8e41f4f078e075e12658a52ae58ccbb27a5699c164255b6f4ec259f5433dffec8af25853f014fd17d
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
-EBUILD pushgateway-1.4.1.ebuild 24639 BLAKE2B 00c968d6f6885f06938c1329aafccc17af09ea0f4b7c8b9e9855fb8dee0f880569dda41f307d2f34a27714827c03d6545d026f1f412b7cf9bfc9ec72b84687e4 SHA512 93dcce190abc9fd4f454fc568636de70d75f3ad4e480779a20b1b5e83bdf52b9593ddcc1370b79f8952cd1b9d88bb02e0239da3aa1c05fadbe7a967c6f1764f9
+EBUILD pushgateway-1.4.1-r1.ebuild 24615 BLAKE2B 874ae8acbead5184188b7c1ceebde4f5cc2efb7314c33f68c157a2bbbbf105c95b9fa6ae02f9de435149cf7fb738de743d6b0c3e2908a6408a4e0e1512faffa7 SHA512 5175699c795385efb6690ec27e772094d911514ed1c862b8699b7f746eeaa3178d7132cd721f5b08b68c81b98aeadd9617f6b21ece280dc833b63a95baa43af6
 MISC metadata.xml 331 BLAKE2B 4b07a7e72e94f5a764207f0e59f1a6e8f578b83f761f2cf658ef3a554e6d3fab9725445b6a2a8adc2de990f4a156c14ae9c5d10632f28ab53d995ce4ffc86ba5 SHA512 7d59c6fdec106a6708a76e44714ff47a947fe2b85839c96dafb2768733bbeb37d04a3d936ee8f371f432055f49f54fc904ac1a214fa96da6d4a961a6fb81d599
diff --git a/app-metrics/pushgateway/pushgateway-1.4.1.ebuild b/app-metrics/pushgateway/pushgateway-1.4.1-r1.ebuild
index ee560d7671a1..fe8bd1137f51 100644
--- a/app-metrics/pushgateway/pushgateway-1.4.1.ebuild
+++ b/app-metrics/pushgateway/pushgateway-1.4.1-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit go-module user systemd
+
+inherit go-module systemd
 
 GIT_COMMIT="6fa509b"
 EGO_SUM=(
@@ -452,20 +453,22 @@ go-module_set_globals
 
 DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
 HOMEPAGE="https://github.com/prometheus/pushgateway"
-SRC_URI="https://github.com/prometheus/pushgateway/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
+SRC_URI="
+	https://github.com/prometheus/pushgateway/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
-BDEPEND=">=dev-util/promu-0.3.0"
+RDEPEND="
+	acct-group/pushgateway
+	acct-user/pushgateway
+"
+DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
+BDEPEND=">=dev-util/promu-0.3.0"
 
 src_prepare() {
 	default
@@ -480,8 +483,8 @@ src_compile() {
 src_install() {
 	newbin "bin/${P}" "${PN}"
 	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	keepdir /var/lib/${PN} /var/log/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
 	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
 	insinto /etc/logrotate.d
diff --git a/app-metrics/uwsgi_exporter/Manifest b/app-metrics/uwsgi_exporter/Manifest
index 85bb4b644924..5d701541fd64 100644
--- a/app-metrics/uwsgi_exporter/Manifest
+++ b/app-metrics/uwsgi_exporter/Manifest
@@ -2,8 +2,6 @@ AUX uwsgi_exporter.confd 857 BLAKE2B ab9ab9a1b80247d552a64d2b3d4d5ff22cf4d8f9dc6
 AUX uwsgi_exporter.initd 627 BLAKE2B 37b6a417bbf2073dd30c7233266edd683e571217eb0aa12a9617ffafe44bbba449e508a437da1facf387e1ad801003a20bf8eed57177c5f62fad875d7ac185d6 SHA512 9735466e203f42c415742c2f6384357c7cd6e2e990dd75761ba79fff471680f2a41ae3324431e6c214f33c227b7d3eaece459cb9f10c6fba9a6080adf2448e30
 AUX uwsgi_exporter.logrotated 101 BLAKE2B f375e39ad267147f98945120479e6c43ea2a0987e882880942f1b8e977f9263fd63cefc433897a1091eea1a1da54b1dfdbb50ff7e4753aebcd23602ef2232630 SHA512 8dc8c9ee998c26d128c26de1c75011d6200c78098bfc9f97bd1d40946b0923f5a7c56eccf8fbfe59fb9df0b6b1430ae321b7f9da817dee1112d8a407d735af71
 AUX uwsgi_exporter.service 454 BLAKE2B 129a09d27a097a1e8a5ee230082d56a6a3e85387e84d8758a5d05589f5a24817146f9198106029e3b413ae4fbff01b05627ff865c6edefb2eb1ffd2e442dcc3f SHA512 b57a18f882285f2c91408697cd144ea4907f17428032f58e91abfdfe18fb76ba6ae5e31092f64e49bfcb5aef43f01ff162f9f15cb9a7b62cdc3bfa68f920b233
-DIST uwsgi_exporter-0.7.0.tar.gz 3039893 BLAKE2B a6efdae7f9a19ad21a283b586b5667bd99456274ed419d1b64aaf4cdb4df1e1c4fb2a08edf6df2b15813d21311fe54c2f2394f0bf25ac11c49db8a924596da05 SHA512 380ef4515eaa81d4dee853682efa7a5e82af2ec00c096e7471028c9932d46e0a7406b75cb40f0f8efec15cd77b06c5477a07919d0b44720e3e194b5bb023b593
 DIST uwsgi_exporter-0.8.0.tar.gz 3040547 BLAKE2B 5b6769487b3a08752cdff9dccc727096bc6b9d49e12e8aa35d04bbd0c3534503c19a4dda882c7efd7409549f3cae750021fa7ce87d12b798a2998efcdfc9f1cf SHA512 a5a1439f554749c7db4857651a11cbbf0ad0a0a8da0ffd421e374fe08194ba289a6bb04a95e4169ba6a75d0358c7a96e5b9f3cc5813cc39004f81dce42edb3ed
-EBUILD uwsgi_exporter-0.7.0.ebuild 1299 BLAKE2B 2b616ae2f1b8823de2ffc693e6e60ca92adfeb2db8c75126688aafb6e7df1c1b405d5192470da7a458b681372f8c230be886997b2a65183891b87029c6f43fc1 SHA512 69d2e60751d68c771478e5fcb4dde3cedda119a3c1097e05b0bf5c41633d9d24ad16f45cdab1f7af5a176cdd60f0dea84d1698d69bd8f42caf75dbfe5cea6c89
-EBUILD uwsgi_exporter-0.8.0.ebuild 1299 BLAKE2B be312e35f8cd472b26864b5c3e01e3e180864d32a1cd60fcc4ab19ab8ae6875fb51bc6bd406c54dcb0659e7299b5646058ecc54adce3ff37ab90fcd8e0f5b127 SHA512 93f78ed203899649d420d3a8254913e72f5476e2ce059fcee59da24645430ba7d109683509d1585c5eed3bc01a08ee19eeaed82731160e103f191a07e4cd2dfe
+EBUILD uwsgi_exporter-0.8.0-r1.ebuild 1298 BLAKE2B f65c9faa759d093d58d4efd9e7602d41b439817a20494934492f591d3c17dd1c1b2a5abcdc57f615955d6a740a12b8a281a4f048bec008c5f14091502701d929 SHA512 eebad63a099c77073cd52612e28d7b542bb74ffea4c888a0140445d34a870bcbc54ce30e004709d43a3e0cebd6fe4cc3893460ff32c5676215dc9d425f147357
 MISC metadata.xml 333 BLAKE2B 95f858b4f8e6c056cdc531b5a8e5dcd4f1a3ef72937d8e9d25276fec38ac13d5da50c3a97c221735bb93cc1bc431e6408c5ef4a68a694a94f077270bb4acac62 SHA512 95be3084c4d196026c2447fbdba6c4c8ca982f04757e613a2b097c0481ca49b5eb0a10e0814fd7bbf1dbcc5862e5704a5ae6cc0b7192e0f4fe87e0ba9ea14e0d
diff --git a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.7.0.ebuild b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.7.0.ebuild
deleted file mode 100644
index b705627040f0..000000000000
--- a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.7.0.ebuild
+++ /dev/null
@@ -1,54 +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/timonwong/uwsgi_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-UWSGI_EXPORTER_COMMIT="20e35a9"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="uWSGI metrics exporter for prometheus.io"
-HOMEPAGE="https://github.com/timonwong/uwsgi_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD ISC MIT"
-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}}/${UWSGI_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
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/uwsgi_exporter
-	dodoc README.md
-	popd || die
-	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"
-}
diff --git a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0.ebuild b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild
index 05b3d84ad98b..5be77e4e77ed 100644
--- a/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0.ebuild
+++ b/app-metrics/uwsgi_exporter/uwsgi_exporter-0.8.0-r1.ebuild
@@ -1,32 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit user golang-build golang-vcs-snapshot systemd
 
-EGO_PN="github.com/timonwong/uwsgi_exporter"
+inherit golang-build golang-vcs-snapshot systemd
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
+EGO_PN="github.com/timonwong/uwsgi_exporter"
 UWSGI_EXPORTER_COMMIT="ddbc18f"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 
 DESCRIPTION="uWSGI metrics exporter for prometheus.io"
 HOMEPAGE="https://github.com/timonwong/uwsgi_exporter"
 SRC_URI="${ARCHIVE_URI}"
+
 LICENSE="Apache-2.0 BSD ISC MIT"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64"
 
-DEPEND="dev-util/promu"
+RDEPEND="
+	acct-group/uwsgi_exporter
+	acct-user/uwsgi_exporter
+"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
+DEPEND="
+	${RDEPEND}
+	dev-util/promu
+"
 
 src_prepare() {
 	default
-	sed -i -e "s/{{.Revision}}/${UWSGI_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+	sed -e "s/{{.Revision}}/${UWSGI_EXPORTER_COMMIT}/" -i src/${EGO_PN}/.promu.yml || die
 }
 
 src_compile() {
@@ -42,7 +46,7 @@ src_install() {
 	dodoc README.md
 	popd || die
 	local dir
-	for dir in /var/{lib,log}/${PN}; do
+	for dir in /var/log/${PN}; do
 		keepdir "${dir}"
 		fowners ${PN}:${PN} "${dir}"
 	done