Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/
Date: Sat, 30 Jan 2016 12:30:35
Message-Id: 1454157030.407a77d2eeaf91db1f149c5cace8db164b29ec3a.jer@gentoo
1 commit: 407a77d2eeaf91db1f149c5cace8db164b29ec3a
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 30 12:30:05 2016 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 30 12:30:30 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=407a77d2
7
8 x11-drivers/nvidia-drivers: Install libXNVCtrl header only when USE=static-libs.
9
10 Package-Manager: portage-2.2.27
11
12 x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild | 7 ++++---
13 x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild | 7 ++++---
14 x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild | 7 ++++---
15 x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild | 7 ++++---
16 x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild | 7 ++++---
17 5 files changed, 20 insertions(+), 15 deletions(-)
18
19 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild
20 index 4de38e1..efc0aae 100644
21 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild
22 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild
23 @@ -351,11 +351,12 @@ src_install() {
24 NV_USE_BUNDLED_LIBJANSSON=0 \
25 install
26
27 - use static-libs && \
28 + if use static-libs; then
29 dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
30
31 - insinto /usr/include/NVCtrl
32 - doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
33 + insinto /usr/include/NVCtrl
34 + doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
35 + fi
36
37 # There is no icon in the FreeBSD tarball.
38 use kernel_FreeBSD || \
39
40 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild
41 index db9410f..a7a3be0 100644
42 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild
43 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild
44 @@ -358,11 +358,12 @@ src_install() {
45 NV_USE_BUNDLED_LIBJANSSON=0 \
46 install
47
48 - use static-libs && \
49 + if use static-libs; then
50 dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
51
52 - insinto /usr/include/NVCtrl
53 - doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
54 + insinto /usr/include/NVCtrl
55 + doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
56 + fi
57
58 insinto /usr/share/nvidia/
59 doins nvidia-application-profiles-${PV}-key-documentation
60
61 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild
62 index 2435263..4bb98c2 100644
63 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild
64 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild
65 @@ -374,11 +374,12 @@ src_install() {
66 NV_USE_BUNDLED_LIBJANSSON=0 \
67 install
68
69 - use static-libs && \
70 + if use static-libs; then
71 dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
72
73 - insinto /usr/share/nvidia/
74 - doins nvidia-application-profiles-${PV}-key-documentation
75 + insinto /usr/share/nvidia/
76 + doins nvidia-application-profiles-${PV}-key-documentation
77 + fi
78
79 insinto /etc/nvidia
80 newins \
81
82 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild
83 index 9f0cd78..145dea6 100644
84 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild
85 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild
86 @@ -372,11 +372,12 @@ src_install() {
87 NV_USE_BUNDLED_LIBJANSSON=0 \
88 install
89
90 - use static-libs && \
91 + if use static-libs; then
92 dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
93
94 - insinto /usr/include/NVCtrl
95 - doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
96 + insinto /usr/include/NVCtrl
97 + doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
98 + fi
99
100 insinto /usr/share/nvidia/
101 doins nvidia-application-profiles-${PV}-key-documentation
102
103 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild
104 index 329f634..cfcaa9b 100644
105 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild
106 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild
107 @@ -363,11 +363,12 @@ src_install() {
108 NV_USE_BUNDLED_LIBJANSSON=0 \
109 install
110
111 - use static-libs && \
112 + if use static-libs; then
113 dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
114
115 - insinto /usr/include/NVCtrl
116 - doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
117 + insinto /usr/include/NVCtrl
118 + doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
119 + fi
120
121 insinto /usr/share/nvidia/
122 doins nvidia-application-profiles-${PV}-key-documentation