Version bump, remove older

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

6 files changed, 47 insertions, 119 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/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 )