Fixed user/group creation in prometheus packages.

net-analyzer/prometheus-alertmanager/Manifest

@@ -1,5 +1,5 @@
 AUX prometheus-alertmanager.confd 135 SHA256 e9ab660023f2dc7aa194e1b2513fe1e92d486ed7a5b9010a6b14b2f64780464d SHA512 391eb26d67310fba9371d274b1e9552cf0c9c02de1e3616c3e5514ae99bf7d36b52c6caa7e94a96f640b0f8542b15b4dded9d59154173c01d4e9a99ec2219fbc WHIRLPOOL cafc9f4eee9b80d6aa7bd837634a5a0811c488a2a84aaa3e22dbcab20a96d3e9f33c49bf968d296045083b27a109866a9e89681cc35997042f4a724b8c2cf09b
 AUX prometheus-alertmanager.initd 817 SHA256 f19ce410a6718495709ac87bc262729f2a9aff6cf02f8019c7649ce1d4531e16 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac WHIRLPOOL d1c7b823a29aa306828ae9c30818405772b6ad4d37b9e7e42122e021fd491926a1de85ac72b06478ade12505a993c567e7857af404ca474b162c7db75230ae39
 DIST prometheus-alertmanager-0.14.0.tar.gz 2786623 SHA256 f25bd1dad2eb3e050f1208650571195194b0c2362c488a7ad5ca60f40ca866ac SHA512 e352d51d86b853ff679892df3c494da2c7b4afb918d807e6d63b76e959b586f43a4c773de18bdd9e6a5067d4034748bb304ebdee2f08983b00890c1ae393d0b8 WHIRLPOOL 9e199ab6a88e29c3a06c0512e1c2cc8b1ab621913604b7e172cc177f24973c193b9fc979c1b4e029c91d50e14c31ffec11857978b832dc09f246e403cebb50a7
-EBUILD prometheus-alertmanager-0.14.0-r1.ebuild 1356 SHA256 2453986772b3ee44bebfe44e382b908b37b73efff9525ef47dc6da1f6822538a SHA512 f38b1e08f665a9f31a99ff58b2b2d470c7ace56f7ff3f06c02f8986a32db294198065fda03e1a380a19fb7f5ec77cb8f1acdd66b8c68b0b56cb4db801a2cfea4 WHIRLPOOL bee3afd54519cac2201bda8c62830a6dfe752cfb07be56da835864c9214503369bb0cdd592071a9fa846a2015a31dc3fec2b5f503a95e4104aabe2acea410552
+EBUILD prometheus-alertmanager-0.14.0-r1.ebuild 1398 SHA256 be68e3d25d6c16f9387eaff2dcdc6d08842899bcabc5df4ca03fff1a09f3f7ea SHA512 cbd89095add8ae72270a95017da86cca281abf3b3b9c9accc12d76193374fcf0a96dbb39b09334da266f55f47124754ef659ff3792189a8c71f26b61d58c73c8 WHIRLPOOL c800d4eda6a614770562ffd67100ae703b8c80e3fe80e251ffcc86eb81d3a6ac4c1bd23a211ade1ccb1ad19b6eaabfe3aa85b1521c7b6288dc5ddf736b69cff2
 MISC metadata.xml 333 SHA256 87b061dda62d5911cfa1088391d83b6486b4fc817ddaf93d174dab1aca11c186 SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f WHIRLPOOL 188807823233f2274caa356920208f2395bc43fb8e839d0a016a165d99647e05a68e62a28aaf9b41f4f562deabcfdf988d27abece5de28bb3f0a9926434a2789

net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0-r1.ebuild

@@ -16,16 +16,16 @@ SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-USER="pr-alert"
-GROUP="pr-alert"
 
 DEPEND="dev-util/promu"
 
 RESTRICT="test"
