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 7816ee18058f25e5fc527bbef0d2f12994e83807..6a86521b651f775ed96be9161793792950b519a9 100644 (file)
--- 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 0f34e846164d59bff1da521e4f4c7f7df8930c06..4cb2df28c973a30a5260473d2d7e08657a28e42d 100644 (file)
--- 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 <chithanh@gentoo.org> (16 Sep 2014)
 # Needs libepoxy keywording, bug #510940
 x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
 
 # Maciej Mrozowski <reavertm@gentoo.org> (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 d2832b079fab553833f31991daea09b00ce43c7b..1994d245defc3c5390e9322f9c5fe5958c1e91cc 100644 (file)
--- 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 <chithanh@gentoo.org> (16 Sep 2014)
 # Needs libepoxy keywording, bug #510940
 x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
 
 # Davide Pesavento <pesa@gentoo.org> (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 89e90cd413530b6770334c5f2858bf18545ea0c3..2fb681e01fa3b78537a7fd00f32103906deca99b 100644 (file)
--- 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 <blueness@gentoo.org> (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 72b35596e103bbadd0deb9009013c1e08d8dd71b..4037b2856c3b752eeeae878649fc9ff2394d7dfe 100644 (file)
--- 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 <chithanh@gentoo.org> (16 Sep 2014)
 # Needs libepoxy keywording, bug #510940
 x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
 
 # Mikle Kolyada <zlogene@gentoo.org> (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 6bfa42411e40c0dc5e67181f8b3eae915e4f1565..c0085bcac677756616a19baeeb1e123dec5d3328 100644 (file)
--- 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 <chithanh@gentoo.org> (16 Sep 2014)
 # Needs libepoxy keywording, bug #510940
 x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
 
 # Maciej Mrozowski <reavertm@gentoo.org> (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 a63aa0b96ac84d87758228ef8c14db28c3ff022c..54c456bef8a83ec4e53007b40e5ae4c081345929 100644 (file)
--- 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