From ef79d60f32789b9751eed45844d76a5995eebbb0 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Wed, 16 Sep 2020 22:59:30 +0200 Subject: sci-chemistry/surf: Port to EAPI 7 Closes: https://bugs.gentoo.org/731888 Closes: https://bugs.gentoo.org/742023 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert --- sci-chemistry/surf/surf-1.0.ebuild | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) (limited to 'sci-chemistry/surf/surf-1.0.ebuild') diff --git a/sci-chemistry/surf/surf-1.0.ebuild b/sci-chemistry/surf/surf-1.0.ebuild index 5b6ff83975fd..16adc336a34d 100644 --- a/sci-chemistry/surf/surf-1.0.ebuild +++ b/sci-chemistry/surf/surf-1.0.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="4" +EAPI=7 inherit toolchain-funcs @@ -12,31 +12,21 @@ SRC_URI="http://www.ks.uiuc.edu/Research/vmd/extsrcs/surf.tar.Z -> ${P}.tar.Z" LICENSE="SURF" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="" -DEPEND=" - !www-client/surf - sys-apps/ed - x11-misc/makedepend" -RDEPEND="" +RDEPEND="!www-client/surf" -S=${WORKDIR} +S="${WORKDIR}" -src_prepare() { - sed \ - -e 's:$(CC) $(CFLAGS) $(OBJS):$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS):g' \ - -i Makefile || die -} +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-Wreturn-type.patch +) -src_compile() { - emake depend \ - && emake \ - CC="$(tc-getCC)" \ - OPT_CFLAGS="${CFLAGS} \$(INCLUDE)" \ - CFLAGS="${CFLAGS} \$(INCLUDE)" +src_configure() { + tc-export CC } src_install() { - dobin ${PN} - dodoc README + dobin surf + einstalldocs } -- cgit v1.2.3-65-gdbad