gentoo resync : 29.05.2018

17 files changed, 302 insertions, 36 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index c8c92af9282e..db25c9d5c1b7 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-mtrack/Manifest b/x11-drivers/xf86-input-mtrack/Manifest
index 539dee9aefd4..50c5e12b87ad 100644
--- a/x11-drivers/xf86-input-mtrack/Manifest
+++ b/x11-drivers/xf86-input-mtrack/Manifest
@@ -1,4 +1,6 @@
 AUX xf86-input-mtrack-0.2.0-drop-mtrack-test.patch 370 BLAKE2B ae2e56bcb86898269157f9e2af597aa9896170288b437f68b2cd3496264a66fd4e6edf9807a85ebec7c6374c8fa11103dded89046255a0d9fd405d45511f3622 SHA512 368c407119963e432ae10c058c40b026099bc0359b23a888f5d72909e30189354e2620692516eb919648217bf48b7939b736784208beae7cc8f356cfdb10deb0
 DIST xf86-input-mtrack-0.4.1.tar.gz 386733 BLAKE2B 6d7a49bd34894df6e88a900a86eb249a69a396d046776dd801b41a4ee505d07145f7ce66c2a83a21fa209cb78c6d709fb697145a30cf5cb5f78badd589844bd7 SHA512 2c517b27f4915978a01ed1d6d63f156b84c4eb1006a5e972183616a01c6d672fd7bc1c248ae22dcb09024be670afce1130c8fd8325b015811d58d020f244f010
+DIST xf86-input-mtrack-0.5.0.tar.gz 392992 BLAKE2B 7b0697dde374d558eec304a5b26b50d62fe85c8a0bbde916096ae0296b6bae372c499138a4ca8500e4b6bfeaf7782a18512813c60013476decd2ae6a4a838aa6 SHA512 d30551e0b8be47af336fa3d5207537eb115586f0bb078b2eb6d823fed695a2157e2e63bf145757f04b09359b94206211df817dc2d1182813a3f6370a2a126846
 EBUILD xf86-input-mtrack-0.4.1.ebuild 875 BLAKE2B ec2bcde3aba6c698bb84932cd566d1b7c377973e5a54d13f74ee5780fcd6d840df30795c3f5f23ca0db20f6e72b8b32acb71949be8b54c0137a0021bb6f2b07f SHA512 fda127708e6bfd937e3edf1bf91fbede89fb7aa99923633f8922418a2aa699885dac433edfc2eba5662ef09d8f3a4f81a66b03536885dd838a521109ec103b2b
-MISC metadata.xml 419 BLAKE2B 35638a571f1318d04069535dc93b5575c22eb3178f13f7321e5e709143a04c5263f8986975967180d9685f34f25865104a5415a3888b5dfbf87b1397a31d846f SHA512 ea5d21be0cf5020e2a1b8d6d342e1ba6c95946a2a6a00df69ae43b4d022fefa452ccd2d1ae1be619a72f7e7fb8a0c124f2b2655a2779ee28451fe0e493a7e5be
+EBUILD xf86-input-mtrack-0.5.0.ebuild 928 BLAKE2B ea86abf4a0894534cdfb29024fd685f2052687aee04efab7c209793a7f738441185cd3047d23bbf0fe1817b7b25b9f8412c471304672fc259c5c413a30b614f8 SHA512 c2694a43b5b30d6ad2948512c50775229ae3d6feb3ed054f59c6a87ca5857300c0710aa728afd815b0b1879af1b36821385668dedb86fc7268c8bf44871f47c0
+MISC metadata.xml 338 BLAKE2B ee56383414c84d6bcf018537f7fc1e44dd31db002639568c2cf7e5e02439dcd28cd93f01547ed8afeee2a01871788d24e1f3c167eb0ffcb97658ee282480aa6e SHA512 fecb11e3d6179589887afc269de0a37cc20a4a555372d7dfc875570458e27c89e1574f2b0ec8bc2a9e60e66f437261318887404b0d445794715b9a940db8f448
diff --git a/x11-drivers/xf86-input-mtrack/metadata.xml b/x11-drivers/xf86-input-mtrack/metadata.xml
index c95a98f366bf..4fdd8ac4d37c 100644
--- a/x11-drivers/xf86-input-mtrack/metadata.xml
+++ b/x11-drivers/xf86-input-mtrack/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>naota@gentoo.org</email>
-  </maintainer>
   <maintainer type="project">
     <email>x11@gentoo.org</email>
     <name>X11</name>
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild
new file mode 100644
index 000000000000..3cac497bb4f8
--- /dev/null
+++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot
+
+DESCRIPTION="Xorg Driver for Multitouch Trackpads"
+HOMEPAGE="https://github.com/p2rkw/xf86-input-mtrack"
+SRC_URI="https://github.com/p2rkw/xf86-input-mtrack/tarball/v${PV/_/-} -> ${P}.tar.gz"
+IUSE="debug"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=sys-libs/mtdev-1.0
+	x11-base/xorg-server:="
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+DOCS=( "README.md" )
+
+src_configure() {
+	econf \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog
+	elog "To enable multitouch support add the following lines"
+	elog "to your xorg.conf:"
+	elog ""
+	elog "Section \"InputClass\""
+	elog "  MatchIsTouchpad \"true\""
+	elog "  Identifier      \"Touchpads\""
+	elog "  Driver          \"mtrack\""
+	elog "EndSection"
+	elog
+}
diff --git a/x11-drivers/xf86-input-tslib/Manifest b/x11-drivers/xf86-input-tslib/Manifest
index 1615a574bb56..0e404bdc649b 100644
--- a/x11-drivers/xf86-input-tslib/Manifest
+++ b/x11-drivers/xf86-input-tslib/Manifest
@@ -1,6 +1,8 @@
 AUX fix-overlapped-variable.patch 485 BLAKE2B e7fd7e023965a2a193f6fa4d1f428ca30d8f561c42bfb806f56c6b6ebda44025a7979f611939e4d4ea7fa980ef5806cdbc904dc8c1eba80f90b4bf5906de207b SHA512 1230565723b1afaa0b63e1c0f5f9c3a010d20bebee57e5ec26b5875688b7dd78a4d71a63f8187b98434f9bd529dcf80af78fe7df5237aa79c5065119461e5036
 AUX xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch 782 BLAKE2B 71c706b4d4e01a9257b56e1c0d2245e78c2e1fcea34146312ad6d57b48d3e4196e14b36143677c69ae2fe7dd158b27a11337d594e222ac8cdd40b6c40f58e494 SHA512 264c921d12591795e8b04c22a7f3b85e63605b3bbc2aaab8418b61ac6ebeb3683bf4e357dddea6c73d416d233bc4d1249f3af17011cc542880772a885c7f4d28
 AUX xf86-input-tslib-port-ABI-12-r48.patch 5306 BLAKE2B e5421a0cf4f0fd645d61777eb7cadf444dd04989eede04b7766453940b65d3a319ec72f57838be14f106215b6aaf5aebd7af73b28dc02b2cad7fcb8e014eb4d0 SHA512 9cdd4c47e8efa3560dd0b508422322f0f4185f4359d98cd7d5c06394bdf096de23e42c5af9f682c457d44831091823867233ced8c6329d2776cf3b5b6bd1ba34
+DIST xf86-input-tslib-1.2.0_rc1.tar.gz 12029 BLAKE2B 28841961882af8285d12830c5774eb86b0c4a3ed515394d493d384933209020e6593680a087c9d70a6e7b351e6556bf73246e3deff4eee7ab52d57f89ecc8f7c SHA512 6ab358470b01c5c29e8004624c5a0ac9e9737bf7ccc946a08606a2d5fe36657af7c062cf8a8fe98f692f9f352a3bc7aa90592faa43647fc133ac22ecb52d4805
 DIST xf86-input-tslib_0.0.6-3.tar.gz 307751 BLAKE2B 05037c2ca9339245b0987ce7e0121f4825a840dab24e60ce901d290b13841a3843d6c93ef9910db92d47418d649189d78e18e26ec248c4ff9ad1131e54b81240 SHA512 abc6060ba595790dab02a191861ee128a729916a6ea2df2a818a0b3388839dac933a0d7ee5530735f376f917f33bf8db40d42a7dce90b20a7682344370bc7b48
 EBUILD xf86-input-tslib-0.0.6-r3.ebuild 781 BLAKE2B 3b4040ab660975e9135dbd8768e2832f297571fe85cc6f2cba83c8abc89e9323780d6de62a9ba989a0db8c8e34fa8b26b3dfb3a8cdabab33f1448c7e96e251f1 SHA512 c7b8f2629e3d4517c5903ff5ca758dff7ab780b3400c94a61a309706d3cb1c465804919cc59fa5c3942b5dc66dae11b5cd8c545935dd468beb9f31e0d28dce25
