gentoo resync : 12.08.2018

17 files changed, 78 insertions, 494 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index b1977b5e9f22..4986b4d3ffe8 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index 5babf21133fc..3e56719e85cb 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -1,8 +1,5 @@
 DIST xf86-input-evdev-2.10.5.tar.bz2 405956 BLAKE2B 4ea36a84eb227e79b43bede0a4c9d146a892db3db54a287da7f0be2c0d90f8748250c8b51ff424a8a5d7b34eee8301362ee51bf55ea4be9243b86f8e001255b0 SHA512 4362c1d12e91f25789722b1cc1b624530fd67f0d061d4c4e204af9f5024df0c9e20b73c87be15051f581a2a178f07f380215b172aba4c67db8805b4eeb82819a
 DIST xf86-input-evdev-2.10.6.tar.bz2 408138 BLAKE2B 2b5815e6ee71971e5023392e893d0b8bdba315ff73b34926b9facd95141ff541de052b84a569fe7bbd4b98810afb4d643a3bcaa97fe5a4e23c37e1ce410a9e12 SHA512 560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1
-EBUILD xf86-input-evdev-2.10.5-r1.ebuild 1107 BLAKE2B f0aafce8bf24027c57bdbc2b013beb197e7bc399c89527e7702c1d7a53bf6236079b56df2aaa9f91c4f5848e3ea3024cad411a4e0b059bc3bfc77ad27c13aa80 SHA512 3bd47fbbab446f493bff6b69c2ce3035d6ede13cd834d3741d36bef987a0c45b820b939d6b059e8616defabea740629cb9d8d5ef4caded52b7bf4d9ad4510184
 EBUILD xf86-input-evdev-2.10.5.ebuild 538 BLAKE2B 10d797c9316ec4e982e6d56888780aaa712d99bcee8cdfb3a47812549c43c5f0841cc81805b292e4800f086b49a4968d5f672d8732441022a76d0b0a9eda6bce SHA512 170d5cd2934ec82cfe92c1f2a6efbc7e840ae6d6ef0f61256ebf453df69e76c116397f744099ead91dd517bee2937f58cf193084f07061e002e9a1ddc12780c3
-EBUILD xf86-input-evdev-2.10.6-r1.ebuild 1107 BLAKE2B f0aafce8bf24027c57bdbc2b013beb197e7bc399c89527e7702c1d7a53bf6236079b56df2aaa9f91c4f5848e3ea3024cad411a4e0b059bc3bfc77ad27c13aa80 SHA512 3bd47fbbab446f493bff6b69c2ce3035d6ede13cd834d3741d36bef987a0c45b820b939d6b059e8616defabea740629cb9d8d5ef4caded52b7bf4d9ad4510184
 EBUILD xf86-input-evdev-2.10.6.ebuild 538 BLAKE2B 10d797c9316ec4e982e6d56888780aaa712d99bcee8cdfb3a47812549c43c5f0841cc81805b292e4800f086b49a4968d5f672d8732441022a76d0b0a9eda6bce SHA512 170d5cd2934ec82cfe92c1f2a6efbc7e840ae6d6ef0f61256ebf453df69e76c116397f744099ead91dd517bee2937f58cf193084f07061e002e9a1ddc12780c3
