From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 98F2D1382C5 for ; Sat, 28 Nov 2020 23:10:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF2E3E086C; Sat, 28 Nov 2020 23:10:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8384E086C for ; Sat, 28 Nov 2020 23:10:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EFA49335CA3 for ; Sat, 28 Nov 2020 23:10:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55A51476 for ; Sat, 28 Nov 2020 23:10:00 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1606604934.c06f102948f0b9c21f8870d2a1361e018d80ac77.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/w_scan/files/, media-tv/w_scan/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/w_scan/files/w_scan-20170107-fno-common.patch media-tv/w_scan/w_scan-20170107.ebuild X-VCS-Directories: media-tv/w_scan/files/ media-tv/w_scan/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: c06f102948f0b9c21f8870d2a1361e018d80ac77 X-VCS-Branch: master Date: Sat, 28 Nov 2020 23:10:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3f2ef0d9-ed18-4672-b056-c21a22f51994 X-Archives-Hash: a25954b36f036c0f0b874fb217f79f45 commit: c06f102948f0b9c21f8870d2a1361e018d80ac77 Author: Jakov Smolic sartura hr> AuthorDate: Sat Nov 28 23:08:54 2020 +0000 Commit: David Seifert gentoo 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 sartura.hr> Signed-off-by: David Seifert 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 + +--- 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