gentoo resync : 28.11.2020

15 files changed, 103 insertions, 119 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 565fe7950366..6daf6c11d202 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/gmtp/Manifest b/media-sound/gmtp/Manifest
index 89393ce6517b..4e2688e59f4c 100644
--- a/media-sound/gmtp/Manifest
+++ b/media-sound/gmtp/Manifest
@@ -1,4 +1,4 @@
 AUX gmtp-1.3.11-fno-common.patch 11945 BLAKE2B 7a8f75b3780f9e8f4dfd0e9c5be29f21f261b4baf95a9a543db9c73d3bebdff485734eb009e4a4edd1079e4f6410051d0b3f651d9996b788a108f44257e4b915 SHA512 0350366fe1abf48f0929351c12b2d891fcf874df29d327f8b8926538efd8263b402371f11ecc77c4a23d6cf12bf6ce7a3bfecdb518115fe48304028d30fe4870
 DIST gmtp-1.3.11.tar.gz 498198 BLAKE2B 870f27712425328febcda0899b821bc5c8324c07bca50d7bf9f2bd78849e1f73968da4f5c2860e154d19c16ea184cd6a1715f198347356734dd815d7d2aca780 SHA512 af6e56136c227818aab19f9eb0a0ad9f1356b24e8a8aa44d600326d632bfcb0dc2794a7c28809f2de2016a52045c1cc5c2bdae0391a0a970ea04e947f920bc95
-EBUILD gmtp-1.3.11.ebuild 814 BLAKE2B c9efebe5fe60f5df2d621ddd63ba14a3a3108e55c6bb8fae8081f0f44359a8206436209c82cd4180ab02e7db2ffb5d11acc8a196bff76fc5571b618b3befe365 SHA512 e05e336ead2b83b5efcd4d94facbe6be61e79629552a0fac6355610c97db42d79c0d404f4da20b823a259baa4dacd73cff14ef1d9deccf1eb78330a7d760250d
+EBUILD gmtp-1.3.11-r1.ebuild 815 BLAKE2B dc882ef24006b4326dc513f24b7b07612566118368bc2d53f0b62ef1fcb445e9aadd6b8b719abf8bcbb6dc14bfaa368604f788ef68b7895370cdc5fc94799985 SHA512 a3290045ac52af088d6d1adabfcb635b7511c115102acd473592b1076b403a326fe90ecd589a018cb6d96486e1602cd8eeacc831a4a055305ced3b456b40c556
 MISC metadata.xml 506 BLAKE2B 84107fa98c343254e61b433946b77be39abb9975736672bad91c9b61831f073aa3402046b946fa56dcab49413d4937480f36586ddcd9dfe8ecae23c09a0ae306 SHA512 ad86ce322da7b9459e597a94d03de3e3ec81d072646bf9fa98a4ad31e904f584c6a70cb82aaf7ec00feeca503818452109fc80cb9eebdff781b701ada830dac5
diff --git a/media-sound/gmtp/gmtp-1.3.11.ebuild b/media-sound/gmtp/gmtp-1.3.11-r1.ebuild
index 0565860ce4e8..9dc541fb70fd 100644
--- a/media-sound/gmtp/gmtp-1.3.11.ebuild
+++ b/media-sound/gmtp/gmtp-1.3.11-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	media-libs/libvorbis
 	x11-libs/gtk+:3"
 DEPEND="${RDEPEND}"
-BDPEND="
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 7af706de6c04..ff07accbde1d 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,6 @@
 AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
-AUX hydrogen-9999-i18n-path.patch 457 BLAKE2B dde2e8b80ca79f52c05a2512d2d07333cb118c96da92326716533c27908fd68dfb5159a8015a2e3347bb20cc7be96217bba09ec1833cdef06d4d3c2ace8d4aae SHA512 85f974df6d490650562a34dbb4dc126d6b67c85bdf1e91303967714738999a9299e64fdac3492d1b7da4bbccfb1773972888840f54327dba3b4efb0671023841
+AUX hydrogen-9999-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
 DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
 EBUILD hydrogen-1.0.1.ebuild 2111 BLAKE2B 115614e67d1001f2af423710998ee7340838baee2cf67c4289edbdf0ab5ff4423721c2923a7f66b71087ba917dd00c6ca022ca3ce3e69e5fdd7f359701653697 SHA512 c91594162fc4787dfcbafac06985fc2be98370ec773c6284ebe9b822dadb45e70db7ffb66a198653b441e05c42eb7b9b1fb15d12c30c4feca8d59d6b9519e65b
-EBUILD hydrogen-9999.ebuild 2133 BLAKE2B 129548ab21f33bd626ea3b7235ff61471142038109998683dff4aa98884b4fbab2b71c4088297f3ec06924d98eabad62852d58ad2fedb11b49e2a0cd76bd23ee SHA512 5ab310fa51b3a856441b5c332957838aa1725b7da740781dcf56c3a8ab8a08e6760b99a4b9c70ccfa35c741dd6a9bd1fb7e955d18771c4ff2d5fd8551cf32053
+EBUILD hydrogen-9999.ebuild 2090 BLAKE2B 196825b644e659eb72da75ceb97293dfc84014fed26c85df7fe0960409ea3de9df7704ef66480befa4f71619697be4ae892dbd6105ccbec5542f82aac9776b88 SHA512 582742d6990b81e662c315f71012db91df51c1a6b274e0e831b3bdd89d0cfc605192e9d36a7ee5b04c423309735721c0cb3079e457148db1898d1a58dcc2f0c6
 MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
new file mode 100644
index 000000000000..ef70497abf72
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 04aa6380..e979783e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -362,10 +362,10 @@ ELSE()
+ 	INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
+ ENDIF()
+ IF(NOT MINGW AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
+ 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index cfdc72a7..b7b0dbcb 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION}
+ 
+ IF(NOT APPLE AND NOT WIN32)
+     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/core DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
+-    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
+ ENDIF()
diff --git a/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
deleted file mode 100644
index 3c32e2b3e621..000000000000
--- a/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/data/i18n/CMakeLists.txt	2020-09-07 09:31:57.481066097 +0200
-+++ b/data/i18n/CMakeLists.txt	2020-09-07 09:29:27.612763184 +0200
-@@ -5,4 +5,9 @@
- 
- QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
- ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
--INSTALL(FILES ${QM_FILES} DESTINATION "./data/i18n")
-+
-+IF(MINGW)
-+	INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+ELSE()
-+	INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
-+ENDIF()
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 87e5b809fe3b..aa141dadf063 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -58,8 +58,7 @@ RDEPEND="${CDEPEND}"
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-i18n-path.patch"
+	"${FILESDIR}/${P}-gnuinstalldirs.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index d800cdcee755..0f7ebe0a1e3b 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -1,4 +1,3 @@
-AUX snapcast-options-for-use-flags.patch 2583 BLAKE2B 4ad94f7c2d796017047645dcc74bd04209817dcf6c96c05cf92a130af2c5239761325f25a0bf8ebd65c6d1221f3ba248b93eb98c22ad278c06bca46c8e27d056 SHA512 84be456467309c2c040526dfa1847e65fdec2c59d7ba917416d10ece0d7173d53ce11c2fed2a566fb3157e58757ea21500464c46abff18e57dfb092c18450932
 AUX snapclient.confd 641 BLAKE2B 74bae4c2c11fb7c1a7d4f2bd0f199c92a5ee11f68efb71da00026816f9dd7ba3555cc96c1e68be04dce26ea190a8e353c71817b5655ad2d9b43e3e510345c97b SHA512 f0adfca9354a4f5acb2def99585409e39229053e2b9be36309a67ac0b6935b1aeb061380a9e8a61d70bd902930536ec3afa98a6a708b08008eea1eb080fd1a5c
 AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd987fa51e9885f4968b0144106883a1a48e502c3e3558ca408babd38c46663b13ee56215caa108c3be SHA512 f429dfef7abd5705a8afc38f68125a7a6e5a812cd68733c8f47a65c7fb6aa22fc665c91e557726b8f35edbaced7b2e72ffad0ba123a6ed33bf8a6d333e8c1bae
 AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
diff --git a/media-sound/snapcast/files/snapcast-options-for-use-flags.patch b/media-sound/snapcast/files/snapcast-options-for-use-flags.patch
deleted file mode 100644
index 956d6299d457..000000000000
--- a/media-sound/snapcast/files/snapcast-options-for-use-flags.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 52fec6e..d068db1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,11 @@ option(BUILD_TESTS "Build tests (run tests with make test)" ON)
- option(BUILD_SERVER "Build Snapserver" ON)
- option(BUILD_CLIENT "Build Snapclient" ON)
- 
-+option(BUILD_WITH_FLAC "Build with FLAC support" ON)
-+option(BUILD_WITH_VORBIS "Build with VORBIS support" ON)
-+option(BUILD_WITH_TREMOR "Build with vorbis using TREMOR" ON)
-+option(BUILD_WITH_AVAHI "Build with AVAHI support" ON)
-+
- 
- if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
-     message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
-@@ -109,10 +114,12 @@ else()
-         endif (ALSA_FOUND)
-     endif()
- 
--    pkg_search_module(AVAHI avahi-client)
--    if (AVAHI_FOUND)
--        add_definitions(-DHAS_AVAHI)
--    endif (AVAHI_FOUND)
-+    if(BUILD_WITH_AVAHI)
-+        pkg_search_module(AVAHI avahi-client)
-+        if (AVAHI_FOUND)
-+            add_definitions(-DHAS_AVAHI)
-+        endif (AVAHI_FOUND)
-+    endif(BUILD_WITH_AVAHI)
- 
-     add_definitions(-DHAS_DAEMON)
- 
-@@ -154,29 +161,39 @@ if(NOT HAS_CXX11_STRING_SUPPORT)
-     add_definitions("-DNO_CPP11_STRING")
- endif()
- 
--pkg_search_module(FLAC flac)
--if (FLAC_FOUND)
--    add_definitions("-DHAS_FLAC")
--endif (FLAC_FOUND)
-+if(BUILD_WITH_FLAC)
-+    pkg_search_module(FLAC flac)
-+    if (FLAC_FOUND)
-+        add_definitions("-DHAS_FLAC")
-+    endif (FLAC_FOUND)
-+endif()
- 
--pkg_search_module(OGG ogg)
--if (OGG_FOUND)
--    add_definitions("-DHAS_OGG")
--endif (OGG_FOUND)
-+if(BUILD_WITH_VORBIS OR BUILD_WITH_TREMOR)
-+    pkg_search_module(OGG ogg)
-+    if (OGG_FOUND)
-+        add_definitions("-DHAS_OGG")
-+    endif (OGG_FOUND)
-+endif()
- 
--pkg_search_module(VORBIS vorbis)
--if (VORBIS_FOUND)
--    add_definitions("-DHAS_VORBIS")
--endif (VORBIS_FOUND)
-+if(BUILD_WITH_VORBIS)
-+    pkg_search_module(VORBIS vorbis)
-+    if (VORBIS_FOUND)
-+        add_definitions("-DHAS_VORBIS")
-+    endif (VORBIS_FOUND)
-+endif()
- 
--pkg_search_module(TREMOR vorbisidec)
--if (TREMOR_FOUND)
--    add_definitions("-DHAS_TREMOR")
--endif (TREMOR_FOUND)
-+if(BUILD_WITH_TREMOR)
-+    pkg_search_module(TREMOR vorbisidec)
-+    if (TREMOR_FOUND)
-+        add_definitions("-DHAS_TREMOR")
-+    endif (TREMOR_FOUND)
-+endif()
- 
--pkg_search_module(VORBISENC vorbisenc)
--if (VORBISENC_FOUND)
--    add_definitions("-DHAS_VORBISENC")
-+if(BUILD_WITH_VORBIS)
-+    pkg_search_module(VORBISENC vorbisenc)
-+    if (VORBISENC_FOUND)
-+        add_definitions("-DHAS_VORBISENC")
-+    endif(VORBISENC_FOUND)
- endif()
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 7144cc863d9e..0aaf63fac5a0 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,10 +1,10 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.5.3.run 97454216 BLAKE2B 228542b7b5169bd4bc86f320f7d9b4e099d088db9bb5c944b7b1e9d029b8c505a50447468fb02bb2b5e34c0f3a4e088a1af2bab466a7ec71e128541fabe9b562 SHA512 8b0ea835b179596ec16c092790383691650f6cb92b97d4ab2012872edc2f4d82e0b3a3ea4551651c4824703b9ef01ba9c95a50ee262d5f279151d780dc3faef6
-DIST TeamSpeak3-Client-linux_amd64-3.5.5.run 97478893 BLAKE2B 4007613a04ef0d42521d7ce2f1ff26924e7fd8a5b3f4da87749365bd866c2cda245b5a013394c9f50248e61361ab86fddf79baa138b1c5bb52acfbab730a5c6c SHA512 0082464460860897519643f292323fb38e7739a62338bc38dfb9443d7f5582be929bfd82bd3cbe3c5b04979d9a146dc58c51c70bf7359dfbcc6f828fcdac95c6
+DIST TeamSpeak3-Client-linux_amd64-3.5.6.run 100152301 BLAKE2B 9fbaa32ac000c9e29e09dcb1c932acea45265d5cf464308d6f27063fb3095690f3cb96abb061ce947438a4b919dcbaf8f3f0189048b470b09bb2b8285e426e39 SHA512 fe1b41773d2b2de8198fdaf189c6665994eeaf6a0255485f7d342a3e77702f5515d5c5c685410a0b5844b4ad5c395d57b68e57c7b1f46bd1211ef813ce1e0030
 DIST TeamSpeak3-Client-linux_x86-3.5.3.run 95939656 BLAKE2B 5aec52b4461d45cd19947e3f87729a40bca23bc78d45565bad59a1f11b437e253f0bf073ad32ca1a43396b8bcf47794d0efb0673ec0b7314e3dd5c2a0dcdb140 SHA512 54a6d7ad03a357a78be71710e7878b9b5c0a54d175bf4242a35ba82df1abfa692dc4d4c921099677c5d163caf18b68db73a87b8637b216ef5c72eaa25b6deab7
-DIST TeamSpeak3-Client-linux_x86-3.5.5.run 95960042 BLAKE2B 221b3dc69b35e959160d0941abd7bdf1103bc160ee5cf739ae61bfe8ca855997a708eb3e1feff5113b247b371526968272d68c4a84a8a4aea788c21108b09ef4 SHA512 7aa8e8da9c0be6ad9d52ef4cf500ce6cd4c56d2660f39075455951a556c92c03d44b76d8f9c79a612e1c1120191047d6e11d917c21f0010d65b9daa18cdeb435
+DIST TeamSpeak3-Client-linux_x86-3.5.6.run 98637555 BLAKE2B 6f891e6846f8f899edb8ef107b7ea6518f413488525b7696863292d99d73614cae40631f5ed2341cce75ea62ffd94c60968ff6b5d587446d7469271835c01202 SHA512 dfc5ed3e2a92ed9f1cea2fdde5e40cf73e4a999ea782c434b26072ac0e7ac37d6305c06ae2d39c104eeee10639f325c7b96f538082e60224a68c0553fab0d12c
 DIST teamspeak-client-5.0.0_beta32.tar.gz 111368604 BLAKE2B 85771c2e7078bf4a25073b66295a8629911a7ed6fcfce17840130abe26e79565df306756928edd7439e0bc8800071a126187cc184b7f9beda15334af2e14acc7 SHA512 ac806deb1c001da01d76ddb07babc8bbde45bebaa5fab0cf2359ccc043036f1d882bfbd973be2cd184451681c297224f3437c89f72212ce10112a42bb46a823b
-EBUILD teamspeak-client-3.5.3.ebuild 2889 BLAKE2B 0b35da3a0914574bbad363e0546f49af1a3d8518e0605767caea4d114718e9657968b6c1a5e498fea6e94cca60925222e5837e83211b8092c0466558eb190acc SHA512 62d27eb4da0f1a16de6ab1164e4dcb2c45b3a4b1f85ba667b556f6b2d6e642499b259395543e5d4167a8f74702820f69089cfe11d11a33467274f81d7a059982
-EBUILD teamspeak-client-3.5.5.ebuild 2891 BLAKE2B 826f44d98998f69b6eb9681b3e5ba9c8f34676c15613d6836ba2dece6bc39fe51ef24e085e51a7bc9b66a9c702ba0585c6739caddf8ac7dab576f1994a1bc470 SHA512 01dd3631b09452183da44b7c6934f4b72c6e83c0ea8fc44b092b89ad01078f0fe3bb3356b11c9458742ba54384c559be4a8528dd5a6cd9d5434079461c0adacd
+EBUILD teamspeak-client-3.5.3-r1.ebuild 3043 BLAKE2B c11d9e2fa4c0dc7609db979a3efe2066fd5c9eab0fc104ca6009026a8f2566e4e9abade67968d6a9bfe8ece59ddb356c26c5198dc0a1a6405d603f3497ed7c3a SHA512 22ecee625ce5b934108f117d156714178e4909f623984733f1176f000fbfe041f0b264ed9c95dbdc2a3838d75c37cce67d61c5148f7cf1a802557812434f8902
+EBUILD teamspeak-client-3.5.6-r1.ebuild 3045 BLAKE2B 3ddc924fb2b3ac71b97f750d0f400ecc9d84f218b4d61254e59f27d5c74f810b53ac0413f4e334e0a93fd8859da73ecc80caf04932805fda96ed0d8457e438ed SHA512 af9c529b550a5dc0fe2d4172c17514d1a8f2eb4fe1da067ada8d498f537f276bf94d207c60d425bae3b99aebc944a6746d3d72e75e5b4a556c501a8e9eaf6ee3
 EBUILD teamspeak-client-5.0.0_beta32.ebuild 2076 BLAKE2B 1d950c346137e1bd0014b7e8d8f2f25a714b7baff2e60791b848ac4193b6daa832bc5e47b4d27cada76e80d970fe9e596b0e47dfa5593b9e212d735e49fd7a73 SHA512 02e62e1afa719556090692e9cc14753b292050b5fa3b5a27e3dbfced651b1c7bd058463fb9c030039bd8f7ebc400fd08b4848b661c84d474014cac8238faca66
-MISC metadata.xml 637 BLAKE2B 996d3156ecf21c789e3a7017d7922f7fae257722021bc4ff968ec3c9863df61f9631fe83e3482781f78ede7b91f2138b4510473d8654063347037031812758fe SHA512 934068091ef8dce4652021965a99d50c4df0a426a7a1d1f26adeca776a73e7f1150d976bf44b704905aa0877d8844dd5d53bfa71279f5126e00dec924f3afc5f
+MISC metadata.xml 744 BLAKE2B e5a883b78a951de65c5a0ac3ef23674fc120339531a8e10225f5049a67d42f206fce5296f41bbb329105386b2138c83385c0b3293199409ac76b92c10dd17696 SHA512 6e8688c9c36c34625b8bf8b0e2870b88a8f7df4986f2a2579c089260058022cc5177e5108e8f4616cebfcfc1c132277eff74b9d45054b6d61f87c8966dff9156
diff --git a/media-sound/teamspeak-client/metadata.xml b/media-sound/teamspeak-client/metadata.xml
index f16b483f34b4..80b2e8647557 100644
--- a/media-sound/teamspeak-client/metadata.xml
+++ b/media-sound/teamspeak-client/metadata.xml
@@ -12,4 +12,7 @@
 		The client software connects to a TeamSpeak server of the user's choice,
 		from which the user may join chat channels.
 	</longdescription>
+	<use>
+		<flag name="system-libcxx">Use <pkg>sys-libs/libcxx</pkg> instead of shipped libs.</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.5.3-r1.ebuild
index a2a578b075ef..7a9b41fc5fc1 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.5.3-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 KEYWORDS="-* amd64 x86"
 LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="3"
-IUSE="+alsa pulseaudio"
+IUSE="+alsa pulseaudio system-libcxx"
 REQUIRED_USE="|| ( alsa pulseaudio )"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -39,11 +39,11 @@ RDEPEND="
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 	net-libs/libsrtp:0
-	sys-libs/libcxx[libcxxabi]
 	sys-libs/zlib:0/1
 	virtual/udev
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( media-sound/pulseaudio )
+	system-libcxx? ( sys-libs/libcxx[libcxxabi] )
 "
 
 RESTRICT="bindist mirror"
@@ -51,6 +51,8 @@ RESTRICT="bindist mirror"
 S="${WORKDIR}"
 
 QA_PREBUILT="
+	opt/teamspeak3-client/libc++.so.1
+	opt/teamspeak3-client/libc++abi.so.1
 	opt/teamspeak3-client/error_report
 	opt/teamspeak3-client/package_inst
 	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
@@ -86,6 +88,7 @@ src_install() {
 	exeinto /opt/teamspeak3-client
 	doexe error_report package_inst ts3client update
 	newexe "${FILESDIR}"/ts3client-bin-r2 ts3client-bin
+	! use system-libcxx && doexe libc++{,abi}.so.1
 
 	exeinto /opt/teamspeak3-client/soundbackends
 	doexe soundbackends/*.so
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.5.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r1.ebuild
index 8f0015c7b7cd..f85207cfb1aa 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.5.5.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 KEYWORDS="-* ~amd64 ~x86"
 LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="3"
-IUSE="+alsa pulseaudio"
+IUSE="+alsa pulseaudio system-libcxx"
 REQUIRED_USE="|| ( alsa pulseaudio )"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -39,11 +39,11 @@ RDEPEND="
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 	net-libs/libsrtp:0
-	sys-libs/libcxx[libcxxabi]
 	sys-libs/zlib:0/1
 	virtual/udev
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( media-sound/pulseaudio )
+	system-libcxx? ( sys-libs/libcxx[libcxxabi] )
 "
 
 RESTRICT="bindist mirror"
@@ -51,6 +51,8 @@ RESTRICT="bindist mirror"
 S="${WORKDIR}"
 
 QA_PREBUILT="
+	opt/teamspeak3-client/libc++.so.1
+	opt/teamspeak3-client/libc++abi.so.1
 	opt/teamspeak3-client/error_report
 	opt/teamspeak3-client/package_inst
 	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
@@ -86,6 +88,7 @@ src_install() {
 	exeinto /opt/teamspeak3-client
 	doexe error_report package_inst ts3client update
 	newexe "${FILESDIR}"/ts3client-bin-r2 ts3client-bin
+	! use system-libcxx && doexe libc++{,abi}.so.1
 
 	exeinto /opt/teamspeak3-client/soundbackends
 	doexe soundbackends/*.so
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index cb6f36cad8a3..3a074518d62a 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -4,9 +4,11 @@ DIST upmpdcli-1.4.0.tar.gz 469357 BLAKE2B edd46e86f367ff2f88346cfb4cb249dae44630
 DIST upmpdcli-1.4.14.tar.gz 552026 BLAKE2B 0e9722d9a3c278b085416df240d3256ae1eff136f3897b181a59ce9d3edcdfd70ed7e568d8d345b1d0b13a9906f877776d9816ba3e8797c41c1684933aa326e6 SHA512 9084f60a4551fb94be915e6539d59a9ac070d55745c383b1f201c0c83262634c9e6fb353f66bb2232c493752805671b19057cbcec00c5ed128e19e1d0a037976
 DIST upmpdcli-1.4.2.tar.gz 477650 BLAKE2B 8bc2f86e8821aaee29f969e6031553f29e3224fdaf4b9c7d443f55bda5f321f36607dbb7dc0af15f0d1e7b006e93595cd1d668f9d1975e8673a80b218ea7f570 SHA512 be855214b55686422689ce786103ff50748a9f9e7e556c8dbeaa7e39e0229a3e0b56502bdbeb7071771706416cd2ff36592cb5245b505d8438f0ba75c200e9c2
 DIST upmpdcli-1.5.0.tar.gz 550268 BLAKE2B 8c9c7c3c4d3bdeb7a3a0c4ff506970d8e8ddfa8dffaf7fff525e263817088d599087843707c5154a6fb5441bccbadbee28a80a0bb85561a1418235af3ebc931f SHA512 a04e4b039d72ac8e8b6769bd4794f995f31978f2807aa8f938183cbf0d07f7b16cf9289c9f8c55efea8fa6ba54883cd87135683e524143c7cf0759decc7390ad
+DIST upmpdcli-1.5.2.tar.gz 550460 BLAKE2B e9905fb2f6c07d7374651fd0a9d7ec821d6ea25d4debe1b6e69bbf7def8b75d0b35b245a5e4ca2477832f71a9fe950f7f7635d1b6fc29add0e59405c0c69b338 SHA512 4d6cd44b64637c5a07996a416f0cf15e27e24b84aa04ee3ee9f6f5eda3164a5b964915587a4342cc0a8f95fa175dd106b99242de5c50d3cb603e48450694009e
 EBUILD upmpdcli-1.4.0.ebuild 1259 BLAKE2B f62c3642b43df9d6d6d78001d0c45aec8b3fc1e5be2fbf5843ec3a6c20f4c500a18f367c6c5abd687482d88a5e39f86d98c30f635e3d8508cc21bc6123a0f81b SHA512 6e97ea302f73f8a3f7ce05d92f06cfe5d7f0fbf9a6b872e271000392d0bd8dd8fdb4cfa96c72beec1c56f94fa7fd31531d393b77f71ab8920c4fc578ec4d9fb1
 EBUILD upmpdcli-1.4.14.ebuild 1243 BLAKE2B 4946da31fe9803e50daaa738189e4cd2ea16c40709d63273d7b1a22613dfa96d22844ca27f9f9f8502c0024c3315d8636972d69b128a3049dc67632765d1fd76 SHA512 affcd83fed4cabbe769dfab4353ed92cea177dd4a90ec05e41989ea7b611e414c768017537c096b91d9d76782f2413bbace7e9c856be1d84d622fe12ad7793fd
 EBUILD upmpdcli-1.4.2.ebuild 1270 BLAKE2B 07b16ba743c24de6ef481f8e1c519f2a082c33dbe0d537595d550be4a45fece35d162ce0c1fa11bf701628c455522cfaf46fd4ce2cf22657325f3f802bbf9c00 SHA512 1f6424cb78e18f8f36aa647c252e3321c3ed8431ab54dec916f201b0afcf50fd72abb10f8bcb19b929d37be80502dd0a9cdd5edec95fcaa103c9ddb2c6e3a9a6
 EBUILD upmpdcli-1.5.0-r1.ebuild 1268 BLAKE2B 6458a9fb1875e490e8ee5fb45a748c176c9fac2812b46b4239da1e50ccd7383471a19fe761c40a29b37289c293e9047d26ef46a2feb9fb8a8f16b4043e25e6b9 SHA512 86c8c689450786448bfe7576601e50765b73d7e8c109c7a6377e9978951a110616d7cc5d060c6e55a4b1f4622e9f0e1ae3f909c906f152ef050c98c1a2c0157e
 EBUILD upmpdcli-1.5.0.ebuild 1260 BLAKE2B f66e40d7fc617c24832fcb034ed5a12edb5314cbbf9b67204150c22602ba11288c7ffa264d914eaf859efb74e7b2f76ea487df7d96a3bf0712fbd0163f943da4 SHA512 6370ffc1419420a757a0bc1cafdb79466c6a6af3aedb682d8f15573ba4549f792c2ee41f2259b77287027e324687d3dfcaecf6e8ec6815973a88a023a4d049f6
+EBUILD upmpdcli-1.5.2.ebuild 1268 BLAKE2B 6458a9fb1875e490e8ee5fb45a748c176c9fac2812b46b4239da1e50ccd7383471a19fe761c40a29b37289c293e9047d26ef46a2feb9fb8a8f16b4043e25e6b9 SHA512 86c8c689450786448bfe7576601e50765b73d7e8c109c7a6377e9978951a110616d7cc5d060c6e55a4b1f4622e9f0e1ae3f909c906f152ef050c98c1a2c0157e
 MISC metadata.xml 323 BLAKE2B 3b9aa1c98130517f1e0d458e9e007330fea3b695192f11a02edb51c2845358353367bcc421a70965abed3996450afdac11d80dd7e54e6b115cbb3c0940830106 SHA512 1f004f9123b7924186183899cdd55ae2fb75a61ab59cd01ac077627a18d28c934716a31f1070e5cd1a2ab6faafd9994079bad87178c6e744093cfcd7d6a7673b
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild
new file mode 100644
index 000000000000..0eb2b288b4ea
--- /dev/null
+++ b/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+LICENSE="GPL-2"
+
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="thirdparty"
+
+DEPEND="
+	dev-libs/jsoncpp
+	media-libs/libmpdclient
+	net-libs/libmicrohttpd
+	>=net-libs/libupnpp-0.20.0-r1
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/upmpdcli
+	acct-user/upmpdcli
+	app-misc/recoll
+	thirdparty? ( dev-python/requests )
+"
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit systemd/upmpdcli.service
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This package no longer assumes that upmpdcli is driving an"
+	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
+	einfo "Probably it is though, so be sure your mpd is built with"
+	einfo "USE=curl."
+	einfo
+	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
+	einfo "detects sc2mpd at run-time, capabilities are added"
+	einfo "including internet radio support.  See upstream docs"
+	einfo "for more information."
+}