gentoo resync : 02.02.2022

7 files changed, 286 insertions, 29 deletions

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index f7951a300261..0ba7e3c6dd65 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -2,9 +2,37 @@ AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e3
 AUX mixxx-2.2.3-qt-5.14.patch 17550 BLAKE2B 3f5c16106bbda8e45f1180ef6f2323a3786ddb11f9a355fac57c545d71a1f5080ef39665011d41b4500643a4e33340851bb3d849d381874e4abf9ac42a18e85f SHA512 677d8e832aab28f21c2641b1a94fce6fa43d652ba76b580a8a7cb7911dc5e5fb788cdcf7825906e7894d90198433f96e421531af4e65bd7d16a8b16fcb68fb54
 AUX mixxx-2.2.4-fix-scons-compat.patch 744 BLAKE2B ffadce18947d538a8f614bc3c53f7e4da5020f2ef87b06e258d864a33fee64f059db5789eff0ad5524161bcbc93565fc5af58e546eff913c5305c5f23871707a SHA512 29bb141ac45fb89cf84018fe1b7ffacbe856d1d2aa6e2eede49b699dd9541f8a25bebc7d3945f6ce044b2a65f134d43142279ef9dd2a2e87c6300e5591634b52
 AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8
+AUX mixxx-2.3.0-cmake.patch 556 BLAKE2B 2757a1c72f4ad052aacd17fba1934a106c34971ac3fb0af2b3a65ebc0eacdcc9809949697aaba6166ae45ab1876a4cc6e6759eb90317efff73b8ab629b506078 SHA512 277fe726ad2d656f97a7350bf6e32bc77b93fb5d6ccddf5bacb7cfa35a9e78dd772b9823097b672ce6a0a4ef8d62222629a375b77ed6cd4e3d201593833d6252
+AUX mixxx-2.3.0-docs.patch 626 BLAKE2B 73eca9849d69112edd254bd28329b360c31434eb1a4bcb626ca9fcfc0b00dee2c9f9d81d83302fbe0718be9e5a47a1748835013f20398eeb4e50c5e81b78a172 SHA512 2de279b48463d214ef7c9da58c58fb10d0fb300afe80b01e1981f4df15a5f7da1079b53ca1422dc0d69da8a367fe4693ba002a351e57f95fa1b24d5ec7fb12a4
+AUX mixxx-2.3.1-benchmark_compile_fix.patch 220 BLAKE2B 28c5a7fe5e6e465bd7d9445e741d366341fadcb8d142961cf25d6b57aabcc453f74cbb0d3f63b01df5e65e7151a9e59545c50b52e732234ae6a734eb171cef82 SHA512 d301a87760a0162a9e09e08dd544183219776c61d2810d75c37d39a9ac9fcf8a329681e53ca922864ccafeb98231cbeea565db2196e56bf62417a09b40bae4b8
 AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
+DIST mixxx-2.3.1.tar.gz 39977210 BLAKE2B 08edfe19f5d0f16072762c3800e34ff37dcad478bde04356b0aae6a02ab99b115a5d1e8a33846f7f142228860bb5b19ded16b52dd464e4738462f6634b9fd6be SHA512 17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcccccda3062f5b4f1f550722c5033c516e046816
+DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 0572da067016d6fd1a0e955cfa9daad319e633357532bad1143333a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c SHA512 965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
+DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76 SHA512 648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
+DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86 SHA512 fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc
+DIST mixxx-manual-2.3-en.pdf 34055279 BLAKE2B 1d4dac58d1d51dec0868f584b7c338a0f5889811c8c1770f89fb86a8ff25c189f68e58c39fb8d279622df1ae5955c3d5d476026976ea4c2144f1d264e0026273 SHA512 ae050aac9d10767de4f1793b9147a85cb41b2070d4747e50b4e17308dd6a4a54e049559473bb1c1dd0dcf0c50a51a649fd2e70aebde78139073adb4068e0ac77
+DIST mixxx-manual-2.3-es.pdf 34063874 BLAKE2B 9a08615f7f01051c01585b967ca82829e264335462874b42bab4314079d1cc08dd5678472403451dde83bd57097be0f827d1e15b4cfe6567a96e817403eea942 SHA512 0bfb5d45a950e08120856ebbd4af771ae4da646a5d77994f2423166b3f9c8c8c90087ccf7eb6ccd81d596867f351ea935623b7299d077d587e1265c7ecf196c1
+DIST mixxx-manual-2.3-fi.pdf 34061528 BLAKE2B e7408e8efec4fab095f6e46f8c25ec0410895cf3d4fac6e11b7ad048d27fa6226b5516c9fba5428f357bf979d7878811bbb719490675da20a06190a6b93e775d SHA512 70fa602c2c90c629a0b5b671f63ffff0110e8945ed76c7e9fe5b09ee167bb75e6a73d1d7c0a23ea30736710555cd1626c4c313cd45436488d3ecd254e245cd58
+DIST mixxx-manual-2.3-fr.pdf 34104354 BLAKE2B fd9b0c2d3a2705018771ca2ad4e609ec6a4a969148dc711bee4bd829f60a71713277cd94d0d95c6ca080a2c75233c7e395532aa816b1e2150c2fe45fe8242364 SHA512 cf8f9a0559845f1d4540d2a27ffa8b251e85aab6408166b352416f357ea045387ab8dd60c746b99c7d84eaf708f8d173bc16d4b92ebf726042b7aea59d3c460d
+DIST mixxx-manual-2.3-gl.pdf 34059337 BLAKE2B 27cc942a0fd9994c573913e246d833e5014b535d152c338d18cd30d3f4f6cf2ffaf782a076862a7df638d0c7b2b61fb23dee61fa51f0cd3e4a4abed47ec48843 SHA512 17460fba1e754018b67d010fd529218b26a0218cc22c3da3ad92db837c5e5cc7d81ae463b168e965a296fff7fb790ee1e04a8228b5596450027cec12bb445a1e
+DIST mixxx-manual-2.3-id.pdf 34061075 BLAKE2B 382d72e6429a83586f1b32779d2abef3a4610688b4bbd194568d4561f8df9d388dcb18cdfe3fd005a79cfca1ea32c948531d7964524d3195c65686d9eff11483 SHA512 231b5e8e617b714095952350dcf84ad5038d37a3e15071f32a827917c8a74bdf16aa529e7832eb46b12169156c30665365c6d4e354ec85a523641fb83d06ac07
+DIST mixxx-manual-2.3-it.pdf 34065113 BLAKE2B 44c7cb83d17c3529096c3f94eab77a9cd6d09e2b33032042efcb8ba776fcf02cb298c5cd6e029bf33c1cd1f3a5239540a2e071cd091960bb3ce8e356fb9f7448 SHA512 d899171401fa5bc3b20b78997aa80cd806c7c2a901ff3e05204c819a7c039d460d09bc29276e862718e84db2e0c2875155b4bb20320b323668a971fc99a5fcdd
+DIST mixxx-manual-2.3-ja-JP.pdf 32835197 BLAKE2B d4fffe0297abaef128fabb14bbead429cf6ee0249b7a7679af88e5cbde606a2ec5f2f2f6fa587efa4fb8f37ebc5559af2e39dca67c20098f12a0442079248ed3 SHA512 ddb288925ceb759ecb33820326d400f5c5fa02a7e8905c5d84b374c6d3eb646fe0da738aa617c787bb9787d0b9be538ef123cb016c5ab0dfd12d77685717ae04
+DIST mixxx-manual-2.3-kn.pdf 34058121 BLAKE2B 9d33e5c2c4f2a4d558968b9af495263dbe817ccc9aeadac947e5eec738d658b303ace613bf9824fae4a5c7de4040ecfea66092bc4dea9306fed610abfc1dd5a9 SHA512 e09a231d17f0c69a95df89112c75ed0a683783d4b1561c575f6ea7b9cc16e0129ba4aa7bd1968ad33cd068826bd9b2ac7bd986b5e9ba99251b87fd618f906cc3
+DIST mixxx-manual-2.3-nl.pdf 34060208 BLAKE2B ccecf45483bfe42691893d68abe8955d57af03116a44e5d4aed506686ec9e77113e424b0eca0e1e9cecefac281749cfba2bc273c0c3caf9da5acf0f2070fdf03 SHA512 5329383a9be0ab39110efc11cd6c3465fc7e57d830b46bf7065a44b1dff330406367f249a9da36a898b26979464ecb68baa1f3e08dad18aba087a0e659048d74
+DIST mixxx-manual-2.3-pl.pdf 34067404 BLAKE2B d50af6a710b1e08a67742bbb97d5c62127ca63508344c6986b5ceede39a58203f950516c6ce9b6a8df00dedc9231e216f63dfe268ec23a204cf67d51809a90a9 SHA512 9fba40e45913e56fb64f3071a0255b459c58a882306ed62e06ed358b8c8a2f209184d55b6f833bd5fdadeb85e0be73b3fa1b8a9ba5093368a0fec384a35a4be1
+DIST mixxx-manual-2.3-pt.pdf 34062564 BLAKE2B 13bdfd9ecf376a6fd516bbacd382956628338c1da77354a8d946c53f4c66828726d50c0fdc26294034853db42daad7bc448aaa3bbac676f82117d1fe68d7cbf4 SHA512 ce73a8bb92832e446bbd6e4ed177455011b0be3210ff11a31dcb2ba6d3c9c7e97495cb34ae1bec30d31be939ea396af70106b61c7b3262c1afdce489e79c8739
+DIST mixxx-manual-2.3-ro.pdf 34067722 BLAKE2B 70cc517f0926fe1bc867d723a0bffcf6dedc75ef0e5cda0ab1a1294f28aad45fdd8f0a9373573ae2d1466a7832710c621cd1c84f692733ad2262e1c98f669872 SHA512 57b60df38aca9000d73bdd1a58c4bb5633340f37d284e6f92921216ac09d38a53415dafc374e43fbffbe2cf528299a61e744db96ab6aa808e11bc30dbc4f8c1d
+DIST mixxx-manual-2.3-ru.pdf 34024493 BLAKE2B d3faca1606cf155ecbf8215d9e0ab94167ff5e536a96625679993000186b02c41d9867490808458d1bd00fd837817a6ddc5e9c5286ef2c71d2ea0aec48e562bc SHA512 9c4abaccb3f6ff452d6d356853a4ba4cf4bd7bbfe9314edcf3c8adf8ff2902445c8ec377cdd3ef97acca1e2a2dccc453f670c2abbfc69cf43a2ab05ac2040bf9
+DIST mixxx-manual-2.3-sl.pdf 34102881 BLAKE2B d7bb7470b7d0164ce7c5ad6341889e465afc2d3e1f79fd57dd708ff2170cb6f7e65773f1977b512caebee41d0313891be7e684f386d176673bfe577f20a3ed4d SHA512 c2f79073b2e3c5afc45f48076314cbdde5a2b60e359e688ff7d1b2c7550c3b2ab4be7a1ab601e4a3b58506e0f86aad9e4ae21b1beb7e3eee067572e6114d60bd
+DIST mixxx-manual-2.3-sq.pdf 34074464 BLAKE2B 2ea7e6b58f821a1969a2bfe167c6045ec4410ef3f87edbabbd28fd304ec2bed1d76591452f08fe3ce627bff9e8bd1ffd70fb80fd66cdf6fc992a7e70800cea7f SHA512 c7d702dde88f4c5607c8fbacb7a89f68f3b42b1a16ae15e478a6ee2165eeee1739d7195ef201cc84b81ab668103a553f12ad9e49b055a34c01ead4f0fbab07e7
+DIST mixxx-manual-2.3-sr.pdf 34079603 BLAKE2B 83ed178b8b095928138c853b530017631621c3c77dcf9944e9ebf6a4bbbcd0202e5aafae9bded76d6c6fd464d8faf7803e16fbb298c597ba59224c8cefab4d56 SHA512 6fd07e473348fe93fc0bf68cd05ae8c78e9a624e48422480b7723952a067489cd72d90f0752f91e3c343e3caae57660b0721a6c947db3c3fb83591373f0829f2
+DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0104d509f76c0569f99348d17131926a564d7e43a73d34036c5a94be4b61a37645e7933b1dea2513c6d72d5d25334fc SHA512 b05f297f3000767e2a8a2319e56f0db73981418943a96d0822f4f3f51f29bbb5667cc0b487ef328f1d6d115013af705371668ef3081321b6980ea95834a40895
+DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
+DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
 EBUILD mixxx-2.2.4-r1.ebuild 3354 BLAKE2B 6be93d4f897357f38bc65d5e0f4a3a6c42c9a701e1e0e452d2549b40eeac346fe7bcb7f0f3cc803db8cdb248e8d894ec70c165e7a86c28dedd0a1036fc09d63c SHA512 5f4cd8ef58b8eec7c608bdc796d393e28c9b397df58a74acf78ed530c85702708953135522f7546b259195e007b914a935c53b8ebf6ee6a96d34b3af5516f19b
