gentoo resync : 16.04.2018

4 files changed, 2 insertions, 70 deletions

diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 4177bca06487..951aa77960f0 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,6 +1,3 @@
-AUX opus-1.1.3-CVE-2017-0381.patch 1011 BLAKE2B 856b9b22525e7eb9bd16ebc1d8b6f0782f11441d23c941db0f981cf5da77d0a62c8c78240e124283d51ac57f3082017f8bf9d7c6ff73244093929efa8195edf2 SHA512 0aeb8103a222e88a4e905db2a31d24dc7eafd1c3dfa61a096cce882d45242dc01e35ce07396b8904adb808d2d4e1217fdd7c87d3baa50a9b379675dc3db054df
-DIST opus-1.1.3.tar.gz 978848 BLAKE2B 0b376c2d0e219b5821e4219e937121ecd6c7b0f17f5d38ffe841a711a6f6b0551ee9ef1bf657e67005750a8d2cbe4ed262ad231195abff527f39b764e0773d81 SHA512 99fe272ade3f072e38101ec29f9125c9f4f2bacbcc002a9caca6e64a721f6c4193d7b1b81bd8370225693249c94293c4eea980e66c704424939dabbab890ab43
 DIST opus-1.2.1.tar.gz 1011070 BLAKE2B eff3e20c22cd5370a6a3aabf90cfe6f950a3a8d33cbaed8e053ff637c3c45d1d007a10da2f7983564c0bfcc3768f79ffbc041489fc8835f1faaa2fb6c0ef3800 SHA512 4a98d0a7dbd1a313e89407576805fd733c1192e8ef7e1137e3260025478a1cf1c5a8b71b48c372a0cffe6340524137fe47f181651888284f8221fb4d673f7cd5
-EBUILD opus-1.1.3-r1.ebuild 1065 BLAKE2B 633595386e7135ccaf55bc51992a92d739397bb749c47ab11cd6c1f752a32a1989168ea1b04474c04b4066b291cea93f9a76c3aa2941c131788ae53a0e30aa5a SHA512 2fa3b9611b39b9fa3cbd2f0b57cb717cdd3d3df6acba3f046a19205fd10c3c64201e78b94411f17d3aac2128f11a544a2b8463087f5ad85a225560fe535e6c1f
-EBUILD opus-1.2.1.ebuild 1093 BLAKE2B 63df57d9cf806b2be26557bf9e6f72db31740b6a48720491acf3b932b68d95376bb039a9a72d65302a18d81884685a213a65eaae63cf76d7dd443ab5caae0948 SHA512 45713b1f82084acd0c5fe5235a980f1c1a98402b6d12cf9d85ab8e8da4310d3d54b04f5962633527293371e4014ef9aee2f24727f3a47c5fd722d701c35419b9
+EBUILD opus-1.2.1.ebuild 1092 BLAKE2B b20442c5544e25e21f2b1236876a68a697cfbe9108ded8df77727c9cc8b98184f180a7b902f5324ed8e17232e7843d861ee89cc71baac657542c77f2bd67295f SHA512 adc7b0ba8cc8c6b8a44925b744cce35f31cc3702597e17820f9e894013ec9d75ba2578f101ea283f7e32321ea67033d60d856cb890d8c585a16b90108e147605
 MISC metadata.xml 415 BLAKE2B 17b08c77ce2fde1c129cbbe276fc1ffe28d7f200769ac2e811c3923d3c069a00c359f42a1aecc01d13fff5ee78e8c786935d1234ac49557be55028daf3136bac SHA512 0138063170ab15d60dace8a720fbde24bbc6c8406835dc5098a70c78b21b39a2d8046844652014734c2121f03200fcaa25a22418c864aa22999a1dc1a6023800
diff --git a/media-libs/opus/files/opus-1.1.3-CVE-2017-0381.patch b/media-libs/opus/files/opus-1.1.3-CVE-2017-0381.patch
deleted file mode 100644
index 621236b5855c..000000000000
--- a/media-libs/opus/files/opus-1.1.3-CVE-2017-0381.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 79e8f527b0344b0897a65be35e77f7885bd99409 Mon Sep 17 00:00:00 2001
-From: Felicia Lim <flim@google.com>
-Date: Thu, 28 Jul 2016 15:21:19 +0200
-Subject: [PATCH] Ensure that NLSF cannot be negative when computing a min
- distance between them
-
-Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
----
- silk/NLSF_stabilize.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/silk/NLSF_stabilize.c b/silk/NLSF_stabilize.c
-index 1fa1ea3..8f3426b 100644
---- a/silk/NLSF_stabilize.c
-+++ b/silk/NLSF_stabilize.c
-@@ -130,7 +130,7 @@ void silk_NLSF_stabilize(
- 
-         /* Keep delta_min distance between the NLSFs */
-         for( i = 1; i < L; i++ )
--            NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], NLSF_Q15[i-1] + NDeltaMin_Q15[i] );
-+            NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], silk_ADD_SAT16( NLSF_Q15[i-1], NDeltaMin_Q15[i] ) );
- 
-         /* Last NLSF should be no higher than 1 - NDeltaMin[L] */
-         NLSF_Q15[L-1] = silk_min_int( NLSF_Q15[L-1], (1<<15) - NDeltaMin_Q15[L] );
diff --git a/media-libs/opus/opus-1.1.3-r1.ebuild b/media-libs/opus/opus-1.1.3-r1.ebuild
deleted file mode 100644
index 03fade575979..000000000000
--- a/media-libs/opus/opus-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.xiph.org/opus.git"
-else
-	SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-fi
-
-DESCRIPTION="Open codec designed for internet transmission of interactive speech and audio"
-HOMEPAGE="http://opus-codec.org/"
-SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-INTRINSIC_FLAGS="cpu_flags_x86_sse neon"
-IUSE="ambisonics custom-modes doc static-libs ${INTRINSIC_FLAGS}"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.3-CVE-2017-0381.patch
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable custom-modes)
-		$(use_enable ambisonics)
-		$(use_enable doc)
-	)
-	for i in ${INTRINSIC_FLAGS} ; do
-		use ${i} && myeconfargs+=( --enable-intrinsics )
-	done
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-libs/opus/opus-1.2.1.ebuild b/media-libs/opus/opus-1.2.1.ebuild
index 68e1f94fd224..3c5cc10addd3 100644
--- a/media-libs/opus/opus-1.2.1.ebuild
+++ b/media-libs/opus/opus-1.2.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 	if [[ "${PV}" != *_alpha* ]] &&  [[ "${PV}" != *_beta* ]] ; then
-		KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd"
+		KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 	fi
 fi