Version bump, remove older

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

4 files changed, 25 insertions, 76 deletions

diff --git a/net-proxy/obfsproxy/ChangeLog b/net-proxy/obfsproxy/ChangeLog
index 30fede4039d9..aaba65b206d0 100644
--- a/net-proxy/obfsproxy/ChangeLog
+++ b/net-proxy/obfsproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/obfsproxy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/ChangeLog,v 1.28 2014/07/06 12:55:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/ChangeLog,v 1.29 2014/07/17 11:19:16 blueness Exp $
+
+*obfsproxy-0.2.11 (17 Jul 2014)
+
+  17 Jul 2014; Anthony G. Basile <blueness@gentoo.org> +obfsproxy-0.2.11.ebuild,
+  -obfsproxy-0.2.8.ebuild, -obfsproxy-0.2.9.ebuild:
+  Version bump, remove older
 
   06 Jul 2014; Michał Górny <mgorny@gentoo.org> obfsproxy-0.2.10.ebuild,
   obfsproxy-0.2.8.ebuild, obfsproxy-0.2.9.ebuild:
diff --git a/net-proxy/obfsproxy/Manifest b/net-proxy/obfsproxy/Manifest
index 84fb86552bba..110511a8b5ba 100644
--- a/net-proxy/obfsproxy/Manifest
+++ b/net-proxy/obfsproxy/Manifest
@@ -6,29 +6,25 @@ AUX obfsproxy-0.2.9-remove-argparse.patch 363 SHA256 210271cb6755ccb6034828788df
 AUX obfsproxy.confd 1494 SHA256 a370791b7bf021fffe83c257642f623368c28d02946e3865194bfa22f8279b95 SHA512 722224e227cbedecae1e769a2d1198a397d7096daea8c6b7b2f0aff92396a1ec4b83e1037dff31d99fe98812be220461d6e479966131975c7e2b80bb82b19093 WHIRLPOOL f85c83be1bd54451248a29040815afc9e9b46be780d6a73e0a307accaf94685bfeebad28ac69ff284f2f21fd9b565a1e25e71401002ae25c90f5eef39b97e4df
 AUX obfsproxy.initd 1808 SHA256 52789c3b7ddcdb7221111a2498e15721d611918765e405e7354b9303ef8858bb SHA512 640c91ec243b6115c050a5752cc62fe4bbfeddfa7a45fb806dceeb08b4cc230890bc1f96269adcddfe49c43ca0d143ab4a735fce65068a608ba6d2af10a7d973 WHIRLPOOL f84b6fc41eabac25bf3d2eb3f7a42e91ee94f7aa69e189a3d4fdc592b1ffde3f3428a42fa22a4cd76275574a539266afc65d65e932d1b633a8f6b39b7397b51a
 DIST obfsproxy-0.2.10.tar.gz 92611 SHA256 d4ca230854ff723685024752b55859f38d5d1105c11936664f0c8e80ee10bce3 SHA512 ee3de72483261b65fc8b8162ea7cb84f0c670e5c9ac98a2e21d0e5d0c0c4b7d75cc86f747504015c72da24094336044419b313f262edce5de0ace205327badfc WHIRLPOOL c7359675dd224cd02c41a50e9b87bfa6d7044c445b81ccd3b98153afc5ddc0a9d98630ec49154664321c52373116dfa32b98c722c41b153b20cbbd64fd2b9b7d
-DIST obfsproxy-0.2.8.tar.gz 88880 SHA256 6d1665a975809d2df6336e9d3004aa357afa4c31662573dd9b972a0ea59f0301 SHA512 1895e6fe6c1042579c1266ad5db7d4e459c89709aa4b9d49d9e5b2495c653a4631bca559aa41a71dd2ddb72e8ff91c334e946a6f49a49a002e4bf39a3c7c52cb WHIRLPOOL 9e3df9cdedab0c1efa81c98ec8ef28317c5f64c9c46bebfd145bb2af72d3ed645f36f22008b683c3840d60bd4dd8ba19ebd3680a426d9efe5c2d49f5c0d3a0b4
-DIST obfsproxy-0.2.9.tar.gz 92163 SHA256 603bde8db72324a7fdbd8c4abaebb7546f1515cdc7aedc1d7fef21d9c499de9f SHA512 d44c0fc8381cce6e60f06fd294f32af0d8e9a70f7da7da2a8552271a2cc8481cd85154500e23bbbfd1af37c0a184995d79a9309f020e0892e1e68dc741d26a38 WHIRLPOOL e055a979647f0561304c69fbe78ee7405e84b35a29095e8fcc56755688efdd480d9ca25ae4f2999048dd2e0558a850cb2aae11ef76d395b98e2e3569facfe822
+DIST obfsproxy-0.2.11.tar.gz 92478 SHA256 121a0e5869e5233e3130ab8355f9cda94bb366e845556cb03b5beb63fb26cb94 SHA512 305667c8a9d7050a8a2eb5e9d889607e25b4a1adf116bb7d1c078285f6e43b734c7e39d505993a3d7389ae2316b2ac026b89ee86a429599682fbd6335e4d21fd WHIRLPOOL ce205ea7179c82c4475cfcd509a57f832c9abcf14720924b744cf5e085d61dc162e905a42d1d0a8406c24ac5fdb34ac3691d5f992589c8f65b4cafd2eb10e767
 EBUILD obfsproxy-0.2.10.ebuild 864 SHA256 60bf8d010919efd0705737d7724faa81717c1ba843eb990722a4dcbfaeff80e3 SHA512 73dcf26b1530d0332e6ee263514e907d26451c705c00f043746cdc2c01f8f16ced25ed65b49055f2f8474945532aa902c4236c801348e5cd9f051aec3842c5f3 WHIRLPOOL f0d482da98e5099a15085e59d01e7b3bbb70c5180b410b9699d6645ea06eed7875021918ecbc2c02a7242620727801564f4ae396fc83ba8f6ea68709d63d0b8e
