[gentoo-commits] repo/gentoo:master commit in: sys-power/athcool/files/, sys-power/athcool/

[David Seifert]

commit:     3f4aea9d7d862dc542123802e50c1a4781a7c5c3
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 14:48:00 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 14:48:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4aea9d

sys-power/athcool: Port to EAPI 7

Closes: https://bugs.gentoo.org/725976
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>

 sys-power/athcool/athcool-0.3.12.ebuild                     | 11 ++++++-----
 ...thcool-0.3.11-build.patch => athcool-0.3.12-build.patch} |  0
 sys-power/athcool/files/athcool-0.3.12-fno-common.patch     | 13 +++++++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/sys-power/athcool/athcool-0.3.12.ebuild b/sys-power/athcool/athcool-0.3.12.ebuild
index bd826f25b0f..f1516378cdd 100644
--- a/sys-power/athcool/athcool-0.3.12.ebuild
+++ b/sys-power/athcool/athcool-0.3.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,12 +12,13 @@ SRC_URI="http://members.jcom.home.ne.jp/jacobi/linux/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* x86"
-IUSE=""
 
 DEPEND="sys-apps/pciutils"
-RDEPEND=""
 
-PATCHES=( "${FILESDIR}"/${PN}-0.3.11-build.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_configure() {
 	tc-export CC

diff --git a/sys-power/athcool/files/athcool-0.3.11-build.patch b/sys-power/athcool/files/athcool-0.3.12-build.patch
similarity index 100%
rename from sys-power/athcool/files/athcool-0.3.11-build.patch
rename to sys-power/athcool/files/athcool-0.3.12-build.patch

diff --git a/sys-power/athcool/files/athcool-0.3.12-fno-common.patch b/sys-power/athcool/files/athcool-0.3.12-fno-common.patch
new file mode 100644
index 00000000000..7fbbea95e9e
--- /dev/null
+++ b/sys-power/athcool/files/athcool-0.3.12-fno-common.patch
@@ -0,0 +1,13 @@
+--- a/scanpci.c
++++ b/scanpci.c
+@@ -11,8 +11,8 @@
+ 
+ #define	die	printf
+ 
+-struct pci_filter	filter;
+-struct pci_access	*pacc;
++extern struct pci_filter	filter;
++extern struct pci_access	*pacc;
+ static int		show_hex = 0;
+ 
+ static struct device	*scan_device( struct pci_dev *p )