gentoo resync : 15.01.2020

5 files changed, 10 insertions, 38 deletions

diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index e56d8e8e9a3e..73c211d89a2e 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,9 +1,8 @@
-AUX confd-1.0.0_pre6 856 BLAKE2B 2545bf913622d7043e7fe8d17bd0e1b3435801bc035598aff28287061c1eb3d3a14f3edc53156035ead91152dd9b5ab523882b6a35bea616637b6d8b5a478366 SHA512 67ab65984c2176edb7b3985b4a561bb41c8c529796d5cc44f559e275240c0c25bfee9e340744c7f25192de8a5231ff94f0bc87ace0edbb5b496846b0f8017fed
 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 2960 BLAKE2B 8fa657edc879d8bb714622323caf29bbf51480be33df9808c481c5e2c2304dd5c6071e6e841a08548f3c353b5336b9eb28b7383a2ba3d82999e575b83c2134c1 SHA512 d994640eb60a8b701bd46d0c4e8bbf559cd82be6cbadc6a759e14ec75ce22e92df25a4982d1fefdc03873659d23cb432ec76d38f5019d79802d59a0fbe0cc441
-EBUILD vdr-xineliboutput-2.1.0.ebuild 3167 BLAKE2B a63b27f5452078abb4b44f3708adca30aaf5579117f07d1445c860ef83047d3437a0674a5274616993dd59496b78b1483d0f4f11b2b22b80616e65879813fe6d SHA512 e470953f353aa30ffd957c5329a90dd547231fca964c4981c38efee7b18f563ca4a1891dc4069627116f40f66f3e88563090e535fe132855a7e02e89a63e3130
-EBUILD vdr-xineliboutput-9999.ebuild 3334 BLAKE2B 1c0f32a978de1c52740d9971b6061ea37b55fa723d641739007a116f5030c944bcff01b6cd39f0a120c71de6730f574217055e91168fa12537f3798ba6d77c78 SHA512 5fa6e56ca18b8ce9950298d2fff76c54579a7373f1ac7a971b5a560cacd688b745f88e706822ce6da0c89a824482d35117b8cd78b4ee14b2327b0e2483a14dbe
+EBUILD vdr-xineliboutput-2.0.0.ebuild 2958 BLAKE2B 722234068e68881bce49d50e7715674165b83d65f87919e519622b2305fd74067aaa195f7d1697ae8f802c91842fcb1bbdfe94724b37b51247fbc31dce39d183 SHA512 aac5e4b0e527943451e87f2fd9eb0d9045971984b29f88487a3db7207b31e44cb72808bb7fdb9e8ae4fddf361216ff507a6e6961e77d3139522e30cc1eb884db
+EBUILD vdr-xineliboutput-2.1.0.ebuild 3168 BLAKE2B 11530d3e256e1c23f428e8d8fef34292aa6046ba0436d2fd4d4f2599f1ac05963eb584c0041aff07cbb3a84825cf02812d203ed2712b0677bca74e483d8be388 SHA512 968ec4d12ca108f657b6bac0352771e88e978ad0cc33c4cf84a5ab395c9e4baa5d74059cf2c031cdfc82e59e80eda5a230ee5c3ed4f1af99bcca6663fc877936
+EBUILD vdr-xineliboutput-9999.ebuild 3335 BLAKE2B dd251a11d5b4d1371ad03e35eff49ed746acc29789a8d7e67658c07f1a80729a3e07e2f250d73beb1b028ab8a6391a9d4f17274cbee15270dd07695a3e48d075 SHA512 16a1e737980e841b5722d21e4735a49c5a9ba6555e8affe876fd1f62cb1652d8fd4331e106603f21a1d58771c2f720211f8a1bc4973229825849aefd2fc283e3
 MISC metadata.xml 914 BLAKE2B 3066d82b14007277d69678a7765cc7fb3337c30a1796f7035f0f3572f169db13ed2a7fb4741c3fba245a5cbcdfab7bcfd6d730420d6263a87f590892f4d56973 SHA512 a51975de16515dec059a35494a2c74d13f70a0468395e711cf8c53b5c121b439a0a3b63c755ffcf6caba4ef6def4f927a307a46123f16adcbfa339e4feb921ec
diff --git a/media-plugins/vdr-xineliboutput/files/confd-1.0.0_pre6 b/media-plugins/vdr-xineliboutput/files/confd-1.0.0_pre6
deleted file mode 100644
index b4fab7ff9690..000000000000
--- a/media-plugins/vdr-xineliboutput/files/confd-1.0.0_pre6
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Usage examples (VDR plugin)
-#
-#  If no arguments are given, both X11 and framebuffer frontends are tried.
-#  First working frontend is used with best available video driver.
-#  Complete list of available command-line arguments can be obtained
-#  with "vdr --help".
-#
-#  Only local frontend, X11/Xv video, alsa audio:
-#    _EXTRAOPTS="--local=sxfe --video=xv --audio=alsa --noremote"
-#
-#  Only local frontend, (slow) X11 video, oss audio:
-#    _EXTRAOPTS="--local=sxfe --video=x11 --audio=oss --noremote"
-#
-#  Only local frontend, DirectFB: 
-#    _EXTRAOPTS="--local=fbfe --video=DirectFB --noremote"
-#
-#  Only remote frontend(s):
-#    _EXTRAOPTS="--local=none --remote=37890"
-#
-#  Local and remote frontends:
-#    _EXTRAOPTS="--local=sxfe --remote=37890"
-#  or
-#    _EXTRAOPTS="--local=fbfe --remote=37890"
-#
-#
-_EXTRAOPTS="--local=none --remote=37890"
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
index d594f721d335..349d81a244af 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
 
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
index 82652c7fe666..f157b6a17f74 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
 
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index d84cc0931176..a262a36247f1 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 EGIT_REPO_URI="https://git.code.sf.net/p/xineliboutput/git"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS=""
 IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
 
@@ -74,7 +74,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Allow user patches to be applied without modifyfing the ebuild
-	eaplly_user
+	eapply_user
 
 	vdr-plugin-2_src_prepare