remove obsolete versions and files

Package-Manager: portage-2.1.13.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x3A051746

6 files changed, 32 insertions, 397 deletions

diff --git a/net-proxy/tsocks/ChangeLog b/net-proxy/tsocks/ChangeLog
index 2ac6b287da94..89b59db9798d 100644
--- a/net-proxy/tsocks/ChangeLog
+++ b/net-proxy/tsocks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/tsocks
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.39 2011/12/14 15:48:19 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.40 2013/10/12 14:49:24 dastergon Exp $
+
+  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
diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest
index 27f0a3930187..67675207e100 100644
--- a/net-proxy/tsocks/Manifest
+++ b/net-proxy/tsocks/Manifest
@@ -1,23 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX tsocks-1.8_beta5-bsd.patch 932 RMD160 d17f6927c4e18b25505139a9893c59afc39775aa SHA1 98b77ce698a8a9ad072f1c7275a3aeb8e2177f86 SHA256 c49851ca7581684788945f0c5cca17536459975b966b65bccb4f0588fc85a42d
-AUX tsocks-1.8_beta5-gentoo-r1.patch 5655 RMD160 8d4908a8a3ddd60493c45f62b8498046623ed915 SHA1 def7eb78180930cefb2e85d554dd416871014dd2 SHA256 678daeb7683a8ded19bf14c665271158f452a715c92d855dee47d78838723b2a
-AUX tsocks-1.8_beta5-gentoo-r2.patch 5879 RMD160 84ac84bd59b85dddc204d9e63e4ae43a278a6ef4 SHA1 64a99abc72242a6e931337c9ef59075d018c2e8b SHA256 0c77bba8e579dc05469c4c4c336fc728085944df1f7fc6ad0d05024f6836817f
-AUX tsocks-1.8_beta5-gentoo-r3.patch 5866 RMD160 2dffa4d10f82a2fd9adacebf987064d24f23aa42 SHA1 35ac9f759102cc7089b7b83757e2942e4d2d3c4a SHA256 5bc4ec52f9d473e50948a5136fd657a26906603e97f779786b76244f026d73ca
-DIST tsocks-1.8b5-tordns1-gentoo-r1.patch.gz 20060 RMD160 5c77013987262331c9285e9d53738f9f7a3ecf45 SHA1 df0474aedd7ae9639053ec11968b10a68b4f82ed SHA256 d49f0eede6cf59a2e911ddf3ec14e880626369e94037c9ad853cf530ce5971dd
-DIST tsocks-1.8b5-tordns1-gentoo-r2.patch.gz 20043 RMD160 366da3dcd51a4c575de160926eba57fec834c341 SHA1 a9f896705488a429f86bd16c807d923d658f0bde SHA256 0f7b7d916475529c975b1bee08b848c237664089d0c453d438f32eb2708ecd9a
-DIST tsocks-1.8beta5.tar.gz 83928 RMD160 12e3eeeafaf7f3be21dd8901da38d5890659b09e SHA1 489f88c5df999ba21b27cdaa7836d9426d062aec SHA256 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347
-EBUILD tsocks-1.8_beta5-r3.ebuild 1823 RMD160 8ebff6a9b5e53b87c0ab274383f8d9559041badf SHA1 1e117dd2832d40c8e731f43aa60ecd2f60991d2f SHA256 909734cdf53dea07375279cb53c7f19cce42ae5c7bb76e1b237421efe34998ae
-EBUILD tsocks-1.8_beta5-r4.ebuild 1829 RMD160 59e4408efdbc5959a9d0fa84d7c2aabc6b39ae31 SHA1 5769d1c864f394783997e4f6ee7cf1881abc7f37 SHA256 da386f9c42a802247e26724170838bf9a7cf4657ade4740975e46e10c28058ed
-EBUILD tsocks-1.8_beta5-r5.ebuild 1831 RMD160 d96eee3267761f3d9fbb6756efc2f8cb827239d7 SHA1 41412fb6b8ecbcb3f890a87d775ffce7baf4582d SHA256 afde50f512ce37d403a83a82fd9dcbb46b0fb99e07291fdb66e4363833c3163a
-EBUILD tsocks-1.8_beta5-r6.ebuild 1855 RMD160 3ee47c4f06041cc9f38c6c5d8a37ec5ed8eed6e6 SHA1 b7ec91afe503abec60e5969097ef481b58d85844 SHA256 6991aea50dba89122ecb6265062b1a3d7bdd6674bb6bb689c61d7a2be274037f
-MISC ChangeLog 6568 RMD160 52f4f1e31d1a5c89915d6a92d0e3912cece31b4c SHA1 7b9d1844c5faa576085d84a1c453971a58097dcb SHA256 b32152bab73fce3b1cec3cf6ff4dd4592a41f1b98961e55fd7aebb3904d4654e
-MISC metadata.xml 593 RMD160 31a381655437e3f21b9d4bd0982356eac43b79bf SHA1 8bd4c29f69a1ca1456fbb99523e46356eca2454c SHA256 08fa435f16b6ec09e7cfb979843b309354230db8986894227436699eb588a2d0
+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 6809 SHA256 7d19d2b5375e9fe869d5e85874bf5387f4ed1496281b14e4209e2e4edea1e399 SHA512 32cb14e843875270562b36498e3f24d8041a959ba3dd535804361a24f3d51136fbeced637db625c716a5f10ee6ec59ced84e246d43e185de58b88b6b5e78a2b6 WHIRLPOOL a34654dff9fed3c349c010f604d120293375234fad8626b667f8f20eb27fcd23d748a5fa7c8a0e4ab5728ec11b35775a1f65d41099c4b58568ecdab5561c72c3
+MISC metadata.xml 593 SHA256 08fa435f16b6ec09e7cfb979843b309354230db8986894227436699eb588a2d0 SHA512 d28389ca04e9203b87880b107b4b61b2fed54b1b998d3c219d00b93ef90166c3bfc1a37502ef84e870442becbd8b9f05afdb3dd2ec9a8f143e67db3783b19db9 WHIRLPOOL 0aca8c8c784321e1c834c1d74fbb5592ce76fbf808453a0a47a6a6f9597a99a442650c68d4099475a6ad90c95fa764e05f641a02f2ff868527346ff194c305b4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEARECAAYFAk7oxUkACgkQVWmRsqeSphM01ACdGyEnXxQfXy2JkHv3aHkUGVOX
-f8QAnjOxq+/aSFrJMH7C7yjwJ3dVsBej
-=Epwl
+iQIcBAEBCAAGBQJSWWJ0AAoJEKMbvrI6BRdGQbMQAMPWhv2+zbidSKTqC/JlJxrN
+jzHNWu2OOp7ldBdbL+BeO9MStltjHg2FO0c6DlohUytbFD5bSejHxbJ2daw0aUPo
+h144hv6UkLuGqqd8BBBdL0TWyBUo4YkTdibYgxAAXiFqvT6egZpSmVNmNpxOcYA+
+kP60lZkxqjLWKeslRgwhuZ+3eckkGYWGhcTES77EjUCourv0EMbpB4zjxy0kgQ4L
+iNKqn1/la3bwg9G+6KamP11KwBa6+VdyWhwLfcRZY+kt6JcoqVJ0jI93cfDwqMEn
+ejkjsrmMWI703VhDhsSxhZSiIUcfG4U1psfl0t2mMdaoy+Trf64+GqV3XIrCZWeI
+HPB1PieXT3C+eD3xfIFuvjtGM5+ltKjKx2xbe6R1yOf4D6hI8xAVGjyktnSTyj26
+oByp+a59iKuUUOkcgnSeqFmY16rs0fYaigWFMQaC+cSJpDB9khAitxY74TAJU6M0
+8v5M6x66M86lZRx/wAuOUJJLz5WaBMrYeorDcl8PfE6hUYcuWqr55HqUSrdPh3wo
+cz8hewZ5sRDXwatqGzIMNDHOqezokCWoLKhgGnbvOCvew4ewG4gj37iEMNWJ5TuH
+75+FZPYWEfCNZNj5UlDULEeMYa9FrHQIj/9/l9ueI8LlsymKCRFquX2dukShMzal
+b1lGYP6Z/jjucRRKDcd8
+=QWJz
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r1.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r1.patch
deleted file mode 100644
index 21065ad94cec..000000000000
--- a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r1.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -Nru tsocks-1.8.orig/Makefile.in tsocks-1.8/Makefile.in
---- tsocks-1.8.orig/Makefile.in	2002-03-16 12:12:40.000000000 +0200
-+++ tsocks-1.8/Makefile.in	2008-02-13 18:06:05.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} -static -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 12:27:18.000000000 +0200
-+++ tsocks-1.8/tsocks	2008-02-13 18:05:11.000000000 +0200
-@@ -46,10 +46,10 @@
- 	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)
-@@ -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 12:20:51.000000000 +0200
-+++ tsocks-1.8/tsocks.8	2008-02-13 18:06:05.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 05:13:08.000000000 +0300
-+++ tsocks-1.8/tsocks.conf.5	2008-02-13 18:06:05.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 12:49:59.000000000 +0200
-+++ tsocks-1.8/validateconf.c	2008-02-13 18:06:05.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/files/tsocks-1.8_beta5-gentoo-r2.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r2.patch
deleted file mode 100644
index adb1206367a7..000000000000
--- a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r2.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -Naur tsocks-1.8.orig/Makefile.in tsocks-1.8/Makefile.in
---- tsocks-1.8.orig/Makefile.in	2002-03-16 12:12:40.000000000 +0200
-+++ tsocks-1.8/Makefile.in	2009-01-22 10:30:17.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} -static -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 -Naur tsocks-1.8.orig/tsocks tsocks-1.8/tsocks
---- tsocks-1.8.orig/tsocks	2002-03-16 12:27:18.000000000 +0200
-+++ tsocks-1.8/tsocks	2009-01-22 10:30:34.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 -Naur tsocks-1.8.orig/tsocks.8 tsocks-1.8/tsocks.8
---- tsocks-1.8.orig/tsocks.8	2002-03-16 12:20:51.000000000 +0200
-+++ tsocks-1.8/tsocks.8	2009-01-22 10:30:17.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 -Naur tsocks-1.8.orig/tsocks.conf.5 tsocks-1.8/tsocks.conf.5
---- tsocks-1.8.orig/tsocks.conf.5	2002-05-18 05:13:08.000000000 +0300
-+++ tsocks-1.8/tsocks.conf.5	2009-01-22 10:30:17.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 -Naur tsocks-1.8.orig/validateconf.c tsocks-1.8/validateconf.c
---- tsocks-1.8.orig/validateconf.c	2002-02-07 12:49:59.000000000 +0200
-+++ tsocks-1.8/validateconf.c	2009-01-22 10:30:17.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/tsocks-1.8_beta5-r3.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r3.ebuild
deleted file mode 100644
index 3998cbf32384..000000000000
--- a/net-proxy/tsocks/tsocks-1.8_beta5-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 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-r3.ebuild,v 1.7 2010/04/17 16:59:10 armin76 Exp $
-
-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? ( mirror://gentoo/${PN}-${PV/_beta/b}-tordns1-gentoo-r1.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="tordns"
-
-S="${WORKDIR}/${P%%_*}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo-r1.patch"
-	epatch "${FILESDIR}/${P}-bsd.patch"
-	use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r1.patch"
-	eautoconf
-}
-
-src_compile() {
-	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"
-	# 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/net-proxy/tsocks/tsocks-1.8_beta5-r4.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r4.ebuild
deleted file mode 100644
index 32fee6833594..000000000000
--- a/net-proxy/tsocks/tsocks-1.8_beta5-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 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-r4.ebuild,v 1.2 2010/04/17 16:59:10 armin76 Exp $
-
-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? ( mirror://gentoo/${PN}-${PV/_beta/b}-tordns1-gentoo-r1.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="tordns"
-
-S="${WORKDIR}/${P%%_*}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo-r2.patch"
-	epatch "${FILESDIR}/${P}-bsd.patch"
-	use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r1.patch"
-	eautoconf
-}
-
-src_compile() {
-	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"
-	# 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"
-}