gentoo resync : 21.06.2020

4 files changed, 73 insertions, 79 deletions

diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 065bf2b40d57..758f165dec70 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -1,11 +1,10 @@
+AUX bumblebee-3.2.1_p20190421-gcc10.patch 2006 BLAKE2B 136c9f5aa38269efa2ef59f410668f1ce5e9976eb377036596a455e27188a88691099eeb7e14b7de92ce0621fc1d36ca32d8301e982fdfe41c138aa7fffc017b SHA512 da2330ca2c915349899a6d7dd525308b02f3ed527b18496ea48889a41f4b4299260d53dab85c78f14a7778576dea47e2d140690c68b61de715cbe0e8722f2031
 AUX bumblebee.confd 60 BLAKE2B 68cfe5dd4db512e10cf82977556336e7bb8eb7ab3f397a2ba5b75c4d5e0856d957a126e741d2c3a45f3453479b42e0b1b42b9aab411eb80de9afc73f3c2ff8bd SHA512 4c773002e372e1696c0922bda91a104ea0ee244eb6beac84a4e7ad2ff1aee265aa248e63c3ad55ea75cabbd36b03d9efa3f8ec3ef708346837ab6a10d6652251
 AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970d75539b04b5d6a23adac7067a511f4f9d9a47797ac1d55f836c3242d26d0c464f6ea3833dc30ae5 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af
 AUX bumblebee.initd 485 BLAKE2B 7583befe5a3e3b699bf895f1e4ac445dbe1bbbb172ef0c9e4d38a6c347699e80aca7a450f95cde9d8fe0f033d5d5a80716c9f17155f7d5ebdfa286b533fc4ab5 SHA512 12c4d28bb0dfa17239c7bf488408f3ca5e672a2167664b7d9f5501fcb878fe679c351bbe037f31b762e8e9a911088d08d66814cd8cc6b257fd973cc6c54ee10f
-DIST bumblebee-3.2.1.tar.gz 143110 BLAKE2B 537fe96e061f229c4c1e7748aef89e4eec040536d7a3161b449a34752c19078d3b4da6703f1c11268b4bb0e6590f94168bab5917fceac0eb73825b3c233548f0 SHA512 6f016f75d199577215ff00c059e196829e9d3efeb0fb6eebe6c3fad6176e330332e1ef25875a22ac9892895683d95899ea44f1ec1f85d31300ad83cb1fe0310a
 DIST bumblebee-3.2.1_p20170130.tar.gz 63428 BLAKE2B 33a2fbbd6e6cbc6cd026b87714d06e54d8803cc75e997cc1bd1aa1d1263c3fe9602f822b92c67fa7e76632bb19daaae11e591b88d087889a970d374f6316e847 SHA512 b457e8ce197782bd1b1fabd3c0c67e4ec26cdb90a3715bbe7a8e1550cdde19134151567cfa0c73d800c30e5d303b30bc1261d5f3cbceaa64d559416e4d541070
 DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
-EBUILD bumblebee-3.2.1.ebuild 2005 BLAKE2B 3201a0ec6fc11d8b66090654b57cf79fbc504079819db90a303fb476bf99c5a7ca74183547b69b948c83a4285093c3ae8aa708d73440f2d0c23647d0d9b001d8 SHA512 02a045d7d3ed89c39b4b354d81e988cf015c873ece37ce4733405fc699e94e14935e8b395ab6a1fee32b3dfc7e186f908546766146a2f19f5702b83a201560aa
 EBUILD bumblebee-3.2.1_p20170130.ebuild 2219 BLAKE2B d422665f2e8033f644162a7ade48b83f7416747ce29a3dcaca58190054510e445bc72515d36e435dcf6990960ea1db852b3dab8b4cdc9ff42da54f6d1c174b93 SHA512 38bd8fe978bed7807f5fda4d6d48fbd97e648cd47e022efd5b11f5805aea5c175cb091eca7ae4f0da8faf67d8e27c49eae89691516932c63805258e85b080e28
