gentoo resync : 25.11.2020

3 files changed, 73 insertions, 25 deletions

diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index a07e51accc83..9b89cf4051ed 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,5 +1,5 @@
 AUX musepack-tools-465-fno-common.patch 659 BLAKE2B 603213fe4c979b4a79b9a2103117eb63e3b90933119cbefef32c18c3523d24c6f0eca8beea685d1ef6effb3bec82e53004bdaeed2062a2a14f4a1e7bb398fd97 SHA512 239b353380d534f09fb381520eb29b919cb3f69ac51be8a813e67338de928c91c99c249b6a5b27f297cd0a741b7c10e7c61171b4bd42b5016402b52efa00cca0
-AUX musepack-tools-465-gentoo.patch 1558 BLAKE2B 292111fc2b795a98cc2c1926b63799114e4b6ea2c11aa9ddee78c24332181ac9d5c4ab403398470014b5f33cf246def98214026d0def5979e11df2a1e2747050 SHA512 c260e1f96fa4ab79f09d78f16ede4522a802f703d565cf6db974b918e8db48233211a561ce64e0e8bc7cbd177ebf2986c46e5c9811ac15515f8126458c15b0af
+AUX musepack-tools-465-gentoo.patch 2982 BLAKE2B 0783de2ac04e77d8ff337e3ed52b09174e6268aaa9a1c2709b65343753880437b42af8fd17fbf1361811bdeb5caed625f78fa8440c7ccbddbdf80b827da3374e SHA512 5eee2985b4a3201e6d93d24e7cd9244d7e7f64208ae80656cdd6932d3adee2403e14e17ede45a83071a5c5bf21aa938e4786267a2c4b3118053c900aa18b2105
 DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
-EBUILD musepack-tools-465-r1.ebuild 867 BLAKE2B 3e2e6ef1d0059aeb0f184fccbc750bc684a6cb4687a7fd2b48363f7a9979b89f5bb2e1455e31fa05a0ff1dcd64b97d820b0170592b438853999b908d12e97b45 SHA512 63540e27bd3deabc966c14a2c3bc5a726e2844602a38abfc8310a9b83862873198f8650212dfff51c4f9de317ea49616346c1d6999a9c90738bd56cd1fd6515e
+EBUILD musepack-tools-465-r1.ebuild 857 BLAKE2B 33b98c1579e40beb7b48cdd2060fc18059f0f2b5144d8e4bfcd5aec1abec5e0fbdd29749e92ab8e6d1099a6e8ce010ca02537da63ec3a98f7e9679dbcda6596b SHA512 2c9315102a948846f8b4d5014f5923175c704a6c447cdb16603b8f18b1c552f124e7af9ee86ce393e3fabf20abb5d4ec2cbd6386271b15831bc29759398507ad
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
index 51df29910742..5c80531d96f4 100644
--- a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
+++ b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
@@ -13,28 +13,79 @@
  add_subdirectory(libmpcenc)
 --- a/libmpcdec/CMakeLists.txt
 +++ b/libmpcdec/CMakeLists.txt
-@@ -1,7 +1,22 @@
+@@ -1,7 +1,15 @@
  include_directories(${libmpc_SOURCE_DIR}/include)
- if(SHARED)
-   add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+-if(SHARED)
+-  add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
 -else(SHARED)
 -  add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
-+  set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7)
-+  if(NOT MSVC)
-+    target_link_libraries(mpcdec_shared m)
-+  endif(NOT MSVC)
- endif(SHARED)
+-endif(SHARED)
  
-+add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7)
++if(NOT MSVC)
++  target_link_libraries(mpcdec_shared m)
++endif(NOT MSVC)
 +
-+set_target_properties(mpcdec_static PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1)
++add_library(mpcdec_shared STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
 +
 +if(NOT MSVC)
-+  target_link_libraries(mpcdec_static m)
++  target_link_libraries(mpcdec_shared m)
 +endif(NOT MSVC)
 +
-+install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
-+
-+if(SHARED)
-+  install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
-+endif(SHARED)
++install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
+--- a/mpc2sv8/CMakeLists.txt
++++ b/mpc2sv8/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ if(SHARED)
+   target_link_libraries(mpc2sv8 mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpc2sv8 mpcdec_static)
++  target_link_libraries(mpc2sv8 mpcdec_shared)
+ endif(SHARED)
+ 
+ target_link_libraries(mpc2sv8 mpcenc_static)
+--- a/mpcchap/CMakeLists.txt
++++ b/mpcchap/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ if(SHARED)
+   target_link_libraries(mpcchap mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpcchap mpcdec_static)
++  target_link_libraries(mpcchap mpcdec_shared)
+ endif(SHARED)
+ 
+ target_link_libraries(mpcchap mpcenc_static)
+--- a/mpccut/CMakeLists.txt
++++ b/mpccut/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ if(SHARED)
+   target_link_libraries(mpccut mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpccut mpcdec_static)
++  target_link_libraries(mpccut mpcdec_shared)
+ endif(SHARED)
+ 
+ target_link_libraries(mpccut mpcenc_static)
+--- a/mpcdec/CMakeLists.txt
++++ b/mpcdec/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ if(SHARED)
+   target_link_libraries(mpcdec mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpcdec mpcdec_static)
++  target_link_libraries(mpcdec mpcdec_shared)
+ endif(SHARED)
+ 
+ install(TARGETS mpcdec RUNTIME DESTINATION bin)
+--- a/mpcgain/CMakeLists.txt
++++ b/mpcgain/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ if(SHARED)
+   target_link_libraries(mpcgain mpcdec_shared)
+ else(SHARED)
+-  target_link_libraries(mpcgain mpcdec_static)
++  target_link_libraries(mpcgain mpcdec_shared)
+ endif(SHARED)
+ 
+ if(NOT MSVC)
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index 6c28404bd48e..e7f1c0e71931 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -16,18 +16,15 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
 DEPEND="
 	>=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
-	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]
-"
+	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
 	!media-libs/libmpcdec
-	!media-libs/libmpcdecsv7
-"
+	!media-libs/libmpcdecsv7"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gentoo.patch"
-	"${FILESDIR}/${P}-fno-common.patch"
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )