1 |
commit: 7c0a2214a381891b0082e503dd4662e7622805ee |
2 |
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Feb 13 17:21:38 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 15 23:00:13 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c0a2214 |
7 |
|
8 |
x11-misc/bumblebee: fix live ebuild. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/3958 |
12 |
|
13 |
x11-misc/bumblebee/bumblebee-9999.ebuild | 15 +++++++-------- |
14 |
1 file changed, 7 insertions(+), 8 deletions(-) |
15 |
|
16 |
diff --git a/x11-misc/bumblebee/bumblebee-9999.ebuild b/x11-misc/bumblebee/bumblebee-9999.ebuild |
17 |
index ef99702e33..4b832aebac 100644 |
18 |
--- a/x11-misc/bumblebee/bumblebee-9999.ebuild |
19 |
+++ b/x11-misc/bumblebee/bumblebee-9999.ebuild |
20 |
@@ -4,11 +4,13 @@ |
21 |
|
22 |
EAPI=6 |
23 |
|
24 |
-inherit autotools readme.gentoo-r1 multilib systemd user |
25 |
+inherit autotools multilib readme.gentoo-r1 systemd user |
26 |
|
27 |
if [[ ${PV} == 9999 ]]; then |
28 |
EGIT_REPO_URI="git://github.com/Bumblebee-Project/Bumblebee.git" |
29 |
EGIT_BRANCH="develop" |
30 |
+ KEYWORDS="" |
31 |
+ inherit git-r3 |
32 |
else |
33 |
COMMIT="c322bd849aabe6e48b4304b8d13cc4aadc36a30d" |
34 |
SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
35 |
@@ -62,12 +64,9 @@ src_prepare() { |
36 |
} |
37 |
|
38 |
src_configure() { |
39 |
- DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group. |
40 |
- You may need to setup your /etc/bumblebee/bumblebee.conf" |
41 |
- |
42 |
if use video_cards_nvidia ; then |
43 |
# Get paths to GL libs for all ABIs |
44 |
- local nvlib="" |
45 |
+ local i nvlib="" |
46 |
for i in $(get_all_libdirs) ; do |
47 |
nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib" |
48 |
done |
49 |
@@ -80,19 +79,19 @@ src_configure() { |
50 |
fi |
51 |
|
52 |
econf \ |
53 |
- --docdir=/usr/share/doc/"${PF}" \ |
54 |
${ECONF_PARAMS} |
55 |
} |
56 |
|
57 |
src_install() { |
58 |
+ default |
59 |
newconfd "${FILESDIR}"/${PN}.confd ${PN} |
60 |
newinitd "${FILESDIR}"/${PN}.initd ${PN} |
61 |
newenvd "${FILESDIR}"/${PN}.envd 99${PN} |
62 |
systemd_dounit scripts/systemd/bumblebeed.service |
63 |
|
64 |
+ local DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group. |
65 |
+ You may need to setup your /etc/bumblebee/bumblebee.conf" |
66 |
readme.gentoo_create_doc |
67 |
- |
68 |
- default |
69 |
} |
70 |
# |
71 |
#pkg_preinst() { |