gentoo auto-resync : 15:04:2024 - 12:04:02

6 files changed, 2 insertions, 181 deletions

diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 21b9c527d2f9..95b747d939f5 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,10 +1,5 @@
-AUX musepack-tools-465-fno-common.patch 659 BLAKE2B 603213fe4c979b4a79b9a2103117eb63e3b90933119cbefef32c18c3523d24c6f0eca8beea685d1ef6effb3bec82e53004bdaeed2062a2a14f4a1e7bb398fd97 SHA512 239b353380d534f09fb381520eb29b919cb3f69ac51be8a813e67338de928c91c99c249b6a5b27f297cd0a741b7c10e7c61171b4bd42b5016402b52efa00cca0
-AUX musepack-tools-465-gentoo.patch 2982 BLAKE2B 0783de2ac04e77d8ff337e3ed52b09174e6268aaa9a1c2709b65343753880437b42af8fd17fbf1361811bdeb5caed625f78fa8440c7ccbddbdf80b827da3374e SHA512 5eee2985b4a3201e6d93d24e7cd9244d7e7f64208ae80656cdd6932d3adee2403e14e17ede45a83071a5c5bf21aa938e4786267a2c4b3118053c900aa18b2105
-AUX musepack-tools-465-musl.patch 435 BLAKE2B 71eb34c0525d72048962e2dba1a24e6ff34b93e5e88554d7050dde195f98f57f3a0a7286e3dadf257b1a861af6ca73c7ffa8fa6789d32dca250e78f40798de55 SHA512 f18421dd7fcef088365abef24ad7d3877c04dd40e38b551ca5d8a3a1828d1644935924cb8c012ae484cbd72666b88468b6bf803a982154afe6a5ac9b29b6bfd6
 AUX musepack-tools-495-fixup-link-depends.patch 3083 BLAKE2B 8876c1500f17effef4efb9f2e22eecc3f8934239dc89262ebcee2a5187c93cebd6868703cd82a2ba888f71b17c6941c4bb65a5d18da549e110d1ea6c6b08a3de SHA512 c598252279b51e2ee04a4975a6dea8406f29c53ac980ccfd1838f1bd67cc96d55dee5b0527436aa2ebb7e331ad9a19de734f128538274eb8406e48b0346121bb
 AUX musepack-tools-495-respect-cflags.patch 644 BLAKE2B b49a7309329719b56a2522afbbd57a18e3d02585787b73dc82721e9c63cb04c964fd41142bcfc1d12a79e23875bfa897c184749942a2cfe6a15f6d2e12c4a38b SHA512 d0faf6490039612339f06f47ec76dfcab7065aee86b8e189ed446314a3699c94aacfda97e35922d3df916d87e99e078ac381e6064cfcd3217b40fbe8d74d54fb
-DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
 DIST musepack-tools-495.tar.xz 148820 BLAKE2B 19e104339fddee49f7082095767228f9ad297e442532c6170c48f7d7ded9df3ce7e2f2afc446055cae4140e7fa0ec52bf5b72d216c2bf932cebf74847fe939e0 SHA512 11e7590280216e4d8706d659be9f9faa25deeb5b1831e03edf7c4615fff06c1c817bc20fb5d6c3f7efd7ccadbb22b32d37ea8070aeb8c126f18e4d67e81c7e1c
