x11-misc/bumblebee: only depend on display-manager-init in ~arch

Fixes: e14314b134c0fb866cc58f48cfcb6370b4aed00b
Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 95 insertions, 1 deletions

diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild
index 6f1cd0a5af5d..4984d378312b 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild
@@ -84,7 +84,7 @@ src_install() {
 	default
 
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newenvd "${FILESDIR}"/${PN}.envd 99${PN}
 	systemd_dounit scripts/systemd/bumblebeed.service
 
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r2.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r2.ebuild
new file mode 100644
index 000000000000..58973b2a9eb5
--- /dev/null
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r2.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 ${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
+}