gentoo resync : 25.04.2020

9 files changed, 92 insertions, 12 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index eadc0a8b2740..5f9b0f15a739 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 5e5d6faa4307..14edb386b986 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,5 +1,5 @@
 DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1 SHA512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
 DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
 EBUILD xcb-proto-1.13.ebuild 1567 BLAKE2B aa0105ebdcba0b3d56e1688bd5ab00e8e2761897c21ef3ac1c541994cbdf9dfe65abed53129c5418d1d2178865d7d7a0499077a442b52bbb9f1e0a1ed27c1868 SHA512 d1cc2521b7c24ec2cd37f08166f25e910a1608e8e1e0ecda5583879b446f5862ef45f5d63b0663021e1b2d684ebb99bd6cffbdd787bc88cd6f05d7030b0a6a56
-EBUILD xcb-proto-1.14-r1.ebuild 1293 BLAKE2B 4a0d66f2164f6147e8883a9bbed81073b6f371850aa89c0f0f7709e10a84df3c569cd9b348e443229ac93672f81387b031c1ef010eca074bee77bcb95c18886c SHA512 759395c47cd8b2b859cee1ad8a90da9035f294cd8474f36862fe2b03c65a0eee4e3b4baaddec77fcf27187dd0fa85395ec7c002e9e768a019bf1781932aa1a44
+EBUILD xcb-proto-1.14-r1.ebuild 1292 BLAKE2B 28a2bb2656257f6348b5e780dc79751543e38acbf4e10d0c6723ad2c61f2026e78695cc59b7c6a2645dbea46d0900e5c5a9b115ccf8c9101d0e26c47a8c32fdc SHA512 c7ab6aa93485610b6e0424dc79022c8bfcf66e48d9e64236d10bab045658aeeec3837d00d321e10be7f9b6e5063582f41b66486a6b11bdc32e78a0825fc8295e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
index 2a73cae43dcc..db6a3ce99915 100644
--- a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 542064b87dd8..6d108b278cb2 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,3 +1,3 @@
-EBUILD xorg-drivers-1.20-r1.ebuild 3746 BLAKE2B 6f94ad8b6e2ba1e5024b7a741205e3f89a01c3ed861311aa700e68276af20aa0834a67d8daf4238a05e503ac92cc543feaad247c51f12c4d5979967ccf371b74 SHA512 110d09989a77e7c47cde4140a0f8836e609bf1b114d44c53355e53cd2812b4cc3c6c70724d3484cf4c747d6a42a3cc6d083b381226556d7d1dd7620a872c6de8
-EBUILD xorg-drivers-9999.ebuild 3715 BLAKE2B a56317af5482b20484478c4f3c27884d58e1d03c0eeb6befcf4f94de97f95d9f77bcb10b3527919aa8658411d16c699d8e86db2200446a7883db7550e043ce62 SHA512 55ab43d588d76451bcd8b067b76f8bd468ca678ee1e79a5f254e5d4e754bdf2caaf1228c45c11ed8bd186044ba2cf58fcdc1e6a93b0ec0e14ccbc3a99caa1a17
+EBUILD xorg-drivers-1.20-r2.ebuild 3832 BLAKE2B 6b4ff0d92c37462c9226b830548a4ec8a6855b13a4bded159306a854613451cd6db8f16c3af59305311cec1b11b9a40408a7b4edbde6dd0640e1bf7eaf0f2d25 SHA512 fe8176318aa6c4f572078d5b7cad4d9d61854e11369198f4f62b0f737f5e471f501eb97bc722be5788461b46d5bc9fc5a3dd1f5970054e38d9770fcd8fe06ffc
+EBUILD xorg-drivers-9999.ebuild 3841 BLAKE2B 29747766753b828cc5778e04f73e7b8ff18e58f9f1104d9e240425bf4ff269b4e8caa57b0eae46a2969f6893626f979cbb2b01b2fb36eff020847865b7ef4346 SHA512 d2914c1ca0449d69b01e71b689d75cb7d9dca3e70da6d5b5d58271ef5e22f3038e6c0aa1c22bd6eecc698126d2bbbc7be292ec00af2a52dd830e8696c41165d3
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
index a015acc2828c..9d4ef15e4889 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
@@ -58,10 +58,16 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
 
 PDEPEND="
 	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