-EBUILD bumblebee-3.2.1_p20190421.ebuild 2203 BLAKE2B d433d4c37f678fde7457ae4452a865ec6d4a77e6cd1ee9c7addd4c0b247acac3ad05ec7c72e02fcb3802ca3545b9d0df0ae474031abef3a051fb545d7525a9dd SHA512 6bb4be55bbcdf8f910b68d70ffca2e3fc4ed9f212d889cd6fedf505034f9df84afc3527d5dc2ca15144167843b99bb0cc215350714a2137544ebb7326da6ff5b
+EBUILD bumblebee-3.2.1_p20190421.ebuild 2310 BLAKE2B f6440bdfdc01b6c9d40b9fd0ffce6eab1bd2ba63f0987d508e8fbbcbb560f6c6a5cc91afb0413a9eb327346874ba533f79bdfb294a42345d10e6ce47a3d7e172 SHA512 62beb1f2f3a134251c4657985edf1b0eda809f021cd8470089533a92b01b46433ef51b644c2f267b0cbd59c78708f6ea1c8976d100d41424583283b961da1b50
 EBUILD bumblebee-9999.ebuild 2215 BLAKE2B f9f61a4183cc43c2c1442101b433fec6a3477d6062da340d8421e0e63398927c5767177ea4d3c98ef87bd261de39b821d003d7a67e209de21b47c57c5e7aed21 SHA512 7da89e2bf3ee757b29fde2757dba5e63c157ff0b15b59d244df8ec43ce9a25adcd00b6f149b694488a916eb7d293b6a59d48e40c18eb94b4be1e9fa35c26a69d
 MISC metadata.xml 1111 BLAKE2B 9f9bcd089280889ccb6990617f6b470c0c69a8b77b2af849d5bde7ff45ec94e121569d2c217a87d7375e19503bf0d90de775c514e7b400c0dd2a6fbc897c21b4 SHA512 dc2f37b1def7e302fc3d82325d3179b0c64c96b2fa609f6cf5196cb97b89854fade361005327ee2f8ccc5927e0aefe1c997cf5e6f9862cc18ef09deb3a2aa814
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
deleted file mode 100644
index a0904a9a887f..000000000000
--- a/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib readme.gentoo systemd user
-
-DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
-HOMEPAGE="https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee"
-SRC_URI="https://bumblebee-project.org/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86"
-
-IUSE="+bbswitch video_cards_nouveau video_cards_nvidia"
-
-RDEPEND="
-	dev-libs/libbsd
-	virtual/opengl
-	x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]
-	x11-misc/virtualgl:=
-	bbswitch? ( sys-power/bbswitch )
-"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	sys-apps/help2man
-	virtual/pkgconfig
-	x11-libs/libX11
-"
-
-REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group.
-		You may need to setup your /etc/bumblebee/bumblebee.conf"
-
-	if use video_cards_nvidia ; then
-		# Get paths to GL libs for all ABIs
-		local 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 \
-		--docdir=/usr/share/doc/"${PF}" \
-		${ECONF_PARAMS}
-}
-
-src_install() {
-	newconfd "${FILESDIR}"/bumblebee.confd bumblebee
-	newinitd "${FILESDIR}"/bumblebee.initd bumblebee
-	newenvd  "${FILESDIR}"/bumblebee.envd 99bumblebee
-	systemd_dounit scripts/systemd/bumblebeed.service
-
-	readme.gentoo_create_doc
-
-	default
-}
-
-pkg_preinst() {
-	use video_cards_nvidia || rm "${ED}"/etc/bumblebee/xorg.conf.nvidia
-	use video_cards_nouveau || rm "${ED}"/etc/bumblebee/xorg.conf.nouveau
-
-	enewgroup bumblebee
-}
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
index ecedcc95c494..eb6477c36832 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
@@ -53,6 +53,11 @@ PDEPEND="
 
 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
 }
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
new file mode 100644
index 000000000000..7d02226521e4
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch
@@ -0,0 +1,66 @@
+Author: Andreas Beckmann <anbe@debian.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