gentoo resync : 15.01.2020

3 files changed, 37 insertions, 7 deletions

diff --git a/media-plugins/vdr-wirbelscan/Manifest b/media-plugins/vdr-wirbelscan/Manifest
index 8b6040aa5330..8f297adea0fe 100644
--- a/media-plugins/vdr-wirbelscan/Manifest
+++ b/media-plugins/vdr-wirbelscan/Manifest
@@ -1,5 +1,7 @@
 AUX receiver-api-fixes.patch 2060 BLAKE2B 02ed94c3504b1989ebf061cef4904fae0e4dacc7fd4d6309c1893ef2d368516b3255fae5a78f54fcb687b0518d7c2acb308b404aa409f106f9c6ec0052d4899f SHA512 973afc96a1f0a162b90b91c8f2053dd538f0b5644c0295ade0398a1cfa0a03ccd938b2faca2a0bcfe75f9d8663b1f0e145afc28de14d0f3bf1626bb0132a30cc
 AUX wirbelscan.mk 3297 BLAKE2B 0b7d8676fc0791cbe877c3cec0d265afebe3be8daf52efb905f7c1ff3a2fd495cd57b4107afb33738e13f912e2e274a7a9516ff93a7bcc178bd9068c86aa15fc SHA512 a3a9e71d8e4da822cad2d9d747904f4fe505a500bc36a3b7312274bcde5dd66bab5dd346e8353de920eb9eec75c55d8e0ddc9ae9eaebca907cbfcd80d6e070cc
 DIST vdr-wirbelscan-0.0.7.tgz 149949 BLAKE2B b0b258b91bef493c352b8a2e7edec821b4046a7a6c2751ffe0e1deacd1ddcf3a563cc4051eee6424526903444952a0d489b8bca00533ba89a8214943948c76d9 SHA512 754b3089b1a8536b501fd8b62ddafedaf8304518856152a49b97149113929b47d6c6299b8eb4b78b2d3dc5aba147a3e21c00554ad02d2dc5018c296f6c55d6a5
-EBUILD vdr-wirbelscan-0.0.7-r1.ebuild 880 BLAKE2B f6764e3ade23f7c878ab01a70be52c538d5bc600b175ea16248086ecfe66451cbae5c9e58be9dbb8c27b3d52fd0fd5f6202956bedffb53581f651c23e3fc0fad SHA512 a3b6d298f952f8d787a588d095385e8fd86da2bbd11960ea35c06b661ddf964f62d654c5b5d96a596c0ac5e877f67134849f4118b6d9a91d504f79d5bbd80f4e
+DIST vdr-wirbelscan-2018.11.04.tar.gz 146140 BLAKE2B 067046dcd11837f2de5a44acce35cc1c58778b7cc110a69eb1f35e2c2e792a1dfac0f04dc50c230b0ee4940a3ed8bf8fe34484ba6cc988b7f7da59c361e2d1d8 SHA512 61d7109f47c3a1d87d520d3228b0737073762e877b9b08d2716337de071bdf7f8419ae5285a72c5e29e4c5081403edb2cb729adf6755a9e898a662af30a7b92c
+EBUILD vdr-wirbelscan-0.0.7-r1.ebuild 843 BLAKE2B b47b0f06eac3db375e82d9c7f88b4f15c473b79ef609ec98f19c27257428f528ea278dbb86d503286c782e3399aa667611c8654a5277add3c0392ac3c3242af0 SHA512 cfba3cc26f4a8f0999a902ce50f2a96c7ce2dfd96a490f810001fbe01915864a5dc76c81ed5653bf5b733cdfc764d77c9854dce557c95b8b9f6442fff567aa32
+EBUILD vdr-wirbelscan-2018.11.04.ebuild 836 BLAKE2B bb74fdd762063a0e4cdf1c5e2f716d319ba8132e57f3be9d649ce4b37c76a078cad32e5987b82404566d402796001e7e2027555c8593e956fda3bfaaae84ed3f SHA512 0799bc6a1a6401a7882d918212cd2bb172a7f9e7be9266fe8f39168242a5862056737d6d02c0b73fd7613be1024e7537d46c6d434778de45e1bb62721334b71b
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild
index 5bdd8471ddc8..7920122c681b 100644
--- a/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild
+++ b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: Scan for channels on DVB-? and on PVR*-Cards"
-HOMEPAGE="http://wirbel.htpc-forum.de/wirbelscan/index2.html"
+HOMEPAGE="https://github.com/CvH/vdr-plugin-wirbelscan"
 SRC_URI="http://wirbel.htpc-forum.de/wirbelscan/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND=">=media-video/vdr-2"
-RDEPEND="${DEPEND}"
 
 src_prepare() {
 	# remove untranslated po files
@@ -24,7 +22,7 @@ src_prepare() {
 	# new Makefile handling
 	cp "${FILESDIR}/wirbelscan.mk" "${S}/Makefile"
 
-	epatch "${FILESDIR}/receiver-api-fixes.patch"
+	eapply "${FILESDIR}/receiver-api-fixes.patch"
 
 	vdr-plugin-2_src_prepare
 
diff --git a/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild
new file mode 100644
index 000000000000..e45baf07b3a5
--- /dev/null
+++ b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+GIT_VERSION="e1377b95312a138a41f93d7b06b3adb4ed4e7324"
+
+DESCRIPTION="VDR Plugin: Scan for channels on DVB-? and on PVR*-Cards"
+HOMEPAGE="https://github.com/CvH/vdr-plugin-wirbelscan"
+SRC_URI="https://github.com/CvH/vdr-plugin-wirbelscan/archive/${GIT_VERSION}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=media-video/vdr-2.4"
+
+S="${WORKDIR}/vdr-plugin-wirbelscan-${GIT_VERSION}"
+
+src_prepare() {
+	# remove untranslated po files
+	rm "${S}"/po/{ca_ES,cs_CZ,da_DK,es_ES,el_GR,et_EE,fi_FI,fr_FR,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
+
+	vdr-plugin-2_src_prepare
+
+	fix_vdr_libsi_include scanfilter.h
+	fix_vdr_libsi_include scanfilter.c
+}