Reform USE=socks5 fix into a patch.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x743A52E86BA81050

4 files changed, 48 insertions, 11 deletions

diff --git a/net-irc/epic5/ChangeLog b/net-irc/epic5/ChangeLog
index 940a4829177b..a685ba6d1dcb 100644
--- a/net-irc/epic5/ChangeLog
+++ b/net-irc/epic5/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/epic5
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/ChangeLog,v 1.24 2014/09/03 04:31:16 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/ChangeLog,v 1.25 2014/09/04 04:53:58 binki Exp $
+
+  04 Sep 2014; Nathan Phillip Brink <binki@gentoo.org>
+  +files/epic5-1.1.10-socks5-libsocks.patch, epic5-1.1.10.ebuild:
+  Reform USE=socks5 fix into a patch.
 
   03 Sep 2014; Nathan Phillip Brink <binki@gentoo.org> epic5-1.1.10.ebuild:
   Fix USE=socks5 compatibility with in-tree versions of dante.
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index e1b884e71f54..40a8742d93be 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,5 +1,6 @@
 AUX epic-defaultserver.patch 610 SHA256 2883f24f8e2d95afc5dd0b3852b8585691c60a47d59aa71a19765301863c4920 SHA512 a7416d269309169a4dd006a5abe7a2a6c6c00d006614388d7a27d071bd06e7dc5a6f4bd35a9c19829b7990babbd1e2c67d1aecf3a767545051f56057cbf20341 WHIRLPOOL b226ff9908f8da263d00f44b6ee8a7b2412f3a70acfb58e70b8086a3f54a9e1cd8ce05db6913a23b5f4b6daa4d83aa042c140b2eeb689f8439f3908c6cb8b024
 AUX epic5-1.1.10-ruby-automagic-as-needed.patch 4139 SHA256 d16b22cb98e5129f15ebdeea746716673af349a5ab0805b6c89c6359f384d44c SHA512 2aa7122a4192849eb3c99c567cc0ad3fb914c4ef17555aecdffeee2b3792f511c3cd43ba069163889705e7a64d04e0636aa0b77934f9605eacfa1ed8d53afa9d WHIRLPOOL f90fe7dbb92fe773f1362af5c1f0328ebfac2e862761f80c32ae54e938b1d05b0f67cc22d1b4a08f0b4956e99da196c9d9d25c437c60d9d892cde994f5a5cbd1
+AUX epic5-1.1.10-socks5-libsocks.patch 1191 SHA256 9358fee981a228211def2f8d236dec8ed5e3cab4f0b996260acaaecfae3bdccf SHA512 bc0a441ef90d454441789fb1a11c3183776544a675acdc33158357ebad6bbc2a89c8689dad89cefe69b59ff7b6de4e97add32d84a500e83d3469634253ef6b3f WHIRLPOOL 40c4d0e914d7123efd0f66de61a07673e1ae2f8146d17a7c8879f754ec04618f63f81956679ef5e5c414444084bedabe3506e04d76664154d2bd51d17c199094
 AUX epic5-1.1.10-tcl-automagic-as-needed.patch 3453 SHA256 60e469a150c04cd720e0eac23e5a589fc548e6b926434796a259cd4801fde7dc SHA512 845e2e2ff40ab0c5351bc995457060b19781b07285e7115013cf5dea7ba333f28b9c248dd66369fda8a6038ad4de4fb71fb1d77c5b51568667a491efaebd72df WHIRLPOOL bdd17f1d236c3ae170186a48af417dbe4639842132aa04aaf7e462b307de4895cd54b65f28cf0436207f610fb5731fbcb76371c18c699a28a425100e8e7b0d27
 AUX epic5-1.1.10-without-localdir.patch 1780 SHA256 487a5614ac4099264e7ef7568858a5d83568cebc8a64d490ecd0597455e99a35 SHA512 788683fe1448793a2d8a5e50dda3dfb0aef86c44cbec11ed0a92444967a1775050bdd3ac40c44989b6fce16a6e7db154aa26d4f4c6692538eca2e661d32af7a6 WHIRLPOOL f95418fde4ae9cc8585b49f8b314d958410dc13287ffa12fffd6720d8d76dd9febceba4ed3dc8ba123884b2f1da21db88d204df75ef8f89c93680241a60614b3
 AUX epic5-1.1.2-libarchive-automagic.patch 1707 SHA256 c04768c6c2fb5dbb5c879d1025cdd6a7d02e7fd3cfc25b081e58e301c2e58439 SHA512 6f438cc70982538e09d9a0eef7e2c42c331aa73c279157d4bd44b48c6aea26b08b9433927a51fef025acf22bfeec330c4c99946538eae5dca50360963e5f828c WHIRLPOOL eb60683cc0424e3948bed3227467c8d39f13d6bc1a8e19f907c59595f2620282343b1649301ce35c4a86c8b68170043846d742ccc69eff3a2378fa1d6bc7928d
@@ -7,6 +8,6 @@ AUX epic5-1.1.2-perl-automagic-as-needed.patch 3123 SHA256 2bdb85285e83a2ab1f68e
 DIST epic5-0.3.5.tar.bz2 722469 SHA256 7cdefea991c0b08b16896dd34f3ee2aa190a84f7ee6594527ff9e8185fe881aa SHA512 aae754397bd04f7da9904c378e57eb01fe009d7c7620d2c5547064a1aa84a4abfdc6762336aa9e7a812e92cf890e6a1c85ec55c84ff66dea60fa4b907ea0e04d WHIRLPOOL 144d33ef6c5d32f8fd6a0930ee661ad15d9213022366521d041aa16e1f6b68df2466f40c7651d5f5a8bb966abdc58e9bbe16e9d64c5a3ca48d6ded8295edddaa
 DIST epic5-1.1.10.tar.bz2 851439 SHA256 a4f19214e8eb9a7aceaed62d924d96d8c9359b186ff230c01daff398dd62cdb5 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048 WHIRLPOOL 906b919e99a4bfed78bab153aae3964850be17de958382859547fc34ded75a546714c57c4b1857597fec210359f93a1f6da3b5375a689ac435be381b101ec64a
 EBUILD epic5-0.3.5.ebuild 1336 SHA256 71a1180cbf87ed550ede55a9c41b34b49b726ac4a4aab23967495f654a47a8b3 SHA512 9b4fe08e52237fd5225cd6540abdf35d792c92826bfeca6d2850bf9c31524b80445a74cb7b010e6129cc4b4d42412af63f3cba77c6c896fd42392da7dba53bc3 WHIRLPOOL e9ec7d74681e68744f8242f3b2043db329e87ccad7b4db92bc512aa46c2fc5a81d8b1a7ebe48f1e69a00b31f13fbda54fc6c743422bbb3e50c31764ee1998fc2
-EBUILD epic5-1.1.10.ebuild 2228 SHA256 8209e27dc034553b33e34225af1f0f060ceb0c8701936977f9eaad3325e117c5 SHA512 b5800bbc7865090a709acd943b20917a8def4810b4360e0720e1bae1b18013d9410cde0f949d316b9cfeac94783b7d3d698cb5e2e0784d976e68c2a6905f60f4 WHIRLPOOL 3b834abe2363ecba7d983b004a1aa9efe533f9bb7e93cf143ec3fb0525debdb0d590c7a317df10ef1e89f1891805645e12910108aff653f8884b60deb785dd26
-MISC ChangeLog 4257 SHA256 2a65fcd41611ea18f34738ac4e182a7b2240a801f5bf13b88781efb4e56c624f SHA512 3bc4a1274a77779d9168962af7fb1e17ad57e62dcb4b524e07aaf40d4f371977b7f8bc937092607806783cdcc682eeaaae957fee8fdecab5dc0d010e07ba7e35 WHIRLPOOL 778d313253e7b39e73e5d03d39f02bb819c1e9d5b50c0e1cbc8c0d7ea45f6cb6c5f7f1c2a701a5c23b7e22528cc937e487c84fb19f74f9245016d32d8e6db6fe
+EBUILD epic5-1.1.10.ebuild 2083 SHA256 d0337a4b5916707eb37cf35ec1bb941a6e9ed4e3f19c17bd3e42838bff32fc60 SHA512 ab691994bc62d71f50c53b60f4673a69b88a0aeca2ce30db7e57c763d6a76c8a055ec81a2c43e45e39e19fb30f80ae4b7baa255ba41310fbc082698981f0eb9a WHIRLPOOL b5749cde5e6d6880b977c58fb64a642076d477f50efba449942c47817bb8a5eabece915baa88e4fc51de7e2377ccd2e7b52ca5a2eaef9a0fc7a6680f7c443cf5
+MISC ChangeLog 4417 SHA256 f4cab75e24211a17ad71c223920c58409f169c1c9929d09bd31ff3bb15010e0a SHA512 3e9eebfdf9e10e0fceda927f0631155edb0c985af43fdbd73f6dad42fb48fb79c480843ecd9a9ffa8f760f6e4e7e528716b1de60a96ca16b9eaedd49fd39dd17 WHIRLPOOL 08bfe3e39317a0eafb9f5b0c31a60a1308ce71b9ddfb9aec0b0c5b34ee17f4975ec3a072b0b5dbab8d06de354942d8dce269f6e5136c968e35d8fca0d1492fd6
 MISC metadata.xml 441 SHA256 e20a2146057bc3d5e2e27e659d95b2b2139d8b5c3df752d5efc257a6750cfe3f SHA512 599eeeca94a2f27712b3f1356e9510ff74fb1fbb567dea9cdf97b0f195aeb166bdb6edfa28c6666e1d92e09a685507383ba065f99d8a71e565782d7115575884 WHIRLPOOL 430bce6fe7ee5787510c1fbe4b494f23d413be35f57631b93cae0439608d19140ada145b25d049f126c3f2830922a10be0f5a99521a0665cb0fe1e7082f832f9
diff --git a/net-irc/epic5/epic5-1.1.10.ebuild b/net-irc/epic5/epic5-1.1.10.ebuild
index 9eabd3f536ca..c8ba8a136387 100644
--- a/net-irc/epic5/epic5-1.1.10.ebuild
+++ b/net-irc/epic5/epic5-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-1.1.10.ebuild,v 1.2 2014/09/03 04:31:16 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-1.1.10.ebuild,v 1.3 2014/09/04 04:53:58 binki Exp $
 
 EAPI=4
 
@@ -46,13 +46,8 @@ src_prepare() {
 		"${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
-
-	# We want --with-socks5 except it tries -lsocks5 instead of -lsocks.
-	grep -qe -lsocks5 configure.in \
-		&& sed -i -e s/-lsocks5/-lsocks/ configure.in \
-		|| die "fixing socks5 support."
-
+		"${FILESDIR}"/${P}-without-localdir.patch \
+		"${FILESDIR}"/${P}-socks5-libsocks.patch
 	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
new file mode 100644
index 000000000000..c2555c059e79
--- /dev/null
+++ b/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch
@@ -0,0 +1,37 @@
+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
+@@ -861,7 +861,7 @@
+ 
+ AC_MSG_CHECKING(whether to support SOCKS)
+ AC_ARG_WITH(socks,
+-[  --with-socks[=PATH]     Compile with SOCKS firewall traversal support.],
++[  --with-socks[=PATH]     Compile with SOCKS (libsocks without socks.h) firewall traversal support.],
+ [ case "$withval" in
+   no)
+ 	AC_MSG_RESULT(no)
+@@ -887,7 +887,7 @@
+ 
+ AC_MSG_CHECKING(whether to support SOCKS5)
+ AC_ARG_WITH(socks5,
+-[  --with-socks5[=PATH]    Compile with SOCKS5 firewall traversal support.],
++[  --with-socks5[=PATH]    Compile with SOCKS5 (libsocks with socks.h) firewall traversal support.],
+ [ case "$withval" in
+   no)
+ 	AC_MSG_RESULT(no)
+@@ -899,7 +899,7 @@
+ 	fi
+ 
+ 	AC_MSG_RESULT(yes)
+-	LIBS="$LIBS -lsocks5"
++	LIBS="$LIBS -lsocks"
+ 	AC_DEFINE(SOCKS)
+ 	AC_DEFINE(USE_SOCKS5)
+ 	;;