modified: net-misc/tor/tor-9999.ebuild

1 files changed, 55 insertions, 41 deletions

diff --git a/net-misc/tor/tor-9999.ebuild b/net-misc/tor/tor-9999.ebuild
index e8daa71..348b1b1 100644
--- a/net-misc/tor/tor-9999.ebuild
+++ b/net-misc/tor/tor-9999.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.0.31.ebuild,v 1.6 2008/11/14 12:43:56 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.8_alpha.ebuild,v 1.1 2011/11/26 15:05:41 blueness Exp $
 
-inherit eutils git
+EAPI=4
 
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://tor.eff.org"
-MY_PV=${PV/_/-}
-SRC_URI=""
-S="${WORKDIR}/${P/_/}"
+inherit eutils flag-o-matic versionator git
 
+#MY_PV="$(replace_version_separator 4 -)"
+#MY_PF="${PN}-${MY_PV}"
+S="${WORKDIR}/${P/_/}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
 EGIT_REPO_URI="git://git.torproject.org/git/tor"
 EGIT_BOOTSTRAP="./autogen.sh"
 
-
+#S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD"
-SLOT=""
-KEYWORDS="~amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="debug logrotate"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
 
 DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-1.2"
-RDEPEND="${DEPEND}
-	net-proxy/tsocks"
+	>=dev-libs/libevent-2.0.14
+	nat-pmp? ( net-libs/libnatpmp )
+	upnp? ( <net-libs/miniupnpc-1.6 )"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	enewgroup tor
@@ -31,45 +33,57 @@ pkg_setup() {
 }
 
 src_unpack() {
-#	unpack ${A}
 	git_src_unpack
 	cd "${S}"
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-#	epatch "${FILESDIR}"/${PN}-0.2.0.30-logrotate.patch
+	./autogen.sh
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/torrc.sample.patch
 }
 
-src_compile() {
-	econf $(use_enable debug) --disable-asciidoc
-	emake || die
+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 --docdir=/usr/share/doc/${PF} \
+		$(use_enable bufferevents) \
+		$(use_enable doc asciidoc) \
+		$(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() {
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
+	emake DESTDIR="${D}" install
+	keepdir /var/lib/tor
 
-	dodoc README ChangeLog AUTHORS ReleaseNotes \
+	dodoc README ChangeLog ReleaseNotes \
 		doc/{HACKING,TODO} \
-		doc/spec/*.txt
+		doc/spec/README
 
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
 
-	if use logrotate; then
-		sed -e "s:/lib::" \
-			-e "s:/rc.d::" \
-			-e "s:\\*:\\*.:" \
-			-e "s:sharedscripts:create 0640 tor tor\n\tsharedscripts:" -i contrib/tor.logrotate || die
-		insinto /etc/logrotate.d
-		newins contrib/tor.logrotate tor
-	fi
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
 }
 
 pkg_postinst() {
-	elog "You must create /etc/tor/torrc, you can use the sample that is in that directory"
-	elog "To have privoxy and tor working together you must add:"
+	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 "(notice the . at the end of the line)"
-	elog "to /etc/privoxy/config"
+	elog
+	elog "to /etc/privoxy/config.  Notice the . at the end!"
+	elog
 }