Sync package media-libs/mesa with main Gentoo Portage tree

New version: 17.0.0

media-libs/mesa/Manifest

@@ -5,14 +5,14 @@ DIST mesa-11.0.9.tar.xz 7282648 SHA256 a1262ff1c66a16ccf341186cf0e57b306b8589eb2
 DIST mesa-11.2.2.tar.xz 7860932 SHA256 40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4 SHA512 fd1fcb1bc97e52784a4b3dedfd8c8ba95bc1b03a62b132d2e16154d076be7a6fabbca1bcba705a7916a1507d811d7f3e6c3488aa386d5e63891282fb1713ce52 WHIRLPOOL 96ecc968b2dad4d0574751565c8fbd383da7e30eb2b805f964d31c11633bfb9e27c461150bd436cb4400bde1c4f28f326f37a3f942b4d13b03ddf49e5ce4620e
 DIST mesa-12.0.1.tar.xz 8571144 SHA256 bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389 SHA512 11898336478d1f5bd3946d695b9599647c0b9084ad8890b4fa89daa922a217e5ca6d8b72f5801e362c3dd7723382f2daaa655b54f65a6d088ad8cfdb85f10023 WHIRLPOOL 9923990fc35142b8c877cbbfdfa7d362ae94c8c637360f28e348943dc6f380bdf5aee944c04da6337994f0f15790c8d1a55bea1f0b00afa780305e5862c78601
 DIST mesa-12.0.6.tar.xz 8662900 SHA256 7d6da9744c1022a4c2ab6ad01a206984d00443fb691568011d01b3dd97e36448 SHA512 2492044f6a3c9d98937146e3a3bd8e262cb1edbb11c3e6d5114fe8c83aa9c846ec3f266b9712adb66fbe080121043772899ca18ddcc3b7a838a84417b6701aae WHIRLPOOL b9993201880536de33852f767001c93f35e6bbc851aac2f2f261b45e9c8a1614b9ad1d121eeef1e737e2943195dbe7489bf34e8f79d705eac2489e59b3206c9a
-DIST mesa-13.0.3.tar.xz 9162036 SHA256 d9aa8be5c176d00d0cd503cb2f64a5a403ea471ec819c022581414860d7ba40e SHA512 e94a60f7e3b2c64d7b44130ccac95fef8edb74ee1574125aa9ec8ceecb1819df26b0fb08369254aaee6cd6df4eecea814783351e604d4c39b0130746b15a3c1e WHIRLPOOL 02b980a02c862d52395f4b5cbec4e02d16b3d5b9d01c29f3b58538574b1401635b5c39bd5d94a026d4ada6ea2583118542d1eaccac64cc7cd3286e1ecfb5d30c
 DIST mesa-13.0.4.tar.xz 9164612 SHA256 a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726 SHA512 5f4d8ad12389a32c028cf3c5289fe285892e2b241220c5c6d04cda5748240e8b13289c4537ac7a6b58d87d6ca4111031e15ad37c9b008777be71918e42e88817 WHIRLPOOL 041cb8db42cd2126b108f8e5d0f105f96882bb4f75808f859d4789b05ffc2b6d98a2b348ebff8abfa507ffb71e7ec757e7dd85ca81e77a264f477296f40b50ed
+DIST mesa-17.0.0.tar.xz 9442580 SHA256 39db3d59700159add7f977307d12a7dfe016363e760ad82280ac4168ea668481 SHA512 880364d63fc252efff27fb324a5a9c037f7197819db0b543f695687849db15deabbb4433d1850d005c2c2436d1c1a01f8533f0d79c71c08aaf79d562b35a753d WHIRLPOOL b48b11df188251d5b0b2ae5428a28c38d1dc79e6790d5e66b9f9b6681bafa181ad9571a6edc3f23d9353634293a48fa1228fca43b5840943c68d0786a7e442ea
 EBUILD mesa-11.0.6-r1.ebuild 13660 SHA256 b71e013fad7050b0b548eaa336d5638c446758292e9910ac37aa2c2da4a29964 SHA512 a1a66ec2c05aead2f52689ccdb2d0d83e84bd0b6345c34bf2ee48e90ba77533d0f129974687a3228e1d6f6f5a341e879b446ae45561e4ebae767d24ee8a53b3d WHIRLPOOL c3f124a69b4272c52a61bd454ff285c859e86978fc2b47a52305279fa00bbe4537d0a59557ec90a0d8a8f0bd5421c5383866a86317df1caf2ab0733958166f81
 EBUILD mesa-11.0.9-r1.ebuild 13518 SHA256 e809445febf5fe97f68e74701f716c80f0471580b652822a169f8678c0cfec67 SHA512 2602f488df0ea387f6167da907bcc3406f434f4b37c870726b8e46465b6456182df4adeda4a022233264e65a4ecad9d7726bd5cea6eb5e3e85052aa7f8310f78 WHIRLPOOL 6f41c6d281d9b7047bbce01e81de2c27b2ceb4c32f789b52d43b35fb71fab0d6fcb78458c89b235dfea7d74870f0a7c39cbe0383927ea4e6b0c0758ee81b52dd
 EBUILD mesa-11.2.2-r1.ebuild 13773 SHA256 a9c93f60b7a139a220b03d1ef20be8aa05e3ff309bf540937d23c7afb4626671 SHA512 c17e14d035296f97882278168db9d7c3700577d0a8902ccfd0325c0ce63f2520bf5270f9ffcd85f1b62755ac68c0b631e4207f27c6dc18d10e4a52399944a2cb WHIRLPOOL 9aa9aadee68dd1dd0151745252d033172889eb6f9cfd12c859ec6e2afc412de969a357cad03a324203e3a48de1021295d01e1cc40b3484d66d892d023e1e0308
 EBUILD mesa-12.0.1-r1.ebuild 13996 SHA256 66b3e521a16cc6a680b4ce45a99242aa3aa072676f48441cb7d632dfcdeee8d5 SHA512 e6ae34d6625f23b734170e7eed5dc8cc14209581e50aac39f17961aeedd6be1e9e798690dabe1ecbdaafc34c4dcd129abc5ec3c046982cd14330994fa3e433de WHIRLPOOL 860da8b04ae59e7a8616a2d7b23901ef66af68ee0367d4940f06958d363155a15afc4d637f6ab8d0961d5fc6545478324ebcc2a7e2e56e02a2cc35e33b1cbddc
 EBUILD mesa-12.0.6-r1.ebuild 13970 SHA256 1b51fa5cf204e7b9cfc89a40258e98c5b95218d13b423abe0bf873384543836a SHA512 d659d70d873281f3237ec42e7f204f359cab2e3bd1bab80326909d62788bd555e7ec8854ff7595ac13ba16ef0ca016531ddff91462bf7dbed172a4fee232e990 WHIRLPOOL 24fac0cd98769b797fb61ab64d4db573eb22e6c1ca096359f5ea0aaf8d528561c41382c9b5929689ceee27d2c8ffb9f8769c666c24f605eac638771d1a30b4fa
-EBUILD mesa-13.0.3-r1.ebuild 14771 SHA256 bf0f46e3285ac98f1a4e889753ba8ba187865d57efdf6149e9a38475368e39ae SHA512 7f378b2ff5250ad8cc01e0a1b00a939705fdeeb1f8c4dfab4733c0008d9da2f82d15de4b4513b307280bc3a5ee0e87c094fee41281dc36cd4dbc8cb0a6bcb06f WHIRLPOOL 6b4cec93ab9c70df931bd07489623e7644041ac245332ec6984cd6e8f7ad906eb8afd6dc607a2dfaff4164ac1a7f47f75c950044ff89776a7727187ca706bc36
-EBUILD mesa-13.0.4-r1.ebuild 14771 SHA256 bf0f46e3285ac98f1a4e889753ba8ba187865d57efdf6149e9a38475368e39ae SHA512 7f378b2ff5250ad8cc01e0a1b00a939705fdeeb1f8c4dfab4733c0008d9da2f82d15de4b4513b307280bc3a5ee0e87c094fee41281dc36cd4dbc8cb0a6bcb06f WHIRLPOOL 6b4cec93ab9c70df931bd07489623e7644041ac245332ec6984cd6e8f7ad906eb8afd6dc607a2dfaff4164ac1a7f47f75c950044ff89776a7727187ca706bc36
-EBUILD mesa-9999-r1.ebuild 14428 SHA256 9b6a74242491565930620e0a5a26d41353a6e3141aa6ed39ec1df4b5f7b97206 SHA512 bc400f294a96614d4e6f22b221df8a87b6f29058799382bd20120ddefc71d478905843bd34b2b2de288ca901aaf7f015ef404b445afaaf24dc74fba2f99d7531 WHIRLPOOL ed3535fae2fa72c79b150a6b3cda5ce3cf833a1d29101596611060c26ee9f55d32faac71430d4b5c3e91ceb3558848871e7ea32d5babf74c649ef075a7025278
+EBUILD mesa-13.0.4-r1.ebuild 14775 SHA256 88a5b1f82643ae829227820541002614100e588b6e0fa73127236ac41da56a4e SHA512 2c2ddb606c1990c03da6ab55a068b2f06891cdffb63a615818de7909337fcc99b9ed5ae6a4e63629f6992c974fd284f9f23149f13d131cde256f16bc8f9550d9 WHIRLPOOL 6d7af553b2dc0b6ce41a7553157f941c3ffe3e8c23faf7d69ecb6a96e8c5e54e9e0f3efaf80ee204b4d3e1d6de0460a35eccc85b6eb825706f3d59263e11fab1
+EBUILD mesa-17.0.0-r1.ebuild 14636 SHA256 16816bdafc388a3bfc10319e7a595ea8348bb7a4ca7bebf53a7b9e53176dfff2 SHA512 9a8b702d14786c7b13165074f355210bbc9782470e90e929ae200224e8d9d3d88b5ef7bda305bb4917f516ba8b47c72dc6c046a127d2cd75b278b1f0d1d1cf5e WHIRLPOOL 45b508662adaf7a7ef28696397dec0b583d25288b3106322ba67a531d73428ba0dbd079fcc346fc3e901abc872c9ab65851654cde27b08d3dfdfcfb3da1b2df0
+EBUILD mesa-9999-r1.ebuild 14469 SHA256 6559a4a10437c42a2618fc7526f91b6cb500e61fd8dbfd1d64715ff807edef33 SHA512 4bba4df02f9b22ba76310e39314d21a4d0d7a77fdfe342037ec91894cbea7dd7b81dbd628d6cc35ba2267b77fe5e4e697bfdef0ba14301a8773095a927ee7acb WHIRLPOOL 783efea466f719b1f2f5c7b39e7fe0324166cfe0249fab0682fc75d50fa0b80ea80aa3f76775193a95f2c8f47965e978f9265492b08e93bada3568e03336e84b
 MISC metadata.xml 2345 SHA256 071a443682c9f18015c20a87ad4e8a10b2e1925e287c17e9e513fb98baf71393 SHA512 cf96cd985b694dc0835f9759b305440d504df59b7deb59fb70d9e509d432377d103908ff95c9adc095012422a30d1930f35e0475122ba7157dc808a5182301a5 WHIRLPOOL fc8c67faad918477a7749f7f69bb317341ae06e7eaede9b417b1a7c1867145649a27307328c26aad58c27e66e6557a500be5905c431a886c7133998b6a807273

