Bump. Fix the license as well as Tor as iactually 3-clause BSD

9 files changed, 54 insertions, 19 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 8761b6192120..c78692343b66 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.18 2004/08/15 19:09:54 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.19 2004/10/06 13:56:46 latexer Exp $
+
+*tor-0.0.8 (06 Oct 2004)
+
+  06 Oct 2004; <peter@gentoo.org> tor-0.0.6.1.ebuild, tor-0.0.6.ebuild,
+  tor-0.0.7.2.ebuild, tor-0.0.7.3.ebuild, tor-0.0.7.ebuild, +tor-0.0.8.ebuild:
+  Bump. Also fix the license as this is really under 3-clause BSD.
 
 *tor-0.0.7.3 (15 Aug 2004)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 6db12eea881b..16a38a6bc672 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,12 +1,14 @@
-MD5 46856eceede5ade48d324c9b3ef3e863 ChangeLog 2660
+MD5 5e5d05ca32b458db9e8d2ea84b73195f tor-0.0.7.3.ebuild 713
+MD5 536f0379efe5556a034ef3fa49b44c4f tor-0.0.6.ebuild 682
+MD5 5428725d8ef59a06e7d264a38102aa5c tor-0.0.8.ebuild 682
+MD5 bbf234bf5e62c50825a4a584741abe06 tor-0.0.7.2.ebuild 713
+MD5 89571a012d0d6763366641d66d2382ee tor-0.0.6.1.ebuild 684
+MD5 69c5d323c65eb96ed543666e1eeff560 tor-0.0.7.ebuild 682
+MD5 3248b28434acde0376b08b3931d1ab2d ChangeLog 2905
 MD5 b5865f551fa6dd21658e0f8349638c9f metadata.xml 223
-MD5 1fd7b3f681bf67e64fef5e52b9a00392 tor-0.0.6.1.ebuild 687
-MD5 303403ed6228d3653ae89af817d65e4d tor-0.0.6.ebuild 685
-MD5 7c2dfdfb2b00ca4e1f23305d29c47e7f tor-0.0.7.ebuild 685
-MD5 9f7be797a7363f920dea6d3e82aa90b4 tor-0.0.7.2.ebuild 716
-MD5 8d967f9c4a82b3e2c988db9e88fcbc38 tor-0.0.7.3.ebuild 716
-MD5 c75a565ea33091fbd651692f07aca831 files/digest-tor-0.0.6 61
 MD5 e3539fb9fb16289bc55bc57232ce2444 files/digest-tor-0.0.6.1 63
-MD5 614964f1da1096bca2c4a9776a7a73b0 files/digest-tor-0.0.7 61
 MD5 8b33e41acaa070dda570b9aff0771b70 files/digest-tor-0.0.7.2 63
 MD5 cc9d942cd34319bdebe7ffe1a088ad47 files/digest-tor-0.0.7.3 63
+MD5 c75a565ea33091fbd651692f07aca831 files/digest-tor-0.0.6 61
+MD5 614964f1da1096bca2c4a9776a7a73b0 files/digest-tor-0.0.7 61
+MD5 00542109979ba2585bab51dbfe7bd2fc files/digest-tor-0.0.8 61
diff --git a/net-misc/tor/files/digest-tor-0.0.8 b/net-misc/tor/files/digest-tor-0.0.8
new file mode 100644
index 000000000000..e57e3579ae22
--- /dev/null
+++ b/net-misc/tor/files/digest-tor-0.0.8
@@ -0,0 +1 @@
+MD5 7d50423692cc1f938b5ed99703c3e5dd tor-0.0.8.tar.gz 442248
diff --git a/net-misc/tor/tor-0.0.6.1.ebuild b/net-misc/tor/tor-0.0.6.1.ebuild
index bd6753f70cf3..4d5ca1a19fa5 100644
--- a/net-misc/tor/tor-0.0.6.1.ebuild
+++ b/net-misc/tor/tor-0.0.6.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.0.6.1.ebuild,v 1.2 2004/06/25 00:16:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.0.6.1.ebuild,v 1.3 2004/10/06 13:56:46 latexer Exp $
 
 MY_P=${P/_rc/rc}
 DESCRIPTION="Anonymizing overlay network for TCP"
 HOMEPAGE="http://www.freehaven.net/tor/"
 SRC_URI="http://www.freehaven.net/tor/dist/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
