gentoo resync : 03.11.2018

16 files changed, 27 insertions, 163 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index d589e456cbe2..39b2beeba2be 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index f4cfc6e9d896..397e21c01886 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -3,5 +3,5 @@ DIST xf86-input-libinput-0.28.0.tar.bz2 374318 BLAKE2B b8629115fce658d9d432c05a9
 DIST xf86-input-libinput-0.28.1.tar.bz2 375923 BLAKE2B f676e857fd47baad848a9325dd23ff41d9f3a0e1ab148b4e0662fe5c47f1c148bf702189c16990defdc18a33378647373ca18a379cb4421043871ec44f1224cc SHA512 2b8cabfbc3490edbe928771ed9d62a0d4a423bc1373fc6cf9d3a6b5937e17ddc48ebb1b70f1191e507024e4b8220c137495cbba825292b51e50709daa7d31623
 EBUILD xf86-input-libinput-0.27.1.ebuild 424 BLAKE2B f2308bb6428e36ccee7681f3e37d978f6aaedef8f81d9f577afcc0d5f8d5ea11a301b7ff19d5208aa7c4d9c6b9e2ded8a5d097fc312fd909bfb118bcecc615ee SHA512 1aac87fc2723d9a1cf5cef59289a807f747b0e99561cdd0ada145ea24dfd4e486f86883f9bed77b05e428a847e924e9da7edf514d199dc70cb341e4cf950bbf5
 EBUILD xf86-input-libinput-0.28.0-r1.ebuild 434 BLAKE2B eeec242b7c0d1e7f7396ca98d9091d425ff25a850f000f8a8d34ed7ede9c26a9bc5d19468542bd2cf5996d099ea8abf80d67388be65f9b44c140c584266e3bf5 SHA512 345005269d8f91d1e9b2a05c4b5158c8109dba78bc1358c7ca31249b2f211655f335ee904c03228a558adb05ef35ff4bce80fc113c0c58f763c0dbe33f339748
-EBUILD xf86-input-libinput-0.28.1.ebuild 426 BLAKE2B 71bb9580815395fdcb512e474bd428f8a636d28af055d577acdf5ae09c269a532cc0692a49ce4014d68df2e781942444d7e6f25f60ac0e4b2585dd65b921ae29 SHA512 72ecab8060583e080a70f6428ab4a39c6e2388687036fb88be082da4d0ab35bb8925a7b19a9ca181e41a455ee0673b001aee6899a625f30d95fa9568532b911e
+EBUILD xf86-input-libinput-0.28.1.ebuild 422 BLAKE2B 9ea8f4c50039055263b9330436ae84a47aa8e7e0ac88d0a540d13c73a39a25bca6dae1869836220db67174e2f5a88435757550579fdb1d99a6453bf0051e332a SHA512 d8bdc3d29cf471c34c2b4b4b617405f3685540fda98d27c95986fadaa2466f93fe50affb81dcd83461cc2eacf2b2f55cb80fc2f5c39eaabdc81d448b72a90c63
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.1.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.1.ebuild
index a58729651926..9697c2064c4b 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.1.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.1.ebuild
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libinput-1.5.0:0="
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index 83f201b06394..c34c405b1f00 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,6 +1,4 @@
-DIST xf86-video-amdgpu-18.0.1.tar.bz2 414683 BLAKE2B 767da468b6d2d41d49dbbc54093594163cbc42fa73d5859d4e210f25cac6822b7cb9fede4c73a15ac2221ef07a10df8b77f6f928b134382b373d5eedfde90225 SHA512 eb3b76240d4e5084d68b5063b5b19ad5f5bb1f93ea9929301d9e17a48ddc1cb713b76529cb93d133b3547fe78ae8a4455f6b15f6ddf88c29349f82bb1a0db1c4
 DIST xf86-video-amdgpu-18.1.0.tar.bz2 430542 BLAKE2B c582c6d5357949833b5b9408e638e3037e38530f9a1d5e85936d1ee866effc4da1c56d7da2e8aa48cde73c09107968840262941e7b0063aa7d2aacfecc5bf120 SHA512 371f1a9f6cd2ce3b7117361222d196950c5efa01d957783c79a37c19a2273ce33d133fa51bb68432b8535aad61cb14fbb61d173a167d318b2533eb2507b7a903