-EBUILD xf86-input-evdev-9999.ebuild 1107 BLAKE2B f0aafce8bf24027c57bdbc2b013beb197e7bc399c89527e7702c1d7a53bf6236079b56df2aaa9f91c4f5848e3ea3024cad411a4e0b059bc3bfc77ad27c13aa80 SHA512 3bd47fbbab446f493bff6b69c2ce3035d6ede13cd834d3741d36bef987a0c45b820b939d6b059e8616defabea740629cb9d8d5ef4caded52b7bf4d9ad4510184
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.5-r1.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.5-r1.ebuild
deleted file mode 100644
index b6d6d54e62a4..000000000000
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.5-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Generic Linux input driver"
-HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/xf86-input-evdev.git"
-	inherit autotools git-r3
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/libevdev
-	sys-libs/mtdev
-	virtual/libudev:=
-	>=x11-base/xorg-server-1.18:=[udev]
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	>=sys-kernel/linux-headers-2.6
-	x11-base/xorg-proto
-	x11-misc/util-macros
-"
-
-pkg_pretend() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INPUT_EVDEV"
-	fi
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-	econf "${econfargs[@]}"
-}
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6-r1.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6-r1.ebuild
deleted file mode 100644
index b6d6d54e62a4..000000000000
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Generic Linux input driver"
-HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/xf86-input-evdev.git"
-	inherit autotools git-r3
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/libevdev
-	sys-libs/mtdev
-	virtual/libudev:=
-	>=x11-base/xorg-server-1.18:=[udev]
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	>=sys-kernel/linux-headers-2.6
-	x11-base/xorg-proto
-	x11-misc/util-macros
-"
-
-pkg_pretend() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INPUT_EVDEV"
-	fi
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-	econf "${econfargs[@]}"
-}
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild
deleted file mode 100644
index b6d6d54e62a4..000000000000
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Generic Linux input driver"
-HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/xf86-input-evdev.git"
-	inherit autotools git-r3
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/libevdev
-	sys-libs/mtdev
-	virtual/libudev:=
-	>=x11-base/xorg-server-1.18:=[udev]
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	>=sys-kernel/linux-headers-2.6
-	x11-base/xorg-proto
-	x11-misc/util-macros
-"
-
-pkg_pretend() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INPUT_EVDEV"
-	fi
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-	econf "${econfargs[@]}"
-}
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index 0da793958d95..c76ef7e650dc 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,6 +1,5 @@
 DIST xf86-input-libinput-0.27.1.tar.bz2 373248 BLAKE2B 499c5c1b33f5159374775317777741db361620583f9d647ab5ee63193f5b82ecbbe5c124a447509c6b7de281cf6330f9747032d8bad8c2b1dbbcdd4517cf4f82 SHA512 01379f5d71bf39214c4dff428173512df57fd12e782f3fcde757be923aa0dbf4e010a0395a81bd8e4fb518edc7e05ca1ee64b1e313eb4df5d4990315580609a1
 DIST xf86-input-libinput-0.28.0.tar.bz2 374318 BLAKE2B b8629115fce658d9d432c05a983227aa1fa40da51e14c366bc0880b9d7c81c971abcb4c4b60ec37b756efad60be8eef061c0d3dcdd86f4fdb8b56e13f4ed9409 SHA512 4276b6aea87ddc83fa1f5e8d8949e34ad117186a6b5b599549231cb90424cd0fa69f3a4701ce529739c676665bb5c936eb447817c9420511d23bc048f6be92a4
 EBUILD xf86-input-libinput-0.27.1.ebuild 424 BLAKE2B f2308bb6428e36ccee7681f3e37d978f6aaedef8f81d9f577afcc0d5f8d5ea11a301b7ff19d5208aa7c4d9c6b9e2ded8a5d097fc312fd909bfb118bcecc615ee SHA512 1aac87fc2723d9a1cf5cef59289a807f747b0e99561cdd0ada145ea24dfd4e486f86883f9bed77b05e428a847e924e9da7edf514d199dc70cb341e4cf950bbf5
