gentoo resync : 19.07.2019

4 files changed, 10 insertions, 10 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 1ebfdcb13b6c..cda1af677004 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -9,7 +9,7 @@ AUX xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch 17
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.20.4.tar.bz2 6123780 BLAKE2B 224dda54f433315f6614cbee5bc54db91d9d9e190c06ac7f26e334b80b9d4a612ff4b2a4f10f50a6f928ecdbea40172d5578289fbf88411f006bcd473253b05d SHA512 f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8
 DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be SHA512 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631
-EBUILD xorg-server-1.20.4.ebuild 5830 BLAKE2B cc5a726bc287b7a78e195e251bb3b687f5c9cbf7443d909874b97c101dc28a1e78ea203d9b8c845dc1d24d49a9f47267262868dac92de8be03da7a418386ef0d SHA512 0551c9620acde87d5cef28b49355076262d81ee4411698d35b19d9e2899ad8250b74ab5835a859670c33df2b6ee73facc2d1b1212a46224e1db78454c277a099
-EBUILD xorg-server-1.20.5.ebuild 5862 BLAKE2B fb8491b86dfe1a5db0e576aa45319da288d741552bac312d6ff930ae5b8cdaecc2d905a140f1af92c36435a3981865e14c2e3b610b67542ec8bde1eb687f87b3 SHA512 5a1140772fff1450f0268a24ea536dd948a260acd16c9e7746096a43945d3f82ba0cde75ddce6d5795b7766719265f450d1e2dd1b53beb525a7b415986b22a4c
-EBUILD xorg-server-9999.ebuild 5582 BLAKE2B b34beee694bc56d0f20509ef2a7184adc9fd13dffce3c5e81e73c50a0f148f5e08c93221242e30e6e7b89b6a15989c67c4892b2a66f7b274e90cef4ad6ff377f SHA512 a9faebd1c26328262e13037117a150359488dd8b498abed1fbac55e73ad8f702a49d5f30a6c4afd93152f59f7fb948c744fd63b3f229a4b597eea58bcda0e281
+EBUILD xorg-server-1.20.4.ebuild 5845 BLAKE2B eec2ac0c09e890a737b27c287c2c3e12ef6e343816d7a06d8162f547f5047cc2a3175445f42a20417545f75ca0593700aba6e2835fae025295620fb032ac3ede SHA512 35669c77e8b297295b57298a961048fddec22f9b168efc0d6e086dd470964963b2788a6d82966313767df1a2c30c7b955388941d0551e9c8c3ae1a6f040e3647
+EBUILD xorg-server-1.20.5.ebuild 5871 BLAKE2B 801a1b28683a1fecf2a7586752ed0b076d675de1e9f1d46b2f0b38e2f3495925e2ac869c3b660655cb227f55147dde8e8a8fbb8443b29f64fa0181f8464756a3 SHA512 9137b0c47d4aabecf8c757195d96bb0b3e7e3c9750891d49c276f12f8dd0381a376be83dfa008017d8ef9640e540da33b6f05575b36f17a882040efe0b7ac108
+EBUILD xorg-server-9999.ebuild 5597 BLAKE2B d1e1979d44a33f2468be65a363b13f7de55d98a17fec4499b0257fc27fe09226caccfee5ca681ecb62aebe2a9554f2c312dc8df0175181e993ba7ed569b983ac SHA512 fc36bb52fb99b66adab7beb83810791abc0f18b2e9d569b234a78f0d996c8ca9cf7bfad16f8031eeca3543bdfd7b16beb50ac5cd915ed4b022088cb79eafdc28
 MISC metadata.xml 960 BLAKE2B 886751450005aa4b2c197e0aa439028ab0138e8947a8deb005890ca4845e6e19b19f3134e7e3d105ef2bab68e6f8605fee87a082dd25cbd7fe223b9268ecc607 SHA512 d027e5a630ec940e6c2c5f216fa159aa25092cbbb7078efe2bc52ebee28b856297d0a641f57a2c108cb13ad61e9d8d0007ae9d6f2c2ff01ec4632650ec1b72df
diff --git a/x11-base/xorg-server/xorg-server-1.20.4.ebuild b/x11-base/xorg-server/xorg-server-1.20.4.ebuild
index 291fd4063306..09900780117f 100644
--- a/x11-base/xorg-server/xorg-server-1.20.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.4.ebuild
@@ -49,7 +49,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 		>=x11-libs/libXtst-1.0.99.2
 	)
 	glamor? (
-		media-libs/libepoxy[X]
+		media-libs/libepoxy[X,egl(+)]
 		>=media-libs/mesa-18[egl,gbm]
 		!x11-libs/glamor
 	)
@@ -74,7 +74,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	unwind? ( sys-libs/libunwind )
 	wayland? (
 		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
+		media-libs/libepoxy[egl(+)]
 		>=dev-libs/wayland-protocols-1.1
 	)
 	>=x11-apps/xinit-1.3.3-r1
diff --git a/x11-base/xorg-server/xorg-server-1.20.5.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild
index 004963a8c779..2a418db64eb5 100644
--- a/x11-base/xorg-server/xorg-server-1.20.5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
@@ -49,7 +49,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 		>=x11-libs/libXtst-1.0.99.2
 	)
 	glamor? (
-		media-libs/libepoxy[X]
+		media-libs/libepoxy[X,egl(+)]
 		>=media-libs/mesa-18[egl,gbm]
 		!x11-libs/glamor
 	)
@@ -74,7 +74,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	unwind? ( sys-libs/libunwind )
 	wayland? (
 		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
+		media-libs/libepoxy[egl(+)]
 		>=dev-libs/wayland-protocols-1.1
 	)
 	>=x11-apps/xinit-1.3.3-r1
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index f03b1a5f7150..aef16fac8f1d 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -48,7 +48,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 		>=x11-libs/libXtst-1.0.99.2
 	)
 	glamor? (
-		media-libs/libepoxy[X]
+		media-libs/libepoxy[X,egl(+)]
 		>=media-libs/mesa-18[egl,gbm]
 		!x11-libs/glamor
 	)
@@ -73,7 +73,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	unwind? ( sys-libs/libunwind )
 	wayland? (
 		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
+		media-libs/libepoxy[egl(+)]
 		>=dev-libs/wayland-protocols-1.1
 	)
 	>=x11-apps/xinit-1.3.3-r1