gentoo resync : 05.12.2021

18 files changed, 44 insertions, 21 deletions

diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index e24b38e08162..d0da22dbfa6b 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/burrow_exporter/Manifest b/acct-user/burrow_exporter/Manifest
index 6798cd618b2a..612e4d91b892 100644
--- a/acct-user/burrow_exporter/Manifest
+++ b/acct-user/burrow_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD burrow_exporter-0.ebuild 258 BLAKE2B d741e0319cc8724b36a1a04f714c2a15c1e11d594e6676b402bea602209d632e1333e96608b4bc487b7feae818eacf136c6b0c156c980946ac91e1de6cbe9e84 SHA512 e4ee3cb6dc12c6930d01847963b7b5fb24542f5c67e6daeadfb17761781e9327765cb016e1b99ad4d8aa269c80ee037c5863e02806d94cd7b311ea1c4716b9e7
+EBUILD burrow_exporter-0-r1.ebuild 259 BLAKE2B b611011d872d850103034ce7f824c53bfa81661d42be10078b69822d08beabcc5f02ac1b677dadcf9b98e3ea644ba33553812889e19098d1fce1f273182ebf12 SHA512 7de120189ab70673f6badaee19852d9794b87d4394c6222fbf753e12ee17ea67498d3bad744461609b9de543cf436607ff24e770ccc332036ce9b68ca1b7d892
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/burrow_exporter/burrow_exporter-0.ebuild b/acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild
index d1e4dc7bf8d8..2985c39db4ca 100644
--- a/acct-user/burrow_exporter/burrow_exporter-0.ebuild
+++ b/acct-user/burrow_exporter/burrow_exporter-0-r1.ebuild
@@ -6,7 +6,7 @@ inherit acct-user
 
 DESCRIPTION="A user for app-metrics/burrow_exporter"
 
-ACCT_USER_ID=96
+ACCT_USER_ID=502
 ACCT_USER_GROUPS=( burrow_exporter )
 
 acct-user_add_deps
diff --git a/acct-user/elasticsearch_exporter/Manifest b/acct-user/elasticsearch_exporter/Manifest
index 73f9f9a2c24f..ccf3651da5dd 100644
--- a/acct-user/elasticsearch_exporter/Manifest
+++ b/acct-user/elasticsearch_exporter/Manifest
@@ -1,2 +1,2 @@
-EBUILD elasticsearch_exporter-0.ebuild 265 BLAKE2B 0240a2a8bd3e8ae12742c1348c5bdf6ec7501f765aaf35f75f3185823b0e0d76cb08269167ba8d4d1a6a58f61722e21dbb8e400913bbbb6a3e872dad02e23f9b SHA512 97d296f17e58e98a4d66e7c175fd8a7fef3d9ea54fc39d5ac9a3155241629e44d43eb8042da25448e4f177be909834bce06d4f06e7218c6a6927263c4e34e91f
+EBUILD elasticsearch_exporter-0-r1.ebuild 273 BLAKE2B 5bae90d0bb86304c796a2a28e0a4dc3592c506c1fc0d00622a8569c0031b141f7b87dfac83cf7319d071c93d98d49c353567fd6f4c0a8d88c55b247fae907cdc SHA512 6b4527d2fac7adb6e1991e0c9accf22169a52e25858f27b8a487c3f0ff349c173fe542fc044f5ca57e5b68a07505a406f3de8e5f673dee9f44e5581b7a2b8539
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0.ebuild b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
index 4ec1c4d775a3..0641a19753f0 100644
--- a/acct-user/elasticsearch_exporter/elasticsearch_exporter-0.ebuild
+++ b/acct-user/elasticsearch_exporter/elasticsearch_exporter-0-r1.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 inherit acct-user
 
-DESCRIPTION="A user for app-metrics/burrow_exporter"
+DESCRIPTION="A user for app-metrics/elasticsearch_exporter"
 
-ACCT_USER_ID=98
+ACCT_USER_ID=501
 ACCT_USER_GROUPS=( elasticsearch_exporter )
 
 acct-user_add_deps
diff --git a/acct-user/fluentd/Manifest b/acct-user/fluentd/Manifest
index b6092eb48d68..4a742d2db658 100644
--- a/acct-user/fluentd/Manifest
+++ b/acct-user/fluentd/Manifest
@@ -1,2 +1,2 @@
-EBUILD fluentd-0.ebuild 240 BLAKE2B e45a25cd13776fa36a3d0f3da67d48b210921bebf811ff9a472ec24a10e832ef2df8e46a81fa4c0270beaa63f4216918ad578d791f32d7c39f2b4df27ef61208 SHA512 a900cdc79b79f452fe42ca7c3e81d4a01c34e284af2d89c322dd9c111689efa94c4b74e2e40950c60a1f6ffca82dd5503f17c7dd18a1886f2f8c2bcbdb99cb62
+EBUILD fluentd-0-r1.ebuild 241 BLAKE2B 26e8a0cb4bcda2bfabcc69fd6491bdfed7f70d6a111a2a6971f462345476e6d3834abd683fe83804213443bb0f6fa4cc2127f8ed55a9a08d0f85948b64f3759e SHA512 0bd3e02b535aedc96fa865a0cbc2a2d7a674d2547e6344c020e8f5e98633a60e271dffcde943484f988c428c4d9aedc91b939a2f1d989747fba5dc4dc69bea00
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/fluentd/fluentd-0.ebuild b/acct-user/fluentd/fluentd-0-r1.ebuild
index 34104243827d..b25d51d0046a 100644
--- a/acct-user/fluentd/fluentd-0.ebuild
+++ b/acct-user/fluentd/fluentd-0-r1.ebuild
@@ -6,7 +6,7 @@ inherit acct-user
 
 DESCRIPTION="A user for app-admin/fluentd"
 
-ACCT_USER_ID=93
+ACCT_USER_ID=504
 ACCT_USER_GROUPS=( fluentd )
 
 acct-user_add_deps
diff --git a/acct-user/greetd/Manifest b/acct-user/greetd/Manifest
index 235ac05651bf..887b17f48071 100644
--- a/acct-user/greetd/Manifest
+++ b/acct-user/greetd/Manifest
@@ -1,2 +1,2 @@
 EBUILD greetd-0-r1.ebuild 237 BLAKE2B 2772ef9a59ffdee577ad2dac61aa0c4ba859143f803d2d1f51ce42c42999224b83e8c9ed22e884fd5485dfb73cd2d39af01d6cb4498322a4c2d165c00a256fa9 SHA512 43e09dfb2f6c5297c56ed19ab4c3ee0ba236f05fc81e4e9f3935288a6df7f363b975aff3bfce1614ad3b6f4fe7f1305f6af2ae9dc3c286e752455e941e8d7b24
-MISC metadata.xml 390 BLAKE2B 6dcb496ae753e33ae5ecc403969ec608d01a0aed30d2eb09451a336c7cb3f3521a33dcf0eb45a9c9e4ec279e31251e246fb3188477b00a0d76ec3544426e5ca2 SHA512 67d5a38f11731b5bed523bb3d993bdf05ad055148a049695609ab30253e35508ef8bf4f7e00c47058961cd4cf3b56608e70c4e4d505894de0c895084fc187014
+MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
diff --git a/acct-user/greetd/metadata.xml b/acct-user/greetd/metadata.xml
index 594b69a09296..60374df2c110 100644
--- a/acct-user/greetd/metadata.xml
+++ b/acct-user/greetd/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>gentoo@aisha.cc</email>
-		<name>Aisha Tammy</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>ajak@gentoo.org</email>
+		<name>John Helmert III</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/prosody/Manifest b/acct-user/prosody/Manifest
new file mode 100644
index 000000000000..1720956ea140
--- /dev/null
+++ b/acct-user/prosody/Manifest
@@ -0,0 +1,2 @@
+EBUILD prosody-0.ebuild 243 BLAKE2B fba7d09fd545e83ff9eb1631eef52c6f5ad88d0fa7a8aeda6a98baf4e6f197b9dab7efb95c9fb680e23a7cf66f6a8f0b3e437167c15f6a2e80ee2dacf0ffedc7 SHA512 eb7c1932673ec18db3bbf1effa26ef90040f8a73d1d8584d1e15acf7b0ca4f465b4ffd1e9a345f1255d52e796c33d0fd7874c2d82f7d7abbe8c8db33dba6509a
+MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/acct-user/prosody/metadata.xml b/acct-user/prosody/metadata.xml
new file mode 100644
index 000000000000..c07e13d4a6bd
--- /dev/null
+++ b/acct-user/prosody/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/prosody/prosody-0.ebuild b/acct-user/prosody/prosody-0.ebuild
new file mode 100644
index 000000000000..223aa45c40f1
--- /dev/null
+++ b/acct-user/prosody/prosody-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="A user for net-im/prosody"
+
+ACCT_USER_GROUPS=( "prosody" )
+ACCT_USER_ID="115"
+
+acct-user_add_deps
diff --git a/acct-user/reg/Manifest b/acct-user/reg/Manifest
index ff784eb25fb7..8111b6041785 100644
--- a/acct-user/reg/Manifest
+++ b/acct-user/reg/Manifest
@@ -1,2 +1,2 @@
-EBUILD reg-0.ebuild 264 BLAKE2B bfb9e0ab960734d7c9c8b924e699b89e1080453662dbb19ac2349be50e720acf4191c97488d92b4ea31f5f97d3999d76b740e5b3f79df4dbad171c3c55a5ecbf SHA512 2f5e33c3fa88bf2480093c2bb18f400fa0f3ebed916033f7a610b514e06334218c7f14e15312276c671171c37b21936cdd9c19d54e12b8cd7f11d6dbb8b8cf5f
+EBUILD reg-0-r1.ebuild 265 BLAKE2B cf741dc6e184815605434c18d229e611d39b8e4d0dbf7aa81676973bd58e353e1e7cc892ce15c17ed0ded6097c87284faa1ea9bce2c4371c2a65c4befd7bae97 SHA512 5de7c9058feba1c7b4505a1e82bea7a28fb3b6a276ece9c4f1d1ba6b4b70d6c33131f95d58ba45fca72491e20a57be17596ce789c5b2964c953a4619e0394fa3
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/reg/reg-0.ebuild b/acct-user/reg/reg-0-r1.ebuild
index 8dbc96cdd96d..52db0f73e1cf 100644
--- a/acct-user/reg/reg-0.ebuild
+++ b/acct-user/reg/reg-0-r1.ebuild
@@ -6,7 +6,7 @@ inherit acct-user
 
 DESCRIPTION="A user for app-emulation/reg"
 
-ACCT_USER_ID=94
+ACCT_USER_ID=503
 ACCT_USER_GROUPS=( reg )
 ACCT_USER_HOME=/var/lib/reg
 
diff --git a/acct-user/root/Manifest b/acct-user/root/Manifest
index 18182d2a31b9..0a61f74ddd76 100644
--- a/acct-user/root/Manifest
+++ b/acct-user/root/Manifest
@@ -1,2 +1,2 @@
-EBUILD root-0-r1.ebuild 342 BLAKE2B 36bcf65b475ca1ceb6713b7ebd187087f9e12bba31a959fcc32a170acc704ba155b236b8ec77b32ebb3edf9be93180e26b9c8dba18d9545325d3a6e31b0fec51 SHA512 dbaabdb7cfde2715a215ab3e0bcb4bf625eb82c920f5dd9e31d6f4fd25a3a6583c8ef12be6ab442d9196f8171cc93ad8c0bebfe95b7047efb41a9b220cfd5e39
+EBUILD root-0-r1.ebuild 441 BLAKE2B cf2d3fa5c74c9dcb45786eaeabad00969a0cde6091bc495dadce313767b36edbd5debef38b94f55b7e9519d0c67102c994b3f5e9fd48ec367c38af63969dfe18 SHA512 6f11fae662873287cf6c341a145998394b8ab2bbdc67d672a206140b3f9dcc3cf45c174e2766eca73daced0c5a1dae06a9f957cb657ee6a06be68ab6d42a5036
 MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/acct-user/root/root-0-r1.ebuild b/acct-user/root/root-0-r1.ebuild
index f85c77b4cd56..ea2e82dfcf29 100644
--- a/acct-user/root/root-0-r1.ebuild
+++ b/acct-user/root/root-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,10 @@ ACCT_USER_HOME="/root"
 ACCT_USER_HOME_PERMS=0700
 ACCT_USER_GROUPS=( root )
 
+# Avoid reverting changes by the sysadmin.
+# https://bugs.gentoo.org/827813
+ACCT_USER_NO_MODIFY=1
+
 acct-user_add_deps
 
 pkg_prerm() {
diff --git a/acct-user/subsonic/Manifest b/acct-user/subsonic/Manifest
index a5e99f199938..da78619d0032 100644
--- a/acct-user/subsonic/Manifest
+++ b/acct-user/subsonic/Manifest
@@ -1,2 +1,2 @@
-EBUILD subsonic-0.ebuild 289 BLAKE2B 8688d4f05adf1115b5ddb59dad30c39fc7a45549819280a3309b9007fd24a0209a17d918dc90cd4b8b8e0336231682db5e5605701acb66a4514d17897b07c25a SHA512 5c4639de09d9c93b85cb43de9f28598fb522896bc71e594a16ba3331c3d5524e7077b39855d7dd287eecad88be539bcbbf6d8c89ed1074371bf966cf4c24ce19
+EBUILD subsonic-0-r1.ebuild 289 BLAKE2B a423eab553884b0ef6fa011c946b1e416294118e08d09dbaa036db45e348613869b23199e032b21e38bd16f154a706862b9d3b017266acba132446367d836b7a SHA512 8273e612e96c6a3a6107de37227ce4948c8a1600b7a3ad78258f92f04645022894ef477f9172fb2be8a9743607e8687beaa21e8700b51bf124df8b2e2af0767c
 MISC metadata.xml 248 BLAKE2B fc6c49e6d2a9807728c39d8b35e23c41446ef45106e9e400926334eecc4fac18c2614dfa18e68888f2e8c7d9356468794734ad0b33bbdf632f690a1c3dc4df34 SHA512 d9e2f282ed49c5ecde0d12d63ebcc971b7c487b9cdac14fe57790cc89a5984ea62bd0ba7c9aed86679598e7704c38f1767e0222d7f54c694f4328a9c4b9d36fa
diff --git a/acct-user/subsonic/subsonic-0.ebuild b/acct-user/subsonic/subsonic-0-r1.ebuild
index e5a5b6d412ec..6ca134e7f2a6 100644
--- a/acct-user/subsonic/subsonic-0.ebuild
+++ b/acct-user/subsonic/subsonic-0-r1.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="A user for media-sound/subsonic-bin"
 
 ACCT_USER_GROUPS=( "subsonic" )
 ACCT_USER_HOME="/var/lib/subsonic"
-ACCT_USER_ID="126"
+ACCT_USER_ID="136"
 
 acct-user_add_deps