gentoo resync : 25.04.2020

8 files changed, 20 insertions, 15 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 35c0f01885bc..2e412c0ee906 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 6d235fb79594..f00076ef46d2 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,6 @@
 DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3 SHA512 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
-DIST audacious-plugins-4.0.tar.bz2 1741569 BLAKE2B 2be0bd0d48cda51788286385a1c75d9f9d5701fff325dab7fe0f63560051690f023d8e27d24d33b87aefeaa0d54cc5e6240736511d9b547aad9d260da0e9f471 SHA512 f9f7d249ff5b8337729ce59b24ec249b96842ed9986a6a42a4de179bed44a431316537311a5514d652c0f847d7e849afd18e0bb2a2a5628d24cc6d449c52095c
+DIST audacious-plugins-4.0.2.tar.bz2 1752042 BLAKE2B 73a7c72517e1f897885d0d73797e0b47fe4c25625f317dd6ea6179de997d10f2e6b829bc35411794c1b526eb671e07220bc7056214668d2cd5b53d2e754a7041 SHA512 0d3aa46f6ad75e6d541de7b7f24de2cc169a8856c5a204688231b6233131a1ce55feb9bb126eed89d05a8ee21e3a441449a1e11fd20b4fc10724afebb4318118
 EBUILD audacious-plugins-3.10.1-r1.ebuild 4264 BLAKE2B 7f428c8cb876672ef3190116b2d4fe11db5c3eb8e1695bc7122742f6f4321f58cb517542d3b2d73419e6032e2f444c62e45b7d4b0769ff0bb29d6b9a99d2694e SHA512 16ad541dd629fb5ac68851d2e7563b4e334addf53664a6c87da64f797c33b102fbdc7371ae189389500f296b47c339f2800bb408ffc2860dd4823cb33a030f44
-EBUILD audacious-plugins-4.0.ebuild 4170 BLAKE2B 4896885c16c2c9c45a0b81bd88ff1652e03d98be1b1804f6a18d634bfdbbf7d497ccbac458c86dc6796593d61caefd0d2ee563fee659075cecc547dbe2f3ada4 SHA512 ee5bde622419a840f4d038f4767dfc0152ae29d8f6b301799ff9286e3afe1fc24a1770028d503deb55ba0613ab3a8dc77464210efc91e0006043b492c57067fc
+EBUILD audacious-plugins-4.0.2.ebuild 4170 BLAKE2B 4896885c16c2c9c45a0b81bd88ff1652e03d98be1b1804f6a18d634bfdbbf7d497ccbac458c86dc6796593d61caefd0d2ee563fee659075cecc547dbe2f3ada4 SHA512 ee5bde622419a840f4d038f4767dfc0152ae29d8f6b301799ff9286e3afe1fc24a1770028d503deb55ba0613ab3a8dc77464210efc91e0006043b492c57067fc
 EBUILD audacious-plugins-9999.ebuild 4440 BLAKE2B bdff723274a39f9073e1ed2d8255ea8a0333f25f7ad678e762128d66477707b0f9f04e906433193da5ed7ab6f0f6f0acd534aef0032b0ce14e46c8ad2d03d2cf SHA512 29bfda58cfed858a64440c18eed2941b51de9af1aa36159026305d9a789fb65c0d4bb539a38c8eddfddc7d5d7eaa678f363fd74282cfc5b774ffdcbfa25ffb1b
 MISC metadata.xml 1383 BLAKE2B cbd59fa551c1841640a017477023c49554180f8cb4aa2d4700973da93f7fa3208ea44127c56c7cece22e0542f2ee9f900876e962d4a375d1ddff159bfa59a651 SHA512 4338dbb924441a1f49dd4a37c22089772ca7638966127427d49fe128084ab3790b313edde2f07b73e2a8a48f6fb54369b45e0769273796eeda258a19a3da308c
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.2.ebuild
index 9344bbc04686..9344bbc04686 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-4.0.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.2.ebuild
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 86f79b9594a9..78430fd3b32a 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -6,8 +6,8 @@ DIST live.2017.10.28.tar.gz 629858 BLAKE2B a1d862ae1356b46fcd4e5ef7e27c47d3fb3ab
 DIST live.2018.01.29.tar.gz 630144 BLAKE2B dd58865636a44ccabd0e3b02e1679393f17fb09d82455188d49d4fcb321b21e136a168c0f4c407c1dba3afcb5b541192cd2c5181d7a7710d39d4727526fc39cf SHA512 dfdfcac67acd28f651807de423c6aed00190cfc38ecd361b76d37d8cc27ee2fa91a42a5b8835045680fd7f65c847e41747b948c2c71e6530a3c7e89421c60227
 DIST live.2018.07.07.tar.gz 630625 BLAKE2B 8545d4d8ed60328ccc782b6c2a8c4a0dc9ce3c1245fbc78fed4d3eb6f42de39c3c341456dc00cdc416fdcb2e518f5fe387273f5b4d2c3e2d32bfa22a21df2a90 SHA512 e7d4ddf51e9666c6ebe9a46976035b68fea94be54825535ffb04006cd242b9d3ad08250305206442bed3500d1e8d628ccf44302c485f63a9e244b3f8b1e27fe4
 DIST live.2020.03.06.tar.gz 7231080 BLAKE2B 95a1d3cc394eba473296973a1e44160dd1ca8e2efbc322a2e0bfbdb183244cda28b219ea14a51c8d146807d829b566a9c3782b291d5abfbd306a92e030e108e4 SHA512 7da439fbdeab0da6687dee56d9a27bf7b8f8a9c84b420d72f2e2a7ff7a73d18756d1fdb920f29b36917d93efcecc9230877637322d5041eeba114882b4bf7a06