-	input_devices_evdev?       ( >=x11-drivers/xf86-input-evdev-2.10.6 )
+	input_devices_evdev?       (
+								 >=x11-base/xorg-server-${PV}[udev]
+								 >=x11-drivers/xf86-input-evdev-2.10.6
+							   )
 	input_devices_joystick?    ( >=x11-drivers/xf86-input-joystick-1.6.3 )
 	input_devices_keyboard?    ( x11-drivers/xf86-input-keyboard )
-	input_devices_libinput?    ( >=x11-drivers/xf86-input-libinput-0.27.1 )
+	input_devices_libinput?    (
+								 >=x11-base/xorg-server-${PV}[udev]
+								 >=x11-drivers/xf86-input-libinput-0.27.1
+							   )
 	input_devices_mouse?       ( >=x11-drivers/xf86-input-mouse-1.9.3 )
 	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
 	input_devices_void?        ( x11-drivers/xf86-input-void )
@@ -94,6 +100,4 @@ PDEPEND="
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
 	video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )
 	video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
-
-	!<x11-drivers/xf86-input-evdev-2.10.4
 "
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 5bf741ecf02a..f9af84eb3d25 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -58,10 +58,16 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
 
 PDEPEND="
 	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
-	input_devices_evdev?       ( >=x11-drivers/xf86-input-evdev-2.10.6 )
+	input_devices_evdev?       (
+								 >=x11-base/xorg-server-${PV}[udev]
+								 >=x11-drivers/xf86-input-evdev-2.10.6
+							   )
 	input_devices_joystick?    ( >=x11-drivers/xf86-input-joystick-1.6.3 )
 	input_devices_keyboard?    ( x11-drivers/xf86-input-keyboard )
-	input_devices_libinput?    ( >=x11-drivers/xf86-input-libinput-0.27.1 )
+	input_devices_libinput?    (
+								 >=x11-base/xorg-server-${PV}[udev]
+								 >=x11-drivers/xf86-input-libinput-0.27.1
+							   )
 	input_devices_mouse?       ( >=x11-drivers/xf86-input-mouse-1.9.3 )
 	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
 	input_devices_void?        ( x11-drivers/xf86-input-void )
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index e04b0d18c7a3..d4ec9425f33c 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,4 +1,6 @@
 DIST xorgproto-2019.2.tar.gz 1080686 BLAKE2B 4e0218ef02a8df5220431ae36ac1bc8feaa2bfdefe784f9b7393fe1d27db5b39ba90a38a3570bd78279964c5842ea65df3724b2407535a43fd867922156d92e9 SHA512 3385e7eb8ae1384aa01945c7f5a300884a1deb8d564ab62bd5bcaa3703d3dbf9bbc19797ac17d19e15417bf8456f706f993e90ece2d34cc94046ac302c062cbe
