Version bump alpha, remove older, patch for bug #435040 accepted upstream

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

4 files changed, 9 insertions, 122 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 07902880a8b9..dbbda512a1f3 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,13 @@
 # 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.362 2012/10/27 14:23:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.363 2012/11/13 12:47:58 blueness Exp $
+
+*tor-0.2.4.6_alpha (13 Nov 2012)
+
+  13 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +tor-0.2.4.6_alpha.ebuild, -files/tor-0.2.4.5-fix-udef-ref-math.patch,
+  -tor-0.2.4.4_alpha.ebuild, -tor-0.2.4.5_alpha.ebuild:
+  Version bump alpha, remove older, patch for bug #435040 accepted upstream
 
   27 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
   files/tor-0.2.4.5-fix-udef-ref-math.patch:
diff --git a/net-misc/tor/files/tor-0.2.4.5-fix-udef-ref-math.patch b/net-misc/tor/files/tor-0.2.4.5-fix-udef-ref-math.patch
deleted file mode 100644
index 5706ff7dba6a..000000000000
--- a/net-misc/tor/files/tor-0.2.4.5-fix-udef-ref-math.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix undefined reference to libm functions linking tor-fw-helper
-
-When configuring tor without upnp support, ie ./configure --disable-upnp,
-tor-fw-helper fails to link with undefined references to `ceil' and
-`log'.  This if fixed by linking to libm.
-
-X-Gentoo-Bug: 435040
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=435040
-Reported-by: Alexandre <alexandre.cortes@outlook.com>
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
-
-diff -Naur tor-0.2.4.5-alpha.orig/src/tools/tor-fw-helper/include.am tor-0.2.4.5-alpha/src/tools/tor-fw-helper/include.am
---- tor-0.2.4.5-alpha.orig/src/tools/tor-fw-helper/include.am	2012-10-26 00:39:27.000000000 -0400
-+++ tor-0.2.4.5-alpha/src/tools/tor-fw-helper/include.am	2012-10-27 10:15:53.000000000 -0400
-@@ -23,7 +23,7 @@
- 
- if MINIUPNPC
- miniupnpc_ldflags = @TOR_LDFLAGS_libminiupnpc@
--miniupnpc_ldadd = -lminiupnpc -lm @TOR_LIB_IPHLPAPI@
-+miniupnpc_ldadd = -lminiupnpc @TOR_LIB_IPHLPAPI@
- miniupnpc_cppflags = @TOR_CPPFLAGS_libminiupnpc@
- else
- miniupnpc_ldflags =
-@@ -32,5 +32,5 @@
- endif
- 
- src_tools_tor_fw_helper_tor_fw_helper_LDFLAGS = $(nat_pmp_ldflags) $(miniupnpc_ldflags)
--src_tools_tor_fw_helper_tor_fw_helper_LDADD = src/common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) @TOR_LIB_WS32@
-+src_tools_tor_fw_helper_tor_fw_helper_LDADD = src/common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) -lm @TOR_LIB_WS32@
- src_tools_tor_fw_helper_tor_fw_helper_CPPFLAGS = $(nat_pmp_cppflags) $(miniupnpc_cppflags)
diff --git a/net-misc/tor/tor-0.2.4.5_alpha.ebuild b/net-misc/tor/tor-0.2.4.5_alpha.ebuild
deleted file mode 100644
index 5da2c7325ad0..000000000000
--- a/net-misc/tor/tor-0.2.4.5_alpha.ebuild
+++ /dev/null
@@ -1,89 +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.4.5_alpha.ebuild,v 1.2 2012/10/27 02:33:56 blueness Exp $
-
-EAPI="4"
-
-inherit autotools 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="https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+bufferevents nat-pmp selinux stats tor-hardening transparent-proxy threads upnp web"
-
-DEPEND="dev-libs/openssl
-	sys-libs/zlib
-	dev-libs/libevent
-	nat-pmp? ( net-libs/libnatpmp )
-	upnp? ( net-libs/miniupnpc )
-	selinux? ( sec-policy/selinux-tor )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
-	epatch "${FILESDIR}"/${PN}-0.2.4.5-fix-udef-ref-math.patch
-	eautoreconf
-}
-
-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 \
-		--disable-buf-freelists \
-		--enable-asciidoc \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable stats instrument-downloads) \
-		$(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) \
-		$(use_enable web tor2web-mode)
-}
-
-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,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.4.4_alpha.ebuild b/net-misc/tor/tor-0.2.4.6_alpha.ebuild
index cb1cd80389fe..068934eccc89 100644
--- a/net-misc/tor/tor-0.2.4.4_alpha.ebuild
+++ b/net-misc/tor/tor-0.2.4.6_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.4.4_alpha.ebuild,v 1.1 2012/10/23 00:08:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.6_alpha.ebuild,v 1.1 2012/11/13 12:47:58 blueness Exp $
 
 EAPI="4"