Version bump, fix bug #493058

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

4 files changed, 82 insertions, 17 deletions

diff --git a/net-proxy/torsocks/ChangeLog b/net-proxy/torsocks/ChangeLog
index 095010d85587..1ffd1045c949 100644
--- a/net-proxy/torsocks/ChangeLog
+++ b/net-proxy/torsocks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/torsocks
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/ChangeLog,v 1.13 2013/09/17 19:12:35 blueness Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/ChangeLog,v 1.14 2014/01/26 17:56:50 blueness Exp $
+
+*torsocks-2.0.0_rc3 (26 Jan 2014)
+
+  26 Jan 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/fix-find-libc.so.patch, +torsocks-2.0.0_rc3.ebuild:
+  Version bump, fix bug #493058
 
   17 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
   torsocks-2.0.0_rc2.ebuild:
diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
index 487186f658bb..1a7014adf04e 100644
--- a/net-proxy/torsocks/Manifest
+++ b/net-proxy/torsocks/Manifest
@@ -3,28 +3,31 @@ Hash: SHA256
 
 AUX fix-docdir-r2.patch 818 SHA256 119103f6c6e9a8891fe026ac0071b9b9b74197b3b92ff9328cc54bb6600c3564 SHA512 64468f0d4784e9c4b7009ed5e6ac1a1291f57c82a8226d1a35065435d790c8b9d99310998e7f0ac3a5a06634e7f5db13403dc08753ab3dcabb1660e9883372f7 WHIRLPOOL 5f7e68d05d14ed6cd1e2f195fa29272e58c92798ea80b1f65c6eb5b2a6c3d5c016d43f2c02a23b4507d0119d769b72ac75f16c5a6aaf3d890d4898532ff097eb
 AUX fix-docdir.patch 1245 SHA256 0f5e2a84b1c77893902a35f2df5575087558822536bd64335c543f91d4bb70f0 SHA512 ff137987df93ad9ff6eb9e82cd1b0bee06088d8ca87bf4a87c4bf4496d21cc0a65c8fb8fa8746bbd521aca6a97b1e4e79918435c61236d3a814c99e7da1c8999 WHIRLPOOL cbf0c8609d3247396d380542c769e61f625ac5ddf50a89c4f8b5ac6e9043b1e5c84c053e0bf0ab1a34e43de5cb322bdb61d7b8f07a52f83c06d8469c0ecff424
+AUX fix-find-libc.so.patch 634 SHA256 f355092a265584b560ec8255b99ce54b8708c5a0ef1ae3efc518721641aa039f SHA512 bcaacf3c270cec290d0ee3949ec3cbb1b0b228ae11eec3c18663f2db96d199a1174b80d855047a0e44a7f36f5877a1385f5f77f1864b3ff944327940413b72c2 WHIRLPOOL ba0fef2bd5ee7e04feb31ea008df7968a0e950295315fbe07ccc0d61aa08995392e2cbe76aecf5bf12d783e7a8618a93aec3aab4bdac08284cb43822ef9826a6
 AUX suppress-warning-msgs.patch 657 SHA256 1700733259fae6b9e4915ec9ec4d678bff84fa50821e212f65d4bbe424c9f759 SHA512 71472b0ea8ef99de58e2be415f7e90405b7f71c4dce26265dbfd4c2bdc2c037cfe2b7c6382f9128bfdc7d1cde850e20d411f9c5016e784840641d633cfa8482f WHIRLPOOL 90c90fb1a37c5f81008b0064be54302960f53886f90f854267502ebe523de1b02bac02b6549d52a5ba461192d395ff0a1b346b04c308a67f5cc1ac3ac50a4d9c
 DIST torsocks-1.2.tar.gz 456453 SHA256 bea57d3624d723724fd1e260f0e6b2a354c0da742c023aa994c7692270d111d4 SHA512 c48cf466c1d4f6204c90ccb5f741d14304b24651d18d080a73952b9a06bbe146e3f6e6c4343ed06ed7a73714d86561cde3eba369e17fc4e155f3553a8d0f3890 WHIRLPOOL af892c2a6f8070308f6867154c50ee8ce6fd20c761dbd6466ea1ae3b46730452ce0757e9de8bf698f8bd455649f3f76a4e9a0bd883408f464c619c1d41e937cf
 DIST torsocks-2.0.0-rc2.tar.gz 107022 SHA256 9467fc4e4d64b6d11dbbfc91196d7bd6fb08d7b4cc72d32a3850c9b78403908b SHA512 8b1d5870b70e20a3e3d5a4dc6344a41d5ff634293018ff721627a65325111b92444d0b715c61f111815d1d967fbd75a1f61815715895fb9ec5e4b6d7597b4409 WHIRLPOOL ac7f02fb4bcfab7a71bd0dc8ce730a2832ac220c6bc3605fe4c87532be3dcc773b0088824ecb9fef4ef24d93cbf16e637efe7858c8b9730705ab695c59f89716
+DIST torsocks-2.0.0-rc3.tar.gz 109998 SHA256 6d3ddb8856a12ff39365e359a06b057c0ea03edc7733b25437a3638d2a973244 SHA512 c10b8ae2f0115eae2b36baa46f48f586c1efaf101d391c4ace95e4b3fbc7287c1b281968524808a752e77e4be077b1583fe7b96d24643c7f27205a379fd9f946 WHIRLPOOL fcb474ff6d8e75265cec9b04914cb7a9f5826b2fc2f1ebec61d6bef7a8b29ee5e86b1882fae0658528b79b4de0da1ec04977ef062a9c77cb94ce4c49b9dac673
 EBUILD torsocks-1.2-r2.ebuild 986 SHA256 66b117b12c21e62522c19b0eb1d4c48ca2c52f41c86ccc1cd8167e9f4ccff15a SHA512 577696c62d7056d1eaefcc0487cad1fb1bd091ea230b6a3df6cffd430c0622711871fbde79cfcf7203224a669fde87d3692764870d6b852e004036696f91c6fd WHIRLPOOL f89a2f18653cf19edfb7816d8c7daaa7d6f6151ace40261cca1d04d50963052db769ace2f9b0ab6ab0d9033b10b0e584bb15e2fca121610b067e2c2b3922ca72
 EBUILD torsocks-1.2.ebuild 765 SHA256 516e12861139063a948e720de4efcff760c66d97a53e306c3a5ca8affd1bd9ca SHA512 ece7864ec17800b46783776437e4b7083aafe8b9d15864ffd2231222acd95e0effbad8c176582558d758cc3ee8ae10e68543a7f651424d4ed5c973317235334d WHIRLPOOL d694995f08df2a351078186fb283e8d49a97b38cadae0efa1417df0337894dbfa3d2762461e8449876027cf1ed0756bdadca49eefaae108834ba569306c8542f
 EBUILD torsocks-2.0.0_rc2.ebuild 1071 SHA256 0ce94464dc8b4604aa3c0f40a388ef467a581b48ddf0d90549d49e5261c4cb42 SHA512 8a894701c8750d244133f23ef4aec1e675d1eaaa3680eaf5148dae6bb8e71c0b6cbcc8106dfb4299cbf7db285b1983917a500528a66e5212c949642cca015209 WHIRLPOOL 79fd36f9d9a0763c2f90b7ad1c2d7b2056199d8db97b5a1891f6183f9315509e25ea210a9802952a656edaeb5fd0ed9415c6f3be3afcfa06453fdd3d23770565
-MISC ChangeLog 1968 SHA256 cd17b8563b8049c6167103b739e9735205ff45cfcaf5b5a100bfd9fad966a8cf SHA512 fd3805e8873106b8b1dc54da097d18560d118740c139365496993a4e5c9d44d37ca72ad6077e0930be69e604306b25b9f1b2ea95965e0a50b87638c09d249c1b WHIRLPOOL 53b9de7b818992f42efef93a3e60ee30586cc3b97a732112a76cbc52e0536b699f5c99ca18d449f784dd82abb3eb563a5a5d2694ca4a3408fd961cb162b7818e
+EBUILD torsocks-2.0.0_rc3.ebuild 1116 SHA256 9af348d491c3f32dd5c97c3f7fc241204a996f29e50e5bac2acc9e9d6b4b3031 SHA512 3d0fab75513ae816f898cf143eb3af199a854613af9a8a87a825af0b929d9993f763588e697ae43b1c62beefd2ded4c57c95215547204dafaff0ffb9f98fc5fc WHIRLPOOL 823f1e89206f624be5158c7b4ee7bc309e3118376d42a33799863ddddb6bc4d28189699c7788c0858c5ee843b9e7fa625209dee1a6557f728419951597a7f2e8
+MISC ChangeLog 2152 SHA256 ee09dad1d185995665f2ef074d6adbb24500637f445a80ca204596f4642a9f5b SHA512 53356ef60d27094609070397b23cf100e7523293e64ff3f08234105b32c98119a566a1fe4db98e4f6c903bb3784044122ded8396a0f5871f3e7f1b5ec07d9768 WHIRLPOOL bd43b3080f3b6589c384dd3d24839fb91cf9c0464d3084bf10d23a4f439148e17dc65c8a74446cbf03e63a1148e2abc541832574bd74abbee73711b7841ee36f
 MISC metadata.xml 316 SHA256 4c32e171681ab5fdd7689307fe5fbca67e4b2c64d1ab5f60b17171ee08066234 SHA512 e7dfd938efe4cadbd14069d6c81e541354829da8737e2a6282627cd54cfb7c2081f7bcb1dd2bc30312f97a8c14fa43398e5e09e17a1649e486031b87155a2810 WHIRLPOOL 3e0a03584d3c3df7c8fe4fc62e6dd24f007be4d7e9cbc4db7fc4a16f1c93a601077b378d9bc26ba8a5e4011047e248e40ca8952dbeb8436813bfb1a65d720ac9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSOKnMAAoJEJOE+m71LUu6NY8P/j8VidmbkAbQsbGG+YU0HXGA
-IUFiyfxhyrZ3utUxQ/k09tU5UkQsvyrdiw36ACYVtrFEjJP4F/MOVvaRhVAOMzl1
-OnPnYSY0Y5VUFPUVUV8tPhdE/XA/hR7NPDoRF7PBGOu8q71gPhBT8MY2lYrt15jy
-r9Xj5S/F7+AYDALXWJbc9fBq2jpDJ/lwJNSHofZVtUGRBURaTKomi+RDhZZ9Onwy
-3Vk4pSid5bCVw7rsiY/D1WJ2o343bP9nEqNrolsf1xRreHNYvgdvQPSwhR4SnwGO
-sChmQNq8nn5Dne+6V3fh7AZKImwu+s1XH9rfoE1hQqpmitJbbOYwQStvAof1/dgx
-C312kI5aKIgRpfUNyxmJB5YeSq87nfuzYIhsUlnAxArOfwzR2qSOLRllU3f8kMU3
-5GcueqtEbEMDXAJHYOmONUKIQR18/XY/6U993XuEI0AcOSt+qDy9kNDTPbEU4249
-/l844l8VnUeTa9M3qu59RpDh8MM2ibWuWup1cpxlZHFkJV8505Y4JO63mSsknJG4
-LsuLBfoZT+rewHpBclakpUVh8BkgNYo7WiCKnrqtmL12i9VhA95kxuK1yM5FUmAt
-+IdkTyiqi9l5rQUexrSLV5WeQ93ZsT4dyVEFADCh7RLYfg0ntP4AB1Lrdcu4+U2F
-TJFer0WLLtBf9T0ahAXt
-=pBXY
+iQIcBAEBCAAGBQJS5UyFAAoJEJOE+m71LUu6VpoP+wQd28RJiGZ7Qr9iI4HaccgI
+iytOcOsOUx2ljEXppZHG8Xoo4NkGL2e31Ek1hHGmlJqPrMrR5aixt0DMi76BBFS7
+YD5Fw6MsLW5bM5MqWd6F/W03XN4yy+TsigOVOlX9B99FfiJW4UBh7uzojn5C1lXb
+BHZT75M5wWme9DTIiZzeXU8l6IMHZP1egkTlJLLg8jzniavrXkBXb8rctZUfXUvF
+sUMjTme7uxRbNlbE4/V8Mu24E5+o/thcfjGBwW8hNjSu4a4ODcAV6JS9DX49OYFB
+6wXRTtpYe/Hix6PGLFARJHcQFo2tPrwqzP9gS0Ro+KeUNbaWdT4C6j/7GXPiOVpJ
+Na1fSxMqg4vfnHlWJSkgkrkS95n8vF6ceSZHzOhzENnmVbEqVqmxLCMlBK8p+jZ2
+E6eD07b5nf30n6XFN0xJXyl55qK+A5s55XseO19wOY7hQHbsRbjTgetbxnPPtVnV
+/q512g7966km4g5Abl49X9P0YJpdP6cCo2mRod6Gxog8qTmHq6OsQNXPksuR8qLP
+5vG/+ZBSirMhK2m852mYp2p32P00UEpaV3mkEKsV3KZKUkmbCzc390hv3uPNXwF+
+Iy+bYahHmp6bTgtbD4bexDoK7Gruu3xud8oNLPdWPJ1MPYwV3j09u919DyNFSsfC
+lN/CuxAhwuHNl4xFImvf
+=M0TQ
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/torsocks/files/fix-find-libc.so.patch b/net-proxy/torsocks/files/fix-find-libc.so.patch
new file mode 100644
index 000000000000..0fb1949116e1
--- /dev/null
+++ b/net-proxy/torsocks/files/fix-find-libc.so.patch
@@ -0,0 +1,12 @@
+diff -Nuar torsocks-2.0.0-rc3.orig/configure.ac torsocks-2.0.0-rc3/configure.ac
+--- torsocks-2.0.0-rc3.orig/configure.ac	2013-11-03 13:24:51.000000000 -0500
++++ torsocks-2.0.0-rc3/configure.ac	2014-01-26 12:49:55.157606016 -0500
+@@ -132,7 +132,7 @@
+ dnl Get libc full system path. Use prefix or some hardcoded standard
+ dnl location on Unixish system.
+ AC_MSG_CHECKING(location of libc.so)
+-for DIR in "$prefix/lib" "$prefix/usr/lib" '/lib' '/usr/lib'; do
++for DIR in "$prefix/lib*" "$prefix/usr/lib*" '/lib*' '/usr/lib*'; do
+ 	if test "${LIBC_PATH}" = ""; then
+ 		LIBC_PATH=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1`
+ 	fi
diff --git a/net-proxy/torsocks/torsocks-2.0.0_rc3.ebuild b/net-proxy/torsocks/torsocks-2.0.0_rc3.ebuild
new file mode 100644
index 000000000000..655c22bc3fb4
--- /dev/null
+++ b/net-proxy/torsocks/torsocks-2.0.0_rc3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/torsocks-2.0.0_rc3.ebuild,v 1.1 2014/01/26 17:56:50 blueness Exp $
+
+EAPI="5"
+
+inherit autotools eutils multilib versionator
+
+MY_PV="$(replace_version_separator 3 -)"
+MY_PF="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_PF}"
+
+DESCRIPTION="Use most socks-friendly applications with Tor."
+HOMEPAGE="http://github.com/dgoulet/torsocks"
+SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static-libs"
+
+# We do not depend on tor which might be running on a different box
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-docdir-r2.patch
+	epatch "${FILESDIR}"/fix-find-libc.so.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	dodoc ChangeLog README TODO doc/notes/DEBUG doc/socks/{SOCKS5,socks-extensions.txt}
+
+	#Remove libtool .la files
+	cd "${D}"/usr/$(get_libdir)/torsocks
+	rm -f *.la
+}