gentoo resync : 28.07.2021

8 files changed, 39 insertions, 157 deletions

diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index f2e0f7c81762..4e19fd058925 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,19 +1,19 @@
 AUX Xsession-r3 4045 BLAKE2B 9c63f8a4641cf25dafb5fdfac5e6daaa596ded8a29ffd48ded57d3932b4213b0446296d67d5b87c0f0e32c104748007d1d5da483afda746fbb30ae3dd568607b SHA512 6c0bfba4c3f00b75d6b5fb0e0e8a492fa262b2d0f3c6382861d7f3a8c657e803151a2060e181439952649fd2acf6fa71b75811565f1156018027ec14a761f7d0
 AUX slim-1.3.5-arm.patch 289 BLAKE2B 039bde606b8ef06f007b87d622fa7f082c37c40b6a964684b1c79910bd1ad0487e43898f6b2f77642adadd65594a149463686d4abc448a8424536394e8fdafd0 SHA512 1d3a3a387433c8bfc9bff6ac3779e70e0e0ca5f65e6120dd83fb51d59dfa47facc6d31c6e955b737e41ebf760416015f7f12dc749e710957cbef274aa5d1d308
 AUX slim-1.3.5-disable-ck-for-systemd.patch 3303 BLAKE2B a0710043c99a7deed5c82b04eb96f9d96c060dc767805e3b3cd1cb6f6744fce069b1eee051ee4cf5f00f03740a6bf4db9b668b93b198dd70a79e7176bbf3cadd SHA512 64205963f8f56f012dd16c2aea18e2e4f4e155093d44222a512b242061b334b7faa9c3abdd1acc011213f0fed9007cf232da8c61e6cedc30c710b149fa841f04
-AUX slim-1.3.6-config.diff 2934 BLAKE2B caed851e9be3715a2e2fac8542a889ad9284f4b767e7a4dbcf1d26264802dba608efdab86aea896c4a9ba2ba448dd1901305253ad04245ead18988b318503b62 SHA512 afee976f30f563ed97187f40cdd618159545d7850e8af15bd5b30306c347cf8e5276c6c16938ce094bb589dcab8d88d5c368f7267dbe3f794a18f734f69ddf10
+AUX slim-1.3.6-config.diff 2938 BLAKE2B c1c71c5b2d9ebe3b0496324fae6f0f0de65cdf4f456a2f9611cd90450161e46f0fd86141107e503c66dded5908a93b036fdaff83c947a4df5f530192fefd7700 SHA512 92e1b710828b07b85e2fb150fc1fbe2c10ac8bddbf824016783510f990fcebf3157fdcc0f5c959785929a83b30a2edab66f443b8b1f71437857069a3177bc7cb
 AUX slim-1.3.6-drop-zlib.patch 309 BLAKE2B de904731cb6455aed2afaff288ff80d4f22565f64979001fa703488d92bcc4808597c1ea7771b690b80307ff32b33d0fe702fb441f55ecc46336c3a031562da7 SHA512 2aa62e5b7ad67df47009e4cff0b34b8ff6116e9d3d23194c8199ec06356fbf0660df6b807e530075d3dc5aa8e04dda29e7a6e1337212b58e3bae09e9543c0c22
 AUX slim-1.3.6-envcpy-bad-pointer-arithmetic.patch 583 BLAKE2B 2b73d2cd1cf0dcc703e21f72e73f2e66441455822b198709bd4b4ac89fa2c34e6d836893e2f9db2fba293225936c39df742dda65024dc8506a5e4afead0f11b3 SHA512 cec2a82cc57a3dc3eb67a40becb9ef562d1fc0c2e962cb0cdddf978d776c8139f616647e3ab25255a616d3b17ff3f67ecaf4d7d92fa6af8aaec3ccf30efdde9c
 AUX slim-1.3.6-fix-slimlock-nopam-v2.patch 839 BLAKE2B 49ff5a7d45a8684265ea46844e3a4d1fd88c9ed54ab5d7104976d8428825ed31a1326275ae2ab7bb1a58611de03478e91121f3e4e2a0e45367a3f724ab0195c6 SHA512 2251cd96801e593b387037d79014ea86fdec223d8910628fbfd0e9c5eafbe79c27ffb7f08123c89b635d33dc2bf9cf76e2964f5293352784c1e08c7b1c7427c0
