gentoo resync : 10.11.2019

8 files changed, 30 insertions, 36 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 10ddcd16132b..ad41fb9fabc2 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 2e45ed1216ff..076daa2da092 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,3 +1,3 @@
-EBUILD xorg-drivers-1.20.ebuild 3731 BLAKE2B 3c9279953bcfe188c0332ef645247f83fe5eabbf6f0dc1a119ad8aaeda469cac6378a6b6090a784758732eaf108d8faf8a079beb441fbf03ca12a43a3e1806f9 SHA512 efb74550fd26223bb086a0117b4375eb179e4bb7b6836f906dc5117f5c85d29bba8ee982e5ceb6ec9304a21cb53eb3d8c961c326222a287ab38ef2cd2fcb8557
-EBUILD xorg-drivers-9999.ebuild 3742 BLAKE2B 14d7628117d690aa6171b30be318497e67ebfd127421aa877a2b20ab797c0bed62c636421dd6e5a4676b2a2846fd50b75c86887e28dc61618c73c763ea52d5c7 SHA512 c5214edf06fe594f5595bacb5adebbbf5aa7b9e44c12583d571a9e62ed41df036c7d79973637849d49ffae4a48b11b59e9f29b1218372fbf6df52d70da283469
+EBUILD xorg-drivers-1.20-r1.ebuild 3731 BLAKE2B b8b96b67a21d272a7293c20baa56187627a7c50d19f972125eb7dce881882a569dea2fb94bd0e028683479f4fb178b4f45b0fa57feb2453a299dde3e7252454c SHA512 b4a5ac9ae19eb39172a457a95aa675d0f3da2a77a46f8370216758d6c3e1e5e23c491acbb9e0f0c7bf0d765fe54acadb2152339625086c3bdf4f10f753e57823
+EBUILD xorg-drivers-9999.ebuild 3742 BLAKE2B 7f2c9d0f0e2b5d7e3a3b9eb0891f758f3a14e5f6ffddb92d49e8a87959c03cdde0253eed8b84075d3310302d9d395c75ea38173e084c7362983e7819ed597126 SHA512 5ccdf98da5b81525882047fc4fc5b09fa7761fdcfaec5cb369bca3dc913e8e4ae2effc76be1f35120c4748eed5c06d02eead07844fd0ff1771eeb846cc8da636
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild
index fc0fa18b37a8..e11cd07feb38 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild
@@ -72,11 +72,11 @@ PDEPEND="
 	video_cards_ast?           ( x11-drivers/xf86-video-ast )
 	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
 	video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
-	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[glamor] )
+	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_geode?         ( x11-drivers/xf86-video-geode )
 	video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
 	video_cards_i915?          ( x11-drivers/xf86-video-intel )
-	video_cards_i965?          ( >=x11-base/xorg-server-${PV}[glamor] )
+	video_cards_i965?          ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_intel?         ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
 	video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
 	video_cards_nouveau?       ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
@@ -86,10 +86,10 @@ PDEPEND="
 	video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
 	video_cards_r128?          ( >=x11-drivers/xf86-video-r128-6.10.2 )
 	video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
-	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] )
+	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
 	video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
-	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[glamor] )
-	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
+	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[-minimal] )
+	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
 	video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 10daad342d79..cd83934c3ef3 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -72,11 +72,11 @@ PDEPEND="
 	video_cards_ast?           ( x11-drivers/xf86-video-ast )
 	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
 	video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
-	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[glamor] )
+	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_geode?         ( x11-drivers/xf86-video-geode )
 	video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
 	video_cards_i915?          ( x11-drivers/xf86-video-intel )
-	video_cards_i965?          ( >=x11-base/xorg-server-${PV}[glamor] )
+	video_cards_i965?          ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_intel?         ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
 	video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
 	video_cards_nouveau?       ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
@@ -86,10 +86,10 @@ PDEPEND="
 	video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
 	video_cards_r128?          ( >=x11-drivers/xf86-video-r128-6.10.2 )
 	video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
-	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] )
+	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
 	video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
