gentoo resync : 15.05.2018

26 files changed, 66 insertions, 427 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index f35f3d52774c..7a0dc43d759d 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest
index 309df1cb349e..86a86fcee5d0 100644
--- a/media-video/dvdrip/Manifest
+++ b/media-video/dvdrip/Manifest
@@ -1,6 +1,6 @@
 AUX dvdrip-0.98.11-fix_parallel_make.patch 880 BLAKE2B 3011cc4503bedfd056f6c587d65cf6bdd42d481f09f5c3644d8337ea11053fb6b91a0d88112385969c3592c8407294b8d1c661701e2b4f27ef4339e096125c80 SHA512 0fabe81659cb510357381d99ae8eea73a6a986e7c646dfd6b0fb7d38920a8b7cf9e79cb40a3606cb88a97f7ff9250d5e64aefb0fa599b9d9e6ae4ce91e692fb9
 AUX dvdrip-0.98.11-libav.patch 1183 BLAKE2B 68681c5c67b619fcf3a5b4e8d3b2023ef0c9f2f582804e95e09e9197a026879b5db8d3af65d79051558b32a5673d8bfd6d058378a9666cef1754d558f956d8e7 SHA512 38a4d034acb9f4cc0dcbe7deb274d820be5e8b623b8852316599fa76dc6407c7a0dd1c8fa204c659d075f0f5a0a7f73e99f6ca978859e845cc88b99ee51042ea
 DIST dvdrip-0.98.11.tar.gz 2075302 BLAKE2B 875ea2d9ee679657b7bebce10ecf037a2467f7e61a8ae8f9417bbb93115368d439e1347b8e0f9c9aae88e8e6d0886ac7dc9b5650420618231550994cca0b65ff SHA512 8bb2e4cb72666ac3f7d1953e02ac868070503f00b05ea39b4961f54042088d07abd4ef020a9cefec11e96e965d84dd95d00288e7562d92551f480ccba88b9dce
-EBUILD dvdrip-0.98.11-r3.ebuild 1988 BLAKE2B 54c9f1e3320a1c8c5ab0460b3a303837340896fa43921088af7d202b98cf63b0ebe5b21ae948d6c7466515ea69ffe85a3ef9f3262097a5f0fedd5e0cfc5af1cc SHA512 b9fe7daaeec204ed2c8bb15a29b1df39444c9ff4aa188ed810a7c02d5dfcf4e14847f6a2a203ba9d169110d9a543687f5e451e5e49e435d4f8dd8b90fb07a356
-EBUILD dvdrip-0.98.11-r4.ebuild 2141 BLAKE2B 73735870420ba16f8592c0756dd21012e6a1d47c1a9209515095495ab2d4f425019e3f399843d4b724ac143b9f99e53334ed0e8f11548d12339f1cfe68ee0082 SHA512 02dc035addacca9fb444cbcefd36d4d93c1d6ce747d9ef36edf29c46763e3a959538ff2caec98cfc95868b1c0926d4edcdb5d12078608b21df53d7c1de3796ec
+EBUILD dvdrip-0.98.11-r3.ebuild 1990 BLAKE2B 6abf8a9b0006f2b00445385c4352434f3d04fdcba7e4fe120f2e91a0628e81d2cecf7bc0237840fba8dc55c5c6090f4d584c692c25ffbf579264dce007718a76 SHA512 c9514775bac93f552dd5e28d2feb0dc8e0b11eb273d5e74b44cece1dd33884b00276649b2c7a6b20a7f5e095f97d551ccd5db49693afdd4440e7ea1a5e67c629
+EBUILD dvdrip-0.98.11-r4.ebuild 2143 BLAKE2B 0c7cbffbf08911cdce1c091b4b1453d0ee127445c5dd8bf4369a71ca1fcd9860f974267aaf606d85f5176cc5817cc76ee69f11d28553e7992a4ee12bdfcafee1 SHA512 41b00b4e066ea39d5085b0cf755bb13ab432f5c681151d0e851a90aa01a72851dca07af8eac8aa2bac5999224b1ca49a5890f7a86e5f07bc0647069556982299
 MISC metadata.xml 389 BLAKE2B 85a367f916a737f8a0010c54746610a34408c68919ce3d8b6728203597cdd1d155839c20e50de6565844c63d27f9e7305aba8d5ec1bb6b7e82384e577c2657c7 SHA512 f9762a6801b0f060cff8b36f328729aa20c71ec34fa33be7c6088e20004d3b42ac4d45b60c82774d7519b6be09b76aa9ea06b18fa252300b47fada916620ecfd
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
index 68bdf3b77ddf..3c99edbd3c5c 100644
--- a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
+++ b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils flag-o-matic perl-module
 
 DESCRIPTION="dvd::rip is a graphical frontend for transcode"
-HOMEPAGE="http://www.exit1.org/dvdrip/"
-SRC_URI="http://www.exit1.org/dvdrip/dist/${P}.tar.gz"
+HOMEPAGE="https://www.exit1.org/dvdrip/"
+SRC_URI="https://www.exit1.org/dvdrip/dist/${P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
index 3eaca7e3509d..fcad2bf424f5 100644
--- a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
+++ b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils flag-o-matic perl-module
 
 DESCRIPTION="dvd::rip is a graphical frontend for transcode"
-HOMEPAGE="http://www.exit1.org/dvdrip/"
-SRC_URI="http://www.exit1.org/dvdrip/dist/${P}.tar.gz"
+HOMEPAGE="https://www.exit1.org/dvdrip/"
+SRC_URI="https://www.exit1.org/dvdrip/dist/${P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 16b4df910ac2..1d4fb1434faf 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -12,6 +12,6 @@ EBUILD libav-11.8.ebuild 11090 BLAKE2B bce6ee5af8fb86a4ca1c760fff386b4e3c7c70f4b
 EBUILD libav-11.9999.ebuild 10990 BLAKE2B 2bab5e0b48d1d490d35c991fd74f4629a0de5b5375d7f9955c0d49c4f7a35fd6f1cfcc91b09833d89dc8f4fe01a29b0ab9058887c2ab2a299a957c0a6acfd50d SHA512 d5a1a7ecd91dbf0bad318ec8c5705afff4b12fd956da8e2a06ac7de002dd23e3dd8a86b5e162097901617d52ca0bdafd5ccc09b08fec51dc9b249d2169b58d90
 EBUILD libav-12.2.ebuild 11371 BLAKE2B a558cbff15f22cd682d718a54f92bd2649fbb599ef4c381ad955c4bb96d9481f478e4248c9551b64b069193ce1d5a54b2690be837972d8b183c836a2e1bdb124 SHA512 b49a1637c76d20c52ec9dc7abec7924251f1bf6f4be618cf469d6fd7d317e07046841f3e25a74bb3860aceb0d928335feabd9a42bb2b9d296648e1d70efba861
 EBUILD libav-13_pre20171219.ebuild 10790 BLAKE2B 5a33e384d54549ec4fad1c082022b9d7187c3e3032461c38a1e237683e6e27b400a7bf23bc220fde169b1b2d7fd59b50620dbc4c4d9d2c8b2df195fbd3d4be05 SHA512 764fbebd1a086913e2a85430732a7b56a369a02a0200f10ed6fd7fef552bf76638df65601f7e2afdbc68987dccd777c403ed2799cca096bf606e382ee2681f54
-EBUILD libav-9.17.ebuild 10041 BLAKE2B 617748930bb9951d89565e004e9d3495356e72ddb8d725393b4737a5b8f5a0a88f0eb31edb0e225a78b15c21cff902361c6129dd5c2f9c8ab637951a5228fd3d SHA512 36df276551e286588e10352731ace7123963551cdfe5e33cb6f6bcfd9de54df206fdb078e48d61b407b81ccd19cd1ac9dda01c5f9049f51de34de6ea84f913ab
+EBUILD libav-9.17.ebuild 10043 BLAKE2B d5d5cd08f4b07c3e55a89fa2c8198529b189faed79aafbc1e9d027ad4ac767002cb576b71ba898fd4fb31bb411989b5b6523eaa2514f1683739b404dc508f004 SHA512 65cb0951cee488e72d6223321e0f5946be8c2de3e9d148d192a067fc23d493476b5e17f0291f179539d6ce47f44175de9d866028d41e581050aef46c475ae976
 EBUILD libav-9999.ebuild 10849 BLAKE2B 1cccc4d2a8e55b9bc0f14d838689a253d52db1e741fe22f8b00bf2d90ab1460b0598e7c1fe9773ed7650af8d20942601698ae86e465272054ec8f5bb28b22936 SHA512 0c41cc11dd22ab4a7afe412e78e07d693a57dfbc97667a4bbe12eb294406f524d287a226ac7911ed3b6a329bf9a5b1b20d08f96d9cdb614fa947c9ef19f10035
 MISC metadata.xml 2959 BLAKE2B abfe1c0bf88198c05a25a629ae4a65829057428362cc35feb02cc9ea9abf718e6478dd605a0b79fbf40e0a41de109765b08c8adff34b3e06dfc1e77d478de2e4 SHA512 ac43516b324f96eb13b2ae4ab511c1dfffddd47293079b9b297ee3f312e92a0dc88561d55bb8d12e6bd89a8ace62670ad30b723a48708046f987cc65244bc628
diff --git a/media-video/libav/libav-9.17.ebuild b/media-video/libav/libav-9.17.ebuild
index 96df97611251..47f49fe210c5 100644
--- a/media-video/libav/libav-9.17.ebuild
+++ b/media-video/libav/libav-9.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,13 +12,13 @@ fi
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
 DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="http://libav.org/"
+HOMEPAGE="https://libav.org/"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
 elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
 	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
 else # Official release
-	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
+	SRC_URI="https://${PN}.org/releases/${P}.tar.xz"
 fi
 
 SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )"
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index ad8f88fc83fd..ba708e433732 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,5 +1,6 @@
+AUX makemkv-ffmpeg.patch 1162 BLAKE2B 17a0b850eedf830fdc95c01444be3783310b23a84db646f983c95d985f8e010a4633ee0bac175a7f27e0d26f4402e617afab18e95bf64d368601d4c19144f68e SHA512 52ac2ca86b621502f78f2f1a6dc3df713686369c4ec227597bd539b7bd55d4198d0710107d858d796d6e3503f9b9a9bc53e020e2eb0cd5a29c8897e4da00bd67
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
 DIST makemkv-bin-1.12.2.tar.gz 9137254 BLAKE2B 9dbb6ff446f76bd119fdad65a97b983badeee17f78b59d79a4cb55f22d1bff443493ddbc1be77686906e324c6dbd3c93b851b0944238e97fc29bc4503c85ef07 SHA512 25b6be8dcea8aa521f2cf4b4ebac1a7a29ed1de603c5c14ee50f94fbf6a2968bf94116ba2dc39129334fb62497966d01032da4b276563c2e819a5f62f93d4d94
 DIST makemkv-oss-1.12.2.tar.gz 4379033 BLAKE2B 24da56b6b3c356dd41d7a6f0449258c0b45cfb8f4882f130fb934911c5c42c080294f4e6445e949f840c372079f143a9b4c920e7f79ed71e553b8486bcc778b4 SHA512 d418dbb14b55bc69937d2265220b3df9dd4baf7d083ba94ff51ed5d9eb2e65c0c4dd2527076dfdcc539ccde7da24dcba94e471bef47998921f0d154330dc2980
-EBUILD makemkv-1.12.2.ebuild 2859 BLAKE2B fc304b3cc80241f3a2f07e020291ca76dca99b85b028b92a1833cde011fdbadc45b9a908371fc77f5c5f050f2a116599b0754d659f4bb4eac6c25e80d616fba6 SHA512 d8d8b25018297ecee548e46bc364953d2db2fe41cbe970b74933ec18400d03ab7317e2b5fe5606cce73de0bb31560b6bd17dbb3169f88807a9a7383de19f010c
+EBUILD makemkv-1.12.2.ebuild 2868 BLAKE2B e03723f1f3ea7c21084fad26732cb43a2b770530aa6407804686f043268726dc3bf20bd6bf4a5f7e9083eb4ce44c67910e8f408c6c3edf520abe8ba88f04f6ad SHA512 c02583d2e9a2fb7721a383004f06c9f3f70b86c0d10d6915d18b2b9dda616f49ed4994bb8af31c36783105c919616cde76b197036edd9387fc177da1c0659a3e
 MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
diff --git a/media-video/makemkv/files/makemkv-ffmpeg.patch b/media-video/makemkv/files/makemkv-ffmpeg.patch
new file mode 100644
index 000000000000..930c144d263d
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-ffmpeg.patch
@@ -0,0 +1,25 @@
+Taken from https://negativo17.org/repos/multimedia/epel-7/SRPMS/makemkv-1.12.2-2.el7.src.rpm

+See https://github.com/FFmpeg/FFmpeg/commit/7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615

+and https://github.com/FFmpeg/FFmpeg/commit/b79a7da36faa6bb5914b04800b548e99eb3b81ca

+diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c

+index 20db4e9..f08d53c 100644

+--- a/libffabi/src/ffabi.c

++++ b/libffabi/src/ffabi.c

+@@ -517,7 +517,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* n

+         info->profile : FF_PROFILE_UNKNOWN;

+ 

+     if ((CodecFlags&FFM_CODEC_FLAG_GLOBAL_HEADER)!=0)

+-        ctx->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;

++        ctx->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;

+ 

+     if (argp) {

+         for (i=0;argp[i];i+=2) {

+@@ -718,7 +718,7 @@ int __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncod

+     info->delay = (int32_t)ctx->avctx->delay;

+     info->flags = 0;

+ 

+-    if ((ctx->avctx->flags&CODEC_FLAG_GLOBAL_HEADER)!=0)

++    if ((ctx->avctx->flags&AV_CODEC_FLAG_GLOBAL_HEADER)!=0)

+         info->flags |= FFM_CODEC_FLAG_GLOBAL_HEADER;

+ 

+     return 0;

diff --git a/media-video/makemkv/makemkv-1.12.2.ebuild b/media-video/makemkv/makemkv-1.12.2.ebuild
index bcc7cf5092ec..e5003042929a 100644
--- a/media-video/makemkv/makemkv-1.12.2.ebuild
+++ b/media-video/makemkv/makemkv-1.12.2.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 
 CONFIG_CHECK="~CHR_DEV_SG"
 S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-path.patch )
+PATCHES=( "${FILESDIR}"/${PN}-{path,ffmpeg}.patch )
 
 src_configure() {
 	# See bug #439380.
diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest
index 58de0be66b95..c705c6255e63 100644
--- a/media-video/minitube/Manifest
+++ b/media-video/minitube/Manifest
@@ -1,4 +1,4 @@
 AUX minitube-2.5.1-disable-updates.patch 205 BLAKE2B 8cde17ebbedfc986c056fe3f3d54f988d39f4fa71251626d09f074e0fb72e3c313abceb510fc8afc182f16edddb3a334a29360a9307fa94d2ed865a2920341e9 SHA512 9b257652feea431d6ee115fab3ba89f07fd85163290782610b504fa7d556d03a547554d1ede10edd670b98b4b0f042d67cbf546bfcc6e07a8028de42a58b3384
 DIST minitube-2.5.2.tar.gz 1063794 BLAKE2B 511923c85efc8f4b8db621047d1887d54f518ef7f01fa1dc76a05bbc4bc8e1e0038318d2fee280b6e0f06a5e1d46e02ddc547a60f62086ea24ad28849ec728a3 SHA512 4001ea95e6d3b541e9a8a2555830238f6e3a0b4749566dfd67ae48fdc6102ec77a38e162e04fb2637cc5ff2b3dccdca541119531302332ffa3b90d9db8809284
-EBUILD minitube-2.5.2-r1.ebuild 2526 BLAKE2B 85426efeeff48fd10df5ad1887d9bef5c27f9876d402d3dd3b2f1e0cd3640e85b047cc112686681b52f38710ad09486d7789ac0dddd64a0ceb2879113d4bfd7a SHA512 aca169730389b992cf93a196510ada5e9eb9d4b3a8f8db71f0fdc5583fbd82fdccb381d4302c71ac33b710e30e2f2f0646f345d6c6584aba5fcc95e10b6539e5
+EBUILD minitube-2.5.2-r1.ebuild 2527 BLAKE2B d815780e5bd4a2ae62893c8cfcf38193cd6a1360b2651a9674920aaff13b8ed95b332d4e5cb68a6bec6b006b462f1cc9d7b62bd7abdf0d293aa694f0887a2dbe SHA512 cd663692314354db858332cc31d73e8f191cf0e0fdc21ddf150aeadb6b06f5ff3bc2b9500bb7f887a553cc50af3f0e3810a49e3bad52ee0a7fa9dfaf0360980e
 MISC metadata.xml 438 BLAKE2B e046cab12e70ee456f4cdac49a0d107ed8edf4ecd51e772a8c88ed45229a3d74e90be842c166c7e9001bf7f28625460f2b2ac01c6db2dd4384d3b70eb229b8ca SHA512 d8ba4788ad9a08c54cb75b509bedc74c06de3542f4048b996583608a8035ec256a2868faa752d1bbcac703dfdf26b21184ffd237518acc5fbf0fca9489f8801b
diff --git a/media-video/minitube/minitube-2.5.2-r1.ebuild b/media-video/minitube/minitube-2.5.2-r1.ebuild
index 3f45b976481e..97e767c3afee 100644
--- a/media-video/minitube/minitube-2.5.2-r1.ebuild
+++ b/media-video/minitube/minitube-2.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ PLOCALE_BACKUP="en"
 inherit l10n qmake-utils
 
 DESCRIPTION="Qt5 YouTube Client"
-HOMEPAGE="http://flavio.tordini.org/minitube"
+HOMEPAGE="https://flavio.tordini.org/minitube"
 SRC_URI="https://github.com/flaviotordini/${PN}/archive/${PV}.tar.gz ->
 ${P}.tar.gz"
 
diff --git a/media-video/mkvalidator/Manifest b/media-video/mkvalidator/Manifest
index dad7e15f1f38..062fa4c0990d 100644
--- a/media-video/mkvalidator/Manifest
+++ b/media-video/mkvalidator/Manifest
@@ -1,3 +1,3 @@
 DIST mkvalidator-0.5.2.tar.bz2 612382 BLAKE2B a60b64902e068b82f95f61295088dbf56ab122918e46a36043246310fcf7e4a6c7f997866a8802a119e18305acbbe532acfb7cde907499168f75436b86ad7482 SHA512 c87d89ce97f8c701f73932012af8c8df3d6e5ac8b0ee24e48000f93b0e29e02ce74250565f6a662fa0c9c2fbd9910705e1d1403ac6d2ac2fe54331ef150d00cc
-EBUILD mkvalidator-0.5.2.ebuild 902 BLAKE2B c994d2bf14b6312fff948247c6482e5f6ec2dc4a1948ca98ae0fe8d928b05b4049307b9da97bf0a821cc1a97fd0abaccb2cc69c8ca56dde725607d7fed547574 SHA512 76f3b3118045d5ff688e404e5f02cad909c299a8dd62d91448b446dd84a1c3b935dc10aec9fa97ef968d062f94d94e06b3b56c59bba1cbb5497b5df404ebea9a
+EBUILD mkvalidator-0.5.2.ebuild 904 BLAKE2B 169859e797b251c69f3428836babf5416c4cd435dccc81f957e936a32a94291f55a0cc7c7d0fedf82377cfd33f9bf64396a06f31168dfea5fe09a40423896962 SHA512 9b36534bdd0068077da2814aab0cb72a03dc605e7e2626a2f753d8e6a0b277d9fd4fb85495b05c471d192629852e5cd29b448e4c2d7ae26a29cd5a57e371ea5a
 MISC metadata.xml 637 BLAKE2B c103109a8fa0baa6da05fc578f9ab0ed02057f362e73a097630468291b2a8f04ea56e11c2fbe6d198a44e1d33bdc1c88e35163b8909d2686f28fca7677390a41 SHA512 5fb4d548f51476d67d42f1ef830303f45e0f6aba344f943c017a111518aa575998fa89312112dffe140681ba92a04eb98eee7d32a86ea876405bb6de67c8751b
diff --git a/media-video/mkvalidator/mkvalidator-0.5.2.ebuild b/media-video/mkvalidator/mkvalidator-0.5.2.ebuild
index 3e4f279a6c73..45d0756c3054 100644
--- a/media-video/mkvalidator/mkvalidator-0.5.2.ebuild
+++ b/media-video/mkvalidator/mkvalidator-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit toolchain-funcs
 
 DESCRIPTION="mkvalidator is a command line tool to verify Matroska files for spec conformance"
-HOMEPAGE="http://www.matroska.org/downloads/mkvalidator.html"
-SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://www.matroska.org/downloads/mkvalidator.html"
+SRC_URI="https://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 03219757039a..ed6bca1750e1 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -3,14 +3,11 @@ AUX mpv-0.23.0-make-libavdevice-check-accept-libav.patch 694 BLAKE2B 655bf30240a
 AUX mpv-0.25.0-fix-float-comparisons-in-tests.patch 2096 BLAKE2B 88cfe962f3c9901e39837a8c890d0d07f362f3f5b2c1d9adc6cadffddb19bf38b918c76bdeb1d634a62ad09115c1d4adcfe218a3202843542d1d751e60e1d449 SHA512 46fdb40f0eafc9fdbf180d0334de5b57a3949b4479835750462414a996272da3ae816d62f58fc986f448045e4e8f8121cebbad19a0a031c589f5ed346a210875
 AUX mpv-0.27.0-add-missing-link-flags-for-rpi.patch 988 BLAKE2B 2dc3c70dbb0565db93fbaa9852e37afd1d953e896bb820095afdac8bc8d1bba52fca07173a63d306990e7c72611afb40e22a21d1bc8293b69691d4f5252c2753 SHA512 bb204c5910d927d3dd159fe17f8edecbbc80a9d36b60d83f08d10181e019fcb140a701d2b3d4c6436d08ef0ebe95fb81bb5d7467c2b63a1b098ba412defeea32
 AUX mpv-9999-make-ffmpeg-version-check-non-fatal.patch 1461 BLAKE2B e87177c8e726d2599a7037734c4128a4ebdfee5a17a15287f61ae70d880cd4262418396efcd976beca9cfcfbb84158051e217eb2be793208e72f0513a3256f9b SHA512 26c3020cb1f531611358d2a16bea3e26926292abb4b40694f4357c4d36d2bee17edbf317f9068c7364cda35cc6e27e2fe9d23a284b1da8d136bed2f1e0cea64d
-DIST mpv-0.25.0-patches-r2.tar.xz 11036 BLAKE2B 09fdd566c5fcca290829c536c9e41b655e254d64e63714281119d62e6963f07f8d384eccb3f8ea6ccb2a9b63a60e19bb7ff1fd4b8e4ccccdc9b1fd8e58a7c628 SHA512 fc8d2a23dff27131d2c18d3f91861ec6e6d5240e6531d1a04c06ebef8d5467250c4f131d9faee802842e1ea485dbf350b43a3eebcc13c230cd45ff875fc855e2
-DIST mpv-0.25.0.tar.gz 2874584 BLAKE2B c64321b50fd635f82bbcbce5cdefee1d0da011558cebdacd3339aaa14162f659c955bea75341ed21096eea5b689e4c1ca4d2d97feff1f4026044ddd61bdd9944 SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf
 DIST mpv-0.27.2-patches-r0.tar.xz 6564 BLAKE2B c02efea40e0b19d60eaa49520988464fbf4c9221108cbf19021934dc0cb0a975dab148ec1ea03753d81b8035173e3e5bd74b262ab5675d9fc5dce4a0f75ea37c SHA512 d1c955c32082338f5c7f1cd8268471ca0ac6dcd817c5fe39fb82f0e8bd3babf6f2f954d4ce52e9be786e5527df75cc6f4f3de8106a3517c8a1d8e39be1b4ebbd
 DIST mpv-0.27.2.tar.gz 2957191 BLAKE2B 35e316e5a30869ae44ff229e99ae11a88e2f7d55b55946bfb752d5ed2d8212885c0c2abb59c9ff6d23a72daee47d80f44511313d67ee6fb265e6681ba4b89ee1 SHA512 bf74a150b3732b8c233362e0902c54f85fbea9ca1765a2a8f946a6eecd9b37a72ede36a36d0dd98a770539c4f81fe24c8ce26be9db7cd6eddd8514a8f82d9cda
 DIST mpv-0.28.2.tar.gz 2982558 BLAKE2B 5faef4122d456916f43bd603192fc72dee1ad16fa3c842d54a2e53dc8f9db416545549a86af62481fe211dc088821ab13b832c09f82572b36167dd3a73d57f62 SHA512 e6206e8c65dca084e2cfa73ab09278b7113cdfd90b89877d1f75a1068c6379a093ea3955a023857357683edce1aba8c12ee441fd195d887af4d939fc7b66cef4
 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
-EBUILD mpv-0.25.0-r2.ebuild 10902 BLAKE2B fa9ae811c53d01d32b8288696436783f9cf434d04255c45ae5efb73d68821afe5bfc3a2548fde646e11b35b4329ca61fc4bf3d18e7277538274a10440cde9069 SHA512 00c1edd4c77e859fc03d8cbadfefa7278bceb94d788d1306478fbf7b7535225c15e6dc65058eccf8251b9e6f3a4f9ce7ba04bfbc2065ccff13416fc5a32ebb7b
 EBUILD mpv-0.27.2.ebuild 10508 BLAKE2B 37b3ba28fee39f4e5d54e8009888f2a2cdf6568b236acc43e58be9fee72c60b7140904c57db8ee9cba46698cc764908705076df3940e55858a141d59ab6d7a86 SHA512 ebf1bb73a7189768a522ac3d86d33eb63dd97459bbca488a08fa78554316d3ab28e7cd54ab80dd449b55b05dbd0dc00a0f3353bd18ca3fed7444978e0bf02aa9
 EBUILD mpv-0.28.2.ebuild 10150 BLAKE2B 6a578bb33d95a3f3f9a14e83415797b0db8958c6ac914154c864305721c7f25ffe8d7733a64e9cbae3db23bdffb157e9e35ba0aa2c5880f805cebd404bd14798 SHA512 0086735a3d64b4c918c24556d8738ab0f7a739d957f308f9ff5db7158091bce2febfdbe2056199f2a7d68bd6a1a1c93529c1bf58abab669438a6bcbe74776fe3
 EBUILD mpv-9999.ebuild 10052 BLAKE2B e947ea5eb136b6aa23a1fc605adb0c92f342437c37e80f11baf4c2c7d4d2c595b9bc41a3ab77725c80b440d4d06657d1007b4d3eb00c4224672ee5387991fc3a SHA512 0a8ae56b7c4769d96631aba34463a9ef9bad549d5db3b922347f97a40c8b2b40e6dc83b10c6bf838f224163482ff1d963a02c3c62d6fea354764275974ff6bd7
-MISC metadata.xml 2281 BLAKE2B fb3fb9a0a5798b9735a654b0b594961105427e03947709a098d73555844a52c38e961802cb3a5fe286dda25b5d502c8052dc874be3a5e509f2a7ed428aeea6a7 SHA512 cc2b169845069766379912edf2c30fd85fbd2d7bb584d18e9a4f599af6eb29e89e87dab8ac2d3f7a27ac5da7aec8edcd5b60c5c909821383b62e82c251931817
+MISC metadata.xml 2189 BLAKE2B 00ef1b58d48470241e6d1fa451a46ac73c6719c30531380edfb8af0c52441fb2f3e90f6bcd0aec0ab6b98dba7f9ebe8491868e3939e71128af139efb38b08c3a SHA512 68e4ca79451d81ba5cd16f0042d2177a1002135e6d2bdefe6aa3e9670ddd3f7b6a5239245de4ae89f71b49878c6bd43122bd7d860f61ced1f704f9e90439b930
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 597c2ce92a71..df0200d2936c 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -33,7 +33,6 @@
 			(Note: these outputs exist for compatibility reasons only, avoid if possible)</flag>
 		<flag name="tools">Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv</flag>
 		<flag name="uchardet">Enable subtitles charset discovery via <pkg>app-i18n/uchardet</pkg></flag>
-		<flag name="vf-dlopen">Install additional video filters to be used with -vf dlopen</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mpv-player/mpv</remote-id>
diff --git a/media-video/mpv/mpv-0.25.0-r2.ebuild b/media-video/mpv/mpv-0.25.0-r2.ebuild
deleted file mode 100644
index 636102c7fe78..000000000000
--- a/media-video/mpv/mpv-0.25.0-r2.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV=1.9.8
-
-inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="
-		https://github.com/mpv-player/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~kensington/distfiles/${P}-patches-${PR}.tar.xz
-	"
-	KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux"
-	DOCS=( RELEASE_NOTES )
-else
-	EGIT_REPO_URI="https://github.com/mpv-player/${PN}.git"
-	inherit git-r3
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
-	dvd +egl encode gbm +iconv jack jpeg lcms +libass libav libcaca libmpv +lua
-	luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl
-	selinux test tools +uchardet v4l vaapi vdpau vf-dlopen wayland +X +xv
-	zsh-completion"
-IUSE+=" cpu_flags_x86_sse4_1"
-
-REQUIRED_USE="
-	|| ( cli libmpv )
-	aqua? ( opengl )
-	cuda? ( !libav opengl )
-	egl? ( || ( gbm X wayland ) )
-	gbm? ( drm egl opengl )
-	lcms? ( opengl )
-	luajit? ( lua )
-	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
-	raspberry-pi? ( opengl )
-	test? ( opengl )
-	tools? ( cli )
-	uchardet? ( iconv )
-	v4l? ( || ( alsa oss ) )
-	vaapi? ( || ( gbm X wayland ) )
-	vdpau? ( X )
-	wayland? ( egl )
-	X? ( egl? ( opengl ) )
-	xv? ( X )
-	zsh-completion? ( cli )
-	${PYTHON_REQUIRED_USE}
-"
-
-COMMON_DEPEND="
-	!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
-	libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
-	sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.18 )
-	archive? ( >=app-arch/libarchive-3.0.0:= )
-	bluray? ( >=media-libs/libbluray-0.3.0:= )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cuda? ( >=media-video/ffmpeg-3.3:0 )
-	drm? ( x11-libs/libdrm )
-	dvd? (
-		>=media-libs/libdvdnav-4.2.0
-		>=media-libs/libdvdread-4.1.0
-	)
-	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
-	iconv? (
-		virtual/libiconv
-		uchardet? ( app-i18n/uchardet )
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	libass? (
-		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	lua? (
-		!luajit? ( <dev-lang/lua-5.3:= )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	openal? ( >=media-libs/openal-1.13 )
-	pulseaudio? ( media-sound/pulseaudio )
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
-	rubberband? ( >=media-libs/rubberband-1.8.0 )
-	samba? ( net-fs/samba[smbclient(+)] )
-	sdl? ( media-libs/libsdl2[sound,threads,video] )
-	v4l? ( media-libs/libv4l )
-	vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] )
-	vdpau? ( >=x11-libs/libvdpau-0.2 )
-	wayland? (
-		>=dev-libs/wayland-1.6.0
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		opengl? (
-			x11-libs/libXdamage
-			virtual/opengl
-		)
-		xv? ( x11-libs/libXv )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-python/docutils
-	virtual/pkgconfig
-	doc? ( dev-python/rst2pdf )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	test? ( >=dev-util/cmocka-1.0.0 )
-	v4l? ( virtual/os-headers )
-	zsh-completion? ( dev-lang/perl )
-"
-RDEPEND="${COMMON_DEPEND}
-	cuda? ( x11-drivers/nvidia-drivers[X] )
-	selinux? ( sec-policy/selinux-mplayer )
-	tools? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
-	"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
-	"${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch"
-)
-
-mpv_check_compiler() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if ! tc-is-gcc && use vaapi && use cpu_flags_x86_sse4_1 && \
-				{ has_version '<media-video/ffmpeg-3.3:0' || has_version '<media-video/libav-13:0'; }; then
-			die "${PN} requires GCC for SSE4.1 intrinsics."
-		fi
-	fi
-}
-
-pkg_pretend() {
-	mpv_check_compiler
-}
-
-pkg_setup() {
-	mpv_check_compiler
-	[[ ${MERGE_TYPE} != "binary" ]] && python_setup
-}
-
-src_prepare() {
-	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
-	chmod +x "${S}"/waf || die
-	default_src_prepare
-	eapply "${WORKDIR}/${PV}"
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG AR
-
-	if tc-is-cross-compiler && use raspberry-pi; then
-		export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
-		# Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
-		die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
-	fi
-
-	local mywafargs=(
-		--confdir="${EPREFIX}/etc/${PN}"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-
-		$(usex cli '' '--disable-cplayer')
-		$(use_enable libmpv libmpv-shared)
-
-		--disable-libmpv-static
-		--disable-static-build
-		# See deep down below for build-date.
-		--disable-optimize		# Don't add '-O2' to CFLAGS.
-		--disable-debug-build	# Don't add '-g' to CFLAGS.
-		--enable-html-build
-
-		$(use_enable doc pdf-build)
-		$(use_enable cplugins)
-		$(use_enable vf-dlopen vf-dlopen-filters)
-		$(use_enable zsh-completion zsh-comp)
-		$(use_enable test)
-
-		$(use_enable iconv)
-		$(use_enable samba libsmbclient)
-		$(use_enable lua)
-		$(usex luajit '--lua=luajit' '')
-		$(use_enable libass)
-		$(use_enable libass libass-osd)
-		$(use_enable encode encoding)
-		$(use_enable bluray libbluray)
-		$(use_enable dvd dvdread)
-		$(use_enable dvd dvdnav)
-		$(use_enable cdda)
-		$(use_enable uchardet)
-		$(use_enable rubberband)
-		$(use_enable lcms lcms2)
-		--disable-vapoursynth	# Only available in overlays.
-		--disable-vapoursynth-lazy
-		$(use_enable archive libarchive)
-
-		--enable-libavdevice
-
-		# Audio outputs:
-		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
-		--disable-sdl1
-		$(use_enable oss oss-audio)
-		--disable-rsound		# Only available in overlays.
-		--disable-sndio			# Only available in overlays.
-		$(use_enable pulseaudio pulse)
-		$(use_enable jack)
-		$(use_enable openal)
-		--disable-opensles
-		$(use_enable alsa)
-		$(use_enable coreaudio)
-
-		# Video outputs:
-		$(use_enable aqua cocoa)
-		$(use_enable drm)
-		$(use_enable gbm)
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable xv)
-		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
-		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
-		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
-		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
-		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
-		$(use_enable vdpau)
-		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
-		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
-		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
-		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
-		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
-		$(use_enable libcaca caca)
-		$(use_enable jpeg)
-		--disable-android
-		$(use_enable raspberry-pi rpi)
-		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
-		--disable-mali-fbdev	# Only available in overlays.
-		$(usex opengl '' '--disable-gl')
-
-		# HWaccels:
-		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable vaapi vaapi-hwaccel)
-		$(use_enable vdpau vdpau-hwaccel)
-		$(use_enable cuda cuda-hwaccel)
-
-		# TV features:
-		$(use_enable v4l tv)
-		$(use_enable v4l tv-v4l2)
-		$(use_enable v4l libv4l2)
-		$(use_enable v4l audio-input)
-		$(use_enable dvb dvbin)
-
-		# Miscellaneous features:
-		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
-	)
-
-	if use vaapi && use X; then
-		mywafargs+=(
-			$(use_enable opengl vaapi-glx)
-			$(use_enable egl vaapi-x-egl)
-		)
-	fi
-
-	# Create reproducible non-live builds.
-	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
-	waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use lua; then
-		insinto /usr/share/${PN}
-		doins -r TOOLS/lua
-	fi
-
-	if use cli && use luajit; then
-		pax-mark -m "${ED}"usr/bin/${PN}
-	fi
-
-	if use tools; then
-		dobin TOOLS/{mpv_identify.sh,umpv}
-		newbin TOOLS/idet.sh mpv_idet.sh
-		python_replicate_script "${ED}"usr/bin/umpv
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
-
-	for rv in ${REPLACING_VERSIONS}; do
-		version_compare ${rv} 0.18.1
-		[[ $? -eq 1 ]] && softvol_0_18_1=1
-		version_compare ${rv} 0.21.0
-		[[ $? -eq 1 ]] && osc_0_21_0=1
-		version_compare ${rv} 0.24.0
-		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
-		version_compare ${rv} 0.25.0
-		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
-	done
-
-	if [[ ${softvol_0_18_1} -eq 1 ]]; then
-		elog "Since version 0.18.1 the software volume control is always enabled."
-		elog "This means that volume controls don't change the system volume,"
-		elog "e.g. per-application volume with PulseAudio."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
-		elog
-	fi
-
-	if [[ ${osc_0_21_0} -eq 1 ]]; then
-		elog "In version 0.21.0 the default OSC layout was changed."
-		elog "If you want to restore the previous layout, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
-		elog
-	fi
-
-	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
-		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
-		elog
-	fi
-
-	if [[ ${opengl_0_25_0} -eq 1 ]]; then
-		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
-		elog "the 'opengl' video output and no longer explicitly requires"
-		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
-	fi
-
-	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
-		elog "If you want to have command-line completion via bash-completion,"
-		elog "please install app-shells/mpv-bash-completion."
-	fi
-
-	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
-		has_version 'app-shells/mpv-bash-completion'; then
-		elog "If command-line completion doesn't work after mpv update,"
-		elog "please rebuild app-shells/mpv-bash-completion."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-src_test() {
-	cd "${S}"/build/test || die
-	local test
-	for test in *; do
-		if [[ -x ${test} ]]; then
-			./"${test}" || die "Test suite failed"
-		fi
-	done
-}
diff --git a/media-video/sswf/Manifest b/media-video/sswf/Manifest
index 270282f9584d..78fe88e2c167 100644
--- a/media-video/sswf/Manifest
+++ b/media-video/sswf/Manifest
@@ -2,6 +2,6 @@ DIST sswf-1.8.2-doc.tar.bz2 4330593 BLAKE2B 381e5b9b6d84e8c05b04ccdfcbbe7e3f7038
 DIST sswf-1.8.2-src.tar.bz2 3064805 BLAKE2B 53ecda8391803feabe30d4ab3c5b0a4f220f1f1deb31cd74c40b69dfd40bc77d3855f6e13a7713cae8fb0d53395f5b520190c4d02661f5f87254bbba00598897 SHA512 fe955742dfc8146cc398acc7bb46a3b0626a2ded64fe4061abf654ec6ef26b6c1cbafb8d418daef9a2ea789b171a7b410cee1fb58ef8b9faf660122f307ab622
 DIST sswf-1.8.4-doc.tar.bz2 10242097 BLAKE2B dc3000b171467772112fc1f847b5f2d8f032f5a3fc148fa98fccb3ca0297abfca446886ba2c71a8d13ff776da6ad61d7e9291fbcae19a58d903601e7e6723913 SHA512 1b756931e8b0f5af4a77d920f77db467822642edf9f03d66130f0d6b88c95162cfc75278531f1e35132e213b03c755126ec646aa2b181231d6bc82e63ac25650
 DIST sswf-1.8.4-src.tar.bz2 3087054 BLAKE2B 8ef08644f01c289c338072575a73cd2dc28e29a41bf84a9eadb5bd31b0a5bcfc3b00b6ddc5e2e8bdb5b4966cacfc0909e91f25e247b9aa5c1978d5b40d98c97c SHA512 5d82e805c69fb86873d088be017df3e3157f0c230d7635329cd1a088b74932870e51772801d3feb4cae3f31a4b646fa773c0a3154ea78b16fae7a253887f2077
-EBUILD sswf-1.8.2-r1.ebuild 1060 BLAKE2B 1b1e619f507f2c1b5ef4cb3458518cd6dbbbcc9d30a732244daa8a8c0836f0361e4be6753233c4ad8c4585861fedc4e09959b2058e42bc820bc7406d649812c4 SHA512 6788e19fb3f77de273b2d7c5a33f31e018649928547aea79e0da3c05aa1ff1c42da362aa15072a0c500b828082df3cdbff087fae463dceaf0267f1b050d1b8cf
-EBUILD sswf-1.8.4-r1.ebuild 1060 BLAKE2B 1b1e619f507f2c1b5ef4cb3458518cd6dbbbcc9d30a732244daa8a8c0836f0361e4be6753233c4ad8c4585861fedc4e09959b2058e42bc820bc7406d649812c4 SHA512 6788e19fb3f77de273b2d7c5a33f31e018649928547aea79e0da3c05aa1ff1c42da362aa15072a0c500b828082df3cdbff087fae463dceaf0267f1b050d1b8cf
+EBUILD sswf-1.8.2-r1.ebuild 1061 BLAKE2B 7550599072787bdfb3b1af164d41ca899273ec1974410582ce15725a77490ca4e4000a8aee7c1bc779c89be2f9881a98abd6ca71ea877cf781997a58fb25420e SHA512 560914e6aee2ab2a4c408be464dd09e0913a0f3b03471d179ec9f2c10a20dace0c3b674e05dae2adbd70dbfe1c0fee45f2b321fecb40e9c77b33e74135de120e
+EBUILD sswf-1.8.4-r1.ebuild 1061 BLAKE2B 7550599072787bdfb3b1af164d41ca899273ec1974410582ce15725a77490ca4e4000a8aee7c1bc779c89be2f9881a98abd6ca71ea877cf781997a58fb25420e SHA512 560914e6aee2ab2a4c408be464dd09e0913a0f3b03471d179ec9f2c10a20dace0c3b674e05dae2adbd70dbfe1c0fee45f2b321fecb40e9c77b33e74135de120e
 MISC metadata.xml 305 BLAKE2B e641cd61263ea78834d2b41554a6305172cc52fe3e7e3d2f48f4eba6b31431cb6b042d8129db7a768941907798a2c80728e681489ea573fd82b0bfe030c590f0 SHA512 e8f4672570af16ef824da298222eb2f52a07e255e6869aab59ae3271f32d82e382970328b74748baa0f7b5f0cf982e80f0eb361ba92aebe186efb40ef5862d32
diff --git a/media-video/sswf/sswf-1.8.2-r1.ebuild b/media-video/sswf/sswf-1.8.2-r1.ebuild
index 09b12077b5c1..84d1e81981f4 100644
--- a/media-video/sswf/sswf-1.8.2-r1.ebuild
+++ b/media-video/sswf/sswf-1.8.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="A C++ Library and a script language tool to create Flash (SWF) movies up to version 8"
-HOMEPAGE="http://www.m2osw.com/sswf.html"
+HOMEPAGE="https://www.m2osw.com/sswf.html"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
 	mirror://sourceforge/${PN}/${P}-doc.tar.bz2"
 
diff --git a/media-video/sswf/sswf-1.8.4-r1.ebuild b/media-video/sswf/sswf-1.8.4-r1.ebuild
index 09b12077b5c1..84d1e81981f4 100644
--- a/media-video/sswf/sswf-1.8.4-r1.ebuild
+++ b/media-video/sswf/sswf-1.8.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="A C++ Library and a script language tool to create Flash (SWF) movies up to version 8"
-HOMEPAGE="http://www.m2osw.com/sswf.html"
+HOMEPAGE="https://www.m2osw.com/sswf.html"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
 	mirror://sourceforge/${PN}/${P}-doc.tar.bz2"
 
diff --git a/media-video/vdr2jpeg/Manifest b/media-video/vdr2jpeg/Manifest
index 31e0e840ca15..54f436b72758 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -3,6 +3,6 @@ AUX vdr2jpeg-0.1.9-ffmpeg1.patch 8787 BLAKE2B 0ade0368504c397be765446cf88a078fa6
 AUX vdr2jpeg-0.1.9-libav9.patch 2072 BLAKE2B f9ace5a099c3030234524065aceefe3f5f72d65d3e62763a53d1c02057e4ad23737b454afcc6362159729d255c92843d78629b302cff4c823a844bc96440fb80 SHA512 d8122499f7f5db79f359bd38801fcc3b72b9ddce1305a854260d40d6f55e2162fb1a23b2a8acd3902c3a93aab1ee66bce418fcd6f5ad72363d98c4bf5f68400a
 DIST vdr2jpeg-0.1.9.tgz 31160 BLAKE2B 6f84e82167f45b8fe3c2a00e72ed5ad660b7a895e1c33110ce47e1cbb2d6f5fc979454761e693f1793f1fae0c1f1694af77a0f47b4483bb6359840ffcc88e6e9 SHA512 e2309fd08591d5efa08246c2ecde70811036ea293e21f7e5ae989af5acef5e795216cbc31455d2f0b65de575a876863efe55ddf4397ab4eadf3d67a627579d99
 DIST vdr2jpeg-0.2.0.tgz 20027 BLAKE2B c79a84c6e7010eae762fb31bdd9771dcdae1e78761afd07c536a55e834b0271fb55dcd4bb49f87a2d28695496d37f94c90350dd70b50229bb6248026422faee0 SHA512 65f3e0acb2ecd3a5341e527c45fafd454266841f1369c89b10750fce86f2326fba76329abd17a05d67aea3b43a7b1299a49cfa9eee9a784bb99c940253ca5952
-EBUILD vdr2jpeg-0.1.9-r1.ebuild 914 BLAKE2B ffc4ee398dbd8ea6163727fb51f7d41893c5019aa7476cebfa3af68c991a756201dc8270f1994deb3cd8588ff2c3a517ba925a1f66aa46f6bc66fe031bfc6184 SHA512 9d3ede8b7280006d7b0ea2dce6c852369fd6a181814492c59c431c54e4efceffe9a2147613f6ddad817ab3627f9d9bb73004088e936c2305f0377a89ef81f6c7
-EBUILD vdr2jpeg-0.2.0.ebuild 895 BLAKE2B 3061dad602723275955572e102f72505fe08cc75d205ae27674088af11d273e23c20003f970771cb32d9efd3118951ca73d158bfd526f58729b127ccc3426c44 SHA512 b3fd37a96098a49770a7109671d30abc1866b227bc541072281805fcdbe931bef70429fa56cac0db1e212e33d79412a5c04389d361974ae947e88fc45c84e6fc
+EBUILD vdr2jpeg-0.1.9-r1.ebuild 915 BLAKE2B b480b02f7d33f693c59941a3d5774142a3b2babc253b36e9dc13608db4403e0afecc576a66e1ba267193f50ea9b7bea5dbc2eacb36c421ad4f40de884d23fa62 SHA512 5091eee9033acef859bf3e94ba8dd28b7b27f18d1261c7819c9261f4fe603c86feb674ca09195bdd9397a8a8f6a5f88794709b0da3ba36a877ac4e4842b13fa0
+EBUILD vdr2jpeg-0.2.0.ebuild 896 BLAKE2B 76e2844841070922de6582eb022cc283834a4659c00ef0534b02d391b78c66e93419bcd80982cafa656ea7a74bec3bc3c90136d40a0b430c41a2acf85ab37dfc SHA512 a14256d860e8da83960099cb1e3fae3c9f4e60673922343af2a28e4e969fd04b4797497168ca630b34e0d12130b0bfc66ce5b2300120e93acfd2c1d67638ddd1
 MISC metadata.xml 536 BLAKE2B e69422432b87ba637e2905d7bac350ed88060952a90efaa494fe9e3fc5e41b75efb805c5372dee17c16312387a811217225043401053f9c35b08f5264c029cb1 SHA512 5e6be6b01884093e88882c9e6809c2c9d09434eec99ed2b88df9b008a01539847c48db59979fe5273699c792c732361477848ab6f7a891ce2c7ae69adcc3731a
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r1.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r1.ebuild
index d6fb8356fa41..12ba97470925 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r1.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ VERSION="717" # every bump, new version
 RESTRICT="strip"
 
 DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://projects.vdr-developer.org/projects/xxv"
+HOMEPAGE="https://projects.vdr-developer.org/projects/xxv"
 SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
 		mirror://gentoo/${P}.tgz"
 
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
index 43e97e267891..23f80a5191c5 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ VERSION="1911" # every bump, new version
 RESTRICT="strip"
 
 DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://projects.vdr-developer.org/projects/xxv"
+HOMEPAGE="https://projects.vdr-developer.org/projects/xxv"
 SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
 		mirror://gentoo/${P}.tgz"
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 84d2314e6389..b2f840654199 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -18,7 +18,7 @@ DIST vlc-3.0.1.tar.xz 25174040 BLAKE2B 10121ef74f90ee7103d5958b49b7b187a3b8a1cd0
 DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c SHA512 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec205517580000a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f
 EBUILD vlc-2.2.8-r1.ebuild 14828 BLAKE2B b3f586131caf059eb621eb3d8b5a4acef12ea8e5a55aa5445b372777e9c67c5444e2c5ff0a2045d3a7c151b7453a10dfe6f55121b4afc7bbf2adcb065f94fa85 SHA512 de4c8f6b34dd6be0d7657c69fd926ba88e2d49fe2185d368693532c73d9ae497326742dc8608beca7f970c55a49e7471fb165a969b813cd2ac4b51afdcd4576d
 EBUILD vlc-3.0.1-r1.ebuild 13499 BLAKE2B 73a4d22e21b0198ea06d3049a323c4acf728f026d46a407137caab96fff63e9f45720cda16ac8961ee48e497baf3f5b5fb7296e439ba8f5b605b7774fcf68b1d SHA512 f928a50049fdbcd6bb498ab2dfbd40470ff92279339034320b722dba0ead2aeb01580aa394380011cf32c68117caf4ddfcddbe30cf61e45f4d3cd421a8d133b7
-EBUILD vlc-3.0.2.ebuild 13454 BLAKE2B e30c153c8291fa02936e5fbe7401028e6b4da305851fd566dbb6edb94b618d45628803732747e481b0baf019a16821ab7d37aa2ea819ef004ffb2c4a6ae51692 SHA512 903876c6a43d1723be1708d686ae99883247fb56d4279e47d50df0d531fc72720bb891269a0c7315511cb689d72f6039c7c643650b231578cef8cf0d700b57ce
-EBUILD vlc-3.0.9999.ebuild 13454 BLAKE2B e30c153c8291fa02936e5fbe7401028e6b4da305851fd566dbb6edb94b618d45628803732747e481b0baf019a16821ab7d37aa2ea819ef004ffb2c4a6ae51692 SHA512 903876c6a43d1723be1708d686ae99883247fb56d4279e47d50df0d531fc72720bb891269a0c7315511cb689d72f6039c7c643650b231578cef8cf0d700b57ce
-EBUILD vlc-9999.ebuild 13364 BLAKE2B 447bf7ede4fdf47f7cef134fb6417417ebb5f50bb3300b5f49b9a908c254c2208bbb0a9b761e440c2f9b6f33d93af20011285966ccce4a98ce8a8806de231113 SHA512 85c108f0b52a44c14a1d6c4fd0d6ed24586eace5280d19d1d7919eda42d6fc3d1e447dfdfd7ad21a3427dda77cf0577fc66cbf20bb8e19fa37c74c761b530293
+EBUILD vlc-3.0.2.ebuild 13454 BLAKE2B d2af9d1909905464a32e2287e92073bd08573bd5d9e135cea3b8006b3f4b8971a6896139e8685a21f551f9552b94bda31014c2102e78c06ce3ed3c171252647f SHA512 4c2031f442786547d217544e528dbf3bcf64f6431cff88acd0f354570cfe621b7cf2f6d70a453a86bcae25769982fe4b817c87123d9f81b764282a3d1baad7b7
+EBUILD vlc-3.0.9999.ebuild 13454 BLAKE2B d2af9d1909905464a32e2287e92073bd08573bd5d9e135cea3b8006b3f4b8971a6896139e8685a21f551f9552b94bda31014c2102e78c06ce3ed3c171252647f SHA512 4c2031f442786547d217544e528dbf3bcf64f6431cff88acd0f354570cfe621b7cf2f6d70a453a86bcae25769982fe4b817c87123d9f81b764282a3d1baad7b7
+EBUILD vlc-9999.ebuild 13364 BLAKE2B 81776da7648e5c7a5517cb24e95143a4c5721601644bf56a101be4f25d9f7247475ba55cd4518601c045b78c71938714148493e4f554d88476dc7861b86d64b2 SHA512 fc84a8014bdfcaf2fb1bebc2e6e663d637bef0fa6f7483c948e5bcd03a95ef62c458d6b7dbb5b6e5f4703194b316afdb455521affd4fcc44492c328965e73d0d
 MISC metadata.xml 6541 BLAKE2B 4119e3ff76fea78140bcac05a2a2d244bfdd86d808ec1f9cf9171c6ec487aaa0b4ab32a43e259b69ed5d4677fc7a91c0d0fe5e074df0ddcf7fb380c9ba6fe5a4 SHA512 64e7aa292342c9c585c05cefce9d7582e8f01f2f8231625e8e393cebd53dbafe50e8a1c6ef6f4f0a2ee35d80912c11705538ec8316e30b771e8d4780ae1ee780
diff --git a/media-video/vlc/vlc-3.0.2.ebuild b/media-video/vlc/vlc-3.0.2.ebuild
index 212e34f012a3..7b4d7ebc7e76 100644
--- a/media-video/vlc/vlc-3.0.2.ebuild
+++ b/media-video/vlc/vlc-3.0.2.ebuild
@@ -53,7 +53,7 @@ REQUIRED_USE="
 	vdpau? ( ffmpeg X )
 "
 RDEPEND="
-	net-dns/libidn:0
+	net-dns/libidn:=
 	sys-libs/zlib:0[minizip]
 	virtual/libintl:0
 	virtual/opengl
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 212e34f012a3..7b4d7ebc7e76 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -53,7 +53,7 @@ REQUIRED_USE="
 	vdpau? ( ffmpeg X )
 "
 RDEPEND="
-	net-dns/libidn:0
+	net-dns/libidn:=
 	sys-libs/zlib:0[minizip]
 	virtual/libintl:0
 	virtual/opengl
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index f09e4c9d6e9b..0d4fec12e51a 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -53,7 +53,7 @@ REQUIRED_USE="
 	vdpau? ( ffmpeg X )
 "
 RDEPEND="
-	net-dns/libidn:0
+	net-dns/libidn:=
 	sys-libs/zlib:0[minizip]
 	virtual/libintl:0
 	virtual/opengl