-EBUILD xf86-video-amdgpu-18.0.1.ebuild 478 BLAKE2B 6ecafe6d38bbb2cf22c5023d65ef02848c43da18eaa0229446f90c0779daa15127d75e70b12b3d106be4fbc2dbb581a35c31ae77cba09307b3c08447d228a926 SHA512 bf5b172b9a1acfd6d4dd3e5981671e394fce667ac0786149536df933afdff80f7aa6ec523e7fed764f80650ab876756b1441b413afbfe7be085655296265ab26
-EBUILD xf86-video-amdgpu-18.1.0.ebuild 475 BLAKE2B d3d5f60942be4b1baae4a73f2c43bcec78161ffd2d86148bb4d04d4292f74f3fd50b9fc7f029f0ba1ce179f67692abd72042d00433321aebe814e06eda9a32d9 SHA512 988242b2fa40e480d834eade07093263c82e9890024427211ede4d479dd5ea1983063981dc887b70e16e500d182a7169777fd63ff15fd5e44ca82aa0c1f571f4
-EBUILD xf86-video-amdgpu-9999.ebuild 480 BLAKE2B a6269c9013f052ffac95225516bf7c2c537d24022597b380c2e76a191b5f5a498a9923589ee581d9c494795ee231c7d05f3c34b8820f5495593917fa50bc6355 SHA512 e0d351b013842529e7fc115d84a5e62684517f275a3ef4a0df5212001a85f2fe6769f224d3de476524b2fc53d4bc6ca4d15c3b772ed97c49319d485daba9145f
+EBUILD xf86-video-amdgpu-18.1.0.ebuild 543 BLAKE2B 4e6e37829fb635788d12bb5c7c625cb7582544cc9cf798d66a684eb007b2d48620712e51fef9c84c910db35ab0f5ca92ea169a819c11c078ab3cf1e31c5dc321 SHA512 2b9e0da7bc5bc020f02669b3dbc5edf7a8cdc178b6d358b2db7fcd06c92e78acb25513ff15ae4c823404a4aa632e205e6f7a1194bcd7df812ef36cce957235ac
+EBUILD xf86-video-amdgpu-9999.ebuild 545 BLAKE2B 5fc92be37181ebdfa7c56c606b97b524f70ec79ef9ad74a2be86839a5b80fa63c0925f57fa714fc0ef41459b6076c84b1bfcb654d406d78caafe810aef5264d0 SHA512 d8ba71e19625c67d28db2a1e438721516c6cb00234d63ef7b226ad414986517fdbc31323dbddbdecafcd3a9f6874c5788b380abc39bc7b0f5a5b156ad0f95363
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1.ebuild
deleted file mode 100644
index 2b5db54e52d4..000000000000
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 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
-	SRC_URI=""
-else
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
-
-RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_amdgpu]
-	x11-base/xorg-server[glamor(-)]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS="--enable-glamor"
-	xorg-2_src_configure
-}
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.1.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.1.0.ebuild
index 7e47777406d4..877e000a1319 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.1.0.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.1.0.ebuild
@@ -13,11 +13,17 @@ fi
 
 DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
 
+IUSE="udev"
+
 RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_amdgpu]
-	x11-base/xorg-server[glamor(-)]"
+	x11-base/xorg-server[glamor(-)]
+	udev? ( virtual/libudev:= )"
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	XORG_CONFIGURE_OPTIONS="--enable-glamor"
+	XORG_CONFIGURE_OPTIONS=(
+		--enable-glamor
+		$(use_enable udev)
+	)
 	xorg-2_src_configure
 }
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 90a061997083..df2b7fe4867b 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,11 +13,17 @@ fi
 
 DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
 
+IUSE="udev"
+
 RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_amdgpu]