-EBUILD live-2017.10.28.ebuild 3972 BLAKE2B aa1972772f5188f515ef1671de6f78761ff0e1c0c3b952e0e7681bdcf36278915e9632a99d75cfb8d9304eb9a20937342abcedad81dc52439e73e0552696e5a0 SHA512 963217c43a1bebe52209f1b2914cc402b533d388e119e794b384085083d8358a51e9939c7e608dedc25094d0c18f638355804ed4885a399099ee4e2286d4f642
+EBUILD live-2017.10.28.ebuild 3973 BLAKE2B 3d0511be782f8265f4976bfa99c2fa8c603702e8ceea1b911e476bd16c33c6ce4ab270b0453d0669632a48a3374e5512b4e75ede9f8356b6551816b69d3fe367 SHA512 87d5e831968a2c974b5d707e5e30ef017eabbb9f3c7f892e84d0b7cde6a4d8e1d1e3eb1e5786ab27ef97e60f9b84f913544143f4b3b40afdd914d0476bcf06d5
 EBUILD live-2018.01.29.ebuild 3982 BLAKE2B e28c5b60c2be54e78cb80804b1e471ab32d32413f6bcd98a9e817cd83cccb087e3701db1500f805b3a3397dc0d29dda91ce38b6908511982957c303eb1f1ff8b SHA512 c6368ae4fe5fce9eb239782f163ac98d7d1124dc3620ef58629ea1877fc64603b1b4e752480973c43a19af25e4db8ae7eafbad5ced1203d5e501236a37d871a2
 EBUILD live-2018.07.07.ebuild 3982 BLAKE2B e28c5b60c2be54e78cb80804b1e471ab32d32413f6bcd98a9e817cd83cccb087e3701db1500f805b3a3397dc0d29dda91ce38b6908511982957c303eb1f1ff8b SHA512 c6368ae4fe5fce9eb239782f163ac98d7d1124dc3620ef58629ea1877fc64603b1b4e752480973c43a19af25e4db8ae7eafbad5ced1203d5e501236a37d871a2
-EBUILD live-2020.03.06.ebuild 3058 BLAKE2B 9b7c8405474858134d592e7de6356b25d802e8f30a3f3f5c30ac3ca0ec0d953b276f97e40a6ff2ea52f8107b6f3b2861898c2941b16eb49bc646fe8eab106498 SHA512 72683d7d6580cbaa9eedce6c94297ff8ee23050164bdb00bbc6b2b7bcff0e83711537bf7a9066f120751fd3bf205c52e6d209192098f387e5c13849f8bc74e6e
+EBUILD live-2020.03.06.ebuild 3052 BLAKE2B fefa656dca0f1ebde2bb5ecccee03c0e5ca2abb1efed3a0921bfefd975cc4cb5eb59197fef1fa8086a03614e024465d64567f0a39909a4c83d6d3c76449c688e SHA512 0d306cb3123b1ee15828c3ae77f782c74a1b408989a80d5a7b16dfe869cff67d8cb3dc4a7ded87aa86d56d173c34ff3474732bb3e4dbc2ac24c127e8c828581e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/live-2017.10.28.ebuild b/media-plugins/live/live-2017.10.28.ebuild
index 608e5bd428c7..80f3e6db5e2b 100644
--- a/media-plugins/live/live-2017.10.28.ebuild
+++ b/media-plugins/live/live-2017.10.28.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
 	mirror://gentoo/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples static-libs"
 DOCS=( "live-shared/README" )
 
diff --git a/media-plugins/live/live-2020.03.06.ebuild b/media-plugins/live/live-2020.03.06.ebuild
index 317ad30c5531..c1ab7d6f306a 100644
--- a/media-plugins/live/live-2020.03.06.ebuild
+++ b/media-plugins/live/live-2020.03.06.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="libressl ssl"
 
 DEPEND="
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 4ecd7547a4ab..96adeb02b793 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,8 +1,8 @@
 AUX confd-2.0.0 1476 BLAKE2B a1f852cb07940ff54125d88bae9467e5068e66e903b4dcdbde295cb3aa89a49d92ff7e89632882ad8be59037ff44e1f6f1d6a4f53d7200024e0fe69b499da693 SHA512 8ab8b99e770dacbaadfc97ccc80f3d2c857bf95b662b9152959ccd88b940f4d2f7d2957ea4f6390f30470aca809cb3bb04b8b9e696122131fbb6d9f5d010f579
 AUX vdr-frontend 400 BLAKE2B 49713e916fbbf849517440d50343f4cedc6ffb7f65e44235df5706d4ef5881fbc92b657a0079f6c0ca9d93b3eb0fe582385b41c1d87b2dc835abd1783c723edb SHA512 e6ef3d51fa02290db8456c5b37f9a97f90557bb7943c1310ff2d8e77ee1beee3c98b1a6f012c9d97e048e3d7079b72cdeab9fa13e2a494bcb6dc58c2cd426e1f
-DIST vdr-xineliboutput-2.0.0.tgz 413085 BLAKE2B 85fffdbea51917035475863019095ed81bdda6e8e994c3d76b83433fca14cf680c64e268c04316199f6b707b5da7bf0ceafb991781ced552abebebf2e283fb5f SHA512 9410072bcd8ae71196e3417c12dc810da109f155748d58b3b0b422cd6d8cd29b3f8a7d0cbffada9dd22af679161ffeb096e952f620ed1c7f1122b46bf111f9ee
 DIST vdr-xineliboutput-2.1.0.tgz 415333 BLAKE2B 8311271dda889cde5ab69d5bf1f643c8f6b1991ca615ce6322ea5585aac12b07b32f6fd933bf6c3797d45971597e61d429e4d9de356246109cab7c8f059b4d79 SHA512 226654dcd47864e9df8282ef401509d291677587b2850872c535abb7bee468a7c6d72c30953090890d002f0977aa1ee357a0fe6938ce3f3c1b6324e82b926537
-EBUILD vdr-xineliboutput-2.0.0.ebuild 2974 BLAKE2B 584e440e45d2eea3b264949d85bac6cac66a9257e2a9343c9aab2d0be535c328943237c8eb2a66014f716d7df6a98c292005d47c27abbe4ffeb83c36c66a7bb6 SHA512 531d4127d1946e881843331db3eb18e070167357ceb0edc741a8253e295c78cb2abfe6df1a5c85757e24c9f022de54712f7e678565973d26aa5b1daba713b7b9
+DIST vdr-xineliboutput-2.2.0.tgz 426058 BLAKE2B 8a5e325e0dd45dffdbcf1b9e49d4ae2486d3b3c7585dbca81855264a0a9057c48da7626acd5e9d7b2113b200eead178b19a0d9834ace5d25cd97157912d50bfa SHA512 d3b753fe496c6f73d491195cc1dac3333a46f2ef6350683fc15e3e8a423a90946574c3fdf0ed43727d61f007a8abdf3041e274317216bf06a8146dc9206f88d9
 EBUILD vdr-xineliboutput-2.1.0.ebuild 3184 BLAKE2B c92bae8a16ea267a2113d92bddeed12b964048dda20dc4175f4f9f4377b0390c212b7cd3c7fedd13063a42c7154c7b69bb5dbf7aea6aee27e8d4dc20a80683dc SHA512 79329bd06dc3def119f8b037b28d4eeef6b77729c562738a6ea78ed94da4b9378bc80eecb493562f56817a93e12941bcb1bfba1b46d5643b83e099c9913a2705
