Remove support for radio. Bug #507940. Thanks to Nikoli <nikoli@gmx.uss>

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

3 files changed, 33 insertions, 29 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index c9c8e33a6f9b..d4e40d26b354 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.67 2014/04/11 17:07:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.68 2014/04/18 09:53:47 hwoarang Exp $
+
+  18 Apr 2014; Markos Chandras <hwoarang@gentoo.org> mpv-9999.ebuild:
+  Remove support for radio. Bug #507940. Thanks to Nikoli <nikoli@gmx.uss>
 
   11 Apr 2014; Sven Vermeulen <swift@gentoo.org> mpv-0.3.5.ebuild,
   mpv-0.3.6.ebuild, mpv-0.3.7.ebuild, mpv-9999.ebuild:
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index fe059c4b8939..9499929b1e46 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -9,23 +9,25 @@ DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e
 EBUILD mpv-0.3.5.ebuild 6090 SHA256 eb6babafd533be9194f9c1f77cddbb5283165a5c9bf533fdf7d3483cd58c8927 SHA512 91c8089bfa31f5c37fbf88968fcd16d764a5f03ff27242237f4e0d7df84fca34fc19a00dd470fabb423e5ae92b602749394b1306a15c5e647fee7a5da0fc87b9 WHIRLPOOL aa235db1e58a3fa16111332517c193966e611ae2e38b2d133f5b97d011fa53dd426e7f7f1ff1e60cf16fbdc1aff021947e12d32b6b430fbb3c211006c6041496
 EBUILD mpv-0.3.6.ebuild 6110 SHA256 2d6bde9d8c523a7734f7bd182e99d137871d92e37090c06145c4c82976d0ce36 SHA512 b263d08f18c8e56c129719145e440ceb94874e8af5ecf00bdb5c8b7b10acd4d3af6c3bbaaa1fb8c73528c22934b60f1d4e50e0ef7c8adc20a3d1831f4acc1c06 WHIRLPOOL fab9c3af18b8bfdbf80ee4b04608a2d10ede8c4b81a7517ca198f5bb8a0952142061d8c00e5f0207d47dd59245c672bc88aadad1db362554147c7150b49c2040
 EBUILD mpv-0.3.7.ebuild 6319 SHA256 d496398ec35eedbab8229afd377b998ca46a87a694a472901f337ef645a38015 SHA512 8ead17b84899a2d5a7b430499f09d9cfb711bf2a4d056c00e75f72f99ea32d40d90f62348060694ea0fafccb577765a2445e0b428dd072e126b9522ec66176fa WHIRLPOOL 39319ad4020654e04f53c1266b1b5240215d129d6a6d5cea9ad8c398d027119a30aac199bd7c8ade6502673d9162223a4c87fa26bbb882915b6ef458853f59f9
-EBUILD mpv-9999.ebuild 6221 SHA256 c3927700fcd16a4a836152c72653cda51fe4dbaa3bf17fdc45f40e2b67cf0d14 SHA512 d152a24f23175edd53e7149afe574f00ff535f6a3fc6ebf86c4e2ce4c836b3252942b3f0e17e877d509c63f137e1394fc00b72b789547809335d70259ffa4c7a WHIRLPOOL 9260ccade46b9b2de365d6e63d4d35d8cde8ac0a0678e2477bb47a671a439b0efd28cdc0644dc5fcbc4b4e0dad670241cde85f7970cf082b92cedea2ea0d592e
-MISC ChangeLog 11336 SHA256 080aaaccdbed049344ff4633323c8a90ff01f08a552c52f19ace613a15fdeb7c SHA512 71b67fb4cee0134ff3fda78924de1130fc40561ad6f4fcd8eb99e584ad5bde855eced7afaa0322f91bc48fa693a380b54fa74a573c4662cd76a072522e04e817 WHIRLPOOL 1cf9792bc86f1913b234bb4daf71d3fecb17496aa42b9827e065950d3a0395ef1a5e05c970060d159ce3c043e47c25be3e7b8f17ff7a77a08f194bb740b664b7
+EBUILD mpv-9999.ebuild 6162 SHA256 58bdcdac675f8647319718dfbce16272a1ed0391bff8351a051c279f943d04d6 SHA512 6fd70deeb47a331039402630458fe81f294eb6c012b8c28095db3621a875569b3306d339fb85a126835b490661174afe9313692edbb97b2b84f58c70b7454b1a WHIRLPOOL 0b6a09ca75a16fe299ae9ef04961ad56042325cbb84243d341087252bb9679d645ab08322545c6488f480b3631aedd5dfd10c229df990c66515063ae2d71b89f
+MISC ChangeLog 11485 SHA256 73bf1ffb49dd02c55978e87cad9eb41343b0511c4ec5df94d28c52c80a66dd5b SHA512 b3d107c30b715611468c9509390c549a2541cc984d0bebf07a2dc5e4ad1d63a3f42f3d0bff1b278dd78781fb8a9b9d5c0db96a0e9f064b84cc134a1118f04363 WHIRLPOOL 8c000710fdedb8a74a1874b7133363a79fef0803d2e547babb385f6fd37e435efdf0d91aca94e96d4f61406b5bf7bb6e61cc0f5a9b300ed6d74becaf74022dde
 MISC metadata.xml 1620 SHA256 60d7a73fa77f8661f6204f27caa17f15e39b6e041f5ce59892892dc020f7383c SHA512 177b6fec28434ef1e1841e32208b105ebac273d2599d75007b439a780e9f1c44d6d54414dbad98bcb226341ac97117c76853d549fabb53fdd523d1c515e141ab WHIRLPOOL e66aeca0056f563525393c42bab276bc3b7917ef925be8e0a1d17072a15d9a91002d8634be9e750cc85615aa27bc66335c4bab7a9297c9b4460ef6c54e1b7a88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTSCFZAAoJEC7dUkA7aK9HrjsP/3yCr4gaAInPZEUBPlNTFs4c
-Ow5/zey/pNe8kIKRyCFmpht8zAdyJIzLq3SgU6tVNaIomwQMHNb4MMBYnuGgpYYh
-FjZ4HwwvD8HqNcxjiO7uopF/BhVtBclnsVfLvZQ8h5rQACd8f8GPKYGEscKO76Ib
-HkZGc/91/AmVDr3JUL/JQfA3u+t5aTksnL151jSyHyoSCOgRYjjonmsbsKKDoNsn
-eEnFmUWsGLXFIHZgqyXyqMdupcmpxglfoeVbWZH/XapfBD53GT47KZlKuKHOhJGT
-0E3pBcpm7MmVOHOkmaLgKAf4j7y9XIy5c8khIT1L+bR/9XKhm9Iewc36cOyg9ttZ
-jnFyNT7Rg0HmbkwI49y5p2KmqjxH8GoS+wdlvsts6WVxoqQNepHsNcdbDk3GVY3z
-Bn5WkhyHtGrt8Chw9335mZxBGUwNiF3VT4p3O+yaSImE4i6zL/DB4WE9UgU5/O8c
-VfLfLpHqmv8+uJLyR18R/UDCVi5kyVTwheSs2K8wjlPdxYytx3UB80QFyPah2m81
-QBHbgF8fxZO1Wzs8aNS+2I2a96Q3Rrk6tCf026nYQwZUuc9eZcxABjf3487WI3Ah
-VlW4sqGzPDgFOzCtCagk35DQcEACY8lZRRS5fLCE0C+E5zor0kXgKXQI0gY63Ed4
-Q/QRjp0UlaH19rLTYKMm
-=dsbE
+iQJ8BAEBCABmBQJTUPXbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88MOoP/jEXCwqr+MjEt8UL+qWfL/G6
+lRkCglLM7yRpd0gdW/4Tnscpik7ntOxscuH9Wvclbqq8SswY0X7rwY29NgBzUnoK
+85tqcZsPkWGFhpHuWL5oUdBdQeVAIMsHQFVyIaCnSdAPnCcKJGT0ZY3N7ZNYKFzh
+dKdlrVP/IK9oaKcX6w3QS9kz39ZuCoqZIDQwEdlcoDwcckVlKNyqQLdavDsOx5Ob
+0K2/nLZy0fwGtwqrlb144KCI0Va9nMgw3lr6d62qaKGvvovIvZWRTVTyQte7IbOH
+23F0RhVjmQVD3pRdjkG1bbPXkR4BTPxu4okfhA0I6Ue+NWepGT3iZTVGvaQTgcTO
+8E+Xi003JDxkYmnUNZo0TJ/by64sJD6TO3nI6jdSJNvqNY+ECpXI5X4BCorlKBVI
+kIy9Xo+2ul/vQpzzFD53/wNbclXPxndc/DxpYAF6B6taJnwuhm3nZ6pIaAKG+RNZ
+IUEH5jUVOGJL3YQIq7AufGbQubQHQrvcYsZ2WVOofiMWAcVVgazCK9ukBK9M3DXB
+Oer1N0ODtF3q/xknikl4/8xVwMgk+ESBoOQAT3pbV9iim+K1Z9BPhCwdQRagZNmv
+Qv/3zxnwj7hCBkO9Jv2AT3WE8vzqpafkvaJP2fkePMUBWT2kSXNx076G9T+SIO82
+l7CFpWTN7WCl0JrlZ8P4
+=ATve
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 23f98274c332..6dae157565b5 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.44 2014/04/11 17:07:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.45 2014/04/18 09:53:47 hwoarang Exp $
 
 EAPI=5
 
@@ -23,8 +23,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick
 jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl
-oss portaudio +postproc pulseaudio pvr +quvi -radio samba selinux +shm v4l vaapi vcd vdpau
-vf-dlopen wayland +X xinerama +xscreensaver +xv"
+oss portaudio +postproc pulseaudio pvr +quvi samba +shm v4l vaapi vcd vdpau vf-dlopen
+wayland +X xinerama +xscreensaver +xv"
 
 REQUIRED_USE="
 	dvdnav? ( dvd )
@@ -34,7 +34,6 @@ REQUIRED_USE="
 	luajit? ( lua )
 	opengl? ( || ( wayland X ) )
 	pvr? ( v4l )
-	radio? ( v4l || ( alsa oss ) )
 	vaapi? ( X )
 	vdpau? ( X )
 	wayland? ( opengl )
@@ -45,8 +44,8 @@ REQUIRED_USE="
 
 RDEPEND+="
 	|| (
-		>=media-video/libav-9:=[encode?,threads,vaapi?,vdpau?]
-		>=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?]
+		>=media-video/libav-10:=[encode?,threads,vaapi?,vdpau?]
+		>=media-video/ffmpeg-2.1.4:0=[encode?,threads,vaapi?,vdpau?]
 	)
 	sys-libs/ncurses
 	sys-libs/zlib
@@ -63,7 +62,7 @@ RDEPEND+="
 		xv? ( x11-libs/libXv )
 	)
 	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
+	bluray? ( >=media-libs/libbluray-0.3.0 )
 	bs2b? ( media-libs/libbs2b )
 	cdio? (
 		dev-libs/libcdio
@@ -103,12 +102,11 @@ RDEPEND+="
 	quvi? (
 		>=media-libs/libquvi-0.4.1:=
 		|| (
-			>=media-video/libav-9[network]
-			>=media-video/ffmpeg-1.2:0[network]
+			>=media-video/libav-10[network]
+			>=media-video/ffmpeg-2.1.4:0[network]
 		)
 	)
 	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mplayer )
 	v4l? ( media-libs/libv4l )
 	wayland? (
 		>=dev-libs/wayland-1.3.0
@@ -165,12 +163,16 @@ src_configure() {
 	# do not add -g to CFLAGS
 	# SDL output is fallback for platforms where nothing better is available
 	# media-sound/rsound is in pro-audio overlay only
+	# vapoursynth is not packaged
 	waf-utils_src_configure \
 		--disable-build-date \
 		--disable-debug-build \
 		--disable-sdl1 \
 		--disable-sdl2 \
 		--disable-rsound \
+		--disable-vapoursynth \
+		--enable-libmpv-shared \
+		--enable-client-api-examples \
 		$(use_enable encode encoding) \
 		$(use_enable joystick) \
 		$(use_enable bluray libbluray) \
@@ -194,9 +196,6 @@ src_configure() {
 		$(use_enable v4l libv4l2) \
 		$(use_enable v4l tv) \
 		$(use_enable v4l tv-v4l2) \
-		$(use_enable radio) \
-		$(use_enable radio radio-capture) \
-		$(use_enable radio radio-v4l2) \
 		$(use_enable mpg123) \
 		$(use_enable jpeg) \
 		$(use_enable libcaca caca) \