gentoo resync : 10.02.2020

4 files changed, 3 insertions, 95 deletions

diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index ca49fa994338..454e7f8e32f1 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,6 +1,3 @@
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
-DIST opus-1.3.tar.gz 1032750 BLAKE2B 7c79cecb957b0353e35758989b07502f2d4531869985639a069dec8737c15061b56ebff5babe31ad316afa9f7787bde6a7c544fa5be10c1e02ccfdff1a80d5c7 SHA512 438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518
-EBUILD opus-1.3.1-r1.ebuild 1064 BLAKE2B 2e2ec38a2a20ad4037e8d473abd2e5594e5e87ef3fca7a698932dc023be1666aa143ad7569d4fc5bd87fa0a0c43140dc023436d5899442c3ca8ac8089978c14a SHA512 8d874857b52b72f22d63c6875e9e43a5cd2ed32e8d67f5c68e01b3f1a14c6fa8cfd4d0cb302ad20f6fb82e56d9769d5ef43946228bbd22b84a4890c44ae0f5e5
-EBUILD opus-1.3.1.ebuild 952 BLAKE2B 67ae11d184681007655fc1270938cf1e41a6cc172f8f57d1459dae30ec0da9d0f41bcc5e9cad21464de723c25ae7ab9ef559cd5cec4ae3a7d34bfbca872ad284 SHA512 7d60bbf645bc0b6d0558ba7b36363fd1ea7f463edf0c7cf51953fc1b8e8dfd9a0e2b0ec265aac31587e945efdb788f65c4bd13e73ac06b80552488ebfabb46a3
-EBUILD opus-1.3.ebuild 1169 BLAKE2B 153d7f0868bfb71aea06d0396dc1d6862762b068448191a36ddf507d08bda251cde5a2b7b5b7e732be77c5029bf64b367fdbeae7e706d40c12125901ca77bef4 SHA512 7a6e60aeb7105b593369acf0a6fd62db92a8de6b7ddff14fe47d639d987e0f1d923a680b7b9266315d7372f33ffcdad998965251f24192a5bce8a204154aeb1b
+EBUILD opus-1.3.1-r1.ebuild 1055 BLAKE2B cb250cc2c4650c97a712ea1dae761579e23c1d827b204ee84d699d93e2b711b1809c7a59c4215fa33368aab10f718d06156b69186cb1016748c362d0d85820e8 SHA512 8f9f014ca7f6bdd050505ca6bef177e346a134b014219052775f22561feee09e5f7a83b1b80f23fb27297c47de32b9f16cecf575c4bf7eb888ef7897703de84e
 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
index ae3328a25fd9..aba9e62e775d 100644
--- a/media-libs/opus/opus-1.3.1-r1.ebuild
+++ b/media-libs/opus/opus-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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}"
 
diff --git a/media-libs/opus/opus-1.3.1.ebuild b/media-libs/opus/opus-1.3.1.ebuild
deleted file mode 100644
index eeda2865a899..000000000000
--- a/media-libs/opus/opus-1.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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}"
-
-DEPEND="doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable custom-modes)
-		$(use_enable doc)
-		$(use_enable static-libs static)
-	)
-	for i in ${INTRINSIC_FLAGS} ; do
-		use ${i} && myeconfargs+=( --enable-intrinsics )
-	done
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/opus/opus-1.3.ebuild b/media-libs/opus/opus-1.3.ebuild
deleted file mode 100644
index 758b0ac2e0ba..000000000000
--- a/media-libs/opus/opus-1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-inherit multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.xiph.org/opus.git"
-else
-	SRC_URI="https://archive.mozilla.org/pub/opus/${MY_P}.tar.gz"
-	if [[ "${PV}" != *_alpha* ]] && [[ "${PV}" != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-	fi
-fi
-
-DESCRIPTION="Open codec designed for internet transmission of interactive speech and audio"
-HOMEPAGE="https://opus-codec.org/"
-
-LICENSE="BSD"
-SLOT="0"
-INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
-IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable custom-modes)
-		$(use_enable doc)
-		$(use_enable static-libs static)
-	)
-	for i in ${INTRINSIC_FLAGS} ; do
-		use ${i} && myeconfargs+=( --enable-intrinsics )
-	done
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}