+EBUILD xf86-input-tslib-1.2.0_rc1.ebuild 665 BLAKE2B 9028d86232cfad3b908d90a00aa6e5f24550ad57a15c031b36aa12b564024413d5c7717c9168db90848666492f0b42756063f83f306455f573d5ac3c982507aa SHA512 02b534838907bf1469aafe4709cb879dae1148cf2800b8c2c9fc31239a6446fefe259a05e663e60a9a8d787ede854206e9946ab55edbde3ac972667cce79088f
 MISC metadata.xml 338 BLAKE2B 3f7f7614c07d92a52a1499634820de2891cf891fd2c86230b69a99b83afae1af395ed8eaabd32b4b17b19b3ffcfd717ea6e7963beb18dfca0ae3db77269eeb87 SHA512 cf7eafaffce2e1064714ac53d374fcb81a4a77cf7a3b9826c595b0b40a01a54b0280ecf4c824b8741b09893d770e80495084ede42281242959f283b5c0d51d2c
diff --git a/x11-drivers/xf86-input-tslib/xf86-input-tslib-1.2.0_rc1.ebuild b/x11-drivers/xf86-input-tslib/xf86-input-tslib-1.2.0_rc1.ebuild
new file mode 100644
index 000000000000..8054b93e5ad4
--- /dev/null
+++ b/x11-drivers/xf86-input-tslib/xf86-input-tslib-1.2.0_rc1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools vcs-snapshot
+
+DESCRIPTION="X.org tslib input driver"
+HOMEPAGE="https://github.com/merge/xf86-input-tslib"
+SRC_URI="https://github.com/merge/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+RDEPEND="x11-libs/tslib
+	x11-base/xorg-server:="
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+DOCS=( "README.md" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 3056d61641d2..7aee5fb0db75 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -4,5 +4,6 @@ DIST xf86-input-wacom-0.35.0.tar.bz2 601314 BLAKE2B 59c2b03b79d141b71583ce3ea6ac
 DIST xf86-input-wacom-0.36.0.tar.bz2 611678 BLAKE2B b3fc8310514e6e07c3c25fceeb982d66e9e10730028af769cd331578a48720666a0872b625beb15c7f68bbb291293dfe4c4e305411310c67bb2bd148e7d570d8 SHA512 48e4cf945eb0f5c7c65d46153756372bbfd6d1f101cd90f609c71cc21b36fa671d98c7be0b52d519775c7e7b875ec441d4308cf70d7897198600553e7a93ccc5
 EBUILD xf86-input-wacom-0.34.0.ebuild 1852 BLAKE2B 3556b5b14f5775211639e77d9dedd7aea4243b98e82fe1913a2e50346132a18f562ccf5909d99501ed2933c5a1cb42005ed6b5e94b3123ba9340da9c4213c92a SHA512 e190da2d8eedb07fd74b6cbde5e56709be235aff114c0ca2f90de00221ad72dd2785d2b1eab3e321b688735fbf160c47d3719f5f5d690bd52c580f845363e0d7
 EBUILD xf86-input-wacom-0.35.0.ebuild 1796 BLAKE2B 31162072ec86bc739f196393d7d97d5fd07e45cc7f9fba20b8be587c383e76a4683c66b93eeb717422c49ea94b4677248958510c61ff97fc5c725d5be8bb295a SHA512 e361c2f8e2c102e19f24e638ff4aca3eb2a831b5244b098d59ce12ef722058114875ec5351f3b18a19311e090cf2bef38a0bd559ea808a53a9ce56e2125f31cb
+EBUILD xf86-input-wacom-0.36.0-r1.ebuild 1740 BLAKE2B 1b0226a589dd3d0896b488e517738c176051b36a8fdaeedcb7f46607c80aa63c6e650c3e85be08255b60550d8d07e47014d436950237574fbedf14bd0137e3e9 SHA512 25e75b18cb4eeaa65c12bf90264a2894b97e7f33ef8c4a4ce27f17898143e86afb093d7c071c33618552c5bbe772973c41fea36210cb02893ce7e4edfc1747ff
 EBUILD xf86-input-wacom-0.36.0.ebuild 1788 BLAKE2B aacfafed4bfb275c658862bb7c47ddd3068a7ed9076d9b0e5267547a8df5c4f70fd7b434dc723cd193eda835972334bddafd9664904dbdfe4b47f343a808843f SHA512 11856ffc1d0b8336002ce9802115f62586f4675383bc7616cded1152d131feea42c74460ec3419aeeafa37efb4f807cf9d70e90401c74af1f7f13ccce64f08c6
 MISC metadata.xml 436 BLAKE2B 255853d810de0bc1d6fdefd359d613163d1277f2eb423e81fe29c3a699f4cee22731b52286d68c64aa3a1b579b3f723a5b86a8d45d18962d234f4f0cb316c7f5 SHA512 2aa103f44b3d36ff6466ac1fb010b25c649f1cc19d2db1d5c9b1ad54d954184eb7c55496feb58174bd466a9296f6c3eb269819b9036486a071a8100b1a3a6cb2
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0-r1.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0-r1.ebuild
new file mode 100644
index 000000000000..4bcff4b9fed2
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.36.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+LICENSE="GPL-2"
+EGIT_REPO_URI="git://git.code.sf.net/p/linuxwacom/${PN}"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/libwacom
+	virtual/libudev:=
+	>=x11-base/xorg-server-1.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+
+	rm -rf "${ED}"/usr/share/hal
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 3 17; then
+		if ! linux_config_exists \
+				|| ! linux_chkconfig_present TABLET_USB_WACOM \
+				|| ! linux_chkconfig_present INPUT_EVDEV; then
+			echo
+			ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+			ewarn "  Device Drivers --->"
+			ewarn "    Input device support --->"
+			ewarn "      <*>   Event interface"
+			ewarn "      [*]   Tablets  --->"
+			ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
+			echo
+		fi
+	else
+		if ! linux_config_exists \
+				|| ! linux_chkconfig_present HID_WACOM; then
+			echo
+			ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+			ewarn "  Device Drivers --->"
+			ewarn "    HID support  --->"
+			ewarn "      Special HID drivers  --->"
+			ewarn "        <*> Wacom Intuos/Graphire tablet support (USB)"
+			echo
+		fi
+	fi
+
+}
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index cc2262463cb0..27755bde1e45 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,4 +1,5 @@
 DIST xf86-video-ati-18.0.1.tar.bz2 881457 BLAKE2B d45ae191239d008261230804161545e971d5ba9b76642341dad5dfb03b52aa3580e2e41fb7f0484af8da5024da46ada2bca182c15ec13053d674e456fb6f0f4a SHA512 b468a78503a596bbf71a1b91b231ce1fa32908f619ff2dfe249352d046696a3641f2a9ff065e32545fff77100134b4b237591215e78ef885b6509d6b16112d14
+EBUILD xf86-video-ati-18.0.1-r1.ebuild 882 BLAKE2B 0c93dba335511fa8ee7ac33339b9f6edfb2efc620fe36869f3b155dd62389e534e752672fcecd39ce62a3e1fe14d125e995e9974d4fad56301c55db38c49a5cd SHA512 b6747348e5c01154999a9e3da2807abffb0cb9632bacee4bf3390e3e0df3ce2debfe8d3b0839b8ac615d282724aad2a13644e05e84b3db163f304fa172749bc0
 EBUILD xf86-video-ati-18.0.1.ebuild 877 BLAKE2B 603b0e38c741bdd7716bd6f5cde3bae5863b4b8ab4866a377b9f9f6a836b1a1bd8572a517136f72020e5613113cc7e6d8eb6686db2d64510ca55ba2f1b51d2c1 SHA512 7e685d2adfe1ab320e6d241a46b6063713d5ad3b6635c4fd0316bf9d1635188a6f6f80d844ef033cd0b49e6e9622d93fc40d0ff187af3eda85768780dfd8c293
-EBUILD xf86-video-ati-9999.ebuild 884 BLAKE2B c44322d99fa4ac3f8a84f8fb7b0051525e21c0d1d031f000bfd745e53912f4d58945274a86645118377bbde5d49cf369302b1306f61c45986096ed55a10fd4b9 SHA512 aa0c939dd071a413736e7cb7daf5d4d084f65c140bf6dac31b431fda3a3cac04ae90868b84146b142b883c162fae79089840367d0566c0368c377c54095e4452
+EBUILD xf86-video-ati-9999.ebuild 889 BLAKE2B cb3053d3b4d9559610a574e422aa6056d66ec852c34f56796bbd60fc84f4f0bdb5fa4aba0f38d70c70bc2ad9dc648783990d35718f18df099ed4c7f192f83079 SHA512 b74c5488cf036794ddb05040782f9a082deb518a22655c6a9eecc53b50bed3167e5599cd2cef6f1cea380deb7e78636510b76b7e2df8f5b36691bd90e0b2465a
 MISC metadata.xml 308 BLAKE2B b9e4150ed35f39b333f5ba4de65f52d82c50e5a5d1b3ca46f14b8a9a5d0ae12ad461f0f376a93d7312a7e4b2ec7a7529e137b0eada1b85f1db643739083cf20c SHA512 2f2c9a682e7aa5c413561df59a02c5dc7f77da6eae4513e93196b7c76d0ca9d76dffc5c644e77396afaa86f922947ed1cccdd133d161f1c441a28554eec68708
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1-r1.ebuild
new file mode 100644
index 000000000000..10c93ae64018
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DRI=always
+inherit linux-info xorg-2
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="ATI video driver"
+HOMEPAGE="https://www.x.org/wiki/ati/"
+
+IUSE="+glamor udev"
+
+RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_radeon]
+	>=x11-libs/libpciaccess-0.8.0
+	glamor? ( x11-base/xorg-server[glamor] )
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+pkg_pretend() {
+	if use kernel_linux ; then
+		if kernel_is -ge 3 9; then
+			CONFIG_CHECK="~!DRM_RADEON_UMS ~!FB_RADEON"
+		else
+			CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON"
+		fi
+	fi
+	check_extra_config
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable glamor)
+		$(use_enable udev)
+	)
+	xorg-2_src_configure
+}
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 3bb9e4ef6269..3f5390aec7a0 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
@@ -20,7 +20,7 @@ IUSE="+glamor udev"
 RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_radeon]
 	>=x11-libs/libpciaccess-0.8.0
 	glamor? ( x11-base/xorg-server[glamor] )
-	udev? ( virtual/udev )"
+	udev? ( virtual/libudev:= )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index f9548204e446..8344ba44e599 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,4 +1,5 @@
 DIST xf86-video-intel-2.99.917_p20180214.tar.xz 951544 BLAKE2B 57df523168c6bf650ddf6ca27bbc799a8a9d183c9a6a4d2e232288124b57bfff7bb36a8fcc55e2845c4ece2653d39c0830c4ea2ecef4f1968a3ee7413506bae3 SHA512 afc8a4db550aa5567fa6f5eb9b480fac7c3e496eb62ae62a6a7b7e317515e24d21bf78bf1b03ba90cfd909dd37a5f65247c7aa2314234aec3d575e53db825912
+EBUILD xf86-video-intel-2.99.917_p20180214-r1.ebuild 2026 BLAKE2B 61cb8f491ad304dd6b3ba64d15de7f7ef4abc6a5e54a6764fc053767fd41db7588f004aafde7b552ed93b370a2e5075139fc269162a96ecdca79dd295e28bedf SHA512 e2ab7cb810c25d4f48b911f69f6da3b7b6243355d717f876f1cfbe5775a525eeed483f8cb901224cbc62dc563d08ac23128bd4c4c20641e5565748659598e3e3
 EBUILD xf86-video-intel-2.99.917_p20180214.ebuild 2021 BLAKE2B 1f854b8fe78e46047378f048c3263a88af93756db3b97a7a22d551a86eec46379680f3c0b28d1df9369c9a4b75c4df743d7fcac362dfedc66b0fa6dcc26fbd2c SHA512 c5b73f5d2775033e234626e47003aea3930071f9be9ab426ca93623e6968d61943e4122cc2755b2f6080358049622ddb9bc61bd44ace5d98991d72b41074bc88
