Version bump alpha and remove older one

(Portage version: 2.1.10.49/cvs/Linux x86_64)

6 files changed, 13 insertions, 120 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index a1cc2359932e..20ba06605009 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.323 2012/03/23 01:00:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.324 2012/03/27 15:15:05 blueness Exp $
+
+*tor-0.2.3.13_alpha (27 Mar 2012)
+
+  27 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  -files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch,
+  -tor-0.2.3.12_alpha-r1.ebuild, -tor-0.2.3.12_alpha-r2.ebuild,
+  -files/tor-0.2.3.12_alpha-fix-miniupnpc-1.6.patch,
+  -files/tor-0.2.3.12_alpha-fix-tor-fw-helper-natpmp.patch,
+  +tor-0.2.3.13_alpha.ebuild,
+  +files/tor-0.2.3.13_alpha-fix-miniupnpc-1.6.patch:
+  Version bump alpha and remove older one
 
 *tor-0.2.3.12_alpha-r2 (23 Mar 2012)
 
diff --git a/net-misc/tor/files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch b/net-misc/tor/files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch
deleted file mode 100644
index ab4fccb68906..000000000000
--- a/net-misc/tor/files/tor-0.2.3.11_alpha-fix-tor-fw-helper-natpmp.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes a regression in tor-fw-helper-natpmp.c where
-a filedescriptor is incorrectly type tor_socket_t.
-
-See https://trac.torproject.org/projects/tor/ticket/4955
-
-diff -Naur tor-0.2.3.11-alpha.orig/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c tor-0.2.3.11-alpha/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
---- tor-0.2.3.11-alpha.orig/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c	2012-01-21 22:07:30.000000000 -0500
-+++ tor-0.2.3.11-alpha/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c	2012-01-24 07:57:42.000000000 -0500
-@@ -87,7 +87,7 @@
- 
- /** Use select() to wait until we can read on fd. */
- static int
--wait_until_fd_readable(tor_socket_t fd, struct timeval *timeout)
-+wait_until_fd_readable(unsigned int fd, struct timeval *timeout)
- {
-   int r;
-   fd_set fds;
diff --git a/net-misc/tor/files/tor-0.2.3.12_alpha-fix-tor-fw-helper-natpmp.patch b/net-misc/tor/files/tor-0.2.3.12_alpha-fix-tor-fw-helper-natpmp.patch
deleted file mode 100644
index 96532ecfd403..000000000000
--- a/net-misc/tor/files/tor-0.2.3.12_alpha-fix-tor-fw-helper-natpmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes a regression in tor-fw-helper-natpmp.c where
-a filedescriptor is incorrectly type tor_socket_t.
-
-See https://trac.torproject.org/projects/tor/ticket/4955
-
---- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
-+++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
-@@ -23,6 +23,8 @@
- // debugging stuff
- #include <assert.h>
- 
-+#include "compat.h"
-+
- #include "tor-fw-helper.h"
- #include "tor-fw-helper-natpmp.h"
diff --git a/net-misc/tor/files/tor-0.2.3.12_alpha-fix-miniupnpc-1.6.patch b/net-misc/tor/files/tor-0.2.3.13_alpha-fix-miniupnpc-1.6.patch
index b3b1be263c19..b3b1be263c19 100644
--- a/net-misc/tor/files/tor-0.2.3.12_alpha-fix-miniupnpc-1.6.patch
+++ b/net-misc/tor/files/tor-0.2.3.13_alpha-fix-miniupnpc-1.6.patch
diff --git a/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild b/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild
deleted file mode 100644
index 2276b7862e83..000000000000
--- a/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild,v 1.2 2012/03/08 16:14:22 blueness Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic versionator
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0.14
-	nat-pmp? ( net-libs/libnatpmp )
-	upnp? ( <net-libs/miniupnpc-1.6 )
-	selinux? ( sec-policy/selinux-tor )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample.patch
-	epatch "${FILESDIR}"/${P}-fix-tor-fw-helper-natpmp.patch
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf \
-		--enable-asciidoc \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable bufferevents) \
-		$(use_enable nat-pmp) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable threads) \
-		$(use_enable upnp)
-}
-
-src_install() {
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r6 tor
-
-	emake DESTDIR="${D}" install
-
-	keepdir /var/lib/tor
-
-	dodoc README ChangeLog ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/README
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}
diff --git a/net-misc/tor/tor-0.2.3.12_alpha-r2.ebuild b/net-misc/tor/tor-0.2.3.13_alpha.ebuild
index 4fe4c4d84eb3..b6dc259fd9eb 100644
--- a/net-misc/tor/tor-0.2.3.12_alpha-r2.ebuild
+++ b/net-misc/tor/tor-0.2.3.13_alpha.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.12_alpha-r2.ebuild,v 1.1 2012/03/23 01:00:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.13_alpha.ebuild,v 1.1 2012/03/27 15:15:05 blueness Exp $
 
 EAPI="4"
 
@@ -32,7 +32,6 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/torrc.sample.patch
-	epatch "${FILESDIR}"/${P}-fix-tor-fw-helper-natpmp.patch
 	epatch "${FILESDIR}"/${P}-fix-miniupnpc-1.6.patch
 	eautoreconf
 }