gentoo resync : 25.11.2020

4 files changed, 50 insertions, 56 deletions

diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
index a25541d522d0..fa0347c14c5f 100644
--- a/net-im/jabber-base/Manifest
+++ b/net-im/jabber-base/Manifest
@@ -1,2 +1,2 @@
-EBUILD jabber-base-0.01-r1.ebuild 1523 BLAKE2B 5a6b5e838f60306102b7ad4f9670397b0d793cbd3e3061c0b5516007f5ae0fc35afed8909f8d1d3e79e68be80af2989547c610fe4618bd17a63df8f954c741d9 SHA512 b6adbf729cb5e49080c07994cd729c357d91b2571b2d025246793c14256811d6643be53b8f6f6e9fba22196bb12913e810bd2590f3fc0ae01bff1fd0c53c0a4a
-MISC metadata.xml 363 BLAKE2B d39b7cb71af89d54bcd663508abec175512058c81d0ecc11cbcf76455e40dbf36c5641bf943266e8f7ce0a7f6bb5807f0fbfe78a2d04054178bf99c15dc1060a SHA512 44bd244e6521f2132804357972d71f92e704471a42828f41b334966d02509c948674aaf20f7c61ff33c2432467cd6b021c30a27bcd851fdedcc7f353903f8462
+EBUILD jabber-base-0.01-r2.ebuild 1244 BLAKE2B eecbd938e95afac047211d66f526324f03ac7accd0ce8e5b37910b6589de020c86b263df2ac44b684fad82898001d057c1f387182bba319b2ab84568b4ced960 SHA512 297eedfc04deddd5427e562b9eaac0afea64daf5cd73dff4a5e401330ba164e13dd969322ba532b953a478b4196637b12e82a51c9f644e729f3df606e39f09dc
+MISC metadata.xml 432 BLAKE2B b9284f76265de518e5ed2d8430da8501f61ff7b66f55db68f0136df7794e92dd9055bd5655d02c7110b5f0d21da2a319a846d89386c11d71911b886920d3674c SHA512 23c78c4f115f8871ccdc279aa0c62dd723945894fd14dd42c1e09654d4e8762a9d703c29015d3ca4539485b6eb63fb884e9034f037d5c492450bc64943148b92
diff --git a/net-im/jabber-base/jabber-base-0.01-r1.ebuild b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
deleted file mode 100644
index ea75b4d57216..000000000000
--- a/net-im/jabber-base/jabber-base-0.01-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Jabber servers and transports layout package"
-SRC_URI=""
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S="${WORKDIR}"
-
-#Info for people working in jabber related packages
-
-#/etc/jabber/ for configuration files
-#/var/run/jabber/ for the pid files
-#/var/spool/jabber/ for the flat files databases (actually there must be a ewarn
-#at end of ebuild telling user to creat /var/spool/jabber/JID, as some transports fail to start if
-#the directory is not there, even if they have permissions to creat it)
-#/var/log/jabber/ for the log files
-
-#for the python based transports with no install script:
-#they must inherit python and be installed in:
-#$(python_get_sitedir)/$package-name
-
-#the user should be the one created here username=group=jabber
-
-src_install() {
-	keepdir /etc/jabber
-	keepdir /var/run/jabber
-	keepdir /var/spool/jabber
-	keepdir /var/log/jabber
-}
-
-pkg_postinst() {
-	# Users should not be created in src_install see bug #124680
-	# Add our default jabber group and user
-	enewgroup jabber
-	enewuser jabber -1 -1 -1 jabber
-	# We can't use fowners & fperms convenience wrappers as we are outside the sandbox
-	chown jabber:jabber /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
-	chmod 770 /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
-}
diff --git a/net-im/jabber-base/jabber-base-0.01-r2.ebuild b/net-im/jabber-base/jabber-base-0.01-r2.ebuild
new file mode 100644
index 000000000000..e054f2b5b47c
--- /dev/null
+++ b/net-im/jabber-base/jabber-base-0.01-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Base layout package for various jabber services"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+
+RDEPEND="
+	acct-group/jabber
+	acct-user/jabber
+"
+
+# This package provides the base layout for all jabber related services.
+# Each service should use the user 'jabber' and the group 'jabber.
+#
+# The base layout contains of the following directories:
+# '/etc/jabber/'	: All main configuration, by jabber services used, is stored here.
+# '(/var)/run/jabber'	: All pid files, used by jabber services, are stored here.
+#			: Please note, that this directory should be
+#			: created dynamically by each jabber service during startup.
+# '/var/log/jabber/'	: All log files, used by jabber services, are stored here.
+# '/var/spool/jabber'	: All (flat) database files, used by jabber services, are stored here.
+
+src_install() {
+	local paths=(
+		"/etc/jabber"
+		"/var/log/jabber"
+		"/var/spool/jabber"
+	)
+
+	for path in ${paths[@]}; do
+		keepdir "${path}"
+		fowners "jabber:jabber" "${path}"
+		fperms 770 "${path}"
+	done
+}
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
index 1eebfe0ed7d2..3052e573aa4c 100644
--- a/net-im/jabber-base/metadata.xml
+++ b/net-im/jabber-base/metadata.xml
@@ -2,10 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
-		Package that creats the users and directory's for jabber
-		related packages. See ebuild for more info.
+		This package creates the base layout,
+		which is used by several jabber services.
+		See ebuild for more information.
 	</longdescription>
 </pkgmetadata>