+EBUILD vdr-xineliboutput-2.2.0.ebuild 3160 BLAKE2B 5c52c25ce1c57801e1aae5b74786ff8b4a5ce4f4d70f158ae7c924c730fa9a0b28e2dd8e5d19e78e951558d230295e41f53a2bffe1155431da76cfdf54d124cf SHA512 b7d8d943e6070f55e89119fbbb971369e4b47b950322985b3f50198300cba1057cf91cbf62e995d69a3ae59c1cc1e07d70b4a312dd92b4042ea8b445b50a5e6e
 EBUILD vdr-xineliboutput-9999.ebuild 3335 BLAKE2B dd251a11d5b4d1371ad03e35eff49ed746acc29789a8d7e67658c07f1a80729a3e07e2f250d73beb1b028ab8a6391a9d4f17274cbee15270dd07695a3e48d075 SHA512 16a1e737980e841b5722d21e4735a49c5a9ba6555e8affe876fd1f62cb1652d8fd4331e106603f21a1d58771c2f720211f8a1bc4973229825849aefd2fc283e3
 MISC metadata.xml 830 BLAKE2B 04a0e0ba5a0afc1b2c3669a442bb5b62f44d25159c16c3a6539c541b43d22b4f30c8c6ea60b076f6326aed51ca4308af52971c3b3cc5bb5c93c3128ec22f6302 SHA512 4407810d8c94d896214a12e33698432024ffed5e788be0bf850aa706f2b3eefd9a5ecb58eaf37d6f3d28611ccaae9683b8feb97d2b1cc074386e67b6dc58e1e0
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0.ebuild
index da8c3780dcae..a0ae0f345cf4 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs vdr-plugin-2
 
@@ -14,11 +14,11 @@ SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
 SLOT="0"
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
+IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
 
 COMMON_DEPEND="
 	vdr? (
-		>=media-video/vdr-1.6.0
+		media-video/vdr
 		libextractor? ( >=media-libs/libextractor-0.5.20 )
 		caps? ( sys-libs/libcap )
 	)
@@ -31,12 +31,13 @@ COMMON_DEPEND="
 			x11-libs/libX11
 			x11-libs/libXext
 			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
+			bluray? ( media-libs/libbluray )
 			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
-			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
 			jpeg? ( virtual/jpeg:* )
-			bluray? ( media-libs/libbluray )
 			opengl? ( virtual/opengl )
+			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
+			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
+			xinerama? ( x11-libs/libXinerama )
 		)
 	)"
 
@@ -82,21 +83,25 @@ src_configure() {
 		$(use_enable X xshm) \
 		$(use_enable X xdpms) \
 		$(use_enable X xshape) \
+		$(use_enable X xrandr) \
 		$(use_enable X xrender) \
 		$(use_enable fbcon fb) \
 		$(use_enable vdr) \
 		$(use_enable xine libxine) \
 		$(use_enable libextractor) \
 		$(use_enable caps libcap) \
+		$(use_enable cec libcec) \
 		$(use_enable jpeg libjpeg) \
 		$(use_enable xinerama) \
-		$(use_enable vdpau) \
 		$(use_enable dbus dbus-glib-1) \
 		$(use_enable nls i18n) \
 		$(use_enable bluray libbluray) \
 		$(use_enable opengl) \
 		${myconf} \
 		|| die
+
+	# UINT64_C is needed by ffmpeg headers
+	append-cxxflags -D__STDC_CONSTANT_MACROS
 }
 
 src_install() {