gentoo resync : 12.05.2022

3 files changed, 2 insertions, 47 deletions

diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index da1b5b1e6053..c9f917f88825 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,5 +1,4 @@
 DIST chromaprint-1.5.1.tar.gz 1581159 BLAKE2B 9f7f030e97d3114cf679df298d313ea826c0fb05e7e7d8a10090d0a27ed0811b380b81b29fce973e0493826c478964367396311fd0484619cb2fc4c2d8e0d4c0 SHA512 ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66
 DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
-EBUILD chromaprint-1.5.1-r2.ebuild 1635 BLAKE2B 8687c05e31d18cd12285fe6b2befc8e30f3e29c769e5c91bf3206b1593a71bc6c3d744f437d53e515dfde9b8f324cfbf643ca749c8b5d758a84160bfb29de7c5 SHA512 c38844e269f1045c4b5d3e51e1f315a1fe6dc381f3c65fd2ec19960361e3b3f4782c4b54c6fc191a3772165554cadeedceeb6df1b39bf1c4f79dd9eadf05117c
-EBUILD chromaprint-1.5.1.ebuild 1300 BLAKE2B ac5a54d0965f922f3b29e65b42a02eb47ed2707ed7cf2b338e37a3791596f7b67bd78b913fbee3613c9bf20be1180bb28da0210ad1a019216b972077113351d6 SHA512 deb96d762d15d06c584839806b1487b9088236d41e7e284ab2de4837e247053a1e6ce271b2a9c89eb2988d2cc7229eedd9515e0d90eae9c0a5732e4119e9e906
+EBUILD chromaprint-1.5.1-r2.ebuild 1628 BLAKE2B eeb24b160b059cc607771bcb04ba51d1c23520043d87cc52e41a16a46f130ac17eaa12c0ad3ab1b0d272ba7a8dac173407a7b44292d5205f0aa75e90a0f03e4f SHA512 0fc3ce04321d4b9b83238964b8fa9b7ceb07736eb8b6c13250c7fb21d5d96621fc405cfe74522331c6d91259849c0601c245b26aba6b5434eb1299b73f5b03d6
 MISC metadata.xml 503 BLAKE2B badb1250c59d72306e528508fe7016028a5aec5f349ad050437ba4c818ed0fc9d63efcdab5774b5ad94956067fe4243f6f4aff5423e25a2ac9685e147590d976 SHA512 b10104402e9b04d904a9ef4e6876bb52764ccf4a0b38b1f5ef7b5b9534737e64b285bfafdb3e9f7582fc21d0204f52014cd7eea6e22c8097ac46f15c111971c3
diff --git a/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
index a3f156b7c867..123873b60767 100644
--- a/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/chromaprint/chromaprint-1.5.1.ebuild b/media-libs/chromaprint/chromaprint-1.5.1.ebuild
deleted file mode 100644
index 77fd5792ba01..000000000000
--- a/media-libs/chromaprint/chromaprint-1.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-GTEST_VERSION="1.10.0"
-GTEST_DIR_VERSION="1.10.x"
-inherit cmake-multilib
-
-DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
-	test? ( https://github.com/google/googletest/archive/v$(ver_cut 1-2 ${GTEST_VERSION}).x.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="test tools"
-RESTRICT="!test? ( test )"
-
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND="media-video/ffmpeg:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-
-DOCS=( NEWS.txt README.md )
-
-multilib_src_configure() {
-	export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_DIR_VERSION}/googletest/"
-	local mycmakeargs=(
-		-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DFFT_LIB=avfft
-		-DAUDIO_PROCESSOR_LIB="swresample"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cd tests && (./all_tests || die "Tests failed")
-}