-EBUILD mixxx-2.3.9999.ebuild 2740 BLAKE2B 1fc346b62b137915adf3b992ffdddbc1c3ed9eec8b8e854e2f8894b00616c6bade501b856fc40b5061909499209be642b7e0dbd90dbe83ca9a6018dc5d63acb5 SHA512 1f07442ea9b628b1e7dfce44735b570db611725fefdc4d9015e01923050dae3dfd95fb4d34d24ea91e42ac71b8750fc425f6f00ee6a991445755369048ad2e26
+EBUILD mixxx-2.3.1-r4.ebuild 3761 BLAKE2B aab85ed765d52e6ed9796fec1d3afd70cb2b65866c6f050d2132137070654943a94b89d3fd0685aace7f442d01716f0360a91772a24071cc8b1e97330814e805 SHA512 b21b6910cf4a183afd7585d884979a49e9d7afa4ca0dc07477acb3dbce6da3af8395080d73089277d9fee94926f4a8ff2d9ae4e77896a462d0d7a06e4856be02
+EBUILD mixxx-2.3.9999.ebuild 3667 BLAKE2B a110809c0f831aaa12707c87a3befe96898a4ede480b141684af14ee651c7af97ab36e827ae35a729388b8487d08d387a2d94de6589202dc0f911ec775569dda SHA512 0ef19fd437b1c957d31470ecbefd1fa38a4596479f73f96a4da903c4457c0892dc833f34b5d4ecf1fce7e580ed7d1a39c4d7e5ffe8042d3bfd3b3ec1ce10c582
 EBUILD mixxx-9999.ebuild 2740 BLAKE2B 1fc346b62b137915adf3b992ffdddbc1c3ed9eec8b8e854e2f8894b00616c6bade501b856fc40b5061909499209be642b7e0dbd90dbe83ca9a6018dc5d63acb5 SHA512 1f07442ea9b628b1e7dfce44735b570db611725fefdc4d9015e01923050dae3dfd95fb4d34d24ea91e42ac71b8750fc425f6f00ee6a991445755369048ad2e26
-MISC metadata.xml 850 BLAKE2B 988b0e86bb646e484fb395996aa389e416dc000fc9b46665638f52391f4c24ecf04a8b8efa8f64bac66f3ed994f65db9f87de2c08d4301e3021308cf073122f2 SHA512 7673654ee70e239937c65fc597b744893085e7b1d8b4901d0ea28764933bfe317bf98615b2beb85236f6fd34d51ab67a27a5cd5e6c7f4e0c17e78ff7b07294f4
+MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8
diff --git a/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch b/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch
new file mode 100644
index 000000000000..b573a624d31e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.3.0-cmake.patch
@@ -0,0 +1,11 @@
+--- mixxx-2.3.0/CMakeLists.txt
++++ mixxx-2.3.0/CMakeLists.txt
+@@ -53,8 +53,6 @@
+     set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Choose the type of build." FORCE)
+     # Set the possible values of build type for cmake-gui
+     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo")
+-  elseif(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo)$")
+-    message(FATAL_ERROR "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} is not supported, use one of Debug, Release or RelWithDebInfo.")
+   endif()
+ endif()
+ 
diff --git a/media-sound/mixxx/files/mixxx-2.3.0-docs.patch b/media-sound/mixxx/files/mixxx-2.3.0-docs.patch
new file mode 100644
index 000000000000..e956e1ce2401
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.3.0-docs.patch
@@ -0,0 +1,26 @@
+--- mixxx-2.3.0/CMakeLists.txt
++++ mixxx-2.3.0/CMakeLists.txt
+@@ -1320,23 +1320,6 @@
+     "${MIXXX_INSTALL_LICENSEDIR}"
+ )
+ 
+-# Documentation
+-install(
+-  FILES
+-    "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Keyboard-Shortcuts.pdf"
+-  DESTINATION
+-    "${MIXXX_INSTALL_DOCDIR}"
+-)
+-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf")
+-  install(
+-    FILES
+-      "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf"
+-    DESTINATION
+-      "${MIXXX_INSTALL_DOCDIR}"
+-  )
+-endif()
+-
+ # Additional Linux-only files
+ if(UNIX AND NOT APPLE)
+   # .desktop file for KDE/GNOME menu
diff --git a/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch b/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch
new file mode 100644
index 000000000000..2ab50c85309e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.3.1-benchmark_compile_fix.patch
@@ -0,0 +1,10 @@
+--- mixxx-2.3.1/lib/benchmark/src/benchmark_register.h
++++ mixxx-2.3.1/lib/benchmark/src/benchmark_register.h
+@@ -2,6 +2,7 @@
+ #define BENCHMARK_REGISTER_H
+ 
+ #include <vector>
++#include <limits>
+ 
+ #include "check.h"
+ 
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 6cfda3f97a3e..38deddc8020f 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="hid">Enable HID controller support</flag>
 		<flag name="keyfinder">Enable musical key detection support via <pkg>media-libs/libkeyfinder</pkg></flag>
