| 1 |
commit: 1ee631bc2a821312256180e311f58761fa42800b |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 31 20:49:32 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 1 14:05:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee631bc |
| 7 |
|
| 8 |
net-misc/aggregate: bump EAPI and drop eutils |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/8660 |
| 12 |
|
| 13 |
net-misc/aggregate/aggregate-1.6.ebuild | 15 +++++++-------- |
| 14 |
net-misc/aggregate/files/aggregate-1.6-build-fixup.patch | 5 ++--- |
| 15 |
2 files changed, 9 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild |
| 18 |
index a8700cfabbd..8df22ac5119 100644 |
| 19 |
--- a/net-misc/aggregate/aggregate-1.6.ebuild |
| 20 |
+++ b/net-misc/aggregate/aggregate-1.6.ebuild |
| 21 |
@@ -1,8 +1,9 @@ |
| 22 |
-# Copyright 1999-2014 Gentoo Foundation |
| 23 |
+# Copyright 1999-2018 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
-EAPI=2 |
| 27 |
-inherit eutils toolchain-funcs |
| 28 |
+EAPI=6 |
| 29 |
+ |
| 30 |
+inherit toolchain-funcs |
| 31 |
|
| 32 |
DESCRIPTION="Take a list of prefixes and perform two optimisations to reduce the length of the prefix list" |
| 33 |
HOMEPAGE="http://dist.automagic.org/" |
| 34 |
@@ -16,9 +17,7 @@ IUSE="" |
| 35 |
RDEPEND="dev-lang/perl" |
| 36 |
DEPEND="" |
| 37 |
|
| 38 |
-src_prepare() { |
| 39 |
- epatch "${FILESDIR}"/${P}-build-fixup.patch |
| 40 |
-} |
| 41 |
+PATCHES=( "${FILESDIR}/${P}-build-fixup.patch" ) |
| 42 |
|
| 43 |
src_configure() { |
| 44 |
tc-export CC |
| 45 |
@@ -26,7 +25,7 @@ src_configure() { |
| 46 |
} |
| 47 |
|
| 48 |
src_install() { |
| 49 |
- dobin aggregate aggregate-ios || die |
| 50 |
+ dobin aggregate{,-ios} |
| 51 |
doman aggregate{,-ios}.1 |
| 52 |
- dodoc HISTORY |
| 53 |
+ einstalldocs |
| 54 |
} |
| 55 |
|
| 56 |
diff --git a/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch b/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch |
| 57 |
index 51c9f9f9612..d16b62e12ed 100644 |
| 58 |
--- a/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch |
| 59 |
+++ b/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch |
| 60 |
@@ -1,6 +1,5 @@ |
| 61 |
-diff -Nuar aggregate-1.6.orig/Makefile.in aggregate-1.6/Makefile.in |
| 62 |
---- aggregate-1.6.orig/Makefile.in 2002-03-06 08:59:37.000000000 -0800 |
| 63 |
-+++ aggregate-1.6/Makefile.in 2008-10-10 01:31:42.613937925 -0700 |
| 64 |
+--- a/Makefile.in |
| 65 |
++++ b/Makefile.in |
| 66 |
@@ -25,8 +25,8 @@ |
| 67 |
INSTALL = @INSTALL@ |
| 68 |
DEFS = @DEFS@ |
Archives