diff options
| -rw-r--r-- | x11-base/xorg-server/files/xdm.initd-11 | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.10-r4.ebuild (renamed from x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild) | 9 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 12 |
3 files changed, 9 insertions, 14 deletions
diff --git a/x11-base/xorg-server/files/xdm.initd-11 b/x11-base/xorg-server/files/xdm.initd-11 index 7b2f992..debbfe0 100644 --- a/x11-base/xorg-server/files/xdm.initd-11 +++ b/x11-base/xorg-server/files/xdm.initd-11 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 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. diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r4.ebuild index 6f15838..f00d056 100644 --- a/x11-base/xorg-server/xorg-server-1.20.10-r2.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.10-r4.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 @@ -81,7 +81,7 @@ CDEPEND=" sys-auth/elogind[pam] sys-auth/pambase[elogind] ) - !!x11-drivers/nvidia-drivers[-libglvnd(-)] + !!x11-drivers/nvidia-drivers[-libglvnd(+)] " DEPEND="${CDEPEND} @@ -98,6 +98,7 @@ DEPEND="${CDEPEND} )" RDEPEND="${CDEPEND} + !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) " @@ -196,10 +197,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 99a8c50..f3daeac 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.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 @@ -11,7 +11,7 @@ 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" @@ -74,6 +74,7 @@ CDEPEND=" >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) + >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd @@ -83,7 +84,7 @@ CDEPEND=" sys-auth/elogind[pam] sys-auth/pambase[elogind] ) - !!x11-drivers/nvidia-drivers[-libglvnd(-)] + !!x11-drivers/nvidia-drivers[-libglvnd(+)] " DEPEND="${CDEPEND} @@ -100,6 +101,7 @@ DEPEND="${CDEPEND} )" RDEPEND="${CDEPEND} + !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) " @@ -197,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 |