old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

10 files changed, 15 insertions, 838 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index f14227f56dcf..99d580f51909 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.79 2014/09/08 11:44:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.80 2014/09/08 11:53:42 ssuominen Exp $
+
+  08 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> -dante-1.3.2.ebuild,
+  -dante-1.4.0-r1.ebuild, -dante-1.4.0.ebuild, -dante-1.4.0_pre1-r1.ebuild,
+  -dante-1.4.0_pre1.ebuild, -files/dante-1.4.0_pre1-osdep-format-macro.patch,
+  -files/sockd.conf, -files/socks.conf:
+  old
 
 *dante-1.4.1 (08 Sep 2014)
 
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index d4f905b4b076..f50eee488be8 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -9,38 +9,29 @@ AUX dante-1.3.2-sockd-init 1757 SHA256 da98cb36ba0cad40273abc1d6d8717299f0c031ab
 AUX dante-1.4.0-cflags.patch 1182 SHA256 cacc63d0ef7d34856f38d1cf5aae58e2c5ec5884d3bfc9798737370ea9368dcb SHA512 436508a1f440b5bc7bf9ef2a2fdb32023c4fb7066ec0f132a90fd19de1d80d44f94dca0ae49067f4c4b565eaededf99bed44b0d7807e4698a9b0264a7be47775 WHIRLPOOL 559c5275e9a5528b3300c0c797f53f93cf547b35a4ee04cbb3a70d4ecb2485979880940bef5882ff240ecb778a457ee4c211b81961a9ea23886b444f46691673
 AUX dante-1.4.0-osdep-format-macro.patch 517 SHA256 b4f2fc60661aa2bff934c2f49ec156359dbccb92a3c499c703f4c98283a95705 SHA512 db3a0670562b563aecf182e70fea4df721097aa66d32d383c3b999dd2c6c01b8294491392efbe51ad82a162e7f446f4196b33a6d92f22c942777f0d5d52bdd86 WHIRLPOOL 453c4e9727301adbce5ad07403863c33e6f87230fc2cb7875b2098284384ba82532709b1b59640425983938d3ba1751702b3c072cb31cabbe137e44a466d3838
 AUX dante-1.4.0-socksify.patch 1203 SHA256 4ee5e22067ef6b3cd5bfaf1774bb19940e1ae8dda8dc8cce198789fc871ba7ba SHA512 ba118ede7b87b8c4c0973053827515762d1bd0aff846dcb17696d930228eb6e6d2fe199f47ff739420420a6d67a72187fe9d864ac74d4653f40a658278675a5a WHIRLPOOL edaa3c7a3c0971cca033df18949568c0bb0f4a8cd37d3f9fae6f8a5f2cb99619954a8eadddc38fdc2b10ca1252547d5f423aca89c93c22826369e3da36848e44
-AUX dante-1.4.0_pre1-osdep-format-macro.patch 479 SHA256 76946857b980acfac393a4bf4ece14e5f65c1f6f67b618b3d075b64b7cf964fb SHA512 09e5c1a820eccbdc7846d0cb71e8a6984715ad996af476a33265090e4252c2f41f4bdb231f0cf3fdb825b7099a5fc7900ce57495632bd14b3b89f00b28f15ce4 WHIRLPOOL b0fd457c25efd61b1917613174c9f8dc33fd8cc7d579ec2e07f89fad72054b23980363a82912695164d2f6b1797fb1d031aa457e8222714e7d7d68779c6d290b
 AUX dante-sockd-conf 463 SHA256 b22c8261148fcb96cfd8942baa85633a790826a444920f7d87fc23d2dcf18a74 SHA512 5987980cb74ac69a8eba383eeadeef9d20bfe2317873eed70bec844509167b49dc8408ba3911cea7ef71900f559dd524b4c7099a93b8a777b513de750c032621 WHIRLPOOL ae2484a8b4e63a1c5d96cd04a88fb00b08be024204d35d0a172c0c9c2b55d663be6ef80d122156c63f961cfe61fe2cc11eee83d9344a2f719546ed5e72ddf448
 AUX dante-sockd-init 1812 SHA256 5956be225fd9e90c96127721b04ead92c201fd7d674ccfc7373b2b9de12c496f SHA512 00f37c35b84489260badd78550a6ffa48e2e5430ca63863457d2ab9b79e5c0efb3807d9ba4a62dce54b580a17c31f1e0965fac643c5befda0486042c6575ea4d WHIRLPOOL 261bef0b8392787addec1356ca30e869710e63698dbbbcb6aeb63cbfea29a0b801cd8fdfd7914201c2eeb1c2e3abf1e89ff0a6e386c0cfaa222d907dad8e90d4
 AUX dante-sockd.service 167 SHA256 81e3dd10ca13fd022905147000661598a3fd6183998a2f7068e66af3c4c7cb53 SHA512 0acc71e1ab429d38c61db45dc5eb3c9ea58d822eefc83912ae9d569486eb281184f07183a40754eaf6e4f6f67c46a3683629734d6333767623d702f98bc720de WHIRLPOOL 6b6258f43872a8344cfd4b418846092d0f63e6de9f769793f721b027fd69c7c7c84d3839d60dd9f4a67a7c6994fcb47a569fbf10189cb08f7f95715224fd57e4
-AUX sockd.conf 7031 SHA256 3ea0e08ee7e5b018d1df1b83af92fb6051fb44a486e0822e28775d104bfcfee7 SHA512 a443ea203aefd3ed51b10c7140dde2fc64dfa31c2fb08539a45353ab77daea42c63b160c276f0ef9e4c683032260f93228af64db83ade7476ff6d353b63dec19 WHIRLPOOL 130a0a017071129061d6ca6987448d51c515785f3802e18b99f7df0150e41d8e03b2f2d88dea21769d5ec0d544d9d82eaccd813c86a1360881598a453f7e6e7f
 AUX sockd.conf-with-libwrap.patch 870 SHA256 ba4bb30ad5933b890d1b09c6468708f37abf012de3f8696482d1c46c5c1f2978 SHA512 087cec0bcdfb989e6cbcb0c7006ae014b7e94fe268f68e1e6516dbb034f9e7e64523ea7edab669433eb16faeb4f6232a9794c401acd2eacce08e1b560469315f WHIRLPOOL edeb4b19ff5d39cd889777bc417b36d3d6d1ab7eaf4e926a239968253260bdb502b7f3b68354556f4ac33b37cd9e18af5dbbaf3c11cac570a7dae3f01b1f5367
 AUX sockd.conf-with-pam.patch 295 SHA256 e67499de8b976e17a9c7c0556e999e03f4bf06e8e57b78ba6dd41a128de0b719 SHA512 78728605362360650e6a20869744fc941782b75d149c0835542faaad931104cb32dda56de77a7b4f9a4fa683053139c551bcf77607a047fb1be68b6da9388630 WHIRLPOOL aa68139d3766446d43987eab1d4f2d9b22deb0e0eb3acbfcd9adb198f359b1c039eb71f07359362e9d99fe64f5194103c8fa77b603d8b7aac882926dea93d271
-AUX socks.conf 4185 SHA256 3dc8c06ca5a8309015c495ea50f62097ee6a605ac262665ffa5f19e0e8a5a9d8 SHA512 d15ea77e20ad750f10285a42c9c6305cbed48313dea205139d8cf59fda4a4640bdd5c5bd2c295b32e0015b774d463f9ad34fa5a22fb188ae921dba1a533553eb WHIRLPOOL e7c39b3f9711f2a6f32d3a7d7c44bc0105d1dc236ae2b51be7257a38dc15f211a38a44c0869fbee4c381dacf946da88909b85b91a7628aeaadab737f2169d480
 DIST dante-1.1.19.tar.gz 895713 SHA256 b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936 SHA512 765e0042f323d9cb20e42642b30856132737974cd756c303d544c1a400dde5e86b6528d4233afdcf73f1baf9b3e0efacda8aabe5c04afa50495edf6e8a248b83 WHIRLPOOL c83553cbf58c6ea7651a7bfad408460c38d3cda6342825d46e0c1311a665f5422afeb00c5f936262172673764323a96377545bcd5815356dbcad3ba6c0f54f72
 DIST dante-1.3.2.tar.gz 949049 SHA256 6b736f32ec58b899c24cf14be02491a0631a778e385314370d5dea4baf482efb SHA512 ee6214ffcb48904cbb361b275e78af5d4a5e0281a3fab6eb5a6913219f4cfebda2d2a7509a88c561e315f9061102c954339ad495cdecf2125e266f85d7e49ca3 WHIRLPOOL e98d31f0bf725d3961582c540cb4180535e1abfdc3138b04663e478dd228e7e642103fd707fa59b904fce8ccd7762ff975fa4310f82669975a042e4bbcf4f8b0
-DIST dante-1.4.0-pre1.tar.gz 1021746 SHA256 57f450bbb428648bdc9c096166a0a26eb8f8fea0800945976b4370eae1f387df SHA512 d76e1433bdaf5a177b1b596aafd14978a723fa753809df5da263f978b18c70abb1775b28d86f3e134ef77d23e4c178205a471e1570b3ffc362447f0380dde7bb WHIRLPOOL 267c944b7154bdd90358e80807d9a7478d6bcc16289dbfdd8626ebe0bc9950d69e141a6b5d6941677a17b30c790b8a624b2f47f1bcff1f55cac3d6831af25984
 DIST dante-1.4.0.tar.gz 1253458 SHA256 55d448f2d523e69b5637ef12c05556f39201a2c397b4671a2aaaa914ba65684b SHA512 978a70eb789dd2d00a9ac4a7671d13450f9ac96344ae41382c38de7a12e98c2e24159c2e140c95caff0cc9119f7cf409a8716130b34957020706a17c0f96de38 WHIRLPOOL 72e03fe8dabb71d25b34600db4e59dbbc2dfacc32ada26c9931bf33fc0050e7bd506182658517d7653027dbc4cc01e27dd1294fafef7dc3589135c16efa92d96
 DIST dante-1.4.1.tar.gz 1284288 SHA256 b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e WHIRLPOOL ab59762ac2f429cb32afd98b396e432f9c62260dd69e8f96d384491cd8620f6530537dcaaf4c39270d0d2448ef06e85cd9018dcc93bb2366e5e8d6606be57b23
 EBUILD dante-1.1.19-r4.ebuild 2390 SHA256 1d7bdb749a5438caa8d310a1b49f0487c003fd6e536fb40b693e740e4ae7eeed SHA512 d13ecf3caaed975873518f0edf073d7b5169c4357c6424af77b0b6403ffa94fc8042158a5020a1a958eb4fe4e7a1a70209801f03a042ed9d3a3993bf6ded2898 WHIRLPOOL 5b39a50139fcdcb8feb94cbe2e2a8b0fe802299abef06ee21a56049d9061a0ea922de6182d1fbdb2cbf3b807539f95d841f8da921f01945c0f1929e97bfb6c0b
 EBUILD dante-1.3.2-r1.ebuild 2208 SHA256 b49ea55b9931e114c715263fdf01ce16ca6a1a7d74ddbf158a65f908cf42e9b8 SHA512 0f0e9aba173eefba1a4bd157efbc0b60a0ffbb7665b9875b315267af44c92c6970c04724c5b70b45c653d106ac14c79d83c92c2ee30d1d4fba7591613f75d241 WHIRLPOOL 062500ccf1bf9fc522f135489425ff9c228d4515e6da9745c3f7e9f89de2d4daf6b27258ca852c51c9a94ee92527c194f965b6ea94d94216a91554646ea15e99
-EBUILD dante-1.3.2.ebuild 2206 SHA256 a2d6afa8cf11f3f7beda7ac789e4be0b81e785f1ef6b693b61abcc35ed8ad71c SHA512 900dc2c3d4ae6d4d59ce0e8cc45bc9c39a4dbc805bf250b8f25e55eb8e984100d6a040732af01ea615534b4c751be9c5f894ee18092d4d856f397d0fb0a92815 WHIRLPOOL 90c9d56507b934668de2f21a29f125dc5ed985b27a4700f6f5618d4314b8673b352d160c2e6e4cefcd1a22bc0cdd7ebc858cd8cf0693eb574294cc1b00617128
-EBUILD dante-1.4.0-r1.ebuild 2673 SHA256 72b5f5a09d8aa37f9a3d6cd052b3b5694527778fa88e03295806715ed389b409 SHA512 0e6c77902cc59d53d97731a5181a30958f341bbc74d21b591a59bcf0a643df5a4d5d7ddb98d92951de891a5b3d64d03124c3b707bc89b14f673f21ac2b1a7600 WHIRLPOOL 5a97b48ccf0d95a76456e8395ce116ce5f7e259ee2dda0cf0b06b407bcb7c476d17e6138ea10b64482e4afaadd5eb2dff4004f407ab2240db31158b286061a2e
 EBUILD dante-1.4.0-r2.ebuild 2705 SHA256 64f45bbca0da085402b4640764800c6da8b19e2af6b1495457fa98dce062090e SHA512 4a809f910f4f0befbae0a9f6192ff3e62185c8efb8b88ea95126ff0fb210e25ac795038177afb5fa48cfeee07f5933aeee6ca57f727c72bfeb313b8a17bf6ebd WHIRLPOOL 10c492348ef1762c2aa8872b50b590dcc1242a80ca845d9817ecccd83582320af64ae5351491464465dc5786b5216508f41d7031729107ce120e22738d5efaaf
-EBUILD dante-1.4.0.ebuild 2620 SHA256 63c1726d39830347f472857deb2fa2d57e4b53a0f3c1eb9d8e185f2ff4355486 SHA512 ed970158ab70acc120d19e064afc2d4330b7c35106c1b5bea8d2a7dcff2851802d437c8da5727fd6c3529eacdccaac1472575ad02385fd71f0edcb6ba5117354 WHIRLPOOL 17bf96cc1ca58a329ba25fc5e8181e31bed9ba783f5c8b4331b4747f86f7aa0648bcf94c9a18656996748350dc25e2eb1ab9b78eb8fbdd9a316a7e99ea29c374
-EBUILD dante-1.4.0_pre1-r1.ebuild 2277 SHA256 3824190c643244fc7ef27fdcdd965eb7e5a7d210ce7f2a9d9c14925d0efe8354 SHA512 90a3bc74ed93191494d4d9a0e3506003970083b4baebe35e8b71aba4651baa763514a00b29b260178604dcf43d024fbf8e4a81ffbefb70b11ae6e05dcb4e906b WHIRLPOOL 3c856829755fd3e0949e979a3129d57cc8c5b5d5d9f66fbfc19ae307bc77beee318c829c754735c15df852870cde10f72df1c1635b949e3fb85af17316274b61
-EBUILD dante-1.4.0_pre1.ebuild 2268 SHA256 41feb54e177142e8305fab8f6e2dcdf3397eefc86b12b23ffb35f2e5453ec364 SHA512 08f6bd423d644430ea19e0563738ba932ec48d996daa1a54cbc6bf5ed000054b6779e42e19e95f84266da98dd1ea8677e464807ed90c4da7457bd8453537e519 WHIRLPOOL ac6793acd2b41ccf4dc64ff70a947dfe830844aa48f57b99bae4e45a0c7a88b36c9532d93a209b9e66ace394185316b664037140b5c3bce4a9e0dc8e5dc697fb
 EBUILD dante-1.4.1.ebuild 2667 SHA256 93d5cb61fe06e927b0c77236c6807996b5eb2eae007db49746c8399b724581dd SHA512 ce8b75a25c2c9b662aa49b3fc299db562c5280ac39c947b861dfbf06f3498d87cc2777ee25baa4d6d4c445792dcf2afd4966d70fa8ca95b34ea0585530f70693 WHIRLPOOL e989624038c4c9c9e85d8d601843e33bc609cfbcddea011c1986e7dd313db2d2152a8f331a99453243c1d1ec453f9c33aaf77462fc4addc73a444e2637660808
-MISC ChangeLog 19111 SHA256 c37b9df4dc07415e03bd99fc5d38070f9f3c9e98017016f55a54232e2e70185d SHA512 6496bf489f90a239912386ffa73d93cac37f4d890c3f56eb49805abdf767723e38fdb1bcb6ba916d9b5921431716e3c85a9f7745ea30e9d95ca40f616dfe242a WHIRLPOOL 413fc92b956059885114dd1b46845575cc7167d319eccbe4bcd3085140b1a946083d8d66bc18390bf24d453d4c0a30d81ee620d09ec01a7471a29e476ce26ff6
+MISC ChangeLog 19387 SHA256 a187ad64397431499b2888cd599840c6be7bc2ad878084379048598dec0f047c SHA512 b4e57435867b7f9c74701a7d0d1349b9b650264c662541e76aee4e2820793bd7be71592cbef57864b3e7ab87b949a06e829bf0079a432f77c39d84cd1a37b223 WHIRLPOOL 39a35138207c434688f9ab5cca10ed5f728435e124528941a92753140dba4c4ba9b3dc7f7809b5c5b7cef619a69b2d4a18e3e3734110f1b98880d4604bc9e04a
 MISC metadata.xml 246 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add SHA512 da5edb1cbf3b7e72b1bf22120bcc2efcc794e1e2f032e57426286de9817dba3ef39d95313dbee4cba51c0198f8b4297ac8f1d412335ee00d32e470799d05b7c4 WHIRLPOOL f5a9fd6f048d1732243da133861886c7a8ff3bd024ca831c98496d3150441512929c86bb263a8d89ff96ee5720dcc06c423227cdcc840a9062d9f8bcaf7197e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUDZXrAAoJEEdUh39IaPFNRxgH/2OWmhWtZmmp6moS7PsoMGmd
-gnUtj47PGchPFpPjVMlkQrhRkr4s0jd00I9T2EipABr0mEGJHnukqYbhRJzDYtWP
-cYfNbdkSN0WbyqX6MD8in+gry0KiQQX5iXt1EGa+r95mcJe7RVA2YA2rHb8lNZ2X
-KCHSJBgnVsUUSvCd1/LC/LKo15EgeZNcsJV9j158dbMiokhibn9V+Jdegwf40Qt8
-+pmKEmXszRf2dT20m+Nlnz3Ro/qTL/1z/Rb0uCo9ULtUU/sIJclBdkjz49Yv7sBm
-+lQ0fG1JOHcAAAqnoWsyszRSvFCGuW8ZBKMiw8dhzE/hR/8fnF+mfu7GTxMF19U=
-=MS5E
+iQEcBAEBCAAGBQJUDZgBAAoJEEdUh39IaPFNHUUH/05ygjIEM3c81ht7dGYLu3cF
+AvPQUXPiHYX9PFejs4xwl6NEd0ygmDHOc21B93wFvgYzRZLMdgsFS5j7U3pTu8bd
+YgEXKK+tb/Ip5d/AX31ARDr2wHzujvD2fd6DD9hsZ6uWUqLPwmQKp4Vvtav2fxzh
+s+qboBgSPiANF7h3g/Z5P9UUZ6NpRJ/wthvrrBjAgCOhxhYncg5YPR0HKV8viosB
+D3yD5/b0iFqjCHPPmL+c+Yg8RIpm6Gs3WerC6Jcjl6RC0Q5j8zq2E1kqfvRayJOp
+nsvIOdgHZfJycWKM4sg3XHmny2hkMZ5EWwTVo34lx3LxsAAubUF8usGpBgFU1iE=
+=yidB
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dante/dante-1.3.2.ebuild b/net-proxy/dante/dante-1.3.2.ebuild
deleted file mode 100644
index cd1b663270f0..000000000000
--- a/net-proxy/dante/dante-1.3.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.3.2.ebuild,v 1.7 2014/01/08 06:24:08 vapier Exp $
-
-EAPI="4"
-
-inherit autotools eutils user
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="http://www.inet.no/dante/"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug kerberos pam selinux static-libs tcpd"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-dante )
-	tcpd? ( sys-apps/tcp-wrappers )
-	userland_GNU? ( virtual/shadow )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.3.0-socksify.patch \
-		"${FILESDIR}"/${PN}-1.3.1-flags.patch
-
-	sed -i \
-		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
-		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
-		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
-		|| die
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
-		--with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
-		--without-upnp \
-		$(use_enable debug) \
-		$(use_with kerberos gssapi) \
-		$(use_with pam) \
-		$(use_enable static-libs static) \
-		$(use_enable tcpd libwrap)
-}
-
-src_install() {
-	default
-
-	# default configuration files
-	insinto /etc/socks
-	doins "${FILESDIR}"/sock?.conf
-	pushd "${ED}/etc/socks" > /dev/null
-	use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
-	use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
-	popd > /dev/null
-
-	# init script
-	newinitd "${FILESDIR}/dante-sockd-init" dante-sockd
-	newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
-
-	# example configuration files
-	docinto examples
-	dodoc example/*.conf
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
-}
-
-pkg_postinst() {
-	enewuser sockd -1 -1 /etc/socks daemon
-}
diff --git a/net-proxy/dante/dante-1.4.0-r1.ebuild b/net-proxy/dante/dante-1.4.0-r1.ebuild
deleted file mode 100644
index 75d19b181236..000000000000
--- a/net-proxy/dante/dante-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0-r1.ebuild,v 1.7 2014/07/13 09:58:21 ago Exp $
-
-EAPI="5"
-
-inherit autotools eutils systemd user
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="http://www.inet.no/dante/"
-MY_P="${P/_/-}"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug kerberos pam selinux static-libs tcpd upnp"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-dante )
-	tcpd? ( sys-apps/tcp-wrappers )
-	userland_GNU? ( virtual/shadow )
-	upnp? ( net-libs/miniupnpc )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch	\
-		"${FILESDIR}"/${PN}-1.4.0-socksify.patch \
-		"${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch \
-		"${FILESDIR}"/${PN}-1.4.0-cflags.patch
-
-	sed -i \
-		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
-		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
-		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
-		|| die
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# hardcoded the libc name otherwise the scan on a amd64 multilib system
-	# ends up finding /usr/lib32/libc.so.5. That cascades and causes the
-	# preload/libdsocks to not be built.
-	econf \
-		--with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
-		--with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
-		--enable-preload \
-		--enable-clientdl \
-		--enable-serverdl \
-		--with-libc=libc.so.6 \
-		$(use_enable debug) \
-		$(use_with kerberos gssapi) \
-		$(use_with pam) \
-		$(use_with upnp) \
-		$(use_enable static-libs static) \
-		$(use_enable tcpd libwrap)
-}
-
-src_install() {
-	default
-
-	# default configuration files
-	insinto /etc/socks
-	doins "${FILESDIR}"/sock?.conf
-	pushd "${ED}/etc/socks" > /dev/null
-	use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
-	use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
-	popd > /dev/null
-
-	# init script
-	newinitd "${FILESDIR}/${PN}-1.3.2-sockd-init" dante-sockd
-	newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
-
-	systemd_dounit "${FILESDIR}/dante-sockd.service"
-
-	# example configuration files
-	docinto examples
-	dodoc example/*.conf
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
-}
-
-pkg_postinst() {
-	enewuser sockd -1 -1 /etc/socks daemon
-}
diff --git a/net-proxy/dante/dante-1.4.0.ebuild b/net-proxy/dante/dante-1.4.0.ebuild
deleted file mode 100644
index af067c5b203f..000000000000
--- a/net-proxy/dante/dante-1.4.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0.ebuild,v 1.2 2014/01/08 06:24:08 vapier Exp $
-
-EAPI="5"
-
-inherit autotools eutils user
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="http://www.inet.no/dante/"
-MY_P="${P/_/-}"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug kerberos pam selinux static-libs tcpd upnp"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-dante )
-	tcpd? ( sys-apps/tcp-wrappers )
-	userland_GNU? ( virtual/shadow )
-	upnp? ( net-libs/miniupnpc )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch	\
-		"${FILESDIR}"/${PN}-1.4.0-socksify.patch \
-		"${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch \
-		"${FILESDIR}"/${PN}-1.4.0-cflags.patch
-
-	sed -i \
-		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
-		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
-		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
-		|| die
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# hardcoded the libc name otherwise the scan on a amd64 multilib system
-	# ends up finding /usr/lib32/libc.so.5. That cascades and causes the
-	# preload/libdsocks to not be built.
-	econf \
-		--with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
-		--with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
-		--enable-preload \
-		--enable-clientdl \
-		--enable-serverdl \
-		--with-libc=libc.so.6 \
-		$(use_enable debug) \
-		$(use_with kerberos gssapi) \
-		$(use_with pam) \
-		$(use_with upnp) \
-		$(use_enable static-libs static) \
-		$(use_enable tcpd libwrap)
-}
-
-src_install() {
-	default
-
-	# default configuration files
-	insinto /etc/socks
-	doins "${FILESDIR}"/sock?.conf
-	pushd "${ED}/etc/socks" > /dev/null
-	use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
-	use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
-	popd > /dev/null
-
-	# init script
-	newinitd "${FILESDIR}/${PN}-1.3.2-sockd-init" dante-sockd
-	newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
-
-	# example configuration files
-	docinto examples
-	dodoc example/*.conf
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
-}
-
-pkg_postinst() {
-	enewuser sockd -1 -1 /etc/socks daemon
-}
diff --git a/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild b/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild
deleted file mode 100644
index c502e26b6f93..000000000000
--- a/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild,v 1.4 2014/01/08 06:24:08 vapier Exp $
-
-EAPI="5"
-
-inherit autotools eutils user
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="http://www.inet.no/dante/"
-MY_P="${P/_/-}"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug kerberos pam selinux static-libs tcpd"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-dante )
-	tcpd? ( sys-apps/tcp-wrappers )
-	userland_GNU? ( virtual/shadow )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch	"${FILESDIR}"/${PN}-1.3.0-socksify.patch \
-		"${FILESDIR}"/${PN}-1.4.0_pre1-osdep-format-macro.patch
-
-	sed -i \
-		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
-		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
-		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
-		|| die
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
-		--with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
-		--without-upnp \
-		$(use_enable debug) \
-		$(use_with kerberos gssapi) \
-		$(use_with pam) \
-		$(use_enable static-libs static) \
-		$(use_enable tcpd libwrap)
-}
-
-src_install() {
-	default
-
-	# default configuration files
-	insinto /etc/socks
-	doins "${FILESDIR}"/sock?.conf
-	pushd "${ED}/etc/socks" > /dev/null
-	use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
-	use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
-	popd > /dev/null
-
-	# init script
-	newinitd "${FILESDIR}/${PN}-1.3.2-sockd-init" dante-sockd
-	newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
-
-	# example configuration files
-	docinto examples
-	dodoc example/*.conf
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
-}
-
-pkg_postinst() {
-	enewuser sockd -1 -1 /etc/socks daemon
-}
diff --git a/net-proxy/dante/dante-1.4.0_pre1.ebuild b/net-proxy/dante/dante-1.4.0_pre1.ebuild
deleted file mode 100644
index 0d5c2926c5a6..000000000000
--- a/net-proxy/dante/dante-1.4.0_pre1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0_pre1.ebuild,v 1.6 2014/01/08 06:24:08 vapier Exp $
-
-EAPI="5"
-
-inherit autotools eutils user
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="http://www.inet.no/dante/"
-MY_P="${P/_/-}"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug kerberos pam selinux static-libs tcpd"
-
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-dante )
-	tcpd? ( sys-apps/tcp-wrappers )
-	userland_GNU? ( virtual/shadow )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch	"${FILESDIR}"/${PN}-1.3.0-socksify.patch \
-		"${FILESDIR}"/${PN}-1.4.0_pre1-osdep-format-macro.patch
-
-	sed -i \
-		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
-		-e 's:/etc/sockd\.conf:"${EPREFIX}"/etc/socks/sockd.conf:' \
-		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8} \
-		|| die
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-socks-conf="${EPREFIX}"/etc/socks/socks.conf \
-		--with-sockd-conf="${EPREFIX}"/etc/socks/sockd.conf \
-		--without-upnp \
-		$(use_enable debug) \
-		$(use_with kerberos gssapi) \
-		$(use_with pam) \
-		$(use_enable static-libs static) \
-		$(use_enable tcpd libwrap)
-}
-
-src_install() {
-	default
-
-	# default configuration files
-	insinto /etc/socks
-	doins "${FILESDIR}"/sock?.conf
-	pushd "${ED}/etc/socks" > /dev/null
-	use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
-	use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
-	popd > /dev/null
-
-	# init script
-	newinitd "${FILESDIR}/dante-sockd-init" dante-sockd
-	newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
-
-	# example configuration files
-	docinto examples
-	dodoc example/*.conf
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
-}
-
-pkg_postinst() {
-	enewuser sockd -1 -1 /etc/socks daemon
-}
diff --git a/net-proxy/dante/files/dante-1.4.0_pre1-osdep-format-macro.patch b/net-proxy/dante/files/dante-1.4.0_pre1-osdep-format-macro.patch
deleted file mode 100644
index 52af3d73ec97..000000000000
--- a/net-proxy/dante/files/dante-1.4.0_pre1-osdep-format-macro.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN dante-1.4.0-pre1-orig/include/osdep.h dante-1.4.0-pre1/include/osdep.h
---- dante-1.4.0-pre1-orig/include/osdep.h	2013-03-05 16:05:17.097007863 -0800
-+++ dante-1.4.0-pre1/include/osdep.h	2013-03-05 16:05:39.259007921 -0800
-@@ -225,9 +225,9 @@
- #endif /* HAVE_DECL_NONNULL */
- 
- #if HAVE_DECL_FORMAT
--#define FORMAT(x) format(x)
-+#define FORMAT(...) format(__VA_ARGS__)
- #else
--#define FORMAT(x)
-+#define FORMAT(...)
- #endif /* HAVE_DECL_FORMAT */
- 
- #if HAVE_LINUX_BUGS
diff --git a/net-proxy/dante/files/sockd.conf b/net-proxy/dante/files/sockd.conf
deleted file mode 100644
index 70b18747ba34..000000000000
--- a/net-proxy/dante/files/sockd.conf
+++ /dev/null
@@ -1,243 +0,0 @@
-# The configfile is divided into two parts; first serversettings,
-# then the rules.
-#
-# The recommended order is:
-#   Serversettings:
-#               logoutput
-#               internal
-#               external
-#               method
-#               clientmethod
-#               users
-#               compatibility
-#               extension
-#               connecttimeout
-#               iotimeout
-#		srchost
-#
-#  Rules:
-#	client block/pass
-#		from to
-#		log
-#
-#     block/pass
-#		from to
-#		method
-#		command
-#		log
-#		protocol
-#		proxyprotocol
-
-# the server will log both via syslog, to stdout and to /var/log/lotsoflogs
-#logoutput: syslog stdout /var/log/lotsoflogs
-logoutput: syslog
-
-# The server will bind to the address 10.1.1.1, port 1080 and will only
-# accept connections going to that address.
-#internal: 10.1.1.1 port = 1080
-# Alternatively, the interface name can be used instead of the address.
-#internal: eth0 port = 1080
-
-# all outgoing connections from the server will use the IP address
-# 195.168.1.1
-#external: 192.168.1.1
-
-# list over acceptable methods, order of preference.
-# A method not set here will never be selected.
-#
-# If the method field is not set in a rule, the global
-# method is filled in for that rule.
-#
-
-# methods for socks-rules.
-#method: username none #rfc931
-
-# methods for client-rules.
-#clientmethod: none
-
-#or if you want to allow rfc931 (ident) too
-#method: username rfc931 none
-
-#
-# An important section, pay attention.
-#
-
-# when doing something that can require privilege, 
-# it will use the userid "sockd".
-user.privileged: sockd
-
-# when running as usual, 
-# it will use the unprivileged userid of "sockd".
-user.notprivileged: sockd
-
-#
-# some options to help clients with compatibility:
-#
-
-# when a client connection comes in the socksserver will try to use
-# the same port as the client is using, when the socksserver
-# goes out on the clients behalf (external: IP address).
-# If this option is set, Dante will try to do it for reserved ports aswell.
-# This will usually require user.privileged to be set to "root".
-#compatibility: sameport
-
-# If you are using the bind extension and have trouble running servers
-# via the server, you might try setting this.  The consequences of it
-# are unknown.
-#compatibility: reuseaddr
-
-#
-# The Dante server supports some extensions to the socks protocol.
-# These require that the socks client implements the same extension and
-# can be enabled using the "extension" keyword.
-#
-# enable the bind extension.
-#extension: bind
-
-
-#
-#
-# misc options.
-#
-
-# how many seconds can pass from when a client connects til it has
-# sent us it's request?  Adjust according to your network performance
-# and methods supported.
-#connecttimeout: 30   # on a lan, this should be enough if method is "none".
-
-# how many seconds can the client and it's peer idle without sending
-# any data before we dump it?  Unless you disable tcp keep-alive for
-# some reason, it's probably best to set this to 0, which is
-# "forever".
-#iotimeout: 0 # or perhaps 86400, for a day.
-
-# do you want to accept connections from addresses without
-# dns info?  what about addresses having a mismatch in dnsinfo?
-#srchost: nounknown nomismatch
-
-#
-# The actual rules.  There are two kinds and they work at different levels.
-#
-# The rules prefixed with "client" are checked first and say who is allowed
-# and who is not allowed to speak/connect to the server.  I.e the
-# ip range containing possibly valid clients.
-# It is especially important that these only use IP addresses, not hostnames,
-# for security reasons.
-#
-# The rules that do not have a "client" prefix are checked later, when the
-# client has sent its request and are used to evaluate the actual
-# request.
-#
-# The "to:" in the "client" context gives the address the connection
-# is accepted on, i.e the address the socksserver is listening on, or
-# just "0.0.0.0/0" for any address the server is listening on.
-#
-# The "to:" in the non-"client" context gives the destination of the clients
-# socksrequest.
-#
-# "from:" is the source address in both contexts.
-#
-
-
-# the "client" rules.  All our clients come from the net 10.0.0.0/8.
-#
-
-# Allow our clients, also provides an example of the port range command.
-#client pass {
-#	from: 10.0.0.0/8 port 1-65535 to: 0.0.0.0/0
-#	method: rfc931 # match all idented users that also are in passwordfile
-#}
-
-# This is identical to above, but allows clients without a rfc931 (ident)
-# too.  In practise this means the socksserver will try to get a rfc931
-# reply first (the above rule), if that fails, it tries this rule.
-#client pass {
-#	from: 10.0.0.0/8 port 1-65535 to: 0.0.0.0/0
-#}
-
-
-# drop everyone else as soon as we can and log the connect, they are not
-# on our net and have no business connecting to us.  This is the default
-# but if you give the rule yourself, you can specify details.
-#client block {
-#	from: 0.0.0.0/0 to: 0.0.0.0/0
-#	log: connect error
-#}
-
-
-# the rules controlling what clients are allowed what requests
-#
-
-# you probably don't want people connecting to loopback addresses,
-# who knows what could happen then.
-#block {
-#	from: 0.0.0.0/0 to: 127.0.0.0/8
-#	log: connect error
-#}
-
-# the people at the 172.16.0.0/12 are bad, no one should talk to them.
-# log the connect request.
-#block {
-#	from: 0.0.0.0/0 to: 172.16.0.0/12
-#	log: connect error
-#}
-
-# unless you need it, you could block any bind requests.
-#block {
-#	from: 0.0.0.0/0 to: 0.0.0.0/0
-#	command: bind
-#	log: connect error
-#}
-
-# or you might want to allow it, for instance "active" ftp uses it.
-# Note that a "bindreply" command must also be allowed, it
-# should usually by from "0.0.0.0/0", i.e if a client of yours
-# has permission to bind, it will also have permission to accept
-# the reply from anywhere.
-#pass {
-#	from: 10.0.0.0/8 to: 0.0.0.0/0
-#	command: bind
-#	log: connect error
-#}
-
-# some connections expect some sort of "reply", this might be
-# the reply to a bind request or it may be the reply to a
-# udppacket, since udp is packetbased.
-# Note that nothing is done to verify that it's a "genuine" reply,
-# that is in general not possible anyway.  The below will allow
-# all "replies" in to your clients at the 10.0.0.0/8 net.
-#pass {
-#	from: 0.0.0.0/0 to: 10.0.0.0/8
-#	command: bindreply udpreply
-#	log: connect error
-#}
-
-
-# pass any http connects to the example.com domain if they
-# authenticate with username.
-# This matches "example.com" itself and everything ending in ".example.com".
-#pass {
-#	from: 10.0.0.0/8 to: .example.com port = http
-#	log: connect error
-#	method: username
-#}
-
-# block any other http connects to the example.com domain.
-#block {
-#	from: 0.0.0.0/0 to: .example.com port = http
-#	log: connect error
-#}
-
-# everyone from our internal network, 10.0.0.0/8 is allowed to use
-# tcp and udp for everything else.
-#pass {
-#	from: 10.0.0.0/8 to: 0.0.0.0/0
-#	protocol: tcp udp
-#}
-
-# last line, block everyone else.  This is the default but if you provide
-# one  yourself you can specify your own logging/actions
-#block {
-#	from: 0.0.0.0/0 to: 0.0.0.0/0
-#	log: connect error
-#}
diff --git a/net-proxy/dante/files/socks.conf b/net-proxy/dante/files/socks.conf
deleted file mode 100644
index 4a7d1520a7b5..000000000000
--- a/net-proxy/dante/files/socks.conf
+++ /dev/null
@@ -1,127 +0,0 @@
-# The configfile is divided into two parts; first misc. settings,
-# then the routes.  Objects in '[]' are optional.
-#
-#
-# recommended order is:
-#	[debug]
-#	[logoutput]
-#	[resolveprotocol]
-#
-#	routes:
-#		from to via
-#		[command]
-#		[extension]
-#		[protocol]
-#		[proxyprotocol]
-
-
-#debug: 1           # uncomment to enable debugging
-
-#logoutput: stdout  # users usually don't want to be bothered with that.
-
-# What protocol should be used for resolving hostnames?  It's important
-# to set this right.
-#resolveprotocol: udp  # default
-#resolveprotocol: tcp  # set this if your socksserver only supports socksv4.
-#resolveprotocol: fake # set this if your clients can't access nameserver,
-		       # neither directly nor proxied.
-
-
-
-#
-# the routes
-#
-
-# specifying routes for accepting remote connections (via bind()) is
-# difficult since we can't know what the "to:" address is
-# until we actually get the connection  Since we support letting
-# the client accept connections both via the proxyserver and
-# "directly" at the same time, we have two options though:
-# a) specify a route for bind (only) first going via the proxyserver.
-#    This will also handle "direct" connections.
-# b) specify a route for bind (only) first going "direct".
-#    This means clients will only be able to accept "direct"
-#    connections.
-
-# we want to accept remote connections via the proxyserver.
-#route {
-#	from: 0.0.0.0/0 to: 0.0.0.0/0 via: 10.1.1.1 port = 1080
-#	command: bind
-#}
-
-# we do not want to accept remote connections via the proxyserver.
-#route {
-#	from: 0.0.0.0/0 to: 0.0.0.0/0 via: direct
-#	command: bind
-#}
-
-
-# if you don't route all local connections via direct, you should
-# at least route nameserver connections via direct connections if you
-# can.  That can make for much better performance, depending on
-# your setup.  Make sure the nameserver line is the first.
-#
-# Assuming your nameserver runs on address 10.1.1.1, you can do it like this:
-#route {
-#	from: 0.0.0.0/0 to: 10.1.1.1/32 port = domain via: direct
-#}
-
-
-# have a route making all connections to loopback addresses be direct.
-#route {
-#	from: 0.0.0.0/0   to: 127.0.0.0/8  via: direct
-#	command: connect udpassociate # everything but bind, bind confuses us.
-#}
-
-# Our net is the 10.0.0.0/8 net, let clients going to local address go
-# direct, not via server.
-#route {
-#	from: 0.0.0.0/0   to: 10.0.0.0/8   via: direct
-#}
-
-# for poor souls trapped behind a msproxy server.
-#route {
-#	from: 0.0.0.0/0   to: 0.0.0.0/0   via: 10.1.1.1 port = 1745
-#	protocol: tcp			 # server supports tcp
-#	proxyprotocol: msproxy_v2        # server runs msproxy_v2
-#}
-
-# clients going anywhere else go via server listening at
-# IP address 10.1.1.1, port 1080.   Note that unless you have
-# specified a direct connection for DNS, or the socksserver is resolvable
-# without network traffic, you can't give a hostname for the socksserver,
-# you must give a IP address.  (the reasons for that are logical enough,
-# you would create a loop otherwise.)
-#route {
-#	from: 0.0.0.0/0   to: 0.0.0.0/0   via: 10.1.1.1 port = 1080
-#	protocol: tcp udp                # server supports tcp and udp.
-#	proxyprotocol: socks_v4 socks_v5 # server supports socks v4 and v5.
-#	method: none #username		 # we are willing to authenticate via
-#					 # method "none", not "username".
-#}
-
-# this is identical to the above, but it matches hostnames instead.
-# This is if you have clients that are unable to resolve hostnames.
-# It can be important that hostname routes come after address routes.
-#route {
-#	from: 0.0.0.0/0   to: .   via: 10.1.1.1 port = 1080
-#	protocol: tcp udp                # server supports tcp and udp.
-#	proxyprotocol: socks_v4 socks_v5 # server supports socks v4 and v5.
-#	method: none #username		 # we are willing to authenticate via
-#					 # method "none", not "username".
-#}
-
-# identical to above two routes, but using a httpproxy instead.
-#
-
-#route {
-#	from: 0.0.0.0/0   to: 0.0.0.0/0   via: 10.1.1.1 port = 3128
-#	command: connect		 # only thing a httproxy supports.
-#	proxyprotocol: http_v1.0
-#}
-
-#route {
-#	from: 0.0.0.0/0   to: .   via: 10.1.1.1 port = 3128
-#	command: connect		 # only thing a httproxy supports.
-#	proxyprotocol: http_v1.0
-#}