clean up

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 i686

4 files changed, 9 insertions, 150 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index a47b55c89499..87c0de34296c 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.154 2009/01/25 13:55:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.155 2009/01/26 22:49:53 fauli Exp $
+
+  26 Jan 2009; Christian Faulhammer <fauli@gentoo.org> -tor-0.2.0.32.ebuild,
+  -tor-0.2.0.32-r1.ebuild:
+  clean up
 
   25 Jan 2009; Markus Meier <maekke@gentoo.org> tor-0.2.0.33.ebuild:
   amd64/x86 stable, bug #256078
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 66bd6d5773c4..370e8e923079 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -5,17 +5,14 @@ AUX tor-0.2.0.30-logrotate.patch 291 RMD160 256507536cb7629a21c855816428885b3587
 AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
 AUX tor.initd-r4 1549 RMD160 2f36cbc9e14c0021139212634b8e0ac585058e44 SHA1 4593e7a1b482bc7b8e787b57d0160f57415b9817 SHA256 0b3c6fdb62b0ce1f4812b0e3ce19dcc7176d4b723cb24b46e4c8474d5b119222
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
-DIST tor-0.2.0.32.tar.gz 2159864 RMD160 e87bee7d7dadf17280bf0b11245b0bad70d68fc2 SHA1 0e48d0706f1717afc6d19228a8878c3bc379b25d SHA256 66669aa2cb74e7b0cf13db05472d88422f42c9c0129ce95ecd463aa123925d27
 DIST tor-0.2.0.33.tar.gz 2167542 RMD160 8649ec953f99a7cd27a25019b26302fd300c84f9 SHA1 4cc94dd6fdb5eb0bd4854631cc5f3cddba7a815f SHA256 33df58455bb6e524350f69f6892627258f6cb0b56a953c80c13beff85f1731ad
-EBUILD tor-0.2.0.32-r1.ebuild 1889 RMD160 f90b4beef3d83fd3d24e5f85e74be12b90ecd66d SHA1 9a81672fd3c3adef09c4995008338924e41989b6 SHA256 ab25eb5c44dfd37e4d767c07989461708b76eab2c6561ac6dcf9bc043120e248
-EBUILD tor-0.2.0.32.ebuild 1750 RMD160 02d0110bac363a35e4934fafa0641bd0df46a6d7 SHA1 21dcf8f7b193071ebe06b60139349433a04d6ba7 SHA256 660fcf355c5fb5ce9706d495d5869d6393d22c08d901643aeed2e90cf4e5414b
 EBUILD tor-0.2.0.33.ebuild 1882 RMD160 8a525156dc05fbf99835c693abcfc70533dfac63 SHA1 ae50f747ebfaccd95fca6330e465ac9827e69221 SHA256 f9a02e1be09e5b3df9bd2660c123083808710d4e154693742025044e997cfb06
-MISC ChangeLog 22656 RMD160 01d0b27cf73da1b98e56bc93ca02ebfca4f1bbbc SHA1 afeef3f6216131286ea231a1191a50258872c025 SHA256 555418267a3f7e7056c4bd583fec7c53d8e97a8e7d08eec8708865ec6cc8c3b2
+MISC ChangeLog 22771 RMD160 5678013d63e262184ab0a33effb75df21c7548e1 SHA1 9f6bb51ec615a7e89126a1d2db80e1b7095c8c37 SHA256 464e10d739be2244ec14afc3f59265ef52e2ed2d0b5755e8cfa3de5347a948e6
 MISC metadata.xml 423 RMD160 4418681fd0a4e22120c6a78f82c915cd6796bf40 SHA1 64cf24b719163a291b87b7909bf46fbef2b49fc2 SHA256 b8ec2e66707ed3e56d10f285c6036ca57135dfe4682f0862392253f2d88b554d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkl8b30ACgkQkKaRLQcq0GK2mACfQiZXrrebq+FIuVZpPTynpC3S
-HFoAn0+paoJUr55Kcf3eo/IjNATDEeXF
-=b7qC
+iEYEARECAAYFAkl+Pi4ACgkQNQqtfCuFnePSBgCfaNlNaXGFAT4dlXGdAFVm9ERJ
++z0An0uWNmfg7hc4miQdCX3sYJLi7gKZ
+=tgFU
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.0.32-r1.ebuild b/net-misc/tor/tor-0.2.0.32-r1.ebuild
deleted file mode 100644
index 7cb85054f9b4..000000000000
--- a/net-misc/tor/tor-0.2.0.32-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2008 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.32-r1.ebuild,v 1.1 2008/12/21 01:33:20 fauli 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 logrotate"
-
-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
-}
-
-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
-
-	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
-
-	# 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.0.32.ebuild b/net-misc/tor/tor-0.2.0.32.ebuild
deleted file mode 100644
index f1cb8c8f549f..000000000000
--- a/net-misc/tor/tor-0.2.0.32.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2008 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.32.ebuild,v 1.6 2008/12/09 19:56:28 bluebird 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 logrotate"
-
-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
-}
-
-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
-
-	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
-}
-
-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"
-}