-EBUILD xorg-proto-2019.2.ebuild 1838 BLAKE2B ea01a806ea80bd23247869fe336d4c4cb4c8ece60948af03b72ada67d54717847df302ddc4962c731662fde38600a8cf079251103681380de74003c76037ad95 SHA512 067ce820ef0351e408f43377f0a1a30e3d15a9db4a7c1c7f4630bc73330f255232ddea7f9a3ced626a326ee6456f6fe2688393f33a2450024304490972bb58fd
+DIST xorgproto-2020.1.tar.gz 1081369 BLAKE2B 1bed8d65499926a830180ee1fce5e5e57a276a6412231508eabb6c5eea5ee20dcce4046fc82203d5be88d1f24fb7919289393551d339e5cf5cb80b1c14f22c42 SHA512 d0bc3aec517fd00fa5fd32a5715760c34810a19154e10fb1f92f2e2fe7f26136f7ba9b76b47fcd37c3c4796663154f4e5abf6a18dd634619b0f718f3e4737ae9
+EBUILD xorg-proto-2019.2.ebuild 1839 BLAKE2B c947dc68efd80041ebd656d6f11887a741b8f1bb9fe683d55ac02b92ee1e7788d2d0754ad59135c6086b6dc845509669ab74b0ba2bd89dacfe41ef674b20b6d7 SHA512 872d2677772d953c2dcfe0ea4ca2ddab3e3fab5632d0114c80e59a2d2ca407573ee3bc824d95093cf9a6db44aedfbf7c07babeffbbaa2fbd8978e32327e59714
+EBUILD xorg-proto-2020.1.ebuild 1848 BLAKE2B 54948566461d17465ed981fdcfb51ee895a29b2f8360a7fd78ce6bd052f81a373c19a9f8f2bf7e4de2910e897714b9ad9d8c925bc7b2eb739e950597e320fc12 SHA512 7b5961c9100a06d0d229310655521c29aeb7973d013ae310cfd8ce6b2125452764d7c46b9272fb089e8e83c9fbdd4f5fe2d06206b83ff3fcbc0a33276463c9c3
 EBUILD xorg-proto-9999.ebuild 1848 BLAKE2B 54948566461d17465ed981fdcfb51ee895a29b2f8360a7fd78ce6bd052f81a373c19a9f8f2bf7e4de2910e897714b9ad9d8c925bc7b2eb739e950597e320fc12 SHA512 7b5961c9100a06d0d229310655521c29aeb7973d013ae310cfd8ce6b2125452764d7c46b9272fb089e8e83c9fbdd4f5fe2d06206b83ff3fcbc0a33276463c9c3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2019.2.ebuild b/x11-base/xorg-proto/xorg-proto-2019.2.ebuild
index b84e81272bed..60cb600fe9e3 100644
--- a/x11-base/xorg-proto/xorg-proto-2019.2.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2019.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
new file mode 100644
index 000000000000..1f96a954d932
--- /dev/null
+++ b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson
+
+DESCRIPTION="X.Org combined protocol headers"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	!<x11-proto/bigreqsproto-1.1.2-r1
+	!<x11-proto/compositeproto-0.4.2-r2
+	!<x11-proto/damageproto-1.2.1-r2
+	!<x11-proto/dmxproto-2.3.1-r2
+	!<x11-proto/dri2proto-2.8-r2
+	!<x11-proto/dri3proto-1.0-r1
+	!<x11-proto/fixesproto-5.0-r2
+	!<x11-proto/fontsproto-2.1.3-r1
+	!<x11-proto/glproto-1.4.17-r2
+	!<x11-proto/inputproto-2.3.2-r1
+	!<x11-proto/kbproto-1.0.7-r1
+	!<x11-proto/presentproto-1.1-r1
+	!<x11-proto/randrproto-1.5.0-r1
+	!<x11-proto/recordproto-1.14.2-r2
+	!<x11-proto/renderproto-0.11.1-r2
+	!<x11-proto/resourceproto-1.2.0-r1
+	!<x11-proto/scrnsaverproto-1.2.2-r2
+	!<x11-proto/trapproto-3.4.3-r1
+	!<x11-proto/videoproto-2.3.3-r1
+	!<x11-proto/xcmiscproto-1.2.2-r1
+	!<x11-proto/xextproto-7.3.0-r1
+	!<x11-proto/xf86bigfontproto-1.2.0-r2
+	!<x11-proto/xf86dgaproto-2.1-r3
+	!<x11-proto/xf86driproto-2.1.1-r2
+	!<x11-proto/xf86miscproto-0.9.3-r1
+	!<x11-proto/xf86vidmodeproto-2.3.1-r2
+	!<x11-proto/xineramaproto-1.2.1-r2
+	!<x11-proto/xproto-7.0.31-r1
+
+	!x11-proto/fontcacheproto
+	!x11-proto/xf86rushproto"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}