gentoo resync : 03.03.2019

8 files changed, 70 insertions, 11 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 17045f0b363b..fdb1771ffd0c 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
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>
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index 364657efbd1a..03e2b66626a4 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -15,6 +15,6 @@ AUX power.d/pci_devices 1391 BLAKE2B 5da4f067b6b7e6d6905fb719cdbead8abf65d347ea3
 AUX power.d/usb_bluetooth 1121 BLAKE2B abcd8ab1e9b455dacadd5ca9627a63e9bb61c6c49912d644283c299c10171d27b684d48166058f64e1a2ebdb24f04492bf728015e3e9f33f7612da3c8d903e13 SHA512 b96abfdb8745f320ac3f1f368d1095195c68b0a56270aea4c5ad61e913ddc1641c5b5e1aadc6225d78f88956c4ffb2a396e031de02b9ecced09fac09765701bf
 AUX sleep.d/50unload_alx 316 BLAKE2B b674a3b9480c77836dc7137dedd4639704b428a6109f7e13971ef45ee328e157c7b4304e12ed0e022298c68d6fc4d2aafbb2da4a5b50d27366e6991ff027320b SHA512 64e7f77088a6157c90024d26ae6afde40abffc17d8ec2775e6a4ed17fac6c6fc1787c9f1b02cd0f4cd9e18dd74502f84e894006875b7dcacc39e509b3e0d86b0
 DIST pm-utils-1.4.1.tar.gz 208687 BLAKE2B dde7992acf1b28378021f4bd433a8e08c37bb35035af19d8b811cf8a22c141ded5cc02caf3e2ffd7119592eefcd941e4ddebb0dfbe715007788ea201cb96d073 SHA512 5bc9479fe75f120aee136befeb24c8d7d85f61410b551177ed61fd1b4ea9cce7989796b067e357ea93b44b4ae9f66311687066f188236c5efdfd3750695a8017
-EBUILD pm-utils-1.4.1-r6.ebuild 2910 BLAKE2B 2626000280e2c04d1a31f124ec3e6de452c207f9908d47d43e9f4850d8426980ceeda1d713a5891521677f5d417c62d122a916f228dd01a5353af1ea1ecdf0e0 SHA512 89762dd49c51124d4100f248ab39307f5916dcb0454439e9007abe601053b14cd8ff54c9381678af72cf9db9d462b242171475554577cb6395efdb600b37aa7f
-EBUILD pm-utils-1.4.1-r7.ebuild 2954 BLAKE2B 8794e602fc78b75ff3f62dd7b10d5e2b5f8dd7bdf506132f05c9111414229c4d553ac46ae9c86caad31c4d766b628f41c93eaa59f925c12f0d02f515675bea4f SHA512 a934a5594cc531db8e25f8a9e386abefbd1d84547d8773680309a8d06668b14d63a9155a6a03b168bffde665d6c958e191f1df9d6634e33443c87bb6a6e3bbbc
+EBUILD pm-utils-1.4.1-r6.ebuild 2912 BLAKE2B 4ad176e894ea631bde939784350ec6611c026bc66af1426144ac82ffe1cf9c6462ab889a912bd82734a2129f3cdf55d597cc6caf9629f5d997c8133e2bef2f18 SHA512 cbac8ab84b9d128e52954e8a542001b51c1dc228e44a42017aae25f6508f121a72ecbeefc3a818daba87948ab0a70b7337662acab0e8a4f195c30dd385a5541b
+EBUILD pm-utils-1.4.1-r7.ebuild 2956 BLAKE2B d1e6ce74419ca1ded34ea0d6a11168969ca6a9769937cce1cf354b23d65ff2cf4567b3936228cefcac059d19186b84d1b7f3d5505f2051d35fad253085a28c0e SHA512 23a03fbf27db472c402a8622d2b5ea39819712ef2796d744b060b6c1c0e9dd82f182ad544f04cf8ba9f6772d7f9fdc3b11e6bb0efc6a4f17e0a2a8d6c89eb77b
 MISC metadata.xml 321 BLAKE2B 17786e84c4ddae5272489e8238655805099de241a1ffa04c985434d4a35c902d2f5a39c8a288dc1c35d6c4d54167d4ccf8439982faee55418ff8872e2ca6aac6 SHA512 8bbd7192ac92567bef9234c1725dd9abd12fbb2809d961d0f6690f05b9477e0d07ef6056a516b1eddb1c533c6b80560c9924d74f1e2fe57f682ca1e622354563
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild
index f7ada2b2e566..d5e572ea5e1f 100644
--- a/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://pm-utils.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="alsa debug ntp video_cards_intel video_cards_radeon"
 
 vbetool="!video_cards_intel? ( sys-apps/vbetool )"
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
index 774ad3b31331..4da7b5dd5a85 100644
--- a/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://pm-utils.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="alsa debug ntp video_cards_intel video_cards_radeon"
 
 vbetool="!video_cards_intel? ( sys-apps/vbetool )"