[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

[Jeroen Roovers]

commit:     407a77d2eeaf91db1f149c5cace8db164b29ec3a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 12:30:05 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 12:30:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=407a77d2

x11-drivers/nvidia-drivers: Install libXNVCtrl header only when USE=static-libs.

Package-Manager: portage-2.2.27

 x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild | 7 ++++---
 x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild  | 7 ++++---
 x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild  | 7 ++++---
 x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild  | 7 ++++---
 x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild  | 7 ++++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild
index 4de38e1..efc0aae 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild
@@ -351,11 +351,12 @@ src_install() {
                        NV_USE_BUNDLED_LIBJANSSON=0 \
                        install
 
-               use static-libs && \
+               if use static-libs; then
                        dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
 
-               insinto /usr/include/NVCtrl
-               doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+                       insinto /usr/include/NVCtrl
+                       doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+               fi
 
                # There is no icon in the FreeBSD tarball.
                use kernel_FreeBSD || \

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild
index db9410f..a7a3be0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild
@@ -358,11 +358,12 @@ src_install() {
                        NV_USE_BUNDLED_LIBJANSSON=0 \
                        install
 
-               use static-libs && \
+               if use static-libs; then
                        dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
 
-               insinto /usr/include/NVCtrl
-               doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+                       insinto /usr/include/NVCtrl
+                       doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+               fi
 
                insinto /usr/share/nvidia/
                doins nvidia-application-profiles-${PV}-key-documentation

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild
index 2435263..4bb98c2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild
@@ -374,11 +374,12 @@ src_install() {
                        NV_USE_BUNDLED_LIBJANSSON=0 \
                        install
 
-               use static-libs && \
+               if use static-libs; then
                        dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
 
-               insinto /usr/share/nvidia/
-               doins nvidia-application-profiles-${PV}-key-documentation
+                       insinto /usr/share/nvidia/
+                       doins 
nvidia-application-profiles-${PV}-key-documentation
+               fi
 
                insinto /etc/nvidia
                newins \

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild
index 9f0cd78..145dea6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild
@@ -372,11 +372,12 @@ src_install() {
                        NV_USE_BUNDLED_LIBJANSSON=0 \
                        install
 
-               use static-libs && \
+               if use static-libs; then
                        dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
 
-               insinto /usr/include/NVCtrl
-               doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+                       insinto /usr/include/NVCtrl
+                       doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+               fi
 
                insinto /usr/share/nvidia/
                doins nvidia-application-profiles-${PV}-key-documentation

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild
index 329f634..cfcaa9b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild
@@ -363,11 +363,12 @@ src_install() {
                        NV_USE_BUNDLED_LIBJANSSON=0 \
                        install
 
-               use static-libs && \
+               if use static-libs; then
                        dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
 
-               insinto /usr/include/NVCtrl
-               doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+                       insinto /usr/include/NVCtrl
+                       doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+               fi
 
                insinto /usr/share/nvidia/
                doins nvidia-application-profiles-${PV}-key-documentation