Permalink
Browse files

bumblebee: Use one confd for both drivers

  • Loading branch information...
Reinis committed Apr 21, 2012
1 parent 7be31fb commit 83de1f9f6faf9d5230d2f9aa533f288e6942c86b
@@ -2,6 +2,11 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 21 Apr 2012; Reinis Danne <rei4dan@gmail.com> bumblebee-3.0-r1.ebuild,
+ bumblebee-9999.ebuild, +files/bumblebee.confd,
+ -files/bumblebee.nouveau-confd, -files/bumblebee.nvidia-confd:
+ Use one confd file for both drivers.
+
15 Apr 2012; Reinis Danne <rei4dan@gmail.com> bumblebee-3.0-r1.ebuild,
metadata.xml:
Rename "powersave" USE flag to "bbswitch".
@@ -51,8 +51,7 @@ src_configure() {
}
src_install() {
- use video_cards_nvidia && newconfd "${FILESDIR}"/bumblebee.nvidia-confd bumblebee
- use video_cards_nouveau && newconfd "${FILESDIR}"/bumblebee.nouveau-confd bumblebee
+ newconfd "${FILESDIR}"/bumblebee.confd bumblebee
newinitd "${FILESDIR}"/bumblebee.initd bumblebee
default
}
@@ -57,8 +57,7 @@ src_configure() {
}
src_install() {
- use video_cards_nvidia && newconfd "${FILESDIR}"/bumblebee.nvidia-confd bumblebee
- use video_cards_nouveau && newconfd "${FILESDIR}"/bumblebee.nouveau-confd bumblebee
+ newconfd "${FILESDIR}"/bumblebee.confd bumblebee
newinitd "${FILESDIR}"/bumblebee.initd bumblebee
default
}
@@ -1,3 +0,0 @@
-# /etc/conf.d/bumblebee
-
-BUMBLEBEE_EXTRA_OPTS="--use-syslog -l /usr/lib/opengl/nvidia/lib:/usr/lib/opengl/nvidia/extensions:/usr/lib64/opengl/nvidia/lib:/usr/lib32/opengl/nvidia/lib:/usr/lib64/opengl/nvidia/extensions:/usr/lib32/opengl/nvidia/extensions"

0 comments on commit 83de1f9

Please sign in to comment.