gentoo resync : 30.06.2018

6 files changed, 2 insertions, 136 deletions

diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 6f10ddd8695a..4cb78977278d 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -1,9 +1,4 @@
-AUX libshout-2.3.1-underlinking.patch 428 BLAKE2B 3d57e5338c4c0ef864d73f6efadf5095453867058af3edad7c9f904b8d24a52c2680e45bc2a28bf9582cf4f884a0865a6ee0dea48d27448cf2c307d5571f1ada SHA512 555d3b00f051f14b016825e3f76ddf23bf956624480179eb316cf47b4c7cde56dfcbea348bfb16903989033f84465444eea8b0757297fd7483690b75d2eaf27f
 AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe3fe68b304521a1d7185e865f4ac254d2bd313686e0d6a59e5aa50a0fe41a0e0214980aefe1fe3dcb8a45d827d4962fb153 SHA512 4717ee913ff50e276cca9983543a046271c34385bca2525bc64f6de90a25c7becc7e780807ff2534147dc17b1f57b57e23746948ea78288addfbeca7c495f78e
-DIST libshout-2.3.1.tar.gz 464229 BLAKE2B 6266e23d34f551e4d8afacc514a4e2e7bb12753d24e1c7cbef48899f832f353e7c13dc8c91a9618326dd5b65853d8ab466103954e058bab59068f6567a14cea5 SHA512 19c1421e654310ddbc25f343d205d921b7c3f1c9c97f028207deaf1a46150b7f6c8069d52b7a3c9ed72dda276b52237cf1208292fbfa09aa7d09f85072c46a7b
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
-EBUILD libshout-2.3.1-r1.ebuild 1087 BLAKE2B dc04384b8f5f61c90bd0daf6a60687311ad998a600bd83c5c36d16b5ba6554c1161cb4a57436e177e2620690be69f614299acffbc68de143a1c191bf14d71919 SHA512 1815449c2ee7342a8aa295fc8a3cf049b0f481cbab4393288545b18bd33439264c9550fcbaad584c6112d740fe947b05ecf346172b3d997b7209d1e14942f461
-EBUILD libshout-2.3.1.ebuild 837 BLAKE2B 06e49c76b036ebe4018cfb40df091f48cda71fe516a32a1517744e89e25c90eb177bfe90cc223255be102cf8cdf2405e8941624f62520b6ca19a4ea8e5ab6169 SHA512 f3ca40a99521c197a07dbcad9458b90243fd1ca36e45cd4c9487feee7115a6598eae6c778307dd22e8133b089c5cfdb47b3d237e9d6bf3f75cefc37d0e657913
-EBUILD libshout-2.4.1-r1.ebuild 1318 BLAKE2B 25522e7bcb883202c43066ea842347bd542fb401c0a7f2bd331bb33eaacea2bddceae05409732fd3764b3353359b1b3e1a46c6d26c92a36fb544bfa23f57f97b SHA512 22b9404502ebcffb61b3818a9fc29bed0b9baec50ad6c1de3a6b94f16c6e908b74294952b54000d62085ecbc6b03e2cbbf476beed09c541d383b23f8cca35b23
-EBUILD libshout-2.4.1.ebuild 1211 BLAKE2B f0fba59b7fe490e3d0caafccab41647ac37a26a427652cbc7a49a7156d0630165cdf3f01d735021a8f6ae606b26b87db1bdfa437815f001bf0d047954e5b4f59 SHA512 d107c34d50564aea4281cca3bab02e4977932c21f715d20e2e01ad839290ceb6546c55e469685eb3c0115693d2255779ed4e9cbc7d911ffd9b35173a6ecee158
+EBUILD libshout-2.4.1-r1.ebuild 1317 BLAKE2B 34e99363db05398190a065358d1fde860372deb4750c5d22d8f128d1fe5d257881faba01e42f3b3bbc1f4094e7ec7a6576776a63712d44987e1732eb3efc4618 SHA512 d3e14eaf24dc7bc450274cb106ba2c2720318d295db20f3a9305849e53f72cd9d4d371ae64a18bd74ec90c4b854ce1c6c831e147b5c086acb62e619fff04619a
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/files/libshout-2.3.1-underlinking.patch b/media-libs/libshout/files/libshout-2.3.1-underlinking.patch
deleted file mode 100644
index e9bb73678ae4..000000000000
--- a/media-libs/libshout/files/libshout-2.3.1-underlinking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/499458
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -26,7 +26,7 @@
- AM_CFLAGS = @XIPH_CFLAGS@
- 
- libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
--		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS)
-+		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(OGG_LIBS) $(VORBIS_LIBS) $(THEORA_LIBS) $(SPEEX_LIBS)
- 
- INCLUDES = -I$(top_builddir)/include
- 
diff --git a/media-libs/libshout/libshout-2.3.1-r1.ebuild b/media-libs/libshout/libshout-2.3.1-r1.ebuild
deleted file mode 100644
index 0824142aa4a8..000000000000
--- a/media-libs/libshout/libshout-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="speex static-libs theora"
-
-RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable theora) \
-		$(use_enable speex)
-}
-
-multilib_src_install_all() {
-	dodoc README examples/example.c
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files
-}
diff --git a/media-libs/libshout/libshout-2.3.1.ebuild b/media-libs/libshout/libshout-2.3.1.ebuild
deleted file mode 100644
index 1e2118e24197..000000000000
--- a/media-libs/libshout/libshout-2.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="speex static-libs theora"
-
-RDEPEND="media-libs/libogg
-	media-libs/libvorbis
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable theora) \
-		$(use_enable speex)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README examples/example.c
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files
-}
diff --git a/media-libs/libshout/libshout-2.4.1-r1.ebuild b/media-libs/libshout/libshout-2.4.1-r1.ebuild
index 5d5ef8a159d5..fcfeae82d3a3 100644
--- a/media-libs/libshout/libshout-2.4.1-r1.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r1.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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libshout/libshout-2.4.1.ebuild b/media-libs/libshout/libshout-2.4.1.ebuild
deleted file mode 100644
index 05d218d13638..000000000000
--- a/media-libs/libshout/libshout-2.4.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-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 )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.1-underlinking.patch
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable theora) \
-		$(use_enable speex)
-}
-
-multilib_src_install_all() {
-	dodoc README examples/example.c
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files
-}