gentoo (valentine's day) resync : 14.02.2021

5 files changed, 85 insertions, 9 deletions

diff --git a/gui-libs/display-manager-init/Manifest b/gui-libs/display-manager-init/Manifest
index 24989ab214af..85de95cb1e32 100644
--- a/gui-libs/display-manager-init/Manifest
+++ b/gui-libs/display-manager-init/Manifest
@@ -1,7 +1,8 @@
 AUX display-manager-setup.initd 224 BLAKE2B 8513295b8c315d71521ac24fc9da1878e32044ebe7b6e37afb77a25eb8ec449568a82e516fd04de7fb2b0f0b5ff355a54a257041616d0035b25d0ae191e336e4 SHA512 d0048fc5b3c0fd92a44b71f7b8132e35787e42095c22f53aa41c10505c219eb25015f76163069aab7ebb6f0ac9feeac62d1b74682fd3947e835ea5de36957727
 AUX display-manager.confd 608 BLAKE2B 814b4d36ce74d2f70a771cda31c3b9f6e21246bef681607d2687b3ed51f1baab8752fe94ad1021b9fd81b3e8444a328d2c1de83718534ea722ef9dadcbdca164 SHA512 40fb28fb6ac06b59fed9fec86816a444f53ea499bb9a7e7a072a5a932b45a29f830b9da9de0954b1f5cb21903c08ff5c997db2e32ee0bb1a300cd6c070cc8aa6
-AUX display-manager.initd 6145 BLAKE2B fb1debd71978b157c185d9a7065c7f630a0d64839652b3882e6f69823444694f4a7fb347a49dcff35c11a9df94b5e8dcc85eac8351ce9a9992c23a13e67eb669 SHA512 5ea8c89d29c03ebf814a5bd036387bf9d8e65962f402b6ea2ce26e3c99f2972fc971b3b6e5e6971a3f1dc559a6d0ddf8b7f5b7f2170bafacfa79653cf3c5445d
+AUX display-manager.initd-r1 6201 BLAKE2B d30dd3c2cfc651c48e4f5a25ddae401894c994286fd5dd5c3668de92e107fdd36a7c14d47f0c080854004aaf6f9cfe7e0a41abee552a69077ed4c795ce834623 SHA512 fdef2ff2eedda6c0b262f5f1fa4b0f3c9bea56b575956b308c2fd145eba204c3cf9f336b6348cc12dd342bcbb64ed2e49f3f82c143249d74c922ac472b786851
 AUX startDM 786 BLAKE2B c5026e862508e598a0b3e8940a5dffd697fecc109eef343ea0f91d72b1b6df927dd273a1e69cddbae7324b707c9cc7b2f2699c44d106100f2b32db28c331f331 SHA512 a35ef86109624f5adb4275906f8466ef8e7a62af93bf2038b5f44e713b446264f1ecb00ff8bb7bb498a89bdbf3b96e50ebf5a7a39471c3c4395506c92f907dcd
 AUX xdm.initd 200 BLAKE2B ec997b7080037a7197a6f75728d9075c846168115d705015afc6518e1e72d815cdf87c2e9e3f3ad950034599e548d015e530cb7821f83b9d289337908455c17a SHA512 4552215cc2cdffa3298a9136e2a22f600f55958d7f74b2d06bbf48568d8034ef24deea27ad9f8d6d100516b0efb4e2688c1f454dc556120f759b1da7fecd877c
-EBUILD display-manager-init-1.0.ebuild 1097 BLAKE2B e053ed6307efcfb8bfd28e031d675cfcf0283fe228eb61429c546568d902687d1ffc651195b15468c7dc56adbc0fff33c7dde0ed92203cda243ec5422fe62849 SHA512 97bd4912687bf6854c1837688ee90ada622857ea7c5fa9913d79d48b1523bd486becdf3a9b7810bd3ef11d9f43ed152a70fb159544b6e9cae11bb09d088334b8
-MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
+EBUILD display-manager-init-1.0-r1.ebuild 1643 BLAKE2B 710562e058ccc71a7a1a3dcf8fa902e0d51cf45ccc0f0667d55b347228256d28fc6a05257dc8800133dbe0e2fa1c06e1c9ecc1af4dbb1e69f00b2c5d0080aa15 SHA512 001d37f515186d70e4fe9314e2917935e4447b682ad6a9557c43f2ed3f45704faf42a30071748b3bfb5d26bf82605500adaa7b0e688522ad31ddbad1cc8c4d58
+EBUILD display-manager-init-1.0-r2.ebuild 1678 BLAKE2B 5802fc8de7652abf1317fac29763209c166406e40850beb11ee68b78020f475ef0079e1d48de50b5cb21ac94b81a45ab7259c11411c0b0378c89b2683ec0857e SHA512 3a267dfc891555d48e0e57bd3c362100f20cc2378a1d184914cc18344495064d5d7575cf6ed162fb5a9abd88fcf70ed53ffdf235943945b046546e94d4dd1fc4
+MISC metadata.xml 258 BLAKE2B 4597deb2f1355078e78791baad22d30ec067357a50f01a817b3fdd239e794a4255ac4e59908b7d9d2e276e455fd352320ab46f37dbfd7df036f64c0bf3cc4900 SHA512 d97af5111022f569340bb378949f4f70ab33607c1d5dc027eff7d64a7a2ed64238710f8bfb623e01e01d48c7b1db60318ac340b8a4279d7fa6984f35a083b2a8
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild
index 576a0a7c887c..d5a588002df3 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.0-r1.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
@@ -7,10 +7,10 @@ DESCRIPTION="RC init files for starting display and login managers"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
-S="${FILESDIR}"
+S="${WORKDIR}"
 
 RDEPEND="
 	sys-apps/gentoo-functions
@@ -21,7 +21,7 @@ RDEPEND="
 
 src_install() {
 	newinitd "${FILESDIR}"/display-manager-setup.initd display-manager-setup
-	newinitd "${FILESDIR}"/display-manager.initd display-manager
+	newinitd "${FILESDIR}"/display-manager.initd-r1 display-manager
 	newinitd "${FILESDIR}"/xdm.initd xdm
 	newconfd "${FILESDIR}"/display-manager.confd display-manager
 	exeinto /usr/bin
@@ -32,6 +32,23 @@ src_install() {
 
 pkg_preinst() {
 	if [[ ${REPLACING_VERSIONS} == "" && -f "${EROOT}"/etc/conf.d/xdm && ! -f "${EROOT}"/etc/conf.d/display-manager ]]; then
-		mv "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
+		cp -a "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
+	fi
+	local rlevel using_xdm
+	using_xdm=no
+	for rlevel in boot default sysinit; do
+		if [[ -e "${EROOT}"/etc/runlevels/${rlevel}/xdm ]]; then
+			using_xdm=yes
+		fi
+	done
+	if [[ "${using_xdm}" = "yes" ]]; then
+		ewarn "The 'xdm' service has been replaced by new 'display-manager'"
+		ewarn "service, please switch now:"
+		ewarn
+		ewarn "  # rc-update del xdm default"
+		ewarn "  # rc-update add display-manager default"
+		ewarn
+		ewarn "Remember to run etc-update or dispatch-conf to update the"
+		ewarn "config protected service files."
 	fi
 }
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild
new file mode 100644
index 000000000000..3c54378da256
--- /dev/null
+++ b/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="RC init files for starting display and login managers"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	sys-apps/gentoo-functions
+	!<=sys-apps/sysvinit-2.98
+	!<=x11-apps/xinit-1.4.1
+	!<=x11-base/xorg-server-1.20.10
+	!=x11-base/xorg-server-1.20.10-r2
+"
+
+src_install() {
+	newinitd "${FILESDIR}"/display-manager-setup.initd display-manager-setup
+	newinitd "${FILESDIR}"/display-manager.initd-r1 display-manager
+	newinitd "${FILESDIR}"/xdm.initd xdm
+	newconfd "${FILESDIR}"/display-manager.confd display-manager
+	exeinto /usr/bin
+	doexe "${FILESDIR}"/startDM
+	# backwards compatibility
+	dosym "${ESYSROOT}"/usr/bin/startDM /etc/X11/startDM.sh
+}
+
+pkg_preinst() {
+	if [[ ${REPLACING_VERSIONS} == "" && -f "${EROOT}"/etc/conf.d/xdm && ! -f "${EROOT}"/etc/conf.d/display-manager ]]; then
+		cp -a "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
+	fi
+	local rlevel using_xdm
+	using_xdm=no
+	for rlevel in boot default sysinit; do
+		if [[ -e "${EROOT}"/etc/runlevels/${rlevel}/xdm ]]; then
+			using_xdm=yes
+		fi
+	done
+	if [[ "${using_xdm}" = "yes" ]]; then
+		ewarn "The 'xdm' service has been replaced by new 'display-manager'"
+		ewarn "service, please switch now:"
+		ewarn
+		ewarn "  # rc-update del xdm default"
+		ewarn "  # rc-update add display-manager default"
+		ewarn
+		ewarn "Remember to run etc-update or dispatch-conf to update the"
+		ewarn "config protected service files."
+	fi
+}
diff --git a/gui-libs/display-manager-init/files/display-manager.initd b/gui-libs/display-manager-init/files/display-manager.initd-r1
index e650df9600e8..9402e969f4a5 100644
--- a/gui-libs/display-manager-init/files/display-manager.initd
+++ b/gui-libs/display-manager-init/files/display-manager.initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
 # This is here to serve as a note to myself, and future developers.
@@ -46,9 +46,11 @@ depend() {
 	# (#291269) Start after quota, since some dm need readable home
 	# (#390609) gdm-3 will fail when dbus is not running
 	# (#366753) starting keymaps after X causes problems
+	# (#768834) race condition with elogind
 	after bootmisc consolefont modules netmount
 	after readahead-list ypbind autofs openvpn gpm lircmd
 	after quota keymaps
+	after elogind
 	before alsasound
 
 	# Start before GUI
diff --git a/gui-libs/display-manager-init/metadata.xml b/gui-libs/display-manager-init/metadata.xml
index 7a7bbf810544..303dfce27f8c 100644
--- a/gui-libs/display-manager-init/metadata.xml
+++ b/gui-libs/display-manager-init/metadata.xml
@@ -5,4 +5,5 @@
 		<email>x11@gentoo.org</email>
 		<name>X11</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>