gentoo resync : 27.03.2018

14 files changed, 36 insertions, 25 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 068c15647ab3..f59d338690b1 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 173f5c85d376..89b114ec9255 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,6 +1,6 @@
 DIST mkvtoolnix-19.0.0.tar.xz 4616780 BLAKE2B 72eb3b1a34bbed0d492098c02c1f60c7ce7f0ea6a8fbff6b88bd9d7af5891dda8c8adb9a0f856c65106fb430b481183ce74b9369590cd4dcfe881d7db84eb06d SHA512 dd18eeffc8a5210ca3c8a287321ad106f63cff8fbe5ad3891460aab7e60f2d5261a3f335f3991524a95724861288593cfb3bd9df6829a2f7751f6a1fdaba0ca6
 DIST mkvtoolnix-21.0.0.tar.xz 4682788 BLAKE2B 52d9920fc5b735f7d8af1f6e60828f143a914ce7cd7c635daacb6d2da584b0158f80e0f4d39824130b0c8fcc83b7c3a1215b2e965cb8b47b2b297df2d78414d5 SHA512 881e0c38eee2d36ab9dea5ccaa8ad74e0076cdc13606f873ab58bfeeec09c05e947529d3bad665b1d4df6a816faca30e8a685bc19115f90c18dac3c1ae27c252
 EBUILD mkvtoolnix-19.0.0.ebuild 2549 BLAKE2B f205d940a9fe250d842cfeaffefd389be863556cfbb6d1d2960551c5b16ece35269c9c64f2c110655e38f2cda894c5940bf686fb04602ad997cca05f61ecb0b9 SHA512 e8291ce11ad3871b538ccce78d81e258ff4112098a14587f12a03969a40cec24ddb884a2c9e3c16503ac1272a586e6e61fef8d414c28e9ee526949c97e52124c
-EBUILD mkvtoolnix-21.0.0.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
-EBUILD mkvtoolnix-9999.ebuild 2711 BLAKE2B 05bc79c266139415bfa53d7c739bfd4b1738b606d2d7660d41eb1fa68a4738970371ab915e0413b30ff8a482452ed8b4568f076c32a8383955f5c2a7f237bff8 SHA512 db31f33ad3f2f302fb978a5a5ce59c265141844142b1d557a1febc42b2c3a0ac1a13a9b5cd04d8903a7c1dab01f3fea9701aa634edd165c40d04e6d64ff9f5df
+EBUILD mkvtoolnix-21.0.0-r1.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
+EBUILD mkvtoolnix-9999.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-21.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-21.0.0-r1.ebuild
index 9cc2c6abecac..cc20f8c7ff38 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-21.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-21.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils
+inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils gnome2-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
@@ -113,9 +113,11 @@ src_install() {
 pkg_postrm() {
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postinst() {
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 9cc2c6abecac..cc20f8c7ff38 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils
+inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils gnome2-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
@@ -113,9 +113,11 @@ src_install() {
 pkg_postrm() {
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postinst() {
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 7cc7fdae830d..db8bc5bd3266 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -13,4 +13,4 @@ EBUILD mpv-0.25.0-r2.ebuild 10902 BLAKE2B fa9ae811c53d01d32b8288696436783f9cf434
 EBUILD mpv-0.27.2.ebuild 10486 BLAKE2B a583f569c6750d7e4daa06fa61caedadb1b0b6ac1213ff0020b5a80a456716f46e10b9b6f365e2d1ac41ec09734e5444db880d89498a104045ceffb2c18ff4dc SHA512 d1c8610722510c4995b5e2ebf9dfe70f67eb2d9ffd9a6fb9c9c112136833920165c5d9ad59304e84a219518a560813df75baecc0ec8471f173a7ac6807872508
 EBUILD mpv-0.28.2.ebuild 10152 BLAKE2B 6db64e6256c2d495cd90418d61829b57d362209ad8ab8c7c1ae3d41ea6df7bf1b3d605ca3f86ab67131ac5358dafb438563e6956ff11d1120f62ca1da8069fce SHA512 f2195ec248b398e4733d416e259f36a707bdf17f873ad6be52c01ce986f359ab3defad5bdcade5c57609e6403ee8e47f93a3e3ae54732e14f3beb492e803bad6
 EBUILD mpv-9999.ebuild 9997 BLAKE2B c9946ff0c3cf13f047b6f504fea3704d9ec0cfe30487f8af0707de892fefc9f3b42bc51d4f745b8e55961bd653680767dbb76fda27d802920c962b8c00925c25 SHA512 96e3219f1ec63ecbd5d0015eb2113561ec77a9cf3798f3291177b9dd3a8779865332952efdbbdeb98f7d05e9e9d2817264412944c42bc24b2fa21d1296253f28
-MISC metadata.xml 2376 BLAKE2B c585e5f1e6e5c91ad9c3ad25de75bde9f01188950bafdf016c2f3b55a5cc74e48775667e173962178f13bbae5b40d2a386144bba7343ec21a2b60f2ee9c1c6c7 SHA512 8da450ad8b003eacfc8aab85b8774206163305750c559e4e7e4e8a56b4e3c398f9cea970430b37d26069c6ec333a4ae860c012a63d702dfb24dc65089edaa604
+MISC metadata.xml 2281 BLAKE2B fb3fb9a0a5798b9735a654b0b594961105427e03947709a098d73555844a52c38e961802cb3a5fe286dda25b5d502c8052dc874be3a5e509f2a7ed428aeea6a7 SHA512 cc2b169845069766379912edf2c30fd85fbd2d7bb584d18e9a4f599af6eb29e89e87dab8ac2d3f7a27ac5da7aec8edcd5b60c5c909821383b62e82c251931817
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index b69462424a7e..597c2ce92a71 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -26,7 +26,6 @@
 		<flag name="libass">Enable OSD (On Screen Display) and subtitles support via <pkg>media-libs/libass</pkg></flag>
 		<flag name="libmpv">Build mpv shared library</flag>
 		<flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag>
-		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
 		<flag name="opengl">Enable the recommended 'opengl' video output</flag>
 		<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
 		<flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag>
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index bed1296ddfef..3ba4f5305b55 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -3,6 +3,6 @@ DIST obs-studio-20.1.3.tar.gz 5638299 BLAKE2B 8956e0ae444c05bc452284a730ba4cba7b
 DIST obs-studio-21.0.2.tar.gz 5904469 BLAKE2B e4e7c1f2b445f1db6b76df0c7a12dd41ffd95e7ea5669d7efc3387cc0fd15e268d864b5da3da5c07d04bc57692a88a53a67351a370621b1a6ca648405d030454 SHA512 a22597ac3a85d4c72b9b1ff886367b158498b6b0141acfd2bdb096a2bd9d29cdfad900dfc00f870eaf0aad66836093579f37b278fa90ccd7b49022e849c1c590
 EBUILD obs-studio-20.1.0.ebuild 2692 BLAKE2B 9d13fc4dd911875bc65e15afd8456fb2f4976501806e543d81b10dfd9d9461be6d000cf61a88e7c90835bbe7c7dcadc5132d25fb90f2e099209c91ea4ef1f7ee SHA512 0bcac3a178efabe8c624aea855018ba24965fba71dde5ee3ee79b3601896850e488daf2d84665d398c23cb1fef0d3fffd727a073268f16271e2292061f4ed0ea
 EBUILD obs-studio-20.1.3.ebuild 2592 BLAKE2B b86a8844f978bda0ecbe155e690bbc866880284634f9074da462451a7a8566e4be5f3b7f1b6234f1b7af44f899aa0da33129089d2d10718bbbbe8bc2bb69e368 SHA512 267f6408a44bf81d41c887b2cfbe225edba24d50ad88e6b3aef32b6e3e2f82a8af5f5fc82738c2012dfffaa31b40b3d76d1463a448f08076d4c5bd99c19d3eb8
-EBUILD obs-studio-21.0.2.ebuild 2592 BLAKE2B b86a8844f978bda0ecbe155e690bbc866880284634f9074da462451a7a8566e4be5f3b7f1b6234f1b7af44f899aa0da33129089d2d10718bbbbe8bc2bb69e368 SHA512 267f6408a44bf81d41c887b2cfbe225edba24d50ad88e6b3aef32b6e3e2f82a8af5f5fc82738c2012dfffaa31b40b3d76d1463a448f08076d4c5bd99c19d3eb8
+EBUILD obs-studio-21.0.2.ebuild 2638 BLAKE2B 8cc9aae34f58c24abc03e40f7fab8d6baa1d41c61d94114c6f297067fecf7e990c716c6798511e9f8c04b7926623c1b5248acd265fa846445fba2f9300bbd0cf SHA512 00605409f48ebeb8425a1f2c3cb2578774808cc6a9e1209957da5cd274436b5bd1d6e2dedb594feb13a4753f01e47d63fa3aefcb96fde720c251496dc46906a5
 EBUILD obs-studio-9999.ebuild 2561 BLAKE2B db86d0ee2d707beeb1944bd90d5897b79ea116174cf5cca35ce5806b9a4036565df1524c748a36c91209ff17b86bf45e9e6dd789d9cfef82231c0f3fccbf8850 SHA512 936dca63cdb45c8fe29174f1240c451f2c0d5799bc7c56a065fd5ea72aa872e4a8515faa8c50fa2888d8b8648b9adc410a408270372c7066c907421e75ee3a64
-MISC metadata.xml 786 BLAKE2B b9a6db2b9d7895bc67945b2f745f7cd442d0a80688f55a2cb0428f9142a90168e76045aa4045c0bc346ee2cadec09967c6bfd552ee4e2ddbba35804b14efab59 SHA512 94ee6c6239b9befb24c87cb647aaed5b87c374deab3791df5742714e7cfabd28cb07822d2cb9a17b310b82f11e2daa6216bb14b327752a7b2a8ddfc9e7062492
+MISC metadata.xml 861 BLAKE2B 42089cc2bf8ac8af65906efa8ebaa2c3254c972f4a60ca72b3420a8e4ff502ca1e17cdc2dd226fd077b918c4616b641274b941c229aa054b6da4ea3bd2caf37b SHA512 c06b0accbc7daa4b0e242b4b41689f77844d15f0c004ca9ca60e81fa03cc8b4c8b3feda309e00f09731e74b85934651437f3e982a361f58038b1d7909b12fae0
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index adf3bcb68204..27ed2bccb4cb 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -14,6 +14,7 @@
   <use>
     <flag name="fdk">Enable libfdk support for AAC encoding.</flag>
     <flag name="imagemagick">Use ImageMagick for image loading instead of FFmpeg.</flag>
+    <flag name="nvenc">Enable NVENC encoding for nVidia video cards</flag>
   </use>
   <upstream>
     <remote-id type="github">jp9000/obs-studio</remote-id>
diff --git a/media-video/obs-studio/obs-studio-21.0.2.ebuild b/media-video/obs-studio/obs-studio-21.0.2.ebuild
index 5faf60232c12..db4647c07d16 100644
--- a/media-video/obs-studio/obs-studio-21.0.2.ebuild
+++ b/media-video/obs-studio/obs-studio-21.0.2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
+IUSE="+alsa fdk imagemagick jack nvenc pulseaudio truetype v4l"
 
 COMMON_DEPEND="
 	>=dev-libs/jansson-2.5
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-video/ffmpeg:=[x264]
+	nvenc? ( media-video/ffmpeg:=[nvenc] )
 	net-misc/curl
 	x11-libs/libXcomposite
 	x11-libs/libXinerama
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index 8846fc55cfc6..bb325ae254d0 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -1,5 +1,5 @@
 DIST rtmpdump-2.4_p20161210.tar.gz 142837 BLAKE2B 412a7c3b21738db643042e51e03b11e115ae1d68214e644374e8c10f3b2ab3f659ce1af884135d0e89f2e0ba44ebdf41937bc0f02d875c463ca711d9ae95698c SHA512 76617f02c13d7e8e3a7cf2734c6174e56fb321a881c9e4869bf6393786b193e0c01a8c530ecbf0679cc888c523af5712f2dcb2031fbd09729b7ddeebc3a4b133
-EBUILD rtmpdump-2.4_p20161210-r1.ebuild 2228 BLAKE2B 04385081e6dc530e3bed8d43f66fde1a4ba1ae15198c1f413783b2ea3301386b9880472a531b026bd967593bedc94982ed4c8024bc037e46dc7ab42577ade7b3 SHA512 468e65501ef2bf5d2f725f0424601488bd1ff1004d1736b7204de630ed933ab09afbf19d7363e373ff5be4683a47bd19147bdb6af6af2b127d5e75534ea4bc36
-EBUILD rtmpdump-2.4_p20161210.ebuild 2207 BLAKE2B 2da3a950e11eff89f97c4a11214bf999d1c625be185b7d6f1a8b69513aa550b534ef3dbb1e70b9e72525a0343a775878d969c094abd4e942ad6dbcfffac79cf5 SHA512 21e9b261d62775f81a32f901bab6636c64424e11b3244e67a96c314c6e03f3843bd74366e8ddb4bfca8242b5434d2dc8a6976f6410127c02534607b2fc928f09
-EBUILD rtmpdump-9999.ebuild 2024 BLAKE2B 9133e2b3845be4b1db9a4508e39075330f1382b61c93b7d3dec2fe0b5555caa5c7b1fc7d6322c2406a47d3ae71915578e21f58e525e9a0c12446286e101802d7 SHA512 124051b461a40a907111bf04516d8e1aabaaf72966d0994f90bc6d04136cdccce18a1c5d52e4adf98541cc73d3fd0205b5d67c7236ef9daf0944f356ac5ede30
-MISC metadata.xml 335 BLAKE2B b26d4623a229a4ad53ffa5aae3797cc21265e84f2812c748880e6aa5449df66cc33dc580b341f80c2715d85ff9ee2dfebd1048ade12c3f19138d5289691d2f21 SHA512 c1701c821cff137b26961c0347fe30a2b992c1c288b6df7c57e6b9ef962f6e706cfd4c9047d6b526dd5af46abb4aadeda4dd6cee6c168c685d76c667fe9e1cfc
+EBUILD rtmpdump-2.4_p20161210-r1.ebuild 2237 BLAKE2B caf1dc99de57985a504a8eff880b62659dd65b2b7cf6a0e75861f5f46827216027b50d62372536333bc5704de60977eacd554080c0f5ae771efb569716b65f2a SHA512 9db37815cc030cfc37d1427d38e79bae3b2df4b63b53fec11a313ec05edc19223454a4a304a3430d8d39bb0251517b71955e2e2c632dcd3d0f2dc657effbef72
+EBUILD rtmpdump-2.4_p20161210.ebuild 2216 BLAKE2B 9e1eb7f275056f75971e791f7272bb46e440935dbf4bb5d48f0c5162d4bafb625001fd7a7005da4b96e83647c29facb0d206278a32bbaadb5ac5f7f7c4f96a93 SHA512 c54aa1492092479ed60fa69af7f81058b13e7af9c65c419c60c658e5c689576a483b35c21fca6c72a13095b133e5c8ab60643eec6ce2bc9d5f4a56749e8e3e04
+EBUILD rtmpdump-9999.ebuild 2033 BLAKE2B 8dfb9b1b7e098bd01577060f3ecef396f4aa28039e53fe9ee1aaece7de98f4e3a4cb3c6d5646b5c6140a67813a75b61409b70227cadf33852be14abe71956793 SHA512 45c08fb69e3c5e8ffd1cefd707bdf37bc8ac29a3b96f23dbc53d99ce53bbf87b0b57e272b09f108af9571cc0f35a272bd55ae066dfc2840bf76f8e4df8632cf2
+MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
index 724b1cb49d66..2028cee3c389 100644
--- a/media-video/rtmpdump/metadata.xml
+++ b/media-video/rtmpdump/metadata.xml
@@ -5,7 +5,4 @@
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
 </maintainer>
-<use>
-	<flag name="gnutls">Use GnuTLS library instead of the default OpenSSL</flag>
-</use>
 </pkgmetadata>
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
index 5ab69865de61..ba1b98b2b9e4 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.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="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 
 # the library is LGPL-2.1, the command is GPL-2
@@ -17,7 +17,10 @@ IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
-		!gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )
+		!gnutls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl )
+		)
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
index eec4bbc9a07c..bb95a41dd316 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20161210.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210.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="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 
 # the library is LGPL-2.1, the command is GPL-2
@@ -17,7 +17,10 @@ IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
-		!gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )
+		!gnutls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl )
+		)
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index ccd765a7d625..83fe157d7a38 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.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="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit git-r3 multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="RTMP client intended to stream audio or video flash content"
-HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+HOMEPAGE="https://rtmpdump.mplayerhq.hu/"
 EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git"
 
 # the library is LGPL-2.1, the command is GPL-2
@@ -17,7 +17,10 @@ IUSE="gnutls ssl libressl"
 
 DEPEND="ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
-		!gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) )
+		!gnutls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl )
+		)
 		>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"