gentoo resync : 15.06.2021

3 files changed, 2 insertions, 48 deletions

diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 8efbc03a050c..049baac46ac7 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,5 +1,4 @@
 AUX opus-1.3.1-libdir-macro.patch 359 BLAKE2B 901a1f09417bb962b3268a1d9a85cfc356df9c67b05452e31599c37cf9c0a2267c50e6b9bd820af2445d54a290d4170492bff692566c01e9b1841ed755b9c020 SHA512 ec9643035203e70589eeed1079cf4da7af548fc1e2f8f30645217042e6adb3f9e0f874dcbd96ad49c07637abb3abca94c201cfc7dd41ad1d687ecbc00320eb2c
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
-EBUILD opus-1.3.1-r1.ebuild 1074 BLAKE2B 4d6be4549fe213a1b4b96459e5d857ba914dcaf6ddfdc8d75cdd76aa0d1263dbc4a22c0fbe1c58429ad0ca6be90c73d0fa942efce2b4b208225fa9c78294410a SHA512 af67ca539e73422a6b9e0d96e6a0cc3dcca168214409a4f9711e737a6bade78786594f2284807718a54b659e9d90e2d3507f9c3f69306173fa7819acc9f07a2c
-EBUILD opus-1.3.1-r2.ebuild 1311 BLAKE2B 68e5e037c067e594dffb053e58492549a2d0c41239c69e0956a8e10bb8d9e2e7e30d8dab251982dfe450dcf78a55ddb13f3b9080f7e52e07353ebe7785d7ad3b SHA512 98a45aeba77ed536c3e43197910e64763820a43e53a13662ce784aca590f7a6784767a76193dff5dd8cb5a04a7e6c89cb1bde197c4fd2d223e46c3b78ab7226c
+EBUILD opus-1.3.1-r2.ebuild 1304 BLAKE2B f71a6bef7d72f01784023a939d056e4183d2ee2ab69c227f52b256655646a124db198164f4b0068e1efa3b248fc043d59bcdda02fdb36cf737e67419a16a7795 SHA512 7cf5995c556ff4b56e6a2b182cde0f4f5d09ff77fa4026bf3b7eba1fd607245b6fad26462b2c49e22c66eac06a70da5d8d903c33644cf91cd98257a29fc685f9
 MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
deleted file mode 100644
index 9f336ce55ee1..000000000000
--- a/media-libs/opus/opus-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Open codec for interactive speech and music transmission over the Internet"
-HOMEPAGE="https://opus-codec.org/"
-SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
-IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
-
-BDEPEND="doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable custom-modes)
-		$(use_enable doc)
-		$(use_enable static-libs static)
-	)
-
-	local i
-	for i in ${INTRINSIC_FLAGS} ; do
-		use ${i} && myeconfargs+=( --enable-intrinsics )
-	done
-
-	if is-flagq -ffast-math || is-flagq -Ofast; then
-		myeconfargs+=( "--enable-float-approx" )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/opus/opus-1.3.1-r2.ebuild b/media-libs/opus/opus-1.3.1-r2.ebuild
index 137c39a1d91e..8f28b5956956 100644
--- a/media-libs/opus/opus-1.3.1-r2.ebuild
+++ b/media-libs/opus/opus-1.3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
 IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"