media-libs/mesa: version bump to 18.1.1, update ebuild to match Gentoo in-tree

2 files changed, 3 insertions, 58 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index a3cbfdd..f1c1b6a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -5,6 +5,6 @@ AUX mesa-18-execinfo.patch 2583 BLAKE2B 1c4d091cca06c8d282458c154d25d1f69f831b6d
 AUX mesa-18-intel-missing-time_t.patch 475 BLAKE2B e8378aafc5ace88e03b425309dda7c6c72564c1fa854977387d4924d3d7768fccef3c56a63fd2a6e286e1076446526f6f224c12c424cb8351c9f4de444f1df72 SHA512 1d2a200388977087320c6018dfb2514ccf73366cb76ee646646ede83ec8e8f8a741d8fdf99ebd987e3d03a5ace543067d293b7a15a6fed11738b8c5a06a764c3
 AUX mesa-18-musl-increase-pthread-stack-size.patch 929 BLAKE2B b4bb448cdaaddcb8d91cfbcacf6c27792aa6c5beba732933d7324f9a060b3f8b2a6800bc5c0ae1c7422ddbfe6389f89174aca81c4a5dd1f219ebdedcde25800c SHA512 c1dcdb7be316114aa2114b8923ad88f17050fbaee906d7e5976e3b8cd5c2b333a48dfc851e4342e9587b14cb62d9c6088dbab1e094b4ba77cc72dd3ad71a90e7
 AUX mesa-18-musl-pthread.patch 2404 BLAKE2B 8c1207116d407b0739145271c353be513b279a4ea4ccdb70c85e1a45e156cc1d3a1b0fecae92d05333bdf5fb845927e3bcef718a73a92d0119445c5f8f59f744 SHA512 7c80b0cf70ea0dbcec85371de6db634e02321042fc80983ad61a75896c4fea1f88fe891993f181932d00b2f8474acc389530aeccf7e2ee48319c555bfb3c2331
-DIST mesa-18.1.0.tar.xz 11118776 BLAKE2B 0da5486e96596b3f919f15d2db9cd12de825811a0f2222bb76859bb7d275914dda0cc19a518b269fa0745d52982b92d5d645b6da639a870709193db721262658 SHA512 8b26af2df8b94373cbc339521974cd568c1d4ff4204986ee7b439e4cf3ebe14d822ea081a7769b68eca9263b7bc6dbca01836b8bb0d6495d2e2614c4e3d601ad
-EBUILD mesa-18.1.0.ebuild 15383 BLAKE2B af0f53d38e07d15531979bd02cca4911e72bfb394e13179aacf0cb6087965696b97424b40021f2760a817f0c09070c1eb986b01bb7d646669c16e0f2223c9431 SHA512 d8d5a5abb815a8fdd0b87fc35ceb2400a53769c7fa0ae138b78a9d329fdb0b8b4dcd576fc03e5a8241ce8d73fa514ded8c32c4c71aae931443820a26274e0a95
+DIST mesa-18.1.1.tar.xz 11110892 BLAKE2B 05d48379109c1c3800d3d07b9f52e96b2cd4bc087517711ee752f89619afce0a0e09b7a9ede8b5d1807ceae3e2b506518657a0760c947f466121e2252f7eada3 SHA512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90
+EBUILD mesa-18.1.1.ebuild 13405 BLAKE2B 74a56e9a6bb5083a6160f23fa6d0743cd66e51869c33cf34a21b5c4359df4ad146b3228afd9ff3c08d92090b1f644ac7582a34cc490a2a637d11e99c71fcbe5d SHA512 a9f43a04c3b516b65a834e5e88af3031794dff41a9f7ed227187567888dff82dc01386cef2e89d799a4cb147f027f822344f5b3a6dca43e831a2310d0401add0
 EBUILD mesa-9999.ebuild 15272 BLAKE2B 28c04dfab46118d90bcbd711478efe61e18466a89fe2d9e9f0a9eeaae24813184ae557f22611696ac90e95d42c4967b31845860b61e7b4a290cf6ee2f7544510 SHA512 373ae8c1926e2e92ec47006ab8eb8e0949b00f0763025cfcc9213f103969d69e036c63b6f724a9de8f4b0b91b63e670196fe0887183e8c1802ea365cb240dba3
diff --git a/media-libs/mesa/mesa-18.1.0.ebuild b/media-libs/mesa/mesa-18.1.1.ebuild
index 14fb865..e34656c 100644
--- a/media-libs/mesa/mesa-18.1.0.ebuild
+++ b/media-libs/mesa/mesa-18.1.1.ebuild
@@ -76,14 +76,7 @@ REQUIRED_USE="
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
 RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
 	>=app-eselect/eselect-opengl-1.3.0
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
@@ -224,15 +217,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 	valgrind? ( dev-util/valgrind )
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	x11-base/xorg-proto
 	vulkan? (
 		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
 	)
@@ -424,37 +409,6 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake install DESTDIR="${D}"
 
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
 	if use opencl; then
 		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
 		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
@@ -484,10 +438,6 @@ multilib_src_install_all() {
 	if use !bindist; then
 		dodoc docs/patents.txt
 	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
 }
 
 multilib_src_test() {
@@ -506,11 +456,6 @@ pkg_postinst() {
 	echo
 	eselect opengl set --use-old ${OPENGL_DIR}
 
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
 	# Switch to mesa opencl
 	if use opencl; then
 		eselect opencl set --use-old ${PN}