[gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/

[Chi-Thanh Christopher Nguyen]

commit:     7dcbde3beb43872724454699c67851ec7059e949
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  5 13:37:36 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Jun  5 13:37:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=7dcbde3b

x11-base/xorg-server: sync glamor dependencies and metadata with g-x86

---
 x11-base/xorg-server/metadata.xml            | 2 +-
 x11-base/xorg-server/xorg-server-9999.ebuild | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index 922e8ed..cbff1d2 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -4,9 +4,9 @@
 <herd>x11</herd>
 <use>
 	<flag name='dmx'>Build the Distributed Multiheaded X server</flag>
+	<flag name='glamor'>Enable Glamor OpenGL 2D acceleration</flag>
 	<flag name='kdrive'>Build the kdrive X servers</flag>
 	<flag name='tslib'>Build with tslib support for touchscreen devices</flag>
-	<flag name='udev'>Enable devices discovery via udev</flag>
 	<flag name='unwind'>Enable libunwind usage for backtraces</flag>
 	<flag name='xnest'>Build the Xnest server</flag>
 	<flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag>

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index de13608..0f1f96a 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -49,6 +49,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	glamor? (
 		media-libs/libepoxy
 		media-libs/mesa[egl,gbm]
+		!x11-libs/glamor
 	)
 	kdrive? (
 		>=x11-libs/libXext-1.0.5