commit: 446222ce8378492e5eb0d2efd129ca00143cd682 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Wed Sep 16 20:16:22 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Wed Sep 16 20:16:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=446222ce
sys-block/fwdl: Port to EAPI 7 Closes: https://bugs.gentoo.org/742113 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-block/fwdl/files/fwdl-1.2.3-makefile.patch | 11 +++++++++++ sys-block/fwdl/fwdl-1.2.3.ebuild | 18 +++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/sys-block/fwdl/files/fwdl-1.2.3-makefile.patch b/sys-block/fwdl/files/fwdl-1.2.3-makefile.patch new file mode 100644 index 00000000000..8635710183e --- /dev/null +++ b/sys-block/fwdl/files/fwdl-1.2.3-makefile.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -41,7 +41,7 @@ + + + linux: fwdl.C fwdl-linux.c +- $(COMPILE_LINUX) -o $(APP) -Dlinux $(EXTRA_DEFINES) fwdl.C fwdl-linux.c ++ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -o $(APP) -Dlinux fwdl.C fwdl-linux.c + + prisa: fwdl.C fwdl-prisa.C + $(COMPILE_SGI) -o $(APP) -Dsgi $(EXTRA_DEFINES) fwdl.C fwdl-prisa.C \ diff --git a/sys-block/fwdl/fwdl-1.2.3.ebuild b/sys-block/fwdl/fwdl-1.2.3.ebuild index fc0248f982c..a5db9943d66 100644 --- a/sys-block/fwdl/fwdl-1.2.3.ebuild +++ b/sys-block/fwdl/fwdl-1.2.3.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="Seagate Fibre-Channel disk firmware upgrade tool" HOMEPAGE="http://www.tc.umn.edu/~erick205/Projects/"; SRC_URI="http://www.tc.umn.edu/~erick205/Projects/${PN}/${P}.tar.gz"; + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="debug" -src_prepare() { - use debug || { sed -i -e "s/^EXTRA_DEFINES/#\0/" Makefile || die ; } -} +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) -src_compile() { - emake COMPILE_LINUX="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}" +src_configure() { + use debug && append-cppflags -DDEBUG + tc-export CXX } src_install() { dosbin fwdl - dodoc CHANGES INSTALL README + einstalldocs }
