gentoo resync : 05.01.2018

4 files changed, 4 insertions, 28 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 6ec152d43f51..6ce086c9f010 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 5f181e0bbd94..6b4d3020c6f1 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,3 +1,3 @@
-EBUILD xorg-drivers-1.19.ebuild 7448 BLAKE2B 47c3720c1afdc832aea5153a45b7248c885ab967f1d6e13dba29aa09b00f49b53a7842e1aa42240aa335d226cb2bef9899eadab8e236bc8a2175bdadfef40e89 SHA512 d6e40edf250973459d272f2eb8e4f8265b029ccf225c9b971629b63034274d02f066c6f78061b5d5fb713b00c644da294e15d1969f4b48e5885590a13841e163
-EBUILD xorg-drivers-9999.ebuild 5738 BLAKE2B ad00f8d58cb3cb45865fd444768260d3eecbd3215233dbf929f67bb9498f9547ee13d03e8eef54a443424624fdf795ac9f5ff437bf47746a488f41b48bf7ccae SHA512 7b9fc608d4fb5f7833900086b0c22ce66b6e50d32f5513bf7f72fced58b4126ab9312da63561e0706a319d388b977515f592d4fd6f36f2c5e7016a08527d7ff8
+EBUILD xorg-drivers-1.19.ebuild 6938 BLAKE2B 3159a4f1aadb695fb5f7f92b94cdf335c1b863afb089e1f73a8d65775f68f08d6d2ba20435291e9f89a8773026d077df528b10158b338519bd8ae7780c9cd9d9 SHA512 84f09cea77f6f303edecc4d1381801d6e8263dcb01fd50773ed800e9e394f9a2b4ec1dd03cdfef2a7f99e501260f3badb4465cf49c11bf5527b749533dd6aab9
+EBUILD xorg-drivers-9999.ebuild 5228 BLAKE2B 792182f87fc10ddfd4d51df329ad811af861a785d3768e853a794b8e3b37b2d7ce5d561401bf4524a99d77110ec5bb28897a820fc5932df0bffb6dd0103f9ca0 SHA512 1584a24fbd184be44fe4365030945d141156467e42616a4544535f31bb6fdccc8331b2ee493387d05002f4a90b0000b36400850cab02b703c0508257fd1fd546
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
index 0cfb79290be5..ff2b0a7693af 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.19.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
@@ -12,18 +12,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
 	input_devices_elographics
 	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
 	input_devices_joystick
 	input_devices_keyboard
 	input_devices_libinput
 	input_devices_mouse
-	input_devices_mutouch
-	input_devices_penmount
 	input_devices_tslib
 	input_devices_vmmouse
 	input_devices_void
@@ -89,18 +83,12 @@ IUSE_VIDEO_CARDS="
 IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
 
 PDEPEND="
-	input_devices_acecad?      ( x11-drivers/xf86-input-acecad )
-	input_devices_aiptek?      ( x11-drivers/xf86-input-aiptek )
 	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
 	input_devices_evdev?       ( x11-drivers/xf86-input-evdev )
-	input_devices_fpit?        ( x11-drivers/xf86-input-fpit )
-	input_devices_hyperpen?    ( x11-drivers/xf86-input-hyperpen )
 	input_devices_joystick?    ( x11-drivers/xf86-input-joystick )
 	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_mutouch?     ( x11-drivers/xf86-input-mutouch )
-	input_devices_penmount?    ( x11-drivers/xf86-input-penmount )
 	input_devices_tslib?       ( x11-drivers/xf86-input-tslib )
 	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
 	input_devices_void?        ( x11-drivers/xf86-input-void )
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 2746204626d3..bfa5853479ac 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.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
@@ -12,18 +12,12 @@ SLOT="0"
 KEYWORDS=""
 
 IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
 	input_devices_elographics
 	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
 	input_devices_joystick
 	input_devices_keyboard
 	input_devices_libinput
 	input_devices_mouse
-	input_devices_mutouch
-	input_devices_penmount
 	input_devices_tslib
 	input_devices_vmmouse
 	input_devices_void
@@ -64,18 +58,12 @@ IUSE_VIDEO_CARDS="
 IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
 
 PDEPEND="
-	input_devices_acecad?      ( x11-drivers/xf86-input-acecad )
-	input_devices_aiptek?      ( x11-drivers/xf86-input-aiptek )
 	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
 	input_devices_evdev?       ( x11-drivers/xf86-input-evdev )
-	input_devices_fpit?        ( x11-drivers/xf86-input-fpit )
-	input_devices_hyperpen?    ( x11-drivers/xf86-input-hyperpen )
 	input_devices_joystick?    ( x11-drivers/xf86-input-joystick )
 	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_mutouch?     ( x11-drivers/xf86-input-mutouch )
-	input_devices_penmount?    ( x11-drivers/xf86-input-penmount )
 	input_devices_tslib?       ( x11-drivers/xf86-input-tslib )
 	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
 	input_devices_void?        ( x11-drivers/xf86-input-void )