gentoo resync : 27.03.2021

6 files changed, 125 insertions, 6 deletions

diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 0c01b72854e0..26647fb4ab96 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -2,9 +2,11 @@ AUX bumblebee-3.2.1_p20190421-gcc10.patch 2006 BLAKE2B 136c9f5aa38269efa2ef59f41
 AUX bumblebee.confd 60 BLAKE2B 68cfe5dd4db512e10cf82977556336e7bb8eb7ab3f397a2ba5b75c4d5e0856d957a126e741d2c3a45f3453479b42e0b1b42b9aab411eb80de9afc73f3c2ff8bd SHA512 4c773002e372e1696c0922bda91a104ea0ee244eb6beac84a4e7ad2ff1aee265aa248e63c3ad55ea75cabbd36b03d9efa3f8ec3ef708346837ab6a10d6652251
 AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970d75539b04b5d6a23adac7067a511f4f9d9a47797ac1d55f836c3242d26d0c464f6ea3833dc30ae5 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af
 AUX bumblebee.initd 488 BLAKE2B be625ab381b6f588bc86402bfe7aacc8f541c0ebe2f8fdbc4309bdef5dd1cfa44953a3488bde8d0af67b8cf4b14b7b5de77ab125067b6b59379ceba75863fc45 SHA512 5c733a901e2bed20082d01f0db2e8d168106b082f2f6300388edbeec7f5b7a70ddfed908012c8ccf9a3caf070669cfb550368237dd6f8ff62018f8b767012cd7
+AUX bumblebee.initd-r1 500 BLAKE2B c37a4ca616b31b2cc151cae750475178c471ce9e2f7f1a9491a93980a882bd8c1b5baaec8ee2ec211acb77e243b36d6a077a25c14aff96ce01a6a493cd88f4c8 SHA512 a3b7e055eb70c46516319cfc9c9e59038568ad646865bcd5cd953d2774c48c4989c8f2a77f644993543d56fb128fedfdc90904a3370dbf8325300932cf7e1d08
 DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
 DIST bumblebee-3.2.1_p20210112.tar.gz 63840 BLAKE2B 53f433c90ea7925a059597f9ce1e6b764bf204337cda2a87b3e862951fbd86e18cf3bb973a2a43c0ff913e9b290170536760ed9163ea746f5b28b7fed4ce9c6d SHA512 2d23db5a6d2a06c37176440568fd30c3afd80a75e13db00f081c0029f9e03275bf6c7b019778b9c31dcffe49ba56ec86a3303f00074123c95560a850bdb0f36b
 EBUILD bumblebee-3.2.1_p20190421-r1.ebuild 2295 BLAKE2B ee30265b3733279db824a9a97a62428d0c480590543475b18eed9450c1735dafb26410a838467f1ce0c98617b9d705f02015f63ee8e4662847d07c7bab296696 SHA512 e4cb4d0c2083134ca248f59e5d709ab61b36429f13ee2a4f3cff8bb5ea8bbd384d759f7193151bff146c11e96914ac70e6eaa0e88b4d1742b69980aa08f735a7
