From: Matt Turner <mattst88@gentoo.org>
Date: Sun, 3 Nov 2019 22:02:49 +0000 (-0800)
Subject: x11-drivers/xf86-video-ati: Drop glamor USE flag
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=973e7833b16816c19d0f6015fec49cc26bc376d3;p=gentoo.git

x11-drivers/xf86-video-ati: Drop glamor USE flag

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

diff --git a/x11-drivers/xf86-video-ati/metadata.xml b/x11-drivers/xf86-video-ati/metadata.xml
index 38cf49862d0f..e943b72b8a48 100644
--- a/x11-drivers/xf86-video-ati/metadata.xml
+++ b/x11-drivers/xf86-video-ati/metadata.xml
@@ -5,7 +5,4 @@
 	<email>x11@gentoo.org</email>
 	<name>X11</name>
 </maintainer>
-<use>
-	<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
-</use>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild
index 489c9927db8a..7b2f0601420c 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild
@@ -15,11 +15,11 @@ fi
 DESCRIPTION="ATI video driver"
 HOMEPAGE="https://www.x.org/wiki/ati/"
 
-IUSE="+glamor udev"
+IUSE="udev"
 
 RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon]
 	>=x11-libs/libpciaccess-0.8.0
-	glamor? ( x11-base/xorg-server[glamor] )
+	x11-base/xorg-server[-minimal]
 	udev? ( virtual/libudev:= )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
@@ -37,7 +37,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable glamor)
+		--enable-glamor
 		$(use_enable udev)
 	)
 }
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild
index 252dd5e7f9c1..2aab4b2d7290 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild
@@ -15,11 +15,11 @@ fi
 DESCRIPTION="ATI video driver"
 HOMEPAGE="https://www.x.org/wiki/ati/"
 
-IUSE="+glamor udev"
+IUSE="udev"
 
 RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon]
 	>=x11-libs/libpciaccess-0.8.0
-	glamor? ( x11-base/xorg-server[glamor] )
+	x11-base/xorg-server[-minimal]
 	udev? ( virtual/libudev:= )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
@@ -37,7 +37,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable glamor)
+		--enable-glamor
 		$(use_enable udev)
 	)
 }
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
index 252dd5e7f9c1..2aab4b2d7290 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
@@ -15,11 +15,11 @@ fi
 DESCRIPTION="ATI video driver"
 HOMEPAGE="https://www.x.org/wiki/ati/"
 
-IUSE="+glamor udev"
+IUSE="udev"
 
 RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon]
 	>=x11-libs/libpciaccess-0.8.0
-	glamor? ( x11-base/xorg-server[glamor] )
+	x11-base/xorg-server[-minimal]
 	udev? ( virtual/libudev:= )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
@@ -37,7 +37,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable glamor)
+		--enable-glamor
 		$(use_enable udev)
 	)
 }