gentoo christmass resync : 25.12.2020

6 files changed, 4 insertions, 32 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index d9b0cc40bf2f..2e251bb1d8df 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 3053599049fa..445ae35b5c41 100644
--- a/x11-drivers/xf86-input-mtrack/Manifest
+++ b/x11-drivers/xf86-input-mtrack/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-input-mtrack-0.5.0.tar.gz 392992 BLAKE2B 7b0697dde374d558eec304a5b26b50d62fe85c8a0bbde916096ae0296b6bae372c499138a4ca8500e4b6bfeaf7782a18512813c60013476decd2ae6a4a838aa6 SHA512 d30551e0b8be47af336fa3d5207537eb115586f0bb078b2eb6d823fed695a2157e2e63bf145757f04b09359b94206211df817dc2d1182813a3f6370a2a126846
-EBUILD xf86-input-mtrack-0.5.0.ebuild 933 BLAKE2B e41899316367a8a5ab28b4e703e0b1cf0b6716803269cfa961e1b8ddac622024701df4b969aa9d1be64e6df6446a1fa6db84ec69c5329914e557552c389e8b61 SHA512 e91ea2c69c081d64623d622d63b14644bf665e9ea448dcf3ef808aa8904e710968f28ab101d4127f4f571e87b385d7e8ff251238b92b32de765b348e2f1f00cf
+EBUILD xf86-input-mtrack-0.5.0.ebuild 930 BLAKE2B a753b64c0997afab28ba8e9b407945db5e908af7e32711ed50ba94e26e902f4d01619cfaaa7f78318b0d8b0f3347d632483ede91ba21012237341e8967fa55bb SHA512 8731382fd501f0e1158e44decf3ba758028126df387165c4f3473a6e354eeb710e6ca256b9bf399543e4bb1b16e56a83ecfca05dc118b80fcc1846176b36b105
 MISC metadata.xml 338 BLAKE2B ee56383414c84d6bcf018537f7fc1e44dd31db002639568c2cf7e5e02439dcd28cd93f01547ed8afeee2a01871788d24e1f3c167eb0ffcb97658ee282480aa6e SHA512 fecb11e3d6179589887afc269de0a37cc20a4a555372d7dfc875570458e27c89e1574f2b0ec8bc2a9e60e66f437261318887404b0d445794715b9a940db8f448
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
index bc216855779b..7d85cca0f2b7 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-drivers/xf86-video-vesa/Manifest b/x11-drivers/xf86-video-vesa/Manifest
index 0e4aa96cbd25..02032dec16e5 100644
--- a/x11-drivers/xf86-video-vesa/Manifest
+++ b/x11-drivers/xf86-video-vesa/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-video-vesa-2.4.0.tar.bz2 324599 BLAKE2B ddaa7a54d439b1afb1152e15e0d436cade79c51a61e78837a066e3e0c04d4a2ea6b079e68eca917e618aae125ed4eab7734009a337018460e771265b8daef443 SHA512 4af5c0a7fd64eba503980198cf510688dff2f33482ceac446455d97255dcc828613387ac57828eb6dce080cb15a8644a2b2e278bf356705fdeaea873ab07c2de
 DIST xf86-video-vesa-2.5.0.tar.bz2 304322 BLAKE2B aee8b59d769a72fb2890bbadde7fb87e2f527fb58eaf8b2ef515b0a1b7dc591c6afaf1d8692caaaefb741f475ed77bc0ed069be43a752103260bc85314a7a830 SHA512 36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b
-EBUILD xf86-video-vesa-2.4.0.ebuild 623 BLAKE2B 203551d95df8ac149816c256d6bffe4c7dea9d3d1be4beef1b962ed20d9a04fc15da50500d2de9eef293cbd2119b98d09cfac2816b3e9d9ea92368be698a1eda SHA512 4945709cce0bc79b8e88a1214cbe6703f0642691539c27cfa2c1efb2f0efbfe70e694faca6435d4cf9b6bfcc0b7ee5bf7be9f94c596263bf4ffe0df8e5f60977
-EBUILD xf86-video-vesa-2.5.0.ebuild 624 BLAKE2B a262dc7ef07605e44992f163a01127ca6a64ed07058e3fecaea42e28cd8c70006f9c1da2b5c6ac887f4ce08313789d6d419b1bc8944e9d1bc884f3ec6b250928 SHA512 43bf1907c5a0e4785d08c159c2609cc2042fc02f8dc28816b86439627394af8ba673e44eac352bc10aef79f856a12356dfe389185c948d412b93a30e4e73316a
+EBUILD xf86-video-vesa-2.5.0.ebuild 623 BLAKE2B ab3420635068980df0be30496073d4b2917f89c67323a25af6356b56de3a0f75e535ccd9fb67518256b465d9706950d3e50d44b74733507084986232e9d98350 SHA512 ba18775c51b0c19c5cf368d11736543cac6cfecf1ea8176446d1cd2d791223ff8e62456b8bdb8535fc8756f92389e39087f6d58cc42af67cc9facf3c6fad3de3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild
deleted file mode 100644
index 8c2a494bb987..000000000000
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info xorg-2
-
-DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* ~alpha amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.6
-	>=x11-libs/libpciaccess-0.12.901"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	if ! linux_config_exists || ! linux_chkconfig_present DEVMEM; then
-		echo
-		ewarn "This driver requires /dev/mem support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Character devices  --->"
-		ewarn "      [*] /dev/mem virtual device support"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
index 610d74713018..2f085947bfdd 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit linux-info xorg-3
 
 DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* ~alpha amd64 ~x86"
+KEYWORDS="-* ~alpha amd64 x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6