[gentoo-commits] repo/gentoo:master commit in: media-tv/w_scan/files/, media-tv/w_scan/

[gentoo-commits] repo/gentoo:master commit in: media-tv/w_scan/files/, media-tv/w_scan/

[David Seifert]

commit:     c06f102948f0b9c21f8870d2a1361e018d80ac77
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Nov 28 23:08:54 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 23:08:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06f1029

media-tv/w_scan: port to EAPI 7

* Thanks to Sam James for providing the patch link

Closes: https://bugs.gentoo.org/707718
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../w_scan/files/w_scan-20170107-fno-common.patch  | 24 ++++++++++++++++++++++
 media-tv/w_scan/w_scan-20170107.ebuild             | 11 +++++-----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/media-tv/w_scan/files/w_scan-20170107-fno-common.patch b/media-tv/w_scan/files/w_scan-20170107-fno-common.patch
new file mode 100644
index 00000000000..43bd7144eeb
--- /dev/null
+++ b/media-tv/w_scan/files/w_scan-20170107-fno-common.patch
@@ -0,0 +1,24 @@
+Taken from: https://git.buildroot.net/buildroot/tree/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch?id=2e8bf36dc4421f2213f8fa6de91b2c9bf3d64e45
+Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+
+--- w_scan-20170107.orig/si_types.h	2020-09-20 11:09:56.776963441 +0200
++++ w_scan-20170107/si_types.h	2020-09-20 11:13:13.149232478 +0200
+@@ -114,7 +114,7 @@
+   uint32_t logical_channel_number;
+   uint8_t  running;
+   void   * priv;
+-} service_t, * p_service_t;
++};
+ 
+ /*******************************************************************************
+ /* transponder type.
+@@ -201,7 +201,7 @@
+   /*----------------------------*/
+   char * network_name;
+   network_change_t network_change;
+-} __attribute__((packed))  transponder_t, * p_transponder_t;
++} __attribute__((packed));
+ 
+ /*******************************************************************************
+ /* satellite channel routing type.
+

diff --git a/media-tv/w_scan/w_scan-20170107.ebuild b/media-tv/w_scan/w_scan-20170107.ebuild
index 0b7e605bf66..926e92f2c2c 100644
--- a/media-tv/w_scan/w_scan-20170107.ebuild
+++ b/media-tv/w_scan/w_scan-20170107.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Scan DVB-C/DVB-T/DVB-S channels"
 HOMEPAGE="http://wirbel.htpc-forum.de/w_scan/index2.html"
@@ -13,12 +13,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
 DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
-RDEPEND=""
 
-src_install() {
-	emake DESTDIR="${D}" install
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
-	dodoc ChangeLog README
+src_install() {
+	default
 
 	if use doc; then
 		dodoc doc/README.file_formats doc/README_VLC_DVB