[gentoo-commits] repo/gentoo:master commit in: x11-misc/bumblebee/

[Patrice Clement]

commit:     7c0a2214a381891b0082e503dd4662e7622805ee
Author:     Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Mon Feb 13 17:21:38 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 23:00:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c0a2214

x11-misc/bumblebee: fix live ebuild.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3958

 x11-misc/bumblebee/bumblebee-9999.ebuild | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/x11-misc/bumblebee/bumblebee-9999.ebuild 
b/x11-misc/bumblebee/bumblebee-9999.ebuild
index ef99702e33..4b832aebac 100644
--- a/x11-misc/bumblebee/bumblebee-9999.ebuild
+++ b/x11-misc/bumblebee/bumblebee-9999.ebuild
@@ -4,11 +4,13 @@
 
 EAPI=6
 
-inherit autotools readme.gentoo-r1 multilib systemd user
+inherit autotools multilib readme.gentoo-r1 systemd user
 
 if [[ ${PV} == 9999 ]]; then
        EGIT_REPO_URI="git://github.com/Bumblebee-Project/Bumblebee.git"
        EGIT_BRANCH="develop"
+       KEYWORDS=""
+       inherit git-r3
 else
        COMMIT="c322bd849aabe6e48b4304b8d13cc4aadc36a30d"
        
SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz
 -> ${P}.tar.gz"
@@ -62,12 +64,9 @@ src_prepare() {
 }
 
 src_configure() {
-       DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' 
group.
-               You may need to setup your /etc/bumblebee/bumblebee.conf"
-
        if use video_cards_nvidia ; then
                # Get paths to GL libs for all ABIs
-               local nvlib=""
+               local i nvlib=""
                for i in  $(get_all_libdirs) ; do
                        nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib"
                done
@@ -80,19 +79,19 @@ src_configure() {
        fi
 
        econf \
-               --docdir=/usr/share/doc/"${PF}" \
                ${ECONF_PARAMS}
 }
 
 src_install() {
+       default
        newconfd "${FILESDIR}"/${PN}.confd ${PN}
        newinitd "${FILESDIR}"/${PN}.initd ${PN}
        newenvd "${FILESDIR}"/${PN}.envd 99${PN}
        systemd_dounit scripts/systemd/bumblebeed.service
 
+       local DOC_CONTENTS="In order to use Bumblebee, add your user to 
'bumblebee' group.
+               You may need to setup your /etc/bumblebee/bumblebee.conf"
        readme.gentoo_create_doc
-
-       default
 }
 #
 #pkg_preinst() {