+ALERT_USER="pr-alert"
+ALERT_GROUP="pr-alert"
 
 pkg_setup() {
-	enewgroup ${GROUP}
-	enewuser ${USER} -1 -1 -1 ${GROUP}
+	enewgroup ${ALERT_GROUP}
+	enewuser ${ALERT_USER} -1 -1 -1 ${ALERT_GROUP}
 }
 
 src_prepare() {
@@ -48,7 +48,7 @@ src_install() {
 	newins doc/examples/simple.yml config.yml.example
 	popd || die
 	keepdir /var/lib/alertmanager /var/log/alertmanager
-	fowners ${USER}:${GROUP} /var/lib/alertmanager /var/log/alertmanager
+	fowners ${ALERT_USER}:${ALERT_GROUP} /var/lib/alertmanager /var/log/alertmanager
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 }

net-analyzer/prometheus-blackbox_exporter/Manifest

@@ -1,5 +1,5 @@
 AUX prometheus-blackbox_exporter.confd 110 SHA256 51fbbc94dc7e7b6276f1dc4ea0caadaebb8f26e5200fdcb6487de821eda283f5 SHA512 aa8720c03c4bf21ad5f789a4e9c6df6059fb71413cfdc605f8868bcd54eab899aa527afa9d847c7780042a8d4d72468145a97f8d732ef6aad861dcbf96bdf2ed WHIRLPOOL eff0e8357fccdbdeb13e05ca4beb618b422e0f676f79d230fa84f1fd30b336a54891bb25358a36f8e614117b260ccebca23cb833192b731067cb801358d440d3
 AUX prometheus-blackbox_exporter.initd 614 SHA256 2ee8168bb637902211021049b9484e3cdaac79a84cc775dbf9fa6b220520c228 SHA512 4a25f59d0fb95ac35c07ab15623c2c905db04cb5a14cccd316bd522e2b4892a08d67a4edb15c6c02fbc2b84e92dc48b67f5d14c7617cfccfa09babf22e4d1beb WHIRLPOOL 73d62db2e7f29db4395dff429d99006e6ce23c95415b2b4e1bf08606729c9475ce2e671f0fcfa0a0966bb6ee9e0b83b8401f6a7c2f6d031ddcd1188067b9ee3e
 DIST prometheus-blackbox_exporter-0.12.0.tar.gz 2202465 SHA256 8d5c2236b555af0c1ef00e6973f1aac76a38bbb5220aa6a39c1837a9b29e2a50 SHA512 2c98c0f4127bdd04ac54eb182c5468fd38121558f85aa8b4bec860f783f266b144df3153da0b028fdb84a4131a4e374a969bb09ce3a781ddf95f0a008c11bbb6 WHIRLPOOL 201f5733626b363ebd52993bf174162f3c4bc93efd95eaeea8b4db1b9d96395a93c9a55dbc2f2b009de6b4bb83ce751abbc3764b99b35c37841585b21aa3c8df
-EBUILD prometheus-blackbox_exporter-0.12.0.ebuild 1490 SHA256 e4dd4354fb7af87c2fc995b4962f6b36b9d45221e07e5de159fcd44579b0059c SHA512 e899a7de05adc4097bb085c666a3d9fd7136d1b1f15e280a9b21b0605e005408791b99447a3628759268f68237835392a2f3c7842bdd7451ef67ff32edd21bba WHIRLPOOL b26f6d4288c109174719c10a72306b8f4d084ed5d2e233dcf480633f6abb43abfca1834bd58f8a0da070f53605b7dd8d8b23799c083221d23c1ba0f9ff5eaeae
+EBUILD prometheus-blackbox_exporter-0.12.0.ebuild 1553 SHA256 ec3eb14171153e1a8e6acdf553611a5cd9b32f0e47854a8369c06960ebea4fa1 SHA512 e02d93e76170414454dd0fdf9d6c6cf14fa47674157418a4ddaeebd46c2f470d918a2229228202cc3fca9ab22b8c44577b7fdb50bd6382c2c3d6776f2a9fe30c WHIRLPOOL e351b6ca0bfbeaf5061a0e9beb9272daf744398c8cf665fd887abc0e27d090b62ee67f51a0f411cf7a67061cc5bd0e40a564563156f80de15e450880ea5d93a4
 MISC metadata.xml 338 SHA256 4b34c24d764f68cd20b642b9f2b0149e59fc65cfd0d5ca0ad39b5f3649fa9dfc SHA512 e431b2ef89e797b9cbb290a70683a4392f07559851550dd22f5410f09c979730c8dd35c095f855565df8d72adb42c6e4b9d03882adf37240b0da28cc508ee2ad WHIRLPOOL 4b0d0fdb9fc3e63c5e5d6eeca8852791085c1b9917d5099a6ea0fa755d20f83b34cb98cc7c59d7f9c770cbb1f83de2ff462e71511242374f40e9bec8ce18aa33

net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.12.0.ebuild

@@ -16,18 +16,18 @@ SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-USER="pr-blackbox"
-GROUP="pr-blackbox"
 
 DEPEND="dev-util/promu"
+EXPORTER_USER="pr-blackbox"
+EXPORTER_GROUP="pr-blackbox"
 
 FILECAPS=(
 	cap_net_raw usr/bin/blackbox_exporter
 )
 
 pkg_setup() {
-	enewgroup ${GROUP}
-	enewuser ${USER} -1 -1 -1 ${GROUP}
+	enewgroup ${EXPORTER_GROUP}
+	enewuser ${EXPORTER_USER} -1 -1 -1 ${EXPORTER_GROUP}
 }
 
 src_prepare() {
@@ -50,7 +50,7 @@ src_install() {
 	newins example.yml blackbox.yml.example
 	popd || die
 	keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	fowners ${USER}:${GROUP} /var/lib/blackbox_exporter /var/log/blackbox_exporter
+	fowners ${EXPORTER_USER}:${EXPORTER_GROUP} /var/lib/blackbox_exporter /var/log/blackbox_exporter
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 }

net-analyzer/prometheus-node_exporter/Manifest

@@ -1,5 +1,5 @@
 AUX prometheus-node_exporter-1.initd 615 SHA256 cdc4233ff3430a15a886d5a38e7f7d5b979663bd47e48706ed5de480838f9c25 SHA512 aecc8180b300660cb6b2882c45a99510d5c12aecaf1aaa24d62f2393c3f5c3e5dd9de6c5e73125f4eb6f3e18ca0d7b7e04e6338db2eed5ab06919e245f7e9d6a WHIRLPOOL 366a5cbea77dbd543e4ccb30bb2064dc8d91dd8d113b0b619eb3404034338424de030b0a6443f3b9567c8c6032a36b5e5c2a0eb99786c648430b468932d8cb4c
 AUX prometheus-node_exporter.confd 111 SHA256 51b9d1c0a9a05f7ccaaa88ae8bc5f6c31c10c7efb097e9cae257cc6af658b533 SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d WHIRLPOOL be439ab6a38d5a61b5c33b4140040f61d783b64ec39d7f0bb837ce09f123293eaec435703df0870b80dc1fee73d0a8c86b65db1d6da0c04c34128037d9add866
 DIST prometheus-node_exporter-0.15.2.tar.gz 1327204 SHA256 940b850376f94580e88b5e99926d92899975d5792d05709cbd9c48dab0a848ad SHA512 b39ce0801a5bf5a2a70c4034659d047d70b3763af3f18925b65c2b5f72832e261362aaeb9ce4c68cb7bf52e790d3fc710a6c8550ad7876e89fd9f5a055200a52 WHIRLPOOL 47b1329dac5f42560e5d484e6dda8f221105dfede9ff9ed5a050dc2ffa9adc1d25c017ce0ddb2c37fa6e6636e2210afb55ad67eb74516308aa10f456545b1a62
-EBUILD prometheus-node_exporter-0.15.2.ebuild 1269 SHA256 bd075d1eebf1b48b5784cc1e589b16e6a8fc067b419cbddd21e5a3ccd5c9da4d SHA512 da695f641e295bc190bc43fea924930f35b57b0be82419d4c5ca11bab57e54cd9b842243bab4cc1c052c37d8b0d857ecd6676c0d148ec8390ded65006910d5aa WHIRLPOOL def4d512a0deb46c8dac8df52d41c1680f5d8d6adcbf6e030cf91958b130184c77d4c4305c5acd3a6594ef384d42b921eff65627bdbc379a3b4f3f7089834c60
+EBUILD prometheus-node_exporter-0.15.2.ebuild 1332 SHA256 f1b1cbee6f00ae1b6a996452c1fee40699470686f89b9f40451b7998dc86fd01 SHA512 4312703b230b45767050796667ed9b04633bbd626c9b95ce9d76928343ba7463dd9f287a929164e605101ab158419191acb487d644661784defb13dcd237fc76 WHIRLPOOL 7628a45031cca905e59d482b5cf74fadbd5ca1beb88651f8756429f79b0a967520618365186310c4125f0f5a5a2cb78a32b1e58d8c9fbfd2885b7ee1d232260a
 MISC metadata.xml 334 SHA256 dce4944e74dfe121777699fe9b10552be275ba92e947a3715f6b60869d67d526 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e WHIRLPOOL d03773ab82553723915864f5bf084d74183fe56cad0628157e6c97e1e95e922edc180db665b6633e09af7df0d279f7bf075ec9066817bd243e656a8a9d0c32e1

net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.2.ebuild

@@ -16,14 +16,14 @@ SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-USER="pr-node"
-GROUP="pr-node"
 
 DEPEND="dev-util/promu"
+EXPORTER_USER="pr-node"
+EXPORTER_GROUP="pr-node"
 
 pkg_setup() {
-	enewgroup ${GROUP}
-	enewuser ${USER} -1 -1 -1 ${GROUP}
+	enewgroup ${EXPORTER_GROUP}
+	enewuser ${EXPORTER_USER} -1 -1 -1 ${EXPORTER_GROUP}
 }
 
 src_prepare() {
@@ -44,7 +44,7 @@ src_install() {
 	dodoc {README,CHANGELOG,CONTRIBUTING}.md
 	popd || die
 	keepdir /var/lib/node_exporter /var/log/node_exporter
-	fowners ${USER}:${GROUP} /var/lib/node_exporter /var/log/node_exporter
+	fowners ${EXPORTER_USER}:${EXPORTER_GROUP} /var/lib/node_exporter /var/log/node_exporter
 	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 }

net-analyzer/prometheus-snmp_exporter/Manifest

@@ -1,5 +1,5 @@
 AUX prometheus-snmp_exporter.confd 98 SHA256 35a4150f56c8f898af0a28c92d9770df35ea30c8d3c59e1e63075c458b3b8ced SHA512 027ff624a0e5faae571e36cf0fdf860e13956976878a7b3ca2afbf5e6387ecb02d391974cf7c44c33468d34a16cf00d10ee153f3b7507b9cc5a62126b70c5a39 WHIRLPOOL 55fbeb2c15a17a8e588a51e6aad1b56a7bc6eaff278b070eba7dc953928843d73df0eb4b2c6e4fc079436be486949a0abfbdfa0e8503c90ad58fcf2ce3d42976
 AUX prometheus-snmp_exporter.initd 591 SHA256 5ed292deb2cd07181328c0cd520dec77e496b5b4237b1c8e9e8ba15277633406 SHA512 0e53ef6790dc60091c0ed3b9cb7f47fabf526db80f9f09e212880efff59e9c0b3abb19235fe9b82da15cfb8aacb1eab326902f51d4908af80348023ae59bd474 WHIRLPOOL 71e7fcbed414e4f93e408441c07748c3640385c54bbf09de25cb796c2e74b86abe9fecb49f827308c15d2a0780d6f3201ba9b0a9e0c92969fcf759b453bfc14e
 DIST prometheus-snmp_exporter-0.9.0.tar.gz 3257207 SHA256 ac508e8cda680cc46638c68fe71a91df012e3274fb99460fd2866637b51591fd SHA512 eb287f4519f2174a9ce80414c2b7a698bc50e1bcb2303a8190164002af088e0694e01233314cfe2bd89b2cd751f2fd6f8447eb641541701b7bd481373ce084b1 WHIRLPOOL 27d1ff38ee2d8cd3733bb3b446a9bb16fd276adeb625c181c60b71efc2e445875089525857c6978b83941275b8685423f7ce35a510c14f7af7387cd00f0da83a
-EBUILD prometheus-snmp_exporter-0.9.0.ebuild 1316 SHA256 85e747d9e1d69acc08770f36a45cd86a241e95847d2af8aace95c1f82b72b662 SHA512 09fc0b177b4dbb54c4e7a32a1fe2dbca71bd27e76ae3d542580841fc4c11181d3047009b5daa7e3fa5cd7d9cf27e2fe8f223a6dae01cb55ddbe5979aa2d70c39 WHIRLPOOL e6d87bd4dccba62a148ad99a4e9c239a1413d60f701b0c3095c07ab3c83e04b5f830b83e050207158a468bd5976b79b8af3fb99944c6d093974f326dc0ee2c09
+EBUILD prometheus-snmp_exporter-0.9.0.ebuild 1379 SHA256 998339ee1d3b6bbd279879e5be2c8f8d6931f19f89cc29f56f46860980d888ba SHA512 1d8894c6166f265634f177f79116434822cd463e9f134d6e2cffe35edbd02e71636c6e155a081694a050c9e85318f8fb0bd07c9a27b994c79473e0f1091cbf4a WHIRLPOOL dd51d63270f8a7354e6a06c64d89632ea5bc9b83b6598c205dbe16842caf93257be25ac2a179185e7ccc403e137b93a73edee7d96e4103848cfc786af85e222e
 MISC metadata.xml 334 SHA256 42c6c31707ac483f87eb5d8605184dd2ea3d28f4e01b62b85ab018a1e1a69e7b SHA512 7fd3e4314022bf2ff86bd01f335d5c4402676970b9810575225aff3d40bd5bdc9ffc27b438c880dc0a665cf3873502b969dfb30644b3c106278fd353820d6599 WHIRLPOOL 1e769a6d9c4c8147f2f1d5b3e30f0c37e94db7f526828da6f1a1697ed8511e90a5541027c42976804c2071027fc65b9a044dac4480319283d1975a9d72d3e146

net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.9.0.ebuild

@@ -16,14 +16,14 @@ SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-USER="pr-snmp"
-GROUP="pr-snmp"
 
 DEPEND="dev-util/promu"
+EXPORTER_USER="pr-snmp"
+EXPORTER_GROUP="pr-snmp"
 
 pkg_setup() {
-	enewgroup ${GROUP}
-	enewuser ${USER} -1 -1 -1 ${GROUP}
+	enewgroup ${EXPORTER_GROUP}
+	enewuser ${EXPORTER_USER} -1 -1 -1 ${EXPORTER_GROUP}
 }
 
 src_prepare() {
@@ -46,7 +46,7 @@ src_install() {
 	newins snmp.yml snmp.yml.example
 	popd || die
 	keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
-	fowners ${USER}:${GROUP} /var/lib/snmp_exporter /var/log/snmp_exporter
+	fowners ${EXPORTER_USER}:${EXPORTER_GROUP} /var/lib/snmp_exporter /var/log/snmp_exporter
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 }