gentoo resync : 22.04.2018

6 files changed, 36 insertions, 25 deletions

diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 0f0d6358b95e..0ba81fda0612 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -1,10 +1,10 @@
-AUX agedu-r9671-fix-automagic.patch 1847 BLAKE2B a449fee6a973a27af67ac5e48547d392e5dec547735e018be7e1752ae473f4a5462c1b0865eb18f1a45d83fe716f0652731c5ec0d28f87c817c847421ee239a6 SHA512 a85805f0d8bbb61964719d246d033c9423fa90f4b7a29fa4d48bd0ef69ee58304b6fa45b9c0a6024f0f05ff64dd164d23cb93791e0f1611363a51bfc993d00e0
+AUX agedu-r9671-fix-automagic.patch 1684 BLAKE2B ab7d2d33a7577251fa65e222914a25e621c68f6bdedbe3c9e62b43f2d8b51e29bbdbc08560fbcd76beab98e115ddf43e76e4cd290f1ce751c0452318ad8ee9e1 SHA512 61f11c624ebd5fa632f24ecc46230146f999a68ffbd9c2ce73f6319a527cd9c37d634ecec9a6b2a7fd1dcc792ab3d23a6c8a599499bab54194f36acb262a201b
 DIST agedu-20170831.fc6b2b5.tar.gz 175900 BLAKE2B f7ace0209afe6c40a54d4f576fd7c2fb7a1fb5433de00c1ae29c8457b32304a3b8686ee38efc3bd64860561bb5ea730f5cfee70d20b56addea1b312ba650a9da SHA512 6e9255776b668de33209486d6fcdcf68e1d4785bd84e2d5392ac71d13e54c7b156d9959e681fefc9b965b43727fbab13ef0b1e1e7587fd56d8dea29568dd0e75
 DIST agedu-20171202.8a8299e.tar.gz 175917 BLAKE2B 9789a901ce2aabd5aff31423d704165f5d2e5a21c6b8d316eb3c97365a51559df1d7c4dc071f329fadb12b4ca748ea4c9d3a697e5b0bd93c7a0b23c5b08af3b8 SHA512 be0f37d0ec94241462095e1503bc94ea3ba1bc1bc8a9b5a8d853cbb96ea09cf267a121fb8c8479c7b5670947b1e5d61d0f93b0ff10337fad9c7ee000765da380
 DIST agedu-20180302.9421c00.tar.gz 176129 BLAKE2B caa30fbb09c7e6f06b0a1832e6206b9400d0ded63866275ecdd3918133f1464db167e046edb5d516a4128a2dcfd9a07692835a88da0b640b4a52500e199e7aca SHA512 ebcb7413fba41341dda00fe8138c37890d5ca3a577060de479c1d1f5ed134ae40228562d24ae58aa496d4a25f59eace28670bfbd7cf033c935776f9592f0148a
 DIST agedu-20180329.af641e6.tar.gz 178860 BLAKE2B a3b17bb708edb530ad56644314969b069577b6663cb3f6ccdc72345ac666c18f80b1eae14c5146be46c9f9692d820104111ccca586e3d5a564bb34a4938aff6a SHA512 66fcaf1f4ee6a66fa68cce88f5a5edbfbc919978513370821de4e01f0fdb499beb7642333b459adb705934dcba2f4a14a8c28edc1045a8fd1b42a4a317061707
-EBUILD agedu-20170831.ebuild 820 BLAKE2B 95cd6fd4dd51d46e1a171c2e1dff3dbe03b4db8a830692277a6189709977044a88b67a6d8011a88107f98c60eb496aeefedf59bdcee721cef6c22cd42a8f5e61 SHA512 0ee867b3ff0802f28d9ca7b919a087c94dbc1ea826b5be998fd6aea959e17b172543230cbd1e8f5b1fa2d3327d86465637c72a76902f6e89295bc2e2fe964fbd
-EBUILD agedu-20171202.ebuild 820 BLAKE2B 13bd8b1d737b2ea3d2b709cf1aee362bc8d6afbc2890a3e9edc3312507b71848a5fbfc62309f4638b7c59f0f37c2d21d2f104f5fb0965a05dedce2b8428ff212 SHA512 774a707927913e22c78a742ef78952d959e9639f9ea09ba717cb5caa7dc2bfb0c25d9dfb01110c8b3575292a881941cdd29de0e7249990b37e875a8e460f2b84
-EBUILD agedu-20180302.ebuild 820 BLAKE2B f5040038168c4e9dadbdcc036551cd1372307e3526b1619c7a3c6d27ad0fc6db0e4c98deab5dc0be661a6a968bc650817f87f0e41c91bccc333c6a57d0d4e8cf SHA512 5796596884e90be15e9c636601110056905b73c6f244500b4b9a84bec76fab65a09d35136eb57cfeab7a82cb8ba2da2fe501f0e6b7789251b6f40403efe9ac34
-EBUILD agedu-20180329.ebuild 820 BLAKE2B 4520dcc0d9dea33c80ccaf66e425c8f11f51672bafd29727d1144ed27ea79e1336de6e3fd450b700e46ac850fa5da503cbd4f04777d24f3999e05e82f5cca3a9 SHA512 f83dfb089017e07e1ad6e10bd38dd78f0f3021d3943f7f51407bb173ad4049ec0b24c304edf46b93323430e44b6e31b762a218f6a78e6826bf257130ee9c82de
+EBUILD agedu-20170831.ebuild 813 BLAKE2B b397889d6e06a4f4415f815ac43a813a7c18b466eb486d6e74d2792ce7957c6920d57797796723aeb6a7fcb278d56567744dddf36696e3f3e7a01ebb4e5fb5c0 SHA512 8ded6c3042e80a75b1d61b445d661c93656cc9e087eb9fe16bc2e77a8fcc08da287820a0064bccbe7fe829995ae6c3d9b8ba340d7057b8ad4fa41d3c4a22537d
+EBUILD agedu-20171202.ebuild 813 BLAKE2B 6daf7f976207f138c6b05dd1e88e7f6ebcef4f5d48248f796d4c72983156fe29ee7f85df13641121aa17a3b96bb5e153a91adcfb1cf13f768c930b9300637cad SHA512 63e72c5a253098d63a519a24f75ff6a10152b74d5aa45de96ba16a6ae4024be8784ea7a73ad7cb1dc2434eb517e7e480ae77b837cbd0b4fafac286e02dd08afb
+EBUILD agedu-20180302.ebuild 813 BLAKE2B be74cba7f0f8d56d58d34758e9ae02bb1eb5cc830366704fdfe053ed3bb525fb584463bada94b44cf938a1f1c127b477ff01b2038d70bb55d5c18718fb3ee54e SHA512 b1bf546fa3b98ccc54e16205c5ca90275e9966b172a94b0dc126472a4e257727fb14696933e314af379b0fdc3f07c34af2c6d73cc4279b8f6ef689603d079d3a
+EBUILD agedu-20180329.ebuild 820 BLAKE2B 980c34c4804a0d081a281367b1d846e805a2a48dcad0c55e0e5b42b78026efb23bf97462ad88dcf413b206b41bc569d48b44d0de86f7f132b08d34620395a077 SHA512 3a4f336ec030a5091dd5e45c851b61ef08b18ed5f667062f7177e461ec5984eec945eafb21c8f389b38502079e60e822f6640263bd8f1bbd1fe9a93707afc230
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/sys-apps/agedu/agedu-20170831.ebuild b/sys-apps/agedu/agedu-20170831.ebuild
index 8b2ec089f3f4..0924f9239532 100644
--- a/sys-apps/agedu/agedu-20170831.ebuild
+++ b/sys-apps/agedu/agedu-20170831.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 # agedu-20151213.59b0ed3.ebuild is not a legitimate name
 # so we'll drop versionator and just set MY_P manually.
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/sys-apps/agedu/agedu-20171202.ebuild b/sys-apps/agedu/agedu-20171202.ebuild
index b157209b4972..0cfc94bc80fd 100644
--- a/sys-apps/agedu/agedu-20171202.ebuild
+++ b/sys-apps/agedu/agedu-20171202.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 # agedu-20151213.59b0ed3.ebuild is not a legitimate name
 # so we'll drop versionator and just set MY_P manually.
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/sys-apps/agedu/agedu-20180302.ebuild b/sys-apps/agedu/agedu-20180302.ebuild
index 8aeb20dc9846..ced64253757b 100644
--- a/sys-apps/agedu/agedu-20180302.ebuild
+++ b/sys-apps/agedu/agedu-20180302.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 # agedu-20151213.59b0ed3.ebuild is not a legitimate name
 # so we'll drop versionator and just set MY_P manually.
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/sys-apps/agedu/agedu-20180329.ebuild b/sys-apps/agedu/agedu-20180329.ebuild
index 72f7d0242506..24322243c5c3 100644
--- a/sys-apps/agedu/agedu-20180329.ebuild
+++ b/sys-apps/agedu/agedu-20180329.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit autotools eutils
 
@@ -21,9 +21,12 @@ IUSE="doc ipv6"
 
 DEPEND="doc? ( app-doc/halibut )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch b/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch
index 8e0c6ea2969e..0ea79d1a170a 100644
--- a/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch
+++ b/sys-apps/agedu/files/agedu-r9671-fix-automagic.patch
@@ -1,6 +1,5 @@
-diff -Naur agedu-r9671.orig/configure.ac agedu-r9671/configure.ac
---- agedu-r9671.orig/configure.ac	2012-10-20 21:20:47.000000000 -0400
-+++ agedu-r9671/configure.ac	2012-10-21 15:13:08.000000000 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -10,8 +10,6 @@
  AC_PROG_CC
  AC_PROG_CC_C99