-EBUILD musepack-tools-465-r2.ebuild 966 BLAKE2B b95a600a04183a689c71e428f522e6b0cd9d1225c9242e6d2f234839e62d9a9c3fa22d96ec20c66b1a5315fe6a3e992583a1f24dc260430efe4d9fedc310b835 SHA512 a9e4f433305de95a16a562c634e77ae02cf1da8ee0231c64ef159c03c7731a7d694a68309c6e3d546503b455faffac4d4d38be264a31e1da1fa6d323bca975ce
-EBUILD musepack-tools-495.ebuild 1120 BLAKE2B 2ee58f5beadb96ca69e2ae49edd34567af71471becbba4576f02ffa360906be4973ecb979073dfdbd4441f205f2b551bba09b228a74f28e6cc4846809374687d SHA512 c0854419a9cc153fad425100ccb91d5152c2a2a8f47681456bf10b384178554fcaea3de9a07294c0613bfe7b60700fa3849e54ba6bdd68f802c2ad931c23171f
+EBUILD musepack-tools-495.ebuild 1115 BLAKE2B b541a4fe5c2a5e1d896007f288a31e561df9f632b3298269af54c45cf97e6e2ad8e8d9f66fc61fe5fb9f4c2194855c8535f40376e739accb4b68da99050649de SHA512 91909c1bfb9408ee331bdd4d58f92fd9a8bafbf3b1b3c2dd0c8ee4825fdb57a2f707910c78aed3799d399048d93df5d161afcda65407470304be6de556259eb6
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch b/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch
deleted file mode 100644
index 0fb9f5e5eb55..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/706992
---- a/libmpcdec/requant.h
-+++ b/libmpcdec/requant.h
-@@ -47,9 +47,9 @@
- 
- 
- /* C O N S T A N T S */
--const mpc_uint8_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
--const MPC_SAMPLE_FORMAT __Cc    [1 + 18]; ///< Requantization coefficients
--const mpc_int16_t       __Dc    [1 + 18]; ///< Requantization offset
-+extern const mpc_uint8_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
-+extern const MPC_SAMPLE_FORMAT __Cc    [1 + 18]; ///< Requantization coefficients
-+extern const mpc_int16_t       __Dc    [1 + 18]; ///< Requantization offset
- 
- #define Cc (__Cc + 1)
- #define Dc (__Dc + 1)
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
deleted file mode 100644
index 5c80531d96f4..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,10 +15,6 @@
- 
- add_definitions(-DFAST_MATH -DCVD_FASTLOG)
- 
--if(NOT MSVC)
--  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe")
--endif(NOT MSVC)
--
- add_subdirectory(libmpcdec)
- add_subdirectory(libmpcpsy)
- add_subdirectory(libmpcenc)
---- a/libmpcdec/CMakeLists.txt
-+++ b/libmpcdec/CMakeLists.txt
-@@ -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)
--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)
--endif(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)
-+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)
-+
-+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_shared m)
-+endif(NOT MSVC)
-+
-+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/files/musepack-tools-465-musl.patch b/media-sound/musepack-tools/files/musepack-tools-465-musl.patch
deleted file mode 100644
index f7fb0f771082..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-465-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Bug: https://bugs.gentoo.org/712978
-
---- a/mpcenc/keyboard.c
-+++ b/mpcenc/keyboard.c
-@@ -84,6 +84,8 @@
- #  define echo_on()   (void)0
- # endif
- 
-+# include <sys/select.h>
-+
- int
- WaitKey ( void )
- {
---- a/mpcenc/mpcenc.h
-+++ b/mpcenc/mpcenc.h
-@@ -50,7 +50,7 @@
- # include <unistd.h>
- #endif
- 
--#if   defined __linux__
-+#if   defined __GLIBC__
- #  include <fpu_control.h>
- #elif defined __FreeBSD__
- # include <machine/floatingpoint.h>
diff --git a/media-sound/musepack-tools/musepack-tools-465-r2.ebuild b/media-sound/musepack-tools/musepack-tools-465-r2.ebuild
deleted file mode 100644
index 96d1eb23372f..000000000000
--- a/media-sound/musepack-tools/musepack-tools-465-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-# svn export http://svn.musepack.net/libmpc/trunk musepack-tools-${PV}
-# tar -cjf musepack-tools-${PV}.tar.bz2 musepack-tools-${PV}
-
-DESCRIPTION="Musepack SV8 libraries and utilities"
-HOMEPAGE="https://www.musepack.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	>=media-libs/libcuefile-${PV}
-	>=media-libs/libreplaygain-${PV}
-"
-RDEPEND="
-	${DEPEND}
-	!media-libs/libmpcdec
-	!media-libs/libmpcdecsv7
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-musl.patch
-)
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/860882
-	#
-	# Software is dead since 2016.
-	filter-lto
-
-	cmake_src_configure
-}
diff --git a/media-sound/musepack-tools/musepack-tools-495.ebuild b/media-sound/musepack-tools/musepack-tools-495.ebuild
index 5e4e5278a51a..0c09918a1fbe 100644
--- a/media-sound/musepack-tools/musepack-tools-495.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-495.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	>=media-libs/libcuefile-477