Version bump, remove older

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

7 files changed, 65 insertions, 138 deletions

diff --git a/net-proxy/obfsproxy/ChangeLog b/net-proxy/obfsproxy/ChangeLog
index 9a773d1d4b85..f03813b839c2 100644
--- a/net-proxy/obfsproxy/ChangeLog
+++ b/net-proxy/obfsproxy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.25 2014/03/29 19:16:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/ChangeLog,v 1.26 2014/05/02 13:39:07 blueness Exp $
+
+*obfsproxy-0.2.9 (02 May 2014)
+
+  02 May 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/obfsproxy-0.2.9-remove-argparse.patch, +obfsproxy-0.2.9.ebuild,
+  -obfsproxy-0.1.4-r1.ebuild, -obfsproxy-0.2.7.ebuild, metadata.xml:
+  Version bump, remove older
 
 *obfsproxy-0.2.8 (29 Mar 2014)
 
diff --git a/net-proxy/obfsproxy/Manifest b/net-proxy/obfsproxy/Manifest
index bf84735d8e9c..2f2fbce65ec2 100644
--- a/net-proxy/obfsproxy/Manifest
+++ b/net-proxy/obfsproxy/Manifest
@@ -2,30 +2,29 @@
 Hash: SHA256
 
 AUX obfsproxy-0.2.8-remove-argparse.patch 363 SHA256 33a2dce7e5aed8748713c21ef346a0ad73d826df1c28a4680b4c616f5ab55838 SHA512 48f511d4a3176df022e4247705784cda4daa08167c989c2588562cd7b247d38dbf929e57566ba95c2364927c2507dc95152d5baae6a1448efbca02853be103bd WHIRLPOOL 00ccd1f843f10f58dbfbe2dcccae046caef098ed121b6aaf6ac9927127e1a1b388b7f30c1eb10216052c6c931fa313cc85faac3ae1b1334dc651b13b05341bbd
+AUX obfsproxy-0.2.9-remove-argparse.patch 363 SHA256 210271cb6755ccb6034828788dfeb73488592d364851cf7542b5fa14ce68bbec SHA512 1e93d58ef602cecc3699551c6b2ae5b7b169260451aadbe486704bb801e621906992472bd3e5674a8a578d757739f0ef61b60bb20b12f5018131f3cff6f398d7 WHIRLPOOL 19b7f52a15e7227ee91f2a7b816744eb60d698c496aa59a56a0f5416812bb5c0d7fbcdcff08f9806ab18e23e82b097076e403f4b36cbde8b1604c754ae6be55b
 AUX obfsproxy.confd 1494 SHA256 a370791b7bf021fffe83c257642f623368c28d02946e3865194bfa22f8279b95 SHA512 722224e227cbedecae1e769a2d1198a397d7096daea8c6b7b2f0aff92396a1ec4b83e1037dff31d99fe98812be220461d6e479966131975c7e2b80bb82b19093 WHIRLPOOL f85c83be1bd54451248a29040815afc9e9b46be780d6a73e0a307accaf94685bfeebad28ac69ff284f2f21fd9b565a1e25e71401002ae25c90f5eef39b97e4df
 AUX obfsproxy.initd 1808 SHA256 52789c3b7ddcdb7221111a2498e15721d611918765e405e7354b9303ef8858bb SHA512 640c91ec243b6115c050a5752cc62fe4bbfeddfa7a45fb806dceeb08b4cc230890bc1f96269adcddfe49c43ca0d143ab4a735fce65068a608ba6d2af10a7d973 WHIRLPOOL f84b6fc41eabac25bf3d2eb3f7a42e91ee94f7aa69e189a3d4fdc592b1ffde3f3428a42fa22a4cd76275574a539266afc65d65e932d1b633a8f6b39b7397b51a