-AUX slim-1.3.6-freetype.patch 426 BLAKE2B f76e4c57283be206a2b8d2c5622b8711c82ccdb469cdb635bb12c025eed67c656cc5793a0ce3b51e74d1fa759a75a223906a0153e4bf478b28601e1568ec4a25 SHA512 e7181993d305b5dd2d27c9c44ffa944c07a5fc9342c70a12f2f8283dff61db7ee3dc8aac50a566104dfb50ae06777b52835a4a2c3e19ad0e82b22a9487cd71aa
-AUX slim-1.3.6-honour-cflags.patch 499 BLAKE2B bb2fe524f7204e52b5da4c6673457b65e7b5832af71610f533f7b4b581fb7376a7bd5324aac40168347fe4ac100360516ea8b8b278c9b39f3b429d520f436337 SHA512 bbc99d396d30e034100e468d8d5a69cee3bc26eb6029793bdb95f29bd6364f680baec13e12e9ca7dcf01d84de3d8d45712462de36f6f729c7f8c232865a71a7a
+AUX slim-1.3.6-freetype.patch 426 BLAKE2B 32a5308e26686687e08ffb98981d6438b4d94ad8643d05efdfe693b7a94b4f67b931a5803edb910715bd9a4744bee8bd99d8568a55f4febb460e87d9fe00cda8 SHA512 4df9b3dbada712f380efcdf5cb929a14f3f80c4149919df1a2ecdc3aad67d079fe120ff7cd03c0ebc962654b5b1de4c4212e939a63ec1a76b85098ce9e98129b
+AUX slim-1.3.6-gcc11.patch 310 BLAKE2B 2e859b020b8a1fb10be2279ee5c02690191a88347a2d8cf4249218bb7f40963737d55aff05408245958a8892fc61c4711f57a9f6749335d9a829da98b9f226d7 SHA512 6c25d2cc9a51fdad50637b37244db97bc3d4a2fde1909b9a38b38b4a90844174a29f85d74ed4c99364961407aea7b9e2bf34337cc3b3e485bf10e3510de097e3
+AUX slim-1.3.6-honour-cflags.patch 503 BLAKE2B 26c5c6221380705512b8a3f9dce5a1ce38e250fde0747d80a556bbeef0dee5564913a48119afb19bae3d0cb0e681a0c5635536461b1c9d823aca9bc8c807f655 SHA512 088df919ea8952e2e544f9546ae97c3d012fbb454491118f48301010337a46882ceac3ff6afeb0a13c8615e0ff7d0394671ef62fb42bd78792855b1c17007ef7
 AUX slim-1.3.6-libslim-cmake-fixes.patch 852 BLAKE2B d4879e855e0cb0e1b2409890ed4d373bbd65a54347d8d8a5c67287d6a88d39e572af21d92008e629a3f674b99c0ecf2cb8ab2f2e42631a9d0b9fdfe1c9a9b10e SHA512 457e23e193c6b9ecb5335accad444470ffb2e0109550d041385bba2b6036fdfac8d48e031574e4229d8b8768a7a86f6d6c191b214540f1156a2a13e5a9f3451f
 AUX slim-1.3.6-session-chooser.patch 3994 BLAKE2B 48990db75196e9da4022af1ecf8ae509453d2e001d44327eb89fbb4513d661ac3b3bbbdbe8e85ca34dabbf179d84076b584401cb777c28beef1860f28425f0c8 SHA512 7227fa0210d7870971870409da2d86d9f239ae285dde116e2b2d817318339fb51324bd11d04dc4c26a2ca3c1e5a0f0686987eab7042265389fb2f60cc7d37a45
