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 39E8713835C 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 6E532E0B28; Sat, 30 Jan 2021 19:21:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 57142E0B28 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 43200340E42 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 B2F8A4AC 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.79ca32d4bc3f86dc0ec288a223241f26143ea78c.slashbeast@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild x11-base/xorg-server/xorg-server-9999.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: slashbeast X-VCS-Committer-Name: Piotr Karbowski X-VCS-Revision: 79ca32d4bc3f86dc0ec288a223241f26143ea78c 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: 4dfbb4cd-9f7c-45b8-958c-f74facdc5768 X-Archives-Hash: 771f155d0ebd742de0259f5e17c9e6ad commit: 79ca32d4bc3f86dc0ec288a223241f26143ea78c Author: Aisha Tammy aisha cc> AuthorDate: Thu Sep 10 01:33:07 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=79ca32d4 x11-base/xorg-server: refactor init files to display-manager-init Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Aisha Tammy aisha.cc> Signed-off-by: Piotr Karbowski gentoo.org> .../{xorg-server-9999.ebuild => xorg-server-1.20.10-r1.ebuild} | 9 +++------ x11-base/xorg-server/xorg-server-9999.ebuild | 5 +---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild similarity index 96% copy from x11-base/xorg-server/xorg-server-9999.ebuild copy to x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild index 09eb63d40ba..76dc03e58d8 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild @@ -4,14 +4,13 @@ EAPI=7 XORG_DOC=doc -XORG_EAUTORECONF="yes" inherit xorg-3 multilib flag-o-matic toolchain-funcs EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" @@ -101,6 +100,7 @@ DEPEND="${CDEPEND} )" RDEPEND="${CDEPEND} + gui-libs/display-manager-init selinux? ( sec-policy/selinux-xserver ) " @@ -169,6 +169,7 @@ pkg_setup() { --disable-linux-acpi --without-dtrace --without-fop + --with-os-vendor=Gentoo --with-sha1=libcrypto CPP="$(tc-getPROG CPP cpp)" ) @@ -198,10 +199,6 @@ src_install() { dodoc "${S}"/hw/xfree86/xorg.conf.example fi - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-11 xdm - newconfd "${FILESDIR}"/xdm.confd-4 xdm - # install the @x11-module-rebuild set for Portage insinto /usr/share/portage/config/sets newins "${FILESDIR}"/xorg-sets.conf xorg.conf diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 09eb63d40ba..3452ef412c4 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -101,6 +101,7 @@ DEPEND="${CDEPEND} )" RDEPEND="${CDEPEND} + gui-libs/display-manager-init selinux? ( sec-policy/selinux-xserver ) " @@ -198,10 +199,6 @@ src_install() { dodoc "${S}"/hw/xfree86/xorg.conf.example fi - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-11 xdm - newconfd "${FILESDIR}"/xdm.confd-4 xdm - # install the @x11-module-rebuild set for Portage insinto /usr/share/portage/config/sets newins "${FILESDIR}"/xorg-sets.conf xorg.conf