[gentoo-commits] repo/gentoo:master commit in: profiles/base/, media-libs/mediastreamer/

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, media-libs/mediastreamer/

[Michał Górny]

commit:     b404c2ee2e7aab1f5826a69f8ddbbf708015f704
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 14:55:36 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 15:33:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b404c2ee

media-libs/mediastreamer: [QA] Punt removed silk support

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild | 3 +--
 media-libs/mediastreamer/metadata.xml                  | 1 -
 profiles/base/package.use.mask                         | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
index 21fa421ab66..f600c88f581 100644
--- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ppc ppc64 x86"
 # TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
 IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
 	ipv6 libav ntp-timestamp opengl opus +ortp oss pcap portaudio pulseaudio sdl
-	silk +speex static-libs test theora upnp v4l video x264 X"
+	+speex static-libs test theora upnp v4l video x264 X"
 
 REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
 	opengl? ( video )
@@ -72,7 +72,6 @@ PDEPEND="
 	amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
 	g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
 	ilbc? ( media-plugins/mediastreamer-ilbc )
-	silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )
 	video? ( x264? ( media-plugins/mediastreamer-x264 ) )
 "
 

diff --git a/media-libs/mediastreamer/metadata.xml b/media-libs/mediastreamer/metadata.xml
index 4f26788fccd..dd4bdefeb44 100644
--- a/media-libs/mediastreamer/metadata.xml
+++ b/media-libs/mediastreamer/metadata.xml
@@ -15,7 +15,6 @@
 			packet</flag>
 		<flag name="ortp">Enable usage of <pkg>net-libs/ortp</pkg></flag>
 		<flag name="pcap">Enable usage of <pkg>net-libs/libpcap</pkg></flag>
-		<flag name="silk">Use silk (skype protocol) codec plugin</flag>
 		<flag name="video">Enable video support</flag>
 	</use>
 </pkgmetadata>

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 7c2451a16a8..961109f8df4 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -53,10 +53,6 @@ mate-extra/mate-power-manager pm-utils
 media-video/ffmpeg schroedinger
 media-video/libav schroedinger
 
-# Pacho Ramos <pacho@gento.org> (04 Nov 2018)
-# media-plugins/mediastreamer-silk will be removed (#599580)
-media-libs/mediastreamer silk
-
 # Pacho Ramos <pacho@gento.org> (04 Nov 2018)
 # cman and co. are going to be removed (#650738)
 sys-cluster/pacemaker cman