x11-base/xorg-drivers: Update dep for IUSE=glamor removal

Closes: https://bugs.gentoo.org/698114
Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
index fc0fa18b37a84a31d58e7f4a9b884a13c9c9ed82..e11cd07feb3881543c96b623f6baba5ce2e1bea6 100644 (file)
--- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
@@ -72,11 +72,11 @@ PDEPEND="
        video_cards_ast?           ( x11-drivers/xf86-video-ast )
        video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
        video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
-       video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[glamor] )
+       video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[-minimal] )
        video_cards_geode?         ( x11-drivers/xf86-video-geode )
        video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
        video_cards_i915?          ( x11-drivers/xf86-video-intel )
-       video_cards_i965?          ( >=x11-base/xorg-server-${PV}[glamor] )
+       video_cards_i965?          ( >=x11-base/xorg-server-${PV}[-minimal] )
        video_cards_intel?         ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
        video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
        video_cards_nouveau?       ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
@@ -86,10 +86,10 @@ PDEPEND="
        video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
        video_cards_r128?          ( >=x11-drivers/xf86-video-r128-6.10.2 )
        video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
-       video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] )
+       video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
        video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
-       video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[glamor] )
-       video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
+       video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[-minimal] )
+       video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[-minimal] )
        video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
        video_cards_via?           ( x11-drivers/xf86-video-openchrome )
        video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )

diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 10daad342d79864640d752c396c8070ab8486364..cd83934c3ef36ebeb10b2d10237ab7b876e67207 100644 (file)
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -72,11 +72,11 @@ PDEPEND="
        video_cards_ast?           ( x11-drivers/xf86-video-ast )
        video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
        video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
-       video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[glamor] )
+       video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[-minimal] )
        video_cards_geode?         ( x11-drivers/xf86-video-geode )
        video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
        video_cards_i915?          ( x11-drivers/xf86-video-intel )
-       video_cards_i965?          ( >=x11-base/xorg-server-${PV}[glamor] )
+       video_cards_i965?          ( >=x11-base/xorg-server-${PV}[-minimal] )
        video_cards_intel?         ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
        video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
        video_cards_nouveau?       ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
@@ -86,10 +86,10 @@ PDEPEND="
        video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
        video_cards_r128?          ( >=x11-drivers/xf86-video-r128-6.10.2 )
        video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
-       video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] )
+       video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
        video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
-       video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[glamor] )
-       video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
+       video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[-minimal] )
+       video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[-minimal] )
        video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
        video_cards_via?           ( x11-drivers/xf86-video-openchrome )
        video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )