diff options
| author |   Nathan Phillip Brink <binki@gentoo.org> | 2014-09-04 04:53:58 +0000 |
|---|---|---|
| committer | Nathan Phillip Brink <binki@gentoo.org> | 2014-09-04 04:53:58 +0000 |
| commit | e460bd55f981bd86b79b06caf21e610b8ec82966 (patch) | |
| tree | 201a6d1bd7fa88ba9afa171870094ea4a133592f | |
| parent | Added :0 to dev-java/ dependencies to avoid breakage on the upcoming bumps of... (diff) | |
| download | gentoo-2-e460bd55f981bd86b79b06caf21e610b8ec82966.tar.gz gentoo-2-e460bd55f981bd86b79b06caf21e610b8ec82966.tar.bz2 gentoo-2-e460bd55f981bd86b79b06caf21e610b8ec82966.zip | |
Reform USE=socks5 fix into a patch.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 743A52E86BA81050)
| -rw-r--r-- | net-irc/epic5/ChangeLog | 6 | ||||
| -rw-r--r-- | net-irc/epic5/epic5-1.1.10.ebuild | 11 | ||||
| -rw-r--r-- | net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch | 37 |
3 files changed, 45 insertions, 9 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/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) + ;; |