clean up and add stable KEYWORDS for -r1

Package-Manager: portage-2.1.4.5

5 files changed, 12 insertions, 149 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index cd2ce7598984..68f778106819 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.139 2008/11/22 15:02:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.140 2008/11/22 17:05:22 opfer Exp $
+
+  22 Nov 2008; Christian Faulhammer <opfer@gentoo.org>
+  -tor-0.2.0.30-r1.ebuild, -tor-0.2.0.31.ebuild, tor-0.2.0.31-r1.ebuild:
+  clean up and add stable KEYWORDS for -r1
 
   22 Nov 2008; Markus Meier <maekke@gentoo.org> tor-0.2.0.31.ebuild:
   amd64 stable, bug #244679
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 643b43eec9bd..5ecb342b5f5a 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-0.2.0.31-sparc.patch 2849 RMD160 74a35891ad0d509015b62b8c727a67073d89491d SHA1 50d2c7acb33ebfcb9bbae920d7d8d8132b5592ea SHA256 754aa16de135ec6c0fef44d836f8637eba8dbbb6d20f94cc7ab8b727415257aa
 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.30.tar.gz 2155463 RMD160 e51a38aa1531076bc9722e1584403f917d207dd0 SHA1 c6fbb3bf0141f4b34cc90845373b3dfa8b47ddc4 SHA256 bc9e8bf841ef64f8b06eef91eeab430f91147a3c4d7a6919826fa33b20453387
 DIST tor-0.2.0.31.tar.gz 2156305 RMD160 584cbbd9f295a8f677bc95a5f05dc78f6184b97a SHA1 a586cc017a791ac481fde836c3cf8e3667fb5cfc SHA256 05894f5cfcb78ebab234f6e73350430e57f4c8bec4a4c3e60a41e1e9fb13c66c
-EBUILD tor-0.2.0.30-r1.ebuild 1742 RMD160 23335d3bd8c4a0ecc28cbd02942f7fcadf7a9cd7 SHA1 eeab29287dc8f988934df090c4418bdbb38cae9b SHA256 b3408f145289e1344fc79f866af77b70e9180c324abe42e653b1e2e7d000c895
-EBUILD tor-0.2.0.31-r1.ebuild 1804 RMD160 db2ff4dd0f7b234ee0fc1205d43c0fcf5c3539da SHA1 701c1234345f503145652671eb7d39fc79e666a6 SHA256 db5d41cb71823f713dad85840a89fd4ace1a0ecb1441fed5be88d41b9d379267
-EBUILD tor-0.2.0.31.ebuild 1749 RMD160 d360623acfe508675c8134ef986f3e4776fbd15f SHA1 37a046e7ba1069c604ee5345a8a26887f7438130 SHA256 42804fde8f3f5824c7b8098f51d674fe3a92af2d353025ba6d9d037d8a7d41f6
-MISC ChangeLog 20724 RMD160 aaeb86fec6a319cd06c4584d28189a6c2d914d50 SHA1 c07097918c5afc8608dd938db55593dc03e6d3e5 SHA256 1416993947f5d9f24988a6789c0cfc11d2c65fe1e92dc927a8bb9a6cd8984268
+EBUILD tor-0.2.0.31-r1.ebuild 1799 RMD160 dbb75735709eeeca86816d178a8458f9e42d72e3 SHA1 67b0d6aa291cb2138bf7b26c67a410f9c730f03d SHA256 dcd5501f4bfd3d02b07559c29717eb5a0075a75b594b5e3798d903e24e7ac070
+MISC ChangeLog 20895 RMD160 dcb9b373c0532c8d4b73e9f0dc769feb073522d9 SHA1 beacd33be3e108eeb3678ec747271e00de2235f3 SHA256 223f0393c1dec16281afefdd3a411a6966f9a5e562299a82cdbd363f87ba8c0d
 MISC metadata.xml 423 RMD160 d053d3997ad9765665ab54fb201840b15c6915d3 SHA1 97fcb174f7c312b3e7a4f9b17f366a726e07345f SHA256 93b2c804410987cf63abb109afb6c6a7bf7bca3d9a207138be0d6d1c50a6c746
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkoHvcACgkQkKaRLQcq0GLxuACePEwPqkAUDOmRk1qmKkzKUOnu
-lC8AniaqGQvz2P217uRVwPdINVZj+Crj
-=xf9l
+iEYEARECAAYFAkkoO9sACgkQNQqtfCuFneMq/wCghsJjCPhaOzQXqFRP7RjWSuQp
+vnkAnjC2x2xeYYsXwtQysH1ji0LdXZyr
+=GlL4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/tor-0.2.0.30-r1.ebuild b/net-misc/tor/tor-0.2.0.30-r1.ebuild
deleted file mode 100644
index ce21932b4d99..000000000000
--- a/net-misc/tor/tor-0.2.0.30-r1.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.30-r1.ebuild,v 1.6 2008/09/06 15:16:31 armin76 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}"/${P}-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"
-}
diff --git a/net-misc/tor/tor-0.2.0.31-r1.ebuild b/net-misc/tor/tor-0.2.0.31-r1.ebuild
index 3e6126e40153..158b1de4aaca 100644
--- a/net-misc/tor/tor-0.2.0.31-r1.ebuild
+++ b/net-misc/tor/tor-0.2.0.31-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.31-r1.ebuild,v 1.2 2008/11/14 12:43:56 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.0.31-r1.ebuild,v 1.3 2008/11/22 17:05:22 opfer Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="debug logrotate"
 
 DEPEND="dev-libs/openssl
diff --git a/net-misc/tor/tor-0.2.0.31.ebuild b/net-misc/tor/tor-0.2.0.31.ebuild
deleted file mode 100644
index 40f65bd53ffb..000000000000
--- a/net-misc/tor/tor-0.2.0.31.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.31.ebuild,v 1.7 2008/11/22 15:02:04 maekke 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"
-}