gentoo resync : 23.06.2018

1 files changed, 5 insertions, 16 deletions

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() {