diff options
author | 2014-11-15 14:13:26 +0100 | |
---|---|---|
committer | 2014-11-15 14:13:26 +0100 | |
commit | e1943630a20049c72c99c65ea189687a47f27c6d (patch) | |
tree | b38c3c41fab8e452da707379ee0cfed1b00da10b /x11-base | |
parent | x11-drivers/ati-drivers: fix x86-32 build failure on linux-3.17 (diff) | |
download | x11-e1943630a20049c72c99c65ea189687a47f27c6d.tar.gz x11-e1943630a20049c72c99c65ea189687a47f27c6d.tar.bz2 x11-e1943630a20049c72c99c65ea189687a47f27c6d.zip |
x11-base/xorg-server: sync ebuild with latest from portage
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index f7176654..82033292 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 IUSE_SERVERS="dmx kdrive xnest xorg xvfb" IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" -RDEPEND=">=app-admin/eselect-opengl-1.0.8 +CDEPEND=">=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 @@ -68,13 +68,12 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8 media-libs/libepoxy ) >=x11-apps/xinit-1.3 - selinux? ( sec-policy/selinux-xserver ) systemd? ( sys-apps/dbus sys-apps/systemd )" -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 @@ -115,6 +114,10 @@ DEPEND="${RDEPEND} >=x11-proto/dri2proto-2.8 )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) +" + PDEPEND=" xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" @@ -235,11 +238,6 @@ pkg_postinst() { ewarn "category using this command:" ewarn " emerge @x11-module-rebuild" fi - - if use udev && has_version virtual/udev[-keymap]; then - ewarn "virtual/udev was built without keymap support. This may cause input device" - ewarn "autoconfiguration to fail." - fi } pkg_postrm() { |