[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-wirbelscan/

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-wirbelscan/

[Jörg Bornkessel]

commit:     8ca5f282c1751a8221fff18d0a273809f1f6fc9e
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 13:33:27 2019 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 13:33:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca5f282

media-plugins/vdr-wirbelscan: version bump

this version need >=vdr-2.4
thx to klaus818 <AT> gmail.com for reporting this
moved to eapi 7
fixed Homepage

Bug: https://bugs.gentoo.org/703810
Closes: https://bugs.gentoo.org/703810
Package-Manager: Portage-2.3.83, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 media-plugins/vdr-wirbelscan/Manifest              |  1 +
 .../vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild  | 10 ++++------
 ...-r1.ebuild => vdr-wirbelscan-2018.11.04.ebuild} | 22 +++++++++-------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/media-plugins/vdr-wirbelscan/Manifest b/media-plugins/vdr-wirbelscan/Manifest
index be8c7316db2..67f10230116 100644
--- a/media-plugins/vdr-wirbelscan/Manifest
+++ b/media-plugins/vdr-wirbelscan/Manifest
@@ -1 +1,2 @@
 DIST vdr-wirbelscan-0.0.7.tgz 149949 BLAKE2B b0b258b91bef493c352b8a2e7edec821b4046a7a6c2751ffe0e1deacd1ddcf3a563cc4051eee6424526903444952a0d489b8bca00533ba89a8214943948c76d9 SHA512 754b3089b1a8536b501fd8b62ddafedaf8304518856152a49b97149113929b47d6c6299b8eb4b78b2d3dc5aba147a3e21c00554ad02d2dc5018c296f6c55d6a5
+DIST vdr-wirbelscan-2018.11.04.tar.gz 146140 BLAKE2B 067046dcd11837f2de5a44acce35cc1c58778b7cc110a69eb1f35e2c2e792a1dfac0f04dc50c230b0ee4940a3ed8bf8fe34484ba6cc988b7f7da59c361e2d1d8 SHA512 61d7109f47c3a1d87d520d3228b0737073762e877b9b08d2716337de071bdf7f8419ae5285a72c5e29e4c5081403edb2cb729adf6755a9e898a662af30a7b92c

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 5bdd8471ddc..7920122c681 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-0.0.7-r1.ebuild b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild
similarity index 56%
copy from media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild
copy to media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild
index 5bdd8471ddc..e45baf07b3a 100644
--- a/media-plugins/vdr-wirbelscan/vdr-wirbelscan-0.0.7-r1.ebuild
+++ b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild
@@ -1,34 +1,30 @@
-# 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
 
+GIT_VERSION="e1377b95312a138a41f93d7b06b3adb4ed4e7324"
+
 DESCRIPTION="VDR Plugin: Scan for channels on DVB-? and on PVR*-Cards"
-HOMEPAGE="http://wirbel.htpc-forum.de/wirbelscan/index2.html"
-SRC_URI="http://wirbel.htpc-forum.de/wirbelscan/${P}.tgz"
+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"
-IUSE=""
 
-DEPEND=">=media-video/vdr-2"
-RDEPEND="${DEPEND}"
+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
 
-	# new Makefile handling
-	cp "${FILESDIR}/wirbelscan.mk" "${S}/Makefile"
-
-	epatch "${FILESDIR}/receiver-api-fixes.patch"
-
 	vdr-plugin-2_src_prepare
 
 	fix_vdr_libsi_include scanfilter.h
 	fix_vdr_libsi_include scanfilter.c
-	fix_vdr_libsi_include caDescriptor.h
 }

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-wirbelscan/

[Jörg Bornkessel]

commit:     6434a98ae8553756339f11668aae3a247cef1d53
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  3 20:13:06 2020 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Tue Mar  3 20:14:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6434a98a

media-plugins/vdr-wirbelscan: license, wrong named lib on install fixed

Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 ...lscan-2018.11.04.ebuild => vdr-wirbelscan-2018.11.04-r1.ebuild} | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04-r1.ebuild
similarity index 81%
rename from media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild
rename to media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04-r1.ebuild
index e45baf07b3a..0695d24306f 100644
--- a/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04.ebuild
+++ b/media-plugins/vdr-wirbelscan/vdr-wirbelscan-2018.11.04-r1.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
@@ -11,7 +11,7 @@ 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"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
@@ -23,6 +23,9 @@ 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
 
+	# fix wrong named lib on install
+	sed -e "s:\$(shell basename \$(PWD) | cut -d- -f1):wirbelscan:" -i Makefile || die
+
 	vdr-plugin-2_src_prepare
 
 	fix_vdr_libsi_include scanfilter.h