Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/fwdl/files/, sys-block/fwdl/
Date: Wed, 16 Sep 2020 20:17:19
Message-Id: 1600287382.446222ce8378492e5eb0d2efd129ca00143cd682.soap@gentoo
1 commit: 446222ce8378492e5eb0d2efd129ca00143cd682
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 16 20:16:22 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 16 20:16:22 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=446222ce
7
8 sys-block/fwdl: Port to EAPI 7
9
10 Closes: https://bugs.gentoo.org/742113
11 Package-Manager: Portage-3.0.7, Repoman-3.0.1
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 sys-block/fwdl/files/fwdl-1.2.3-makefile.patch | 11 +++++++++++
15 sys-block/fwdl/fwdl-1.2.3.ebuild | 18 +++++++++---------
16 2 files changed, 20 insertions(+), 9 deletions(-)
17
18 diff --git a/sys-block/fwdl/files/fwdl-1.2.3-makefile.patch b/sys-block/fwdl/files/fwdl-1.2.3-makefile.patch
19 new file mode 100644
20 index 00000000000..8635710183e
21 --- /dev/null
22 +++ b/sys-block/fwdl/files/fwdl-1.2.3-makefile.patch
23 @@ -0,0 +1,11 @@
24 +--- a/Makefile
25 ++++ b/Makefile
26 +@@ -41,7 +41,7 @@
27 +
28 +
29 + linux: fwdl.C fwdl-linux.c
30 +- $(COMPILE_LINUX) -o $(APP) -Dlinux $(EXTRA_DEFINES) fwdl.C fwdl-linux.c
31 ++ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -o $(APP) -Dlinux fwdl.C fwdl-linux.c
32 +
33 + prisa: fwdl.C fwdl-prisa.C
34 + $(COMPILE_SGI) -o $(APP) -Dsgi $(EXTRA_DEFINES) fwdl.C fwdl-prisa.C \
35
36 diff --git a/sys-block/fwdl/fwdl-1.2.3.ebuild b/sys-block/fwdl/fwdl-1.2.3.ebuild
37 index fc0248f982c..a5db9943d66 100644
38 --- a/sys-block/fwdl/fwdl-1.2.3.ebuild
39 +++ b/sys-block/fwdl/fwdl-1.2.3.ebuild
40 @@ -1,27 +1,27 @@
41 -# Copyright 1999-2019 Gentoo Authors
42 +# Copyright 1999-2020 Gentoo Authors
43 # Distributed under the terms of the GNU General Public License v2
44
45 -EAPI=4
46 +EAPI=7
47
48 -inherit toolchain-funcs
49 +inherit flag-o-matic toolchain-funcs
50
51 DESCRIPTION="Seagate Fibre-Channel disk firmware upgrade tool"
52 HOMEPAGE="http://www.tc.umn.edu/~erick205/Projects/"
53 SRC_URI="http://www.tc.umn.edu/~erick205/Projects/${PN}/${P}.tar.gz"
54 +
55 LICENSE="GPL-2"
56 SLOT="0"
57 KEYWORDS="~amd64 ~ppc ~x86"
58 IUSE="debug"
59
60 -src_prepare() {
61 - use debug || { sed -i -e "s/^EXTRA_DEFINES/#\0/" Makefile || die ; }
62 -}
63 +PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
64
65 -src_compile() {
66 - emake COMPILE_LINUX="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}"
67 +src_configure() {
68 + use debug && append-cppflags -DDEBUG
69 + tc-export CXX
70 }
71
72 src_install() {
73 dosbin fwdl
74 - dodoc CHANGES INSTALL README
75 + einstalldocs
76 }