gentoo resync : 12.05.2022

4 files changed, 4 insertions, 80 deletions

diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index f3f1fb9af6bf..4ecd976636e9 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,6 +1,4 @@
-DIST libsndfile-1.0.31.tar.bz2 875335 BLAKE2B 33e3c3d111427e829d8233aec52c227188834936839da9a04cf1ea5d2595d6a3127e7ce86d7686ca0336cca2017e6e2466845c27c7fc399efae34a0902316e41 SHA512 62202092e5cac6346fd3c0a977380e9bf888fc59d08c9c9707dc254a8ef6ed6356da2ab0430bb970c7b06ba5bb1dafa5d7b0fe13898834c1fe4acb16f409f0e1
 DIST libsndfile-1.1.0.tar.xz 730604 BLAKE2B ff2d27bff460c4d3c549bdf70c84c6f17a2c3e10674a44216ed83e657e603ddfbc33afe0827676fc4f5dc7745a9fb6aa866023fe589d0c00714477e3a246e5f2 SHA512 d01696a8a88a4444e5eb91a137cf7b26b55b12c1fe3b648653f7e78674bbdf61870066216c9ff2f6a1e63bdf7b558af9a759480cf6523b607d29347b12762006
-EBUILD libsndfile-1.0.31.ebuild 1796 BLAKE2B bcc411b71c822a9d427e71c682bf3613f5f79958bd76f7664c2d0fbf7e20ff44ee2496defd1fbdc9484c9c96c083515341f0ed30051af471060d6e1270a2e8ab SHA512 787cb47d84d230460a735fa73fe137f4a8d0d1319e47fc034decb3275ace8b4843807787dc5c837251e54deb4cb8a2c20625c3545b49972c43e6d7016e70157c
-EBUILD libsndfile-1.1.0-r1.ebuild 1912 BLAKE2B 99412566285e27002762c9a46a849a7e61a880c168746dfbe25d0a1b9430d597fc719d3b35332993ccf566e5d29fff1f25499b3874f774ce764d6cb33af77ade SHA512 5149a95f5398c3cd19e12e2a07dfd7a4124d1f82f585997f8ef26eedc144969a56c4e0b44a37cd929dc4664aa37804bb35fad9c91fbf9eb4d5cceceaedaf8f56
-EBUILD libsndfile-9999.ebuild 1918 BLAKE2B b89768d09324e9276f402ede221311bfd8dc2e9acbcf83bc8d38d31503bce38f01896d0f1c0fa08af0491f9ad8647ef83c0d9366e2630d9365df3f26f44e5c10 SHA512 5fa0004d35d6e6132bcd9ce5e289e8edbdcaa8eff8aadb5f393f0a277793a708b35c9d0b28af2c6d39ac86defaebda87fb192d2f9c55ac552f4aea2fc7e212b2
+EBUILD libsndfile-1.1.0-r1.ebuild 1905 BLAKE2B 6fbcc2a1e1af8c6712e543bbe79a0c0382a255c0f86c3893308944afb3f4e572e1af14a66a248b2736d556a4b356375c6b605bd9a41bf77370451a4de900efe4 SHA512 31efe2d60095ab00b4705bc80b96fa4c2bebf23294721f558dcfb2c1ed6e9afd647deeed278acce8371737f620e6fe1e284e5b128b83cfcea2505ee5465409f7
+EBUILD libsndfile-9999.ebuild 1912 BLAKE2B 84e666034a8e8ac0d4c0185b7b3f472fe3cef78f58a6a312bab6f63b3e171fa0120eacf38ebcac3b44c3252c925f8f337a08b7bf84ab0ca65d673e5eed83cbdd SHA512 c1fe0949539460c485d7f9169147bd0117b3ac577c70c94c6513ea6b662613e701d61d30949860eb062fc8016b0056bbc503274301ee477bf83be8e5e8cbd631
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-libs/libsndfile/libsndfile-1.0.31.ebuild b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
deleted file mode 100644
index aa0df067763b..000000000000
--- a/media-libs/libsndfile/libsndfile-1.0.31.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} 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 ~m68k ~mips ppc ppc64 ~riscv ~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="https://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-1.1.0-r1.ebuild b/media-libs/libsndfile/libsndfile-1.1.0-r1.ebuild
index 16d64ad88d7a..31ca425e0fd4 100644
--- a/media-libs/libsndfile/libsndfile-1.1.0-r1.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.1.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index 7518292d8465..a069371aa9e3 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal