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 1143A1382C5 for ; Sat, 30 Jan 2021 19:21:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A1E9E0AC5; Sat, 30 Jan 2021 19:21:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 34BC1E0AC5 for ; Sat, 30 Jan 2021 19:21:18 +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 4F757340E6A for ; Sat, 30 Jan 2021 19:21:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C68F34AD for ; Sat, 30 Jan 2021 19:21:15 +0000 (UTC) From: "Piotr Karbowski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Piotr Karbowski" Message-ID: <1612034262.79da973a405180e9084c61af12962e87a9677d0c.slashbeast@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-r1.ebuild X-VCS-Directories: x11-apps/xinit/ X-VCS-Committer: slashbeast X-VCS-Committer-Name: Piotr Karbowski X-VCS-Revision: 79da973a405180e9084c61af12962e87a9677d0c X-VCS-Branch: master Date: Sat, 30 Jan 2021 19:21:15 +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: 3478270d-62ac-44a5-8455-e5675a8efdc4 X-Archives-Hash: 303c9edd150d345a003f608b715e4a56 commit: 79da973a405180e9084c61af12962e87a9677d0c Author: Aisha Tammy aisha cc> AuthorDate: Thu Sep 10 01:35:47 2020 +0000 Commit: Piotr Karbowski gentoo org> CommitDate: Sat Jan 30 19:17:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79da973a x11-apps/xinit: refactor startDM.sh to display-manager-init Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Aisha Tammy aisha.cc> Closes: https://github.com/gentoo/gentoo/pull/16554 Signed-off-by: Piotr Karbowski gentoo.org> x11-apps/xinit/xinit-1.4.1-r1.ebuild | 75 ++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild b/x11-apps/xinit/xinit-1.4.1-r1.ebuild new file mode 100644 index 00000000000..36ce2267f5c --- /dev/null +++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xorg-3 + +DESCRIPTION="X Window System initializer" + +LICENSE="${LICENSE} GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~arm-linux ~x86-linux" +IUSE="twm" + +RDEPEND=" + x11-apps/xauth + x11-libs/libX11 +" +DEPEND="${RDEPEND}" +PDEPEND="x11-apps/xrdb + twm? ( + x11-apps/xclock + x11-apps/xsm + x11-terms/xterm + x11-wm/twm + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch" + "${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch" + "${FILESDIR}/${PN}-1.4.1-move-serverauthfile-into-tmp.patch" +) + +XORG_CONFIGURE_OPTIONS=( + --with-xinitdir="${EPREFIX}"/etc/X11/xinit +) + +src_install() { + xorg-3_src_install + + exeinto /etc/X11 + doexe "${FILESDIR}"/chooser.sh + exeinto /etc/X11/Sessions + doexe "${FILESDIR}"/Xsession + exeinto /etc/X11/xinit + newexe "${FILESDIR}"/xserverrc.2 xserverrc + exeinto /etc/X11/xinit/xinitrc.d/ + doexe "${FILESDIR}"/00-xhost + + insinto /usr/share/xsessions + doins "${FILESDIR}"/Xsession.desktop +} + +pkg_postinst() { + 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." + ewarn "You can set this in a file in /etc/env.d/ for the entire system," + ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)." + ewarn "Here's an example of setting it for the whole system:" + ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession" + ewarn " env-update && source /etc/profile" + 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 +}