-AUX slim-1.3.6-strip-systemd-unit-install.patch 474 BLAKE2B 3ead82c9f7b6acd580ea81d7ae293fa3e7cb08fa9d4bb1342409050fe3e57facadce5ed7736d1c219c94f314f29c5feb2aefee1e26ca8cd251ab8a3d5efede6b SHA512 377b1443c700ab6697b2087affed8486d9661de8794355e134a78125695a22e966927f26296e6330b8f4e7a600e9d21bca034dbc2d5445171e05618a2bfad55a
+AUX slim-1.3.6-strip-systemd-unit-install.patch 474 BLAKE2B 77f06c1f31801a56289b699f4e801ee169543c0407a79c6d7d73aa83053fdb70f74dbd962654b93081c6af680d800c9ede45cbf7116bc66ef540f216154a3f06 SHA512 990723e37a3adcec5a43a6b9bf5196d580121f8af9a6db533a3eb1c4d38269150fb01f0efd8d8e57c85b4662a573195347bdd95259059052b70f22c4b3164f9f
 AUX slim-1.3.6-systemd-session.patch 820 BLAKE2B 39345e96a1dc2cfc7a94b874d5be4bc099377aada324056bb8be073bb1c5245bbdd8b265b37b286a0fd1863fbc1de1ffd37b1001f468a1df3d49ac33c0f544de SHA512 df653a31bd2b0d3bb5b09d700d89d6b4c444b3ef49dc6d5a0646cab5480841a76ecb1c3bcd45b602eb0d2000971a5ef576eac63de67907769ea23b6925329635
 AUX slim-9999-config.diff 2480 BLAKE2B 11dcd073dd0cfb83e49bc545fde0190a2d733104a63b502822a7adb6b1ed21b2e227ab6ab6957e33741a3604852ff4164b106d64be039c779f2be5c23d06bd5e SHA512 6018c5eadd0c63e86b07ad8662ffc046fd1f586c101dc84bc9452295a9a11ed1a82a6a8a228bf8d5e064cc5d17b1bcea8662f957b831c96f8ba21c0f55a0d216
 AUX slim.logrotate 102 BLAKE2B 8b41d56746b9889ee7f13f3cef08f80532c0c58505061ce09262aa629af5ec77dc35278ce979c717cd53f6ba586c529201e0dca47a28044231bf2d0b9cd8f317 SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2
 DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
-EBUILD slim-1.3.6-r5.ebuild 3820 BLAKE2B 1bd9cd6158a42d6cfb60aca575585abf196ff8fbee1f7c947aebac6760ce916a75aa56accc0b1ef970360a9be6c95bfa3ace3c1578c3452d0a48e18acae7ce42 SHA512 4403901e0702319e1781ae103b57cd71aff1d7e966b7fd7b6c336b44c9ef23e62e296942ebf735b68903c5540137ef2de26e87ba3c18e0b26c443a91d4e426f6
-EBUILD slim-9999.ebuild 3664 BLAKE2B 9fe1f1efae07054d5b6a8be8fb95074d3979eac95b202c7c7ace7e3ee9d299ee3366fb2185014b50c509022073b8d909e00768232d402d248ccad51c43bd910b SHA512 4836465fd45a3bbf864890a4a35a8eb1d314a24bccd638d1e8162f9f2d68002401703f99c2773ace13459d0f5200892d510f0bb70bb792f6b9fbbf517f21752a
+EBUILD slim-1.3.6-r5.ebuild 3811 BLAKE2B 1da707f0dbeaa34d9708b50d8339f3447ca4fc13533dad09fa0930d85c2c42d7498a298fcba7c7fb66b6dc782d424365b539e70a6c9c703b64166ade89d6cd29 SHA512 a9be0049e39b7e28c607156f7b98824ceaa78f5ab532e7d21fadc64878acd4c5a356194ede7ec8331d843dc2cdf166ea9c8857c47ae2a9aa481178b976a808c4
 MISC metadata.xml 249 BLAKE2B f1188767acee9adb5a73fedc907c389bf967957760ba5af8a90636683d26cf964d03be1bc6f9bc79cceefe20783ce4665dd67c58f9b25983321550bb8d1485e3 SHA512 a5a485bd5f4ae6cb9c2e85025d164278c6469aef02eb40e39149c94ed53a2c9a0503183377473563923043154571ecb4a033edfea00dd83d6aa4eb462d06e790
