gentoo resync : 03.03.2019

4 files changed, 64 insertions, 5 deletions

diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index ce0dbc69b2f5..f665aca7022e 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -2,6 +2,7 @@ AUX bbswitch-0.8-kernel-4.12.patch 528 BLAKE2B 4c4b5dbf29338b9a8bbd4cfc974466bee
 AUX bbswitch.modprobe 46 BLAKE2B e76506e79adc57bedd68f038293257e7c70f1f3bc924776741e152b7c95c691f5241066b742583af063a4bdde90134005949ce28715d0b8f0c51f59c582223c8 SHA512 a4fa992d66b401e039c995b64ac5f3b2491c3ccf4412e211d50d1e514253f9341dc77a6d8da808f03988735e44a97bb973f3303ed3c0eeed6f4e21794d3545b6
 DIST bbswitch-0.8.tar.gz 15800 BLAKE2B d9a16d2ca8baebcbc7ad1d8c1daeb9822ed4ea797ff297848e7087d2a0b142b7cd1333d12346fcde85ad06ddb0640e0d6e299d00e0e8e6c7f96d0a409a08d1c6 SHA512 11ab163931feb6c0e202d04c4552b848e999fedea9990390c26b28abdb4a69081ccfb5a22d1e390cc274f1c0cfc9adedc719c5fece14738b17aaa93e28865b7c
 EBUILD bbswitch-0.8-r1.ebuild 1065 BLAKE2B a2ef9212dff29eafc989f1dc658deb1a5d886d89240b522ce9703970a8646cb453b9c5edc0d6e4a1d9268db327000833df8cdd6a8634cff7b5cc3e9587ab27fe SHA512 2da9fca8f2ce0bf553d3af86c17d3108aec4c957c5677c099212c389dfc7dd5708af4642c35a51e72fbdb83d08fea4679097fdd6768b335588b9b9cd4b13e9cc
+EBUILD bbswitch-0.8-r2.ebuild 1060 BLAKE2B 1e0d64798d692efb54aaae8c3abf8fef445b383d7758aa78c4622440206108893d5bb9bc40c715a5534935b029d7240d53dc29d3a3af899db48493f75267320b SHA512 51d60415904a06222a4c8ad6eeb353bbd659dd22a25d189d97e95e51e29f04b16aa770714d40f7b384a9538158a63447bf4ae7f1341df1dcdb2358d2892c7a6a
 EBUILD bbswitch-0.8.ebuild 870 BLAKE2B 82cf687d98caa7a66d43faf95695b2bc41d29040ab3572c9d9c129387b309345d96a90c3c744d2d427ff5c5d1798be36a97526f9b2ca8bed4a54a11d195fbc3f SHA512 8fc0d492a417cec27ec87d6e0235758e9017f44b1549b8464b187f30173505a391eefb270b74183784613bbc38930e4df2aa99d67445b80938dc3616c0252418
-EBUILD bbswitch-9999.ebuild 1067 BLAKE2B 07a93fdec1bcd4755674bc6f86c194e6b46ec99f877851467b835e4be2f1c008e715e909157cd11d2af9e5c7dfc07a85d1139b68e801c1beec89f2bc60296e0e SHA512 4130a6c02e65506877a61590c42bb7afa86a9dcc485b53d7b64a265f8c153d3ab71c8bff03c9bdca758dbb91bff5966c648aa4afa653f24c6346592e445f98bc
-MISC metadata.xml 866 BLAKE2B a35e8f3ebad2c7a3a4ef43095a8dc381d3e46205ecaad70f5ffbbb46d48206d14b64a25f9b546d2d93af5c6bd938da6a29536b8541b41d40c20acb951212258d SHA512 0a39acf63faef61a12277e39d96fc866ff30822336ab098a0ab6affdcbc63054ff9c78bcbcddae952e205927ac6f00c04dce803bc825ae1c2853bfaded81124d
+EBUILD bbswitch-9999.ebuild 1060 BLAKE2B 1e0d64798d692efb54aaae8c3abf8fef445b383d7758aa78c4622440206108893d5bb9bc40c715a5534935b029d7240d53dc29d3a3af899db48493f75267320b SHA512 51d60415904a06222a4c8ad6eeb353bbd659dd22a25d189d97e95e51e29f04b16aa770714d40f7b384a9538158a63447bf4ae7f1341df1dcdb2358d2892c7a6a
+MISC metadata.xml 979 BLAKE2B 94694c70d21a40b08bc585ec4cc226d1f33302d4da70137737cb40e08e24584204069fdaafd8a3e99662dad0d5b097c696ae4be1ea51832f290011e09b8280bd SHA512 018a41f0d913f5b7e6c405770b200650c117a3a37d905ed58b4025631bb3bba5e00e64ccd4eeabdd30ab38f4764832403c687a46ab3a7d76aec5b40462c6b403
diff --git a/sys-power/bbswitch/bbswitch-0.8-r2.ebuild b/sys-power/bbswitch/bbswitch-0.8-r2.ebuild
new file mode 100644
index 000000000000..ad44354463cd
--- /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 bb29cb2fd85b..ad44354463cd 100644
--- 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 437e2daa175e..4c90e0a75de3 100644
--- a/sys-power/bbswitch/metadata.xml
+++ b/sys-power/bbswitch/metadata.xml
@@ -2,6 +2,10 @@
 <!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>
 	</maintainer>