commit: eb9d8d4eb93aa09f675bc2cedb6ec8d90c4539e4 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Fri Dec 29 12:22:56 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Dec 29 13:16:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9d8d4e
app-arch/arc: Port to EAPI 6 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-arch/arc/arc-5.21p.ebuild | 17 +++++++++++------ app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild index 5cc46fabeba..21daa1b1560 100644 --- a/app-arch/arc/arc-5.21p.ebuild +++ b/app-arch/arc/arc-5.21p.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Create & extract files from DOS .ARC files" HOMEPAGE="http://arc.sourceforge.net"; @@ -14,17 +14,22 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="" +PATCHES=( + "${FILESDIR}"/${PN}-5.21m-darwin.patch + "${FILESDIR}"/${PN}-5.21m-gentoo-fbsd.patch + "${FILESDIR}"/${PN}-5.21o-interix.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P/p/m}-darwin.patch \ - "${FILESDIR}"/${P/p/m}-gentoo-fbsd.patch \ - "${FILESDIR}"/${P/p/o}-interix.patch + default + sed -i Makefile \ -e 's/CFLAGS = $(OPT) $(SYSTEM)/CFLAGS += $(SYSTEM)/' \ || die "sed Makefile" } src_compile() { - emake CC="$(tc-getCC)" OPT="${LDFLAGS}" || die "emake failed." + emake CC="$(tc-getCC)" OPT="${LDFLAGS}" } src_install() { diff --git a/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch b/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch index 552bfd14edd..f2762f74b9d 100644 --- a/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch +++ b/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch @@ -1,5 +1,5 @@ ---- tmclock.c 2005-09-21 18:39:57 +0200 -+++ tmclock.c.new 2007-06-16 15:58:26 +0200 +--- a/tmclock.c ++++ b/tmclock.c @@ -18,8 +18,10 @@ #include <sys/time.h> #else
