gentoo resync : 05.02.2020

4 files changed, 18 insertions, 3 deletions

diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 12c3d49da5a3..e8e0b8463699 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -3,10 +3,11 @@ AUX xmms2-0.8-rtvg.patch 1539 BLAKE2B b359db6f477f0ca6a8e528645f731ccb33ec13067f
 AUX xmms2-0.8DrO_o-waflib-fix-perl.patch 1693 BLAKE2B 6057da2c8493ea7887ea03322d16d45ca0726174e7deb1a64f76b289fdeaba02c7659944803a23d7a32a0a74de7a39de1404d5566b43dd3306004a29876af038 SHA512 0f7f86cebd0ff75ed53366776f8c93abb54adf5942f53d7424183a4bd6913b73493882d4d3caadba6a959ddf22da0a22fa53d0fc18ce5b8508eb5670482e8c92
 AUX xmms2-0.8_p20161122-be-hash.patch 1075 BLAKE2B 7c9678016751b207a5ef48c0f7963bc0a2e3e99fb461e52b5745bc5e2dde6c329bb358e58802c127aef96d5912e22a7df7a64f719286e9cf7787703765c4b18f SHA512 051e22907315bb6bda201497e1c2ef84d919fc7d39aefac187b3616c5f6c41e768cdd79cfe197fbadfdda3863f9e9c96b5f72fa07d5e1655451328cde8ba5781
 AUX xmms2-0.8_p20161122-cpp-client.patch 2326 BLAKE2B a59da287dafafe8a3a177c11673eb7de5918fc6efef2e32c707832d7ea202091493e41f907f3e2dc370cd34d990571eed1d274fddf05f715dff7462973fb802f SHA512 095f2878afe9616bc7982037c0a9b0cc610164e04d116d40fe138df0280160680c19f6bf5c2f9aed6e9d31d42ee2f310570aefae28872ee15496f886d20ee2e9
+AUX xmms2-0.8_p20161122-gcc-10.patch 222 BLAKE2B a198b2e69081253f299ff1c7f94f0a2d3572a31caf4b7ec7de20e8d9a9bc404c58a98b31f0da6560034fe09599ae2e9f03b97728f45ad2fc30061b384c9fb13d SHA512 44685777b04e46e236104a74e654162a85b5c76c9838572921cc78b4775a7c2d5127566202415bfab10bb17261e242b034dde8aaf44024b66daa55a150ed1352
 AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af18269b784360bbbcaef33b1db4b880704f88e8dad06168e3737a43fcdb71ba722da1ffb5ba77f3f61ecf07674e1ad0988f5a SHA512 d2fe5f9a0c59205c787386e7b219c3fa9a334c30787b9a343214cc1c4dbf9f5d47f5dad9b2efd7deac1e96a227c827cc66198215a89b0e788c9d856cff51b16b
 AUX xmms2-0.8_p20161122-perl-no-local.patch 697 BLAKE2B 86ab6bb3594fd45e9a9bdbd07d85d3740ed206eea24652161c7fbbdf620c98a6b002b646aba65a3f017e263bb82d6dc7b933fb53540012c2005d65dd2e667b06 SHA512 eb5afb39409c7c199a844d9452ab829a653d2a1ce8f5d9f1361fa995e851914d5a962d25d8116947a265fabc649f8560aa1947a24cf45d954da7743954fc3cd7
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r4.ebuild 7594 BLAKE2B 6e1893817399a44acb7b22b9212d853e437933a6c5d01ca976eba7d1befec1c969d908973cd8ea3fa040ca2e8594eb85fbe543a86e5220a9471a0c5dc2f523f3 SHA512 ff89979cb00f5c88914b1cb7fd2a960a7f8f58598973e490151942a29f980b08f0baf5312a9463743104aac63ef25aca4591e5d4b8ca8b86ff85846fa618cedf
-EBUILD xmms2-0.8_p20161122-r5.ebuild 7721 BLAKE2B 4e2a5cde7a143bc7ba5d495b2c085c105d869fc76bb07d5e9f07eb929c83a3acd4bba1b3986a37141c39859867d66b8c4125aa5bb784b27c2b33d5324a7cfd29 SHA512 d10ba3643ee6db0091dced8fc482f21bda8335ee19ec2256e1376bab8e810a3077dbd9d42c9fa1ab8d7c3b5a9e32a51b1a7e3ed8f7d05b3fb0c57293c69aaa59
+EBUILD xmms2-0.8_p20161122-r4.ebuild 7595 BLAKE2B 934c3be5d48d1333599023aa8ce0fb8cd871a5c48a4c03a8f1b49d8efb0199c793d19c0d1b01d946bc4d5f6ad8bfcb27dc846d02d733c980fe810bd774b17b82 SHA512 2db0d45b99a0090c9636dcabb0a23c40b85aba2e9e481bee6a46ae052f805fbb5e62c90f0938d5a541ea76735f7f2dca734d3c2b9db7da455266f3ad67a10db9
+EBUILD xmms2-0.8_p20161122-r5.ebuild 7816 BLAKE2B 643ab2642018795f535563cf4ea086303ad0ab71781b189e275218672cf1ee9cab4de46ff2949886870b78e868d0545dccdcb8b33a6bcc01085c0513b1be2ab3 SHA512 0b3ddec472458764b7b8fe4df551d56548652554c90fb2740d35444f449c5d7c0a23fa7c444fa3b8d7160e4e6749439fffdf8e6a603a0c7f2e4d51416c4752e2
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
new file mode 100644
index 000000000000..29a8311d2197
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
@@ -0,0 +1,11 @@
+--- a/src/lib/s4/tests/s4/t_transactions.c
++++ b/src/lib/s4/tests/s4/t_transactions.c
+@@ -19,7 +19,7 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ 
+-s4_t *s4;
++extern s4_t *s4;
+ s4_val_t *val;
+ 
+ SETUP (Transactions) {
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
index 55cdd371a14c..b5150186d945 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc x86"
+KEYWORDS="~alpha amd64 ~arm ppc x86"
 
 IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
 jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
index 68f9fc6c4c2e..393d601eabd9 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
@@ -143,6 +143,9 @@ src_prepare() {
 	# C++ client dangling reference: https://github.com/xmms2/xmms2-devel/pull/5
 	eapply "${FILESDIR}/${P}"-cpp-client.patch
 
+	# gcc-10 stopped putting globals into common section
+	eapply "${FILESDIR}/${P}"-gcc-10.patch
+
 	eapply_user
 }