sys-power/bbswitch: 9999, 0.8-r2 - better kernel source dir handling,

With approval of NP-Hardass adding myself to metadata. EAPI bump.
Fixing the way kernel sources are find, the hardcoded value uses running
kernel's /build dir, it was later altered to default /usr/src/linux.
This change makes it so it uses $KERNEL_DIR that defaults to
/usr/src/linux and fallback to running kernel's /build if no
/usr/src/linux exist.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Piotr Karbowski <slashbeast@gentoo.org>

diff --git a/sys-power/bbswitch/bbswitch-0.8-r2.ebuild b/sys-power/bbswitch/bbswitch-0.8-r2.ebuild
new file mode 100644 (file)
index 0000000..ad44354
--- /dev/null
+++ b/sys-power/bbswitch/bbswitch-0.8-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+if [[ ${PV} == 9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
+       EGIT_BRANCH="develop"
+else
+       PATCHES=( "${FILESDIR}/${PN}-0.8-kernel-4.12.patch" )
+       SRC_URI="https://github.com/Bumblebee-Project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
+HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
+
+SLOT="0"
+LICENSE="GPL-3+"
+IUSE=""
+
+DEPEND="
+       virtual/linux-sources
+       sys-kernel/linux-headers
+"
+RDEPEND=""
+
+MODULE_NAMES="bbswitch(acpi)"
+
+pkg_setup() {
+       linux-mod_pkg_setup
+
+       BUILD_TARGETS="default"
+       BUILD_PARAMS="KVERSION=${KV_FULL}"
+}
+
+src_prepare() {
+       # Fix build failure, bug #513542
+       sed "s%^KDIR :=.*%KDIR := ${KERNEL_DIR}%g" -i Makefile || die
+
+       default
+}
+
+src_install() {
+       einstalldocs
+
+       insinto /etc/modprobe.d
+       newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
+
+       linux-mod_src_install
+}

diff --git a/sys-power/bbswitch/bbswitch-9999.ebuild b/sys-power/bbswitch/bbswitch-9999.ebuild
index bb29cb2fd85b0591cf845edf5907f4d10c5500cf..ad44354463cd540af50cdd33a144f296041576cf 100644 (file)
--- a/sys-power/bbswitch/bbswitch-9999.ebuild
+++ b/sys-power/bbswitch/bbswitch-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit linux-mod
 
@@ -39,7 +39,7 @@ pkg_setup() {
 
 src_prepare() {
        # Fix build failure, bug #513542
-       sed -i 's/^KDIR.*$/KDIR\ \:= \/usr\/src\/linux/g' Makefile || die
+       sed "s%^KDIR :=.*%KDIR := ${KERNEL_DIR}%g" -i Makefile || die
 
        default
 }

diff --git a/sys-power/bbswitch/metadata.xml b/sys-power/bbswitch/metadata.xml
index 437e2daa175e45692e4e8569a52ed393ef04b7f5..4c90e0a75de3f647705143424fb33f8cb19e7ae2 100644 (file)
--- a/sys-power/bbswitch/metadata.xml
+++ b/sys-power/bbswitch/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+       <maintainer type="person">
+               <email>slashbeast@gentoo.org</email>
+               <name>Piotr Karbowski</name>
+       </maintainer>
        <maintainer type="person">
                <email>NP-Hardass@gentoo.org</email>
                <name>NP-Hardass</name>