diff --git a/net-irc/epic5/epic5-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild
index 323296c7006d5..289bab3402a81 100644
--- a/net-irc/epic5/epic5-1.1.10-r2.ebuild
+++ b/net-irc/epic5/epic5-1.1.10-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 USE_RUBY="ruby22 ruby23"
 
-inherit autotools eutils multilib ruby-single toolchain-funcs
+inherit autotools ruby-single toolchain-funcs
 
 DESCRIPTION="Epic5 IRC Client"
 SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.bz2"
@@ -30,17 +30,17 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \
+	"${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \
+	"${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \
+	"${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \
+	"${FILESDIR}"/${P}-without-localdir.patch \
+	"${FILESDIR}"/${P}-socks5-libsocks.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \
-		"${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \
-		"${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \
-		"${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \
-		"${FILESDIR}"/${P}-without-localdir.patch \
-		"${FILESDIR}"/${P}-socks5-libsocks.patch
-
-	eapply_user
-
+	default
 	eautoconf
 }
 
diff --git a/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch b/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch
index c2555c059e796..4aef0c7d6af3e 100644
--- a/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch
+++ b/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch
@@ -1,13 +1,8 @@
 From: Nathan Phillip Brink <binki@gentoo.org>
 Subject: Use -lsocks instead of -lsocks5 for `./configure --with-socks5`.
 
-Index: configure.in
-===================================================================
-RCS file: /home/cvs/repository/epic5/configure.in,v
-retrieving revision 1.101
-diff -u -b -B -u -r1.101 configure.in
---- configure.in	9 Apr 2014 17:51:06 -0000	1.101
-+++ configure.in	4 Sep 2014 00:18:00 -0000
+--- a/configure.in
++++ b/configure.in
 @@ -861,7 +861,7 @@
  
  AC_MSG_CHECKING(whether to support SOCKS)