+		<flag name="modplug">Add libmodplug support</flag>
 		<flag name="lv2">Add support for Ladspa V2 via <pkg>media-libs/lilv</pkg></flag>
 		<flag name="qtkeychain">Enable Secure credential storage support via <pkg>dev-libs/qtkeychain</pkg></flag>
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
diff --git a/media-sound/mixxx/mixxx-2.3.1-r4.ebuild b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
new file mode 100644
index 000000000000..fff5c84c8171
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.1-r4.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg udev
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	if [[ "${PV}" == ?.?.9999 ]] ; then
+		EGIT_BRANCH=${PV%.9999}
+	fi
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libebur128
+	media-libs/libid3tag:=
+	media-libs/libogg
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/libvorbis
+	media-libs/portaudio[alsa]
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	media-sound/lame
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	virtual/udev
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	hid? ( dev-libs/hidapi )
+	keyfinder? ( media-libs/libkeyfinder )
+	lv2? ( media-libs/lilv )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	qtkeychain? ( dev-libs/qtkeychain )
+	wavpack? ( media-sound/wavpack )
+	"
+	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
+	# available in ::gentoo
+	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
+	#shout? ( >=media-libs/libshout-idjc-2.4.6 )
+
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+BDEPEND="virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0-docs.patch
+	"${FILESDIR}"/${PN}-2.3.0-cmake.patch
+	"${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch
+)
+
+PLOCALES="
+	ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW
+"
+
+mixxx_set_globals() {
+	local lang
+	local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 1-2)"
+	for lang in ${PLOCALES} ; do
+		SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )"
+		IUSE+=" l10n_${lang/ en/ +en}"
+	done
+	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
+}
+mixxx_set_globals
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Not available on Linux yet and requires additional deps
+		-DBATTERY="off"
+		-DBROADCAST="$(usex shout on off)"
+		-DCCACHE_SUPPORT="off"
+		-DFAAD="$(usex aac on off)"
+		-DFFMPEG="$(usex ffmpeg on off)"
+		-DHID="$(usex hid on off)"
+		-DINSTALL_USER_UDEV_RULES=OFF
+		-DKEYFINDER="$(usex keyfinder on off)"
+		-DLILV="$(usex lv2 on off)"
+		-DMAD="$(usex mp3 on off)"
+		-DMODPLUG="$(usex modplug on off)"
+		-DOPTIMIZE="off"
+		-DOPUS="$(usex opus on off)"
+		-DQTKEYCHAIN="$(usex qtkeychain on off)"
+		-DVINYLCONTROL="on"
+		-DWAVPACK="$(usex wavpack on off)"
+	)
+
+	if [[ "${PV}" == 9999 ]] ; then
+		mycmakeargs+=(
+			-DENGINEPRIME="OFF"
+
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
+	dodoc README.md CHANGELOG.md
+	local locale
+	for locale in ${PLOCALES} ; do
+		if use l10n_${locale} ; then
+			dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
+		fi
+	done
+}
diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
index 8b5963df7ac6..73bd3177b918 100644
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,28 +7,25 @@ inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == 9999 || ?.?.9999 ]] ; then
+if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
+	if [[ "${PV}" == ?.?.9999 ]] ; then
+		EGIT_BRANCH=${PV%.9999}
+	fi
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
 else