-EBUILD xf86-input-libinput-0.28.0.ebuild 1070 BLAKE2B 264026f88587ccf25e8fdc54929b86a92c12206a4f401ccee350bd3b5af1418ecaa65a97e33370cd4faa7184cd3db0d811f9795411e01cbbc9486812cf07a41a SHA512 d692d879823b3f1ebe412b598a0c0215e033d82b8631bb1d78d723e73c9b69fa7b7fd991a9afc8b13ddae6dd2dc152869147cb95e83a19b1250c00588bf9c824
-EBUILD xf86-input-libinput-9999.ebuild 1070 BLAKE2B 264026f88587ccf25e8fdc54929b86a92c12206a4f401ccee350bd3b5af1418ecaa65a97e33370cd4faa7184cd3db0d811f9795411e01cbbc9486812cf07a41a SHA512 d692d879823b3f1ebe412b598a0c0215e033d82b8631bb1d78d723e73c9b69fa7b7fd991a9afc8b13ddae6dd2dc152869147cb95e83a19b1250c00588bf9c824
+EBUILD xf86-input-libinput-0.28.0-r1.ebuild 434 BLAKE2B eeec242b7c0d1e7f7396ca98d9091d425ff25a850f000f8a8d34ed7ede9c26a9bc5d19468542bd2cf5996d099ea8abf80d67388be65f9b44c140c584266e3bf5 SHA512 345005269d8f91d1e9b2a05c4b5158c8109dba78bc1358c7ca31249b2f211655f335ee904c03228a558adb05ef35ff4bce80fc113c0c58f763c0dbe33f339748
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.0-r1.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.0-r1.ebuild
new file mode 100644
index 000000000000..fb96bba26232
--- /dev/null
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit linux-info xorg-2
+
+DESCRIPTION="X.org input driver based on libinput"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libinput-1.5.0:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( "README.md" )
+
+pkg_pretend() {
+	CONFIG_CHECK="~TIMERFD"
+	check_extra_config
+}
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.0.ebuild
deleted file mode 100644
index 401446b857d9..000000000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="X.org input driver based on libinput"
-HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/xf86-input-libinput.git"
-	inherit autotools git-r3
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=x11-base/xorg-server-1.10:=
-	>=dev-libs/libinput-1.5.0:0=
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-pkg_pretend() {
-	CONFIG_CHECK="~TIMERFD"
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-9999.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-9999.ebuild
deleted file mode 100644
index 401446b857d9..000000000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="X.org input driver based on libinput"
-HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/xf86-input-libinput.git"
-	inherit autotools git-r3
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=x11-base/xorg-server-1.10:=
-	>=dev-libs/libinput-1.5.0:0=
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-pkg_pretend() {
-	CONFIG_CHECK="~TIMERFD"
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-	)
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index 148d35fca098..b1a7d71c3779 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,5 +1,4 @@
 DIST xf86-video-amdgpu-18.0.1.tar.bz2 414683 BLAKE2B 767da468b6d2d41d49dbbc54093594163cbc42fa73d5859d4e210f25cac6822b7cb9fede4c73a15ac2221ef07a10df8b77f6f928b134382b373d5eedfde90225 SHA512 eb3b76240d4e5084d68b5063b5b19ad5f5bb1f93ea9929301d9e17a48ddc1cb713b76529cb93d133b3547fe78ae8a4455f6b15f6ddf88c29349f82bb1a0db1c4
-EBUILD xf86-video-amdgpu-18.0.1-r1.ebuild 983 BLAKE2B 75335eddd465c46032158d5ddea0ca41f47635c4e6908a425b68095945728c266686bae7a5bff3647517bacc04fbb135a8fe4d8ff1b8b515694d50ce7a471363 SHA512 5a177fb59a95e35e1d25c6ac0a6802e13b472aea6cbf706812ec10b470ed2c07393f855ccb153197af73fe6c350a59d1d4322ebccf6205da2a1b63931a087683
 EBUILD xf86-video-amdgpu-18.0.1.ebuild 478 BLAKE2B 6ecafe6d38bbb2cf22c5023d65ef02848c43da18eaa0229446f90c0779daa15127d75e70b12b3d106be4fbc2dbb581a35c31ae77cba09307b3c08447d228a926 SHA512 bf5b172b9a1acfd6d4dd3e5981671e394fce667ac0786149536df933afdff80f7aa6ec523e7fed764f80650ab876756b1441b413afbfe7be085655296265ab26
-EBUILD xf86-video-amdgpu-9999.ebuild 983 BLAKE2B 75335eddd465c46032158d5ddea0ca41f47635c4e6908a425b68095945728c266686bae7a5bff3647517bacc04fbb135a8fe4d8ff1b8b515694d50ce7a471363 SHA512 5a177fb59a95e35e1d25c6ac0a6802e13b472aea6cbf706812ec10b470ed2c07393f855ccb153197af73fe6c350a59d1d4322ebccf6205da2a1b63931a087683
+EBUILD xf86-video-amdgpu-9999.ebuild 480 BLAKE2B a6269c9013f052ffac95225516bf7c2c537d24022597b380c2e76a191b5f5a498a9923589ee581d9c494795ee231c7d05f3c34b8820f5495593917fa50bc6355 SHA512 e0d351b013842529e7fc115d84a5e62684517f275a3ef4a0df5212001a85f2fe6769f224d3de476524b2fc53d4bc6ca4d15c3b772ed97c49319d485daba9145f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1-r1.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1-r1.ebuild
deleted file mode 100644
index 1045c31be890..000000000000
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
-HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/xf86-video-amdgpu.git"
-	inherit autotools git-r3
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=x11-libs/libdrm-2.4.78[video_cards_amdgpu]
-	x11-libs/libpciaccess
-	x11-base/xorg-server:=[glamor(-),-minimal]
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-		--enable-glamor
-	)
-
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
index 1045c31be890..90a061997083 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
@@ -1,52 +1,23 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=5
+XORG_DRI="always"
+inherit xorg-2
 
-DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
-HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/xf86-video-amdgpu.git"
-	inherit autotools git-r3
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
 else
-	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=x11-libs/libdrm-2.4.78[video_cards_amdgpu]
-	x11-libs/libpciaccess
-	x11-base/xorg-server:=[glamor(-),-minimal]
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-"
+DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
 
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
+RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_amdgpu]
+	x11-base/xorg-server[glamor(-)]"
+DEPEND="${RDEPEND}"
 
 src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-		--enable-glamor
-	)
-
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
+	XORG_CONFIGURE_OPTIONS="--enable-glamor"
+	xorg-2_src_configure
 }
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 18787fa48773..27755bde1e45 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,6 +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-r2.ebuild 1297 BLAKE2B 540ab98689b9e0c4864b3dc3dd877e49461c2fb9ccb636822c6a1249e92755ec74c0e99edc5759d7ab43f9955203651e28d06869d4418dba8d2956d14cff829d SHA512 be611b537d108bb659dec557ee834217b69393346a06e8a8aec896771143829e342b8b8bd65c0af4a9f704981b88ec6e64f144ee3653f139badd7934586bc626
 EBUILD xf86-video-ati-18.0.1.ebuild 877 BLAKE2B 603b0e38c741bdd7716bd6f5cde3bae5863b4b8ab4866a377b9f9f6a836b1a1bd8572a517136f72020e5613113cc7e6d8eb6686db2d64510ca55ba2f1b51d2c1 SHA512 7e685d2adfe1ab320e6d241a46b6063713d5ad3b6635c4fd0316bf9d1635188a6f6f80d844ef033cd0b49e6e9622d93fc40d0ff187af3eda85768780dfd8c293
-EBUILD xf86-video-ati-9999.ebuild 1297 BLAKE2B 540ab98689b9e0c4864b3dc3dd877e49461c2fb9ccb636822c6a1249e92755ec74c0e99edc5759d7ab43f9955203651e28d06869d4418dba8d2956d14cff829d SHA512 be611b537d108bb659dec557ee834217b69393346a06e8a8aec896771143829e342b8b8bd65c0af4a9f704981b88ec6e64f144ee3653f139badd7934586bc626
+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-r2.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1-r2.ebuild
deleted file mode 100644
index 1ac62fccd4ec..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="ATI video driver"
-HOMEPAGE="https://www.x.org/wiki/ati/"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/${PN}"
-	inherit autotools git-r3
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+glamor udev"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=x11-libs/libdrm-2.4.78[video_cards_radeon]
-	>=x11-libs/libpciaccess-0.8.0
-	x11-base/xorg-server:=
-	glamor? ( x11-base/xorg-server[glamor] )
-	udev? ( virtual/libudev:= )
-"
-DEPEND="
-	${LIVE_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_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-		$(use_enable glamor)
-		$(use_enable udev)
-	)
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
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 1ac62fccd4ec..3f5390aec7a0 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
@@ -1,41 +1,28 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=5
 
-inherit linux-info
-
-DESCRIPTION="ATI video driver"
-HOMEPAGE="https://www.x.org/wiki/ati/"
+XORG_DRI=always
+inherit linux-info xorg-2
 
 if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/${PN}"
-	inherit autotools git-r3
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+	SRC_URI=""
 else
