From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8AED3138350 for ; Mon, 9 Mar 2020 02:06:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA667E08FA; Mon, 9 Mar 2020 02:06:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72978E08FA for ; Mon, 9 Mar 2020 02:06:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2BAA634F29E for ; Mon, 9 Mar 2020 02:06:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5CBF173 for ; Mon, 9 Mar 2020 02:06:03 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1583719542.db0db442ab5220efe9ab11ea8f931ff9b83d460a.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-apps/xinit/xinit-1.4.1.ebuild X-VCS-Directories: x11-apps/xinit/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: db0db442ab5220efe9ab11ea8f931ff9b83d460a X-VCS-Branch: master Date: Mon, 9 Mar 2020 02:06:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 63b26d3e-d82e-45ab-a605-0b00adc869cd X-Archives-Hash: 3232e048441d099a342ce9876bac4f30 commit: db0db442ab5220efe9ab11ea8f931ff9b83d460a Author: Matt Turner gentoo org> AuthorDate: Mon Mar 9 01:50:51 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Mar 9 02:05:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db0db442 x11-apps/xinit: Fix postinstall message Closes: https://bugs.gentoo.org/710294 Signed-off-by: Matt Turner gentoo.org> x11-apps/xinit/xinit-1.4.1.ebuild | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild b/x11-apps/xinit/xinit-1.4.1.ebuild index 70f4ab1c68a..cd467fa426a 100644 --- a/x11-apps/xinit/xinit-1.4.1.ebuild +++ b/x11-apps/xinit/xinit-1.4.1.ebuild @@ -53,7 +53,7 @@ src_install() { } pkg_postinst() { - if ! has_version 'x11-apps/xinit'; then + if [[ -z "${REPLACING_VERSIONS}" ]]; then ewarn "If you use startx to start X instead of a login manager like gdm/kdm," ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or" ewarn "any executable. When you run startx, it will run this as the login session." @@ -64,11 +64,13 @@ pkg_postinst() { ewarn " env-update && source /etc/profile" fi - if has_version "<${CATEGORY}/${PN}-1.4.1"; then - ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the" - ewarn "home directory but rather are created in \$TMPDIR (typically /tmp). The change" - ewarn "is transparent for most of users, however those that use runtime temporary" - ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them" - ewarn "not to remove the 'serverauth.*' files." - fi + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "1.4.1"; then + ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the" + ewarn "home directory but rather are created in \$TMPDIR (typically /tmp). The change" + ewarn "is transparent for most of users, however those that use runtime temporary" + ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them" + ewarn "not to remove the 'serverauth.*' files." + fi + done }