-EBUILD obfsproxy-0.2.8.ebuild 1902 SHA256 f8dadc6afd59cc92f61e9f92f0e7f7a0f8ebe485110556991377837ebf533cf9 SHA512 5f29b731b89fa2efb41599c7827ac7cf730d953a379a19c17afa276639159387e13ecc3debfac9327f09ca004e08af6785d662db786e9d02020a945a6747e9fd WHIRLPOOL 8bed1cb75bccc8e3fafb7583cd7ba7a73f9fed680318054d47291a741ea8a6b3b05c3c2761e91b70ce3fc47b857bb504c2c44c119cf0dd7d9e85ed724cb58822
-EBUILD obfsproxy-0.2.9.ebuild 856 SHA256 7e7fcbf05697c8da1efc62ff5ac8ea8b2700ed0ad23f4bc8f27dab0cd213e754 SHA512 6929157ed5bc73066342fdf7abd06db77296b80cd0c7575ec477bc58d67d5378bb607c085767587d4f7539e46a0ef3e3c48be03aecbf18a36e9315fedfbda931 WHIRLPOOL 2b28de97014ec8fe224471189390dfe8c9fc556e43be04ba2b8554fda542c7b11652a2fd4c1141c7e2445e0ee54c57d7987c9cd312a5910011b261798277f0c0
-MISC ChangeLog 4304 SHA256 d75997579838f000c4a3cd3eb773c62711e8dea44aad8e7d1a5640dc6fce6441 SHA512 fcf3f40a666a7d97ad6e645d84c44e4e5026eac3732adb4ff33a6461682ea23e1fa223aaf8e3169d8d681c27455a9b986726cd26d8249c0ff4e65629d4c7e2f8 WHIRLPOOL 7fd0bf49b4a2c88be05996b5ddcbc0dd1f019eb0e864bceb7ddb96df38b88426451dfefeec7458d2e69b3807306121ca4edf47f242f3374e016311a608944c4f
+EBUILD obfsproxy-0.2.11.ebuild 866 SHA256 a67c49a76d32f2974cf5ac8fd80ce73c72c6d48ae9f920d6563b580346cd2eb7 SHA512 29c3786accf29e4141b2c0e664b3acd4875bb862589d5c331b1cd2cbf07a19db282ef644550ed4464f8bf73d7b3b2d7881e5c15bb5a5f5953561fb1917566a2d WHIRLPOOL 10c049dc2a97a6d3d7f06108e700c1781c49441623bdd64b714bad06374c25040b7340b031b47bff799d52f7b23109603d27144f9c6e259ab89b2159e7a108fd
+MISC ChangeLog 4502 SHA256 340ba69a9e0568ba373ea184368ee75e795e06cdddf8c18f209167bd3a0cd116 SHA512 e08cec6215456f9904d447b603202c0d0d62e5e1afe2d672e0dd60369bf80fbe3fbd8be6f77f798945fa6e8e6f2ec8951d857573010c9ab7c110158bebaf5dc2 WHIRLPOOL 73a9d2e84ec7a5097fc10472d4c50a9eebbfa692c3a3a17f2941937959c98585f512b56035d020dfe2502cd3fd6b32721ae071a0be66fc70774b18c1e1d84004
 MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTuUdCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXMEP/0cXYPtTLApdyZI4lqU8u+9H
-Y0o2eb90qxzqQMDTpL39Se7/mqtp2Dv0ro6OXoRZoyrURZ3LfipsTOQJLXcmECgp
-nYnG+YfD3g60ZHq73OzInoHhiw59Oovcc5qFGMo49oHiys+9AbzHeKQv3ASKhbqN
-61mxovxqgPm42r/ZRiOHXlcUZo3H8Yi0UzN1cvPmXENWIeGYbiunNj5a90LZTKtT
-QTKHRAf3Ltuh1jNGDJBCWoswua7gL/s2+fucKuxzbPUQOl2kV88YMauEMZ0X0hUR
-eqJVd6d6HhafvK5tUoC+PYIwU8j//kw+VG3DfiCFNYMHKPwxKEhR0+ns94M8+umA
-CElzRLD8ZcSBBd1xFpDIWCn1LRFgTjodUzIOMVDPysFYyuSsWPm1mG70Ri0Anx4m
-YGyw0GO9lQ8+6bfQCzwySkMCyhanPCyc7heXm5GA8FEQ0nCDYOoMge1/RFtf9CQi
-NR9Lr5LddFayUaBmKeyBV3hqGmHZMha2qVd5iAC59AQxkMGW3gmgshcU1jZgbpub
-mucgqIXt8ePCyikP0GXPOhGBCcCoDeO3neWQuGfqNrSw6SSipPJ6b68/GCoNCT6n
-7oXotg7YjYH3ZkbHPldctLgwdTjr1iafBu/GDBpghn5YRPI8B+PIFto7XeEGis1W
-dgnLz7PQLlFXQIUZx7p9
-=rtjT
+iQIcBAEBCAAGBQJTx7GAAAoJEJOE+m71LUu62SYP/RbjZDEaFSKJ7TKK++nQOdWY
+vpuxtHUClYY0jiCr3GHEStTDEUQfYIdA1TOGxpcgquHUoo/0pNKyCTECxyigGC/1
+wYKh3KBaXrFM8CgaTnvnz7lL723WLTzbaU/FOeUBi1JfmpnEwT2rMmpLDmGI4pLA
+EjTFMvON8UW2lk6HcwsZqo91v7OJIUnunm614xqERy9MPkSEOBVIkHHPCfz0yMdI
+TiMeC2Gn9FBD6F8JC2i6d+eBeQI5l4k42+nwPLjdZaanMgzbSN+iKDOY7Q2PPnny
+ZsioeHDBDWiqWCbfqAr66oybfcC/GEIHaie4GWfA8YwvmFqpk6H1x0zRPfYc9Z0n
+8UyrMUHPTqlKwio7hckEKZDbx8g0Jlbb3AziY9G4dqM/fmBJGZnkeB9lJ5S1tha1
+25u8YAT/1DeNJgG/wFvysT/Nf8cDhIhNj9ehIjrykoUMqXGGs+hliP1fNRYGIKKs
+VEeRwEB5yx3rCK6fIkFKgbj62Lb4Yw8sUSjcRyPT+WgoO2rLVdUVLBEPCcL6JNcu
+tZ00jm9AMiz9cqon1TslcYWfPE/wPE9vEZgzIfDF/czwiGqAzsll9h1mlqMwhiza
+MPPuDuRBTvG5SkgTA0KhAJICZe3ZpC76qk9bnNTypXFAlxSZbSnBp6ZM9KpXagBb
+04qu0Y1ZqarPIQ+RidOj
+=gOuy
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.9.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.11.ebuild
index 2e9e7edf3a6e..124ae11b0616 100644
--- a/net-proxy/obfsproxy/obfsproxy-0.2.9.ebuild
+++ b/net-proxy/obfsproxy/obfsproxy-0.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/obfsproxy-0.2.9.ebuild,v 1.2 2014/07/06 12:55:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/obfsproxy-0.2.11.ebuild,v 1.1 2014/07/17 11:19:16 blueness Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -24,4 +24,4 @@ RDEPEND=">=dev-python/pyptlib-0.0.6[${PYTHON_USEDEP}]
 	dev-python/twisted-core[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}"/${P}-remove-argparse.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.2.9-remove-argparse.patch )
diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.8.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.8.ebuild
deleted file mode 100644
index aca2696ee68c..000000000000
--- a/net-proxy/obfsproxy/obfsproxy-0.2.8.ebuild
+++ /dev/null
@@ -1,53 +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/obfsproxy/obfsproxy-0.2.8.ebuild,v 1.2 2014/07/06 12:55:23 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="An obfuscating proxy using Tor's pluggable transport protocol"
-HOMEPAGE="https://www.torproject.org/projects/obfsproxy.html"
-SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( ChangeLog INSTALL README TODO doc/HOWTO.txt )
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND=">=dev-python/pyptlib-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6-r2[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	epatch "${FILESDIR}"/obfsproxy-0.2.8-remove-argparse.patch
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To run ${PN} with a tor bridge, add the following to your torrc file:"
-	einfo
-	einfo " SocksPort 0"
-	einfo " ORPort 443 # or some other port if you already run a webserver/skype"
-	einfo " BridgeRelay 1"
-	einfo " ExitPolicy reject *:*"
-	einfo " Nickname CHANGEME_1"
-	einfo " ContactInfo CHANGEME_2"
-	einfo " ServerTransportPlugin obfs2,obfs3 exec /usr/bin/${PN} managed"
-	einfo
-	einfo "Obviously, change CHANGEME_1 and CHANGEME_2 to appropriate values.  When you"
-	einfo "start tor, you should see a message similar to the following in its logs:"
-	einfo
-	einfo " Oct 05 20:00:41.000 [notice] Registered server transport 'obfs2' at '0.0.0.0:26821"
-	einfo " Oct 05 20:00:42.000 [notice] Registered server transport 'obfs3' at '0.0.0.0:40172"
-	einfo
-	einfo "Note the port numbers, 26821 and 40172 in this case, and report it, along with"
-	einfo "your IP address, to your bridge clients.  If you are behind a NAT firewall, you"
-	einfo "you need to do port forwarding on those ports."
-	einfo
-}