diff --git a/net-misc/tor/tor-0.0.6.ebuild b/net-misc/tor/tor-0.0.6.ebuild
index 43afbb2b660b..5c75aefae3eb 100644
--- a/net-misc/tor/tor-0.0.6.ebuild
+++ b/net-misc/tor/tor-0.0.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.0.6.ebuild,v 1.3 2004/06/25 00:16:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.0.6.ebuild,v 1.4 2004/10/06 13:56:46 latexer Exp $
 
 MY_P=${P/_rc/rc}
 DESCRIPTION="Anonymizing overlay network for TCP"
 HOMEPAGE="http://www.freehaven.net/tor/"
 SRC_URI="http://www.freehaven.net/tor/dist/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
diff --git a/net-misc/tor/tor-0.0.7.2.ebuild b/net-misc/tor/tor-0.0.7.2.ebuild
index 4831e502a6ee..49282f81048e 100644
--- a/net-misc/tor/tor-0.0.7.2.ebuild
+++ b/net-misc/tor/tor-0.0.7.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.0.7.2.ebuild,v 1.3 2004/09/16 02:16:26 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.0.7.2.ebuild,v 1.4 2004/10/06 13:56:46 latexer Exp $
 
 MY_P=${P/_rc/rc}
 DESCRIPTION="Anonymizing overlay network for TCP"
 HOMEPAGE="http://www.freehaven.net/tor/"
 SRC_URI="http://www.freehaven.net/tor/dist/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~ppc macos ppc-macos"
 IUSE=""
diff --git a/net-misc/tor/tor-0.0.7.3.ebuild b/net-misc/tor/tor-0.0.7.3.ebuild
index 5eaa2885c98b..afc503ff230a 100644
--- a/net-misc/tor/tor-0.0.7.3.ebuild
+++ b/net-misc/tor/tor-0.0.7.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.0.7.3.ebuild,v 1.3 2004/09/16 02:17:06 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.0.7.3.ebuild,v 1.4 2004/10/06 13:56:46 latexer Exp $
 
 MY_P=${P/_rc/rc}
 DESCRIPTION="Anonymizing overlay network for TCP"
 HOMEPAGE="http://www.freehaven.net/tor/"
 SRC_URI="http://www.freehaven.net/tor/dist/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~ppc macos ppc-macos"
 IUSE=""
diff --git a/net-misc/tor/tor-0.0.7.ebuild b/net-misc/tor/tor-0.0.7.ebuild
index 750929160c33..a9089110489e 100644
--- a/net-misc/tor/tor-0.0.7.ebuild
+++ b/net-misc/tor/tor-0.0.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.0.7.ebuild,v 1.2 2004/06/25 00:16:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.0.7.ebuild,v 1.3 2004/10/06 13:56:46 latexer Exp $
 
 MY_P=${P/_rc/rc}
 DESCRIPTION="Anonymizing overlay network for TCP"
 HOMEPAGE="http://www.freehaven.net/tor/"
 SRC_URI="http://www.freehaven.net/tor/dist/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
diff --git a/net-misc/tor/tor-0.0.8.ebuild b/net-misc/tor/tor-0.0.8.ebuild
new file mode 100644
index 000000000000..21da2aecdabc
--- /dev/null
+++ b/net-misc/tor/tor-0.0.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.0.8.ebuild,v 1.1 2004/10/06 13:56:46 latexer Exp $
+
+MY_P=${P/_rc/rc}
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.freehaven.net/tor/"
+SRC_URI="http://www.freehaven.net/tor/dist/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND="dev-libs/openssl"
+RDEPEND="net-misc/tsocks"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc README ChangeLog AUTHORS \
+		doc/{CLIENTS,FAQ,HACKING,TODO} \
+		doc/{rendezvous.txt,tor-design.tex,tor-spec.txt}
+}