clean up

Package-Manager: portage-2.1.3.19

4 files changed, 16 insertions, 128 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index ae694aad0891..37505abe25bb 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.105 2008/02/07 11:32:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.106 2008/02/07 13:42:23 opfer Exp $
+
+  07 Feb 2008; Christian Faulhammer <opfer@gentoo.org> -files/tor.initd-r2,
+  -tor-0.1.2.17.ebuild:
+  clean up
 
   07 Feb 2008; Raúl Porcel <armin76@gentoo.org> tor-0.1.2.18.ebuild:
   sparc stable wrt #208336
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 52fb98f33ac9..e697dd07ea9c 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,12 +1,19 @@
-AUX tor.initd-r2 1494 RMD160 56ac023f10e4a170daa8ec29c854968e1320107c SHA1 e76e069ce828c2a21cef0450033056d8e4e604dd SHA256 51fd05cb4c079fcb392459d066a7505de9f57f9f10b7ad5b274edcd1fe9cd1e4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tor.initd-r3 1568 RMD160 ed03ef5176615af9867af3041fdf24851cd8d14a SHA1 0722b36a30466bf9003b45da3aff7d0298cce4b6 SHA256 c65f92c3eddc1d056eebb948935abb236a235a38ededa1fbd2012f76da7f0241
 AUX tor.logrotate.patch 301 RMD160 47a096ae4e7ddabdd5974df3c8cd1b221641edbb SHA1 b3c158d27b23600cc87f5e0a2ebba732e5fe3f69 SHA256 e64ff0f7442a180bcc8f9bd5fc258058ceae227847e32b69de39b589236f09dc
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
-DIST tor-0.1.2.17.tar.gz 1251636 RMD160 7ec316cdcc57ab5e817af1dcda913438b332f7e3 SHA1 01092fb75c407b5c1d7f33db069cf7641973d94d SHA256 fc0fb0c2891ae09854a69512c6b4988964f2eaf62ce80ed6644cb21f87f6056a
 DIST tor-0.1.2.18.tar.gz 1257011 RMD160 e0ccd51288f7b41b5c4a21e49ce712066ce66a58 SHA1 ff2160d30cfcb8cd7b735236dcb641b4bcb3fbeb SHA256 e485f916dc02908a390c96b6bd3385a562281706e62987fffd486c635d380991
 DIST tor-0.1.2.19.tar.gz 1264275 RMD160 4f1b5474a4bbad2e3c82ef0fce2dd838907e48d5 SHA1 5022dab0de2499e2c6638e1a2e9eee6c79fb707c SHA256 7e57198a0858f5ba8651d75225248c85b619e905f0ff4dbb45fffa2d03a1aa61
-EBUILD tor-0.1.2.17.ebuild 1642 RMD160 bcd28211be8bca8ddd9276785321437bdc97773a SHA1 99c97438fa3bbdd48686432e59899654b1319380 SHA256 a673ffb36d9e06d3606d04466f686f71008f395c388ae2fec2070c384bd0cdab
 EBUILD tor-0.1.2.18.ebuild 1639 RMD160 7e42b3539ba5d46f7c1ece54777565374bdfcf96 SHA1 3fb6e539cfa5a3a3ee0cb740db1a276eda541b14 SHA256 72b5fe08d5b1a34389a1ee8accdac93812bf447ce6317d0447e8040ecaf03e17
 EBUILD tor-0.1.2.19.ebuild 1642 RMD160 9ef5f16661a8a49309265e16dd2f9914882c8361 SHA1 f011cfa47d6e3bfa558adfc987e16582213b66da SHA256 54adabc3b12cd5a0c9f75a305a528ed5940989e68ff05bfa8b23314e590fc790
-MISC ChangeLog 16475 RMD160 aeed8e5de28c90f5bc41d7b35b6bb46c39b102b8 SHA1 02ac266364c1ffee03ed887fccf2d328ff42e791 SHA256 6c85f4dbbc7904394d1c57287893a7f5f8f6fae720df5d74ddd885b9a95e730a
+MISC ChangeLog 16585 RMD160 b0189e5d5e2273a7bac2dd65032371c4ddd03c44 SHA1 68c97b819c4d4d144c05081b30396049ab8a4f98 SHA256 233d989eaf503bf83c7f160f9501bb7a2f09fc7a5da85558c568456f659e70aa
 MISC metadata.xml 224 RMD160 87e0a44a0ea05af5ad562f03d35b841c42c48971 SHA1 76b617d1cccc3a09fc6995f19e800d99775064c7 SHA256 5a95452656188e381651219d143d53498f11199a52ade7ed467a94e001e72bd6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHqwsaNQqtfCuFneMRAu9wAJ9DQ/NaDh0Apqo2fuylS8ianMuDNwCglkYc
+B7iqfqwf4V9tnvLuDsAETbE=
+=gfiB
+-----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor.initd-r2 b/net-misc/tor/files/tor.initd-r2
deleted file mode 100644
index df4f8ad652a0..000000000000
--- a/net-misc/tor/files/tor.initd-r2
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r2,v 1.1 2007/05/15 15:57:21 humpback Exp $
-
-opts="${opts} checkconfig reload"
-PIDFILE=/var/run/tor/tor.pid
-CONFFILE=/etc/tor/torrc
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        # first check that it exists
-        if [ ! -f ${CONFFILE} ] ; then
-                eerror "You need to setup ${CONFFILE} first"
-                eerror "Example is in ${CONFFILE}.sample"
-                return 1
-	fi
-
-	# now verify whether the configuration is valid
-	/usr/bin/tor --verify-config -f ${CONFFILE} &> /dev/null
-	if [ $? -eq 0 ] ; then
-		einfo "Tor configuration (${CONFFILE}) is valid."
-		return 0
-	else
-		eerror "Tor configuration (${CONFFILE}) not valid."
-		/usr/bin/tor --verify-config -f ${CONFFILE}
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-        ebegin "Starting Tor"
-        HOME=/var/lib/tor
-        start-stop-daemon --start --quiet --chuid tor --exec /usr/bin/tor -- --runasdaemon 1 &> /dev/null
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Tor"
-        start-stop-daemon --stop --quiet --chuid tor --exec /usr/bin/tor
-        eend $?
-}
-
-reload() {
-	if [ ! -f ${PIDFILE} ]; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading Tor configuration"
-	start-stop-daemon --stop --oknodo --signal HUP --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-misc/tor/tor-0.1.2.17.ebuild b/net-misc/tor/tor-0.1.2.17.ebuild
deleted file mode 100644
index 662a09385189..000000000000
--- a/net-misc/tor/tor-0.1.2.17.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.2.17.ebuild,v 1.5 2007/09/03 18:10:02 dertobi123 Exp $
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://tor.eff.org"
-MY_PV=${PV/_/-}
-SRC_URI="http://tor.eff.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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/tor.logrotate.patch
-}
-
-src_compile() {
-	econf $(use_enable debug)
-	emake || die "emake failed"
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r3 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 -i -e "s:/lib::" \
-		-e "s:/rc.d::" \
-		-e "s:\\*:\\*.:" contrib/tor.logrotate
-	insinto /etc/logrotate.d
-	newins contrib/tor.logrotate tor
-}
-
-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"
-}