gentoo resync : 25.11.2020

3 files changed, 2 insertions, 76 deletions

diff --git a/media-plugins/swh-plugins/Manifest b/media-plugins/swh-plugins/Manifest
index 2d8320a9168d..c7e9b0203076 100644
--- a/media-plugins/swh-plugins/Manifest
+++ b/media-plugins/swh-plugins/Manifest
@@ -1,7 +1,4 @@
 AUX swh-plugins-0.4.17-system-gsm.patch 1365 BLAKE2B d1e0d86384f47d0d096b12d4e216b53aa3e9df24a7dc11fe79667cee369b4001ffe0e972ff2bc761b8b892a470d15e631da59a6cf7c2c3254f6548f194745a13 SHA512 57e0f6976cd1d91ce453947f7f013d81b56fb27094f4c653ffd033baaf7d4d77bb52167fc912d84b6eef207e34590edb4cee4bc7d676dea116a4ad34b06436ea
-DIST swh-plugins-0.4.15-patchset.tar.bz2 5208 BLAKE2B 5ed8f49ddec0a8ed34fab05defc9489c6ae563f824f1514845719ee3716847cbeb023152d3ac1522e28712845ecd14ab62b4e4c466e9385a3df6fa3dc9a970ab SHA512 b2d016c52fa3cb90e255f26f1e9f7410b7a44b50e0ede0acc5a3092abbb65fbb455c3c3eb0059083f40556e00f95262a885c8970a8b25c310f73af6913973fc5
-DIST swh-plugins-0.4.15.tar.gz 1051623 BLAKE2B 8b18cd558160b58ad09662b3aea69ce928daa812bb5aa8089423a504a103fa6e29b4663b9bd827230742b1d7c6570c9b671b4a25cdc54e794b465edb36743a07 SHA512 b26d11f3887d03d39187b86f8e4061e3808ac03fa49caf24256ae457a0156be5982fe687ed50fa4240ccbb3e6250ed920d1da8c95d57cf4313e127559491eb03
 DIST swh-plugins-0.4.17.tar.gz 456472 BLAKE2B 827e5c0d6ac692636904df64d1af8d94488f22a26cf09586b0ad32bec9017c9f3cd66074d8f786f5722e4918d32ff27be719561005273f2dcee81ea8690d6274 SHA512 6b566030b43c3929ce8938648abd458efa0fea0b4916410a34b4f4fa788c45e4a6ec3f46ca435f8546179ff0c4674303db22314e1c1f1d09e5f2b71e6c5aecc7
-EBUILD swh-plugins-0.4.15-r3.ebuild 2023 BLAKE2B 36febc87621052eda9e1eb3207a4698f5e7257c1479798877d80660ae9804aca9abd909bda05c606278d2b2648458b1412112ac0db92f593fded89da53ee7689 SHA512 5dd79fffdbd2022108b3283b97c7c1a57b7c7e6aa099520fc81eb25dc1940e03da5c89e9eb89c1f41fc3b4eec4c0c480dd9345f483d24061c46d8bcbb61937ea
-EBUILD swh-plugins-0.4.17.ebuild 1680 BLAKE2B 0eabb6d76141f0bad86938f9d1b1735c06ec484c14499b17d2bda613f8a192c090448f92e943eda1c96bd4e63ca1f6694b972ab0522fde154062bb3b3907258f SHA512 7d7bc7fd4592f5310dedffcea84ec58568bcc8cb5eb08999afa3076172bdf6fecad657d13bfeb7780e8a3397c243dec8967744fc07e2540d393b4e9fe98ffe90
+EBUILD swh-plugins-0.4.17.ebuild 1678 BLAKE2B e2434b96b64435ed4b2bf530b8724ac1dcc564437ede44d46042fd3aeacbb5e6453bc88e528d0128511091ac032ae325f53c8ab7296903677c35ff3d82f245d3 SHA512 3365774353ade054fd47b75c3cdd3c153d86aa540152df2f0612bd4dd73a661c096e57837754f816c43c78a041d39cdd8a32ab521bb716d5fbe3f75cf0b281f6
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
deleted file mode 100644
index 88acf6e44d88..000000000000
--- a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools multilib-minimal
-
-DESCRIPTION="Large collection of LADSPA audio plugins/effects"
-HOMEPAGE="http://plugin.org.uk"
-SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_3dnow nls cpu_flags_x86_sse"
-
-RDEPEND="
-	>=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}]
-	>=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	media-libs/ladspa-sdk
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}-patchset/${P}-pic.patch"
-	epatch "${WORKDIR}/${P}-patchset/${P}-plugindir.patch"
-	epatch "${WORKDIR}/${P}-patchset/${P}-riceitdown.patch"
-	epatch "${WORKDIR}/${P}-patchset/${P}-gettext.patch"
-	epatch "${WORKDIR}/${P}-patchset/${P}-x86-asm-optional.patch"
-	epatch "${WORKDIR}/${P}-patchset/${P}-glibc-2.10.patch"
-
-	# Use system libgsm, bug #252890
-	rm -rf gsm
-	epatch "${WORKDIR}/${P}-patchset/${P}-system_gsm.patch"
-
-	# This is to update gettext macros, otherwise they are incompatible with
-	# recent libtools, bug #231767
-	autopoint -f || die
-
-	# it doesn't get updated otherwise
-	rm -f missing
-
-	# old shipped version breaks multilib build #475022
-	rm -f config.h
-
-	# Fix build with automake 1.13
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
-
-	eautoreconf
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_3dnow 3dnow) \
-		$(use_enable nls) \
-		--enable-fast-install
-}
-
-pkg_postinst() {
-	ewarn "WARNING: You have to be careful when using the"
-	ewarn "swh plugins. Be sure to lower your sound volume"
-	ewarn "and then play around a bit with the plugins so"
-	ewarn "you get a feeling for it. Otherwise your speakers"
-	ewarn "won't like that."
-}
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.17.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.17.ebuild
index efe30fb2d026..aeb2c673ccb7 100644
--- a/media-plugins/swh-plugins/swh-plugins-0.4.17.ebuild
+++ b/media-plugins/swh-plugins/swh-plugins-0.4.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/swh/ladspa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="nls cpu_flags_x86_3dnow cpu_flags_x86_sse"
 
 RDEPEND="