gentoo resync : 22.12.2021

19 files changed, 178 insertions, 16 deletions

diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index d0da22dbfa6b..f49c5b8ffd5a 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/ejabberd/Manifest b/acct-user/ejabberd/Manifest
new file mode 100644
index 000000000000..e98bf091f46d
--- /dev/null
+++ b/acct-user/ejabberd/Manifest
@@ -0,0 +1,2 @@
+EBUILD ejabberd-0.ebuild 236 BLAKE2B fea7d577d255e090cf62c0d2228b1098ff177f9a46943c624aa599739f09089507459ef89beeeb0782ddb129268ec43540be5c03e8a9ff85130e20b568e8b24b SHA512 bd44e80f3c9e3236a9a98a088b4f0891ff647efe40beee1f532b2386f07069d6fbb83f5e5665b0a1b7ae72bdd9db74bd35e7d02ecae74c57729ccaf5fb5c1ee2
+MISC metadata.xml 327 BLAKE2B e2fef9e407b36d9097b4e139fc22f8a390d3a9468ce471d2cea8d4e9cf41a27b52871fe1e62c6986561338948db688aeb115f64e8dfcf542face361b9eb3ccd2 SHA512 650c51220755586eefc829aa8cebd394c198676b347f5c9e3c92f39e1ad8eef847e45c949b6c80457c942c98fcb8f9fe58d651e9fd25b71f9e07c1e052262657
diff --git a/acct-user/ejabberd/ejabberd-0.ebuild b/acct-user/ejabberd/ejabberd-0.ebuild
new file mode 100644
index 000000000000..db8ac6554fa9
--- /dev/null
+++ b/acct-user/ejabberd/ejabberd-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/ejabberd"
+
+ACCT_USER_ID=114
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/ejabberd/metadata.xml b/acct-user/ejabberd/metadata.xml
new file mode 100644
index 000000000000..d199a5d1bcc9
--- /dev/null
+++ b/acct-user/ejabberd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ejabberd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/lxc/Manifest b/acct-user/lxc/Manifest
index 9edaca6b1c86..9e82121c7aad 100644
--- a/acct-user/lxc/Manifest
+++ b/acct-user/lxc/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxc-0.ebuild 230 BLAKE2B a6137bdebba906c7e213e2969a8853f60ffb1d229eac7e27b95525602d54fa32cd15b2f63623c817dd2f8fbf0c67b8e8a64f9121cd6734c5b04455ec3ff748c1 SHA512 cb9d4beb92eb1a99e192de654ffae98519b45bbd5e2d7df34ada798fc4dbe2d20dd444d0bc5a943b4c663893ba602e9ef9cd25ece105fad06b4b04b8399a06e3
+EBUILD lxc-0.ebuild 231 BLAKE2B 28c282a5600e0cdb01ed2f9d801a70781af66d97773c15ffba9f4c5c00b826d8890433589e75df9ac118df079a556c681f1731ebb50369c9e9baa2c72de6dd40 SHA512 5002765f63eea0fb5cadb4d79ab498a8599da84c652f09c83c2b3a47457bf18574824b62828aa22945f13b7ddfecc832b79e8c655e40a5cc41f6bbea2d71464f
 MISC metadata.xml 278 BLAKE2B eefaeacc4adbdf7808105113674a97a8aad48ba4b6ac35ab0db401ed86739e62b5cceb545ccb8185d74e660c6222bc21cff58ac8cdcd6443e1acb5be5122e3d2 SHA512 415abb61e906b24fd0acd5cdd10299585b7ff38d24ae4db63d93f715e4efc86c49d7db13488b1b6405608bd60a4b75e949fe75fe93debaaafa28a392407bfa37
diff --git a/acct-user/lxc/lxc-0.ebuild b/acct-user/lxc/lxc-0.ebuild
index c0bf316bb091..1ea4ec8d2826 100644
--- a/acct-user/lxc/lxc-0.ebuild
+++ b/acct-user/lxc/lxc-0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit acct-user
 
-DESCRIPTION="User for app-emulation/lxc"
+DESCRIPTION="User for app-containers/lxc"
 ACCT_USER_ID=358
 ACCT_USER_GROUPS=( lxc )
 
diff --git a/acct-user/radius/Manifest b/acct-user/radius/Manifest
index ab9391e6218e..cfa124cf5174 100644
--- a/acct-user/radius/Manifest
+++ b/acct-user/radius/Manifest
@@ -1,2 +1,2 @@
 EBUILD radius-0-r1.ebuild 233 BLAKE2B c92dba45cb0be09ed08d2c3c675170ddf3dcd909ffb7c56d60fecdb98bcd4077470a7946d4f630ba271f671fa562496981b0bd8418cd57b188f0419cb2dea2d2 SHA512 9cd75d55de303b1c8cb16a9fe39d975b9020cfdc303f1caac5c77c226b72e8aabec1aafcc8efe3d5c7489bfbce2b5f9b8e3b500ca0c5d2a218f4521f9e12a9c3
-MISC metadata.xml 395 BLAKE2B 5a2d331fc9d4236bc0ad19b4f316db903f64c969c37b86ec78cc2aad01d2429cdb7cb578184c7004de7c1c6c947c757f8db900cbcc6e098feeed9cb589ed9efe SHA512 95e0b2e3d390bca370f60d4dc5e224c9d41ea96dfce9cc371c2a32f1e6653c855886868e0fa9ffeecaf44b1c7d8f68ab6675557ad5ee64f3e9fa5cfcc11de640
+MISC metadata.xml 169 BLAKE2B f97e770609744c72ba2fc05bac60582959f25c4cf8dd7b0f65208fc7078770bbab6cc11db8894b6aa4362c1f2b6ab54ffd925ced1dc796cd02d8528882f9d454 SHA512 7a46ba961797f936df2f35f0796a6d474ad8bc992faae5be38f0050b22a6fde87decb42a148c235e0803b99a6f0b3c390aa21b6c2463f6b5fdaa91f9f76ebd60
diff --git a/acct-user/radius/metadata.xml b/acct-user/radius/metadata.xml
index aeaeea373703..fcf1cd64f680 100644
--- a/acct-user/radius/metadata.xml
+++ b/acct-user/radius/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>geaaru@gmail.com</email>
-		<name>Daniele Rondina</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/acct-user/reg/Manifest b/acct-user/reg/Manifest
index 8111b6041785..3ec4b02f6beb 100644
--- a/acct-user/reg/Manifest
+++ b/acct-user/reg/Manifest
@@ -1,2 +1,2 @@
-EBUILD reg-0-r1.ebuild 265 BLAKE2B cf741dc6e184815605434c18d229e611d39b8e4d0dbf7aa81676973bd58e353e1e7cc892ce15c17ed0ded6097c87284faa1ea9bce2c4371c2a65c4befd7bae97 SHA512 5de7c9058feba1c7b4505a1e82bea7a28fb3b6a276ece9c4f1d1ba6b4b70d6c33131f95d58ba45fca72491e20a57be17596ce789c5b2964c953a4619e0394fa3
+EBUILD reg-0-r1.ebuild 266 BLAKE2B afba4526f33416bffc04a02af10c3ebbbc5707893f32838ac489c6365cf787aca18a17a0fdd12c458c4328fdf640df7c91345e03ab8173d50e2993717b274cc2 SHA512 a24ecfba3bb6b449f6a50d923e902ecf74eb857fff5944803ef69c4a82ac378f8c999f598e6ecbc65adc3583cfd691c72a7de2b4c1ef96ae78d96552ef207fec
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/acct-user/reg/reg-0-r1.ebuild b/acct-user/reg/reg-0-r1.ebuild
index 52db0f73e1cf..57bb9a6ed18f 100644
--- a/acct-user/reg/reg-0-r1.ebuild
+++ b/acct-user/reg/reg-0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit acct-user
 
-DESCRIPTION="A user for app-emulation/reg"
+DESCRIPTION="A user for app-containers/reg"
 
 ACCT_USER_ID=503
 ACCT_USER_GROUPS=( reg )
diff --git a/acct-user/registry/Manifest b/acct-user/registry/Manifest
index 47aa2d51c87e..53c109158c6c 100644
--- a/acct-user/registry/Manifest
+++ b/acct-user/registry/Manifest
@@ -1,2 +1,2 @@
-EBUILD registry-0.ebuild 259 BLAKE2B 1b74a888c4a198116cf7976d27597ffae9b87df8637aa6789df2e1e26c03631fcfc23ac215721128ad5730c8959f3ec82cc0d9ca5270b67c531e7dc5133fa842 SHA512 4d35586e0eab5e067a876a1e977c39b76a8f5363ec3bb222eb917c4607a823e0947dcf39229489076b8d6d5fcf992b70d0dca8ddb25e02dd3dc53eb5a95cafae
+EBUILD registry-0.ebuild 260 BLAKE2B 38ee067d9a593df80ec11f19c3c19af3bda5663d8eb83c1d48c58a4e18580cbf2400ac28c8e79150ad8bc6767c4f4467baa5a80e7c329d6852371864c851cc8c SHA512 6bee03be6a291a91c41719da5a7cee74b995db22ff78c03980dc6ce037451a1f744dea08ac26aaed99e464477157aba6225b9f4a5512d9767ddb36fb23e7ef15
 MISC metadata.xml 219 BLAKE2B 44a2c7ca55a3cf5b2cb6d19700294cf260037f45a66ee2abfc5eedc2c82e04955c829d76aafadf9109324ac41cc6fa57a35d46a671b78aaccfa76bb7e901467d SHA512 e5f08f62aa629143ccb4f338f70cc8da2a1fd5e760e067624a16a1eaf2ebfa8fe25c8939c8f66568ee7b26d525ece2d1d08ad6e383d4ee7219048ec4f4c932b6
diff --git a/acct-user/registry/registry-0.ebuild b/acct-user/registry/registry-0.ebuild
index 93323d5b3713..5994a8162973 100644
--- a/acct-user/registry/registry-0.ebuild
+++ b/acct-user/registry/registry-0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit acct-user
 
-DESCRIPTION="A user for app-emulation/docker-registry"
+DESCRIPTION="A user for app-containers/docker-registry"
 
 ACCT_USER_GROUPS=( "registry" )
 ACCT_USER_ID="295"
diff --git a/acct-user/stdiscosrv/Manifest b/acct-user/stdiscosrv/Manifest
index 9cb682507cdf..2ac4ea99df44 100644
--- a/acct-user/stdiscosrv/Manifest
+++ b/acct-user/stdiscosrv/Manifest
@@ -1,2 +1,3 @@
 EBUILD stdiscosrv-0-r1.ebuild 316 BLAKE2B 51aa673f3f033d7ba7fbff43444d8281ad670a8e6af6d6ea3e522e5396c034c31adabe647f7d90931c192b00770a1ed30c26a6f16d07dfddf5c1f49932ed40ec SHA512 50a18cd26f7f6753d308a44ec56a089014037f0ddeab52c96bae9513aba2510d7abf35d6428b28b1337787fecaa9fa553ead771111f5864447a88ff6cdcc0d18
+EBUILD stdiscosrv-1.ebuild 682 BLAKE2B 2bd28a6db284f6ad8693703e16bfae5f7ce8183546b8e6945e0ae44cf01c32d2452eda673e39e63b42b741a449d66a09833a8337caa076603f5ec749b3630210 SHA512 c4147a460c29581da50c689107a467c9d61b559932eb56225bcc08d740d227578c2577cbf1011a2721c24aa89097644569bd4668db3dd9dc00a3560f01bd5e2f
 MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-user/stdiscosrv/stdiscosrv-1.ebuild b/acct-user/stdiscosrv/stdiscosrv-1.ebuild
