gentoo resync : 29.08.2018

21 files changed, 97 insertions, 67 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index de165cd3e426..44040cf39b76 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ccextractor/Manifest b/media-video/ccextractor/Manifest
index 55ce73323edc..74086d6794f0 100644
--- a/media-video/ccextractor/Manifest
+++ b/media-video/ccextractor/Manifest
@@ -1,5 +1,5 @@
 AUX ccextractor-0.68-libpng.patch 316 BLAKE2B b2e9888be409b56ba0f7ea1a7838c780f0b3e781d8ccd26aa83b8e952fcaee41b19e459729a0b76c1dcfcc8ad548c892ea21bcd71fe96c50c1c34d6cd986fe80 SHA512 1952c3a9a8804cb2adafb026994c94fad3e621fcdd601ead9ccb53d022efd131c8325ea93b1dbf5d37afd272ae69db120087452fad640b990f15e6e1b198d676
-AUX ccextractor-0.85-makefile.patch 3074 BLAKE2B ca569c3456ed722866248e81e02aec85d7f5dd72f25e579b728ac61b562f975c1a88943323572969e542bc4aac3363220656a3c2dc70c19dbe7090e4e1b6637e SHA512 5b6ff4d68f11bea84159dea3c4b430244bbfccf1037456d9f401fd1d5097fa2a92152d8617de1d1a2bc0b22acaa8249676b1322759f229475afb584ef2b4fa24
+AUX ccextractor-0.85-cmake.patch 3008 BLAKE2B a6ce3f6004dbaaa2cb2b5d87798d8125779f380923f930210440165c09ddedc4027f71e338acf560f25ebbb235064e35c4afec7cec588e058367a2cbb4069cf7 SHA512 d2fee97a35c3b104d311d9424cdd199655b12a114172c3b152cca8503b06900897a5334709770af3b1b1294893376d9d4f5f3fc0486250dd90899df0bc7af3d0
 DIST ccextractor-0.59-src.zip 168198 BLAKE2B b0398e897b2f5e1aa7974b92aefd1d7a8c2c7fcaa9761b672de8f0b6c636fc373a5b66a0421e163c6b03253817475eb07cb0ec1a4561d9e930d332f1a31cb1dd SHA512 13c9ffacdcbea781bac067e850700dbe46ba5fad00f2fde1fb563980c06b77be4c2216b1075d3dad873e3604f408f4cb739fca66bc0764bbaf15a987eb9cc9a3
 DIST ccextractor-src-nowin.0.85.zip 1843154 BLAKE2B 507018e76ed075de033df10c8af235ab7095b3dcf85c10398d9a7c8dbec338c6fe43f98b4f337419945b5deb9290d8652caa54c70de5fdfb0364b9dc48468379 SHA512 53adc017b7b1679302677e3773aabdcceddabdd8a6550cf8b9fb98150b7323a1cc6dbe67a48ebcdf22a4d013c00831907799032dd0f7f6f06943252be8177cec
 DIST ccextractor.src.0.68.zip 927590 BLAKE2B 2f2e3423ef67acb76a9cdfec66a6bd3c41fac88b53b8fcabaf1c260589d117efe19f04b3b005ad30b549d23a5974509a242beabd61eda01fb5bfe77f52e9fe45 SHA512 c73eb007db7058cf17a818cd5bdf20dfb6f6f3585f55d9f7f1b894aaedcc6b74ac0c2b34b517b44491cdefe2fe7b1fc0035802326b61f7f6330acdb854b8c2ad
@@ -7,5 +7,5 @@ DIST ccextractor.src.0.69.zip 940531 BLAKE2B c15d8936cbbae5d2fc54add13b0b8031828
 EBUILD ccextractor-0.59.ebuild 589 BLAKE2B 0ca1569ffb185579d9f845c2683013f8b6992f2c5375851d3055e34da6fa1809638906d41bcec1193765ee90bfa5ff3280d7e7a8faf425ab40a781a45591b158 SHA512 0e0f88172de4ce078192f8279307ead63cea96aa837264e3b823056414c1d3b451cf1971bdbe1fc5633afc749d4e77e867c29e42d592582c3995736e51222c98
 EBUILD ccextractor-0.68.ebuild 836 BLAKE2B dad24887218fc543d8f5795f348071484fa4107db11958248e4e4c20173a6dc6f66ccec7a8ccb3fcc1bb34f95d2f97edde45f0efae6f1ac12d3247640207fee8 SHA512 fbd2aad9e1208b2c0f6a47a6c1086b4fd1ea425ef8c8c5107359b28d94591cac51c382ca24223623595498274005c7e1c2949c31bed13bdef0baef0be3e382e1
 EBUILD ccextractor-0.69.ebuild 783 BLAKE2B 4e005b471352246d52b8c8b144a11f0b80c30d85c23036a27cc205807eef99f2f516aba35090e7bd248168f88b4a974c912963c1c0c53607bb6b0ca027a42248 SHA512 c6e4ee836537639a126f23cc5cb8eedc3ae0f564ef43f33c0476ef975ba1a986020aa87bb91f9fa00e89cb27e933b8d2363d5e6e155a3640d5d1478dcc352a9a
-EBUILD ccextractor-0.85-r1.ebuild 626 BLAKE2B e0942a7756c2501bcebab36b70f8a3e33e73a5db05ebbe1a3ea9c2ba351e2642fc3109b004b5cc3f3566b02eac757e67a53404afbed01b9beba31cf8a3466613 SHA512 2566ba32d6e980b5e541ec3f4b80ff5a669b0a28630b5e601bbbdc41edfb0897f615b92d826355abe97cefcb13e3c867cdd82c3681a6b538af438bc601e7bc49
+EBUILD ccextractor-0.85-r2.ebuild 629 BLAKE2B 91f141f219f13759f4504c8383a938fb0b2868080a79746152e55cec8b63ecd6066a398c715567f5141fb84ab349cc7d55ef41e570d44cacfebc83ef3e9080eb SHA512 4ab39bc6653f4ac687eeca4040276cbe11f7048cd4594cd1a3e67e9b29c6d188d61a1f407942ea29a851a4cf90cba3fb5bc9093777b606811eb0bc838a724f34
 MISC metadata.xml 525 BLAKE2B 930b586a391abcf3b3f5b3102fd4e720e8ca762eeec93adea4e3c4078b2e903f356d1e6da7cbf8a294a95b43b392efe64287c01c6b5666ced37326d6236c777f SHA512 497eb90960d645c7d1a205c4d556d79b4d2df8aec51fa0abf73afc3b359dbf6f85b4c6e035b966a69f2e5ed4d3de22ee7b335d62d60ad6b20b071edd4d75ddb2
diff --git a/media-video/ccextractor/ccextractor-0.85-r1.ebuild b/media-video/ccextractor/ccextractor-0.85-r2.ebuild
index 35c0f63e14fe..1ae06ed2d101 100644
--- a/media-video/ccextractor/ccextractor-0.85-r1.ebuild
+++ b/media-video/ccextractor/ccextractor-0.85-r2.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
+EAPI=6
 
-inherit eutils toolchain-funcs cmake-utils
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Extract closed captioning subtitles from video to SRT"
-HOMEPAGE="http://ccextractor.sourceforge.net/"
+HOMEPAGE="https://www.ccextractor.org/"
 SRC_URI="mirror://sourceforge/ccextractor/${PN}-src-nowin.${PV}.zip"
 
 LICENSE="GPL-2"
@@ -24,10 +24,9 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}/src"
 
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
-src_prepare() {
-	cmake-utils_src_prepare
+src_install() {
+	cmake-utils_src_install
+	dodoc ../docs/*.TXT
 }
diff --git a/media-video/ccextractor/files/ccextractor-0.85-makefile.patch b/media-video/ccextractor/files/ccextractor-0.85-cmake.patch
index 6937869180de..2fcf6cfee4b0 100644
--- a/media-video/ccextractor/files/ccextractor-0.85-makefile.patch
+++ b/media-video/ccextractor/files/ccextractor-0.85-cmake.patch
@@ -1,5 +1,5 @@
---- ccextractor/src/CMakeLists.txt.orig	2017-07-25 12:22:29.294144514 -0600
-+++ ccextractor/src/CMakeLists.txt	2017-07-25 12:23:33.979149436 -0600
+--- a/CMakeLists.txt	2017-07-25 12:22:29.294144514 -0600
++++ b/CMakeLists.txt	2017-07-25 12:23:33.979149436 -0600
 @@ -25,14 +25,13 @@
  include_directories ("${PROJECT_SOURCE_DIR}/protobuf-c/")
  include_directories ("${PROJECT_SOURCE_DIR}/zvbi")
@@ -43,8 +43,8 @@
  
  ########################################################
  # Build using FFmpeg libraries
---- ccextractor/src/lib_ccx/CMakeLists.txt.orig	2017-07-25 12:32:32.803190443 -0600
-+++ ccextractor/src/lib_ccx/CMakeLists.txt	2017-07-25 12:25:40.819159089 -0600
+--- a/lib_ccx/CMakeLists.txt	2017-07-25 12:32:32.803190443 -0600
++++ b/lib_ccx/CMakeLists.txt	2017-07-25 12:25:40.819159089 -0600
 @@ -1,6 +1,6 @@
  cmake_policy (SET CMP0037 NEW)
  
diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
index de5c35a5d428..b78d5b3557ec 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-mplayer-1.0.8.tar.gz 1062691 BLAKE2B 0ff843b26ffdaffa7240c04a55f15f8534e657610f6483da9fa92d054e748187a288deb8e330032ae0d2e774d3e4d7b913680669ccf0b8fa9202c98fee686295 SHA512 795530313a6b8135e328e0cb8f5d9081b0b5caf8f81b1ab182a2876241bd662b96d2ef25164dc6f436fb66168472f3716e033697f0aeffe5f84c59cd8de420c2
 DIST gnome-mplayer-1.0.9.tar.gz 1082199 BLAKE2B c2219b5a6902c9e2c9849dd3a31a29e2270b7ca513945a5e9684fa429073f42e360f6ef698f42b93e61a3d39edef1215f657e92cfab1c9fe3b19d5ea85eac839 SHA512 5aaea17afddaf2f949b798b87d4d6306130b9622d2dae68a7f24abebc2174cac7cb17c3112dac6629a0643e31098865462c10355dfcd43f16d2503848e18fa7d
-EBUILD gnome-mplayer-1.0.8.ebuild 1842 BLAKE2B 3f170e2ec80a8f02065a1f6421fdb7d74a64e8522b7ca6345e0b4f08b06d7704c9ad9e5bb59dcbd4c81afc6cccb64efae9b0a9f329dde9385d4247d4305b65ff SHA512 8c113790c51ea05cfce90409288c447f53b21a99cfccec0332b68d465605974f4a670bbdac2d09d1cd7a3bcd590e619b13a6806b4da621178d2e5e9d5a42e2eb
-EBUILD gnome-mplayer-1.0.9.ebuild 1956 BLAKE2B 986944c3d72416ca54a6a761d28effe13e71fb24cfac7245af4d574599944793f6bb551d08d9770b0024af3386a333f30768a7135df074e09dc287c7555c64c9 SHA512 43b5d05c61673133676821019083555bcf355116c73d02c507afce206240b1189f505770ba17f833f27deb3ae1156c5b59da3da28ca36d8bb6e2279fa3af3bc4
+EBUILD gnome-mplayer-1.0.8.ebuild 1806 BLAKE2B 307dc849ae9e5c42fad05e46ac988aaa350cadb3ec0bf6a0b580e4e0d8a8bbfbe519907cd37523d6a1651ddab2a4c808821ac4e78f4c3488d075b310349dc8df SHA512 90b98fdb269d35030cd565e579e60c1249c7e7ff120421b4d2a85b32cea932843a097d4dfa2dfb6363ba99e1dd9964a352eff1544a0cf0525acfc19bfe762b93
+EBUILD gnome-mplayer-1.0.9.ebuild 1920 BLAKE2B 3c779d5faa4e322df4f1d98226de4ff4063797b983c691c8880e0745178bdbf20e20ca52c7b706890459d4dd0758ad52cefb660dd05e8b97c075871988b03d0e SHA512 fc42f38928001d4f844afdfebbd66ff2ad9a258fd9c6e92cfea0c20424536ab8e2cb60885f787a3ce0284d4d5bbe66394e994546ea3a11743e503c13b801fa6d
 MISC metadata.xml 398 BLAKE2B e6cef861c1aa0178c3ff271532dc97bef997513cf5f5c37ab4a41dfe0e3430d5b2f7fdfcf0f7952a5ff6811a96520139531d23b8a446b226e21f57d6df739a4f SHA512 5916892e84d2f43920e341fce811b49419c27a81a1c95e8e8a6a269b1a9b58702aef3d5728b947afc2699dffc788e877f44dce45380f0024894c4422750c9a87
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
index c4b1bf9cb060..e3cfb34a9eb0 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.8.ebuild
@@ -31,7 +31,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
-	|| ( >=media-video/mplayer-1.0_rc4_p20100101[libass] media-video/mplayer2[libass] )"
+	>=media-video/mplayer-1.0_rc4_p20100101[libass]"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
index 5deb795cc254..b6473af07344 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.9.ebuild
@@ -31,7 +31,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )"
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
-	|| ( >=media-video/mplayer-1.0_rc4_p20100101[libass] media-video/mplayer2[libass] )"
+	>=media-video/mplayer-1.0_rc4_p20100101[libass]"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 1d4fb1434faf..94fab6e0f7cd 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 10043 BLAKE2B d5d5cd08f4b07c3e55a89fa2c8198529b189faed79aafbc1e9d027ad4ac767002cb576b71ba898fd4fb31bb411989b5b6523eaa2514f1683739b404dc508f004 SHA512 65cb0951cee488e72d6223321e0f5946be8c2de3e9d148d192a067fc23d493476b5e17f0291f179539d6ce47f44175de9d866028d41e581050aef46c475ae976
+EBUILD libav-9.17.ebuild 9976 BLAKE2B 053e88c957d482f172b0ad170ed35712e86758d945df08e666640b28743d8970fc2c481b69c0ed74234a2a66e4e0116573f7e660500365f77e6ca3b41b55007e SHA512 0dba0e1cd904a8cacf6d50e6370983bba1dd85d5495e934d83def260a35a4d28fb14876d36d528dc4b2a34442e0d22b22e69a10b2b7d13506c9f175fad3e980a
 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 47f49fe210c5..ff2da501fc7b 100644
--- a/media-video/libav/libav-9.17.ebuild
+++ b/media-video/libav/libav-9.17.ebuild
@@ -49,10 +49,7 @@ RDEPEND="
 	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	cdio? (
-		|| (
-			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
-			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
-		)
+		>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
 	)
 	encode? (
 		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index a172063ca8da..b557d15d75bc 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -2,6 +2,6 @@ DIST parole-0.8.1.tar.bz2 814827 BLAKE2B 54c6753da5f9e6e6eef70bfbe13dd6496687fb3
 DIST parole-1.0.0.tar.bz2 900499 BLAKE2B d6a1eb21846426781a712f33b7cf8f412b17b9a3e02b1ef15b6ff742687efc70a3e3f0ae8124ed2226a1cf00022c7ef0650c8e1c1b6e3279b111891e8c3e651e SHA512 0581fed93d2a09a3d9ec9cf1bb68a298ccd47676b22d0824495136ee9d785290b8465af8c12b5ecd34a46936f7433bf96dd559e6252a8f1af46c0e2f9256c864
 DIST parole-1.0.1.tar.bz2 903754 BLAKE2B 2bd8a8892c04bc145d7ba0bc08c29ad1f9c4507cce533d554952553e46c408e9f293a19820790541d0a494052ac6024d415bfef4864fc09b8d851664688ace3e SHA512 026ece62e6a8175976e7ce218edbd6955a0cdb5074996adad5bed3e536f90108e4d1106f22edcb06d213fb09dd47b04f81bff94f4534710b61f0f53cb0395f72
 EBUILD parole-0.8.1.ebuild 1284 BLAKE2B add340579bde9e74dad8d327f0a47d72d0275eac9a69f43b034b71b80f6e4f754999f937e6585c8e7494f35172fcfc55258f5eb8d6ed4d095a44efd3d2bef741 SHA512 d315e12d36f1d0c8bbf8a5e2bb4a34e3c9f67e4cfc06fa03ac862a7ac8df349957bb43f15fc75589e9523dda4785142e849f8ababd3cd18ed050f222627fcae2
-EBUILD parole-1.0.0.ebuild 1489 BLAKE2B b609b1903f400a0465ee0b3c425eaceab269b9d39c5bba04ef27da757719057ab8e0befd12664c4b486fa9d12a8c46b6ef2f79a8da0d9984e7ff7599bf123bf0 SHA512 303f44537374389aa315b7e0d4b70ba35c97df9d35f49e425fdba012d857a5258e95a9b01f27b419d3c0ca859596aa1415d16c52ee90fac0b5279f5c9ba758ba
-EBUILD parole-1.0.1.ebuild 1491 BLAKE2B 7ec1947bf6ad7865889343c6f81d331762eff7885eb129461e9fdc1250a04df1873c9df31d4aeaef847ad421e599db6362f45064b6b4177dace84100feabd1f3 SHA512 eabdea181b48d8535f3ad3e20567289ad4873654535c5cf16718082ea3e12ff25178c248f5c49780bfe7011adc19f4f6b95dc0e84b2b61813c880bb7fd3f8652
+EBUILD parole-1.0.0.ebuild 1423 BLAKE2B 2cf11db0e9ceb829b290ccf774f9fb9cf94a0af47f8d896e91cd5660d24f61f321fe4d9b5ee7381138efb739263ae71beae28a07352a700b5f8d781f6e882006 SHA512 f7a862aca1db2e6b234d5276f0fe6ea9febd3b7fef718e758558494dbfa3de1aa5302325431b8601702593ec857a7d8beea3ecb93f29e1716172ecf13f349b38
+EBUILD parole-1.0.1.ebuild 1425 BLAKE2B 14511bc39a817114e35f2f6d349207a54b0a2dfec9fc983de15780acd3b69c34a04ea955e37002556800ae456c33bf821b576250a523aba0d250cde13bea330b SHA512 e8e341d19cbc90b6899462c2fff6fb68388587a2bb33544713c9d7487f24b47bd65448633f09ecfc208bc6b7174cac50f1cb7fd65d1be859cdae118b339ee3f4
 MISC metadata.xml 318 BLAKE2B fc559f9ed2dba93e1117e5b01a8e7202b4d8fa64493133ebbe758e4d6c13836ae484b7be986cbcae4d32ec3175d138292aa51a86018cf531c7f12c8f3bd06590 SHA512 412b57b034604b0b6d532fadf5eba6478222b30fe4a003ff1486b59ec1136f440343c4524951cee33b235dfa782c09380326d9cbee17e1406408947d12fc430e
diff --git a/media-video/parole/parole-1.0.0.ebuild b/media-video/parole/parole-1.0.0.ebuild
index 19fa3b98c738..09bfa0b3870f 100644
--- a/media-video/parole/parole-1.0.0.ebuild
+++ b/media-video/parole/parole-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~mips x86"
-IUSE="clutter libnotify taglib"
+IUSE="libnotify taglib"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
 	>=dev-libs/glib-2.32:2=
@@ -24,11 +24,6 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
 	>=xfce-base/libxfce4ui-4.11:0=[gtk3(+)]
 	>=xfce-base/libxfce4util-4.11:0=
 	>=xfce-base/xfconf-4.10:0=
-	clutter? (
-		>=media-libs/clutter-1.16.4:1.0=
-		>=media-libs/clutter-gtk-1.4.4:1.0=
-		<x11-libs/gtk+-3.22:3
-	)
 	libnotify? ( >=x11-libs/libnotify-0.7:0= )
 	taglib? ( >=media-libs/taglib-1.6:0= )"
 RDEPEND="${COMMON_DEPEND}
@@ -43,7 +38,8 @@ DOCS=( AUTHORS ChangeLog README THANKS TODO )
 
 src_configure() {
 	local myconf=(
-		$(use_enable clutter)
+		# clutter backend does not work with new GTK+3 versions
+		--disable-clutter
 		$(use_enable taglib)
 		$(use_enable libnotify notify-plugin)
 	)
diff --git a/media-video/parole/parole-1.0.1.ebuild b/media-video/parole/parole-1.0.1.ebuild
index 6bc14f9e8690..e25d25434825 100644
--- a/media-video/parole/parole-1.0.1.ebuild
+++ b/media-video/parole/parole-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="clutter libnotify taglib"
+IUSE="libnotify taglib"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
 	>=dev-libs/glib-2.32:2=
@@ -24,11 +24,6 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
 	>=xfce-base/libxfce4ui-4.11:0=[gtk3(+)]
 	>=xfce-base/libxfce4util-4.11:0=
 	>=xfce-base/xfconf-4.10:0=
-	clutter? (
-		>=media-libs/clutter-1.16.4:1.0=
-		>=media-libs/clutter-gtk-1.4.4:1.0=
-		<x11-libs/gtk+-3.22:3
-	)
 	libnotify? ( >=x11-libs/libnotify-0.7:0= )
 	taglib? ( >=media-libs/taglib-1.6:0= )"
 RDEPEND="${COMMON_DEPEND}
@@ -43,7 +38,8 @@ DOCS=( AUTHORS ChangeLog README THANKS TODO )
 
 src_configure() {
 	local myconf=(
-		$(use_enable clutter)
+		# clutter backend does not work with new GTK+3 versions
+		--disable-clutter
 		$(use_enable taglib)
 		$(use_enable libnotify notify-plugin)
 	)
diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest
index 19829a125f1a..8b2b966ceac9 100644
--- a/media-video/syncplay/Manifest
+++ b/media-video/syncplay/Manifest
@@ -1,6 +1,6 @@
 DIST syncplay-1.5.0.tar.gz 1588514 BLAKE2B 0f2bddf3500758c3081bdba993b21fe60a0d3af7081c5edd0f684e1d60a2a95edce133a597e79747350e681dd40768226226f0b26e295850a8c218107b1da3e9 SHA512 8a57add8a845c041c02147415fc4b7941a41edfb80fc037c3af4e246d9ca6391be9f3886407470b1b51b8783ad6306e42bb34991e7cbb08eea87e781e3cd2200
 DIST syncplay-1.5.1.tar.gz 1603524 BLAKE2B 0d7edb0c2129f67ce457cffb57f5600d0c0d6bee017119efc866d748f63e6e984becd21f88324e19dcac3f0ce52e2e2f1bf65326aab6237ea41b04bdecf26334 SHA512 8d7f99132b49148003dcdc83b5afc3158ebd7ad0b8a161229f8f576e7683e3c432d09793db071239e6344490f6e08d01c9061a32556b5bce6dcd68823b47a0cf
-EBUILD syncplay-1.5.0.ebuild 1358 BLAKE2B a3a78b3aead791d23c6c573983f8395b3f0221b6a92a2772f20029bf11269237b0a976f1f248bb977ff5c9e6779c4f765fe36ba8690e21cd71ecc6a685f41406 SHA512 4a3d8d5921466aea906ecb6548d143192d7e292a716a50c94491212b49c9e9a1de236de503c24f0205bceb3aa4fca0666057b929cb4a26d54b39b68ddd22692c
-EBUILD syncplay-1.5.1.ebuild 1398 BLAKE2B aa8155d7c14cdef31a62b83f939e9fde73655f5a8391f101f013ecc44f553bee76030637ec286f90cf93c1f38ba2b504781426fe2e3bde8128416641ed0e3c2d SHA512 07547edce94ec53c09d03bf88cec67b88d9709541bafd6741b5485c433b32960d3cc7c39eea482fe2abc87615cf604bbc03015eb0604dcb7f122b4785d7a863b
-EBUILD syncplay-9999.ebuild 1310 BLAKE2B f928436c63e4d100758fad6cdabc4b09e30c9dbea4a5322c667716b984d3baa703999343bafa678e372ee030e5e3b0a53ed306d10e12d74fa8e695747b7d62a7 SHA512 6ce992560e967e47a3e2a52352916d0ee7c45050963dec7e764e128eaa8e099b50e57de9404c526a18ce173dc50b578dc5aff528ded5d94f05d9fc28ac417681
-MISC metadata.xml 679 BLAKE2B fcbe4ddf714fa5ddd358c8ec03e4b0df2e201971ba0a6fea15e58b05ae3f22f510f332bd946c5021f0efcd087fae0cd31165663bcc974d3eae56b48a2175b4c3 SHA512 e997de8e604c16977c8a3dec989c50e9cbfba327e8447277bdaee835e442d77565c2b2092bede04e64babe34f62e1fcd640cc01d6ef56d4c7572bacb1718b714
+EBUILD syncplay-1.5.0.ebuild 1265 BLAKE2B 723adcca54a3874984f3e2c692eaa89fa53655cfe4f0d91c042b24e5c50cd972a750726f231afa584da18e05929ade6a1c073ff441502f9c733e3ffda0099d36 SHA512 fc05cb6ceacb6ebed2d0a484519158f6330d589fb7ac7850d1652f5a247d6be7ec05642fcb2d4a8fd842098b497330707d72fb5ca782a869a3a42196b2d4a5b3
+EBUILD syncplay-1.5.1.ebuild 1305 BLAKE2B 3c18e0111d733b6bdb09a2409b874d433b65721f52027841c22316fd127bb7dedc325fe90cb627d28c97cfa0d66e331b570a55ba80999d18b7ae8f97a886c26d SHA512 3c979ed9c651e9ad9001529431b0dff7189e040a5741a81741afa0868009ff82a23a757b58c5efa12dbc436ac394fecf30dcdbf9bbd408de07b6de5f9a28ca35
+EBUILD syncplay-9999.ebuild 1217 BLAKE2B 5a09f5c3616be994e3b1d3a2a785be441ea9d62657e34f0ce101b5bed0d5a8a9ca4662f9fee9e494ad3c6ac55818a086b415ae53ed3ff6742fc93cd8121e5d0e SHA512 55bc42bea194c8e9f25791bd42e439f89c1d442a6689c4e5c059f05cad05b684964da4000b967201f19360721a99c8848856e89445ff4609ac9cbdecc70d81a9
+MISC metadata.xml 634 BLAKE2B 8c059c46e6bdac47fede221ce0b4f67478a68aaaea8649e312a77950afb49af528bd54cc82c216fad4930e4b7e57f146d20e2a885d456eb5da8f426caa1e11db SHA512 1a29904f3b1676702df5230cb59b0822a64826d4f2e3accdfee6981f53c5f8f22465451e27990d44a0e7302e8f4a1870aab25b08fad81b3cd3fb4e1c2989b12a
diff --git a/media-video/syncplay/metadata.xml b/media-video/syncplay/metadata.xml
index 1ad1d49790cb..9fa7c960908c 100644
--- a/media-video/syncplay/metadata.xml
+++ b/media-video/syncplay/metadata.xml
@@ -15,7 +15,6 @@
 	<use>
 		<flag name="client">Install Syncplay client</flag>
 		<flag name="server">Install Syncplay server</flag>
-		<flag name="gui">Enable gui support</flag>
 		<flag name="vlc">Enable VLC2.x support</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/syncplay/syncplay-1.5.0.ebuild b/media-video/syncplay/syncplay-1.5.0.ebuild
index 82e3ec8bd455..88c576cffbde 100644
--- a/media-video/syncplay/syncplay-1.5.0.ebuild
+++ b/media-video/syncplay/syncplay-1.5.0.ebuild
@@ -16,9 +16,8 @@ SRC_URI="https://github.com/Syncplay/syncplay/archive/v${MY_PV}.tar.gz -> ${P}.t
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE="+client +server gui vlc"
+IUSE="+client +server vlc"
 REQUIRED_USE="vlc? ( client )
-	gui? ( client )
 	${PYTHON_REQUIRED_USE}"
 
 DEPEND=""
@@ -27,18 +26,15 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 		dev-python/twisted-core[${PYTHON_USEDEP}]
 	)
-	gui? ( dev-python/pyside[${PYTHON_USEDEP}] )
 	vlc? ( media-video/vlc[lua] )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_prepare() {
 	default
-	if ! use gui; then
-		sed -i 's/"noGui": False,/"noGui": True,/' \
-			syncplay/ui/ConfigurationGetter.py \
+	sed -i 's/"noGui": False,/"noGui": True,/' \
+		syncplay/ui/ConfigurationGetter.py \
 		|| die "Failed to patch ConfigurationGetter.py"
-	fi
 }
 
 src_compile() {
diff --git a/media-video/syncplay/syncplay-1.5.1.ebuild b/media-video/syncplay/syncplay-1.5.1.ebuild
index 908f6042f4ae..55904564d23e 100644
--- a/media-video/syncplay/syncplay-1.5.1.ebuild
+++ b/media-video/syncplay/syncplay-1.5.1.ebuild
@@ -14,9 +14,8 @@ SRC_URI="https://github.com/Syncplay/syncplay/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 x86"
-IUSE="+client +server gui vlc"
+IUSE="+client +server vlc"
 REQUIRED_USE="vlc? ( client )
-	gui? ( client )
 	${PYTHON_REQUIRED_USE}"
 
 DEPEND=""
@@ -27,16 +26,13 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 		dev-python/twisted-core[${PYTHON_USEDEP}]
 	)
-	gui? ( dev-python/pyside[${PYTHON_USEDEP}] )
 	vlc? ( media-video/vlc[lua] )"
 
 src_prepare() {
 	default
-	if ! use gui; then
-		sed -i 's/"noGui": False,/"noGui": True,/' \
-			syncplay/ui/ConfigurationGetter.py \
+	sed -i 's/"noGui": False,/"noGui": True,/' \
+		syncplay/ui/ConfigurationGetter.py \
 		|| die "Failed to patch ConfigurationGetter.py"
-	fi
 }
 
 src_compile() {
diff --git a/media-video/syncplay/syncplay-9999.ebuild b/media-video/syncplay/syncplay-9999.ebuild
index fd8e3170c71b..ed87eb7ddfed 100644
--- a/media-video/syncplay/syncplay-9999.ebuild
+++ b/media-video/syncplay/syncplay-9999.ebuild
@@ -15,9 +15,8 @@ EGIT_REPO_URI="https://github.com/Syncplay/${PN}.git"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="+client +server gui vlc"
+IUSE="+client +server vlc"
 REQUIRED_USE="vlc? ( client )
-	gui? ( client )
 	${PYTHON_REQUIRED_USE}"
 
 DEPEND=""
@@ -26,18 +25,15 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 		dev-python/twisted-core[${PYTHON_USEDEP}]
 	)
-	gui? ( dev-python/pyside[${PYTHON_USEDEP}] )
 	vlc? ( media-video/vlc[lua] )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_prepare() {
 	default
-	if ! use gui; then
-		sed -i 's/"noGui": False,/"noGui": True,/' \
-			syncplay/ui/ConfigurationGetter.py \
+	sed -i 's/"noGui": False,/"noGui": True,/' \
+		syncplay/ui/ConfigurationGetter.py \
 		|| die "Failed to patch ConfigurationGetter.py"
-	fi
 }
 
 src_compile() {
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 3d6c54243855..adfac42f5263 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -3,7 +3,9 @@ AUX vdr-2.0.6_gentoo.patch 2255 BLAKE2B 36b8f013e363990f831d7d5216eeefe79caba9db
 AUX vdr-2.0.7_systemd_argsdir.patch 14827 BLAKE2B b2c8eedd695f761a718d295c83cc53d8da55679c8c46f261326e2e67707f9af65b51dfa8cbe96a86ddd34c216580fdeb5b3e33adcf01f825b0c8ffd7a4374d99 SHA512 f0510d27d4b5ff2bbc3f400e5e8e4aae165f665bc7455742e12ebe6f9c6e46985b2ac9fd4089fd3c33c71d975afe73a6e9e089fc6fd9f226c5d53e3fe0553317
 AUX vdr-2.0.7_systemd_argsdir_vanilla.patch 14825 BLAKE2B 930955b2e80fa5a6c9ee24e89f3b980f7c4acded4c114cc78528d2afefa74dbdf4e0a6b41c968fcbba15943a3b91fecdebec725a9ae426f241e775893cbc369b SHA512 1270abaca1bed4a1dfc7756aaa9d1e3b17c5f35b69f3ff333988192ceddb10bbe03aa1973f878537d750b92a0a277213de193f98d6f113a2f447e342867639f3
 AUX vdr-2.2.0-r2_gentoo.patch 2578 BLAKE2B f40bd2dadb802285eb229219b2c9e2966073d37cbb6233a309589d22dd875e4457bd4a66f37aba3e0dc679960d310ee718d1bf2d72112c2dbed89a53ca234330 SHA512 46e447fabdfa38dd164dae5aacc932933595f0a068b8c60b19e9aba635c1d4b7cdf368af9e5544933f0ec64550bb685b2705f39ebffba5b1a66897e27bca6ef1
+AUX vdr-2.2.0_gcc7extpng.patch 705 BLAKE2B da34652e596d39c3a8c210a6034c2c2aba6649f9cd5e194f00a0ed21f3d2b67de68c560a4e6d2e927a262152a1998c5c279e4451248a918a757adc543a4eab03 SHA512 1f319f71c3819d82e83f68979f2876d7169d086c161939c105cd15d2107e68cbc95cda09e7e883a74e6c95c7db5b0dc58eb92662833732c180250322413ac85b
 AUX vdr-2.2.0_gentoo.patch 2322 BLAKE2B 7a7a2357bcefe53e251ed3a5b6b1cee1b85c76597c14746236671f044b5a7a5644bd1788e12499588aab87d7c342952c8b55e3a32868299e8c055983a2224b81 SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7
+AUX vdr-2.2.0_glibc-2.24.patch 1395 BLAKE2B 83a82c516554c2fce3b47078c494ddbbd0dbdbe148f1e6525532865b6f61a79110da5d55d17e6357887655ba840525f7349b221bb356a180813ae28bdfd7d1de SHA512 73acef83ada40d067b1c7207e527d782de5bc16027571a31f6411a5a075ef6fbdbd3ecd466314aaa08a01b0bf90a35c36306b5533ea4fecc0e024f7df939517a
 AUX vdr-2.2.0_unsignedtosigned.patch 5237 BLAKE2B 21c3eddc9e5684337be332ae22c97b6068681ebc8c9ff39a8d673f3511c216fd78ff9bbb43f90fd8f60d8e9bef3b4f0ac4b982469887e91a50919c0d786809ed SHA512 eb740bbfa70d205ee5db66b0aa234a09c54a49cfd60027536af86a208097f0a47dc84e7dae4a6af2cd5c34187b41cd0905ad678c7d610159fe09684b645d6a45
 DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57 SHA512 f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
@@ -13,5 +15,5 @@ DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e2
 EBUILD vdr-2.0.6-r1.ebuild 6921 BLAKE2B bb5925105f29a4ac9d303459adc3742f3b817a352bb575271c20ce5565a3edb980bd89306ee978cfa398c38be4ae8f75cdf253b1fe6526f7384488cd1a917ab9 SHA512 10997c095cb8af5f0ffa00e07247a790cb038f42a9705a4e6b2e5ca715431dd51749dc5faf9beadf899a4170d9e01de92ff61cf1cdf6e21fe87e6dd60afab07b
 EBUILD vdr-2.0.7.ebuild 7275 BLAKE2B ebe4497429f1a08314d80736f5f88ee58c0cb8df65f6930eb1de65b907cc713b29f06a46ac98cab330af24ea137ccbd47392a93d22db9d79395e5f29518489d8 SHA512 c43dd5e9d776ff640eb04b3064f77ead2931194642eb2b541a0add7e3df1c4d6291bfcf4996a450af5a4e979566ae6b374f4cbe20dca71e797fea29bdf5d8520
 EBUILD vdr-2.2.0-r1.ebuild 7538 BLAKE2B fabc149e2174c9ba75bea2b3e560e1e8ad1a79ac31933162d31908843971d9529eb7cd63fc1e5adf0c025e3bfcbde914eab5e64314f60dffaa781001dc0b7e3e SHA512 641e41abcabaae613a2d6f0a6ba55194b04ee412ed48461869dc0e4c705a02bb7cfe7ae9c64cc7efadfd3a4ed9dd7a06661874bbbbf3a5e213269899a6b6d572
-EBUILD vdr-2.2.0-r3.ebuild 7609 BLAKE2B 805e86f93e9f4d9492fd6c64025d28b6e444061ba46bab82873bdcc74399c5e8b1b2e85d8df64946695bf83de595401b66f9966d095e04bbf809c76ce7c7da5c SHA512 3c60eb03eb2d826fcdc021cfe91a859e1dce3affe47ca8c78dd035610c25ecb9cf9d3f5670a5c1d0c3d977ae0bad5d0ec5486daeea69208f08f748e77953cc64
+EBUILD vdr-2.2.0-r3.ebuild 7697 BLAKE2B 54b9bcbb607313e222cb5c3d784b3a08008b18e812c0d9ae6db664adab54c321e12b36ccccb8418016b89a02f24e2d94b6de4114e858c09b84ed7337b1dd7f6b SHA512 bee1097c7dbf79833e3fc6b0276c113ca8f05275c0353f30221cfe6a31217bd256f16ab731342c30cd21b9f1decb24fd1ca15f40ae74e4caa7561f8cc983d1c3
 MISC metadata.xml 2164 BLAKE2B 1976e2e6090ee6bddcc008794c4ffcc6ae656ab46d1ca459d01a6dd5b7736387d53af03f72685c4e9237ea04bb4f86da49ef9af7f7e1707b038b6a87ae9028c0 SHA512 b960e1d56205787e2c2f6334835b7d9f28fbd283850e2e7af6427a25a590719b7832cc2dcbd94b4ecf3e983fb846909d6b66cfadda89e5b8bcbc469a91651d24
diff --git a/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch b/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch
new file mode 100644
index 000000000000..e00453c2a728
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch
@@ -0,0 +1,16 @@
+fix compile issius gcc7: ISO C++ forbids comparison between pointer and integer
+https://www.linuxtv.org/pipermail/vdr/2017-March/029230.html
+
+Signed-of by: Joerg Bornkessel <hd_brummy@gentoo.org> (29 Aug 2018)
+diff -Naur vdr-2.2.0.orig/osdbase.c vdr-2.2.0/osdbase.c
+--- vdr-2.2.0.orig/osdbase.c	2018-08-29 11:59:49.522326559 +0200
++++ vdr-2.2.0/osdbase.c	2018-08-29 11:59:13.861326559 +0200
+@@ -525,7 +525,7 @@
+ #ifdef USE_MENUSELECTION
+       i = 0;
+       item_nr = 0;
+-      if (s && (s = skipspace(s)) != '\0' && '0' <= s[i] && s[i] <= '9') {
++      if (s && (s = skipspace(s)) != NULL && '0' <= s[i] && s[i] <= '9') {
+          do {
+             item_nr = item_nr * 10 + (s[i] - '0');
+             }
diff --git a/media-video/vdr/files/vdr-2.2.0_glibc-2.24.patch b/media-video/vdr/files/vdr-2.2.0_glibc-2.24.patch
new file mode 100644
index 000000000000..98cc13b0c3bf
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0_glibc-2.24.patch
@@ -0,0 +1,35 @@
+patch will fix readdir_r() is deprecated as of glibc-2.24
+https://www.vdr-portal.de/forum/index.php?thread/130752-handle-deprecated-functions-readdir-r-auto-ptr/&postID=1293833#post1293833
+
+Signed-of by: Joerg Bornkessel <hd_brummy@gentoo.org> (27 Aug 2018)
+diff -Naur vdr-2.2.0.orig/tools.c vdr-2.2.0/tools.c
+--- vdr-2.2.0.orig/tools.c	2018-08-27 12:59:28.571326559 +0200
++++ vdr-2.2.0/tools.c	2018-08-27 13:03:11.222326559 +0200
+@@ -1466,7 +1466,11 @@
+ struct dirent *cReadDir::Next(void)
+ {
+   if (directory) {
++#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24
+      while (readdir_r(directory, &u.d, &result) == 0 && result) {
++#else
++     while ((result = readdir(directory)) != NULL) {
++#endif
+            if (strcmp(result->d_name, ".") && strcmp(result->d_name, ".."))
+               return result;
+            }
+diff -Naur vdr-2.2.0.orig/tools.h vdr-2.2.0/tools.h
+--- vdr-2.2.0.orig/tools.h	2018-08-27 12:59:28.641326559 +0200
++++ vdr-2.2.0/tools.h	2018-08-27 13:01:44.022326559 +0200
+@@ -369,10 +369,12 @@
+ private:
+   DIR *directory;
+   struct dirent *result;
++#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24
+   union { // according to "The GNU C Library Reference Manual"
+     struct dirent d;
+     char b[offsetof(struct dirent, d_name) + NAME_MAX + 1];
+     } u;
++#endif
+ public:
+   cReadDir(const char *Directory);
+   ~cReadDir();
diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild b/media-video/vdr/vdr-2.2.0-r3.ebuild
index 2b4a137a165a..1da9aad71f86 100644
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild
@@ -218,6 +218,8 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}_gentoo.patch"
 	#gcc-7.2, this will fix only the core vdr, not the extpatch
 	eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
+	eapply "${FILESDIR}/${P}_glibc-2.24.patch"
+	eapply "${FILESDIR}/${P}_gcc7extpng.patch"
 
 	# fix some makefile issues
 	sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \