From: Matt Turner Date: Thu, 12 Nov 2015 05:44:57 +0000 (-0800) Subject: x11-drivers/xf86-video-ati: Require xorg-server[glamor] for USE=glamor. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c8df5e1d34e62a61f41d58b65c65d130a1101c53;p=gentoo.git x11-drivers/xf86-video-ati: Require xorg-server[glamor] for USE=glamor. The out-of-tree glamor library is dead. All glamor development happens in the xserver. --- diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask index 7816ee18058f..6a86521b651f 100644 --- a/profiles/arch/amd64-fbsd/todo/package.use.mask +++ b/profiles/arch/amd64-fbsd/todo/package.use.mask @@ -137,6 +137,7 @@ media-libs/mesa video_cards_vmware # media-libs/libepoxy x11-base/xorg-server glamor wayland +x11-drivers/xf86-video-ati glamor # x11-drivers/xf86-video-sis x11-base/xorg-drivers video_cards_sis diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index 0f34e846164d..4cb2df28c973 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -92,6 +92,7 @@ sys-apps/systemd xkb # Chí-Thanh Christopher Nguyễn (16 Sep 2014) # Needs libepoxy keywording, bug #510940 x11-base/xorg-server glamor wayland +x11-drivers/xf86-video-ati glamor # Maciej Mrozowski (13 Aug 2014) # Missing keywords on dev-libs/protobuf-c (bug 519772) diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask index d2832b079fab..1994d245defc 100644 --- a/profiles/arch/mips/package.use.mask +++ b/profiles/arch/mips/package.use.mask @@ -29,6 +29,7 @@ app-doc/doxygen clang # Chí-Thanh Christopher Nguyễn (16 Sep 2014) # Needs libepoxy keywording, bug #510940 x11-base/xorg-server glamor wayland +x11-drivers/xf86-video-ati glamor # Davide Pesavento (02 Jun 2014) # dev-qt/qtdeclarative:4 is not keyworded on mips diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index 89e90cd41353..2fb681e01fa3 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -75,6 +75,7 @@ sys-apps/systemd xkb # Needs libepoxy keywording, bug #510940 x11-base/xorg-server glamor wayland x11-drivers/xf86-video-nouveau glamor +x11-drivers/xf86-video-ati glamor # Anthony G. Basile (17 Aug 2014) # This pulls in qemu[smartcard] which is masked diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask index 72b35596e103..4037b2856c3b 100644 --- a/profiles/arch/s390/package.use.mask +++ b/profiles/arch/s390/package.use.mask @@ -17,6 +17,7 @@ app-portage/layman g-sorcery # Chí-Thanh Christopher Nguyễn (16 Sep 2014) # Needs libepoxy keywording, bug #510940 x11-base/xorg-server glamor wayland +x11-drivers/xf86-video-ati glamor # Mikle Kolyada (11 Jan 2014) # too much unkeyworded dependencies (bug #497068) diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index 6bfa42411e40..c0085bcac677 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -97,6 +97,7 @@ sys-apps/systemd xkb # Chí-Thanh Christopher Nguyễn (16 Sep 2014) # Needs libepoxy keywording, bug #510940 x11-base/xorg-server glamor wayland +x11-drivers/xf86-video-ati glamor # Maciej Mrozowski (13 Aug 2014) # Missing keywords on dev-libs/protobuf-c (bug 519772) diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild index a63aa0b96ac8..54c456bef8a8 100644 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild +++ b/x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild @@ -15,10 +15,7 @@ IUSE="+glamor udev" RDEPEND=">=x11-libs/libdrm-2.4.58[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 - glamor? ( || ( - x11-base/xorg-server[glamor] - >=x11-libs/glamor-0.6 - ) ) + glamor? ( x11-base/xorg-server[glamor] ) udev? ( virtual/udev )" DEPEND="${RDEPEND} x11-proto/fontsproto