clean up

(Portage version: 2.1.6.13/cvs/Linux i686)

6 files changed, 7 insertions, 383 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 0106fa10f550..c720cb1fbb84 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.188 2009/12/26 20:32:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.189 2009/12/27 17:27:23 fauli Exp $
+
+  27 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+  -files/tor-0.2.0.30-logrotate.patch,
+  -files/tor-0.2.0.33-no-internal-libevent.patch, -tor-0.2.0.35.ebuild,
+  -tor-0.2.1.19.ebuild, -tor-0.2.1.19-r1.ebuild:
+  clean up
 
   26 Dec 2009; Raúl Porcel <armin76@gentoo.org> tor-0.2.1.19-r2.ebuild:
   sparc stable wrt #294297
diff --git a/net-misc/tor/files/tor-0.2.0.30-logrotate.patch b/net-misc/tor/files/tor-0.2.0.30-logrotate.patch
deleted file mode 100644
index d597a91fb110..000000000000
--- a/net-misc/tor/files/tor-0.2.0.30-logrotate.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- contrib/tor.logrotate.in.ori	2008-08-01 17:12:35.500216496 +0200
-+++ contrib/tor.logrotate.in	2008-08-01 17:12:46.352234096 +0200
-@@ -7,6 +7,6 @@
- 	notifempty
- 	sharedscripts
- 	postrotate
--		/etc/init.d/tor reload > /dev/null
-+		/etc/init.d/tor reload > /dev/null || true
- 	endscript
- }
diff --git a/net-misc/tor/files/tor-0.2.0.33-no-internal-libevent.patch b/net-misc/tor/files/tor-0.2.0.33-no-internal-libevent.patch
deleted file mode 100644
index 7c565358ce71..000000000000
--- a/net-misc/tor/files/tor-0.2.0.33-no-internal-libevent.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff -u src/or.orig/dns.c src/or/dns.c
---- src/or.orig/dns.c	2009-01-14 20:58:15.000000000 +0100
-+++ src/or/dns.c	2009-01-29 14:51:21.000000000 +0100
-@@ -16,7 +16,7 @@
- 
- #include "or.h"
- #include "ht.h"
--#include "eventdns.h"
-+#include <evdns.h>
- 
- /** Longest hostname we're willing to resolve. */
- #define MAX_ADDRESSLEN 256
-diff -u src/or.orig/dnsserv.c src/or/dnsserv.c
---- src/or.orig/dnsserv.c	2008-02-26 20:56:28.000000000 +0100
-+++ src/or/dnsserv.c	2009-01-29 14:51:34.000000000 +0100
-@@ -12,7 +12,7 @@
-  **/
- 
- #include "or.h"
--#include "eventdns.h"
-+#include <evdns.h>
- 
- /* Helper function: called by evdns whenever the client sends a request to our
-  * DNSPort.  We need to eventually answer the request <b>req</b>.
-diff -u src/or.orig/Makefile.am src/or/Makefile.am
---- src/or.orig/Makefile.am	2008-03-11 19:57:51.000000000 +0100
-+++ src/or/Makefile.am	2009-01-29 14:50:44.000000000 +0100
-@@ -20,7 +20,6 @@
- 	networkstatus.c \
- 	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
- 	rendservice.c rephist.c router.c routerlist.c routerparse.c \
--	eventdns.c \
- 	tor_main.c
- 
- AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
-@@ -42,7 +41,6 @@
- 	networkstatus.c \
- 	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
- 	rendservice.c rephist.c router.c routerlist.c routerparse.c \
--	eventdns.c \
- 	test_data.c test.c
- 
- test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
-@@ -50,7 +48,7 @@
- test_LDADD = ../common/libor.a ../common/libor-crypto.a \
-         -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@
- 
--noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i
-+noinst_HEADERS = or.h micro-revision.i
- 
- tor_main.o: micro-revision.i
- 
-diff -u src/or.orig/Makefile.in src/or/Makefile.in
---- src/or.orig/Makefile.in	2009-01-21 18:38:07.000000000 +0100
-+++ src/or/Makefile.in	2009-01-29 14:50:29.000000000 +0100
-@@ -56,7 +56,7 @@
- 	dirvote.c dns.c dnsserv.c geoip.c hibernate.c main.c ntmain.c \
- 	networkstatus.c onion.c policies.c relay.c rendcommon.c \
- 	rendclient.c rendmid.c rendservice.c rephist.c router.c \
--	routerlist.c routerparse.c eventdns.c test_data.c test.c
-+	routerlist.c routerparse.c test_data.c test.c
- @BUILD_NT_SERVICES_TRUE@am__objects_1 = ntmain.$(OBJEXT)
- am_test_OBJECTS = buffers.$(OBJEXT) circuitbuild.$(OBJEXT) \
- 	circuitlist.$(OBJEXT) circuituse.$(OBJEXT) command.$(OBJEXT) \
-@@ -69,7 +69,7 @@
- 	onion.$(OBJEXT) policies.$(OBJEXT) relay.$(OBJEXT) \
- 	rendcommon.$(OBJEXT) rendclient.$(OBJEXT) rendmid.$(OBJEXT) \
- 	rendservice.$(OBJEXT) rephist.$(OBJEXT) router.$(OBJEXT) \
--	routerlist.$(OBJEXT) routerparse.$(OBJEXT) eventdns.$(OBJEXT) \
-+	routerlist.$(OBJEXT) routerparse.$(OBJEXT) \
- 	test_data.$(OBJEXT) test.$(OBJEXT)
- test_OBJECTS = $(am_test_OBJECTS)
- test_DEPENDENCIES = ../common/libor.a ../common/libor-crypto.a
-@@ -81,7 +81,7 @@
- 	dirvote.c dns.c dnsserv.c geoip.c hibernate.c main.c ntmain.c \
- 	networkstatus.c onion.c policies.c relay.c rendcommon.c \
- 	rendclient.c rendmid.c rendservice.c rephist.c router.c \
--	routerlist.c routerparse.c eventdns.c tor_main.c
-+	routerlist.c routerparse.c tor_main.c
- am_tor_OBJECTS = buffers.$(OBJEXT) circuitbuild.$(OBJEXT) \
- 	circuitlist.$(OBJEXT) circuituse.$(OBJEXT) command.$(OBJEXT) \
- 	config.$(OBJEXT) connection.$(OBJEXT) \
-@@ -93,7 +93,7 @@
- 	onion.$(OBJEXT) policies.$(OBJEXT) relay.$(OBJEXT) \
- 	rendcommon.$(OBJEXT) rendclient.$(OBJEXT) rendmid.$(OBJEXT) \
- 	rendservice.$(OBJEXT) rephist.$(OBJEXT) router.$(OBJEXT) \
--	routerlist.$(OBJEXT) routerparse.$(OBJEXT) eventdns.$(OBJEXT) \
-+	routerlist.$(OBJEXT) routerparse.$(OBJEXT) \
- 	tor_main.$(OBJEXT)
- tor_OBJECTS = $(am_tor_OBJECTS)
- tor_DEPENDENCIES = ../common/libor.a ../common/libor-crypto.a
-@@ -230,7 +230,6 @@
- 	networkstatus.c \
- 	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
- 	rendservice.c rephist.c router.c routerlist.c routerparse.c \
--	eventdns.c \
- 	tor_main.c
- 
- AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
-@@ -253,7 +252,6 @@
- 	networkstatus.c \
- 	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
- 	rendservice.c rephist.c router.c routerlist.c routerparse.c \
--	eventdns.c \
- 	test_data.c test.c
- 
- test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
-@@ -262,7 +260,7 @@
- test_LDADD = ../common/libor.a ../common/libor-crypto.a \
-         -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@
- 
--noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i
-+noinst_HEADERS = or.h micro-revision.i
- all: all-am
- 
- .SUFFIXES:
-@@ -351,7 +349,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirvote.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsserv.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eventdns.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geoip.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hibernate.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
diff --git a/net-misc/tor/tor-0.2.0.35.ebuild b/net-misc/tor/tor-0.2.0.35.ebuild
deleted file mode 100644
index 4cdf98a4ad83..000000000000
--- a/net-misc/tor/tor-0.2.0.35.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 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.35.ebuild,v 1.6 2009/07/12 00:57:38 josejx Exp $
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-MY_PV=${PV/_/-}
-SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+bundledlibevent debug"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-1.2"
-RDEPEND="${DEPEND}
-	net-proxy/tsocks"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/${PN}-0.2.0.30-logrotate.patch
-	# Normally tor uses a bundled libevent fragment to provide
-	# asynchronous DNS requests.  This is generally a bad idea, but at
-	# the moment the official libevent does not have the 0x20 hack, so
-	# anonymity is higher with the bundled variant.  Remove patch as
-	# soon as upstream has installed the autoconf option to use
-	# system's libevent (0.2.1 or later)
-	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
-	# for upstream's report
-	use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.0.33-no-internal-libevent.patch
-}
-
-src_compile() {
-	econf $(use_enable debug)
-	emake || die
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/*.txt
-
-	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
-
-	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
-
-	# allow the tor user more open files to avoid errors, see bug 251171
-	insinto /etc/security/limits.d/
-	doins "${FILESDIR}"/tor.conf
-}
-
-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 "forward-socks4a / localhost:9050 ."
-	elog "(notice the . at the end of the line)"
-	elog "to /etc/privoxy/config"
-
-	if ! use bundledlibevent; then
-		elog
-		elog "Please be aware that using the system's libevent library will lower your anonymity"
-		elog "a little bit.  If you rely on it, please enable USE=bundledlibevent."
-	fi
-}
diff --git a/net-misc/tor/tor-0.2.1.19-r1.ebuild b/net-misc/tor/tor-0.2.1.19-r1.ebuild
deleted file mode 100644
index 4ba56b60e3a2..000000000000
--- a/net-misc/tor/tor-0.2.1.19-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.19-r1.ebuild,v 1.1 2009/08/17 19:42:11 fauli Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-MY_PV=${PV/_/-}
-SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-1.2"
-RDEPEND="${DEPEND}
-	net-proxy/tsocks"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/${P}-logrotate.patch
-	# Normally tor uses a bundled libevent fragment to provide
-	# asynchronous DNS requests.  This is generally a bad idea, but at
-	# the moment the official libevent does not have the 0x20 hack, so
-	# anonymity is higher with the bundled variant.  Remove patch as
-	# soon as upstream has installed the autoconf option to use
-	# system's libevent.  This hasn't happened, so we
-	# have to live with the bundled libevent for this release, as the
-	# current version in tree won't suffice for tor to build
-	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
-	# for upstream's report
-	# Let's revisit this when libevent-2* is unmasked
-	# use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/*.txt
-
-	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
-
-	insinto /etc/logrotate.d
-	newins contrib/tor.logrotate tor
-
-	# allow the tor user more open files to avoid errors, see bug 251171
-	insinto /etc/security/limits.d/
-	doins "${FILESDIR}"/tor.conf
-}
-
-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 "forward-socks4a / localhost:9050 ."
-	elog "(notice the . at the end of the line)"
-	elog "to /etc/privoxy/config"
-}
diff --git a/net-misc/tor/tor-0.2.1.19.ebuild b/net-misc/tor/tor-0.2.1.19.ebuild
deleted file mode 100644
index 69b95481f29a..000000000000
--- a/net-misc/tor/tor-0.2.1.19.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.19.ebuild,v 1.1 2009/08/06 22:01:30 fauli Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-MY_PV=${PV/_/-}
-SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-1.2"
-RDEPEND="${DEPEND}
-	net-proxy/tsocks"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/${PN}-0.2.0.30-logrotate.patch
-	# Normally tor uses a bundled libevent fragment to provide
-	# asynchronous DNS requests.  This is generally a bad idea, but at
-	# the moment the official libevent does not have the 0x20 hack, so
-	# anonymity is higher with the bundled variant.  Remove patch as
-	# soon as upstream has installed the autoconf option to use
-	# system's libevent.  This hasn't happened, so we
-	# have to live with the bundled libevent for this release, as the
-	# current version in tree won't suffice for tor to build
-	# See http://bugs.noreply.org/flyspray/index.php?do=details&id=920
-	# for upstream's report
-	# Let's revisit this when libevent-2* is unmasked
-	# use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r4 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/*.txt
-
-	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
-
-	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
-
-	# allow the tor user more open files to avoid errors, see bug 251171
-	insinto /etc/security/limits.d/
-	doins "${FILESDIR}"/tor.conf
-}
-
-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 "forward-socks4a / localhost:9050 ."
-	elog "(notice the . at the end of the line)"
-	elog "to /etc/privoxy/config"
-}