-	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-release-${PV}"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-release-${PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
-
-if [[ "${PV}" == ?.?.9999 ]] ; then
-	EGIT_BRANCH=${PV%.9999}
-fi
-
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
+IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack"
 
 RDEPEND="
 	dev-db/sqlite
 	dev-libs/glib:2
 	dev-libs/protobuf:0=
-	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -48,11 +45,12 @@ RDEPEND="
 	media-libs/libsndfile
 	media-libs/libsoundtouch
 	media-libs/libvorbis
-	media-libs/portaudio
+	media-libs/portaudio[alsa]
 	media-libs/portmidi
 	media-libs/rubberband
 	media-libs/taglib
 	media-libs/vamp-plugin-sdk
+	media-sound/lame
 	sci-libs/fftw:3.0=
 	sys-power/upower
 	virtual/glu
@@ -68,15 +66,21 @@ RDEPEND="
 	hid? ( dev-libs/hidapi )
 	keyfinder? ( media-libs/libkeyfinder )
 	lv2? ( media-libs/lilv )
+	modplug? ( media-libs/libmodplug )
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
 	qtkeychain? ( dev-libs/qtkeychain )
-	shout? ( >=media-libs/libshout-2.4.5 )
 	wavpack? ( media-sound/wavpack )
 	"
+	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
+	# available in ::gentoo
+	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
+	#shout? ( >=media-libs/libshout-idjc-2.4.6 )
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
 BDEPEND="virtual/pkgconfig
 	dev-qt/qttest:5
 	dev-qt/qtxmlpatterns:5"
@@ -85,34 +89,51 @@ PATCHES=(
 	"${FILESDIR}"/mixxx-9999-docs.patch
 	)
 
+PLOCALES="
+	ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW
+"
+
+mixxx_set_globals() {
+	local lang
+	local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 1-2)"
+	for lang in ${PLOCALES} ; do
+		SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )"
+		IUSE+=" l10n_${lang/ en/ +en}"
+	done
+	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
+}
+mixxx_set_globals
+
 src_prepare() {
 	cmake_src_prepare
 }
 
 src_configure() {
-
 	local mycmakeargs=(
+		# Not available on Linux yet and requires additional deps
+		-DBATTERY="off"
+		-DBROADCAST="$(usex shout on off)"
+		-DCCACHE_SUPPORT="off"
 		-DFAAD="$(usex aac on off)"
 		-DFFMPEG="$(usex ffmpeg on off)"
 		-DHID="$(usex hid on off)"
+		-DINSTALL_USER_UDEV_RULES=OFF
+		-DKEYFINDER="$(usex keyfinder on off)"
 		-DLILV="$(usex lv2 on off)"
 		-DMAD="$(usex mp3 on off)"
+		-DMODPLUG="$(usex modplug on off)"
 		-DOPTIMIZE="off"
-		-DCCACHE_SUPPORT="off"
 		-DOPUS="$(usex opus on off)"
-		-DBROADCAST="$(usex shout on off)"
+		-DQTKEYCHAIN="$(usex qtkeychain on off)"
 		-DVINYLCONTROL="on"
-		-DINSTALL_USER_UDEV_RULES=OFF
 		-DWAVPACK="$(usex wavpack on off)"
-		-DQTKEYCHAIN="$(usex qtkeychain on off)"
-		-DKEYFINDER="$(usex keyfinder on off)"
 	)
 
 	if [[ "${PV}" == 9999 ]] ; then
-	local mycmakeargs+=(
-		-DENGINEPRIME="OFF"
+		mycmakeargs+=(
+			-DENGINEPRIME="OFF"
 
-	)
+		)
 	fi
 	cmake_src_configure
 }
@@ -124,8 +145,11 @@ src_compile() {
 src_install() {
 	cmake_src_install
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
-
-	if use doc ; then
-		dodoc README Mixxx-Manual.pdf
-	fi
+	dodoc README.md CHANGELOG.md
+	local locale
+	for locale in ${PLOCALES} ; do
+		if use l10n_${locale} ; then
+			dodoc ${DISTDIR}/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
+		fi
+	done
 }