gentoo resync : 17.02.2021

4 files changed, 2 insertions, 74 deletions

diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index a3a131edebb6..a57aadb3077a 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -1,6 +1,3 @@
-AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe3fe68b304521a1d7185e865f4ac254d2bd313686e0d6a59e5aa50a0fe41a0e0214980aefe1fe3dcb8a45d827d4962fb153 SHA512 4717ee913ff50e276cca9983543a046271c34385bca2525bc64f6de90a25c7becc7e780807ff2534147dc17b1f57b57e23746948ea78288addfbeca7c495f78e
-DIST libshout-2.4.3.tar.gz 529563 BLAKE2B 30d982fcf52507e07af23113560cfc9e43ca4ce37c286854326ea09215dc30c3c0d57320dce46dd4faec43b3d473df2f7882ad759479fb023166cec3f24327c5 SHA512 fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34
 DIST libshout-2.4.5.tar.gz 543991 BLAKE2B a3ceabd150413e9d1cee2118fe9576959bfa05d86e261b2574969a9a665aba3da4ac1c39db2b27d033fe587232a69a569d80362f856bba667277b5454dd170ca SHA512 290844185da16961f03434d3e341573dd6cb0139e5fa81902903021b641382d2629302d7c356bc591b35656754e07f4e44a8d9e782e092b17a051b9ae8f54341
-EBUILD libshout-2.4.3.ebuild 1312 BLAKE2B e409e9f703a351d6e0df5dcac4beb3ae9de6c4773257e0d2ef541ea5d3120822f7ddc7938d0f123e250c38669aa6596928c8329b15a620a67b2a422dd40a3358 SHA512 e2b159724aff657070e9fe692981e94cd73d00b7f8d57110364154575ddbf27a111953f04dbec4c2479b3db88f1806afbb5bd201fa1dd95e05547247a3945fca
-EBUILD libshout-2.4.5.ebuild 1233 BLAKE2B d7db0b2fd29286e7c0fd6aa0e23cfdad2a9a99a5daa1510f96ee087ace066b43d2ea2484603a1d71b3131931b918d86f25c54c885864c2aadd5c493f71770069 SHA512 fe6d0ef23491b20202c2650d4ca7402d2555e7a5a5d1a1937f82fee5be1f4123e164abe64a8102528e7ee121213c8fa784f2ce9265138d59dad7d093ec5cfdc5
+EBUILD libshout-2.4.5.ebuild 1232 BLAKE2B 8cc0aaf280320e3e36ac89892a273d801999257f8f983666cff99920d297190ae4a49d2ad1910a902eb1abfb627737946ada9e808700144280f60c9fe0919d10 SHA512 0978109abab884d5a6134b72b02ad31836fd6c819d42d968f710ee369d0639837e98ae1d114e31fad957ce9bbea3be89da8f18700b85ddc3defa6725260602a9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/files/libshout-2.4.1-underlinking.patch b/media-libs/libshout/files/libshout-2.4.1-underlinking.patch
deleted file mode 100644
index 0c6b7f2f5a71..000000000000
--- a/media-libs/libshout/files/libshout-2.4.1-underlinking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/499458
-
---- libshout-2.4.1/src/Makefile.am
-+++ libshout-2.4.1/src/Makefile.am
-@@ -33,7 +33,7 @@
- AM_CFLAGS = @XIPH_CFLAGS@
- 
- libshout_la_LIBADD = common/net/libicenet.la common/timing/libicetiming.la common/avl/libiceavl.la\
--		common/httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS) @XIPH_LIBS@
-+		common/httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(OGG_LIBS) $(VORBIS_LIBS) $(THEORA_LIBS) $(SPEEX_LIBS) @XIPH_LIBS@
- 
- INCLUDES = -I$(top_builddir)/include -I./common/
- 
diff --git a/media-libs/libshout/libshout-2.4.3.ebuild b/media-libs/libshout/libshout-2.4.3.ebuild
deleted file mode 100644
index 3d9eb17139be..000000000000
--- a/media-libs/libshout/libshout-2.4.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="https://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="libressl speex static-libs theora"
-
-RDEPEND="
-	>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/shout/shout.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.1-underlinking.patch
-)
-
-src_prepare() {
-	default
-	# Fix docdir
-	sed '/^docdir/s@$(PACKAGE)@$(PF)@' -i Makefile.am || die
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable speex)
-		$(use_enable static-libs static)
-		$(use_enable theora)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libshout/libshout-2.4.5.ebuild b/media-libs/libshout/libshout-2.4.5.ebuild
index 802fe33ff774..847b1829fedb 100644
--- a/media-libs/libshout/libshout-2.4.5.ebuild
+++ b/media-libs/libshout/libshout-2.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="