gentoo resync : 22.01.2021

3 files changed, 32 insertions, 4 deletions

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 5dccb89f82af..298b93de03a9 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -2,9 +2,10 @@ AUX elogind-241.4-broken-test.patch 436 BLAKE2B 204591800f415b00535bcd520435ea91
 AUX elogind-243.7-nodocs.patch 999 BLAKE2B f4fc95f14ce0412e88bb8b2a001975fae3b42bdf82c1f23b28e4b2cc635d92722c6317ac919bedd1dfbcc47faf4a177d6662b3b04569ce993e1b8fd5ce8bde15 SHA512 87c6072f95b9fe752324ae8dce576a70f795c31115f4b7478cd66c0ab22e50d0035620b5a278f042bc95635423056b1a7984ed81b32e9011dee84b9a5dec7566
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
+AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a4f0f2c166b4062ebc6b01f201f1b7d1f22f6781c51ac22f924136c83c0b0cdb29d6aadf640a6c0e8 SHA512 97d78afe1c0833f3f632272904bd8338869639facb79cd2fae6a4bf58fc5b2dd960484e1f9945152ff13d075216cf4b48b6b234eb7738fbbf445eee2c20e88f2
 DIST elogind-243.7.tar.gz 1338186 BLAKE2B f3efc2af50f56c2cda18d721c18f4d88ca608fb35b2c7e2ebb35c3f3f743124dcf17efcc9db47810a13093397b1c1bc82cb42e017b3db493af5d2bb70bcf0eff SHA512 fd17c5016d083d63805f9ed0326ee32597870f6c48c9c246712cb09a77db775036b0fd0f4258b6557e189a1eceb4b50f4ae2e9e7881f4d9759b87a0b49ce3472
-DIST elogind-246.9.1.tar.gz 1534991 BLAKE2B 3360b5a2504156ea3c3b965f11db305bc1a7cb761bd4c2ca73a00005dbb62db37dec35d07f7939917bac61e0573a9b6224eb094853001c4d522b0c8bfde54a13 SHA512 b409568630ac20c1e984d9389237533e67ce4ad0fe0e0d47ad3fd943e579971412bcbdb922f2929bc5e9f26198647d3436beadbde0bfed4ae730107611a69e48
+DIST elogind-246.9.2.tar.gz 1534982 BLAKE2B 428def0f577cb92c8167f4400a59093ebf738d14b449e0dc59f1aa59da2c0f781db62bffc4bea2649edbfcc06ff5799ab24243dfb580eaa12c5cf0c41be8fc17 SHA512 b50d319793307a425d7542626e8cf27e56fb5e5c75cca9519cd3f5a1e7c387c4179310b95fa083f8bd8172384f16c0e45e7000b313d2bcf84ed8aba98dc775c1
 EBUILD elogind-243.7-r1.ebuild 4133 BLAKE2B 50218c57ea3a2f8ac9d3a24702ea9cf4b116caec19af85bf2b6966cc73d0f9046b5608e53c30e2534134f317adce0646db7a2d499357d8c6321bcad8e3367c9d SHA512 adef0c04b80c8cd91317ecb26c18d8690237e50f68cb91e1edcaf762fb6182841a0b2a9e6e53f7bb70367537935e89f5e849b21586fcab2e700b4c2179c8a2fd
 EBUILD elogind-243.7.ebuild 4055 BLAKE2B 1eee3558814325ccd0f107bafc3eee1facbf7d15eb901073f9d38e25ec1669c1fa8b95c7a2a0e552eec41d96f0da332d6e2d01c0a31a20af8e1aa6d8cd91545d SHA512 182abf35ceccc60bcbbc31534b590b6a7c871a2142efc21ca1d0013f651952502e7d15b43c0f8f9c7e5d37db9cb0307867b19e36ccf49cce9a718ec5753c2315
-EBUILD elogind-246.9.1.ebuild 4140 BLAKE2B 71fa6124df423d6c737bc0818b3ddf998289c4eece8ff01d7c93c3db1df0a903516de97d76c54e70d3e344ea76e5f26e030f03262892a9e6167a351fe50408a4 SHA512 b4552a6a8bbfebe0ea400cb118582f50ecaa2e6abb30b036eb9823cedb9122b2fb1dd599d8de6a45f27549a16e32b4d4c61129437d460fd80462583586291038
+EBUILD elogind-246.9.2.ebuild 4143 BLAKE2B 23ec1b60f22a737310fd0d7586054691df49b135baefc6fba8a8bc31410233b7709c17d9a81ef2bccc8b3b0da58bf161b86cb867e839f1656c13ce12bde42c87 SHA512 81d3cc1a890ddadf99a9a39cfa1a599d3936931e804a56aec1eb7c4b66bb282cc94f9d3cc6882a64dffa79e4e6f8a72afa38524e3ab5fdf75f51cc51446ce18f
 MISC metadata.xml 492 BLAKE2B 5a8b55fb5fd3c98d72f0f003e69275d50a511c2cfa8b8c15c3e06c105b96ad19515e0144c9cffe5e6a86002656a2101ab811c6b9178ece9b050a32f65fd9ebd2 SHA512 220bde659ec75567f5d78eca23fa7e03f49a829cb1c08abe66be3d22ae2d7dd7ba2f177fdb33642a2b0ffc125abe7547d6a77153e88de9bb62d7009a898e8969
diff --git a/sys-auth/elogind/elogind-246.9.1.ebuild b/sys-auth/elogind/elogind-246.9.2.ebuild
index afcc828ef599..79d70653448e 100644
--- a/sys-auth/elogind/elogind-246.9.1.ebuild
+++ b/sys-auth/elogind/elogind-246.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -106,7 +106,7 @@ src_install() {
 
 	meson_src_install
 
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
 
 	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
 	newconfd ${PN}.conf ${PN}
diff --git a/sys-auth/elogind/files/elogind.init-r1 b/sys-auth/elogind/files/elogind.init-r1
new file mode 100644
index 000000000000..1cb5071c621e
--- /dev/null
+++ b/sys-auth/elogind/files/elogind.init-r1
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need dbus
+
+	# Make sure elogind is up before xdm starts any dm
+	before xdm
+
+	use logger
+}
+
+start() {
+	ebegin "Starting elogind"
+
+	start-stop-daemon --start --quiet \
+		--pidfile "${ELOGIND_PIDFILE}" \
+		--exec "${ELOGIND_EXEC}" -- --daemon
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping elogind"
+	start-stop-daemon --stop --quiet --pidfile "${ELOGIND_PIDFILE}"
+	eend $?
+}