qtox: added missed dep

2 files changed, 17 insertions, 6 deletions

diff --git a/net-im/qtox/qtox-scm.ebuild b/net-im/qtox/qtox-scm.ebuild
index a22a28c..a836836 100644
--- a/net-im/qtox/qtox-scm.ebuild
+++ b/net-im/qtox/qtox-scm.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 	dev-qt/qtxml:5
 	media-gfx/qrencode
 	media-libs/openal
+	media-libs/libexif
 	|| ( >=media-video/ffmpeg-3[webp,v4l] >=media-video/libav-12[webp,v4l] )
 	gtk? (	dev-libs/atk
 			dev-libs/glib:2
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 95a3ad2..83d864c 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -12,13 +12,12 @@ DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 KEYWORDS=""
 
-IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland"
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux systemd tslib +udev unwind xcsecurity"
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl )
-	media-libs/freetype
 	>=x11-apps/iceauth-1.0.2
 	>=x11-apps/rgb-1.0.3
 	>=x11-apps/xauth-1.0.3
@@ -48,7 +47,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 		>=x11-libs/libXtst-1.0.99.2
 	)
 	glamor? (
-		media-libs/libepoxy
+		media-libs/libepoxy[X]
 		>=media-libs/mesa-10.3.4-r1[egl,gbm]
 		!x11-libs/glamor
 	)
@@ -57,7 +56,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 		x11-libs/libXv
 	)
 	xephyr? (
-		x11-libs/libxcb
+		x11-libs/libxcb[xkb]
 		x11-libs/xcb-util
 		x11-libs/xcb-util-image
 		x11-libs/xcb-util-keysyms
@@ -75,6 +74,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	wayland? (
 		>=dev-libs/wayland-1.3.0
 		media-libs/libepoxy
+		>=dev-libs/wayland-protocols-1.1
 	)
 	>=x11-apps/xinit-1.3.3-r1
 	systemd? (
@@ -107,6 +107,7 @@ DEPEND="${CDEPEND}
 	>=x11-proto/xineramaproto-1.1.3
 	>=x11-proto/xproto-7.0.31
 	>=x11-proto/presentproto-1.0
+	>=x11-proto/dri2proto-2.8
 	>=x11-proto/dri3proto-1.0
 	dmx? (
 		>=x11-proto/dmxproto-2.2.99.1
@@ -153,6 +154,13 @@ pkg_pretend() {
 		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
 }
 
+pkg_setup() {
+	if use wayland && ! use glamor; then
+		ewarn "glamor is necessary for acceleration under Xwayland."
+		ewarn "Performance may be unacceptable without it."
+	fi
+}
+
 src_configure() {
 	# localstatedir is used for the log location; we need to override the default
 	#	from ebuild.sh
@@ -161,13 +169,13 @@ src_configure() {
 	#	package it somewhere
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
+		$(use_enable debug)
 		$(use_enable dmx)
 		$(use_enable glamor)
 		$(use_enable kdrive)
 		$(use_enable kdrive kdrive-kbd)
 		$(use_enable kdrive kdrive-mouse)
 		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
 		$(use_enable tslib)
 		$(use_enable unwind libunwind)
 		$(use_enable wayland xwayland)
@@ -176,6 +184,7 @@ src_configure() {
 		$(use_enable !minimal dri)
 		$(use_enable !minimal dri2)
 		$(use_enable !minimal glx)
+		$(use_enable xcsecurity)
 		$(use_enable xephyr)
 		$(use_enable xnest)
 		$(use_enable xorg)
@@ -186,6 +195,7 @@ src_configure() {
 		$(use_with systemd systemd-daemon)
 		$(use_enable systemd systemd-logind)
 		--enable-libdrm
+		--enable-suid-wrapper
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var
 		--with-fontrootdir="${EPREFIX}"/usr/share/fonts