commit: c8df5e1d34e62a61f41d58b65c65d130a1101c53
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 05:44:57 2015 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 05:45:15 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8df5e1d
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.
profiles/arch/amd64-fbsd/todo/package.use.mask | 1 +
profiles/arch/ia64/package.use.mask | 1 +
profiles/arch/mips/package.use.mask | 1 +
profiles/arch/powerpc/package.use.mask | 1 +
profiles/arch/s390/package.use.mask | 1 +
profiles/arch/sparc/package.use.mask | 1 +
x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild | 5 +----
7 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask
b/profiles/arch/amd64-fbsd/todo/package.use.mask
index 7816ee1..6a86521 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 0f34e84..4cb2df2 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 <chith...@gentoo.org> (16 Sep 2014)
# Needs libepoxy keywording, bug #510940
x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
# Maciej Mrozowski <reave...@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 d2832b0..1994d24 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 <chith...@gentoo.org> (16 Sep 2014)
# Needs libepoxy keywording, bug #510940
x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
# Davide Pesavento <p...@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 89e90cd..2fb681e 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 <bluen...@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 72b3559..4037b28 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 <chith...@gentoo.org> (16 Sep 2014)
# Needs libepoxy keywording, bug #510940
x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
# Mikle Kolyada <zlog...@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 6bfa424..c0085bc 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 <chith...@gentoo.org> (16 Sep 2014)
# Needs libepoxy keywording, bug #510940
x11-base/xorg-server glamor wayland
+x11-drivers/xf86-video-ati glamor
# Maciej Mrozowski <reave...@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 a63aa0b..54c456b 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
