gentoo resync : 15.01.2020

3 files changed, 29 insertions, 3 deletions

diff --git a/media-plugins/vdr-avards/Manifest b/media-plugins/vdr-avards/Manifest
index 8eed2ad4bea4..08f79861de01 100644
--- a/media-plugins/vdr-avards/Manifest
+++ b/media-plugins/vdr-avards/Manifest
@@ -1,3 +1,5 @@
 DIST vdr-avards-0.2.4.tar.bz2 24865 BLAKE2B 13d14a923869054145e7cc30515271ff5676dcdc14d6a7237934deec17d9b2ae52b34df5d32b00f415c744d16311dc2af9e7c28bb9842244e6b024b89d9bba5a SHA512 d878016d83317ff4d8a6fc121344615d508f1dc1c8b1d555a9e94cb02725353fe8c9f274cbeca45b5ee46e384379128a8c1d1ec8833aa10454d7bef1be02fc83
-EBUILD vdr-avards-0.2.4.ebuild 836 BLAKE2B 5aac47d4557b31b35ec768fa78b3a8393b1298fd68a8ee23954b1abcc53ac52065920b5134eedc7756cdaab95ab8dc05f6a3480725b9d006069b4cf192876004 SHA512 ef78e7d679dd8f2d239a685b38f985d436ac9bc2313322853ce56496bf3698b6dae19f966976fd3da8e903b4b242de71e93f5ad541bf5c4e74f6166b8086226f
+DIST vdr-avards-0.2.6.tar.bz2 26190 BLAKE2B 56bd73baeea816dfdb0c1c67b9699236a62f29333f97ee9a962ecf215f153e427ff738e24af2faa531c272075a0e7eb4fea6dc8f627bf3023caeb8d132b1d3c1 SHA512 945182b77d4dd5fc927d0fb28635183a29dcf45addc3ce8fee50e00bf5f12823fa20e707736f87b43c53c821c149365c8b4e47390ca70ad0a63f01b544ccc024
+EBUILD vdr-avards-0.2.4.ebuild 834 BLAKE2B a7eb4c13e94155b58b0cb14ada352bcee53c53d671a8984946873aece6740d1972981e3bb3fcb5e147e8573c563f53bf569755d4200ac4694f9b32902dcc9ffb SHA512 ae0adb8dfeb1195562317ee0fcfae3147834bb762eeea2391f9b210d0e7db7fc21e2beee2941af039da75573c462b27ce66004ae9fd90da7480638b6a8258231
+EBUILD vdr-avards-0.2.6.ebuild 583 BLAKE2B 33df7761f2fc528f2801cbf40b72ffde42f678d30493963dfee9b96db2e3e3cc9fb33d2a3ae67f4f5c7bde0f280f16dcc66df15b668a3734463a22bad17cea44 SHA512 b6437610641e81fdce3db3709c0dfc2c593a8590f41638d467e158bfecbe88881da185a1cc85e3e94f3db869b6d818377d2bd2205cccc8958e5d56cd0fe10135
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild b/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild
index 6df2555f3514..d00e7f4ea89f 100644
--- a/media-plugins/vdr-avards/vdr-avards-0.2.4.ebuild
+++ b/media-plugins/vdr-avards/vdr-avards-0.2.4.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=7
@@ -9,7 +9,7 @@ DESCRIPTION="VDR Plugin:  Automatic Video Aspect Ratio Detection and Signaling"
 HOMEPAGE="http://firefly.vdr-developer.org/avards/"
 SRC_URI="http://firefly.vdr-developer.org/avards/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/media-plugins/vdr-avards/vdr-avards-0.2.6.ebuild b/media-plugins/vdr-avards/vdr-avards-0.2.6.ebuild
new file mode 100644
index 000000000000..2b5ba1064f50
--- /dev/null
+++ b/media-plugins/vdr-avards/vdr-avards-0.2.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin:  Automatic Video Aspect Ratio Detection and Signaling"
+HOMEPAGE="http://firefly.vdr-developer.org/avards/"
+SRC_URI="http://firefly.vdr-developer.org/avards/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-video/vdr"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# revert wrong implementation of vdr-2.4. feature
+	sed -i Makefile \
+		-e "s:\$(INCLUDES) -o \$@ \$<:\$(INCLUDES) -o \$<:" || die
+}