-EBUILD bumblebee-3.2.1_p20210112.ebuild 2188 BLAKE2B 6501cb6761a95fc3b4eceb1abcb5401f46da02520c38cb457043c90834fe610a5c791df08befff23acca37f26e0ccca7fbeef12fdc6e22c37b3740df40f0ad33 SHA512 b9f7bf526f7804fc9810f16488147b674d30294caa303c2ad6eb2e1c21cf7d06e08e0360852aff5b20ec49517d00244d94337ab8fc2f37f566881a2eae9abe20
-EBUILD bumblebee-9999.ebuild 2199 BLAKE2B e19016ca68387e551f0694b924217680f46752f81e6fa5126b14217c33f0dfe29b41fd7d8555ab05ef69a11c31aa94013f6d705538002d3daf80c4afad36b36d SHA512 a483f2303cba245bbcc94d8cf984e606539ad200d7db9bd53e36152719dc9f64038b2b4046ca7121d8db0af4f1b8400c1e006fffa17e0cd75c5dac7065555f9a
-MISC metadata.xml 1141 BLAKE2B 441886a10ea50d12e995e2de4dce097741958d7dd88396f670249dca04c9441371e46bb2a8b39351351d3e7039ad4ea6389c004a76d82ac792656c2e9349e49f SHA512 6d530cd8b214a7c5b9c2122bcd32e4f3fb2ecb8fb0411a0527a21c0683982d19916a4f4ba75bcbb23527192928f49b691a99f563d9d6f974208b3e9608abbc50
+EBUILD bumblebee-3.2.1_p20210112-r1.ebuild 2188 BLAKE2B 6501cb6761a95fc3b4eceb1abcb5401f46da02520c38cb457043c90834fe610a5c791df08befff23acca37f26e0ccca7fbeef12fdc6e22c37b3740df40f0ad33 SHA512 b9f7bf526f7804fc9810f16488147b674d30294caa303c2ad6eb2e1c21cf7d06e08e0360852aff5b20ec49517d00244d94337ab8fc2f37f566881a2eae9abe20
+EBUILD bumblebee-3.2.1_p20210112-r3.ebuild 2193 BLAKE2B eb474aab9b516f1c5e7d1414ffa8519dc9bb223c845b9884c648d18ee56b4c502e601a626f87549e6a77698212b1fd5f5656ef18ab0340c5cdad120f2e5c2afe SHA512 31805ff90100ab826e48ff7ee82d6c64ddae23c89f0d98b319342c963776bba2c11aacbbc6cc0e28099d19c6e9fb3fbc4a2f1add53645bb8586fafc23bce7632
+EBUILD bumblebee-9999.ebuild 2202 BLAKE2B a427123a698832721063aac463d06a873027fd226161b95656ef53e83f32c6e468957d28370fec47d41c86726a6e64a17115a315f0bbc9e39620fcc4b557c1eb SHA512 d89511ba58ddb48e8bd3e68fd976c6e87fe749974ee9e94538c83a54915d49ed3f89fed850b504ce13213c7bd108ee55beb7b7edb2e5848cce1fd598e5ae6ef6
+MISC metadata.xml 1143 BLAKE2B 2f0cc1faa1d3cf4bbb1bad28b72bdf32ffbace0ef02ecefb2a786401bb23123233b647860b0a0b1b7f24e37dc11470a820b1799ac6fd8e716f8b2c8f05d95677 SHA512 e1098847284529bf6840c313198664dfc037abf0a812e22f93a55d6cced08b0d49eb12316b7ca12c26728a3560dd5a5527b01fb218f6857e9a991cfd75b90bf3
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild
index 4984d378312b..4984d378312b 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r3.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r3.ebuild
new file mode 100644
index 000000000000..6c6e83af37a9
--- /dev/null
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 systemd user
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git"
+	EGIT_BRANCH="develop"
+else
+	COMMIT="8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec"
+	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+
+	S="${WORKDIR}/Bumblebee-${COMMIT}"
+fi
+
+DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
+HOMEPAGE="https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee"
+
+SLOT="0"
+LICENSE="GPL-3"
+
+IUSE="+bbswitch video_cards_nouveau video_cards_nvidia"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/libbsd
+	sys-apps/kmod
+	x11-libs/libX11
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/opengl
+	x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]
+	bbswitch? ( sys-power/bbswitch )
+"
+
+DEPEND="${COMMON_DEPEND}
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+PDEPEND="
+	|| (
+		x11-misc/primus
+		x11-misc/virtualgl
+	)
+"
+
+REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
+
+pkg_setup() {
+	enewgroup bumblebee
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use video_cards_nvidia ; then
+		# Get paths to GL libs for all ABIs
+		local i nvlib=""
+		for i in  $(get_all_libdirs) ; do
+			nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib"
+		done
+
+		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}"
+	fi
+
+	econf \
+		${ECONF_PARAMS}
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newenvd "${FILESDIR}"/${PN}.envd 99${PN}
+	systemd_dounit scripts/systemd/bumblebeed.service
+
+	local DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group.
+		You may need to setup your /etc/bumblebee/bumblebee.conf"
+	readme.gentoo_create_doc
+}
diff --git a/x11-misc/bumblebee/bumblebee-9999.ebuild b/x11-misc/bumblebee/bumblebee-9999.ebuild
index e66fb829acb9..b9699790cb80 100644
--- a/x11-misc/bumblebee/bumblebee-9999.ebuild
+++ b/x11-misc/bumblebee/bumblebee-9999.ebuild
@@ -84,7 +84,7 @@ src_install() {
 	default
 
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newenvd "${FILESDIR}"/${PN}.envd 99${PN}
 	systemd_dounit scripts/systemd/bumblebeed.service
 
diff --git a/x11-misc/bumblebee/files/bumblebee.initd-r1 b/x11-misc/bumblebee/files/bumblebee.initd-r1
new file mode 100644
index 000000000000..0780fb902b48
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee.initd-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need display-manager
+	want vgl
+}
+
+PIDFILE="${PIDFILE:-/var/run/bumblebee.pid}"
+
+start() {
+	ebegin "Starting BumbleBee Daemon"
+		start-stop-daemon -S -p "${PIDFILE}" -x /usr/sbin/bumblebeed -- -D ${BUMBLEBEE_EXTRA_OPTS} --pidfile "${PIDFILE}"
+	eend $?
+}
+
+stop() {
+
+	ebegin "Stopping BumbleBee Daemon"
+		start-stop-daemon -K -p "${PIDFILE}" -R SIGTERM/10
+	eend $?
+}
diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml
index 33a45f6774e3..6edb74642ffc 100644
--- a/x11-misc/bumblebee/metadata.xml
+++ b/x11-misc/bumblebee/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>NP-Hardass@gentoo.org</email>
-		<name>NP-Hardass</name>
+		<email>np-hardass@gentoo.org</email>
+		<name>Adam Feldman</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>