diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /x11-base/xorg-server/xorg-server-9999.ebuild | |
parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) |
gentoo resync : 14.12.2020
Diffstat (limited to 'x11-base/xorg-server/xorg-server-9999.ebuild')
-rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index e6b07abb3bb3..ed1a5f6c51e6 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -15,14 +15,10 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity" -CDEPEND="libglvnd? ( - media-libs/libglvnd[X] - !app-eselect/eselect-opengl - !!x11-drivers/nvidia-drivers[-libglvnd(-)] - ) - !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) +CDEPEND=" + media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 @@ -88,7 +84,8 @@ CDEPEND="libglvnd? ( sys-auth/elogind[pam] sys-auth/pambase[elogind] ) - " + !!x11-drivers/nvidia-drivers[-libglvnd(-)] +" DEPEND="${CDEPEND} sys-devel/flex @@ -212,15 +209,6 @@ src_install() { find "${ED}"/var -type d -empty -delete || die } -pkg_postinst() { - if ! use minimal; then - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - if ! use libglvnd; then - eselect opengl set xorg-x11 --use-old - fi - fi -} - pkg_postrm() { # Get rid of module dir to ensure opengl-update works properly if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |