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

diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild
index a8700cfabbd514cbffb5f2fdac0397d845ac5d65..8df22ac5119909445638eb67ec9cc8f1afb22a55 100644 (file)
--- 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 51c9f9f9612869d7667bb21c3fa1c6b266c6569b..d16b62e12edb40f539a170fa378111067849326f 100644 (file)
--- 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@