Remove older non-daemon version

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

3 files changed, 20 insertions, 79 deletions

diff --git a/net-proxy/obfsproxy/ChangeLog b/net-proxy/obfsproxy/ChangeLog
index 9fee90c83fcd..f8e87ebfe7a4 100644
--- a/net-proxy/obfsproxy/ChangeLog
+++ b/net-proxy/obfsproxy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-proxy/obfsproxy
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/ChangeLog,v 1.21 2013/10/08 10:53:07 blueness Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/ChangeLog,v 1.22 2014/01/26 21:15:41 blueness Exp $
+
+  26 Jan 2014; Anthony G. Basile <blueness@gentoo.org> -obfsproxy-0.1.4.ebuild:
+  Remove older non-daemon version
 
   08 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
   +files/obfsproxy-remove-argparse.patch:
diff --git a/net-proxy/obfsproxy/Manifest b/net-proxy/obfsproxy/Manifest
index e4d5596b88a1..daff23b3c3ed 100644
--- a/net-proxy/obfsproxy/Manifest
+++ b/net-proxy/obfsproxy/Manifest
@@ -7,24 +7,23 @@ AUX obfsproxy.initd 1808 SHA256 52789c3b7ddcdb7221111a2498e15721d611918765e405e7
 DIST obfsproxy-0.1.4.tar.gz 217518 SHA256 6e0ed147e9be4b9f89862b5e2597d355427e977a69c8dfb6e15c04530d3bedb3 SHA512 5bf06be42e4a7ec4677252dcd9def3f26ca0ce2dfca3c4f514271561b3014937421929ec0432f508368fe3f885a4a6c186f3bf0d48b7cd48097c4532b1f5102f WHIRLPOOL fa219d58bce96bdf25e2beaef59e1b04c68bcd36cda6763976526de45f66f47a4f645917234cbf9adc1a36597ee7d1e4533a96a4ea57baa35dbe5d2197d027f9
 DIST obfsproxy-0.2.4.tar.gz 50979 SHA256 b0f34860cb7c9a1e6eedc95c3b3549baf67e90e4c32036bb9c4c015370734e43 SHA512 65708747c653613e2b2950c4d12643a449970da8026b43cf7bb38d1a94a195bcd41e30a34777ba844007794a5cd6e9d5df17b10cbd89048b310c7ee506069bb0 WHIRLPOOL 8d000fdf233340e6fc7777a96985db019e0a02816ec588efe77cf9d28728dc0f32ab945a50df71f17a92d9b25c5aa5d734795940a8ac8dcc4a4f76c7ec1f0c1b
 EBUILD obfsproxy-0.1.4-r1.ebuild 2033 SHA256 2d388c8a8f29c9921df2f60d68e628c04742555d136dbda17ac5d0fcd6d4cd96 SHA512 344ceae21513d3f29492feceaffc7fe9b83b9adf1adf93249b10f62d1612ead4aa92ec0dbcb553408b45100de3cc8cfb58bc31e0ff3b75bac4a9a1383399707f WHIRLPOOL 2a5d60d3946ffe4c7ea46f59f32d59d352619569af545b5f736aaf4e568739b27088b42f89836726f24e871aacd4956f236250942735a7a6e552ca120a1881cc
-EBUILD obfsproxy-0.1.4.ebuild 1855 SHA256 02647a21b5b16d1571c782f6f06a5339de00788a4edfa7d5b67d736fe0caddbb SHA512 e19f518ef1bdf1de736de04319fd9583144c5fbbea188e23e4616c94e14958037050ef7a7b4603086d978b9c3013f0f48bc81c46cedf2d805855775ce1369295 WHIRLPOOL 8ae2213c8bbeb81c6f9963042ab7397bd7f49105de8169c975b5184aa8b51814dde496838589f9662ab4af98180af9fc0d1fc108008331b4efa12f3dfa88b01e
 EBUILD obfsproxy-0.2.4.ebuild 1842 SHA256 a2855bf0e8e67a157ba420fa577799fc263d9fde0776e5f1e1e44e133683ea09 SHA512 b02de0e9eb225616a10f3d5d960527d645105bf0d3a02618f1c8e605946d12d2802ac12ea8be0b7a1e5a41f3dab8417135a3caa183294eacde72281c036e315d WHIRLPOOL e93ff5f482a60623e56bff2e36b7ce87a8e3adb4bc968186b232ef696bdd5a822d7f34cf05c6ceb94db6d2ecc2c8f84cd57eab1dd1a3dec13db54f7895568a86
-MISC ChangeLog 2967 SHA256 999cc2b4789560ddb60e99b32bff2bd0a28bf2726f139a4a5e3c08703811910b SHA512 3d2957edd173384dcd2d91d9c6a0c2d01599dfc64d81bb341acb1d135ab28f4c9f704781f0e5792351d85f0272160312ad6b5d63a025313f0e3e1b35dd2bd99b WHIRLPOOL 7eac45773f7c7bc0d89ad4868a3e5af9f0dcfa160aebaf6314c51e02e842b37bd4358b1b9b4d8baf25c66bb98cc07ba1ec4649ccc3e05be29a6aab2a3632a0f9
+MISC ChangeLog 3082 SHA256 2c9b95f482c0e84dacf7c5ee24f53f89b35959698ca5c66a612ba81ad115262a SHA512 888ec92c7b9bec6aea950313569ba5269b5bce8fae45fcd2a8670d6f1943202d004bc5e085d3f4eb3ae251292cd32119513e1b3f6a377c77b6babc9a0b353d3d WHIRLPOOL 102ec73fe7bd73d8f54c38007eb1c0b496089f0dfe27b4f1de6526ab15093a93c515de503b3e3411dddb4deae343a81973b51d784ceee66bf7b0391c19470037
 MISC metadata.xml 319 SHA256 1f131e89abe09d6120753980e23dcb5e4438359f11fb10d2bb20d554d9fc6dea SHA512 5c9bceffaa09973714dd04e28e4f23639bc0f3d7f790d2a0e7666b5397c3fa16ca0227555bf904fe5c335d9f0daa6a05db2bbb3ea1ff25fcdbcb7436621b52f4 WHIRLPOOL 7ee9236cbd0e478c1a267145e4c945e9bdc8548255ca0ef9d1d569bdca4fe49568fc0ddad91588ee545581cc2b0c72681389ef4a57e14dae2542c81117b4146c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSU+RyAAoJEJOE+m71LUu67vwP/1U/aX38Z9kXlqMVp9jLgDuQ
-4dm0UTxXF/dFRvZlN+67c16ssLoo2hF0QnjWMUnMAGyE6zMhTVdqgFlwH5fQPHCI
-RvC+cDLXQxV/hEnreU90LGUC9aCxg3hRX6vj9imxcY68/o6tnhGy2JUIjczXiA0p
-DmhwliMi08cVthXL7Nc1MSG0H8Hke5JAZGv4n6TIIn20nS/MlbbV58/waMVwk35K
-IUGa19Dk/tWdeWd94p1CcnYbYwpHbwenqLZ9EnidOvZdygwkQfUSsRgcyKFQd2en
-j+z7GBZKoKlON2N/WQclSzAmbQUDGwnG0DQJL/m1miVQqoMURuShYKb4VC/8BoHr
-r3IdtK2pF5p8DN0LvXw+r2Zc5ooZhhPhO1nmmHdILySjICDm7EKQ1uwUwMC2sc6m
-6ra3W5IdX2vFpwBpSSbct5fwChAtk7ZH/ecS4y59ZrQTb8zYxDT8Gs99zZR499/B
-orsCj1gwBe7c/FhG0uYmgggjROW2F2BcxvA5DkgGqclfdqgzbu1T0FB1F96u9dJb
-7eLVWRnOa7PuM4JJ5izeOV2s5u50Cwmu2a6MdArDz2F1iv7q5eS8uO+hyQfrOMSa
-pH58jMkw64Uf/t9ZKuPbq1qvQ0pJ4R0mI+8UpDbCo2IvMX9/AacWC35ZVsmh+xzB
-gqVZNQgHpekgfn+z9xqY
-=wnP8
+iQIcBAEBCAAGBQJS5XsaAAoJEJOE+m71LUu6vKIQAJfUS3LeKSwHP0z/NEBOONGC
+zpNSU3FeMUl0o/UJCsJd68+iG1rWxHChgga08UloqTx2t05SwU5kgEs5OyfQ9Prl
+ty8qpN+aBgdpjhAe64U+ber6JHsn9rT4OrX2QCZgws6LqNDphKct6nXtmuX9R7Fp
+GgK8d0J8YKbw8MfhkMEfCpVyWW1u0kbotX8f0FTkYUIZFhXNaZ94D6AvpgDstdnF
+d4TI8r9KVIr9s2p+cOP06mlcXsxaC2h4mjnkZk4ZiCR0Aaitdhld1nhYa9bFtG7h
+GQY/E3x1Zn4Lqc+Ch37vRzWyKC3EQ2UVDaAE2l4gw//mNbe6F+TNS/4CSf2wnchl
+8IToDRan0dBvSuIGLRB8xSwAXqWhB4/OJsViffxp3rv7PswhoU/GpLTRhuR0EPJr
+HbjThiOQWJB6Qp9R/6t1eZidXE+Dk+tzlpWutLahQgI9LSyaGx2/TlEYEmZj0jxV
+qjOnffcaAP2GSO1Z6J/bK/PGb+CLJusZXVpzDPw4y3qUoPMe1uNan7rl8GPHhKPv
+0L4LFdihqgqgo8fK2aAbTFNS56wOjJGzs22sNmz4Fmm9msZ9nUPEuE6isop2w5QX
+Nedrrt2NBLL4SElJufcSEGx/mk05a1NQ/3R8skgY67NUvdqDtL8xge/BqBTQtRFx
+Bqj7kxdn+oNuI0PJ8fxa
+=iz1t
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/obfsproxy/obfsproxy-0.1.4.ebuild b/net-proxy/obfsproxy/obfsproxy-0.1.4.ebuild
deleted file mode 100644
index 7d797c73df45..000000000000
--- a/net-proxy/obfsproxy/obfsproxy-0.1.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/obfsproxy-0.1.4.ebuild,v 1.8 2013/01/22 17:31:31 ago Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A tor-compliant pluggable transports proxy to obfuscate tor traffic"
-HOMEPAGE="https://www.torproject.org/projects/obfsproxy.html"
-SRC_URI="https://archive.torproject.org/tor-package-archive/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "s:^AR = ar:AR = $(tc-getAR):" Makefile.in || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README ChangeLog
-	dodoc -r doc/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To run ${PN} with a tor bridge, add the following to your torrc file:"
-	einfo
-	einfo " ORPort 5001"
-	einfo " BridgeRelay 1"
-	einfo " ExitPolicy reject *:*"
-	einfo " ServerTransportPlugin obfs2 exec /usr/bin/${PN} --managed"
-	einfo
-	einfo "Change your ORPort to whatever value you use.  When you start tor,"
-	einfo "you should see a message similar to the following in its logs:"
-	einfo
-	einfo " Registered server transport 'obfs2' at '0.0.0.0:33578'"
-	einfo
-	einfo "Note the port number, 33578 in this case, and report it, along with"
-	einfo "your IP address, to your bridge clients."
-	einfo
-	einfo
-	einfo "To run ${PN} with a tor client, add the following to your torrc file:"
-	einfo
-	einfo " SocksPort 5000"
-	einfo " UseBridges 1"
-	einfo " Bridge obfs2 <IP>:<port>"
-	einfo " ClientTransportPlugin obfs2 exec /usr/bin/${PN} --managed"
-	einfo
-	einfo "Change your SocksPort to whatever value you use.  Also, replace the"
-	einfo "<IP>:<port> pair with the values you received from the tor obfs bridge."
-	einfo
-}