From 5c5a3fa386b106ba71ccb06ed134bad1c11e2f5e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 7 Jan 2015 08:44:22 +0100
Subject: [PATCH] libGL: move .so symlinks to their respective pkgs, rather
 than MesaLib-devel.

... otherwise installing MesaLib-devel when catalyst or nvidia are installed
will override the libGL.so symlink to the mesa one.

This change was introduced in ef53b9cc20e459a37f3b7c40a2a44e4411941685
and got lost in the libGL pkg rename.

Thanks to @dominikh for details.
---
 srcpkgs/libGL/template | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template
index b55988812cc..5b9acb2d2a4 100644
--- a/srcpkgs/libGL/template
+++ b/srcpkgs/libGL/template
@@ -1,7 +1,7 @@
 # Template build file for 'libGL'.
 pkgname=libGL
 version=10.4.1
-revision=1
+revision=2
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
@@ -84,41 +84,47 @@ post_install() {
 }
 
 libglapi_package() {
+	replaces="MesaLib-devel<10.4.1_2"
 	depends="libudev"
 	short_desc="Free implementation of the GL API - shared library"
 	pkg_install() {
-		vmove "usr/lib/libglapi.so.*"
+		vmove "usr/lib/libglapi.so*"
 	}
 }
 libgbm_package() {
+	replaces="MesaLib-devel<10.4.1_2"
 	short_desc="Mesa Generic buffer management API - runtime"
 	pkg_install() {
-		vmove "usr/lib/libgbm.so.*"
+		vmove "usr/lib/libgbm.so*"
 	}
 }
 libEGL_package() {
+	replaces="MesaLib-devel<10.4.1_2"
 	short_desc="Free implementation of the EGL API - runtime"
 	pkg_install() {
-		vmove "usr/lib/libEGL*.so.*"
+		vmove "usr/lib/libEGL*.so*"
 	}
 }
 libGLES_package() {
+	replaces="MesaLib-devel<10.4.1_2"
 	depends="libudev"
 	short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API"
 	pkg_install() {
-		vmove "usr/lib/libGLES*.so.*"
+		vmove "usr/lib/libGLES*.so*"
 	}
 }
 libOSMesa_package() {
+	replaces="MesaLib-devel<10.4.1_2"
 	short_desc="Mesa Off-Screen interface library"
 	pkg_install() {
-		vmove "usr/lib/libOSMesa.so.*"
+		vmove "usr/lib/libOSMesa.so*"
 	}
 }
 libwayland-egl_package() {
+	replaces="MesaLib-devel<10.4.1_2"
 	short_desc="Free implementation of the EGL API - wayland runtime"
 	pkg_install() {
-		vmove "usr/lib/libwayland-egl.so.*"
+		vmove "usr/lib/libwayland-egl.so*"
 	}
 }
 MesaLib-devel_package() {
@@ -136,13 +142,13 @@ MesaLib-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
 	}
 }
 libxatracker_package() {
+	replaces="MesaLib-devel<10.4.1_2"
 	short_desc="Mesa XA tracker interface library"
 	pkg_install() {
-		vmove "usr/lib/libxatracker*.so.*"
+		vmove "usr/lib/libxatracker*.so*"
 	}
 }
 mesa-ati-dri_package() {