media-libs/mesa/mesa-13.0.4-r1.ebuild

@@ -101,9 +101,9 @@ RDEPEND="
 	llvm? (
 		video_cards_radeonsi? (
 			virtual/libelf:0=[${MULTILIB_USEDEP}]
-			vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
+			vulkan? ( >=sys-devel/llvm-3.9.0:0=[${MULTILIB_USEDEP}] )
 		)
-		>=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}]
 	)
 	nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
 	!nettle? (
@@ -153,8 +153,8 @@ DEPEND="${RDEPEND}
 		) )
 	)
 	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
+				>=sys-devel/llvm-3.4.2:0=[${MULTILIB_USEDEP}]
+				>=sys-devel/clang-3.4.2:0=[${MULTILIB_USEDEP}]
 				>=sys-devel/gcc-4.6
 	)
 	sys-devel/gettext

media-libs/mesa/mesa-13.0.3-r1.ebuild → media-libs/mesa/mesa-17.0.0-r1.ebuild

@@ -4,7 +4,7 @@
 
 EAPI=6
 
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
 
 if [[ ${PV} = 9999 ]]; then
 	GIT_ECLASS="git-r3"
@@ -13,12 +13,11 @@ fi
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
 
 OPENGL_DIR="${PN}"
 
 MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
 HOMEPAGE="http://mesa3d.sourceforge.net/"
@@ -27,7 +26,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
+	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"
 fi
 
@@ -37,20 +36,19 @@ RESTRICT="!bindist? ( bindist )"
 
 AMD_CARDS=( "r100" "r200" "r300" "r600" "radeon" "radeonsi" )
 INTEL_CARDS=( "i915" "i965" "ilo" "intel" )
-VIDEO_CARDS=( "freedreno" "nouveau" "vc4" "vmware" )
+VIDEO_CARDS=( "freedreno" "imx" "nouveau" "vc4" "vivante" "vmware" )
 VIDEO_CARDS+=( "${AMD_CARDS[@]}" )
 VIDEO_CARDS+=( "${INTEL_CARDS[@]}" )
 for card in "${VIDEO_CARDS[@]}"; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gcrypt gles1 gles2
-	libressl +llvm +nettle +nptl opencl osmesa pax_kernel openmax openssl pic
-	selinux vaapi valgrind vdpau vulkan wayland xvmc xa"
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+	+nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau
+	vulkan wayland xvmc xa"
 
 REQUIRED_USE="
-	|| ( gcrypt libressl nettle openssl )
 	d3d9?   ( dri3 gallium )
 	llvm?   ( gallium )
 	opencl? ( gallium llvm )
@@ -68,6 +66,7 @@ REQUIRED_USE="
 	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
 	video_cards_ilo?    ( gallium )
