bumblebee: fixed bug #532306

Bumblebee-Project · Jul 21, 2016 · 60bd788 · 60bd788
1 parent 94f2325
commit 60bd788
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/sys-power/bbswitch/bbswitch-9999.ebuild b/sys-power/bbswitch/bbswitch-9999.ebuild
@@ -2,22 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-
-inherit git-2 linux-mod
+EAPI="5"
+inherit linux-mod git-r3
 
 DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
 HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
 EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
 SRC_URI=""
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="virtual/linux-sources
-	sys-kernel/linux-headers"
+DEPEND="
+	virtual/linux-sources
+	sys-kernel/linux-headers
+"
 
 RDEPEND=""
 
@@ -33,7 +34,7 @@ pkg_setup() {
 src_install() {
 	insinto /etc/modprobe.d
 	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
-	dodoc NEWS
+	dodoc NEWS README.md
 
 	linux-mod_src_install
 }
diff --git a/x11-misc/bumblebee/bumblebee-9999.ebuild b/x11-misc/bumblebee/bumblebee-9999.ebuild
@@ -2,12 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
-inherit autotools base git-2 multilib eutils readme.gentoo systemd user
+EAPI=6
+inherit autotools git-r3 multilib eutils readme.gentoo-r1 systemd user
 
 DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
 HOMEPAGE="http://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee"
 EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN/bu/Bu}.git"
+EGIT_BRANC="develop"
 SRC_URI=""
 
 SLOT="0"
@@ -39,7 +40,7 @@ PDEPEND="
 REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
 
 src_prepare() {
-	base_src_prepare
+	default
 	eautoreconf
 }
 
@@ -54,14 +55,18 @@ src_configure() {
 
 		local nvpref="/usr/$(get_libdir)/opengl/nvidia"
 		local xorgpref="/usr/$(get_libdir)/xorg/modules"
-		ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \
-			CONF_LDPATH_NVIDIA=${nvlib#:} \
-			CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}"
+		local myeconfargs=()
+		myeconfargs+=(
+			"CONF_DRIVER=nvidia"
+			"CONF_DRIVER_MODULE_NVIDIA=nvidia"
+			"CONF_LDPATH_NVIDIA=${nvlib#:}"
+			"CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}"
+		)
 	fi
 
 	econf \
 		--docdir=/usr/share/doc/"${PF}" \
-		${ECONF_PARAMS}
+		${myeconfargs[@]}
 }
 
 src_compile() {
@@ -86,3 +91,7 @@ pkg_preinst() {
 
 	enewgroup bumblebee
 }
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/x11-misc/bumblebee/files/bumblebee.initd b/x11-misc/bumblebee/files/bumblebee.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $