Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

3 files changed, 13 insertions, 11 deletions

diff --git a/net-misc/aggregate/Manifest b/net-misc/aggregate/Manifest
index ed68fd908fcf..5fd95728f583 100644
--- a/net-misc/aggregate/Manifest
+++ b/net-misc/aggregate/Manifest
@@ -1,4 +1,4 @@
-AUX aggregate-1.6-build-fixup.patch 193 BLAKE2B 99a4266726eb7ef36cb58c5f3ace8c36bc1f923f453acb003f3f59af179ab88e5ef641b387c03912f476a8bb29a46fada6ce5b4b6382d7328fd06752134ba186 SHA512 6c7508f88da5f287b5dbf7e12bf5891722300d11d0c167659c816a28dd38e2cf46de928b4cda48ee8ff6b6201b01cc6a41bc22345eb478ab255b5c1dc2713b11
+AUX aggregate-1.6-build-fixup.patch 362 BLAKE2B 242d2f560b5d9d6c2c3e27453bc7ce7df63a9f3df127f5f52e3613a6bc1e0efd3288c05ca30998c169860bd44258129104bb2048dab9ec4d2861d9df95b96f39 SHA512 15fbcd2681187543ff0475cf08ff33ff3cf0cb74653229424209d931adf70f3b67c30434b62ae5a395252e579b45dcd51c68a80fcf5dc7ec4c1420370d246340
 DIST aggregate-1.6.tar.gz 20566 BLAKE2B 8d7c9b16063da1481a1be57e1de8e73d5ee54ab8fe539b116263582b951bc84396b174388ce6ea1ee8126a1b1ac49e4e69dcfad8ded37f32edd429d620c4971f SHA512 b6c48540a6905c5b0c2195c91c6b19fa537f1a746adb7e173642c3f0bd894cbbd8f4ab7203f1c6b904538c4b0f1ce13138c5e00e6f05567992bfc51b8b459f84
-EBUILD aggregate-1.6.ebuild 616 BLAKE2B 88fd060b446858374ffc23b39e1593a8a71f78cfa389364256fb7518c7e4481721952736b3188ac4a0204822420d31a5d63569ecbea20580e0443f34c7f1b77f SHA512 9c75a996a410ce1db0d75d996df706bf8a0034918f8a338cc1d046bea1b4431bbf594523d874d01d38b044f5e7e73884f95d4a1a7e63b5e9ce0eea34cb3ef7f6
+EBUILD aggregate-1.6.ebuild 651 BLAKE2B 228bfee5009dc4499261425636f9214225f46072af5369d6e36ed817474ea4b8d7eaa2b519a401e98393e601f8687f3ce9856bfc83faf763ac83e5974c837943 SHA512 5862c00f51063af12cb5b4a1b68c5b4e032c5f71223ea8c75c8ae64f31bd1113ae5d58dd62d70a5ad2bb75a098a8b325ca8bed00fa867b3150aa744c8b4970dd
 MISC metadata.xml 975 BLAKE2B 5478f76eb90bbdb4daee5ccc930312d6b1e6fa162e20824b1c6ee7c9371183ca3436fe000ba9b7c66d4b991ace6109b5ff4d0bd0453a7c055105e2d3007fc124 SHA512 f192380066542eb7a770edc78e4804f06b41bdc65dcd70a9a69618789220c220c7d97e9ba979e3cebb2d9813bf26664bfb7536d4c51e01071964561d72dac054
diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild
index 8df22ac51199..a8700cfabbd5 100644
--- a/net-misc/aggregate/aggregate-1.6.ebuild
+++ b/net-misc/aggregate/aggregate-1.6.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit toolchain-funcs
+EAPI=2
+inherit eutils 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/"
@@ -17,7 +16,9 @@ IUSE=""
 RDEPEND="dev-lang/perl"
 DEPEND=""
 
-PATCHES=( "${FILESDIR}/${P}-build-fixup.patch" )
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build-fixup.patch
+}
 
 src_configure() {
 	tc-export CC
@@ -25,7 +26,7 @@ src_configure() {
 }
 
 src_install() {
-	dobin aggregate{,-ios}
+	dobin aggregate aggregate-ios || die
 	doman aggregate{,-ios}.1
-	einstalldocs
+	dodoc HISTORY
 }
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 d16b62e12edb..51c9f9f96128 100644
--- a/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
+++ b/net-misc/aggregate/files/aggregate-1.6-build-fixup.patch
@@ -1,5 +1,6 @@
---- a/Makefile.in
-+++ b/Makefile.in
+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
 @@ -25,8 +25,8 @@
  INSTALL = @INSTALL@
  DEFS = @DEFS@