-	x11-base/xorg-server[glamor(-)]"
+	x11-base/xorg-server[glamor(-)]
+	udev? ( virtual/libudev:= )"
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	XORG_CONFIGURE_OPTIONS="--enable-glamor"
+	XORG_CONFIGURE_OPTIONS=(
+		--enable-glamor
+		$(use_enable udev)
+	)
 	xorg-2_src_configure
 }
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 603fb14a0df7..7ca3b316492f 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,7 +1,4 @@
-DIST xf86-video-ati-18.0.1.tar.bz2 881457 BLAKE2B d45ae191239d008261230804161545e971d5ba9b76642341dad5dfb03b52aa3580e2e41fb7f0484af8da5024da46ada2bca182c15ec13053d674e456fb6f0f4a SHA512 b468a78503a596bbf71a1b91b231ce1fa32908f619ff2dfe249352d046696a3641f2a9ff065e32545fff77100134b4b237591215e78ef885b6509d6b16112d14
 DIST xf86-video-ati-18.1.0.tar.bz2 891953 BLAKE2B 9092554c708b583f9b99a6788104a1e9420537fbbeaaaa6ae7e82be2a2299ad834365d00f8b146ce845afb5e2a08d3de3da591143eff63d4fb34c7040251f443 SHA512 7a58c9a6cb4876bd2ff37d837372b4e360e81fec7de6a6c7a48d70a5338d62745f734f5d4207f30aa368ff2d9ef44f5f1ef36afd73802a618998c16fe395ed53
-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-18.1.0.ebuild 881 BLAKE2B 42270a0d803a878363f9ea9fe166a4226777b343785a563583216402a36e2dcef5ec1d6c6e72bc0366797c25826d3fe8202c6999baa663452f4fbb1987909335 SHA512 44f21864951796130a08fdf27efc85b1e2504baa45d73d7d54fe8651bba176bbb9015e60f4b796b227db299e9246fe8dd024ff70323e827373b908af1b2edfe8
+EBUILD xf86-video-ati-18.1.0.ebuild 879 BLAKE2B 2d0d32199112f945a1b10256c43ecdbdf564bf536afdc7741b781740c7c8effcc2a41632136156fe3222ac6915c0ce740997ffb489d0d02d0fa8793c0023c792 SHA512 444ee2636f6d3feb3c825e6f33ff25ecee2cf1469642dad2123cdd77395704f8327c85efab9d558dd027cf5f2088ac209db2f255ddc22f4f924885f1e7a7fa1a
 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
deleted file mode 100644
index 10c93ae64018..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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-18.0.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1.ebuild
deleted file mode 100644
index c1bc5c73512b..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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/udev )"
-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-18.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
index a18f3cd17146..145972dac689 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
@@ -9,7 +9,7 @@ inherit linux-info xorg-2
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="ATI video driver"
diff --git a/x11-drivers/xf86-video-qxl/Manifest b/x11-drivers/xf86-video-qxl/Manifest
index 3cb3a0ed691e..f16c1b125da1 100644
--- a/x11-drivers/xf86-video-qxl/Manifest
+++ b/x11-drivers/xf86-video-qxl/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-qxl-0.1.5.tar.bz2 508266 BLAKE2B ca0fd43830a393d9bb1f5a6ba306f26e07a0b90233fa44f3fbe7a5f21026f1bd6960254db9cd75d947b3c42f6cc8cd3b7cfd71afc2c0a74bd84c60eafcf7e150 SHA512 7510b2d037b3e978df6063b29e2406f3d1270695a239f29fdaec9b1dc65a30ab10cb959f15eb336f78e93aa708d41c64c5ea43803958feffc64542229605b782
-EBUILD xf86-video-qxl-0.1.5.ebuild 672 BLAKE2B 18217e21b5d350c81d89c8477edbaa6f3bc46b0d6342d7bc3c778b3c55c9bde25c481f3ee6d23a349633711a6283d3054cccf07ff93773da7ea183b466b8b368 SHA512 d3a65e31803c304102712c610d1d32d1ad67ebae8cefea27372b0b24639cb6c8484eba3f3e82398e827c28b2aa53af0184189fa46fe3c19b2380da057c0e4adf
+EBUILD xf86-video-qxl-0.1.5.ebuild 660 BLAKE2B b1ee18808733abe3278189796d4ba3ec2c5b3c9914e118557ccc645e795b272e1850d6a7d840402d64c3472238dd4914483ce50c1da95cdbd5ff24ec0689f305 SHA512 3c23c3feebd6011442785d6747f44d155833e211b969a8bd1e2330755d894834a5dc92155e6858bdb19539c606ce2ba32e4be8bf6cf6e1661b1b17c9700e3c90
 MISC metadata.xml 292 BLAKE2B def2312773a7e6872be5d2de2184f3bbdd74caaa32bd0a8c1a85955f11e4a56a7a045431fb582eb121c5fbd5aa3f9d59a137af4973870c08c012abd7d45cdf72 SHA512 d09afd5c8c1c5180f73d6b482e84904cd015f8c302a076e059caa504cfd0029049e75a9f70aff5d4cbf1c36cfd8afdd1c4751ad78bd9e21d6aee6c8e574f8078
diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5.ebuild
index 8774666ba910..e68a0aea45c5 100644
--- a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5.ebuild
+++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="QEMU QXL paravirt video driver"
 
 KEYWORDS="amd64 x86"
 IUSE="xspice"
-REQUIRED_USE="xspice? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	xspice? (
diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest
index 9ac4f9753635..10ccffe11b58 100644
--- a/x11-drivers/xf86-video-r128/Manifest
+++ b/x11-drivers/xf86-video-r128/Manifest
@@ -1,6 +1,4 @@
 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.12.0.tar.bz2 483999 BLAKE2B f3433ce0289a7c356b69871ad4acb9ce9b0a947c1bf6ee9bf436a5d27ad1324fc81bb2d3c9be16ddf588f286ae092091dafd161c39ce8bc1bf20b6cb36ffdb72 SHA512 0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38
-EBUILD xf86-video-r128-6.10.2.ebuild 576 BLAKE2B f06b52058b47d8beafa75e47d32c08d77c65a9c8aba7f9fb4c6bd442447df926c53140dfd1bac012cd06af357b33c5fa588f6cb30bfda88184c80fb1a4a0b6fc SHA512 d8eee58f13fe73efbb8f2ce728f124c34fbfb8ba1be01eef9a2128a3fe27e4d41a91c5cf8549f2737b586a641ed78765ef6d2537b390638c1f60a1232f209601
-EBUILD xf86-video-r128-6.12.0.ebuild 524 BLAKE2B 8d713708dee8adc2348bd0977128c5ae964ab9b9dbc8aab735758aecea95737e988cd9e7bfa2369573ffe7603d7f497b3ef1354209fc76fb6b7563f353a4d3fe SHA512 64101499f8816932ad77bdab29c05bee6e4684c8229c34aeb00080bf6fe379c4bdc93ff3d86a79f13bd3a7a38ab5d244d723efda11d1b3c06d7de3d41f02a318
+EBUILD xf86-video-r128-6.12.0.ebuild 522 BLAKE2B 1fb442f7c95ecee6486f1979634534eb31c235e7dd76951f8a33107727a5f675fe0942a64db7a8752e2adc96e3f164ce522000876349c30b47229516715a2132 SHA512 c16dde432a1dee46901aa171183a0a277314063a2126a704be35c1b2fa3764de7630d14261049d54ee8222ccfab644e7157e375f81fb47c4babd1c0de48ba9d7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.10.2.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.10.2.ebuild
deleted file mode 100644
index 6369cbf866a1..000000000000
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.10.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-stdint_h.patch )
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-	)
-}
-
-src_configure() {
-	# always use C11 semantics
-	append-cflags -std=gnu11
-
-	xorg-2_src_configure
-}
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
index 7f490f56e3d7..a59508f6b49e 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
@@ -8,7 +8,7 @@ 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"
+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"