gentoo resync : 22.04.2018

6 files changed, 39 insertions, 28 deletions

diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index d4c102ed8e44..3b20a35b614f 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,10 +1,10 @@
-AUX respect-gentoo-env-r3.patch 1999 BLAKE2B bd1c650f3ea99843e49336477ea31b101deec10f7ae4afe2f8c999eca791ea367452e48725fbc27abc483b487da23d22410e535d1a1280fe84d03da04dfbe24a SHA512 61e7919f138525b3a674e36a90e921ca6a5ea61334d2af102b2d90b4eae0e2a4ad5af6abdaa89cb456f3c4263aa44a945d4cd21b857a8428a56f1ee2caac96b0
+AUX respect-gentoo-env-r3.patch 1864 BLAKE2B 7392d487d9d35039413be785f2d5798fb4469108618c118d751e5e493a437a9a977fdfbb0851f4b1a52e44e25f5b22f68598d2dab73090794a7bf0f740a7437e SHA512 1502cc8bc68fa2fb8df904fad0f791c54bfdd94cb59e4ec25cce06423350aaff7afa1547386be28637efefdd23003d5483499cc812c46d2b7a534f753562e2d2
 DIST gradm-3.1-201603152148.tar.gz 91549 BLAKE2B a569ebbac10418ad69effb47a4102bdfd16cb99448d70550a71cad5ab2dca8076d03c4234819fa8ba9d3d50a57d676c2d703c2f308396a7d9ffdf527b1f1a5d8 SHA512 a423db1dfdaa0b068970b92dc970d6e10bfc20695437e92d967b064c3efe05114ab6de672eec984ab2f048b67b12ec8c6667a71bc584f03e5d2f0ebab1476158
 DIST gradm-3.1-201607172312.tar.gz 91667 BLAKE2B 207f86d12789ada00eeb3bc813863d671be54265eff7649a40960ab41296977d0e36dc60ebc482514e1803050026783d43017e7423e25e4d652f813cfb3e75c0 SHA512 61f14038ee555b99e4d0096dd01697d8adba45e057ffceadb44eafbdfba807b53030684c5073d169c005902acfa6baa673975ed4ab00ad035941c209f8f1d2e2
 DIST gradm-3.1-201608131257.tar.gz 91949 BLAKE2B e1dc55706a0c8492b2d0716cfe8abb4efdcd3829da725f412bd6882e28b34e0f52eb796fb9ff0b25db93512893d9d7dafe1aa54f44fa2f3b329adb48d4bc14b4 SHA512 0947abda8d4085fd6f4a569a29f146d6f093c7013ea3aba50df4fb740487b93696b63ab475eb862cfcd26aeb62cd69a55c3d6083b91a2eb9349ad566735f8cfe
 DIST gradm-3.1-201708012022.tar.gz 92238 BLAKE2B 220a2cba3f01e92adc6bf959cfa1721d6ea41247be2c6b742577c434071fe80d0135773e18b9a8a89f1c893c9cd03443e29af0e0b027c97422e4a743f8b6c960 SHA512 1c319ce5b102ad54d0c4d0c43222ed755719bb2568c9a4575b62965a73b0765265dc7068488e5e34df52ed9382b17e4bf1b32a8eef20a4d7a534f3f9a4ba2b3d
-EBUILD gradm-3.1.201603152148.ebuild 1088 BLAKE2B 5ff8a4b1a63600b0d7759d1b84d8aed15d09dea58d600c22875edd82c5487e10ba55ae1d05d910dc58d4609495753d39a125fca583bde0a33ed1bee1e1d89fdf SHA512 1af30a86418bfebba36d4774eb4486c2eb0458961cb06753133093dfface0456f32353b097dc5a628c841e970e2a2a217f9074f184b0302655fe6fc2a2aad5c9
-EBUILD gradm-3.1.201607172312.ebuild 1088 BLAKE2B 5ff8a4b1a63600b0d7759d1b84d8aed15d09dea58d600c22875edd82c5487e10ba55ae1d05d910dc58d4609495753d39a125fca583bde0a33ed1bee1e1d89fdf SHA512 1af30a86418bfebba36d4774eb4486c2eb0458961cb06753133093dfface0456f32353b097dc5a628c841e970e2a2a217f9074f184b0302655fe6fc2a2aad5c9
-EBUILD gradm-3.1.201608131257.ebuild 1090 BLAKE2B 1f623cd7094a62c0baeb97e145c3e27037bcf2d4e7b78578381364d170f57cd8446ddc58ef834420151adb9c20448b584d7a965add7290c2dfd0a47aa31045ad SHA512 97e5438d3f02af476e739e9c449dbc78a9a65b5776f53914d586ca7dff019dcd8c1fd951a9f6d3ee6e43c4b3985c92edcdd8388ed74d9667e743cbc113b41f64
-EBUILD gradm-3.1.201708012022.ebuild 1090 BLAKE2B 678a535028e9f4764d5006101ace00b52de3fe703e3313d49b5533bc6c1029e99b7bacbf2f18c62218e6795386f36b8796f50ed4db6a1b2398a5f5c5adab5c63 SHA512 0c9374b23d4f309dca4069cc9c1c9bfcab06d78a370b2d08270b568d000b3c39bc279d04386839f99f90b2caebfbc5e3e5f938cd3a9e218a25d6f42445caadc7
+EBUILD gradm-3.1.201603152148.ebuild 1081 BLAKE2B bd9ed5b7f58fd5028880bcc75dbb7e3c8522625a7d9af31fdf433b78962c5923fec2e3525701074963176391faf6cb39c942bd5c16a41ed1d050b1b36bb02092 SHA512 38e02d2493d68b9dfacf10a86e465c89dd656393b17d1f5f3fa26adee6460e540a3ec140cf2059618c7e6e4dd2666faef4c4335e4118faf8f28e0841ef41bf52
+EBUILD gradm-3.1.201607172312.ebuild 1081 BLAKE2B bd9ed5b7f58fd5028880bcc75dbb7e3c8522625a7d9af31fdf433b78962c5923fec2e3525701074963176391faf6cb39c942bd5c16a41ed1d050b1b36bb02092 SHA512 38e02d2493d68b9dfacf10a86e465c89dd656393b17d1f5f3fa26adee6460e540a3ec140cf2059618c7e6e4dd2666faef4c4335e4118faf8f28e0841ef41bf52
+EBUILD gradm-3.1.201608131257.ebuild 1083 BLAKE2B 27878e0b59903977b5a8119894edf12a6a8edb698be8bb91e5a9b48d79cbdd0fca6e90e2ea38ead3f2d08ebbff0c5fa687069e1671e82805c45f51217a242aee SHA512 4fc03ef60ac32cf8352909b5a39b8e3f2b7bface4567add63da88170bb1c334ff4e3055ed9d483c6f0cf36f83da668acc9b8fdf06c41614264f33332b880c9f6
+EBUILD gradm-3.1.201708012022.ebuild 1083 BLAKE2B 27878e0b59903977b5a8119894edf12a6a8edb698be8bb91e5a9b48d79cbdd0fca6e90e2ea38ead3f2d08ebbff0c5fa687069e1671e82805c45f51217a242aee SHA512 4fc03ef60ac32cf8352909b5a39b8e3f2b7bface4567add63da88170bb1c334ff4e3055ed9d483c6f0cf36f83da668acc9b8fdf06c41614264f33332b880c9f6
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/gradm/files/respect-gentoo-env-r3.patch b/sys-apps/gradm/files/respect-gentoo-env-r3.patch
index 7c899b139745..13220ae4689a 100644
--- a/sys-apps/gradm/files/respect-gentoo-env-r3.patch
+++ b/sys-apps/gradm/files/respect-gentoo-env-r3.patch
@@ -1,6 +1,5 @@
-diff -Naur gradm2.orig/Makefile gradm2/Makefile
---- gradm2.orig/Makefile	2013-08-09 16:28:37.000000000 -0400
-+++ gradm2/Makefile	2013-08-10 07:57:12.000000000 -0400
+--- a/Makefile
++++ b/Makefile
 @@ -18,18 +18,18 @@
  BISON=/usr/bin/bison
  #YACC := $(shell if [ -x $(BYACC) ]; then echo $(BYACC); else echo $(BISON); fi)
diff --git a/sys-apps/gradm/gradm-3.1.201603152148.ebuild b/sys-apps/gradm/gradm-3.1.201603152148.ebuild
index 5b0e441a008d..e4eef58b2dc0 100644
--- a/sys-apps/gradm/gradm-3.1.201603152148.ebuild
+++ b/sys-apps/gradm/gradm-3.1.201603152148.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit flag-o-matic toolchain-funcs versionator eutils udev
+EAPI=6
+inherit flag-o-matic toolchain-funcs udev versionator
 
 MY_PV="$(replace_version_separator 2 -)"
 
@@ -23,10 +23,13 @@ DEPEND="
 
 S=${WORKDIR}/${PN}
 
+PATCHES=(
+	"${FILESDIR}"/respect-gentoo-env-r3.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/respect-gentoo-env-r3.patch
+	default
 	sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-	eapply_user
 }
 
 src_compile() {
diff --git a/sys-apps/gradm/gradm-3.1.201607172312.ebuild b/sys-apps/gradm/gradm-3.1.201607172312.ebuild
index 5b0e441a008d..e4eef58b2dc0 100644
--- a/sys-apps/gradm/gradm-3.1.201607172312.ebuild
+++ b/sys-apps/gradm/gradm-3.1.201607172312.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit flag-o-matic toolchain-funcs versionator eutils udev
+EAPI=6
+inherit flag-o-matic toolchain-funcs udev versionator
 
 MY_PV="$(replace_version_separator 2 -)"
 
@@ -23,10 +23,13 @@ DEPEND="
 
 S=${WORKDIR}/${PN}
 
+PATCHES=(
+	"${FILESDIR}"/respect-gentoo-env-r3.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/respect-gentoo-env-r3.patch
+	default
 	sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-	eapply_user
 }
 
 src_compile() {
diff --git a/sys-apps/gradm/gradm-3.1.201608131257.ebuild b/sys-apps/gradm/gradm-3.1.201608131257.ebuild
index a12d1fbde72a..4badd5731290 100644
--- a/sys-apps/gradm/gradm-3.1.201608131257.ebuild
+++ b/sys-apps/gradm/gradm-3.1.201608131257.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit flag-o-matic toolchain-funcs versionator eutils udev
+EAPI=6
+inherit flag-o-matic toolchain-funcs udev versionator
 
 MY_PV="$(replace_version_separator 2 -)"
 
@@ -23,10 +23,13 @@ DEPEND="
 
 S=${WORKDIR}/${PN}
 
+PATCHES=(
+	"${FILESDIR}"/respect-gentoo-env-r3.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/respect-gentoo-env-r3.patch
+	default
 	sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-	eapply_user
 }
 
 src_compile() {
diff --git a/sys-apps/gradm/gradm-3.1.201708012022.ebuild b/sys-apps/gradm/gradm-3.1.201708012022.ebuild
index 31c5550113d0..4badd5731290 100644
--- a/sys-apps/gradm/gradm-3.1.201708012022.ebuild
+++ b/sys-apps/gradm/gradm-3.1.201708012022.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit flag-o-matic toolchain-funcs versionator eutils udev
+EAPI=6
+inherit flag-o-matic toolchain-funcs udev versionator
 
 MY_PV="$(replace_version_separator 2 -)"
 
@@ -23,10 +23,13 @@ DEPEND="
 
 S=${WORKDIR}/${PN}
 
+PATCHES=(
+	"${FILESDIR}"/respect-gentoo-env-r3.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/respect-gentoo-env-r3.patch
+	default
 	sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
-	eapply_user
 }
 
 src_compile() {