gentoo resync : 23.06.2018

3 files changed, 8 insertions, 19 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d30a948e4e50..96c898704bec 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,10 +3,10 @@ DIST mesa-17.3.9.tar.xz 10660456 BLAKE2B 54f4a75f9040e50e9eea8f5c52a276578379d25
 DIST mesa-18.0.5.tar.xz 10952996 BLAKE2B 708cdb2ef95a618430cd4e7eb45bcab0f6575774065b61f53787aa378385fe0dfa0b04f9c80c5426f9581851edc545a75c137777dc304ac8ba57465d365fcd50 SHA512 63b47cdca7f8282aab7aaa66233411f02918e5c4804b7a0010de2b1867fe90171e492ff031dfc4aa20968dfc99bd7dceb5d35fd44c709e54a2ece61175a60f3d
 DIST mesa-18.1.1.tar.xz 11110892 BLAKE2B 05d48379109c1c3800d3d07b9f52e96b2cd4bc087517711ee752f89619afce0a0e09b7a9ede8b5d1807ceae3e2b506518657a0760c947f466121e2252f7eada3 SHA512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90
 DIST mesa-18.1.2.tar.xz 11124408 BLAKE2B 8327f16f41d59e6ec8d4145a8399503cf04799d437e336714760e4bdc563c483583363e32d41affc2365e977b96494156300910b1834bc9957504b6c0cf168fa SHA512 1b896ecc42c2f81813d551a2b14d271d274a948fa10bf5b7a567417690316c2ab7e7fdd52fe004732cd1a47661ba91acf7d5b21e3b3f28e21b50aadbfa96a5d5
-EBUILD mesa-17.3.9.ebuild 14466 BLAKE2B 454a5c29f5c33bc1f63e42dedb6f7b4f43bcf54af617ca8eef1dfde468bd1914699e42c6e6da36f9dd6aa916431621724a2d51ea1eb20babf924241797a346de SHA512 b770e3b3a19d58b18a749232691817f17b1e7b9be36751fd17e133a10184345183c6aab5f044230350d39d7dfe8a9a267f966e9944b98e617f40e7b251a69989
+EBUILD mesa-17.3.9.ebuild 14465 BLAKE2B 9fbe7ed8fd4f46d918288fe6f8b944d56cdd470c804d2786a19ef713b65c6b609e7286425c2cdc47aa52fd509af02eb077bea83ba04fa9dc232b2e6e19e59b1f SHA512 2f09d42d19cb4ef714d6b5fc1b6526f630393428522d98d24106d351a135e93eab172a2072e11cd9968e9c9e18da82b3f96cd7f6b0dc81ab316db80d6c542e3a
 EBUILD mesa-18.0.5.ebuild 14421 BLAKE2B d1170f83f571b84a1c3906b02aff38190c9586e3a22928b3f85b16c98448c928574faa18975bc01210c524d10221af679a894c975f83e0cdbca0146b553950a1 SHA512 a9d5c7284211a34f8022388838fedf2df792bac3188cc4e12ed4a5f362a978651b39c571402d798e559bc625708a2dd3a0363c19ccc43dfed9de81eda40e22b7
 EBUILD mesa-18.1.1-r1.ebuild 13414 BLAKE2B de43bfb504fe2f1f5e93777b85c097b1463d271b42f095e484292052bc4c1272e95b06eac71e5314e0b1bbace716fb1f232f8b48d1c457dc316a2a136bd60ddf SHA512 5117bd498b00842dabd73d528309e9fb081c9b19bb296c3ba3be834316015ceea584c9f8b9d3af74458dc6ba709a90bdf703e7062af816c224833bc48adfa489
 EBUILD mesa-18.1.1.ebuild 13086 BLAKE2B 1b16c276e43656dae8281ab4cf73540856b6745ddca81b11ee7ce2cd70ce376c24f370217b22b4756ef4271946806b36032a0a9ef225a37a17c848e70a652568 SHA512 6360affa7be25af6f9f97b4de04a42706bf1fae95dc4453a6480c62135792dd9ef6b3a1c1385fbf9c6dfa7e84243d3f9d09e3be0770b9d1005665ce5a5c9a602
 EBUILD mesa-18.1.2.ebuild 13414 BLAKE2B de43bfb504fe2f1f5e93777b85c097b1463d271b42f095e484292052bc4c1272e95b06eac71e5314e0b1bbace716fb1f232f8b48d1c457dc316a2a136bd60ddf SHA512 5117bd498b00842dabd73d528309e9fb081c9b19bb296c3ba3be834316015ceea584c9f8b9d3af74458dc6ba709a90bdf703e7062af816c224833bc48adfa489
-EBUILD mesa-9999.ebuild 12268 BLAKE2B d7782c37a3c5766dd3acb23655ea78fea9f24856419e9f0e531a2265de48b8f46d68a5d2010ccfbe815b006e7cee965391363942ff1a3b7b20b7bfb3b031d9e8 SHA512 df6e5e9a1890ce75cd094b731134cf44bdd2462d35b768f4bab7e32d45e5a502ccafe4a8009268eb59f84b7e4f4d08542c24b266299d42b6ea78045b537b7d15
+EBUILD mesa-9999.ebuild 11964 BLAKE2B 48537a7aae256d79f3a29075bb2e258dfd2876dd0c5f661b01cb3d23519be1505b15c3fe81a08686a0a1d7e9a84090203db58323794df06ba89fd56262d4455d SHA512 09462036738bb8bdce4550754eeb25f902a96a69c5f9743ea6e26f2a2e5253c8db2ea5f11f041e64c7b17454ce20381d006c7565c11445ab188b69048c4b15a2
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-17.3.9.ebuild b/media-libs/mesa/mesa-17.3.9.ebuild
index 7f78fbc062ba..58f8f3fe0525 100644
--- a/media-libs/mesa/mesa-17.3.9.ebuild
+++ b/media-libs/mesa/mesa-17.3.9.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f159a80c67f4..1a11d453698e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -26,7 +26,6 @@ fi
 LICENSE="MIT"
 SLOT="0"
 RESTRICT="
-	!bindist? ( bindist )
 	!test? ( test )
 "
 
@@ -37,9 +36,9 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	lm_sensors opencl osmesa pax_kernel openmax pic selinux test unwind
-	vaapi valgrind vdpau vulkan wayland xvmc xa"
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
+	opencl osmesa openmax pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan wayland xa xvmc"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 gallium )
@@ -367,18 +366,19 @@ multilib_src_configure() {
 		$(meson_use test build-tests)
 		-Dglx=dri
 		-Dshared-glapi=true
-		$(meson_use !bindist texture-float)
 		$(meson_use dri3)
 		$(meson_use egl)
 		$(meson_use gbm)
 		$(meson_use gles1)
 		$(meson_use gles2)
+		$(meson_use selinux)
 		$(meson_use unwind libunwind)
 		$(meson_use lm_sensors lmsensors)
 		-Dvalgrind=$(usex valgrind auto false)
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
 		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
 	)
 	meson_src_configure
 }
@@ -414,10 +414,6 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
 }
 
 multilib_src_test() {
@@ -442,13 +438,6 @@ pkg_postinst() {
 			omxregister-bellagio
 		eend $?
 	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
-		elog "explanation."
-	fi
 }
 
 pkg_prerm() {