gentoo resync 08.09.2018

10 files changed, 259 insertions, 30 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 9a98076e4c4d..1b5375d802ae 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index a8f9127cf1e4..4ca1a4290310 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -8,4 +8,4 @@ DIST plexmediaserver_1.13.2.5154-fd05be322_amd64.deb 111093662 BLAKE2B 26b116110
 EBUILD plex-media-server-1.11.3.ebuild 4677 BLAKE2B a383ba8725a3b464d4f26df41db9823b6f63d704d7071723a92d03e07b3e40619afefeb64991e4a9051a47c0d2943416aa3da906cccd9033fbb8d91d29a1fab0 SHA512 b2b97885dc31e520aac8278df291c03c81169931940ec65aa5197957dee2bffb18ac32e11c1e049b14a196a9b5c096f210b439efd7800e9cac8d7e3743193682
 EBUILD plex-media-server-1.12.3.ebuild 4737 BLAKE2B a08d70d804e55777bdda1b67ed3438cb94013f93c2020a1c175c4839c0dc3d6f2727045be262a8ff01225666d006899dd11817f9d2309ea6b788744c8ee1c4de SHA512 18e182da95d918349f59bec88f860442dd4bef8778abbde77db8d7cd88db9c83dfb6f654afff9554101880a87542e7309f2e3411a70e159990e1417d86f97af3
 EBUILD plex-media-server-1.13.2-r1.ebuild 5115 BLAKE2B b37cfd6a579c959ecee460e5e519581a078e37ecc1285489df2e3bb235306b31563ab5b40cf1a1ee806ac907eb4b548048f5fa91cac5b9045df77abf1a591507 SHA512 c2406e229ba4a921888f028b3664d9b49dcacc36030d9fbbc5b00f51daf12a5bfa5ccc9d27c61d16d134f3d93aed8e0eb5d45114b65c767e6cc14bf3b9f21fd8
-MISC metadata.xml 272 BLAKE2B 084b8ae019863d5cda604c5cafb2ae06aaa78efedd73224cdddf5089fc709ef783841063c23d2d599dcea7d4c49770158d12dee34738322fc5933ca80fec71c5 SHA512 21fe9d289af64cd556f7c8edb452857c3285dec0e3b83a3be2e8a67dda1da59994ab70de86c78a5d9fe9a3c488ff82dc909f7e5fee946386bffb410b02caafdb
+MISC metadata.xml 170 BLAKE2B 596d3ac9dabce24bba0cde2371d477e82ca5f9200bfeda69429558c79d4b59db07d8cb368f7eac09605bd132564778c12a20934e61cfede0197b9ebf69a3b5ca SHA512 ad26626abac376b8d9cb5b3125c4361c443524ef85ec99212acd972ca75190b15fe2f701c00c5110c74efc2171db92e41d580786ae2356bf1248e7808b6c67b8
diff --git a/media-tv/plex-media-server/metadata.xml b/media-tv/plex-media-server/metadata.xml
index 68319c2b587c..bca0744b282e 100644
--- a/media-tv/plex-media-server/metadata.xml
+++ b/media-tv/plex-media-server/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>fearedbliss@gentoo.org</email>
-        <name>Jonathan Vasquez</name>
-    </maintainer>
+    <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index d2ec27595069..005b67db041a 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,10 +1,12 @@
 AUX tvheadend-4.0.9-use_system_queue.patch 296 BLAKE2B 0986117969d9bb3463123e984aba7a73c8caf89b16f0c10e870a9b49857f8c946958a31900d99c5d332f5635cbd49ae544c2cc97f1e8a211c352bcaba965fe76 SHA512 56180b9c2fbb092530963229213805ec63e3d941c67d967e38b46f778db85db981234fe5727b5a8dcf64ab3a9e24c9d10b681abf275249e0d6f0ad63e391ecc4
 AUX tvheadend-4.2.1-hdhomerun.patch 1045 BLAKE2B cad3922efbdd20c457c9570ecc75a786a997cafbe698226e31e4175394c38b79071ed7a165194ddc31e318ed015a0253dfb1f978695db35721749077154534f4 SHA512 416af870e5070001fbd0e09ec8c14160ff7c54b716564f708c6a983ca529cdf5963678c05551ad676a23c3347b4932bd7ae65e8eeea47a5f9f3955b46292c3f9
 AUX tvheadend-4.2.2-dtv_scan_tables.patch 463 BLAKE2B 4e52d89d75c05d8a3cc645280794dd4570953bb5452d1067442177d7eb4c85779a8bcb96f1f8d3fbbcb6a34e770ff014bb262103eae5a92556ac4586038cdd9e SHA512 9bdecbac57ee1f30be91f9145e32f89949b5631090edc85cd5383915b09949ec9211f62474bd06afb4600e431093ce2ee5550d204b08c64b5b2e1a1cd38a517d
+AUX tvheadend-4.2.5-ffmpeg_3.5.patch 5028 BLAKE2B 0a4d67473e9d3bc98a7f7c94593e0fe14a320e1ef0180356df7e7217e7469ea2044691f369837201445641a3cd30a58c5d15684834e49fc29ec997d37ffd08bf SHA512 4a6ab125c2670d3de64d81f3fce25ee671b027aba16cdefa6dfba7d28ca2f35e3b1f93f3d1774375c7ce830fef0485142a202201c05eae9a80b3b34930467d68
+AUX tvheadend-4.2.5-gcc8.patch 4104 BLAKE2B e6912ab8b9b2a787d239f94dc5d74e44db6bbad060b8398a06618859eb12b1eca893e024538643e93e99a6e79d637d0f126193dad60de541a8ba2696503c1e36 SHA512 d18368fb9923ea2fa60e5b62f69545fe4d5a2b5057fea0f97ad71b55fbe42b486d86472ae31fcfaf2520331b916c2c880f84c122c12ecdc31e5796bcfb7244ca
 AUX tvheadend.confd 355 BLAKE2B 36ba5a3466838b643beb877050ef6cc481adb91a433efa7429977104c9db1e6ef54901750d14dc0f43a20c89ddf504a9fc28a10a88d68105e5a5f07820696d50 SHA512 64ae0cca1e1b46a3ecb2fb4a4ba69ad1dd6a72ce57944b44be28768d293f9cca2ab29067335023f384433e8c75d976fbc4610ca574c930b9891a2f1c75ff4c0b
-AUX tvheadend.initd 376 BLAKE2B 9ea5ac60f0f93f2f656d4de3516568502b2527a4d4956583551da0707df8fbba8b04d3bed057e91bbe8829783f6095bf5ace1ad610dc0b5286095a1a377cbf1f SHA512 e0cd720289185f9a483901b8d52aec989934423630dfa99d2fec5006bc5c16d6ce013dacd62e2fe2395a77bcd9649dbcc8972cb118c1789ac4427dae3af98c12
-AUX tvheadend.service 512 BLAKE2B b51bb6facda5287e038059f6234f7fd585ffd33a9a0483e1a9d89fe3cfa35bfc2859718b7a3e4774bf2159c0bf4c791b1424d9933c985d123f5763fec7f7573b SHA512 48fa16a3511ebed58d60b81227c483c4aac734abf096b14474f18cff55a9c44a7972c09d28fd2f6b622e91c5bc810869804da65e4a9676c6f684ba655430b695
-DIST tvheadend-4.2.4.tar.gz 21526564 BLAKE2B 19c571bb253041bd122306eaa516071d096d747b03eaf623b45b79fc0511633a75f1a0925a890207c994da001a2ba3404d1860b91236adae34e307bcf8c57796 SHA512 333a3509da198f5d96316f30fd010a216262315614db302c83405de78d29b32b1d878c0abd7fae2214713107e6955478ee3222b18888a84c57810035af882df4
-EBUILD tvheadend-4.2.4.ebuild 2974 BLAKE2B 62c7b046ce561fc8d85f8cf4bcf02531f611213877abc7aa7926d72e8490462763584221ed2d6aac5db91d1128f0d443a2bc8c98609db859481c2e193bb699b9 SHA512 bed3ac3bc460824f0b8c3ba0bff4b8299c31ff7a50b316a1bb12f06d00e85165ca17ae1189fbe18278d9db9ec0f79751921ffe672688b50685762cdfd8d44332
-EBUILD tvheadend-9999.ebuild 3722 BLAKE2B 905b13ea537621cf3998fa9535480fa81b698bb6ca76c136f7b57f1123d9889718489e14e3abe0f71f8ef970453bc6cf5d200f03838c15b8640d487467324fcb SHA512 5c3eea75d17790f4d9537d88add017ad5c26b8ee5cc39797d59a2e7da4da63f8404a7be4ef951bb6b3b0f9fea4ddf6c759f51c04abc7744f20e6967842b6959a
+AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
+AUX tvheadend.service 577 BLAKE2B f6762aef0f9370a7ad1e438aa4b35c500c40240bd7d66db5e32b061c0dc9776adc2b8de2c395b2299151bd5c6fc8735944a8384828b873b29fbf6c1ed76bafde SHA512 1192b98da179503bc249e0b0d3a0e6c2bf420bfb7d14a72b917fe9e1975a42d1647b5d951ead8f18419999f4c74c352b21e58c28bacc65419012d46bb83270d4
+DIST tvheadend-4.2.6.tar.gz 21528720 BLAKE2B 358373bc19bd4c27ddb597bb14e29e2f451d4a1efd075f40c0324d692b5fdcac0d23f2f626ba9d0ca235f7d0c91930c5bf2438d0b6537af187a9fb3fcf36c419 SHA512 6291b0ba1d9af11d5295bf6804988835e746db2d3ebbd465a22e293a1108225c8c361762b78213c881cd15d7dedd16092f28a97c9e5b38f44920848bfbaf9709
+EBUILD tvheadend-4.2.6.ebuild 3056 BLAKE2B 8fe71e0d2e181038928e5ee51dc530874233d7b61bce63b1832e9357e10cfbfee189d21aefcf8e5eb80a2a5bc27409b83918ba41abc218cb121f6426c48a4b7c SHA512 f878fcb7c437076329d1e2e6184da4c1c21facd7cd3786c22040bab026ed3b31f68ec950d21767c661bfa0efab808202cf7162925aa9bbbd62c0a6924e8a0416
+EBUILD tvheadend-9999.ebuild 3715 BLAKE2B a7477dd7c4417416bd96da0c8662f5c2e719a731beecf2f22341248b0e04e98a8da232a12813af0cc41b1c70326d09d849d7f265dde1dfc631a237484ae66d7e SHA512 fc8659aac79ca96cfe6a582a391e6cff5e1aed8627f05993e7b83385cfae744fcb6d9d6d281c2dab9be013ebf56f19078f22a74b7bac4b0349ad5494eba3a70c
 MISC metadata.xml 1517 BLAKE2B 2024621f2f5dd3eba2f33618a80c8d826163ec917975bd5045e3943c0c79b61b6e03c9870cb0fa89532c23a5017fe1480c2bf3602d5f1d98af2253a21da3fcbb SHA512 ad6ad89c261d482f78b45037777fec796c62dfaff2e76d99c9f7c983989cab56c6671a99b38aa77fadbcf5cdeff96c38a1ed666fbc12b1b4660a85db965039d2
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch b/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch
new file mode 100644
index 000000000000..eaec90eabcef
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch
@@ -0,0 +1,115 @@
+diff -up ./src/muxer/muxer_libav.c.orig ./src/muxer/muxer_libav.c
+--- ./src/muxer/muxer_libav.c.orig	2017-12-18 09:57:28.000000000 +0100
++++ ./src/muxer/muxer_libav.c	2018-01-23 14:24:07.923509542 +0100
+@@ -174,7 +174,7 @@ lav_muxer_add_stream(lav_muxer_t *lm,
+   }
+ 
+   if(lm->lm_oc->oformat->flags & AVFMT_GLOBALHEADER)
+-    c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++    c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+   return 0;
+ }
+diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c
+--- ./src/plumbing/transcoding.c.orig	2017-12-18 09:57:28.000000000 +0100
++++ ./src/plumbing/transcoding.c	2018-01-23 14:43:14.873964416 +0100
+@@ -19,7 +19,7 @@
+ #include <unistd.h>
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+ #include <libavutil/opt.h>
+@@ -574,7 +574,7 @@ transcoder_stream_audio(transcoder_t *t,
+     octx->channels        = as->aud_channels ? as->aud_channels : ictx->channels;
+     octx->channel_layout  = transcode_get_channel_layout(&octx->channels, ocodec);
+     octx->bit_rate        = as->aud_bitrate  ? as->aud_bitrate  : 0;
+-    octx->flags          |= CODEC_FLAG_GLOBAL_HEADER;
++    octx->flags          |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+     if (!octx->sample_rate) {
+       tvherror(LS_TRANSCODE, "%04X: audio encoder has no suitable sample rate!", shortid(t));
+@@ -619,7 +619,7 @@ transcoder_stream_audio(transcoder_t *t,
+       break;
+ 
+     case SCT_AAC:
+-      octx->flags |= CODEC_FLAG_BITEXACT;
++      octx->flags |= AV_CODEC_FLAG_BITEXACT;
+       // use 64 kbit per channel as default
+       if (octx->bit_rate == 0) {
+         octx->bit_rate = octx->channels * 64000;
+@@ -630,10 +630,10 @@ transcoder_stream_audio(transcoder_t *t,
+       // use vbr with quality setting as default
+       // and also use a user specified bitrate < 16 kbit as quality setting
+       if (octx->bit_rate == 0) {
+-        octx->flags |= CODEC_FLAG_QSCALE;
++        octx->flags |= AV_CODEC_FLAG_QSCALE;
+         octx->global_quality = 4 * FF_QP2LAMBDA;
+       } else if (t->t_props.tp_abitrate < 16) {
+-        octx->flags |= CODEC_FLAG_QSCALE;
++        octx->flags |= AV_CODEC_FLAG_QSCALE;
+         octx->global_quality = t->t_props.tp_abitrate * FF_QP2LAMBDA;
+         octx->bit_rate = 0;
+       }
+@@ -1048,7 +1048,7 @@ create_video_filter(video_stream_t *vs,
+                     AVCodecContext *ictx, AVCodecContext *octx)
+ {
+   AVFilterInOut *flt_inputs, *flt_outputs;
+-  AVFilter *flt_bufsrc, *flt_bufsink;
++  const AVFilter *flt_bufsrc, *flt_bufsink;
+   enum AVPixelFormat pix_fmts[] = { 0, AV_PIX_FMT_NONE };
+   char opt[128];
+   int err;
+@@ -1289,12 +1289,12 @@ transcoder_stream_video(transcoder_t *t,
+       else
+           octx->pix_fmt    = AV_PIX_FMT_YUV420P;
+ 
+-      octx->flags         |= CODEC_FLAG_GLOBAL_HEADER;
++      octx->flags         |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+       if (t->t_props.tp_vbitrate < 64) {
+         // encode with specified quality and optimize for low latency
+         // valid values for quality are 2-31, smaller means better quality, use 5 as default
+-        octx->flags          |= CODEC_FLAG_QSCALE;
++        octx->flags          |= AV_CODEC_FLAG_QSCALE;
+         octx->global_quality  = FF_QP2LAMBDA *
+             (t->t_props.tp_vbitrate == 0 ? 5 : MINMAX(t->t_props.tp_vbitrate, 2, 31));
+       } else {
+@@ -1340,7 +1340,7 @@ transcoder_stream_video(transcoder_t *t,
+       else
+           octx->pix_fmt    = AV_PIX_FMT_YUV420P;
+ 
+-      octx->flags         |= CODEC_FLAG_GLOBAL_HEADER;
++      octx->flags         |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+       // Default = "medium". We gain more encoding speed compared to the loss of quality when lowering it _slightly_.
+       // select preset according to system performance and codec type
+@@ -1371,7 +1371,7 @@ transcoder_stream_video(transcoder_t *t,
+ 
+     case SCT_HEVC:
+       octx->pix_fmt        = AV_PIX_FMT_YUV420P;
+-      octx->flags         |= CODEC_FLAG_GLOBAL_HEADER;
++      octx->flags         |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+       // on all hardware ultrafast (or maybe superfast) should be safe
+       // select preset according to system performance
+@@ -2177,7 +2177,7 @@ transcoder_get_capabilities(int experime
+     if (!WORKING_ENCODER(p->id))
+       continue;
+ 
+-    if (((p->capabilities & CODEC_CAP_EXPERIMENTAL) && !experimental) ||
++    if (((p->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && !experimental) ||
+         (p->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) {
+       continue;
+     }
+@@ -2192,7 +2192,7 @@ transcoder_get_capabilities(int experime
+     htsmsg_add_str(m, "name", p->name);
+     snprintf(buf, sizeof(buf), "%s%s",
+              p->long_name ?: "",
+-             (p->capabilities & CODEC_CAP_EXPERIMENTAL) ?
++             (p->capabilities & AV_CODEC_CAP_EXPERIMENTAL) ?
+                " (Experimental)" : "");
+     if (buf[0] != '\0')
+       htsmsg_add_str(m, "long_name", buf);
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.5-gcc8.patch b/media-tv/tvheadend/files/tvheadend-4.2.5-gcc8.patch
new file mode 100644
index 000000000000..1891808e4077
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.5-gcc8.patch
@@ -0,0 +1,110 @@
+diff -up ./src/dvr/dvr_rec.c.orig ./src/dvr/dvr_rec.c
+--- ./src/dvr/dvr_rec.c.orig	2017-12-18 09:57:28.000000000 +0100
++++ ./src/dvr/dvr_rec.c	2018-03-08 17:15:06.479877783 +0100
+@@ -669,7 +669,7 @@ static int
+ pvr_generate_filename(dvr_entry_t *de, const streaming_start_t *ss)
+ {
+   char filename[PATH_MAX];
+-  char path[PATH_MAX];
++  char path[PATH_MAX + 1];
+   char ptmp[PATH_MAX];
+   char number[16];
+   char tmp[MAX(PATH_MAX, 512)];
+diff -up ./src/epgdb.c.orig ./src/epgdb.c
+--- ./src/epgdb.c.orig	2017-12-18 09:57:28.000000000 +0100
++++ ./src/epgdb.c	2018-03-08 17:15:06.479877783 +0100
+@@ -470,7 +470,7 @@ static int _epg_write_sect ( sbuf_t *sb,
+ 
+ static void epg_save_tsk_callback ( void *p, int dearmed )
+ {
+-  char tmppath[PATH_MAX];
++  char tmppath[PATH_MAX + 4];
+   char path[PATH_MAX];
+   sbuf_t *sb = p;
+   size_t size = sb->sb_ptr, orig;
+diff -up ./src/epggrab/module/eit.c.orig ./src/epggrab/module/eit.c
+--- ./src/epggrab/module/eit.c.orig	2017-12-18 09:57:28.000000000 +0100
++++ ./src/epggrab/module/eit.c	2018-03-08 17:15:06.480877787 +0100
+@@ -50,8 +50,8 @@ typedef struct eit_private
+ 
+ typedef struct eit_event
+ {
+-  char              uri[257];
+-  char              suri[257];
++  char              uri[529];
++  char              suri[529];
+   
+   lang_str_t       *title;
+   lang_str_t       *summary;
+diff -up ./src/imagecache.c.orig ./src/imagecache.c
+--- ./src/imagecache.c.orig	2017-12-18 09:57:28.000000000 +0100
++++ ./src/imagecache.c	2018-03-08 17:15:06.481877791 +0100
+@@ -252,7 +252,7 @@ imagecache_image_fetch ( imagecache_imag
+ {
+   int res = 1, r;
+   url_t url;
+-  char tpath[PATH_MAX] = "", path[PATH_MAX];
++  char tpath[PATH_MAX + 4] = "", path[PATH_MAX];
+   tvhpoll_event_t ev;
+   tvhpoll_t *efd = NULL;
+   http_client_t *hc = NULL;
+diff -up ./src/input/mpegts/dvb_psi.c.orig ./src/input/mpegts/dvb_psi.c
+--- ./src/input/mpegts/dvb_psi.c.orig	2017-12-18 09:57:28.000000000 +0100
++++ ./src/input/mpegts/dvb_psi.c	2018-03-08 17:15:06.482877795 +0100
+@@ -678,7 +678,7 @@ static int
+ dvb_freesat_add_service
+   ( dvb_bat_id_t *bi, dvb_freesat_region_t *fr, mpegts_service_t *s, uint32_t lcn )
+ {
+-  char name[96], src[64];
++  char name[96], src[126];
+   if (!fr->bouquet) {
+     strcpy(name, "???");
+     if (idnode_is_instance(&bi->mm->mm_id, &dvb_mux_dvbs_class))
+diff -up ./src/input/mpegts/dvb_support.c.orig ./src/input/mpegts/dvb_support.c
+--- ./src/input/mpegts/dvb_support.c.orig	2017-12-18 09:57:28.000000000 +0100
++++ ./src/input/mpegts/dvb_support.c	2018-03-08 17:15:06.483877799 +0100
+@@ -853,7 +853,7 @@ dvb_str2val(qam);
+ 
+ const char *dvb_bw2str(int p)
+ {
+-  static char __thread buf[16];
++  static char __thread buf[17];
+   const char *res = dvb_common2str(p);
+   if (res)
+     return res;
+diff -up ./src/input/mpegts/linuxdvb/linuxdvb_satconf.c.orig ./src/input/mpegts/linuxdvb/linuxdvb_satconf.c
+--- ./src/input/mpegts/linuxdvb/linuxdvb_satconf.c.orig	2017-12-18 09:57:28.000000000 +0100
++++ ./src/input/mpegts/linuxdvb/linuxdvb_satconf.c	2018-03-08 17:15:06.484877803 +0100
+@@ -185,7 +185,7 @@ linuxdvb_satconf_class_orbitalpos_set
+   linuxdvb_satconf_t *ls = p;
+   int c = *(int*)linuxdvb_satconf_class_orbitalpos_get(p);
+   int n = *(int*)v;
+-  char buf[20];
++  char buf[22];
+ 
+   if (n == c)
+     return 0;
+diff -up ./src/input/mpegts/scanfile.c.orig ./src/input/mpegts/scanfile.c
+--- ./src/input/mpegts/scanfile.c.orig	2017-12-18 09:57:28.000000000 +0100
++++ ./src/input/mpegts/scanfile.c	2018-03-08 17:23:20.200963915 +0100
+@@ -331,7 +331,7 @@ scanfile_create_network
+ {
+   scanfile_region_t *reg = NULL;
+   scanfile_network_t *net;
+-  char buf[256], buf2[256], buf3[256], *str;
++  char buf[256], buf2[263], buf3[270], *str;
+   int opos;
+ 
+   /* Region */
+diff -up ./src/settings.c.orig ./src/settings.c
+--- ./src/settings.c.orig	2017-12-18 09:57:28.000000000 +0100
++++ ./src/settings.c	2018-03-08 17:15:06.484877803 +0100
+@@ -129,7 +129,7 @@ void
+ hts_settings_save(htsmsg_t *record, const char *pathfmt, ...)
+ {
+   char path[PATH_MAX];
+-  char tmppath[PATH_MAX];
++  char tmppath[PATH_MAX + 4];
+   int fd;
+   va_list ap;
+   htsbuf_queue_t hq;
diff --git a/media-tv/tvheadend/files/tvheadend.initd b/media-tv/tvheadend/files/tvheadend.initd
index 27956ccb234b..dc3bed76f299 100644
--- a/media-tv/tvheadend/files/tvheadend.initd
+++ b/media-tv/tvheadend/files/tvheadend.initd
@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 
 depend() {
-	need net
+	use net
 }
 
 start() {
diff --git a/media-tv/tvheadend/files/tvheadend.service b/media-tv/tvheadend/files/tvheadend.service
index 2d0573ca910f..6d1e27445b73 100644
--- a/media-tv/tvheadend/files/tvheadend.service
+++ b/media-tv/tvheadend/files/tvheadend.service
@@ -3,19 +3,22 @@ Description=tvheadend
 After=network.target
 
 [Service]
-Type=forking
+Type=simple
 User=tvheadend
 Group=video
 RuntimeDirectory=tvheadend
 PIDFile=/run/tvheadend/tvheadend.pid
-ExecStart=/usr/bin/tvheadend -6 -f -p /run/tvheadend.pid -C -c /etc/tvheadend
+EnvironmentFile=/etc/conf.d/tvheadend
+ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c "${TVHEADEND_CONFIG}" ${TVHEADEND_OPTIONS}
+TimeoutStartSec=1m
+TimeoutStopSec=20s
 Restart=always
-RestartSec=5
+RestartSec=5s
 DevicePolicy=closed
-DeviceAllow=char-DVB rw # DVB devices
-DeviceAllow=char-drm rw # GPUs for transcoding
+DeviceAllow=char-DVB rw
+DeviceAllow=char-drm rw
 RestrictAddressFamilies=AF_INET AF_INET6
-ProtectSystem=strict
+ProtectSystem=yes
 ProtectHome=yes
 NoNewPrivileges=yes
 
diff --git a/media-tv/tvheadend/tvheadend-4.2.4.ebuild b/media-tv/tvheadend/tvheadend-4.2.6.ebuild
index 99676db49370..72be6b32f041 100644
--- a/media-tv/tvheadend/tvheadend-4.2.4.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.6.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
@@ -44,9 +44,11 @@ REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
 # https://github.com/rpmfusion/tvheadend
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.0.9-use_system_queue.patch"
-	"${FILESDIR}/${PN}-4.2.1-hdhomerun.patch"
-	"${FILESDIR}/${PN}-4.2.2-dtv_scan_tables.patch"
+	"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
+	"${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch
+	"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
+	"${FILESDIR}"/${PN}-4.2.5-ffmpeg_3.5.patch
+	"${FILESDIR}"/${PN}-4.2.5-gcc8.patch
 )
 
 DOCS=( README.md )
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 04ecda4fb1b5..8ee4fdaf1183 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-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
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="+capmt +constcw +cwc dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
+IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
 
 RDEPEND="
 	virtual/libiconv
@@ -47,7 +47,6 @@ RDEPEND+="
 	xmltv? ( media-tv/xmltv )"
 
 REQUIRED_USE="
-	dvbcsa? ( || ( capmt constcw cwc ) )
 	ddci? ( dvb )
 "
 
@@ -55,9 +54,9 @@ REQUIRED_USE="
 # https://github.com/rpmfusion/tvheadend
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.0.9-use_system_queue.patch"
-	"${FILESDIR}/${PN}-4.2.1-hdhomerun.patch"
-	"${FILESDIR}/${PN}-4.2.2-dtv_scan_tables.patch"
+	"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
+	"${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch
+	"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
 )
 
 DOCS=( README.md )
@@ -89,14 +88,15 @@ src_configure() {
 		--enable-libtheora \
 		--enable-libvorbis \
 		--nowerror \
-		$(use_enable capmt) \
-		$(use_enable constcw) \
-		$(use_enable cwc) \
 		$(use_enable dbus dbus_1) \
 		$(use_enable debug trace) \
 		$(use_enable ddci) \
 		$(use_enable dvb linuxdvb) \
 		$(use_enable dvbcsa) \
+		$(use_enable dvbcsa capmt) \
+		$(use_enable dvbcsa cccam) \
+		$(use_enable dvbcsa constcw) \
+		$(use_enable dvbcsa cwc) \
 		$(use_enable ffmpeg libav) \
 		$(use_enable hdhomerun hdhomerun_client) \
 		$(use_enable imagecache) \