diff --git a/x11-misc/slim/files/slim-1.3.6-config.diff b/x11-misc/slim/files/slim-1.3.6-config.diff
index 9da6795cccfa..561e6a99273c 100644
--- a/x11-misc/slim/files/slim-1.3.6-config.diff
+++ b/x11-misc/slim/files/slim-1.3.6-config.diff
@@ -1,5 +1,5 @@
---- slim.conf.orig	2010-08-25 11:52:23.000000000 -0400
-+++ slim.conf	2010-08-25 11:58:58.000000000 -0400
+--- a/slim.conf.orig	2010-08-25 11:52:23.000000000 -0400
++++ b/slim.conf	2010-08-25 11:58:58.000000000 -0400
 @@ -2,7 +2,7 @@
  # Note: -xauth $authfile is automatically appended
  default_path        /bin:/usr/bin:/usr/local/bin
diff --git a/x11-misc/slim/files/slim-1.3.6-freetype.patch b/x11-misc/slim/files/slim-1.3.6-freetype.patch
index 8cefc0bf0998..fe2aa60ad1b6 100644
--- a/x11-misc/slim/files/slim-1.3.6-freetype.patch
+++ b/x11-misc/slim/files/slim-1.3.6-freetype.patch
@@ -1,6 +1,6 @@
 diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
