gentoo resync : 29.01.2021

3 files changed, 85 insertions, 9 deletions

diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 885b73a355d4..7abe9eed9385 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,4 +1,6 @@
 DIST libsndfile-1.0.30.tar.bz2 852320 BLAKE2B 00bd558a3d8645f4ad03fba38c31fcea25d30bea4b6f1a785b4b31b0da61bfa6a6f7df1bd7907c95c543cce8ee6766032d2e614eb285f2fc529146cb1d319517 SHA512 c4be4bc57df880da81570889a80256ba4567f2c7d6bdfb38f3803c55f616278160e962544bfac32e53b613b8fdf2a2644d8da9ee778747c32cb681a0fd5aab00
+DIST libsndfile-1.0.31.tar.bz2 875335 BLAKE2B 33e3c3d111427e829d8233aec52c227188834936839da9a04cf1ea5d2595d6a3127e7ce86d7686ca0336cca2017e6e2466845c27c7fc399efae34a0902316e41 SHA512 62202092e5cac6346fd3c0a977380e9bf888fc59d08c9c9707dc254a8ef6ed6356da2ab0430bb970c7b06ba5bb1dafa5d7b0fe13898834c1fe4acb16f409f0e1
 EBUILD libsndfile-1.0.30.ebuild 1806 BLAKE2B 6da01f634fe9fdbcd6909a5fb2b2fbc4db1d1d5e043bd9cbe49394cc0949b21fb180b276bc3487909c0f48e14d9364da946be1b0d2865fa93f9cee6a57343ebb SHA512 1dbf804a971370d8d4c160c5df5825587ad81053de5a01a1d5c86d74b5695952f06235c11dc8cd35df72ec5721db0c22800a4802f77029330e2fd07a75120062
-EBUILD libsndfile-9999.ebuild 1813 BLAKE2B 0c4729157478fe2d9a62a708bd35692ad3d74ea342a387fa4080d00b7f6cbbef81b037a01b1866830256ea56ba826cbf13e75d5583bb2ba9f8326cbb8a0f9ae6 SHA512 0a1b8d3c656277ab726c16e0b7b22501bec3896400fd5a7b8e842065019f1d71d8fa1d46a5d7a4beab413c9fc633b3fdf48003c08a40b3606115013c356b7e0b
+EBUILD libsndfile-1.0.31.ebuild 1788 BLAKE2B 2c16c7480477006e1a72e91f50e19d9c9b8fb5e6edecf4b351a8a48925f90749e1a55368a6e74b7c77a77f030e1a2dbd4431d9a8b24d17650f20378b875ab2b5 SHA512 423e5e7c5be3fcd74d4b5523394eb27bb9c2890300f330e5d8f8d05e54ec4e4a4cb706164880aaeb3a20f9408bc1d4a2f90207a3ce6334f43b59f39516841f64
+EBUILD libsndfile-9999.ebuild 1788 BLAKE2B 2c16c7480477006e1a72e91f50e19d9c9b8fb5e6edecf4b351a8a48925f90749e1a55368a6e74b7c77a77f030e1a2dbd4431d9a8b24d17650f20378b875ab2b5 SHA512 423e5e7c5be3fcd74d4b5523394eb27bb9c2890300f330e5d8f8d05e54ec4e4a4cb706164880aaeb3a20f9408bc1d4a2f90207a3ce6334f43b59f39516841f64
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.31.ebuild b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
new file mode 100644
index 000000000000..541b8501fc49
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
+else
+	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+inherit python-any-r1 multilib-minimal
+
+DESCRIPTION="C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://libsndfile.github.io/libsndfile/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa minimal sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!minimal? (
+		media-libs/flac:=[${MULTILIB_USEDEP}]
+		media-libs/libogg:=[${MULTILIB_USEDEP}]
+		media-libs/libvorbis:=[${MULTILIB_USEDEP}]
+		media-libs/opus:=[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib:= )
+	sqlite? ( dev-db/sqlite )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )"
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+="
+		${PYTHON_DEPS}
+		sys-devel/autogen
+	"
+fi
+
+pkg_setup() {
+	if use test || [[ ${PV} == *9999 ]]; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-octave \
+		--disable-static \
+		--disable-werror \
+		$(use_enable !minimal external-libs) \
+		$(multilib_native_enable full-suite) \
+		$(multilib_native_use_enable alsa) \
+		$(multilib_native_use_enable sqlite) \
+		PYTHON="${EPYTHON}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index fe3ad230a792..541b8501fc49 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -3,23 +3,23 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
+	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
-	SRC_URI="https://github.com/erikd/libsndfile/releases/download/v${PV}/${P}.tar.bz2"
+	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
 DESCRIPTION="C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile"
+HOMEPAGE="http://libsndfile.github.io/libsndfile/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa minimal sqlite static-libs test"
+IUSE="alsa minimal sqlite test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -57,8 +57,8 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		--disable-octave \
+		--disable-static \
 		--disable-werror \
-		$(use_enable static-libs static) \
 		$(use_enable !minimal external-libs) \
 		$(multilib_native_enable full-suite) \
 		$(multilib_native_use_enable alsa) \
@@ -69,6 +69,6 @@ multilib_src_configure() {
 multilib_src_install_all() {
 	einstalldocs
 
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }