x11-base/xorg-server: Add libglvnd support

Closes: https://bugs.gentoo.org/692168
Signed-off-by: Maik Freudenberg <hhfeuer@gmx.de>
Signed-off-by: Matt Turner <mattst88@gentoo.org>

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 1fbae4ec6556afe764a96fc105f3bb023c0cab0d..d6883094f9fd51d5492e4a242a47370a11c29cfa 100644 (file)
--- 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 3547a7b0742f7611bf1e76289a55a6739d6d6124..c45093888f55127bc5426b0e90334ef8d3ece349 100644 (file)
--- 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
 }