-DIST obfsproxy-0.1.4.tar.gz 217518 SHA256 6e0ed147e9be4b9f89862b5e2597d355427e977a69c8dfb6e15c04530d3bedb3 SHA512 5bf06be42e4a7ec4677252dcd9def3f26ca0ce2dfca3c4f514271561b3014937421929ec0432f508368fe3f885a4a6c186f3bf0d48b7cd48097c4532b1f5102f WHIRLPOOL fa219d58bce96bdf25e2beaef59e1b04c68bcd36cda6763976526de45f66f47a4f645917234cbf9adc1a36597ee7d1e4533a96a4ea57baa35dbe5d2197d027f9
-DIST obfsproxy-0.2.7.tar.gz 88636 SHA256 700d96f32b7311963b7dea6636c0c3f98333f09b7c9c4e5931a0979ee43cb71b SHA512 1fc7eafe469a7bc76bba7fecfc13da322210c7b0edde26552d9a97e654f7fa911010ef24f0001a7e8d92a6646caff9a35b0ec74f48cf86d77d04b57f9db96b58 WHIRLPOOL 9992c8e130b29a1cc1325ce5f8789769e265dffbd8cd64de6f6deba4ce5afc64b95620cc5b4995e4d9947f9e68bae30b4958108552fef934016b1fa1466a09ba
 DIST obfsproxy-0.2.8.tar.gz 88880 SHA256 6d1665a975809d2df6336e9d3004aa357afa4c31662573dd9b972a0ea59f0301 SHA512 1895e6fe6c1042579c1266ad5db7d4e459c89709aa4b9d49d9e5b2495c653a4631bca559aa41a71dd2ddb72e8ff91c334e946a6f49a49a002e4bf39a3c7c52cb WHIRLPOOL 9e3df9cdedab0c1efa81c98ec8ef28317c5f64c9c46bebfd145bb2af72d3ed645f36f22008b683c3840d60bd4dd8ba19ebd3680a426d9efe5c2d49f5c0d3a0b4
-EBUILD obfsproxy-0.1.4-r1.ebuild 2033 SHA256 2d388c8a8f29c9921df2f60d68e628c04742555d136dbda17ac5d0fcd6d4cd96 SHA512 344ceae21513d3f29492feceaffc7fe9b83b9adf1adf93249b10f62d1612ead4aa92ec0dbcb553408b45100de3cc8cfb58bc31e0ff3b75bac4a9a1383399707f WHIRLPOOL 2a5d60d3946ffe4c7ea46f59f32d59d352619569af545b5f736aaf4e568739b27088b42f89836726f24e871aacd4956f236250942735a7a6e552ca120a1881cc
-EBUILD obfsproxy-0.2.7.ebuild 1788 SHA256 e7cb13143dfe164a7304f260922091784bb01f5a4acc60a3fac4e2e9741fc77a SHA512 66c8f284e2e0ac3140cbf6328298328d69fb5ffaf5faf8d38560dd4e82fdc5eba3c99f697fd14fc9adc4c1f5dd08d3a5886fc93c8903cba64bd2867a58e81209 WHIRLPOOL 8221683be3f0b8a76368f56e3930ed01c38041563324c81fcea5326b031289eb824344a04d05440a0965cfd46b311aef7a85defb110c1f3b977f89f4eee742a5
+DIST obfsproxy-0.2.9.tar.gz 92163 SHA256 603bde8db72324a7fdbd8c4abaebb7546f1515cdc7aedc1d7fef21d9c499de9f SHA512 d44c0fc8381cce6e60f06fd294f32af0d8e9a70f7da7da2a8552271a2cc8481cd85154500e23bbbfd1af37c0a184995d79a9309f020e0892e1e68dc741d26a38 WHIRLPOOL e055a979647f0561304c69fbe78ee7405e84b35a29095e8fcc56755688efdd480d9ca25ae4f2999048dd2e0558a850cb2aae11ef76d395b98e2e3569facfe822
 EBUILD obfsproxy-0.2.8.ebuild 1947 SHA256 6db99b07be7b7b9702908509becaf52c438bba6aaeedd05846858bd0736ea8dc SHA512 1413f79ea5d4b1a35a0463962be70b25c0f0a593eb33164f7a21881c70925da9150241fc9953367d34ae34284c714152ad3b9b1a64d76f06d5c49f42d59c11fd WHIRLPOOL cc619ca45b4991720488fb717279904f52d2c0dca7b7f01b3620f970b8b5920a0905a0c73d29a118fc23f82f5653d5641a89763310d85226beedbeeeee99a639
