gentoo resync : 20.03.2022

3 files changed, 3 insertions, 70 deletions

diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index dfbdcd8bc072..cf82c4b8467f 100644
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -1,4 +1,3 @@
 DIST spandsp-0.0.6.tar.gz 3309837 BLAKE2B 6ee95501473d5758c9ff96580bb51222f49a230dc6a5f52f5a852781cbb70079bb07f9d7224f5c7ea91c0dd617fa543a37518f68875c76a44b3be1415aece696 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4
-EBUILD spandsp-0.0.6-r1.ebuild 1835 BLAKE2B 679bda38200fc9e1360fef7b7b9cf3347bb58a365c05c9a3c66062e36d0864f9d6f02f24d3ce9156a5582a3511616bde1486bb57889068cbf92b631a4cad8768 SHA512 0dfe3554992ffd2e6d304c1a1e1318ee122cb33254c0db2a904514f18155930f1a1c33074bd31d594d3ad79e3af5eb314292b0839ec42d83fc58ca9f9cb0aca9
-EBUILD spandsp-0.0.6.ebuild 1990 BLAKE2B 7665e0a1e4003e7f6c70331fdee881615df879f1f32272dbc8ff81ec53a4931a65cd458febf6e03ca700c4392f820858a7ca0b8f73f9f059e620266e3417a93e SHA512 9502da0b5fd038cdb6ed8e4f368ae1e6fc45d78ebe106f324653ed70b3be613da6f86a7b003050fcf920dcb52be4b6f63cf7a37662f12071fb0cdcf574a9af61
+EBUILD spandsp-0.0.6-r1.ebuild 1829 BLAKE2B 625aff01bdaca673461c6d2474fbdaeb3684b2e61a9a37479b321d255db5769106db200ac91c26c198c47c8bf6a5802773e88a50b12f6db980305e6af0962325 SHA512 f97a6ccbd7990e9611055ecadf7359edf8bd67bab8d5ece11be467af63428a5ed804c5dcf733595b06e46fc3c5f1489249a3506cf22612069e0668239346bffd
 MISC metadata.xml 244 BLAKE2B 55f7bb21fa829b545045078abd465615b8e8d3ba8ce19e1acf7466d14d45d695d771d9d78983749f8e0290166f3eab703ea332169a4fda45427ad4baa6ff8512 SHA512 2dde78e90a526f069d855081163e58cbcd9cd9e0429eb1615c9ef8bc5af93bcea4d145333feedd8adcf8421e3417c7ebf0b03b98227cad03431f20cb014f080a
diff --git a/media-libs/spandsp/spandsp-0.0.6-r1.ebuild b/media-libs/spandsp/spandsp-0.0.6-r1.ebuild
index 84eb7d57d4a6..89e857946a38 100644
--- a/media-libs/spandsp/spandsp-0.0.6-r1.ebuild
+++ b/media-libs/spandsp/spandsp-0.0.6-r1.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=8
@@ -9,7 +9,7 @@ SRC_URI="https://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3"
 
 RDEPEND="media-libs/tiff
diff --git a/media-libs/spandsp/spandsp-0.0.6.ebuild b/media-libs/spandsp/spandsp-0.0.6.ebuild
deleted file mode 100644
index f5989411a1b1..000000000000
--- a/media-libs/spandsp/spandsp-0.0.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib versionator
-
-DESCRIPTION="SpanDSP is a library of DSP functions for telephony"
-HOMEPAGE="http://www.soft-switch.org/"
-SRC_URI="http://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs"
-
-RDEPEND="media-libs/tiff
-	 virtual/jpeg"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		dev-libs/libxslt )"
-
-# Enabled implicitly by the build system. Really useless.
-REQUIRED_USE="
-	cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse? ( cpu_flags_x86_mmx )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-# TODO:
-# there are two tests options: tests and test-data
-# 	they need audiofile, fftw, libxml and probably more
-
-src_configure() {
-	# Note: flags over sse3 aren't really used -- they're only
-	# boilerplate. They also make some silly assumptions, e.g. that
-	# every CPU with SSE4* has SSSE3.
-	# Reference: https://bugs.funtoo.org/browse/FL-2069.
-	# If you want to re-add them, first check if the code started
-	# using them. If it did, figure out if the flags can be unbundled
-	# from one another. Otherwise, you'd have to do REQUIRED_USE.
-
-	econf \
-		$(use_enable doc) \
-		$(use_enable fixed-point) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog DueDiligence NEWS README
-
-	if ! use static-libs; then
-		# remove useless la file when not installing static lib
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	if use doc; then
-		dohtml -r doc/{api/html/*,t38_manual}
-	fi
-}