gentoo resync : 30.10.2021

3 files changed, 2 insertions, 111 deletions

diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 3be0d0958fc5..7cbaeb073e03 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,5 +1,3 @@
-DIST sox-14.4.2_p20200803.zip 1089835 BLAKE2B fa53d8c9f14620675bf534090bf6c69ec256bb977aa1b3c01b2d95ba8e685eb4f9d479872f303b2954aa1b063c095bf3b90e5b746fd8d7d66e35476e5218fa6b SHA512 8c485a53b9ecce9ecf759d7bbf8d95e568a89505bec7d1258afded4c7ad0f28c624b637a188ab87b64dee720db59b8de20c347805910f0401f00550832e16392
 DIST sox-14.4.2_p20210509.zip 942551 BLAKE2B 2ddd229faacb9190fe18052b1c02da40d4c3f24fc73dd08b28ac99bef267cb05f8bcbf64e0c397c391b3be2467667783ed94f6c60798af069567e1c237ec9ccd SHA512 4868f9b77141b7e2caf2571ceb68a48bd744732e72f63ed787f8e0b9fe39b77de4e998b32d99c2500e10b017a1fd1a3379f4f9f8b67db6093b85d02cb3447934
-EBUILD sox-14.4.2_p20200803-r2.ebuild 2833 BLAKE2B 321acd4a7c6587b310c85ebcaaffa3ea60aed488e4b3ef95fc082275e91e2170212d762a7f9de55c6e3d9050e18c4c56af3b560385f5decea16dafb75c79f58e SHA512 59e0d8bf59301124f02c2dc859c8debc4e50c62bb7055826380bdb6f2c57df51142e18af43bcf27bc07583370c4e50a75b82f3b1bdd51423c564a47ea631638d
-EBUILD sox-14.4.2_p20210509.ebuild 2875 BLAKE2B ae46bd3d5e96c0f61c6b9b254308442015bd2cdd5e767efabb103af1bfdcf5012eaed532ec78635bbc56bd26d835b4122623276d199c1fdc8bc50b3c1705249f SHA512 97b27b4dd3bc79f91d56387934df3a65b396773bf5a3d2c8ffcfa6987066fbcd1d56ecdcd47ae3b533be1fa4f38e5a097558911eb32bdf7744a76d7e015a53f3
+EBUILD sox-14.4.2_p20210509.ebuild 2874 BLAKE2B 445724cd1a56678852890786adf28c31cca4ee01181fb83ef063f7cfa2f890564ce434853a6fddad86a1448235ec3535230206b5396602a5c14f75331ee2be8f SHA512 e20a9b184ea185a86c0e548de1d7465205d3e4ca0db464a7514189ebf4c3ce624d6747e10d50e8a3532730e5ff0251d28e5216c64a34554b7cbb2174e5613c77
 MISC metadata.xml 709 BLAKE2B 29d863a59fa534ccdaf3ccfe73ec03ff931055b7537ce3ef1111a596c8178f944910cd3c917e25f778a1e297d5fd0023833d0a8556adb6cd187fbd59e2ff5703 SHA512 a40c70b421b78a8bf2b7044b1b512600120c0352bf61755ba7d48af621fcc33c82ef3c7eff3df10c913add4b7250f7fb7461ea7171b21a07f306794d7c1cbdbf
diff --git a/media-sound/sox/sox-14.4.2_p20200803-r2.ebuild b/media-sound/sox/sox-14.4.2_p20200803-r2.ebuild
deleted file mode 100644
index c8ec11bac503..000000000000
--- a/media-sound/sox/sox-14.4.2_p20200803-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-# We take a snapshot because of the huge number of security
-# and other fixes since the release of 14.4.2.
-# Recommend mirroring the snapshot; unclear if they are stable URIs.
-COMMIT="50857c46c03a85c72826e819f5e815aad4a4633d"
-MY_P="sox-code-${COMMIT}"
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-# Source: https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/${MY_P}.zip
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.zip -> ${P}.zip"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/libltdl:0=
-	>=media-sound/gsm-1.0.12-r1
-	sys-apps/file
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	ao? ( media-libs/libao:= )
-	encode? ( >=media-sound/lame-3.98.4 )
-	flac? ( >=media-libs/flac-1.1.3 )
-	id3tag? ( media-libs/libid3tag:= )
-	ladspa? ( media-libs/ladspa-sdk )
-	mad? ( media-libs/libmad )
-	ogg? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	opus? (
-		media-libs/opus
-		media-libs/opusfile
-	)
-	png? (
-		media-libs/libpng:0=
-		sys-libs/zlib
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( >=media-libs/libsndfile-1.0.11 )
-	twolame? ( media-sound/twolame )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS )
-
-src_prepare() {
-	default
-
-	# bug #386027
-	sed -i -e 's:CFLAGS="-g":CFLAGS="$CFLAGS -g":' configure.ac || die
-
-	# bug #712630
-	if use elibc_musl ; then
-		ewarn "Applying musl workaround for bug #712630."
-		ewarn "File-type detection with pipes may be missing."
-		sed -i '/error FIX NEEDED HERE/d' src/formats.c || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with alsa) \
-		$(use_with amr amrnb) \
-		$(use_with amr amrwb) \
-		$(use_with ao) \
-		$(use_enable debug) \
-		$(use_with encode lame) \
-		$(use_with flac) \
-		$(use_with id3tag) \
-		$(use_with ladspa) \
-		$(use_with mad) \
-		$(use_enable openmp) \
-		$(use_with ogg oggvorbis) \
-		$(use_with oss) \
-		$(use_with opus) \
-		$(use_with png) \
-		$(use_with pulseaudio) \
-		$(use_with sndfile) \
-		$(use_enable static-libs static) \
-		$(use_with twolame) \
-		$(use_with wavpack) \
-		--with-distro="Gentoo"
-}
-
-src_install() {
-	default
-	# libltdl is used for loading plugins, keeping libtool files with empty
-	# dependency_libs what otherwise would be -exec rm -f {} +
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-sound/sox/sox-14.4.2_p20210509.ebuild b/media-sound/sox/sox-14.4.2_p20210509.ebuild
index 7575b5867ffc..bf31ee4ef9a9 100644
--- a/media-sound/sox/sox-14.4.2_p20210509.ebuild
+++ b/media-sound/sox/sox-14.4.2_p20210509.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="alsa amr ao encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile sndio static-libs twolame wavpack"
 
 BDEPEND="