| 1 |
commit: eb9d8d4eb93aa09f675bc2cedb6ec8d90c4539e4 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 29 12:22:56 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 29 13:16:15 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9d8d4e |
| 7 |
|
| 8 |
app-arch/arc: Port to EAPI 6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
app-arch/arc/arc-5.21p.ebuild | 17 +++++++++++------ |
| 13 |
app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch | 4 ++-- |
| 14 |
2 files changed, 13 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild |
| 17 |
index 5cc46fabeba..21daa1b1560 100644 |
| 18 |
--- a/app-arch/arc/arc-5.21p.ebuild |
| 19 |
+++ b/app-arch/arc/arc-5.21p.ebuild |
| 20 |
@@ -1,9 +1,9 @@ |
| 21 |
# Copyright 1999-2017 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI="2" |
| 25 |
+EAPI=6 |
| 26 |
|
| 27 |
-inherit eutils toolchain-funcs |
| 28 |
+inherit toolchain-funcs |
| 29 |
|
| 30 |
DESCRIPTION="Create & extract files from DOS .ARC files" |
| 31 |
HOMEPAGE="http://arc.sourceforge.net" |
| 32 |
@@ -14,17 +14,22 @@ SLOT="0" |
| 33 |
KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" |
| 34 |
IUSE="" |
| 35 |
|
| 36 |
+PATCHES=( |
| 37 |
+ "${FILESDIR}"/${PN}-5.21m-darwin.patch |
| 38 |
+ "${FILESDIR}"/${PN}-5.21m-gentoo-fbsd.patch |
| 39 |
+ "${FILESDIR}"/${PN}-5.21o-interix.patch |
| 40 |
+) |
| 41 |
+ |
| 42 |
src_prepare() { |
| 43 |
- epatch "${FILESDIR}"/${P/p/m}-darwin.patch \ |
| 44 |
- "${FILESDIR}"/${P/p/m}-gentoo-fbsd.patch \ |
| 45 |
- "${FILESDIR}"/${P/p/o}-interix.patch |
| 46 |
+ default |
| 47 |
+ |
| 48 |
sed -i Makefile \ |
| 49 |
-e 's/CFLAGS = $(OPT) $(SYSTEM)/CFLAGS += $(SYSTEM)/' \ |
| 50 |
|| die "sed Makefile" |
| 51 |
} |
| 52 |
|
| 53 |
src_compile() { |
| 54 |
- emake CC="$(tc-getCC)" OPT="${LDFLAGS}" || die "emake failed." |
| 55 |
+ emake CC="$(tc-getCC)" OPT="${LDFLAGS}" |
| 56 |
} |
| 57 |
|
| 58 |
src_install() { |
| 59 |
|
| 60 |
diff --git a/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch b/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch |
| 61 |
index 552bfd14edd..f2762f74b9d 100644 |
| 62 |
--- a/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch |
| 63 |
+++ b/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch |
| 64 |
@@ -1,5 +1,5 @@ |
| 65 |
---- tmclock.c 2005-09-21 18:39:57 +0200 |
| 66 |
-+++ tmclock.c.new 2007-06-16 15:58:26 +0200 |
| 67 |
+--- a/tmclock.c |
| 68 |
++++ b/tmclock.c |
| 69 |
@@ -18,8 +18,10 @@ |
| 70 |
#include <sys/time.h> |
| 71 |
#else |
Archives