gentoo resync : 02.09.2020

4 files changed, 2 insertions, 71 deletions

diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index 13e62833f156..effa2b2df1a4 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -1,8 +1,5 @@
-AUX darkice-1.2-gcc47.patch 236 BLAKE2B df44cbc3ce60ff0fee38e4ede7d0321adc2b1fc15dd3bfc322ff08d7eaf4d3405dfce796c0a5f7757f9658ff992d208b12bf0e1b7fa31d1763d75f4d2e24b079 SHA512 4f77a2694f2bb574c600edfe1d2b88dd1d9c932ff8280e8fe0739c50f5ec346c284d49ac34993e351582c1a4909b9dd380073df7a16b62b8db71c66b0f1c7326
-DIST darkice-1.2.tar.gz 357026 BLAKE2B 3553711a05631feca198de83387234dc1ca85429ee69424910352e32d3ec4f8037ff33fcb4946aef0f84f58deb59e073be007856fd9cbe01b1570d4a0244ba98 SHA512 d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823
 DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674
 DIST darkice-1.4.tar.gz 364782 BLAKE2B 6097ddc022c4ac8dfba2deea2b6ab6e6ad86e49cc542d573572643faf6091a2ed2996f0e5c24045c22a60e972e4222c2ecd80342b2641fae52610778b9775aee SHA512 708ab08a45e216dce350f6cd36374e10d4606f77f0cde4dfbf35675d9d0778fb7a013b49fd62d713039d5fcfb9e7d66e6b7ae14acf1e5f142685eecdf7a865bc
-EBUILD darkice-1.2.ebuild 1432 BLAKE2B 4b891be0777bdcb207018dc8bae3e4627b8ef6c70b49c7563d27b9c0983ea625ac1f9feeab66bafb0382d51c425a473b8727c746363d58116caa9f8155731968 SHA512 0a5a6eeebbb1bd28dc117939a504981872ccf9ca010123d7b8dee40c3f3343776804bfcc736a231791b83f63c3b149b52de87190ddd2d9b3cddc424f08a7d754
-EBUILD darkice-1.3.ebuild 1257 BLAKE2B 027117e47505abf7c0433953abe71c25f1d2abe658501ee972f414bc9d80348e6b6e7c96e7d2a7f3d7149671db440db9146c320491ec25c7fc04393849b79e93 SHA512 0ea41c7ccb8ad071207fd1fc064abdb09f0ca4f2050e6807ee749fca0dae9ed302d0e7583776131fc2aa62003094877ad3868d024882ccf938f45c9dc2c2e883
+EBUILD darkice-1.3.ebuild 1256 BLAKE2B d52b4d5ea2d885e1fdc23e8dc8fb531073ffea47633eb1b7c5d2f27db47f02a734638de1e77e30f09e5923d0376740d68b4da596a95a5a7945f6f4cd3e5eda42 SHA512 5fdde41f5a0874799e41a89e737e559ee4f58351c884979f8e39e0050517ffb6d4ec8fe1eb76b871a4b92dcadef179b402baf6e26c829ea3703bc963781a5a13
 EBUILD darkice-1.4.ebuild 1277 BLAKE2B d5106bb22bd49f0561ffcac079d1ceafc96ece74ef2d96d9d7828d834e46df9bb54faa5677933a6e4baf9806d04079cf936aedc33fec236c4b217a26ab5db5c4 SHA512 bc8061f7ff7545b317af30ad76bd7910d4ed00a730adf1a8cb3cd7b77e4aa4b1908203b77a58be4266a478b7ba596c6fb1ee1aefe9abaad3bacf7b8dd2e39c20
 MISC metadata.xml 524 BLAKE2B 05c3bdca6fd593bae9aa6dd13f05e5953ad8143737121a3f021b4862d3d20c90448efec42a3d37bb17e3e3651247a0c7d3f3f486bfd42ceb2508f8bc33cd9bef SHA512 4acf731ab9d985087d227f1090c5ffdd1130c6d9e20add6f2bd69aaf381c0e18e4a85852346f7a91f27e785065e14a6ad6aa6bedf47cc23a18f172c969d164e3
diff --git a/media-sound/darkice/darkice-1.2.ebuild b/media-sound/darkice/darkice-1.2.ebuild
deleted file mode 100644
index 959c5f101b9c..000000000000
--- a/media-sound/darkice/darkice-1.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A live audio streamer"
-HOMEPAGE="http://www.darkice.org/"
-SRC_URI="https://darkice.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc sparc x86"
-IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
-
-RDEPEND="aac? ( media-libs/faac )
-	aacplus? ( >=media-libs/libaacplus-2.0.0 )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	mp3? ( media-sound/lame )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	twolame? ( media-sound/twolame )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}"
-
-# Version 1.2 doesn't check for opus as input codec (bug #593790).
-# This is fixed in version 1.3
-REQUIRED_USE="|| ( aac aacplus mp3 twolame vorbis )
-		|| ( alsa jack pulseaudio )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-}
-
-src_configure() {
-	econf \
-		$(use_with aac faac) \
-		$(use_with aacplus) \
-		$(use_with alsa) \
-		$(use_with debug) \
-		$(use_with jack) \
-		$(use_with libsamplerate samplerate) \
-		$(use_with mp3 lame) \
-		$(use_with opus) \
-		$(use_with pulseaudio) \
-		$(use_with twolame) \
-		$(use_with vorbis)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
-}
diff --git a/media-sound/darkice/darkice-1.3.ebuild b/media-sound/darkice/darkice-1.3.ebuild
index 7965e18aaba3..630f69949edd 100644
--- a/media-sound/darkice/darkice-1.3.ebuild
+++ b/media-sound/darkice/darkice-1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc sparc x86"
 IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
diff --git a/media-sound/darkice/files/darkice-1.2-gcc47.patch b/media-sound/darkice/files/darkice-1.2-gcc47.patch
deleted file mode 100644
index e10439f27e45..000000000000
--- a/media-sound/darkice/files/darkice-1.2-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- darkice-1.2/src/PulseAudioDspSource.cpp
-+++ darkice-1.2/src/PulseAudioDspSource.cpp
-@@ -43,6 +43,8 @@
- #include "config.h"
- #endif
- 
-+#include <stdio.h>
-+
- #include "Util.h"
- #include "Exception.h"
- #include "PulseAudioDspSource.h"