revision bump to make it compatible with Baselayout 1, as reported by Stanislav Cymbalov <DummyUnit AT gmail.com> in bug 272404

Package-Manager: portage-2.1.6.11/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 19 insertions, 12 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index b96607057394..ce0085f6b82b 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,13 @@
 # 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.164 2009/06/03 08:09:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.165 2009/06/03 13:02:23 fauli Exp $
+
+*tor-0.2.0.34-r2 (03 Jun 2009)
+
+  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org> -files/tor.initd-r5,
+  +files/tor.initd-r6, -tor-0.2.0.34-r1.ebuild, +tor-0.2.0.34-r2.ebuild:
+  revision bump to make it compatible with Baselayout 1, as reported by
+  Stanislav Cymbalov <DummyUnit AT gmail.com> in bug 272404
 
 *tor-0.2.0.34-r1 (03 Jun 2009)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 914bebc90239..b6d86a36e36b 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -4,16 +4,16 @@ Hash: SHA1
 AUX tor-0.2.0.30-logrotate.patch 291 RMD160 256507536cb7629a21c855816428885b3587f14c SHA1 e1592a63df6677c8e2537ae5363eda39c4a3aeb1 SHA256 8c8c4d33d758127eedb234cda6836be625188c09e9eadfea290f6cf575516c22
 AUX tor-0.2.0.33-no-internal-libevent.patch 5026 RMD160 c263d14eaf776ba1ba90bdc86308219dc802705c SHA1 7e9b1595380a518f849901dc7419a3cb4acf5bf3 SHA256 cc57416b5b5fb8562fcf69f5b096a168bf693cd08b4bd02105d84531192f7647
 AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
-AUX tor.initd-r5 1601 RMD160 54ea139b5ade6f897cd9842de47184cc6b185212 SHA1 c561d844744e6348d673e2920e1010a598f05930 SHA256 214fe89d6e94250832367f98d2db2641a1a00de031697ad70549540b42ff33ee
+AUX tor.initd-r6 1593 RMD160 0b370bb90a26e7990f61671bc0ec72f05edd0518 SHA1 cf010d20533afd3c4d6c3b0e8c0aad3c574267a9 SHA256 ae09780b525f086fdedfdb63c5937e277764da44874736d3adb6e8a88841a78e
 AUX torrc.sample-0.1.2.6.patch 1067 RMD160 77ac6827513cc1fc48a72bf352915887e22c4284 SHA1 6194000ee38cbaf095954bd0f9adebb001ccaf05 SHA256 5e657209f85b52d2c4c8434a1c65d652828be5f58f672f5829db6524a80e9998
 DIST tor-0.2.0.34.tar.gz 2170871 RMD160 a7a1a78b32072524472c6b2973117689aab4823b SHA1 6797b85cf4bd44a3a1c3ff1ccb9c46b55f9391f9 SHA256 1bb19bcc52d365b47dd0e7bc06e3208786447a1cf759d6595c516a0f0cde3cb2
-EBUILD tor-0.2.0.34-r1.ebuild 2620 RMD160 e80f9cd161213becdaebfb62676bf22079d213cd SHA1 2941383c94d1988fed52932992b4f748026c9ef4 SHA256 faa772a25d364b07eb2657c1718db669c8626ede998ba0c2c97f2b9cd33e8875
-MISC ChangeLog 24355 RMD160 7c634ce64759fea687e88b70376410ea41b6d7f0 SHA1 94e5789ab3356861269412f2141ba60aa50ba197 SHA256 442ffcb385adacf78c237530be7b0f5c688dc4860efe15f97e3959ebcc013603
+EBUILD tor-0.2.0.34-r2.ebuild 2620 RMD160 93135fdf7c16cedabb445d0133dbc814bff71243 SHA1 d101e481fc06eabe2f04c6ccea88ba2f18fcc68a SHA256 dc9f6393d2b7e91fe8594a3a66b4689327b2d7c76cfb93fd6e9c6dd6dfdea35a
+MISC ChangeLog 24669 RMD160 fb132320415c9ea9b901e88493cb03e450c3ed42 SHA1 58deeda92ff179ace77ce0766c73f088ad2612f2 SHA256 c951258130e16ae4b815028af4afd03e049c11192dd3beafe15f439c328944e5
 MISC metadata.xml 482 RMD160 8dca0b35cd6e529c49031ba66a4c29fd3075a131 SHA1 909c1148521f411a17bcfd3ec97cc1ccadd4f580 SHA256 43850c54cf0ec6651bf3c4ef826b28d84e284e60891ca39c20284e2a3bbdcec9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkomL6wACgkQNQqtfCuFneMH0ACeIEyRfSRkzeRiEZXwDcbA5idx
-Mt4An21M9kjqU61J8m4uZerYFw8k+5aC
-=kE7x
+iEYEARECAAYFAkomdGUACgkQNQqtfCuFneMN8wCdF1GYKVlOwBSqIAVBxtLO+InK
+2YIAoJQ+Ij/cIzHQMoCAlqGoHH73oO4N
+=qdp4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor.initd-r5 b/net-misc/tor/files/tor.initd-r6
index 2d2926a9d00f..42557392fb04 100644
--- a/net-misc/tor/files/tor.initd-r5
+++ b/net-misc/tor/files/tor.initd-r6
@@ -1,7 +1,7 @@
 #!/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-r5,v 1.1 2009/06/03 08:09:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r6,v 1.1 2009/06/03 13:02:24 fauli Exp $
 
 opts="${opts} checkconfig reload"
 PIDFILE=/var/run/tor/tor.pid
@@ -35,13 +35,13 @@ start() {
 	checkconfig || return 1
         ebegin "Starting Tor"
         HOME=/var/lib/tor
-	start-stop-daemon --start --user tor:tor --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
+	start-stop-daemon --start --user tor --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
         eend $?
 }
 
 stop() {
         ebegin "Stopping Tor"
-	start-stop-daemon --stop --user tor:tor --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
+	start-stop-daemon --stop --user tor --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
         eend $?
 }
 
diff --git a/net-misc/tor/tor-0.2.0.34-r1.ebuild b/net-misc/tor/tor-0.2.0.34-r2.ebuild
index 7d1f17959c25..1b5d2a9b99d9 100644
--- a/net-misc/tor/tor-0.2.0.34-r1.ebuild
+++ b/net-misc/tor/tor-0.2.0.34-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.34-r1.ebuild,v 1.1 2009/06/03 08:09:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.0.34-r2.ebuild,v 1.1 2009/06/03 13:02:23 fauli Exp $
 
 EAPI=1
 
@@ -49,7 +49,7 @@ src_compile() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r5 tor
+	newinitd "${FILESDIR}"/tor.initd-r6 tor
 	emake DESTDIR="${D}" install || die
 	keepdir /var/{lib,log,run}/tor