-	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
-LICENSE="MIT"
-SLOT="0"
+DESCRIPTION="ATI video driver"
+HOMEPAGE="https://www.x.org/wiki/ati/"
+
 IUSE="+glamor udev"
 
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=x11-libs/libdrm-2.4.78[video_cards_radeon]
+RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_radeon]
 	>=x11-libs/libpciaccess-0.8.0
-	x11-base/xorg-server:=
 	glamor? ( x11-base/xorg-server[glamor] )
-	udev? ( virtual/libudev:= )
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	x11-base/xorg-proto
-"
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 pkg_pretend() {
 	if use kernel_linux ; then
@@ -48,21 +35,10 @@ pkg_pretend() {
 	check_extra_config
 }
 
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
 src_configure() {
-	local econfargs=(
-		--disable-selective-werror
+	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable glamor)
 		$(use_enable udev)
 	)
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
+	xorg-2_src_configure
 }
diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest
index d02e3b02ddd6..0bc2ebe1a0f7 100644
--- a/x11-drivers/xf86-video-r128/Manifest
+++ b/x11-drivers/xf86-video-r128/Manifest
@@ -1,4 +1,6 @@
 AUX xf86-video-r128-6.10.2-fix-stdint_h.patch 194 BLAKE2B fd054df8e84c8db45c054b6405fb6414d56045461183e49a7bf8d5ca1bc7ed6dea50c5de9bb9893491d5607a4288725527f0532d2a194ccfc5d5bfd8b9446f40 SHA512 fb494532052ba73cabe52d8ac9990a994067f55f9dd56f39edd923bb5f4f2fbbd16333b3c1e5820135f21cb79a6b12745b2fd769df0317c1126ccdc1d6dbb9d6
 DIST xf86-video-r128-6.10.2.tar.bz2 504031 BLAKE2B 3d74d0aa82167f8e883b0a92e6d57cf688f36a45971b03327a2fb8171133fc155cd0f233b854f3c3f9713b478c1ac2cb0b4cac124d49431c8429a954a71c68dd SHA512 564b65454ee538c1b9dc5d22a52a57bdff0c1f94e1832719a8310699cee7167c1ca8fcd26243dfc4089832b1fcbab9efafb69c9061b328532f689d02a0acac23
+DIST xf86-video-r128-6.11.0.tar.bz2 482903 BLAKE2B 04222bab109be719cd8cbb4d759d0ba98563e2348b95bce30c48e65d2da0964386d46ce57ade9162e817b6db797cab330fb454e363304479cb87e30d8404f310 SHA512 1211cac52f65010aa4e168a173660186ad2b8595688a910ac545b0321d0d6879e02284b3bb26779faf3cf5b3b3031f33adb63ff596fb55a8f7a1f465ca0db1ba
 EBUILD xf86-video-r128-6.10.2.ebuild 576 BLAKE2B f06b52058b47d8beafa75e47d32c08d77c65a9c8aba7f9fb4c6bd442447df926c53140dfd1bac012cd06af357b33c5fa588f6cb30bfda88184c80fb1a4a0b6fc SHA512 d8eee58f13fe73efbb8f2ce728f124c34fbfb8ba1be01eef9a2128a3fe27e4d41a91c5cf8549f2737b586a641ed78765ef6d2537b390638c1f60a1232f209601
+EBUILD xf86-video-r128-6.11.0.ebuild 532 BLAKE2B 9dfb63bfbb7344b09d8102b0dd4f8b79ad2d6ae4d3d99c77e8385bea8b01b62e3739f6b0f00804105e448afb6f6c31d89554b25b36c72702d886a316d55c421f SHA512 b610fd0a277841d0524f60a7be8527a3eb70e0c990d33d51d700fb3cd21ee5eb788f85d5f4a65aad5afdc9aecf8c7e69388c0278ab2b1c2ddb6d86fef52a6c20
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.11.0.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.11.0.ebuild
new file mode 100644
index 000000000000..e770f425a248
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.11.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_DRI=dri
+
+inherit flag-o-matic xorg-2
+
+DESCRIPTION="ATI Rage128 video driver"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+}
+
+src_configure() {
+	# always use C11 semantics
+	append-cflags -std=gnu11
+
+	xorg-2_src_configure
+}