gentoo resync : 12.03.2021

8 files changed, 106 insertions, 8 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 7883d4978b35..329e63f5c0d1 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-video-geode/Manifest b/x11-drivers/xf86-video-geode/Manifest
index 9908f45d3331..51010aa2badf 100644
--- a/x11-drivers/xf86-video-geode/Manifest
+++ b/x11-drivers/xf86-video-geode/Manifest
@@ -1,3 +1,4 @@
+AUX xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch 2211 BLAKE2B ad3228a6c1d88f985949cd04940da5b3f45f2c284443c0bb538a44f75f8d479be1d64e8ed19a8953942c2ccb7996a55d6a490c1a1ab0f7f96bade79562dd16a5 SHA512 69d25f08a11c7897c7d870ae7f16977a55b7b678b0b3240d1626fe98638c7f76cfbb3f4d091436d4a984aeb3098e1635131c97be2025345bd18a90b82e3fb934
 DIST xf86-video-geode-2.11.20.tar.bz2 699973 BLAKE2B ed5c96a4ac41bb908239d89a49ef833a56fdeab62e441ddf36e32be1704a0850a2466a5538aafad87c83d3850339b0bdf0610851a17e3f4ace5eefab20c82296 SHA512 a67376ec174c544256aef693590d515742199c2acf1a54117207f599e1d9f70a3fb70c9c811ebc3f907dfa795e0e662a1c1f18673774660f0d5f3c757e848f0d
-EBUILD xf86-video-geode-2.11.20.ebuild 339 BLAKE2B 20041d5436b8f31697c59ba4ffe7c5c850a3144d57de09fe5df56c62cc864c32f8fe08f8b62e6e2b180af8af1e6d092db1733d174a28f7144940f10a94b442b0 SHA512 8dbc5582e5ea764eadcb8d66e75405117e478fae0d18168d9d9ff8b70a8fb424b0d5375eece2bb42e29bd5917251e9a6a32228ca916efb13585b93ceb7c28fcc
+EBUILD xf86-video-geode-2.11.20.ebuild 418 BLAKE2B df6745f4893cbb7aab1b266de5d5b8e835b8afc8fe23516859d0a846e988b6c6e2978717a2f00e8733faccffd6cb547fd04f9cba871de3c9eb60b9d052e4a041 SHA512 597ed5104afc1e14a22fe7899d317ddbf60d06b6b7c0c8b42747b79931bc290b87c24ade2ce779b0c171eff173f6f433c9288d972956f866fa520ca89a2b3c99
 MISC metadata.xml 373 BLAKE2B 1e2d777e05ee946958d8f757a6a710a04e299498cc195fbea7347b42545a91a028f765ed9c620ec5d6d233fc3fbe8e1c4a8d6a13441a8e4dc2ccef49490af27c SHA512 eb36f99f2f6df31d80d3ce66bb13b33d1c7eb7820b75f9bbfb2f4b7900bd2979c8ab9be59eb73742607f6c9d4ffec1ba489c15d239821fda9ff6e6a5f144ff65
diff --git a/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch
new file mode 100644
index 000000000000..5bacc0cfbc8d
--- /dev/null
+++ b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch
@@ -0,0 +1,93 @@
+From ba63bf6821c40707237ad2e7a13352a537e5b588 Mon Sep 17 00:00:00 2001
+From: Christian Gmeiner <christian.gmeiner@gmail.com>
+Date: Thu, 3 Dec 2020 14:22:23 +0100
+Subject: [PATCH] fix 'multiple definition of' linker error
+
+Fix for FTBFS due to -fno-common on GCC 10.
+
+Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
+---
+ src/geode.h     | 8 ++++----
+ src/gx_driver.c | 2 +-
+ src/gx_video.c  | 2 +-
+ src/lx_driver.c | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/geode.h b/src/geode.h
+index eb61c28..1b144ff 100644
+--- a/src/geode.h
++++ b/src/geode.h
+@@ -343,7 +343,7 @@ typedef struct _geodeRec {
+ 
+ /* option flags are self-explanatory */
+ #ifdef HAVE_LX
+-enum {
++enum LX_GeodeOpts {
+     LX_OPTION_SW_CURSOR,
+     LX_OPTION_HW_CURSOR,
+     LX_OPTION_NOCOMPRESSION,
+@@ -357,11 +357,11 @@ enum {
+     LX_OPTION_FBSIZE,
+     LX_OPTION_PANEL_MODE,
+     LX_OPTION_DONT_PROGRAM
+-} LX_GeodeOpts;
++};
+ #endif
+ 
+ #ifdef HAVE_GX
+-enum {
++enum GX_GeodeOpts {
+     GX_OPTION_SW_CURSOR,
+     GX_OPTION_HW_CURSOR,
+     GX_OPTION_NOCOMPRESSION,
+@@ -378,7 +378,7 @@ enum {
+     GX_OPTION_FBSIZE,
+     GX_OPTION_PANEL_GEOMETRY,
+     GX_OPTION_DONT_PROGRAM
+-} GX_GeodeOpts;
++};
+ #endif
+ 
+ /* geode_dcon.c */
+diff --git a/src/gx_driver.c b/src/gx_driver.c
+index 4de336e..188828c 100644
+--- a/src/gx_driver.c
++++ b/src/gx_driver.c
+@@ -78,7 +78,7 @@
+ 
+ extern OptionInfoRec GX_GeodeOptions[];
+ 
+-unsigned char *XpressROMPtr;
++extern unsigned char *XpressROMPtr;
+ 
+ static inline void
+ gx_enable_dac_power(void)
+diff --git a/src/gx_video.c b/src/gx_video.c
+index 0d3e1c5..7964d17 100644
+--- a/src/gx_video.c
++++ b/src/gx_video.c
+@@ -112,7 +112,7 @@ void GXSetVideoPosition(int x, int y, int width, int height,
+ 
+ extern void GXAccelSync(ScrnInfoPtr pScrni);
+ 
+-int DeltaX, DeltaY;
++extern int DeltaX, DeltaY;
+ 
+ unsigned long graphics_lut[256];
+ static int lutflag = 0;
+diff --git a/src/lx_driver.c b/src/lx_driver.c
+index 47f6875..9cb8889 100644
+--- a/src/lx_driver.c
++++ b/src/lx_driver.c
+@@ -74,7 +74,7 @@
+ 
+ extern OptionInfoRec LX_GeodeOptions[];
+ 
+-unsigned char *XpressROMPtr;
++extern unsigned char *XpressROMPtr;
+ 
+ static Bool
+ LXSaveScreen(ScreenPtr pScrn, int mode)
+-- 
+2.26.2
+
diff --git a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
index 1f52580d981c..3b9f17e55879 100644
--- a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
+++ b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,10 @@ DEPEND="${RDEPEND}
 		sys-kernel/linux-headers
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-multiple-definition-of-linker-error.patch
+)
+
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ztv)
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index d61cbee4458e..4cf97ef54fa0 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -4,6 +4,6 @@ DIST xf86-video-intel-2.99.917_p20200515.tar.bz2 1250303 BLAKE2B 81fca6a4ccfd01c
 DIST xf86-video-intel-2.99.917_p20201215.tar.bz2 1250622 BLAKE2B ddcbd84ee125528fe82f0a369f8e768d218eb0d9c4fc00cbe4a921d6267a846eccc001e3dd765f8cdaf7a38c461357831cd9675acfdfd3cc6ac282ec4b6f4b67 SHA512 29526fe191a95c2df5a3e168150b8c7f759dfdc9a4912e28887ec51be05304a9f552d21c990a37a90d6299e64df4bb1fba051c1d0ad25606dc52f801cd30b60d
 EBUILD xf86-video-intel-2.99.917_p20200310.ebuild 1989 BLAKE2B 431b15edc9df546042a6ef4d1fed6f99ec3fdc0f9793c90c8d8b0f59199b111d0aebd53f078f1fd83fb20c7e9d3b659bfacf73db846f4e181f2811ce463f883a SHA512 381b30272e8959ac4754efe7cb66d4ca1cf427a349728558159475dd68347b2b3a4049c92ca006d56dd535ec1b30916fe119ed24a8d00504df8d41159b0bf753
 EBUILD xf86-video-intel-2.99.917_p20200515.ebuild 1989 BLAKE2B 79fa3d1553678509ea27bd986ebba6b136c9f4138b48a750750cbb9335341732e7dca7cac60950428c4427738378d5afb4a85e6a6f1fb595d45ed7063db04e72 SHA512 7a418b091a51d62a4e80ec7062cbaa955f3dfaf86d09777fe4bb9172d3be74e73273e784dab7c26eacca101360101497a17202900d9a0fce826ec0037c3a5a94
-EBUILD xf86-video-intel-2.99.917_p20201215.ebuild 1939 BLAKE2B 78d38f49492071c6d04e433625c5a13a730e0db43999ea0a08ebf2762f33db46ee13f85ccfa05a3dd1bcbcef2789d546e2d2d020b9a33481e7f4972be52b44de SHA512 7fc53a96f9e293bd360e8d37c3d9c2b4278b06c59d07c079f471241fbbc0cc96cbfbd1b51f67b8161cf05128150a891a311c80c60468f8678b4b0d35055a4f07
+EBUILD xf86-video-intel-2.99.917_p20201215.ebuild 1937 BLAKE2B 7730ce66f8763d3c6839ad0cca36128cd5f49f50bb7f467125c95b1c85d8d8560655246c9d66b78a53b1a279794debf09ad5d2d4fc7c75d75cb9122943e63fbc SHA512 f6efaf35836a1702e7daab85acf8dac1123c8c202a82b17aacd44b1a77836ecc8121703063fedccd0e534026cbfeb505cb433d2b6973739c035fd31c16fab347
 EBUILD xf86-video-intel-9999.ebuild 1899 BLAKE2B 07e79ee178cc079f07e75bc4d53d166d70b2d2893e8b148933334c314bb705493c60209952898279564399e6d2eabdc25f00012116c0568c648f8f9000ddd18f SHA512 9499b4b813b8b8c6d723f1082e87e3818eea2661ef28d2ce5b4c804171490a3643485d49c13b286244b4eec886fa70ec0ad58e815370da5004e0dd4b294e0163
 MISC metadata.xml 558 BLAKE2B f7903a6eb37ee7cf8a5d3ec54b56c4099e4770717e08e24d386ef41f7f7d4604470dee2a7d8735b119c5c7f8a4ee8b0f280ef036266c282faca2edcf2413c151 SHA512 89dc6b97c4dc2315848b264bce4219717cf3260f8b7fbeeb3e304ebc3482aed77522cf5b10c7a87c76bfd394e6076e7c08ef7735932e4c0aa9e03b6deea0f0ab
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild
index 88500f06f4bf..8dd4903ee81e 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit linux-info xorg-3 flag-o-matic
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	COMMIT_ID="a511f22cdec56504913b457a2e60dafee8e2b570"
 	SRC_URI="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/${COMMIT_ID}/${P}.tar.bz2"
 	S="${WORKDIR}/${PN}-${COMMIT_ID}"
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 4d6f3f186279..6e34833f5343 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-nouveau-1.0.16.tar.bz2 629404 BLAKE2B 519ae2ddc6f895648274e10fc3b5052896734e40251dcaf35a948be051711c14054573a08192ccf15002f3a8d1e6079c982c32cf8c58e2a288c0f146155020e8 SHA512 41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0
 DIST xf86-video-nouveau-1.0.17.tar.bz2 632535 BLAKE2B 8f4a3e749dbf46f6723f65b7bdffdf32e40fb194a18cb9951af297d7c3bcc34cc4ee6eed4687c42a385c259f37d1438ca7c9eda7594a3426704b358e1cda36fb SHA512 adba58ba5298d1a5b3f9f8540f9ef2cb2e10e47bba8e374103ec2e1f92e915f5f4393ed0021168cd649646e12315135a1efcdf77e8fb1648e1295914d87279b2
 EBUILD xf86-video-nouveau-1.0.16.ebuild 616 BLAKE2B 3123d1d141ed0287b812f170c2a8e02e167b6f25a23c145870054e4bf4a3e35e1a0004ed66bf1c31d0a626cf5fe21a3000cd2c75cabcc417d3c6a92446303b86 SHA512 cf22557c666182ae9e8d954007b5f5eb23a7eb24deedf16fbfae1c89d98cbb4f66367fd6c2d3e8d7d6f26fce13a446ce8f6107fe2bb7f7541af184b28c282547
-EBUILD xf86-video-nouveau-1.0.17.ebuild 620 BLAKE2B 4277a95ef77d9225b4df952a1848dbeea75fa15f6d172b6482085578fa5d35e806624bf2cfde6df8529a9181e0f032f7c9db7a47bac2d11cff366baeb5b89adc SHA512 f35a8532457f415be1fb41f39fe5ddbb8ab71210821c802e43ea1cf9bad8ad29decdeeb81223853c20f492e92ca088b1b3264b96584574b05fcc21490b4cdd4e
+EBUILD xf86-video-nouveau-1.0.17.ebuild 618 BLAKE2B 18fce987f45115101ad50303749ba9ca40a4812bdd8846c7690598de12258920fe70751a3eef9b9636867afcba9423a85cf00908d2e2ceea51408c3685042e3d SHA512 393df42f73ece27f6e5e1a8f482938d3327239001f89890e9bc61b37b0bc9a72f32f25b6861a159fb40e9b3fbe07e47665ad819b97dc75c041f9e94720a46aef
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
index eec86bc056e4..2c1883d6e115 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ fi
 DESCRIPTION="Accelerated Open Source driver for nVidia cards"
 HOMEPAGE="https://nouveau.freedesktop.org/wiki/ https://cgit.freedesktop.org/nouveau/xf86-video-nouveau"
 
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]