diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2014-03-29 19:16:07 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2014-03-29 19:16:07 +0000 |
commit | 12462f0cbde2ea286ce6ed11504ff4673d9dcacf (patch) | |
tree | 2777985bf52ed6d03fc0bdce7cd4220c7b8c9c82 /net-proxy | |
parent | Version bump, drop old (diff) | |
download | gentoo-2-12462f0cbde2ea286ce6ed11504ff4673d9dcacf.tar.gz gentoo-2-12462f0cbde2ea286ce6ed11504ff4673d9dcacf.tar.bz2 gentoo-2-12462f0cbde2ea286ce6ed11504ff4673d9dcacf.zip |
Version bump, fix bug #505086
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'net-proxy')
-rw-r--r-- | net-proxy/obfsproxy/ChangeLog | 9 | ||||
-rw-r--r-- | net-proxy/obfsproxy/files/obfsproxy-0.2.8-remove-argparse.patch | 11 | ||||
-rw-r--r-- | net-proxy/obfsproxy/obfsproxy-0.2.8.ebuild (renamed from net-proxy/obfsproxy/obfsproxy-0.2.6.ebuild) | 10 |
3 files changed, 27 insertions, 3 deletions
diff --git a/net-proxy/obfsproxy/ChangeLog b/net-proxy/obfsproxy/ChangeLog index bd89061bd674..9a773d1d4b85 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.24 2014/03/15 18:51:20 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/ChangeLog,v 1.25 2014/03/29 19:16:07 blueness Exp $ + +*obfsproxy-0.2.8 (29 Mar 2014) + + 29 Mar 2014; Anthony G. Basile <blueness@gentoo.org> + +files/obfsproxy-0.2.8-remove-argparse.patch, +obfsproxy-0.2.8.ebuild, + -obfsproxy-0.2.6.ebuild: + Version bump, fix bug #505086 *obfsproxy-0.2.7 (15 Mar 2014) diff --git a/net-proxy/obfsproxy/files/obfsproxy-0.2.8-remove-argparse.patch b/net-proxy/obfsproxy/files/obfsproxy-0.2.8-remove-argparse.patch new file mode 100644 index 000000000000..9c5051667669 --- /dev/null +++ b/net-proxy/obfsproxy/files/obfsproxy-0.2.8-remove-argparse.patch @@ -0,0 +1,11 @@ +diff -Naur obfsproxy-0.2.8.orig/setup.py obfsproxy-0.2.8/setup.py +--- obfsproxy-0.2.8.orig/setup.py 2014-03-27 13:24:39.000000000 -0400 ++++ obfsproxy-0.2.8/setup.py 2014-03-29 15:10:05.063283282 -0400 +@@ -32,7 +32,6 @@ + 'setuptools', + 'PyCrypto', + 'Twisted', +- 'argparse', + 'pyptlib >= 0.0.5', + 'pyyaml' + ], diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.6.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.8.ebuild index 7d988be047a2..a9aa0608d86c 100644 --- a/net-proxy/obfsproxy/obfsproxy-0.2.6.ebuild +++ b/net-proxy/obfsproxy/obfsproxy-0.2.8.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.6.ebuild,v 1.1 2014/02/04 13:19:52 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/obfsproxy/obfsproxy-0.2.8.ebuild,v 1.1 2014/03/29 19:16:07 blueness Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 ) @@ -21,7 +21,13 @@ 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/twisted-core[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + virtual/python-argparse[${PYTHON_USEDEP}]" + +src_prepare() { + epatch "${FILESDIR}"/obfsproxy-0.2.8-remove-argparse.patch +} pkg_postinst() { einfo |