-MISC ChangeLog 3645 SHA256 1313aaf57de2e04235199b896f9ca98ee9946a7ceda63a9a7b79b55eea7ad5f2 SHA512 4b7560e48a7f48e5083e63ae512598f4278a7ebc108662777ab07380d86fd8186f6b804dafb926c8d91f2d6741fc0a560276a908e044be5b3be29c8d82cadf93 WHIRLPOOL 84dce277838ecf5022675db77936b624fa591794e6fc7ff9ec63bf82fd948aec16c559a6674cc8dedde3f9bb819ef813d7145c59682ab6a39e250eafff8029b8
-MISC metadata.xml 319 SHA256 1f131e89abe09d6120753980e23dcb5e4438359f11fb10d2bb20d554d9fc6dea SHA512 5c9bceffaa09973714dd04e28e4f23639bc0f3d7f790d2a0e7666b5397c3fa16ca0227555bf904fe5c335d9f0daa6a05db2bbb3ea1ff25fcdbcb7436621b52f4 WHIRLPOOL 7ee9236cbd0e478c1a267145e4c945e9bdc8548255ca0ef9d1d569bdca4fe49568fc0ddad91588ee545581cc2b0c72681389ef4a57e14dae2542c81117b4146c
+EBUILD obfsproxy-0.2.9.ebuild 901 SHA256 568b4c7875ae694a9eccf7fa7fef09acaac3202cf74a9c5cd8e65f19d3ba59fe SHA512 b64efe4bb270197e61a6be7a0fab280ab3bcf5cc85e342d72a6aba48f941d12a24ecb64615afbf3b111290cebda1409455f00ca3a7ff8f9162eb1d069013c087 WHIRLPOOL 605a80c632596055698df1c2d4f63bde57239689fef76c6d3b826f25b9efee9f46d1008bea2da5496ae3712598a1f91b201a20bf42f85b4a26dff4edf8f990dd
+MISC ChangeLog 3904 SHA256 af4b407612de8a3c5294e11b26e939c2c7dab97bf8ef16bf4c400affdca6b431 SHA512 7b878b6e190fd1c750264ffe429ea51ee920dce279b069db7a77d4efd993957204d78cc22cef88ebfc94130e1a6bd448f506111ef51e472f3c466f922e1d67cf WHIRLPOOL 7b3e527282db94687ccd3772bb578ea324653be65acb31d5fca943d8910e41130382c821aa7ebd6237c67ba066448692928c4342e1d706b855c70e5569304cbd
+MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTNxwpAAoJEJOE+m71LUu6BHUQAKMHSM2pevV5arDhH4hk9kUF
-wpw0keXa5cRgrBsgNeM3/eaVton4J6D59fvt+khM6eQA4oBxMbqbflulerOnGHCn
-EkMdKb2x1abrlC6BldqbvR9bPnX1uQy27Swphv5OWmqNZIYDiHNm6JHrPFUqfDgI
-qA4+j0P8CuhmTQ42JJyJLRKS7woDQseKwiPcIHizwB1oGoWuZb2wO3grSyZ+u00g
-OV+WCgztVsISJnBt9dL7Dj/h5Ih2U/Ftenl/uyrK6scjU4SwHN0oRXald1c1izi8
-VX4Y13Qp92gsrJTCLUkKQVH2R6UPwbso4wHspbo19dqqN4ykaKeZCOpwWo+WPeWs
-bL+6x9p0vhGn2j/2zSlE+p4mUyJ544p1uHmCoN2Sd0vEPrfnivr7Vqd3nRTZmjb4
-4BQpvb3fB8a3EiFQBChPeKbieeYhfFyvXcI2z2yb9xvlxyJHoUzeASW55l3eMmAH
-mdOo40kbvL7nLW9PHmhNkOu+J2DSzkiAiC2NRD1u4xYBtDvVLDbbadDGN+r3mhME
-IUlj7I//hUk4nA5Kd39zebHqCJyJhudSQavTdNT5LRljrar2AlkmUFRHKEGosgVv
-5BlOzVPn1H3Pv0YUxGdDMHnNpMDOC54rbk5rpzsqoOe4IWJBSNB0098d3bOsCwwB
-SQ+5KqLmaaqf5mfNsgvj
-=bwat
+iQIcBAEBCAAGBQJTY6AFAAoJEJOE+m71LUu63HcP/RkqQMRxCp3UurpN/UrYBu9Q
+WRyE9FNT4706tBFOouMGLTvqVbse2SPSpSAK2LFJ031rAj/dG92qAjEOPT5Dv6U1
+vlmPnwjX4Zrcun67/IQweJ+ao+vgn4w1qzpFVaV3r6Tovv/sXeS9aU8GCLFluKiy
+NPGNO4SovlGjkRp0AjbvUvyXe1NB8Rp3lheMU39t7P2VbLgjHizdJy2BuI6BdZfm
+VeTzS+ANPhNiqR+XQfIj9IBOaqvK9ntKQ7KFE75Od0N3khG7mzbmY++iM3qM8LQW
+wGt6Khe2dSQ8m43Jo9oIS+/xEEjauCB0XiiVGGLv0L3s4IhJkRfEMxF10s6TASRa
+y8WJKssYb+q2Bt2q7bFhBQzzQZdQOhx6/EwvLGq91oMrNXPbr1QUmwzTqM+s0S5N
+sQH/CaBA2TVP1DI5BVDe6mWEcjzbtU3Kk5TW6sGNC7Aakyw7vRXRWb1YM4Mr98Tn
+tqad08v33nShLqQS6j1Na1ZAZryGWe+2RQJyVD67SqeKmZkG28uv5gNTcW6rq+/Y
+H7//rAkPA0WmbuaAn8cz1rv7ONLmYv4wdZJBp8IhNilXrwZ/ptEgsRfM64+5JTFh
+fKKCOf/UV939T4ndpRo0TmQR/qpMHC0Q2izezOp2TZmgXzgubYpqq3LhoGzPc6B1
+qMeDDvMOsRFsSIcdUfFV
+=7P/C
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/obfsproxy/files/obfsproxy-0.2.9-remove-argparse.patch b/net-proxy/obfsproxy/files/obfsproxy-0.2.9-remove-argparse.patch
new file mode 100644
index 000000000000..ef3d28ecf75c
--- /dev/null
+++ b/net-proxy/obfsproxy/files/obfsproxy-0.2.9-remove-argparse.patch
@@ -0,0 +1,11 @@
+diff -Naur obfsproxy-0.2.9.orig/setup.py obfsproxy-0.2.9/setup.py
+--- obfsproxy-0.2.9.orig/setup.py	2014-05-01 14:37:27.000000000 -0400
++++ obfsproxy-0.2.9/setup.py	2014-05-02 09:28:37.278675261 -0400
+@@ -32,7 +32,6 @@
+         'setuptools',
+         'PyCrypto',
+         'Twisted',
+-        'argparse',
+         'pyptlib >= 0.0.6',
+         'pyyaml'
+         ],
diff --git a/net-proxy/obfsproxy/metadata.xml b/net-proxy/obfsproxy/metadata.xml
index 959210f80198..1e7587374fdf 100644
--- a/net-proxy/obfsproxy/metadata.xml
+++ b/net-proxy/obfsproxy/metadata.xml
@@ -5,7 +5,4 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<use>
-		<flag name='daemon'>Run obfsproxy as a standalone daemon</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-proxy/obfsproxy/obfsproxy-0.1.4-r1.ebuild b/net-proxy/obfsproxy/obfsproxy-0.1.4-r1.ebuild
deleted file mode 100644
index 8deb42dd04a8..000000000000
--- a/net-proxy/obfsproxy/obfsproxy-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,67 +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-r1.ebuild,v 1.7 2013/06/26 11:56:18 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="daemon"
-
-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
-	sed -i -e "s:-Werror::" Makefile.in || die
-}
-
-src_install() {
-	if use daemon; then
-		newconfd "${FILESDIR}"/obfsproxy.confd obfsproxy
-		newinitd "${FILESDIR}"/obfsproxy.initd obfsproxy
-	fi
-
-	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
-}
diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.7.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.7.ebuild
deleted file mode 100644
index 0cd56df4554b..000000000000
--- a/net-proxy/obfsproxy/obfsproxy-0.2.7.ebuild
+++ /dev/null
@@ -1,48 +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.7.ebuild,v 1.1 2014/03/15 18:51:20 blueness 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}]"
-
-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
-}
diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.9.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.9.ebuild
new file mode 100644
index 000000000000..d5fc742dffd0
--- /dev/null
+++ b/net-proxy/obfsproxy/obfsproxy-0.2.9.ebuild
@@ -0,0 +1,28 @@
+# 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.1 2014/05/02 13:39:07 blueness 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.6[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6-r2[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	virtual/python-argparse[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${P}-remove-argparse.patch )