commit: cf1808147751ddb95788f2c3b30ab4d62dbe343b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 16:18:33 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 16:19:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf180814
x11-base/xorg-drivers: [QA] Remove support for removed xf86-*-tslib
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
profiles/arch/s390/use.mask | 3 +--
profiles/base/use.mask | 6 +-----
profiles/default/bsd/use.mask | 3 +--
profiles/desc/input_devices.desc | 3 +--
profiles/embedded/make.defaults | 2 +-
x11-base/xorg-drivers/xorg-drivers-1.19.ebuild | 2 --
x11-base/xorg-drivers/xorg-drivers-1.20.ebuild | 2 --
x11-base/xorg-drivers/xorg-drivers-9999.ebuild | 2 --
8 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index e69c27dbeca..015b48d992e 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -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
# Unmask the flag which corresponds to ARCH.
@@ -92,7 +92,6 @@ input_devices_keyboard
input_devices_mouse
input_devices_vmmouse
input_devices_synaptics
-input_devices_tslib
input_devices_wacom
video_cards_amdgpu
video_cards_fbdev
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index b7fada49ea9..50595c64203 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -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
# This file is only for generic masks. For arch-specific masks (i.e.
@@ -8,10 +8,6 @@
# d3d9 only works on amd64/x86.
d3d9
-# Matt Turner <matts...@gentoo.org> (02 Nov 2018)
-# xf86-input-tslib is dead and is masked for removal. Bug #664096
-input_devices_tslib
-
# Aaron W. Swenson <titanof...@gentoo.org> (09 Sep 2018)
# Mask PostgreSQL 12 while in (pre-)alpha.
postgres_targets_postgres12
diff --git a/profiles/default/bsd/use.mask b/profiles/default/bsd/use.mask
index 804ed3af341..b72658438e2 100644
--- a/profiles/default/bsd/use.mask
+++ b/profiles/default/bsd/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors.
# Distributed under the terms of the GNU General Public License, v2
# Mart Raudsepp <l...@gentoo.org>
@@ -56,7 +56,6 @@ tslib
# Mask Xorg-modular drivers that are Linux-specific
input_devices_evdev
-input_devices_tslib
input_devices_synaptics
input_devices_vmmouse
video_cards_vmware
diff --git a/profiles/desc/input_devices.desc b/profiles/desc/input_devices.desc
index f78bca56ee3..766122adf8c 100644
--- a/profiles/desc/input_devices.desc
+++ b/profiles/desc/input_devices.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation.
+# Copyright 1999-2018 Gentoo Authors.
# Distributed under the terms of the GNU General Public License v2
# This file contains descriptions of INPUT_DEVICES USE_EXPAND flags.
@@ -32,7 +32,6 @@ roccat_ryosmk - INPUT_DEVICES setting to build driver for
Roccat RyosMK Pro inpu
roccat_ryostkl - INPUT_DEVICES setting to build driver for Roccat RyosMK Pro
input devices
roccat_tyon - INPUT_DEVICES setting to build driver for Roccat Tyon input
devices
synaptics - INPUT_DEVICES setting to build driver for synaptics input devices
-tslib - INPUT_DEVICES setting to build driver for tslib input devices
vmmouse - INPUT_DEVICES setting to build driver for vmmouse input devices
void - INPUT_DEVICES setting to build driver for void/dummy input devices
wacom - INPUT_DEVICES setting to build driver for wacom input devices
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index a424cbb27e1..e0ee78c89ae 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -10,7 +10,7 @@ EBEEP_IGNORE="1"
PORTAGE_WORKDIR_MODE="2775"
PORTAGE_ECLASS_WARNING_ENABLE="0"
-INPUT_DEVICES="evdev mouse keyboard tslib"
+INPUT_DEVICES="evdev mouse keyboard"
VIDEO_CARDS="fbdev"
KERNEL="linux"
USERLAND="GNU"
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
b/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
index c2382d5cb06..9f6935c15fd 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
@@ -18,7 +18,6 @@ IUSE_INPUT_DEVICES="
input_devices_keyboard
input_devices_libinput
input_devices_mouse
- input_devices_tslib
input_devices_vmmouse
input_devices_void
input_devices_synaptics
@@ -65,7 +64,6 @@ PDEPEND="
input_devices_keyboard? ( x11-drivers/xf86-input-keyboard )
input_devices_libinput? ( x11-drivers/xf86-input-libinput )
input_devices_mouse? ( x11-drivers/xf86-input-mouse )
- input_devices_tslib? ( x11-drivers/xf86-input-tslib )
input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse )
input_devices_void? ( x11-drivers/xf86-input-void )
input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
index b4f073c1206..674992cafc9 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
@@ -18,7 +18,6 @@ IUSE_INPUT_DEVICES="
input_devices_keyboard
input_devices_libinput
input_devices_mouse
- input_devices_tslib
input_devices_vmmouse
input_devices_void
input_devices_synaptics
@@ -64,7 +63,6 @@ PDEPEND="
input_devices_keyboard? ( x11-drivers/xf86-input-keyboard )
input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.27.1 )
input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.9.3 )
- input_devices_tslib? ( x11-drivers/xf86-input-tslib )
input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse )
input_devices_void? ( x11-drivers/xf86-input-void )
input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 99c062fe855..d0a348508b0 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -18,7 +18,6 @@ IUSE_INPUT_DEVICES="
input_devices_keyboard
input_devices_libinput
input_devices_mouse
- input_devices_tslib
input_devices_vmmouse
input_devices_void
input_devices_synaptics
@@ -64,7 +63,6 @@ PDEPEND="
input_devices_keyboard? ( x11-drivers/xf86-input-keyboard )
input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.27.1 )
input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.9.3 )
- input_devices_tslib? ( x11-drivers/xf86-input-tslib )
input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse )
input_devices_void? ( x11-drivers/xf86-input-void )
input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