-	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[glamor] )
-	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
+	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[-minimal] )
+	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[-minimal] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
 	video_cards_virtualbox?    ( x11-drivers/xf86-video-vboxvideo )
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 4b09dfc5efe1..82b19047123d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -8,6 +8,6 @@ AUX xorg-server-1.20.4-shm-Use-memfd_create-when-possible.patch 3194 BLAKE2B 6ac
 AUX xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch 1724 BLAKE2B 34c607f6b6a6f21ed6b34d7a87cb3bc1774f526f32144218c7d5d338474c08c98c72a87b41f3d0afcaf81dc0e8d5989a48fd8e64a6a9e25ad968ad8156f6e984 SHA512 49d5af904bac03cfc8ad89b70541e9af6687f7f0153d06ada64e2226d27dddc1b7bb27024bed73c20c365197858957730de005c515bbae8e22b610c3241b70e4
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be SHA512 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631
-EBUILD xorg-server-1.20.5.ebuild 6070 BLAKE2B 685afa31864463a516a8f906b88ba838b19fb5a1f194b128c5cf4d228936f6ffcffd28df79a04fa40a6b81d108a64d7e1963b2747c76b104440f574a28d1074f SHA512 9e230fb9aa3518c046c5c1ad2841ce3c7897b764458e1df42f645a396ffb78bed48a39de96dd17926b5c2a933a099a66c75eb313a4ba95f38de666aa35dd6ce4
-EBUILD xorg-server-9999.ebuild 5799 BLAKE2B e82105b1d4ab87f7fb41ffd1f12cd50c193178af0d5853d5d04d417211b85398f1984ec61e397ff7f51718685de95713c3565a6a0811c17a97a7d6fc69daefcf SHA512 7b1b96e8f2f57c65b652dd6b2c2b95b571374c5a05ab49ea1e5f1f1823bffcef2ead3e1d1c8c1d96fc01d5664c7ff67bf2174c5aa7effa93d976a624ae14636c
-MISC metadata.xml 1017 BLAKE2B 98dc828c96dc8fe30ef9314a6858aab7f25a0959d496f1c61802a38438902597c477ea1ae8018873958339ff936f0093651e4352db2e82fe4b77116365888d9f SHA512 695f5fefa689ccb192e43f9deab082bb4b18f68355d95e6b483e053451c87bb64a4d74c9e382e736e2900b9f4720613651f69831e8eefb2c1cd228b6284ae5c2
+EBUILD xorg-server-1.20.5.ebuild 6057 BLAKE2B d509009a97278827f4d78e2a8e2f3d23d7e7d26b7f9c8c550bbd760fedb5cb9165166a5c03ed3c2d23255aba557546ed2ce65bbceb1cc0d32bf50bccc028a680 SHA512 f33ba6c619e3c9319e48673db7315e627115a2a0393de7f872cd37098d0028982a3f4737b733c36638e7b755de1022feb76291cf3dbdfc05186c7cda2f9b76d6
+EBUILD xorg-server-9999.ebuild 5809 BLAKE2B 966606e8b0c0fe9e6ce574147c40f1202977fe2fcfd9e772b685d288d017ccaa0af82248a6b7ce742a4d12c26e9d0c5bf40d3682e9f2d44dac2b12bb88537593 SHA512 fcbb8d395ff4f93f011bf22a13692a0f0a11282237c1774502e9c33f312f8b78d1c60be453d8192a3ee895a5e21c2574ccf9ee5098e090c842e03ec8fddb0075
+MISC metadata.xml 952 BLAKE2B 48b5bada3b2b3b16ef4806f028b8fe47a4d5cd0d19783ebb585f0389f51df589d3f53c5bff5f5ed883ad61c7e7be0fef94fd5cf11042e23dea5e456faf0a927c SHA512 34955c04ee1488a09997d0d9caf63c9202023d06e0524b74120c5c1def033d9dbc2ce82a5d4c289a6fd98df83e2e09ad54e6a084d164d2416228628df7874198
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index b3f0d6f2cdee..2e8d8799f905 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -8,7 +8,6 @@
 <use>
 	<flag name="dmx">Build the Distributed Multiheaded X server</flag>
 	<flag name="elogind">Use elogind to get control over framebuffer when running as regular user</flag>
-	<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
 	<flag name="kdrive">Build the kdrive X servers</flag>
 	<flag name="libglvnd">Use libglvnd for dispatch.</flag>
 	<flag name="unwind">Enable libunwind usage for backtraces</flag>
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 601e6ae7a361..8f859c2eaf57 100644
--- a/x11-base/xorg-server/xorg-server-1.20.5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
 
 CDEPEND="libglvnd? (
 		media-libs/libglvnd
@@ -52,11 +52,6 @@ CDEPEND="libglvnd? (
 		>=x11-libs/libXres-1.0.3
 		>=x11-libs/libXtst-1.0.99.2
 	)
