[gentoo-commits] dev/bircoph:master commit in: net-proxy/tsocks/files/, profiles/, net-proxy/tsocks/

["Andrew Savchenko" <bircoph@gmail.com>]

commit:     617e7011263daa1d062fed1a71542d1e5a28937f
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Jan  9 01:40:26 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Jan  9 01:40:26 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=617e7011

Add initial tsocks version from the tree.

---
 net-proxy/tsocks/ChangeLog                         | 203 +++++++++++++++++++++
 net-proxy/tsocks/Manifest                          |  19 ++
 net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch  |  22 +++
 .../tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch  | 133 ++++++++++++++
 net-proxy/tsocks/metadata.xml                      |  13 ++
 net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild        |  60 ++++++
 profiles/categories                                |   1 +
 7 files changed, 451 insertions(+)

diff --git a/net-proxy/tsocks/ChangeLog b/net-proxy/tsocks/ChangeLog
new file mode 100644
index 0000000..04fe397
--- /dev/null
+++ b/net-proxy/tsocks/ChangeLog
@@ -0,0 +1,203 @@
+# ChangeLog for net-proxy/tsocks
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.41 2015/01/07 14:04:49 pacho Exp $
+
+  07 Jan 2015; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Reassign and cleanup as discussed at https://www.mail-archive.com/gentoo-
+  dev@lists.gentoo.org/msg66357.html
+
+  12 Oct 2013; Pavlos Ratis <dastergon@gentoo.org>
+  -files/tsocks-1.8_beta5-gentoo-r1.patch,
+  -files/tsocks-1.8_beta5-gentoo-r2.patch, -tsocks-1.8_beta5-r3.ebuild,
+  -tsocks-1.8_beta5-r4.ebuild:
+  remove obsolete versions and files
+
+  14 Dec 2011; Naohiro Aota <naota@gentoo.org> Manifest:
+  Manifest update wrt #394197
+
+*tsocks-1.8_beta5-r6 (19 Nov 2011)
+
+  19 Nov 2011; Naohiro Aota <naota@gentoo.org> +tsocks-1.8_beta5-r6.ebuild:
+  Use MAP_ANON instread of MAP_ANONYMOUS if available. Bug #381917
+
+  06 Jun 2010; Raúl Porcel <armin76@gentoo.org> tsocks-1.8_beta5-r5.ebuild:
+  arm stable wrt #300830
+
+  17 Apr 2010; Raúl Porcel <armin76@gentoo.org> tsocks-1.8_beta5-r3.ebuild,
+  tsocks-1.8_beta5-r4.ebuild, tsocks-1.8_beta5-r5.ebuild:
+  Add ~arm wrt #300830
+
+  19 Jul 2009; nixnut <nixnut@gentoo.org> tsocks-1.8_beta5-r5.ebuild:
+  ppc stable #274790
+
+  06 Jul 2009; Raúl Porcel <armin76@gentoo.org> tsocks-1.8_beta5-r5.ebuild:
+  sparc stable wrt #274790
+
+  04 Jul 2009; Brent Baude <ranger@gentoo.org> tsocks-1.8_beta5-r5.ebuild:
+  stable ppc64, bug 274790
+
+  28 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
+  tsocks-1.8_beta5-r5.ebuild:
+  Stable on alpha, bug #274790
+
+  28 Jun 2009; Markus Meier <maekke@gentoo.org> tsocks-1.8_beta5-r5.ebuild:
+  amd64/x86 stable, bug #274790
+
+*tsocks-1.8_beta5-r5 (20 Jun 2009)
+
+  20 Jun 2009; Alin Năstac <mrness@gentoo.org>
+  +files/tsocks-1.8_beta5-gentoo-r3.patch, +tsocks-1.8_beta5-r5.ebuild:
+  Link tsocks-saveme dinamically (#273339). Migrate to EAPI 2.
+
+*tsocks-1.8_beta5-r4 (18 Feb 2009)
+
+  18 Feb 2009; Alin Năstac <mrness@gentoo.org>
+  -files/tsocks-1.8_beta5-gentoo.patch,
+  +files/tsocks-1.8_beta5-gentoo-r2.patch, -tsocks-1.8_beta5-r2.ebuild,
+  +tsocks-1.8_beta5-r4.ebuild:
+  Fix LD_PRELOAD setup, thanks to Yuval Hager <yuval at avramzon dot net>
+  (#255960).
+
+  22 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml,
+  tsocks-1.8_beta5-r3.ebuild:
+  amd64 stable, bug #231690; add GLEP 56 USE flag desc from use.local.desc
+
+  21 Jul 2008; nixnut <nixnut@gentoo.org> tsocks-1.8_beta5-r3.ebuild:
+  Stable on ppc wrt bug 231690
+
+  17 Jul 2008; Markus Rothe <corsair@gentoo.org> tsocks-1.8_beta5-r3.ebuild:
+  Stable on ppc64; bug #231690
+
+  17 Jul 2008; Raúl Porcel <armin76@gentoo.org> tsocks-1.8_beta5-r3.ebuild:
+  alpha/x86 stable wrt #231690
+
+  16 Jul 2008; Friedrich Oslage <bluebird@gentoo.org>
+  tsocks-1.8_beta5-r3.ebuild:
+  Stable on sparc, bug #231690
+
+*tsocks-1.8_beta5-r3 (13 Feb 2008)
+
+  13 Feb 2008; Alin Năstac <mrness@gentoo.org>
+  +files/tsocks-1.8_beta5-gentoo-r1.patch, +tsocks-1.8_beta5-r3.ebuild:
+  Link programs using user selected LDFLAGS (#209703). Fix library path in
+  tsocks script.
+
+  17 Jun 2007; Alin Năstac <mrness@gentoo.org> -tsocks-1.8_beta5.ebuild,
+  -tsocks-1.8_beta5-r1.ebuild:
+  Remove old revisions.
+
+  22 Apr 2007; Bryan Østergaard <kloeri@gentoo.org>
+  tsocks-1.8_beta5-r2.ebuild:
+  Stable on Alpha, bug 174160.
+
+  11 Apr 2007; Alin Năstac <mrness@gentoo.org> tsocks-1.8_beta5-r2.ebuild:
+  Stable on amd64.
+
+  01 Apr 2007; Michael Hanselmann <hansmi@gentoo.org>
+  tsocks-1.8_beta5-r2.ebuild:
+  Stable on ppc.
+
+  03 Dec 2006; Markus Rothe <corsair@gentoo.org> tsocks-1.8_beta5-r2.ebuild:
+  Stable on ppc64
+
+  07 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  tsocks-1.8_beta5-r2.ebuild:
+  Stable on sparc
+
+  01 Nov 2006; Alin Nastac <mrness@gentoo.org> tsocks-1.8_beta5-r2.ebuild:
+  Add SONAME to libtsocks. Stable on x86.
+
+  20 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  tsocks-1.8_beta5-r1.ebuild:
+  Stable on sparc
+
+  29 Sep 2006; Markus Rothe <corsair@gentoo.org> tsocks-1.8_beta5-r1.ebuild:
+  Stable on ppc64
+
+  24 Sep 2006; Michael Hanselmann <hansmi@gentoo.org>
+  tsocks-1.8_beta5-r1.ebuild:
+  Stable on ppc.
+
+*tsocks-1.8_beta5-r2 (22 Sep 2006)
+
+  22 Sep 2006; Alin Nastac <mrness@gentoo.org>
+  +files/tsocks-1.8_beta5-gentoo.patch, +tsocks-1.8_beta5-r2.ebuild:
+  Rename saveme and validateconf executables. Add tordns patch & local USE
+  flag (#148550).
+
+  20 Sep 2006; Alin Nastac <mrness@gentoo.org> tsocks-1.8_beta5-r1.ebuild:
+  Stable on x86.
+
+*tsocks-1.8_beta5-r1 (16 Jul 2006)
+
+  16 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/tsocks-1.8_beta5-bsd.patch, +tsocks-1.8_beta5-r1.ebuild:
+  Add tsocks with a little cleanup and patch for BSD compatibility (bug #140612).
+
+  04 Oct 2005; Alin Nastac <mrness@gentoo.org> -tsocks-1.8_beta4.ebuild,
+  tsocks-1.8_beta5.ebuild:
+  Remove obsolete version. Remove INSTALL from docs.
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  tsocks-1.8_beta5.ebuild:
+  Stable on ppc.
+
+  02 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  tsocks-1.8_beta5.ebuild:
+  Stable on sparc
+
+  30 Jul 2005; Alin Nastac <mrness@gentoo.org> tsocks-1.8_beta5.ebuild:
+  Stable on x86.
+
+  20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> tsocks-1.8_beta5.ebuild:
+  Stable on amd64.
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> tsocks-1.8_beta5.ebuild:
+  Stable on ppc64
+
+  22 Apr 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml:
+  Move net-misc/tsocks to net-proxy/tsocks. Add metadata.
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> tsocks-1.8_beta5.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #86993
+
+  22 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  tsocks-1.8_beta5.ebuild:
+  Multilib cleanup.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> tsocks-1.8_beta5.ebuild:
+  Stable on alpha.
+
+*tsocks-1.8_beta5 (22 Feb 2004)
+
+  22 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #42394 by Scott Jones.
+
+  07 Dec 2003; David Holm <dholm@gentoo.org> tsocks-1.8_beta4.ebuild:
+  Added to ~ppc.
+
+  21 Aug 2003; Will Woods <wwoods@gentoo.org> tsocks-1.8_beta4.ebuild:
+  Added ~alpha to KEYWORDS
+
+  12 Jun 2003; <msterret@gentoo.org> tsocks-1.8_beta4.ebuild:
+  add Header
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*tsocks-1.8_beta4 (10 Jun 2002)
+
+  11 Jul 2002; lamer <lamer@gentoo.org> tsocks-1.8beta4.ebuild : 
+  Added "dobin validateconf saveme inspectsocks" to src_install
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> tsocks-1.8beta4.ebuild :
+  Added KEYWORDS, SLOT.
+
+  10 Jun 2002; Ben Lutgens <lamer@gentoo.org> tsocks-1.8_beta4: Ebuild for
+  tsocks submitted to bugs.gentoo.org by a gentoo user *THANKS*
+  bardur-gta@odense.kollegienet.dk. It should be noted that as per the
+  install docs, this stuff gets installed to /lib. Mainly due to the fact
+  that it's often needed before /usr gets mounted. So the old
+  /etc/ld.so.preload trick won't work!

diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest
new file mode 100644
index 0000000..36d44d6
--- /dev/null
+++ b/net-proxy/tsocks/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX tsocks-1.8_beta5-bsd.patch 932 SHA256 c49851ca7581684788945f0c5cca17536459975b966b65bccb4f0588fc85a42d SHA512 15e126ccc183f4217b4862bb0cb0d5da49c7895b1a51e00ff43fadb3e66cc9f9dc70208672f92c10da438fa4af17506a8dade9517b5eeae29fea171d04b90093 WHIRLPOOL e13fdc6fb62e8ae2b0d55f9869391a8a8127b78f26649e9c99e82b79b5f41328aa62319e738c7c3c0f4d3ee85a320d6e733f34d156ced9ebf26b61163ab0b3a2
+AUX tsocks-1.8_beta5-gentoo-r3.patch 5866 SHA256 5bc4ec52f9d473e50948a5136fd657a26906603e97f779786b76244f026d73ca SHA512 a0cd8e282d54b1238501622f9366fd9be5d3e344e482efcb71318a066e5ba944378370436b1a3c4a1441a3005612f2889b81706ba07cc4fc6ccc26e349908212 WHIRLPOOL 044db8cc414568512772afe99104f8d88768b676d07a6677827bab1f6755fcb1578ed453c7fd5cafad42d0845f2a90888a8dd0fc96abcc3905cec967b30d1b31
+DIST tsocks-1.8b5-tordns1-gentoo-r1.patch.gz 20060 SHA256 d49f0eede6cf59a2e911ddf3ec14e880626369e94037c9ad853cf530ce5971dd
+DIST tsocks-1.8b5-tordns1-gentoo-r2.patch.gz 20043 SHA256 0f7b7d916475529c975b1bee08b848c237664089d0c453d438f32eb2708ecd9a SHA512 d141ae2405de7d3f4620fca57cb6d968eb526b96022cf8ed6e715697643e9a39ef7cd17e8f31cfa832ffe74b78cecbddc51de9d8018d4446ae6ed9e5c5844b6a WHIRLPOOL d608a9a92772458de3478f019bacb6b789fe9f02255ade84e16f1e395fb0d721389c99a30556583b7e6fa9009bf06334dd1686f9722d2b2261680628bbe05845
+DIST tsocks-1.8beta5.tar.gz 83928 SHA256 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 SHA512 b41636ea6b77abf0d1e3cda7bbca4e7ee96f3cdb1843f3a2c530650931e5567f67921de67b28ba9bab0f51df39770a3f7fb458cf7ac78aad7aa861923df2c4a9 WHIRLPOOL 9b50f66d63c870a37111450d76ea027fab79ecc4f62be8d6fab380f9fbfa6d1573f8bad5afe284571de3ee557460454826967449518d7665a80f563a2cfe5151
+EBUILD tsocks-1.8_beta5-r5.ebuild 1831 SHA256 afde50f512ce37d403a83a82fd9dcbb46b0fb99e07291fdb66e4363833c3163a SHA512 c22d2bd78d7d0a10ee5eb8734183e69120a10d71ec0ead934d1630482e385809a68b5e5aaa7d0d1934644bbaf05f6e87ee64a0b558ae6f2728ecdfd2db799db1 WHIRLPOOL 53bf9b946e976c326124f0eaa325aaeb5b37b109c1833fceb2ec02be8ab44525d03157070a006a267b7a7e0cf51e395e08e19bd27db69b7312f11e83544bd214
+EBUILD tsocks-1.8_beta5-r6.ebuild 1855 SHA256 6991aea50dba89122ecb6265062b1a3d7bdd6674bb6bb689c61d7a2be274037f SHA512 a4af87487100c0c6178f4fa7c2d535c51598d1b53f2648cdd7232a6a4703328cc499155c601b427dfc6d0e10d05a112b169b902eb3dc28b69df72d98a775ce8c WHIRLPOOL 69473b8c3cf60459c3bada3b381fe5c1e84379ea5e5f6eda17ec7a8d80efd93dd4236f7d87ea5aac937aadea64749fab4a898a1078fe62c9561ccf9f92cc179f
+MISC ChangeLog 6979 SHA256 34a98843c578bf3491e74aee2d629354bae71ca00dec888c433614847b828e6e SHA512 4f1e8ac15b41d977374905264d524d596415ee4d214cd128c0dd5cbc081636171bcb1a525bf7e1fd85942ad56ad646c0da622dd3e7b33d5761781f851991f097 WHIRLPOOL 2a978b823bcc7cfb390729fa63a68c0b4b010d6a1424d9cf21e4e20293885a7ce8bb714d41a567803d13aad71379868d7af27a5e67085bbee4cc9fed27e9b058
+MISC metadata.xml 639 SHA256 f169d4d868162eb3e8c7f729b9cf3f705f316370f0074465a2f2431cb9910b30 SHA512 bb842e83602820694ec8648a3ad2591fa9f90ffa88d9be972cfcc1118172ce36dd9ea98090f126938390f6f9666142994c82f845c1eea1b75cbaeeb211b23fed WHIRLPOOL 06c8e41728064c058a6985ccf48fc2f47fb02da74a5989779656565cff43e81d2bcca1127d89a3cdd973700c0e1828e6488e568f50f5c13930bf1e5aa3a9e4b2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlStPQIACgkQCaWpQKGI+9SB1ACfbEfcquLn8zTXDRTB9+VZJOpk
+z/wAnjJjASyFXcEwX+iuLztofLmOZRFa
+=TLT9
+-----END PGP SIGNATURE-----

diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch
new file mode 100644
index 0000000..e003475
--- /dev/null
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch
@@ -0,0 +1,22 @@
+Index: tsocks-1.8/configure.in
+===================================================================
+--- tsocks-1.8.orig/configure.in
++++ tsocks-1.8/configure.in
+@@ -122,7 +122,7 @@ LIBS=
+ 
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -ldl:
+-AC_CHECK_LIB(dl, dlsym,,AC_MSG_ERROR("libdl is required"))
++AC_CHECK_FUNC([dlsym], [], [AC_CHECK_LIB(dl, dlsym,,AC_MSG_ERROR("libdl is required"))])
+ 
+ dnl If we're using gcc here define _GNU_SOURCE
+ AC_MSG_CHECKING("for RTLD_NEXT from dlfcn.h")
+@@ -312,7 +312,7 @@ AC_DEFINE_UNQUOTED(CLOSE_SIGNATURE, [${P
+ dnl Find the correct poll prototype on this machine 
+ AC_MSG_CHECKING(for correct poll prototype)
+ PROTO=
+-for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' 
++for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' 'struct pollfd ufds[[]], nfds_t nfds, int timeout'
+ do
+   if test "${PROTO}" = ""; then
+     AC_TRY_COMPILE([

diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch
new file mode 100644
index 0000000..1c9dd18
--- /dev/null
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch
@@ -0,0 +1,133 @@
+diff -Nru tsocks-1.8.orig/Makefile.in tsocks-1.8/Makefile.in
+--- tsocks-1.8.orig/Makefile.in	2002-03-16 11:12:40.000000000 +0100
++++ tsocks-1.8/Makefile.in	2009-06-20 13:56:56.000000000 +0200
+@@ -28,6 +28,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ INCLUDES = -I.
+ LIBS = @LIBS@
+ SPECIALLIBS = @SPECIALLIBS@
+@@ -41,16 +42,16 @@
+ all: ${TARGETS}
+ 
+ ${VALIDATECONF}: ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o
+-	${SHCC} ${CFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS}
++	${SHCC} ${LDFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS}
+ 
+ ${INSPECT}: ${INSPECT}.c ${COMMON}.o
+-	${SHCC} ${CFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} 
++	${SHCC} ${LDFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} 
+ 
+ ${SAVE}: ${SAVE}.c
+-	${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c
++	${SHCC} ${LDFLAGS} ${INCLUDES} -o ${SAVE} ${SAVE}.c
+ 
+ ${SHLIB}: ${OBJS} ${COMMON}.o ${PARSER}.o
+-	${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
++	${SHCC} ${LDFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
+ 	ln -sf ${SHLIB} ${LIB_NAME}.so
+ 
+ %.so: %.c
+diff -Nru tsocks-1.8.orig/tsocks tsocks-1.8/tsocks
+--- tsocks-1.8.orig/tsocks	2002-03-16 11:27:18.000000000 +0100
++++ tsocks-1.8/tsocks	2009-06-20 13:56:38.000000000 +0200
+@@ -46,14 +46,14 @@
+ 	on)
+ 		if [ -z "$LD_PRELOAD" ]
+ 			then
+-				export LD_PRELOAD="/usr/lib/libtsocks.so"
++				export LD_PRELOAD="/lib/libtsocks.so"
+ 			else
+-				echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
+-				export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
++				echo $LD_PRELOAD | grep -q "/lib/libtsocks\.so" || \
++				export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD"
+ 		fi
+ 	;;
+ 	off)
+-		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/lib\/libtsocks.so \?//'`
++		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libtsocks.so \?//'`
+ 		if [ -z "$LD_PRELOAD" ]
+ 			then
+ 				unset LD_PRELOAD
+@@ -68,10 +68,10 @@
+ 	*)
+ 		if [ -z "$LD_PRELOAD" ]
+ 		then
+-			export LD_PRELOAD="/usr/lib/libtsocks.so"
++			export LD_PRELOAD="/lib/libtsocks.so"
+ 		else
+-			echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
+-			export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
++			echo $LD_PRELOAD | grep -q "/lib/libtsocks\.so" || \
++			export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD"
+ 		fi
+ 
+ 		if [ $# = 0 ]
+diff -Nru tsocks-1.8.orig/tsocks.8 tsocks-1.8/tsocks.8
+--- tsocks-1.8.orig/tsocks.8	2002-03-16 11:20:51.000000000 +0100
++++ tsocks-1.8/tsocks.8	2009-06-20 13:56:38.000000000 +0200
+@@ -127,8 +127,8 @@
+ libtsocks in /etc/ld.so.preload. Please make sure you correctly enter the
+ full path to the library in this file if you do this. If you get it wrong,
+ you will be UNABLE TO DO ANYTHING with the machine and will have to boot
+-it with a rescue disk and remove the file (or try the saveme program, see
+-the INSTALL file for more info).  THIS IS A ***WARNING***, please be
++it with a rescue disk and remove the file (or try the tsocks-saveme program,
++simply unlinks /etc/ld.so.preload ). THIS IS A ***WARNING***, please be
+ careful. Also be sure the library is in the root filesystem as all hell
+ will break loose if the directory it is in is not available at boot time.
+ 
+diff -Nru tsocks-1.8.orig/tsocks.conf.5 tsocks-1.8/tsocks.conf.5
+--- tsocks-1.8.orig/tsocks.conf.5	2002-05-18 04:13:08.000000000 +0200
++++ tsocks-1.8/tsocks.conf.5	2009-06-20 13:56:38.000000000 +0200
+@@ -139,21 +139,20 @@
+ the version that server supports. 
+ 
+ .TP
+-validateconf
+-validateconf can be used to verify the configuration file. It checks the format
+-of the file and also the contents for errors. Having read the file it dumps 
+-the configuration to the screen in a formatted, readable manner. This can be 
+-extremely useful in debugging problems.
+-
+-validateconf can read a configuration file from a location other than the 
+-location specified at compile time with the -f <filename> command line 
+-option.
+-
+-Normally validateconf simply dumps the configuration read to the screen (in
+-a nicely readable format), however it also has a useful 'test' mode. When
+-passed a hostname/ip on the command line like -t <hostname/ip>, validateconf 
+-determines which of the SOCKS servers specified in the configuration file 
+-would be used by tsocks to access the specified host. 
++tsocks-validateconf
++tsocks-validateconf can be used to verify the configuration file. It checks
++the format of the file and also the contents for errors. Having read the file 
++it dumps the configuration to the screen in a formatted, readable manner.
++This can be extremely useful in debugging problems.
++
++tsocks-validateconf can read a configuration file from a location other than the 
++location specified at compile time with the -f <filename> command line option.
++
++Normally tsocks-validateconf simply dumps the configuration read to the screen 
++(in a nicely readable format), however it also has a useful 'test' mode. When
++passed a hostname/ip on the command line like -t <hostname/ip>, 
++tsocks-validateconf determines which of the SOCKS servers specified in the 
++configuration file would be used by tsocks to access the specified host. 
+ 
+ .SH SEE ALSO
+ tsocks(8)
+diff -Nru tsocks-1.8.orig/validateconf.c tsocks-1.8/validateconf.c
+--- tsocks-1.8.orig/validateconf.c	2002-02-07 11:49:59.000000000 +0100
++++ tsocks-1.8/validateconf.c	2009-06-20 13:56:38.000000000 +0200
+@@ -23,7 +23,7 @@
+ */
+ 
+ /* Global configuration variables */ 
+-char *progname = "validateconf";	      /* Name for error msgs      */
++char *progname = "tsocks-validateconf";	      /* Name for error msgs      */
+ 
+ /* Header Files */
+ #include <config.h>

diff --git a/net-proxy/tsocks/metadata.xml b/net-proxy/tsocks/metadata.xml
new file mode 100644
index 0000000..5b428c0
--- /dev/null
+++ b/net-proxy/tsocks/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+<longdescription>tsocks' role is to allow non SOCKS aware applications (e.g telnet, ssh, ftp etc) to use SOCKS 
+without any modification. It does this by intercepting the calls that applications make to establish network connections 
+and negotating them through a SOCKS server as necessary.</longdescription>
+<use>
+	<flag name='tordns'>
+		Apply tordns patch which allows transparent TORification of the DNS queries
+	</flag>
+</use>
+</pkgmetadata>

diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild
new file mode 100644
index 0000000..9c926e8
--- /dev/null
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/tsocks-1.8_beta5-r6.ebuild,v 1.1 2011/11/19 16:24:03 naota Exp $
+
+EAPI="2"
+
+inherit multilib eutils autotools toolchain-funcs
+
+DESCRIPTION="Transparent SOCKS v4 proxying library"
+HOMEPAGE="http://tsocks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz
+	tordns? ( http://dev.gentoo.org/~naota/patch/${PN}-${PV/_beta/b}-tordns1-gentoo-r2.patch.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="tordns"
+
+S="${WORKDIR}/${P%%_*}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo-r3.patch"
+	epatch "${FILESDIR}/${P}-bsd.patch"
+	use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r2.patch"
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	# NOTE: the docs say to install it into /lib. If you put it into
+	# /usr/lib and add it to /etc/ld.so.preload on many systems /usr isn't
+	# mounted in time :-( (Ben Lutgens) <lamer@gentoo.org>
+	econf \
+		--with-conf=/etc/socks/tsocks.conf \
+		--libdir=/$(get_libdir) || die "configure failed"
+}
+
+src_compile() {
+	# Fix QA notice lack of SONAME
+	emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*} || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	newbin validateconf tsocks-validateconf
+	newbin saveme tsocks-saveme
+	dobin inspectsocks
+	insinto /etc/socks
+	doins tsocks.conf.*.example
+	dodoc FAQ
+	use tordns && dodoc README*
+}
+
+pkg_postinst() {
+	einfo "Make sure you create /etc/socks/tsocks.conf from one of the examples in that directory"
+	einfo "The following executables have been renamed:"
+	einfo "    /usr/bin/saveme renamed to tsocks-saveme"
+	einfo "    /usr/bin/validateconf renamed to tsocks-validateconf"
+}

diff --git a/profiles/categories b/profiles/categories
index 8b938e5..ef0cb9c 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -23,6 +23,7 @@ net-irc
 net-libs
 net-misc
 net-print
+net-proxy
 sci-geosciences
 sci-visualization
 sys-apps