gentoo resync : 15.12.2019

4 files changed, 7 insertions, 15 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f4beb051b547..12aecffa5cc0 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,8 @@
 DIST mesa-19.1.8.tar.xz 10945480 BLAKE2B df2ce0561cd0a61f0f35a406a5a9b2384c0c5869efadabfa40b07cf96a592214aa5c6d03423598c531f117075c3b59aa5af6f9b1c5dfa5914aabe41f60b592a0 SHA512 3bcc90c17cf966ce3399434ca2d4f363c5778e52c56b8184d6cdf22ef2e4a4fdb9c3fbff5c98efc856e3535f81259608a6daa74af1f3bdce30ea251d86435c74
-DIST mesa-19.2.4.tar.xz 11458340 BLAKE2B 2403f50e3d31f87981b8f243d8473672305c88f93daa11c0d9a373d5b68f52af105b134d9deda71bc9d4f56e6c8b2d6358b298060229802987ef88dd58bc5d21 SHA512 e8a0e90460f3153d730f8fb13f2c912a9826c05d2af9e22dc575bcd8885bf6a33c0af1c6659e81701ff097a132df88eead208e89dceb552b9da809ab543fa479
-DIST mesa-19.3.0-rc3.tar.xz 11790800 BLAKE2B c7ed3f2a01b64df3a411f60c53e9462d663ccbe047c60df6ea025437e3baa15a26b2f6923dac7479d5b9e95a2994ee842c06298b1aa60d347fbf9995c72387dc SHA512 a95318f8778c79f611b2915e48bb6270e02735a2325b3538825012bd5ea06477f395b683c63e21b6f1635122f7002d819c8239a36d8e34e0331cec019f4a8c99
+DIST mesa-19.2.7.tar.xz 11460812 BLAKE2B 27408d28d24ea397a0e60d1e4dc56ebe11c269720c31285794e611f41db6f2691c914892910b468210bb43f2111e5caf210e0dac287fb28a24825ad54e5643cc SHA512 87a82664381432e956ee23dc92bec5accf667606232e38d9458d67132c16fdc44584f65671293b83f00c58ad7742b80e942a5d1bd66d457705be60aaaf35395b
+DIST mesa-19.3.0.tar.xz 11831372 BLAKE2B 97584bd68558e37d20d6e719610066ca2e3df83a26034e2f9b78022d5e5e7b97d12c70e05d8dd2f542f6db5311c4213a1f72afaea1ace4a2bf4ff561bcda2fe6 SHA512 69c4519540118fb3d50d718d92f443051c149633cf4291a07706c6d45cd6ad1f6f3b91446de2d31a9082efe9e3b4ce35b7472830e152ba655d83a91c2ed3c042
 EBUILD mesa-19.1.8.ebuild 14241 BLAKE2B dbdd629eb1f7ec6ad67de25e693e5a05217e425f107ced5cae65e8410112b686cbd1f71098eda8943ba728f0e038860e347c147fa75b1e6e67e7420d2421576f SHA512 b5b86b2f9866bcc8494493bd38bc9cdba20596f129fafcb37804758a387d4d2d61ca17d2f06876029b59619ce2699f0334d6ec7198b2758924f5d4c1c26c8d45
-EBUILD mesa-19.2.4.ebuild 14529 BLAKE2B 32f66c7981c79569b03e561fad1dff4a6bc2cef2ab895732f354d60c25e61df34ee045e782f5f0151f13f1dd348824367b0ed6b6d6b81e21a8d959dda3df9e7a SHA512 ba0d797949a1b1be41cf1436dac3ff41d5708148a3c3647c8ce91ef1a22a78a44e418306aec62bac72fd23b534764de78bdf53e9de8173f7fd3fd53dbe05fdb9
-EBUILD mesa-19.3.0_rc3.ebuild 14553 BLAKE2B 6b39b52b60222f4af0b3e001a749bd416998d28ec5611dea1544b142fbe35db420fa5fd33622ed8572ee86bdbe4c09a87c798b52bcad2333cd423dccb72efdb9 SHA512 e5fdf87caf58f4c8a7ef66a1445192d0ca76b55db727f2f4cb52deda25048492c171630d62c295c059756dd058ea222e7803fd9d0aab28019b6f3757a6210dfb
-EBUILD mesa-9999.ebuild 14594 BLAKE2B ca59d90c807441c8f556dde89a06f8fe2e2c8dec78bc85caa78ae1e046448940c5ae5efbf654b57bb95e23415970e379ca31530ec9496c66525aa2e5cd35de7c SHA512 9e49ac1228c6002d1ad5855c4eef6097cedcd35589207c95282ef42a7c7d1201323b88417d8d5809ea8cacff5c1983037532df9c429273392dab5ca478da40a5
+EBUILD mesa-19.2.7.ebuild 14529 BLAKE2B 32f66c7981c79569b03e561fad1dff4a6bc2cef2ab895732f354d60c25e61df34ee045e782f5f0151f13f1dd348824367b0ed6b6d6b81e21a8d959dda3df9e7a SHA512 ba0d797949a1b1be41cf1436dac3ff41d5708148a3c3647c8ce91ef1a22a78a44e418306aec62bac72fd23b534764de78bdf53e9de8173f7fd3fd53dbe05fdb9
+EBUILD mesa-19.3.0.ebuild 14446 BLAKE2B d52f2def07a716c08f2cf78885b11b780929a828c24bd04f865afdd6a880466d790c601d40fefcd5afe923490d140760369b06059a8356d974e352c4de07b554 SHA512 012f9d14ae4cc04c40d5fb48d97b2880f11712530709830561f9adde6ee075bc6cdad6fbd7c1091fc4093d46b950d700d650b555068febad7ee442cb1a0177f6
+EBUILD mesa-9999.ebuild 14366 BLAKE2B 20bd843874b3f1f2ec5883542e38ff5678e80076597c91971574ab8be7e8771910dcb8163319ccb1c0eacf6b0c73c0e0545b9408d3bcfbb5bd2feddc207b6d90 SHA512 cbe36fd52e933d6f757bf38ba1badd7b4488662b7b0db627df57800b981b800faa1ff7c8d930e983615fb2285c76cc9dbac1980ed0b2cc3e66b58b5f4c8b79e7
 MISC metadata.xml 2000 BLAKE2B c38c6f85a08bdb71f3921847d03c8a2849a43def253c200cb3f21d68142f3a5065cb2e1a2170093d91f3aba34c99fdd9bab840f2bc62ce05f11484b2edb3cb40 SHA512 d55b9c0ff6a97d995a150ee10643c869359370222ab29712da25f69c5671a4e6988e2d508c956082cc7165db96f42289d25daecf230d36efe2240e4f377d1c72
diff --git a/media-libs/mesa/mesa-19.2.4.ebuild b/media-libs/mesa/mesa-19.2.7.ebuild
index 9fb49167ff44..9fb49167ff44 100644
--- a/media-libs/mesa/mesa-19.2.4.ebuild
+++ b/media-libs/mesa/mesa-19.2.7.ebuild
diff --git a/media-libs/mesa/mesa-19.3.0_rc3.ebuild b/media-libs/mesa/mesa-19.3.0.ebuild
index d8de3e17e493..199a28668ea7 100644
--- a/media-libs/mesa/mesa-19.3.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-19.3.0.ebuild
@@ -104,7 +104,6 @@ RDEPEND="
 				)
 		vaapi? (
 			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
 		)
 		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
@@ -151,7 +150,6 @@ LLVM_DEPSTR="
 	|| (
 		sys-devel/llvm:9[${MULTILIB_USEDEP}]
 		sys-devel/llvm:8[${MULTILIB_USEDEP}]
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
 	)
 	sys-devel/llvm:=[${MULTILIB_USEDEP}]
 "
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 8f593918a1ac..db1fd34bf9ab 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -36,8 +36,8 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 libglvnd +llvm
-	lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
-	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
@@ -104,7 +104,6 @@ RDEPEND="
 				)
 		vaapi? (
 			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
 		)
 		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
@@ -459,11 +458,6 @@ multilib_src_configure() {
 		vulkan_enable video_cards_radeonsi amd
 	fi
 
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
 	if use gallium; then
 		gallium_enable -- swrast
 		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )