gentoo resync : 18.11.2018

3 files changed, 2 insertions, 95 deletions

diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index 8ac67d40915d..bc4154f31e1e 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -4,8 +4,6 @@ AUX icecast.initd 431 BLAKE2B cbbff709fc0e8c4bb83410639e20500d212ac781c55590adfc
 AUX icecast.logrotate 140 BLAKE2B e42003ef1902b876df9c90fbbe15ebfd41fe6b38d989d22b9878097de3bb7634bd713a8704074f3b065fb57d20827da7c022c1591512fd03822284d49572726c SHA512 8aead6208b97b1d1cbd5d17a61dd3dd2493bdf68bfefc3ab6f9ae3e1acc856435942de7a129ef701c5379450428b9718e50701636e16d9e1ddccc8c752c2ccac
 AUX icecast.service 185 BLAKE2B 342bfd8bb1c906ae6184ae56469c7fd484b09d55da9d552cd1e8ec32865bc8756608f2962fc63810fe3fbd1936819d36207926c80e5eb1796ec7dc742f56d075 SHA512 a1e662f9b39ecbd35f28e849c5ae9db314d12e8fcefb152660180e9b51fe538197522c5ddda4908a4012ebe73ac4f9a6c12543a01548e9c41f17b5a17b942f51
 AUX icecast.xml 6775 BLAKE2B 2e63a21250cc0e3e580ee1bda7a188d295e3ce81de9ebb442bcd17c4ca5ed6edc0384bf03128e9b680b399feabb4272b7d56940f8732f3ca8da9a5fd68c6c11e SHA512 72620980b9213aa3570b9e4e803cb901f0a3770b081721f0f4e01ad9a0af0cc8a7f6242940b1ac9941f51320ab8c3e97245cf8e0249c5bf504b8f3a01c250a96
-DIST icecast-2.4.3.tar.gz 2393358 BLAKE2B a2b34eeb7c94974e13250620f9a19ed0165ec0cc676c5947edf8f88cea76240ab5eb90807d598c29944573c3717b8b7951261434521bc81100c3a6ba22d85840 SHA512 70e755ee935e738f2b7310333823992517747897692d101b67d73d5cd40d6385a20c25d089a0430806c116021e6e2055761efee9fec27cd9bccb2b58a2bfd446
 DIST icecast-2.4.4.tar.gz 2360592 BLAKE2B fd4034749feb4bf38c684ac6d8de572fdebce875843dc1be286264c8fe8d38feb24ea889b07ec79aada34cf16dae46eb21a8c5470f67c08f2dd56dc04c12130f SHA512 e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0
-EBUILD icecast-2.4.3.ebuild 2193 BLAKE2B 2ea2134420764bd2f9b9036a192fc2df7aaca1a32ca29be6326f0cd8427af608bb2e50a0e029aec3faa09d4c588fd1bfc71566b7970f00658332d7871ea52285 SHA512 a687f8a9b909a0beb8fb6dd533b8393668ec7d02faed1aaeb2245966ebfa6cd5bbe1d6ef147602ee71b27e4ca8e9df7252f00559d0e65c035a6eea4cdb7fe8fe
-EBUILD icecast-2.4.4.ebuild 2226 BLAKE2B 597483a56de0e1dd417906aea1715e497235e917796681ba54c5b839267a0da7296851e664df4ebf85c8c8aa1f730d58d1b3f145d4fe2ec246e4448ba34fc82e SHA512 149a40d6627c260c5dc9f1b7552402e4af05a952b499b5ff5c1e5b5e3ec20e48bdcae6655201c680b888bbedd2cf6604f5879711d00ac6d8112e7a597cc1bcc9
+EBUILD icecast-2.4.4.ebuild 2222 BLAKE2B 937ef133aebf2d40cace835c1b987db433ee5fbbcf2b41c6aa83606e1f372ae4c572daa62fc00fb895f4b7f65c8bea9904efecb6b2f55f270feaeb47f460a1dc SHA512 c8df48f631fc6abf6bf47e6573ebf9c2889612c488e8d08df94bfead8f4ca91b8e62bd67143ae26bbc40b1d45036da75af669c38344f906b56797372c5a3bc54
 MISC metadata.xml 512 BLAKE2B d4478aee58c5ea15615899722848ee4e84025febf3fdff1203cdc68cea5b7f9021df8995bec3d25bf8f06953dfb3b4b6f2621fae904be59cc88c78732a0ac79a SHA512 73beb97a44390ef3aa35ef29f473397886d8af1f02e8b76924697d8e86df99238010ae63b392e9eb8cd5e6d7c634e380a51c5e298074cd7ed8256649ef6bfc62
diff --git a/net-misc/icecast/icecast-2.4.3.ebuild b/net-misc/icecast/icecast-2.4.3.ebuild
deleted file mode 100644
index 0bb95c586543..000000000000
--- a/net-misc/icecast/icecast-2.4.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools systemd user
-
-DESCRIPTION="Opensource alternative to shoutcast that supports mp3, ogg and aac streaming"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="kate libressl logrotate +speex +ssl +theora +yp"
-
-#Although there is a --with-ogg and --with-orbis configure option, they're
-#only useful for specifying paths, not for disabling.
-DEPEND="dev-libs/libxslt
-	dev-libs/libxml2
-	media-libs/libogg
-	media-libs/libvorbis
-	kate? ( media-libs/libkate )
-	logrotate? ( app-admin/logrotate )
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )
-	yp? ( net-misc/curl )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewuser icecast -1 -1 -1 nogroup
-}
-
-PATCHES=(
-	# bug #368539
-	"${FILESDIR}"/${PN}-2.3.3-libkate.patch
-	# bug #430434
-	"${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF} \
-		--sysconfdir=/etc/icecast2 \
-		$(use_enable kate) \
-		$(use_with theora) \
-		$(use_with speex) \
-		$(use_with yp curl) \
-		$(use_with ssl openssl) \
-		$(use_enable yp)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
-	docinto html
-	dodoc doc/*.html
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	insinto /etc/icecast2
-	doins "${FILESDIR}"/icecast.xml
-	fperms 600 /etc/icecast2/icecast.xml
-
-	if use logrotate; then
-		dodir /etc/logrotate.d
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${PN}.logrotate ${PN}
-	fi
-	diropts -m0764 -o icecast -g nogroup
-	dodir /var/log/icecast
-	keepdir /var/log/icecast
-	rm -r "${D}"/usr/share/doc/icecast || die
-}
-
-pkg_postinst() {
-	touch "${ROOT}"var/log/icecast/{access,error}.log
-	chown icecast:nogroup "${ROOT}"var/log/icecast/{access,error}.log
-}
diff --git a/net-misc/icecast/icecast-2.4.4.ebuild b/net-misc/icecast/icecast-2.4.4.ebuild
index 6c599a6c0cf2..561df4885c27 100644
--- a/net-misc/icecast/icecast-2.4.4.ebuild
+++ b/net-misc/icecast/icecast-2.4.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="kate libressl logrotate +speex +ssl +theora +yp"
 
 #Although there is a --with-ogg and --with-orbis configure option, they're