gentoo resync : 17.08.2021

3 files changed, 42 insertions, 7 deletions

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index e6b423de7316..3abf5b76450f 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,5 +1,6 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
+AUX cantata-2.4.2-main-musl.patch 1196 BLAKE2B 13272e8b73aa97d4bac7b81de362dc9b58fc79e576f94fd8f314249072d3d32e83113f8cf7c1126d4af02f27c0cc025217a33665d36f4a75bc6e5dc664a7dcaf SHA512 23d22e126ea39739c67331b3db3a17d61bb4d0a462273c6bd7e652c8ca421fe3d15e264e3f752c6b0b6a7349753bd4396e061e5280fce2e7a26b2058453e4dcd
 AUX cantata-2.4.2-solid-musl.patch 1035 BLAKE2B 43b0f3312e93f8fe92b56dd488a70c815f448b6907ae1db3418f65aaef394f06ffb82279c483185cc4cde74081b28a0bba3b92c8c5a29f2fff2d3ff5ab510d67 SHA512 eb34e0939500b9176829347329ed508f0ba08e92cf450b949661a103782385cfd9175551cd8f0832799ebcf116c89cca98fad4eaa236729c38c1724b5b981221
 DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7 SHA512 c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b
-EBUILD cantata-2.4.2.ebuild 3074 BLAKE2B 9b296e832b7436de60c1a7966cdf8e81190eef8558b611e5ca0ef26c16445ab3143cb88d93e25a5f2974aed623911b6ef5f094bff610d8f029fd484db38e7364 SHA512 8f70c086d37c4d708d8013819df44a468efe62e35c017dc5ee381ac7724161528d4d0764ec6d8416553838056012e317448cb8acf1d91ba18166e5d98de3219c
+EBUILD cantata-2.4.2.ebuild 3122 BLAKE2B 5b63451d54fc89b3bf5d73248cf52f907b144899fbe807811d790d2e1c3ff715cb858938be19203bef55eed785f867ffb8466a3130ab90f93bf6215d04f9e595 SHA512 eab98c659bd6cf62ca4e2399336c0daf91b4a64f53289d9069c8d016a41c21ce80e3cf626cfbcfa5a3517352978b07594b59af63e9325fb57b6886a53cc67f9e
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.4.2.ebuild b/media-sound/cantata/cantata-2.4.2.ebuild
index 19e2a7c4abd3..0b6da7338566 100644
--- a/media-sound/cantata/cantata-2.4.2.ebuild
+++ b/media-sound/cantata/cantata-2.4.2.ebuild
@@ -23,10 +23,9 @@ REQUIRED_USE="
 	musicbrainz? ( || ( cdio cdda ) taglib )
 	replaygain? ( taglib )
 "
+# cantata has no tests
+RESTRICT="test"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
 COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -62,13 +61,14 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qtconcurrent:5
 "
-
-# cantata has no tests
-RESTRICT="test"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-headers.patch"
 	"${FILESDIR}/${P}-solid-musl.patch" # bug 792555
+	"${FILESDIR}/${P}-main-musl.patch" # bug 807763
 )
 
 src_prepare() {
diff --git a/media-sound/cantata/files/cantata-2.4.2-main-musl.patch b/media-sound/cantata/files/cantata-2.4.2-main-musl.patch
new file mode 100644
index 000000000000..492dc815854a
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.4.2-main-musl.patch
@@ -0,0 +1,34 @@
+From d837de8669a2c0eee835d81d9105e21172c8efc0 Mon Sep 17 00:00:00 2001
+From: Helmut Pozimski <helmut@pozimski.eu>
+Date: Sat, 16 Jun 2018 10:01:19 +0200
+Subject: [PATCH] Fix gui/main.cpp build with musl
+
+Picked from VoidLinux:
+
+https://github.com/void-linux/void-packages/commit/188bc4852af59e20f60b186e7acaaaa4b8ce51ab#diff-413d61b1a38989fbf79759fb57901b99d629706587f21aa4b1b19fb8ef23fd4b
+---
+ gui/main.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gui/main.cpp b/gui/main.cpp
+index 3424e94f7..f3851a0ef 100644
+--- a/gui/main.cpp
++++ b/gui/main.cpp
+@@ -266,7 +266,7 @@ static void installDebugMessageHandler(const QString &cmdLine)
+     qInstallMessageHandler(cantataQtMsgHandler);
+ }
+ 
+-#if defined Q_OS_LINUX && defined __GNUC__
++#if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
+ #include <execinfo.h>
+ #include <unistd.h>
+ #include <signal.h>
+@@ -346,7 +346,7 @@ static void sigHandler(int i)
+ 
+ int main(int argc, char *argv[])
+ {
+-    #if defined Q_OS_LINUX && defined __GNUC__
++    #if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
+     signal(SIGSEGV, sigHandler);
+     #endif
+     QThread::currentThread()->setObjectName("GUI");