From 431397a75444c2b216ab260aa44ba04630d407c7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 22 Mar 2015 06:34:49 +0100
Subject: [PATCH] nvidia304: split libs into the -libs subpkg.

This avoids a circular dependency with packages depending on libGL,
provided previously by "nvidia304".
---
 common/shlibs              |  3 +--
 srcpkgs/nvidia304-libs     |  1 +
 srcpkgs/nvidia304/template | 15 ++++++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/nvidia304-libs

diff --git a/common/shlibs b/common/shlibs
index cf3e254d58b..79ae6cc0aee 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -129,9 +129,8 @@ libnvidia-tls.so.346.47 nvidia-libs-346.47_1 ignore
 libnvidia-glcore.so.346.47 nvidia-libs-346.47_1 ignore
 libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
-libnvidia-ml.so.1 nvidia-stable-libs-340.46_1 ignore
-libnvidia-tls.so.346.47 nvidia-stable-libs-340.46_1 ignore
 libnvidia-glcore.so.346.47 nvidia-stable-libs-340.46_1 ignore
+libnvidia-ml.so.1 nvidia304-libs-304.00_1 ignore
 libglapi.so.0 libglapi-7.11_1
 libgbm.so.1 libgbm-9.0_1
 librsvg-2.so.2 librsvg-2.26.0_1
diff --git a/srcpkgs/nvidia304-libs b/srcpkgs/nvidia304-libs
new file mode 120000
index 00000000000..b9008ead703
--- /dev/null
+++ b/srcpkgs/nvidia304-libs
@@ -0,0 +1 @@
+nvidia304
\ No newline at end of file
diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template
index 80404a2749d..6f44350efe8 100644
--- a/srcpkgs/nvidia304/template
+++ b/srcpkgs/nvidia304/template
@@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)"
 
 pkgname=nvidia304
 version=304.125
-revision=5
+revision=6
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -13,9 +13,10 @@ create_wrksrc=yes
 only_for_archs="i686 x86_64"
 short_desc="${_desc} - Libraries and Utilities"
 depends="${pkgname}-dkms-${version}_${revision} pkg-config"
-provides="nvidia-${version}_${revision} libGL-${version}_${revision}"
-replaces="nvidia>=0 libGL>=0"
+provides="nvidia-${version}_${revision}"
+replaces="nvidia>=0"
 conflicts="catalyst>=0 xserver-abi-video>20"
+subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs"
 
 if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
@@ -177,3 +178,11 @@ nvidia304-opencl_package() {
 		vmove etc/OpenCL
 	}
 }
+nvidia304-libs_package() {
+	short_desc="${_desc} - libraries"
+	provides="libGL-${version}_${revision}"
+	replaces="libGL>=0"
+	pkg_install() {
+		vmove usr/lib
+	}
+}