-EBUILD xf86-video-intel-9999.ebuild 1983 BLAKE2B 6eab7e47bf5e8fd706acc602e0af16d10eb0ed59ec5093a5ff761cad2220809df1ae0ad3f9cad435cc85ced2043a2e72c9e0e810df67f043377c8c06ebb48232 SHA512 ebba3fc33850276f7fedd3d33c238ef65f723290d6bb1f44c58aab66b99bd258b923e6913dc5e75530eb4e3538af4cfe7ea40d8950824c271c2efa8606becb0e
+EBUILD xf86-video-intel-9999.ebuild 1988 BLAKE2B 9238b061e865cc77baaaaa7c702c242792e5a54cbbcb5dc6ba3889d7af182844f158d5c8bf8d1912361a4515304c4293a41263c69a3ed16f5aed93019ba4a164 SHA512 de3cde168cb903ef28baccae085c9d05b67cc91cf388f2a125c24344b3ba296e594ad58c7d04a9c2b018c4ed64f02f5cc95408a97be8d8dd654516323672f8d2
 MISC metadata.xml 716 BLAKE2B 9c0d0d8f69b50931cdc0cbb9de69722531918bec055e0bf460dd00dd1fc551054233a99f479856036b2ce129adda1dc4468879eb2903a97e8b1a682004e9265c SHA512 11c95d0fd78c1c38b8398fbeb1b8fd2c6e3e02b0aca2e771cabf6a935e3ef40ec344f0a906268e39094496782ba530a6004c5d7527e6ecce009ef384302c258d
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r1.ebuild
new file mode 100644
index 000000000000..b3cc3345b8dd
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DRI=dri
+XORG_EAUTORECONF=yes
+inherit linux-info xorg-2 flag-o-matic
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="amd64 x86"
+	COMMIT_ID="75795523003798d789d417e82aaa81c7ea1ed616"
+	SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
+	S=${WORKDIR}/${COMMIT_ID}
+fi
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+IUSE="debug dri3 +sna tools +udev uxa xvmc"
+
+REQUIRED_USE="
+	|| ( sna uxa )
+"
+RDEPEND="
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXScrnSaver
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.52[video_cards_intel]
+	dri3? (
+		>=x11-base/xorg-server-1.18
+		!<=media-libs/mesa-12.0.4
+	)
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)
+	tools? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxshmfence
+		x11-libs/libXtst
+	)
+	udev? (
+		virtual/libudev:=
+	)
+	xvmc? (
+		x11-libs/libXvMC
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_configure() {
+	replace-flags -Os -O2
+	XORG_CONFIGURE_OPTIONS=(
+		--disable-dri1
+		$(use_enable debug)
+		$(use_enable dri)
+		$(use_enable dri dri3)
+		$(usex dri3 "--with-default-dri=3")
+		$(use_enable sna)
+		$(use_enable tools)
+		$(use_enable udev)
+		$(use_enable uxa)
+		$(use_enable xvmc)
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists && \
+		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
index 260b77654663..57a5241bcdd5 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 		x11-libs/libXtst
 	)
 	udev? (
-		virtual/udev
+		virtual/libudev:=
 	)
 	xvmc? (
 		x11-libs/libXvMC
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 3a95ea000992..39b46d51b178 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,7 +1,4 @@
-DIST xf86-video-nouveau-1.0.13.tar.bz2 616715 BLAKE2B 1795eb5c7b32ac0eb21658e47e08c4958820e4877502a21246fd99484f96f8eafc20e1b0d11e3ce6ba309ca3c0c2b11c297c68e3a44ab6102edbc13ce02db981 SHA512 f78230baea71ace9ca7f84c1ff6c2ef3a3844b7c12423499ff8098c66638ddbff9c06ab86069eebe92ab729259c007bdce43e0f82956a4aa369eafe65f07ee10
-DIST xf86-video-nouveau-1.0.14.tar.bz2 584586 BLAKE2B b4dfe6ced034a464571fa355e9d941d61b366fb70e0f3a35b997affdfeae285a791a6904c6db94ad8c668669255a80c6000529a7973d8191ce503d30193ae0b7 SHA512 f07d49d736f87d4f42781c3cf3b5d07e7c57ca864973a917f6a7933082be1663214e9174f1434ddded094fac74f2087c63bb5ae528e21baf99dcd3385b219e66
 DIST xf86-video-nouveau-1.0.15.tar.bz2 584998 BLAKE2B 474eb27d00351fff9b24438c317e2f18810fde76d866ace047beda6c6cc58276e9f6ce25b4690c1de321dbdcd2dd238dc6f473a273cd3b54123d2f8383d5e586 SHA512 69a8f8e7920d893f17d14fd9f05e35de246d980a243f3b3b00c05deae7f6bd97e0f51e6ddfa322b4d0815233fe5f656d4e55f54461249f3f24c3bc025a682285
-EBUILD xf86-video-nouveau-1.0.13.ebuild 537 BLAKE2B 1f5d6f069d7852878946265d795364796317cb7a161a228c2fbc38cf43bd9e9e53d3501a25169d94a8d90a814a00336fe42ac74b9ac01dfe6278b0fd845a5a0d SHA512 0c338c203c2cb595e3e4ddaac7d56df830a17bcdf8654587789cb304c1ba0d4c3ed79fb98607c3ba2d8a14e33c9311047448ad488c73a1d13a002fa7c9cdfa9a
-EBUILD xf86-video-nouveau-1.0.14.ebuild 541 BLAKE2B 1d6621f33065c99933a22ff6b2e1c604fe5eaba3c5ba291ef6637dbeac50a94fa6e288988e57e5a3fa21841045926a2fe91fc58185e6c0098927a42ea57ae785 SHA512 de77fda83fe7a179eedd891b0764d5d2269a6967104cc4ebd1426f059516a2eff9c22fe11afd1fea7482ef0d7d4c571b336f16dc3aec0c90ad105408756df4c8
+EBUILD xf86-video-nouveau-1.0.15-r1.ebuild 563 BLAKE2B 959c018f721d1be2830d277c9baf299fe32f8a9a865f4e21eb7d986e43f551366c991a01b8e5d7cbd0edc55d79f5a72205ff0b7f4503f1dfa026474be45bc9f9 SHA512 7e2801b3f493db56492888077633046492f27bcc3aac7bb786cc91aefac09881eb1a4217f8834f963f6dd95b563ece50ba5090e244ad154effc6d8e978d30717
 EBUILD xf86-video-nouveau-1.0.15.ebuild 544 BLAKE2B 8f926d22e2f53d35a9b57126a1d72e7cb87556598f75983d75a5ba71e5f42c7b3acbb80ed05e6c3f3dace8199791f845de3816e88e928e89bddb4764b3c05dcd SHA512 e9a25a9d941b6d2b5982a8bb0cf861b691d540ea150d2820f411696e209ebb9aee4e427cf62fbc02d2f9d841cce13ba8cc084edf2cb2d3b4be3a548475cda4a4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.14.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.14.ebuild
deleted file mode 100644
index a608f66a1075..000000000000
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.14.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_DRI="always"
-inherit xorg-2
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau.git"
-	SRC_URI=""
-fi
-
-DESCRIPTION="Accelerated Open Source driver for nVidia cards"
-HOMEPAGE="https://nouveau.freedesktop.org/wiki/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]
-	>=x11-libs/libpciaccess-0.10"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.13.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.15-r1.ebuild
index fb528f58e02a..4015df63ed84 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.13.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,9 +13,10 @@ fi
 DESCRIPTION="Accelerated Open Source driver for nVidia cards"
 HOMEPAGE="https://nouveau.freedesktop.org/wiki/"
 
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]
-	>=x11-libs/libpciaccess-0.10"
+	>=x11-libs/libpciaccess-0.10
+	virtual/libudev:="
 DEPEND="${RDEPEND}"