[gentoo-commits] repo/gentoo:master commit in: x11-misc/bumblebee/files/, x11-misc/bumblebee/

[Pacho Ramos]

commit:     d953555228d855a17c7d36ae2b6dd4898b5faba1
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  8 12:24:48 2021 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Jul  8 12:24:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9535552

x11-misc/bumblebee: Drop old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 x11-misc/bumblebee/Manifest                        |  1 -
 .../bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild  | 99 ----------------------
 .../bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild  | 94 --------------------
 .../files/bumblebee-3.2.1_p20190421-gcc10.patch    | 66 ---------------
 x11-misc/bumblebee/files/bumblebee.initd           | 23 -----
 5 files changed, 283 deletions(-)

diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 0fb422d246a..f030cce1d87 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -1,2 +1 @@
-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

diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild
deleted file mode 100644
index 3c344ba46d4..00000000000
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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="7aa457fe7b4fffc3b175ad36fdae00d7777065dc"
-	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 )"
-
-PATCHES=(
-	# https://github.com/Bumblebee-Project/Bumblebee/issues/1058
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
-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
-}

diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild
deleted file mode 100644
index 4984d378312..00000000000
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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
-}

diff --git a/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch b/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch
deleted file mode 100644
index 7d02226521e..00000000000
--- a/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Author: Andreas Beckmann <anbe@××××××.org>
-Description: fix FTBFS with gcc-10
- gcc-10 defaults to -fno-common
- see https://gcc.gnu.org/gcc-10/porting_to.html
-Bug-Debian: https://bugs.debian.org/957058
-
---- a/src/bbconfig.h
-+++ b/src/bbconfig.h
-@@ -103,7 +103,7 @@ enum bb_pm_method {
-     PM_VGASWITCHEROO,
-     PM_METHODS_COUNT /* not a method but a marker for the end */
- };
--const char *bb_pm_method_string[PM_METHODS_COUNT];
-+extern const char *bb_pm_method_string[PM_METHODS_COUNT];
- 
- /* String buffer size */
- #define BUFFER_SIZE 1024
---- a/src/switch/switching.h
-+++ b/src/switch/switching.h
-@@ -60,10 +60,10 @@ void switcheroo_off(void);
- 
- /* number of switchers as defined in switching.c */
- #define SWITCHERS_COUNT 2
--struct switching_method switching_methods[SWITCHERS_COUNT];
-+extern struct switching_method switching_methods[SWITCHERS_COUNT];
- 
- /* A switching method that can be used or NULL if none */
--struct switching_method *switcher;
-+extern struct switching_method *switcher;
- 
- struct switching_method *switcher_detect(const char *name, struct switch_info);
- enum switch_state switch_status(void);
---- a/src/bbsecondary.h
-+++ b/src/bbsecondary.h
-@@ -21,7 +21,7 @@
- #pragma once
- 
- /* PCI Bus ID of the discrete video card */
--struct pci_bus_id *pci_bus_id_discrete;
-+extern struct pci_bus_id *pci_bus_id_discrete;
- 
- /// Start the X server by fork-exec, turn card on if needed.
- bool start_secondary(bool);
---- a/src/switch/switching.c
-+++ b/src/switch/switching.c
-@@ -31,6 +31,8 @@ struct switching_method switching_method
-           switcheroo_on, switcheroo_off}
- };
- 
-+struct switching_method *switcher = NULL;
-+
- /**
-  * Enumerates through available switching methods and try a method
-  * 
---- a/src/bbsecondary.c
-+++ b/src/bbsecondary.c
-@@ -37,6 +37,9 @@
- #include "pci.h"
- #include "module.h"
- 
-+/* PCI Bus ID of the discrete video card */
-+struct pci_bus_id *pci_bus_id_discrete;
-+
- /**
-  * Substitutes DRIVER in the passed path
-  * @param x_conf_file A path to be processed

diff --git a/x11-misc/bumblebee/files/bumblebee.initd b/x11-misc/bumblebee/files/bumblebee.initd
deleted file mode 100644
index b9296538a80..00000000000
--- a/x11-misc/bumblebee/files/bumblebee.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need xdm
-	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 $?
-}