+	video_cards_imx?    ( gallium )
 	video_cards_nouveau? ( || ( classic gallium ) )
 	video_cards_radeon? ( || ( classic gallium )
 						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
@@ -76,6 +75,7 @@ REQUIRED_USE="
 	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_r600?   ( gallium )
 	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vivante? ( gallium gbm )
 	video_cards_vmware? ( gallium )
 	${PYTHON_REQUIRED_USE}
 "
@@ -101,17 +101,16 @@ RDEPEND="
 	llvm? (
 		video_cards_radeonsi? (
 			virtual/libelf:0=[${MULTILIB_USEDEP}]
-			vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
+			vulkan? (
+				|| (
+					sys-devel/llvm:4
+					>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] ) )
 		)
-		>=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-	)
-	nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
-	!nettle? (
-		gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-		!gcrypt? (
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+		|| (
+			sys-devel/llvm:4
+			>=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
 		)
+		<sys-devel/llvm-5:=
 	)
 	opencl? (
 				app-eselect/eselect-opencl
@@ -124,9 +123,9 @@ RDEPEND="
 		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
 	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
 "
 for card in ${INTEL_CARDS}; do
 	RDEPEND="${RDEPEND}
@@ -153,9 +152,15 @@ DEPEND="${RDEPEND}
 		) )
 	)
 	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
+		|| (
+			sys-devel/llvm:4
+			>=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
+		)
+		|| (
+			sys-devel/clang:4
+			>=sys-devel/clang-3.6.0:0[${MULTILIB_USEDEP}]
+		)
+		>=sys-devel/gcc-4.6
 	)
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -198,11 +203,15 @@ pkg_setup() {
 		ewarn "detected! This can cause problems. For details, see bug 459306."
 	fi
 
+	if use llvm || use opencl; then
+		LLVM_MAX_SLOT=4 llvm_pkg_setup
+	fi
 	python-any-r1_pkg_setup
 }
 
 src_prepare() {
 	[[ ${PV} == 9999 ]] && eautoreconf
+	eapply_user
 	default
 }
 
@@ -251,10 +260,12 @@ multilib_src_configure() {
 
 		gallium_enable swrast
 		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
 		gallium_enable video_cards_vmware svga
 		gallium_enable video_cards_nouveau nouveau
 		gallium_enable video_cards_i915 i915
 		gallium_enable video_cards_ilo ilo
+		gallium_enable video_cards_imx imx
 		if ! use video_cards_i915 && \
 			! use video_cards_i965; then
 			gallium_enable video_cards_intel i915
@@ -307,7 +318,6 @@ multilib_src_configure() {
 		--enable-dri \
 		--enable-glx \
 		--enable-shared-glapi \
-		--disable-shader-cache \
 		$(use_enable !bindist texture-float) \
 		$(use_enable d3d9 nine) \
 		$(use_enable debug) \
@@ -322,7 +332,6 @@ multilib_src_configure() {
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		--with-vulkan-drivers=${VULKAN_DRIVERS} \
-		--with-sha1=$(usex nettle libnettle $(usex gcrypt libgcrypt libcrypto)) \
 		PYTHON2="${PYTHON}" \
 		${myconf}
 }
@@ -402,7 +411,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete
 	einstalldocs
 
 	if use !bindist; then
@@ -412,11 +421,6 @@ multilib_src_install_all() {
 	# Install config file for eselect mesa
 	insinto /usr/share/mesa
 	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-
-	# Mesa should not install these
-	if use vulkan; then
-		rm "${ED}"/usr/include/vulkan/{vulkan.h,vk_platform.h} || die "rm"
-	fi
 }
 
 multilib_src_test() {

media-libs/mesa/mesa-9999-r1.ebuild

@@ -13,7 +13,7 @@ fi
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
 
 OPENGL_DIR="${PN}"
 
@@ -116,7 +116,7 @@ RDEPEND="
 		video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
 	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
 "
@@ -145,8 +145,8 @@ DEPEND="${RDEPEND}
 		) )
 	)
 	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
+				>=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
+				>=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
 				>=sys-devel/gcc-4.6
 	)
 	sys-devel/gettext
@@ -190,6 +190,9 @@ pkg_setup() {
 		ewarn "detected! This can cause problems. For details, see bug 459306."
 	fi
 
+	if use llvm || use opencl; then
+		llvm_pkg_setup
+	fi
 	python-any-r1_pkg_setup
 }
 
@@ -302,7 +305,6 @@ multilib_src_configure() {
 		--enable-dri \
 		--enable-glx \
 		--enable-shared-glapi \
-		--disable-shader-cache \
 		$(use_enable !bindist texture-float) \
 		$(use_enable d3d9 nine) \
 		$(use_enable debug) \
@@ -396,7 +398,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete
 	einstalldocs
 
 	if use !bindist; then