Version bump; also restores upnp and libdsocks support.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

9 files changed, 199 insertions, 33 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 390a07781ebe..9cf8c73e98a6 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/dante
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.68 2013/05/05 21:53:24 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.69 2014/01/05 23:33:03 robbat2 Exp $
+
+*dante-1.4.0 (05 Jan 2014)
+
+  05 Jan 2014; Robin H. Johnson <robbat2@gentoo.org> +dante-1.4.0.ebuild,
+  +files/dante-1.4.0-cflags.patch, +files/dante-1.4.0-socksify.patch,
+  +files/dante-1.4.0_pre1-osdep-format-macro.patch, dante-1.4.0_pre1-r1.ebuild,
+  dante-1.4.0_pre1.ebuild, files/dante-1.4.0-osdep-format-macro.patch:
+  Version bump; also restores upnp and libdsocks support.
 
   05 May 2013; Tom Wijsman <TomWij@gentoo.org> dante-1.1.19-r4.ebuild,
   dante-1.3.2-r1.ebuild, dante-1.3.2.ebuild, dante-1.4.0_pre1-r1.ebuild,
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index c5cba24637a7..6bd6bc17ce0c 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -1,12 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX dante-1.1.19-libpam.patch 2688 SHA256 e78503cc9ece8347cfe0f11d77e0952bec9e2286dd1bea0916540f489d86ab54 SHA512 ae65a7d58e93b7e0f883c8194166e23fd378b27537fa4005dd1f751889d6bdf807bab3c09327b5b1348193dff2350b6483baac29ff652a5d2cbcc9f912842e01 WHIRLPOOL e9b8ee2651db965a1d1ac93529a240d83bb8ed8785382ea462f98cfed528a3831deb7585e907b8652911e05ce16edb815d91dc19e2fab637243402fc445e885b
 AUX dante-1.1.19-socksify.patch 811 SHA256 2e39a9cb13ae30eaf4129583dbd28d6df08133564aa679b81b5feb21532822d5 SHA512 2f5616e788de6764eec22a7f561be367b58c7b6d3420dab7fa9dee8204bf78cf5342e65b66df5cc02766c8a5454e932b72ea73d9d155d9062c0c4875e93dda30 WHIRLPOOL d6ed423f3ea2425cd138e9a675304cba5015624f6abb52572439500a18a24bfc1f04abe9df3182238733b38fb5787c80b99da9ff73fd2c475cfae4762bc87425
 AUX dante-1.3.0-socksify.patch 987 SHA256 d5482aba9f049c879d646e8831e31ed9af0d69be9eada742323b2be05d66b7a1 SHA512 a5d8217da81226afe4c6cd11ebf6eb207c86703a2b2fce156e79e5506a71216aa916bb989b298aabce4b1a535a9f7c2f654a4d024f4657164627e83711ea0cfb WHIRLPOOL d2d4a41ca4fd6b8c1d347bb12326e77a63c50d7a36cc71a9e013a15ed20a0b2cfeebfbb2f11b7af4396981d79cc731fc99e7865ebdcf2a5effecdb84b4203ab5
 AUX dante-1.3.1-flags.patch 1012 SHA256 731758799fc94be04d141310482800f3948e4b1ca2c1089543d63f94a90a0824 SHA512 4508b16f9a66779d589e9fe334798a8cee342117697e97bccadc784000404fad46c48154b029de061a68a0e530be7cb5f80d6bdcd6b2f332641ac0f78fa75f04 WHIRLPOOL 6e3000917489216cc0d1ee912b680840b5650de51c00f4edb39cf1a125ffa915fa11bde10c88b2b15e502c709008d9d07fb1069a08f99d234dd36060a3055d4d
 AUX dante-1.3.2-sockd-init 1757 SHA256 da98cb36ba0cad40273abc1d6d8717299f0c031ab709e4923f002085dc936d98 SHA512 dc9d155309d269c80ac69ebf9937e7dc3b72b01909511bd8232f1b351a774c744149e6f98a261a5a22d4410039bd69cdb189fe29363bde1e7bc995f33be35e55 WHIRLPOOL 98af698993f4c8a34394efff9e3fc98f0f4ccae9fd900846329d4742438dd714f92b39e0df802e6fa2509570dc29dbb73336d028c6a376e3fba4588b1cc72924
