close bug #174185 and #177590

(Portage version: 2.1.2.2)

6 files changed, 26 insertions, 14 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 7eae622a0282..b667b6efb76e 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.78 2007/05/15 15:57:21 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.79 2007/05/15 16:08:36 humpback Exp $
+
+  15 May 2007; <humpback@gentoo.org> tor-0.1.0.18.ebuild,
+  tor-0.1.0.18-r1.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.26.ebuild,
+  tor-0.1.2.13.ebuild:
+  Added keepdir. Close Bug #177590.
+
+  15 May 2007; <humpback@gentoo.org> tor-0.1.1.23.ebuild,
+  tor-0.1.1.26.ebuild:
+  Fixed missing RDEP's. Close Bug #174185.
 
 *tor-0.1.2.13 (15 May 2007)
 
diff --git a/net-misc/tor/tor-0.1.0.18-r1.ebuild b/net-misc/tor/tor-0.1.0.18-r1.ebuild
index cf606b456c3e..23600a8277aa 100644
--- a/net-misc/tor/tor-0.1.0.18-r1.ebuild
+++ b/net-misc/tor/tor-0.1.0.18-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.0.18-r1.ebuild,v 1.1 2006/10/22 16:06:25 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.0.18-r1.ebuild,v 1.2 2007/05/15 16:08:36 humpback Exp $
 
 inherit eutils flag-o-matic
 
@@ -43,7 +43,7 @@ src_install() {
 	exeinto /etc/init.d ; newexe ${FILESDIR}/tor.initd-r1 tor
 	insinto /etc/conf.d ; newins ${FILESDIR}/tor.confd tor
 	make DESTDIR=${D} install || die
-
+	keepdir /var/{lib,log,run}/tor
 	dodoc README ChangeLog AUTHORS INSTALL \
 		doc/{CLIENTS,FAQ,HACKING,TODO} \
 		doc/{control-spec.txt,rend-spec.txt,tor-doc.css,tor-doc.html,tor-spec.txt}
diff --git a/net-misc/tor/tor-0.1.0.18.ebuild b/net-misc/tor/tor-0.1.0.18.ebuild
index 1f54354be640..03033b8a0b6e 100644
--- a/net-misc/tor/tor-0.1.0.18.ebuild
+++ b/net-misc/tor/tor-0.1.0.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.0.18.ebuild,v 1.9 2006/10/22 16:06:24 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.0.18.ebuild,v 1.10 2007/05/15 16:08:36 humpback Exp $
 
 inherit eutils flag-o-matic
 
@@ -45,6 +45,7 @@ src_install() {
 	exeinto /etc/init.d ; newexe ${FILESDIR}/tor.initd-r1 tor
 	insinto /etc/conf.d ; newins ${FILESDIR}/tor.confd tor
 	make DESTDIR=${D} install || die
+	keepdir /var/{lib,log,run}/tor
 
 	dodoc README ChangeLog AUTHORS INSTALL \
 		doc/{CLIENTS,FAQ,HACKING,TODO} \
diff --git a/net-misc/tor/tor-0.1.1.23.ebuild b/net-misc/tor/tor-0.1.1.23.ebuild
index d668c58b960c..87a2bdf3e3e5 100644
--- a/net-misc/tor/tor-0.1.1.23.ebuild
+++ b/net-misc/tor/tor-0.1.1.23.ebuild
@@ -1,6 +1,6 @@
 # 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.1.23.ebuild,v 1.8 2007/04/29 17:48:03 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.1.23.ebuild,v 1.9 2007/05/15 16:08:36 humpback Exp $
 
 inherit eutils
 
@@ -15,7 +15,8 @@ IUSE=""
 
 DEPEND="dev-libs/openssl
 	dev-libs/libevent"
-RDEPEND="net-proxy/tsocks"
+RDEPEND="net-proxy/tsocks
+		${DEPEND}"
 
 pkg_setup() {
 	enewgroup tor
@@ -31,6 +32,7 @@ src_unpack() {
 src_install() {
 	newinitd ${FILESDIR}/tor.initd tor
 	make DESTDIR=${D} install || die
+	keepdir /var/{lib,log,run}/tor
 
 	dodoc README ChangeLog AUTHORS INSTALL \
 		doc/{HACKING,TODO} \
diff --git a/net-misc/tor/tor-0.1.1.26.ebuild b/net-misc/tor/tor-0.1.1.26.ebuild
index 22890d8393bd..9906586f8748 100644
--- a/net-misc/tor/tor-0.1.1.26.ebuild
+++ b/net-misc/tor/tor-0.1.1.26.ebuild
@@ -1,6 +1,6 @@
 # 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.1.26.ebuild,v 1.2 2007/04/29 17:48:03 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.1.26.ebuild,v 1.3 2007/05/15 16:08:36 humpback Exp $
 
 inherit eutils
 
@@ -15,7 +15,8 @@ IUSE=""
 
 DEPEND="dev-libs/openssl
 	dev-libs/libevent"
-RDEPEND="net-proxy/tsocks"
+RDEPEND="net-proxy/tsocks
+		${DEPEND}"
 
 pkg_setup() {
 	enewgroup tor
@@ -31,6 +32,7 @@ src_unpack() {
 src_install() {
 	newinitd ${FILESDIR}/tor.initd tor
 	make DESTDIR=${D} install || die
+	keepdir /var/{lib,log,run}/tor
 
 	dodoc README ChangeLog AUTHORS INSTALL \
 		doc/{HACKING,TODO} \
diff --git a/net-misc/tor/tor-0.1.2.13.ebuild b/net-misc/tor/tor-0.1.2.13.ebuild
index 39804213c76f..7e10cef32789 100644
--- a/net-misc/tor/tor-0.1.2.13.ebuild
+++ b/net-misc/tor/tor-0.1.2.13.ebuild
@@ -1,6 +1,6 @@
 # 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.13.ebuild,v 1.1 2007/05/15 15:57:21 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.2.13.ebuild,v 1.2 2007/05/15 16:08:36 humpback Exp $
 
 inherit eutils
 
@@ -39,14 +39,12 @@ src_compile() {
 src_install() {
 	newinitd "${FILESDIR}"/tor.initd-r2 tor
 	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
 
 	dodoc README ChangeLog AUTHORS ReleaseNotes \
 		doc/{HACKING,TODO} \
 		doc/spec/*.txt
 
-	keepdir /var/lib/tor
-	keepdir /var/log/tor
-	keepdir /var/run/tor
 	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