---- ./CMakeLists.txt.orig	2014-11-11 20:38:40.706121207 +0100
-+++ ./CMakeLists.txt	2014-11-11 20:39:34.206120264 +0100
+--- a/CMakeLists.txt.orig	2014-11-11 20:38:40.706121207 +0100
++++ b/CMakeLists.txt	2014-11-11 20:39:34.206120264 +0100
 @@ -165,7 +165,7 @@ include_directories(
  	${X11_Xft_INCLUDE_PATH}
  	${X11_Xrender_INCLUDE_PATH}
diff --git a/x11-misc/slim/files/slim-1.3.6-gcc11.patch b/x11-misc/slim/files/slim-1.3.6-gcc11.patch
new file mode 100644
index 000000000000..a6b07c637780
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-gcc11.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/786498
+--- a/panel.cpp
++++ b/panel.cpp
+@@ -48,7 +48,7 @@
+ 		gcm = GCGraphicsExposures;
+ 		gcv.graphics_exposures = False;
+ 		WinGC = XCreateGC(Dpy, Win, gcm, &gcv);
+-		if (WinGC < 0) {
++		if (WinGC == 0) {
+ 			cerr << APPNAME
+ 				<< ": failed to create pixmap\n.";
+ 			exit(ERR_EXIT);
diff --git a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch
index 8335e0fe9e75..2a43be75fb02 100644
--- a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch
+++ b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt	2013-10-01 18:38:05.000000000 -0400
-+++ CMakeLists.txt.new	2013-10-15 11:33:18.975741094 -0400
+--- a/CMakeLists.txt	2013-10-01 18:38:05.000000000 -0400
++++ b/CMakeLists.txt.new	2013-10-15 11:33:18.975741094 -0400
 @@ -42,11 +42,6 @@
  set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"")
  set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"")
diff --git a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch b/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch
index f116c5ebc976..9ffa19ce0537 100644
--- a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch
+++ b/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt	2013-10-15 12:02:13.463722050 -0400
-+++ CMakeLists.txt.new	2013-10-17 09:41:41.602917345 -0400
+--- a/CMakeLists.txt	2013-10-15 12:02:13.463722050 -0400
++++ b/CMakeLists.txt	2013-10-17 09:41:41.602917345 -0400
 @@ -238,10 +238,6 @@
  install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
  # configure
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index ef30117b352d..ee566409d2d3 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils pam systemd versionator
+inherit cmake pam systemd
 
 DESCRIPTION="Simple Login Manager"
 HOMEPAGE="https://sourceforge.net/projects/slim.berlios/"
 SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
 IUSE="branding pam"
 
 RDEPEND="x11-libs/libXmu
@@ -25,8 +25,8 @@ RDEPEND="x11-libs/libXmu
 	pam? (	sys-libs/pam
 		!x11-misc/slimlock )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
 PATCHES=(
@@ -43,10 +43,11 @@ PATCHES=(
 	"${FILESDIR}"/${P}-drop-zlib.patch
 	"${FILESDIR}"/${P}-freetype.patch
 	"${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch
+	"${FILESDIR}"/${PN}-1.3.6-gcc11.patch
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use elibc_FreeBSD; then
 		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
@@ -60,15 +61,15 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use pam USE_PAM)
+		-DUSE_PAM=$(usex pam)
 		-DUSE_CONSOLEKIT=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use pam ; then
 		pamd_mimic system-local-login slim auth account session
@@ -94,11 +95,12 @@ pkg_postinst() {
 	# a previous emerge attempt failed in the middle of qmerge.
 	local rv=none
 	for rv in ${REPLACING_VERSIONS} ; do
-		if version_is_at_least "1.3.2-r7" "${rv}" ; then
+		if ver_test "1.3.2-r7" -le "${rv}" ; then
 			rv=newer
 			break;
 		fi
-		if version_is_at_least "1.0" "${rv}"  ; then
+
+		if ver_test "1.0" -le "${rv}"  ; then
 			rv=older
 			break;
 		fi
@@ -126,6 +128,7 @@ pkg_postinst() {
 		elog "accordingly."
 		elog
 	fi
+
 	if ! use pam; then
 		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
 		elog "the console when restarting your window manager. If this is not desired, then"
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
deleted file mode 100644
index 2a9801204240..000000000000
--- a/x11-misc/slim/slim-9999.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils pam systemd versionator
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/axs-gentoo/slim-git.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="Simple Login Manager"
-HOMEPAGE="https://sourceforge.net/projects/slim.berlios/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="branding pam"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXft
-	x11-libs/libXrandr
-	media-libs/libpng:0=
-	virtual/jpeg:=
-	x11-apps/sessreg
-	pam? ( sys-libs/pam
-		!x11-misc/slimlock )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
-
-PATCHES=(
-	# Our Gentoo-specific config changes
-	"${FILESDIR}"/${P}-config.diff
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use elibc_FreeBSD; then
-		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
-			|| die
-	fi
-
-	if use branding; then
-		sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf \
-			|| die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_PAM=$(usex pam)
-		-DUSE_CONSOLEKIT=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use pam ; then
-		pamd_mimic system-local-login slim auth account session
-		pamd_mimic system-local-login slimlock auth
-	fi
-
-	systemd_dounit build_files/slim.service
-
-	insinto /usr/share/slim
-	newins "${FILESDIR}/Xsession-r3" Xsession
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/slim.logrotate" slim
-
-	dodoc xinitrc.sample README THEMES
-}
-
-pkg_postinst() {
-	# massage ${REPLACING_VERSIONS} to come up with whether or not it's a new install
-	# or if it's older than 1.3.2-r7
-	# Note - there should only ever be zero or one version as this package isn't slotted,
-	# so the logic doesn't worry about what happens if there's two, due to the case where
-	# a previous emerge attempt failed in the middle of qmerge.
-	local rv=none
-	for rv in ${REPLACING_VERSIONS} ; do
-		if version_is_at_least "1.3.2-r7" "${rv}" ; then
-			rv=newer
-			break;
-		fi
-		if version_is_at_least "1.0" "${rv}"  ; then
-			rv=older
-			break;
-		fi
-	done
-
-	if [[ ${rv} == none ]]; then
-		elog
-		elog "The configuration file is located at /etc/slim.conf."
-		elog
-		elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
-		elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
-	fi
-	if [[ ${rv} != newer ]]; then
-		elog
-		elog "By default, ${PN} is set up to provide X session selection based on the"
-		elog ".desktop entries in /usr/share/xsessions/ that are installed by each"
-		elog "DE, including ~/.xsession support via the 'Xsession' session.  Sessions"
-		elog "are selected at login by pressing [F1].  As per the Xorg guide, each"
-		elog "user's default session can be specified by adding the name from"
-		elog "/etc/X11/Sessions to ~/.xsession."
-		elog
-		elog "The XSESSION environment variable is still supported as a default"
-		elog "if no session has been specified by the user."
-		elog
-		elog "If you want to use .xinitrc in the user's home directory for session"
-		elog "management instead, see README and xinitrc.sample in"
-		elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
-		elog "accordingly."
-		elog
-	fi
-	if ! use pam; then
-		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
-		elog "the console when restarting your window manager. If this is not desired, then"
-		elog "please remerge ${PN} with USE=\"pam\""
-		elog
-	fi
-}