diff options
| -rw-r--r-- | profiles/base/package.use.mask | 7 | ||||
| -rw-r--r-- | profiles/base/use.mask | 4 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.5.ebuild | 12 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 12 |
4 files changed, 22 insertions, 13 deletions
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index bb2dc3c56112..34da891f5c12 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -137,13 +137,6 @@ dev-db/mariadb-connector-c mysqlcompat # Not keyworded on non-x86 arches app-admin/conserver freeipmi -# Matt Turner <mattst88@gentoo.org> (2019-03-03) -# Mask for testing. Bug 606924 -# Jeroen Roovers <jer@gentoo.org> (2019-09-02) -# Bug 692170 -media-libs/mesa libglvnd -x11-drivers/nvidia-drivers libglvnd - # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-01-17) # Mask openjdk:8 for use as system java-vm until it's proven to work dev-java/openjdk:8 gentoo-vm diff --git a/profiles/base/use.mask b/profiles/base/use.mask index fff8836e1fd9..fe8254ba5b7c 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -4,6 +4,10 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Matt Turner <mattst88@gentoo.org> (2019-03-03) +# Mask for testing. Bug 606924 +libglvnd + # Matt Turner <mattst88@gentoo.org> (2019-09-01) # app-office/texmacs is package.mask'd. Bug #436400 texmacs diff --git a/x11-base/xorg-server/xorg-server-1.20.5.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild index 1fbae4ec6556..d6883094f9fd 100644 --- a/x11-base/xorg-server/xorg-server-1.20.5.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild @@ -15,9 +15,13 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" -CDEPEND=">=app-eselect/eselect-opengl-1.3.0 +CDEPEND="libglvnd? ( + media-libs/libglvnd + !app-eselect/eselect-opengl + ) + !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 @@ -206,7 +210,9 @@ src_install() { pkg_postinst() { if ! use minimal; then # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old + if ! use libglvnd; then + eselect opengl set xorg-x11 --use-old + fi fi } diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 3547a7b0742f..c45093888f55 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -14,9 +14,13 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" -CDEPEND=">=app-eselect/eselect-opengl-1.3.0 +CDEPEND="libglvnd? ( + media-libs/libglvnd + !app-eselect/eselect-opengl + ) + !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 @@ -201,7 +205,9 @@ src_install() { pkg_postinst() { if ! use minimal; then # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old + if ! use libglvnd; then + eselect opengl set xorg-x11 --use-old + fi fi } |