5 files changed, 34 insertions, 23 deletions
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() {