new file mode 100644
index 000000000000..fc1db7a4a130
--- /dev/null
+++ b/acct-user/stdiscosrv/stdiscosrv-1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Syncthing discovery server"
+ACCT_USER_ID=497
+ACCT_USER_HOME=/var/lib/syncthing-discosrv
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local rver
+		for rver in ${REPLACING_VERSIONS} ; do
+			if ver_test "${rver}" -lt 1; then
+				ewarn "The home directory of this user has changed to /var/lib/syncthing-discosrv"
+				ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
+				break
+			fi
+		done
+	fi
+}
diff --git a/acct-user/strelaysrv/Manifest b/acct-user/strelaysrv/Manifest
index 25a4c3c102b1..2266b84d1f5d 100644
--- a/acct-user/strelaysrv/Manifest
+++ b/acct-user/strelaysrv/Manifest
@@ -1,2 +1,3 @@
 EBUILD strelaysrv-0-r1.ebuild 312 BLAKE2B 48b68b0086508e583867beb8368260106fff5b03dbae01f218d3c11da103938b17cc5e8de56a0dc90a244f06881ae306d122c063554cc2039ad68d7567ffe9d2 SHA512 0ff9a4715812d8b4afa9d4da64a83c4d399f45d4cad34f345c97cf3de7edb4d977d7e699775eaeaff348890f403278ca255c8978fd9c9d14871de44bbb73a56a
+EBUILD strelaysrv-1.ebuild 678 BLAKE2B a9d8047f40daf1c9b8b67edcdb577d4686a15c73813734f9ac26e84b76c2d9b5d0b00b5a67b0c4180550a25c78bc35f42e94c060699656d2e725f0f6cfdfaace SHA512 51322e2cd3b58282278e7a94489c74c7847587d08000131fb42368e2e30ccfcc27b701b08bae99b49ac7131cb333dead23042dadd63a770508414c5b993aeae6
 MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/acct-user/strelaysrv/strelaysrv-1.ebuild b/acct-user/strelaysrv/strelaysrv-1.ebuild
new file mode 100644
index 000000000000..c4b804d8160c
--- /dev/null
+++ b/acct-user/strelaysrv/strelaysrv-1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for the Syncthing relay server"
+ACCT_USER_ID=496
+ACCT_USER_HOME=/var/lib/syncthing-relaysrv
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( syncthing )
+
+acct-user_add_deps
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local rver
+		for rver in ${REPLACING_VERSIONS} ; do
+			if ver_test "${rver}" -lt 1; then
+				ewarn "The home directory of this user has changed to /var/lib/syncthing-relaysrv"
+				ewarn "If you have any files in /var/lib/${PN}, move them to the new location by hand"
+				break
+			fi
+		done
+	fi
+}
diff --git a/acct-user/vdr/Manifest b/acct-user/vdr/Manifest
new file mode 100644
index 000000000000..0e7f0848f82c
--- /dev/null
+++ b/acct-user/vdr/Manifest
@@ -0,0 +1,2 @@
+EBUILD vdr-0.ebuild 1949 BLAKE2B 4d724c7f96d41240af0fe4f19d9f27ee7ec0cdc061099084d26d30e1dd2e3b7484c9333b843bbc087d4b58b06a11b2bd05977767646900e8b9714189afe29b7a SHA512 f1df714e80706a0414ca938774bf96aab2a8c50d2c38737ff6efe61553dbfc60d55aad8f955d4fb2aa3c502f8ae10a615ddd42a498c90830a5cc42989109aed2
+MISC metadata.xml 1005 BLAKE2B cd363066d9d4e25d5b5a4d70805a8d5f06efc2cd1ddacc1cb92878d14b274c9e3f8ff60147c7148538cb41a4182b694a80aa24805507db4d92800941acb590d8 SHA512 fe67b020f0fc4546e1f8f1f9018247da78a77240032e10acc823c9a9248f1f99b8073c17ab0bf1b6970727d3b6f3dcd551c48f8ccf1d0e5346e47ecfe79b9a90
diff --git a/acct-user/vdr/metadata.xml b/acct-user/vdr/metadata.xml
new file mode 100644
index 000000000000..b0a6246a09bb
--- /dev/null
+++ b/acct-user/vdr/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<use>
+		<flag name="graphlcd">Prepare group membership for <pkg>media-plugins/vdr-graphlcd</pkg>.</flag>
+		<flag name="legacy-homedir">Keep old home directory /var/vdr of an existing installation. When
+			this useflag is cleared, the home directory is switched to FHS conformant /var/lib/vdr</flag>
+		<flag name="remote">Prepare group membership for <pkg>media-plugins/vdr-remote</pkg>.</flag>
+		<flag name="serial">Prepare group membership for <pkg>media-plugins/vdr-serial</pkg>.</flag>
+	</use>
+</pkgmetadata>
diff --git a/acct-user/vdr/vdr-0.ebuild b/acct-user/vdr/vdr-0.ebuild
new file mode 100644
index 000000000000..55986b2ff78d
--- /dev/null
+++ b/acct-user/vdr/vdr-0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user user-info
+
+ACCT_USER_ID=452
+ACCT_USER_HOME=/var/lib/vdr
+ACCT_USER_GROUPS=( vdr audio cdrom video )
+
+DESCRIPTION="VDR (VideoDiskRecorder) service user"
+IUSE="graphlcd legacy-homedir remote serial systemd"
+
+acct-user_add_deps
+
+pkg_setup() {
+	# if user wants to preserve his existing vdr installation,
+	# he can set USE=legacy-homedir
+	use legacy-homedir && ACCT_USER_HOME=/var/vdr
+
+	# media-plugins/vdr-graphlcd
+	use graphlcd && ACCT_USER_GROUPS+=( lp usb )
+
+	# media-plugins/vdr-remote, _only_ when systemd is installed
+	if use remote; then
+		if use systemd; then
+			ACCT_USER_GROUPS+=( input )
+		else
+			einfo "use-flag remote has no effect on systemd systems"
+		fi
+	fi
+
+	# media-plugins/vdr-serial: add group to access /dev/ttyS*
+	# on systemd systems: add "dialout"
+	# non-systemd systems: add "uucp"
+	if use serial; then
+		if use systemd; then
+			ACCT_USER_GROUPS+=( dialout )
+		else
+			ACCT_USER_GROUPS+=( uucp )
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# if useflag legacy-homedir is _not_ set, check if user vdr exists and what his homedir is
+	if ! use legacy-homedir; then
+		local EXISTING_HOME=$(egethome vdr)
+		if [[ "${EXISTING_HOME}" = "/var/vdr" ]]; then
+			ewarn "The user \"vdr\" exists on this system, his current home directory is \"/var/vdr\""
+			ewarn "The new default home directory for user vdr is \"/var/lib/vdr\""
+			ewarn "You have three options to continue:"
+			ewarn " - set USE=legacy-homedir for ${CATEGORY}/${PN} to continue to use /var/vdr"
+			ewarn " - move /var/vdr to /var/lib/vdr manually and repeat to install ${CATEGORY}/${PN}"
+			ewarn " - move /var/vdr to /var/vdr.old or anywhere else (to keep it as your backup), repeat to"
+			ewarn "   install ${CATEGORY}/${PN} and let the installation create a fresh /var/lib/vdr"
+			ewarn "the emerge will stop here."
+			die "user action required"
+		fi
+	fi
+}