-	glamor? (
-		media-libs/libepoxy[X,egl(+)]
-		>=media-libs/mesa-18[egl,gbm]
-		!x11-libs/glamor
-	)
 	kdrive? (
 		>=x11-libs/libXext-1.0.5
 		x11-libs/libXv
@@ -72,7 +67,8 @@ CDEPEND="libglvnd? (
 	!minimal? (
 		>=x11-libs/libX11-1.1.5
 		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-18[X(+)]
+		>=media-libs/mesa-18[X(+),egl,gbm]
+		media-libs/libepoxy[X,egl(+)]
 	)
 	udev? ( virtual/libudev:= )
 	unwind? ( sys-libs/libunwind )
@@ -119,7 +115,7 @@ REQUIRED_USE="!minimal? (
 	)
 	elogind? ( udev )
 	?? ( elogind systemd )
-	minimal? ( !glamor !wayland )
+	minimal? ( !wayland )
 	xephyr? ( kdrive )"
 
 UPSTREAMED_PATCHES=(
@@ -136,9 +132,10 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use wayland && ! use glamor; then
+	if use wayland && use minimal; then
 		ewarn "glamor is necessary for acceleration under Xwayland."
 		ewarn "Performance may be unacceptable without it."
+		ewarn "Build with USE=-minimal to enable glamor."
 	fi
 
 	# localstatedir is used for the log location; we need to override the default
@@ -150,7 +147,6 @@ pkg_setup() {
 		$(use_enable ipv6)
 		$(use_enable debug)
 		$(use_enable dmx)
-		$(use_enable glamor)
 		$(use_enable kdrive)
 		$(use_enable unwind libunwind)
 		$(use_enable wayland xwayland)
@@ -159,6 +155,7 @@ pkg_setup() {
 		$(use_enable !minimal dri)
 		$(use_enable !minimal dri2)
 		$(use_enable !minimal dri3)
+		$(use_enable !minimal glamor)
 		$(use_enable !minimal glx)
 		$(use_enable xcsecurity)
 		$(use_enable xephyr)
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index e9c4e0045348..25dac9a8620a 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 XORG_DOC=doc
+XORG_EAUTORECONF="yes"
 inherit xorg-3 multilib flag-o-matic
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 
@@ -14,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
 
 CDEPEND="libglvnd? (
 		media-libs/libglvnd
@@ -51,11 +52,6 @@ CDEPEND="libglvnd? (
 		>=x11-libs/libXres-1.0.3
 		>=x11-libs/libXtst-1.0.99.2
 	)
-	glamor? (
-		media-libs/libepoxy[X,egl(+)]
-		>=media-libs/mesa-18[egl,gbm]
-		!x11-libs/glamor
-	)
 	kdrive? (
 		>=x11-libs/libXext-1.0.5
 		x11-libs/libXv
@@ -71,7 +67,8 @@ CDEPEND="libglvnd? (
 	!minimal? (
 		>=x11-libs/libX11-1.1.5
 		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-18[X(+)]
+		>=media-libs/mesa-18[X(+),egl,gbm]
+		media-libs/libepoxy[X,egl(+)]
 	)
 	udev? ( virtual/libudev:= )
 	unwind? ( sys-libs/libunwind )
@@ -118,7 +115,7 @@ REQUIRED_USE="!minimal? (
 	)
 	elogind? ( udev )
 	?? ( elogind systemd )
-	minimal? ( !glamor !wayland )
+	minimal? ( !wayland )
 	xephyr? ( kdrive )"
 
 UPSTREAMED_PATCHES=(
@@ -132,9 +129,10 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use wayland && ! use glamor; then
+	if use wayland && use minimal; then
 		ewarn "glamor is necessary for acceleration under Xwayland."
 		ewarn "Performance may be unacceptable without it."
+		ewarn "Build with USE=-minimal to enable glamor."
 	fi
 
 	# localstatedir is used for the log location; we need to override the default
@@ -146,7 +144,6 @@ pkg_setup() {
 		$(use_enable ipv6)
 		$(use_enable debug)
 		$(use_enable dmx)
-		$(use_enable glamor)
 		$(use_enable kdrive)
 		$(use_enable unwind libunwind)
 		$(use_enable wayland xwayland)
@@ -155,6 +152,7 @@ pkg_setup() {
 		$(use_enable !minimal dri)
 		$(use_enable !minimal dri2)
 		$(use_enable !minimal dri3)
+		$(use_enable !minimal glamor)
 		$(use_enable !minimal glx)
 		$(use_enable xcsecurity)
 		$(use_enable xephyr)