-AUX dante-1.4.0-osdep-format-macro.patch 479 SHA256 76946857b980acfac393a4bf4ece14e5f65c1f6f67b618b3d075b64b7cf964fb SHA512 09e5c1a820eccbdc7846d0cb71e8a6984715ad996af476a33265090e4252c2f41f4bdb231f0cf3fdb825b7099a5fc7900ce57495632bd14b3b89f00b28f15ce4 WHIRLPOOL b0fd457c25efd61b1917613174c9f8dc33fd8cc7d579ec2e07f89fad72054b23980363a82912695164d2f6b1797fb1d031aa457e8222714e7d7d68779c6d290b
+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 sockd.conf 7031 SHA256 3ea0e08ee7e5b018d1df1b83af92fb6051fb44a486e0822e28775d104bfcfee7 SHA512 a443ea203aefd3ed51b10c7140dde2fc64dfa31c2fb08539a45353ab77daea42c63b160c276f0ef9e4c683032260f93228af64db83ade7476ff6d353b63dec19 WHIRLPOOL 130a0a017071129061d6ca6987448d51c515785f3802e18b99f7df0150e41d8e03b2f2d88dea21769d5ec0d544d9d82eaccd813c86a1360881598a453f7e6e7f
@@ -16,21 +16,12 @@ AUX socks.conf 4185 SHA256 3dc8c06ca5a8309015c495ea50f62097ee6a605ac262665ffa5f1
 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
 EBUILD dante-1.1.19-r4.ebuild 2385 SHA256 599899992f80a269c3b2322634bf4ffbc0605da933fc626ea79ccfeac44b4c5d SHA512 82e7cb4a13e2eee9d8dadfd68ed7c5921513acbcf3bbdbb8f2c6a2271913f32e2a5b3e1490a6020b0d5fde53e49f5c6096989ba0fa48f426f667d97c29b6f86b WHIRLPOOL d24e55fdd0a63ca8748d6ef35f9245a950d364eadfcdb6239ff2d7bbe0ac8c167283830d2616b224b53c9619d73e6e630ac9ca688cf619d3594105d08673e9a0
 EBUILD dante-1.3.2-r1.ebuild 2203 SHA256 6f378d890003cf8f8dd8f46123a1fdafdf351640700c80cea7e68b367d0fc16e SHA512 ab467461028357fe8ef8264ad304d4676339d19706008874356bce8a14130f98dcb9194f71cdbfc8095d11248ac6906f8b8f397594122c3f1e30ebde9cf784b1 WHIRLPOOL cbe16e5339e26c3febba8945920668152b512b92eb1c3d36d1eabd96dcdf7400875f6acc5398f3cb436ddfa6812de3a718bb5ca258fae700401fdef610ba2f80
 EBUILD dante-1.3.2.ebuild 2201 SHA256 27cc084b43c33d0e3e94f24d2462fe5bb9632ea5f58c572b91991fd68176d21b SHA512 1c50a778a35a772edf43476327971b379dd2add2cf7074824b73f16edcacce2f41eb74106e15c16cf7736cd6baaeded0da8ca4a3ccea8110ea7448695d13f8e4 WHIRLPOOL 66c785848886bdeff56e6a3ed8dadacdcf8b5dbb193443c851cd5ce390854739748bdaeab2b287c18b2aeaf76e988c240798dabb0b949a9862a6d8fcd616fbb2
-EBUILD dante-1.4.0_pre1-r1.ebuild 2267 SHA256 186a390589b0409be5913dfcb224a49c00220248ef6c8c8dca58ab1802308652 SHA512 ed385ddc72c6395a795e32ef17b6ac3d77783cc5663fbf32b68ea2efdd8539dd941d4711d57ec1b702f6a018b8afd355b0c32469bd39902238ec29fe26a94a87 WHIRLPOOL efc790ae51d48d2e53e36b291002c2b21a7637afd758ded3f70eb1b66922b7952e0f4b48570529e513d3dd1afb20817ca195e684794f7315f92ea4dcef009973
-EBUILD dante-1.4.0_pre1.ebuild 2258 SHA256 e03bfe49c9e61df85dc3ca856f06b315d1d7260447691f5d78fb66fab8891678 SHA512 0d31b5d18daff287c9876e8c905c5757a5630c13b9b5241a733cd4a7c797be20a827608e47667fdc7922bd1be8aca8711f19376250b8c74a32f0e6bc1b6bbc7c WHIRLPOOL 8682a9d198de825ad38e67e802e7005b8e2496122014f6f4d8d5c0c8fa6ca1d6360738ce4f568d01270dabd93264e66b10648fa0de9de6b7a61600098e353290
-MISC ChangeLog 17352 SHA256 2ceacafdeb15dcedab6c3f6143cc2617120c9a779fcc404010bb022d6d492d33 SHA512 301fec469aa9083f7f33c6e45153cab8688855850e7d1d7a67d1956b08bd6b03f8859bec792fb042d3504cf81ef261e310eb54484d24b4f78a6aaa5bdc7b4ac8 WHIRLPOOL 04e079fec8defd476389ef449d5c5c4aaa1da9c996e34cc8b5b704a90039e72c8ffd9e17366d9957472f204a5d7b5dca7972d6d6032820fb15cb783c4bc85333
+EBUILD dante-1.4.0.ebuild 2616 SHA256 f2005b562ef609022586cd4b055d0a6f098e2ba6010a93f567bc91877e417ad9 SHA512 5d78c48ca479e90b80e829f475ab49ac1f07403a3ebe9441844b4ceca2b21d096f60fd131d6032ea21dac282ce623820268666a3b0e1e6101b082a4b8dc92b7c WHIRLPOOL ac1db529486f87430f47d3da0f39fbb30d40f1988d0b5c99bfe0d1b5f5a5d088f19c57cd58aaa56030722c59c71af3b922e3d3a4219accec7b847ab396467f00
+EBUILD dante-1.4.0_pre1-r1.ebuild 2273 SHA256 5b80aa4227031f7df84f4ea56183249133701d2a0882a2b13b7fda1cdc94936e SHA512 af43f420620dfc4dedd6e80f89084fd169c53aa00fec2a70c4a17835f0ab50f727c7ee10ec518e45cdb0e6e9806898463fd44f995cb24ab2d3fb994a8951610e WHIRLPOOL 6128d509353f2c1add4e18b04062a2a232850a6ce8366d905bc7e7377468d5e62d1063b38324eb658f94b9cdcd25b3f520188207752d7cf82736c11ebee2f289
+EBUILD dante-1.4.0_pre1.ebuild 2264 SHA256 ab799eecf9f04a0049db644c7038806e19e1ab00c409ed4419f1f1d991083167 SHA512 5d6078b265adb7f266cabe33d2afc26a1f907348d173acf4fb5f3c1704d2bdaecb8ddf890cf24778e2bb28e53ca5f2ca431f7618e1f4aa6d6feda089342dfe45 WHIRLPOOL d44b5e7839701c51de4d1a49b3fd270977b700e0a8b5d5d9f9b3a8892ee544e858339702f6a4789f8cea9177a4fdfef216f9ac9bdb906374df198baae6e3830e
+MISC ChangeLog 17735 SHA256 4d2f73e2432e924f6274c5bfdda4537d44d9a1b6a2a57472740b1a26b05b8ebd SHA512 f59a6a8db804f990bd58b266524761b20fea21d33f71d33286030a27e9fd00f7aa19f6e1ccfa2528d8a14afe1c5267edfd30d9dfba55b85a6b84c51761cef61b WHIRLPOOL c0ec25493d8b8c8d89d6e629fa8b225aeed896ea7f79098763c317c65bde0258f1b97228295f185ac3a7b7a1009de2159420599fc51304c2730014426563b69a
 MISC metadata.xml 246 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add SHA512 da5edb1cbf3b7e72b1bf22120bcc2efcc794e1e2f032e57426286de9817dba3ef39d95313dbee4cba51c0198f8b4297ac8f1d412335ee00d32e470799d05b7c4 WHIRLPOOL f5a9fd6f048d1732243da133861886c7a8ff3bd024ca831c98496d3150441512929c86bb263a8d89ff96ee5720dcc06c423227cdcc840a9062d9f8bcaf7197e2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJRhtSFAAoJEJWyH81tNOV9HNsH/0ORdf621KKCUE5a/GVipZm0
-IXxERnssqAiNSMWejWjzRwUfxtpHS7ZsfM74VWyuiUrZ1JhM3DTc1WAWtXW6Z6Ju
-K0W999iyCjrfQzDZimb4Eq23PvuWY/DHNWDF4g1Y2jip2nWRdcjAiI59T4u1yLCY
-ELDpfThVSQXyzyvWiTf1glWQXGfY3KG+siAFu+dbvCKQuH91K1j8Pw4tJuQcxrS+
-D0fuukL8W4Y7mgjGsxH4h4rDL9iMLejK7jqr0su1OmQgI6PrgCaOfRJ5A/QCulg1
-ItC1o3CPIAMI4DqaEVecvb3+j1xoa6p+DHhqztk1v7W1I89WeoYFyHGtZtJA35c=
-=8FVZ
------END PGP SIGNATURE-----
diff --git a/net-proxy/dante/dante-1.4.0.ebuild b/net-proxy/dante/dante-1.4.0.ebuild
new file mode 100644
index 000000000000..dcc343e750b7
--- /dev/null
+++ b/net-proxy/dante/dante-1.4.0.ebuild
@@ -0,0 +1,93 @@
+# 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.1 2014/01/05 23:33:03 robbat2 Exp $
+
+EAPI="5"
+
+inherit autotools eutils
+
+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
index d95bda53ea59..5ecd1b3e1572 100644
--- a/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild
+++ b/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.2 2013/05/05 21:53:24 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0_pre1-r1.ebuild,v 1.3 2014/01/05 23:33:03 robbat2 Exp $
 
 EAPI="5"
 
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch	"${FILESDIR}"/${PN}-1.3.0-socksify.patch \
-		"${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch
+		"${FILESDIR}"/${PN}-1.4.0_pre1-osdep-format-macro.patch
 
 	sed -i \
 		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
diff --git a/net-proxy/dante/dante-1.4.0_pre1.ebuild b/net-proxy/dante/dante-1.4.0_pre1.ebuild
index a5fb5a5a62aa..168f81da4b9e 100644
--- a/net-proxy/dante/dante-1.4.0_pre1.ebuild
+++ b/net-proxy/dante/dante-1.4.0_pre1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.4 2013/05/05 21:53:24 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0_pre1.ebuild,v 1.5 2014/01/05 23:33:03 robbat2 Exp $
 
 EAPI="5"
 
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch	"${FILESDIR}"/${PN}-1.3.0-socksify.patch \
-		"${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch
+		"${FILESDIR}"/${PN}-1.4.0_pre1-osdep-format-macro.patch
 
 	sed -i \
 		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
diff --git a/net-proxy/dante/files/dante-1.4.0-cflags.patch b/net-proxy/dante/files/dante-1.4.0-cflags.patch
new file mode 100644
index 000000000000..eccb64a5d7d8
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.0-cflags.patch
@@ -0,0 +1,32 @@
+The upstream code tries to remove -g from CFLAGS, but the logic also matches
+the -g in the middle of flags, like:
+-frecord-gcc-switches => -frecordcc-switches
+-ggdb3 => ggdb3
+Both of which cause GCC to fail horribly!
+
+Fix the grep & sed to only match standalone instances.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar dante-1.4.0.orig/compiler.m4 dante-1.4.0/compiler.m4
+--- dante-1.4.0.orig/compiler.m4	2013-10-24 13:20:23.000000000 -0700
++++ dante-1.4.0/compiler.m4	2014-01-05 15:18:03.544336373 -0800
+@@ -375,14 +375,14 @@
+ 	gcc)
+ 	    if test x"$aixldbug" != x; then
+ 	        #disable debug info
+-		if echo $CFLAGS | grep -- "-g" >/dev/null; then
+-		    CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`"
++		if echo $CFLAGS | grep -w -- "-g" >/dev/null; then
++		    CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`"
+ 		fi
+ 		CFLAGS="$CFLAGS${CFLAGS:+ }-g0"
+ 	    else
+ 		#use -ggdb also when not debugging
+-		if echo $CFLAGS | grep -- "-g" >/dev/null; then
+-		    CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`"
++		if echo $CFLAGS | grep -w -- "-g" >/dev/null; then
++		    CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`"
+ 		fi
+ 		CFLAGS="$CFLAGS${CFLAGS:+ }-ggdb"
+ 	    fi
diff --git a/net-proxy/dante/files/dante-1.4.0-osdep-format-macro.patch b/net-proxy/dante/files/dante-1.4.0-osdep-format-macro.patch
index 52af3d73ec97..02a0d916e563 100644
--- a/net-proxy/dante/files/dante-1.4.0-osdep-format-macro.patch
+++ b/net-proxy/dante/files/dante-1.4.0-osdep-format-macro.patch
@@ -1,15 +1,15 @@
-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 @@
+diff -Nuar --exclude '*.orig' --exclude '*.rej' dante-1.4.0.orig/include/osdep.h dante-1.4.0/include/osdep.h
+--- dante-1.4.0.orig/include/osdep.h	2013-10-27 08:24:41.000000000 -0700
++++ dante-1.4.0/include/osdep.h	2014-01-05 15:06:45.346071952 -0800
+@@ -254,9 +254,9 @@
  #endif /* HAVE_DECL_NONNULL */
  
  #if HAVE_DECL_FORMAT
--#define FORMAT(x) format(x)
+-#define FORMAT(x, y, z) format(x, y, z)
 +#define FORMAT(...) format(__VA_ARGS__)
  #else
--#define FORMAT(x)
+-#define FORMAT(x, y, z)
 +#define FORMAT(...)
  #endif /* HAVE_DECL_FORMAT */
  
- #if HAVE_LINUX_BUGS
+ #if HAVE_DECL_BOUNDED
diff --git a/net-proxy/dante/files/dante-1.4.0-socksify.patch b/net-proxy/dante/files/dante-1.4.0-socksify.patch
new file mode 100644
index 000000000000..2063327b42c5
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.0-socksify.patch
@@ -0,0 +1,27 @@
+diff -Nuar --exclude '*.orig' --exclude '*.rej' dante-1.4.0.orig/bin/socksify.in dante-1.4.0/bin/socksify.in
+--- dante-1.4.0.orig/bin/socksify.in	2013-10-27 08:24:41.000000000 -0700
++++ dante-1.4.0/bin/socksify.in	2014-01-05 15:04:32.495670262 -0800
+@@ -53,7 +53,7 @@
+     exit 1
+ fi
+ 
+-SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@"
++#SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@"
+ SOCKS_LIBDIR="${SOCKS_LIBDIR:-@LIBRARY_PREFIX@}"
+ 
+ #platform that requires full path to libdsocks?
+@@ -82,8 +82,12 @@
+ @PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}"
+ export @PRELOAD_VARIABLE@
+ 
+-LD_LIBRARY_PATH="${SOCKS_LIBDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+-export LD_LIBRARY_PATH
++# There is no reason to set LD_LIBRARY_PATH, at least on Linux, where
++# LD_PRELOAD can contain a full path to the library.  Setting the
++# following breaks socksify on Linux/Alpha at least with
++# binutils-2.14.90.0.7-r3 (08 Dec 2003 agriffis)
++#LD_LIBRARY_PATH="${SOCKS_LIBDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
++#export LD_LIBRARY_PATH
+ 
+ #SunOS 64-bit library path
+ if test x"@ISA64DIR@" != x; then
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
new file mode 100644
index 000000000000..52af3d73ec97
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.0_pre1-osdep-format-macro.patch
@@ -0,0 +1,15 @@
+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