gentoo resync : 31.05.2021

4 files changed, 73 insertions, 3 deletions

diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 27b36a518b44..8efbc03a050c 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,3 +1,5 @@
+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 1058 BLAKE2B 3e8943a6ff0645b769327754a0369e5eaa5dcc78319af56623bff5100017c29915932cd6a54390a2dd9067378f82fcad65f522699656365f9071f0bc8960f1da SHA512 03ebe2113ca9d3392aefb1a36f2b9906e0ba05055d307e0ada16a480bde30b85cf6fc6c9abaeb3700f1e3e99e150eff4b8570031c2bcdc70d0661818b77ed7e5
+EBUILD opus-1.3.1-r1.ebuild 1074 BLAKE2B 4d6be4549fe213a1b4b96459e5d857ba914dcaf6ddfdc8d75cdd76aa0d1263dbc4a22c0fbe1c58429ad0ca6be90c73d0fa942efce2b4b208225fa9c78294410a SHA512 af67ca539e73422a6b9e0d96e6a0cc3dcca168214409a4f9711e737a6bade78786594f2284807718a54b659e9d90e2d3507f9c3f69306173fa7819acc9f07a2c
+EBUILD opus-1.3.1-r2.ebuild 1311 BLAKE2B 68e5e037c067e594dffb053e58492549a2d0c41239c69e0956a8e10bb8d9e2e7e30d8dab251982dfe450dcf78a55ddb13f3b9080f7e52e07353ebe7785d7ad3b SHA512 98a45aeba77ed536c3e43197910e64763820a43e53a13662ce784aca590f7a6784767a76193dff5dd8cb5a04a7e6c89cb1bde197c4fd2d223e46c3b78ab7226c
 MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/files/opus-1.3.1-libdir-macro.patch b/media-libs/opus/files/opus-1.3.1-libdir-macro.patch
new file mode 100644
index 000000000000..4f57e54ddf00
--- /dev/null
+++ b/media-libs/opus/files/opus-1.3.1-libdir-macro.patch
@@ -0,0 +1,11 @@
+--- a/opus.m4
++++ b/opus.m4
+@@ -22,7 +22,7 @@ AC_ARG_ENABLE(opustest,AC_HELP_STRING([--disable-opustest],[Do not try to compil
+   elif test "x$opus_prefix" != "x" ; then
+     OPUS_LIBS="-L$opus_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    OPUS_LIBS="-L$prefix/lib"
++    OPUS_LIBS="-L${libdir}"
+   fi
+ 
+   if test "x$opus_prefix" != "xno" ; then
diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
index 257b3a7fb6f1..9f336ce55ee1 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,9 +26,12 @@ multilib_src_configure() {
 		$(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
@@ -37,6 +40,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	default
+	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
new file mode 100644
index 000000000000..137c39a1d91e
--- /dev/null
+++ b/media-libs/opus/opus-1.3.1-r2.ebuild
@@ -0,0 +1,54 @@
+# 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
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.1-libdir-macro.patch
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable custom-modes)
+		$(use_enable doc)
+		$(use_enable static-libs static)
+	)
+
+	local i
+	# We want to disable intrinsics if no flags are enabled
+	# (This is a fun Bash construct to do that!)
+	# bug #752069
+	for i in "${INTRINSIC_FLAGS}" ; do
+		use ${i} && myeconfargs+=( --enable-intrinsics ) && break
+	done || myeconfargs+=( --disable-intrinsics )
+
+	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
+}