[gentoo-commits] repo/gentoo:master commit in: net-misc/aggregate/files/, net-misc/aggregate/

[gentoo-commits] repo/gentoo:master commit in: net-misc/aggregate/files/, net-misc/aggregate/

[Aaron Bauman]

commit:     1ee631bc2a821312256180e311f58761fa42800b
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Thu May 31 20:49:32 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Jun  1 14:05:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee631bc

net-misc/aggregate: bump EAPI and drop eutils

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8660

 net-misc/aggregate/aggregate-1.6.ebuild                  | 15 +++++++--------
 net-misc/aggregate/files/aggregate-1.6-build-fixup.patch |  5 ++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild
index a8700cfabbd..8df22ac5119 100644
--- a/net-misc/aggregate/aggregate-1.6.ebuild
+++ b/net-misc/aggregate/aggregate-1.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="Take a list of prefixes and perform two optimisations to reduce the length of the prefix list"
 HOMEPAGE="http://dist.automagic.org/"
@@ -16,9 +17,7 @@ IUSE=""
 RDEPEND="dev-lang/perl"
 DEPEND=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build-fixup.patch
-}
+PATCHES=( "${FILESDIR}/${P}-build-fixup.patch" )
 
 src_configure() {
 	tc-export CC
@@ -26,7 +25,7 @@ src_configure() {
 }
 
 src_install() {
-	dobin aggregate aggregate-ios || die
+	dobin aggregate{,-ios}
 	doman aggregate{,-ios}.1
-	dodoc HISTORY
+	einstalldocs
 }

diff --git a/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch b/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
index 51c9f9f9612..d16b62e12ed 100644
--- a/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
+++ b/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
@@ -1,6 +1,5 @@
-diff -Nuar aggregate-1.6.orig/Makefile.in aggregate-1.6/Makefile.in
---- aggregate-1.6.orig/Makefile.in	2002-03-06 08:59:37.000000000 -0800
-+++ aggregate-1.6/Makefile.in	2008-10-10 01:31:42.613937925 -0700
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -25,8 +25,8 @@
  INSTALL = @INSTALL@
  DEFS = @DEFS@