gentoo resync : 22.04.2018

3 files changed, 15 insertions, 20 deletions

diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 7600fb7a2862..514a1043f493 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,10 +1,10 @@
 AUX epic5-1.1.10-ruby-automagic-as-needed.patch 4139 BLAKE2B 4b94005dec241bc7be23f4d844c4c33087929d5bb765a70a8cd421e028faa74502b7c6f4a4c822030e22e841b60e7fde9e4bd60f93aa5d6107c4103e5aecf3d1 SHA512 2aa7122a4192849eb3c99c567cc0ad3fb914c4ef17555aecdffeee2b3792f511c3cd43ba069163889705e7a64d04e0636aa0b77934f9605eacfa1ed8d53afa9d
-AUX epic5-1.1.10-socks5-libsocks.patch 1191 BLAKE2B 29775783fc47c969aab1a2b19b7f6a92d15f9195df38a841660f33ad30e984f9a9961e7e1109c8dc8881a0e3bb8797a4bfbefcd57038a8f04f134c028f91c3a5 SHA512 bc0a441ef90d454441789fb1a11c3183776544a675acdc33158357ebad6bbc2a89c8689dad89cefe69b59ff7b6de4e97add32d84a500e83d3469634253ef6b3f
+AUX epic5-1.1.10-socks5-libsocks.patch 933 BLAKE2B ab7b6f7d76f947c41caec9352d43020527e309b3dea3cda4625205c2deaa0e0d864d6919e3c5194fb31643759e5f3c3e8c7efc805627f9dfa4d815df88e5619d SHA512 2357fb29b9be7fb16be606da05b75475fcc092dd0dd54b4a7defe6f4d6847a4aa15db7aec2a3e5ca0f0fe2d0d16104eee78c92ee6ee5ddcf571f2a7ef239bbb0
 AUX epic5-1.1.10-tcl-automagic-as-needed.patch 3453 BLAKE2B efd48926297535ae927f470f17f104a4ffe8f6719acc2040dc49f1fb7a453c9a9a85f87ef64e77ee215abc7fa4b3c669c04c1ec5fd154575f1d4228f4082594f SHA512 845e2e2ff40ab0c5351bc995457060b19781b07285e7115013cf5dea7ba333f28b9c248dd66369fda8a6038ad4de4fb71fb1d77c5b51568667a491efaebd72df
 AUX epic5-1.1.10-without-localdir.patch 1780 BLAKE2B 97b29e5c3efd4f9048db52f501acfdb848eff53a987e9fa4bf573dfccace8965adcb98109a2fcfe401ac6e86cf319a3f9dc8873df123bd4acf9d529b4d1b76f5 SHA512 788683fe1448793a2d8a5e50dda3dfb0aef86c44cbec11ed0a92444967a1775050bdd3ac40c44989b6fce16a6e7db154aa26d4f4c6692538eca2e661d32af7a6
 AUX epic5-1.1.2-libarchive-automagic.patch 1707 BLAKE2B 94eb0be15058b7ce86fe6500337477729ab2b4ab792d8c100c941c1fd9ff8ff96982616c539ae41bda111b08c1792478e4f47e2ec44e6e84d800e5b5d3ee7fd9 SHA512 6f438cc70982538e09d9a0eef7e2c42c331aa73c279157d4bd44b48c6aea26b08b9433927a51fef025acf22bfeec330c4c99946538eae5dca50360963e5f828c
 AUX epic5-1.1.2-perl-automagic-as-needed.patch 3123 BLAKE2B b104b7ab792010e0113e8f4ef378a53dac2f64182e7045866e3d57176427a735ded0b3a3b7975fab892dfa77692589e7324c927206dfb7a636d7f9ad69950f90 SHA512 bd58fa5b49b0b9c900612d1183d696e6683113420f79702df0706a3bd3885bc6215a178a11ca9dff8c9337314cf72488b85217d731b162dea95f4c8e22d50a6c
 DIST epic5-1.1.10.tar.bz2 851439 BLAKE2B 13cf0f78ed2009595479fac8173b2936cf74382ec22964e00de2d84fd89c6cee661e4ea9e3d8ba44ec715ac7e861f4639b3459d3ac2d67c74cc49ad4aeebf127 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048
 EBUILD epic5-1.1.10-r1.ebuild 2211 BLAKE2B 66eadd474ad71e72267844f1cec015b4fd12ce811d55262df74b7624b0f36fbc9151f4e1674146afaa47a4ef8b95a4a88b2557b2cacabfac96de8a88630d6bd2 SHA512 16c5a47784f0d8ed534b8f269f693497be01079b3b6a8fa563f36116f3aea65f3af829af938db002775aa59613e09281cc1b4071710065d4a8fe721c000ad6d4
-EBUILD epic5-1.1.10-r2.ebuild 1852 BLAKE2B 56029b98239501cbbbcf5aaecf65ad1ad9b7203a25c48fbdf7b285d754ed859fdddd8cfc67cab827818778a5fe78d906e4de208c975b5a9efc3ecac18a058a5e SHA512 f515d5b88fe3e9486e97416e2f671bc515eb3fd35c4d7faa0411dd6cb679b670934fcda96220098afc4e9d4a7d3d6fdd57d01cd96c2c4dba16c79dfbac64d4bd
+EBUILD epic5-1.1.10-r2.ebuild 1827 BLAKE2B 4867a91c2899389283c9c3edb291ce46e3d534376d6bc24f12d58c55c0d6e8e999245e5b8741651d01780e5ce0adedd5184a4cc6e2c4b4987ee79587208da6f4 SHA512 3032819fd494ac0f7844c6ef43ddf4d8d0345c2b32d88e7d04a6602430e616d051e0a8c335d2f1b4f05118bf358cc2f09de60c448c68e2180937b2678d31c5c0
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild
index 323296c7006d..289bab3402a8 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}
 
-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
+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() {
+	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 c2555c059e79..4aef0c7d6af3 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)