Still problems with dependency on =net-libs/miniupnpc-1.6

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 023c11a8dd70085dfe5c39a4de6c09ab831a442b..a9bfee92b31db7b9499a766f4fe6d25ecab7e919 100644 (file)
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.312 2011/12/30 15:29:06 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.313 2011/12/31 01:32:24 blueness Exp $
+
+  31 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  -tor-0.2.3.10_alpha-r1.ebuild:
+  Still problems with dependency on =net-libs/miniupnpc-1.6
 
 *tor-0.2.3.10_alpha-r1 (30 Dec 2011)
 

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 4e3d7aceaa0e027c8cca578eeb74afd94bdef9ea..a8487928e9a66d05fe047231e6cde0d8ea7587b7 100644 (file)
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -14,14 +14,13 @@ DIST tor-0.2.3.10-alpha.tar.gz 2950344 RMD160 26fd5a9388fb90c923d1b885c85651d411
 EBUILD tor-0.2.1.32.ebuild 1824 RMD160 bf35dbca3099ec1657646f4d8eaa8053a2a31ca7 SHA1 b70f0a9cab8fa9318e555f2bd620d89e5ae725b2 SHA256 92096e0c90cf502e2c326b3e23b0108934886f0271924c15f080f83c6c4d00b8
 EBUILD tor-0.2.2.34.ebuild 2184 RMD160 9accd89f4236d5e28b9f1b8589818da92a13b561 SHA1 66c6cbd57179923934f1f5b155be082954b59e06 SHA256 4f1b4527429de8050884edb17ff1557f5e61e9eae2a31166736fb5d2b93d75ee
 EBUILD tor-0.2.2.35.ebuild 2085 RMD160 38bce2cfba9b6e9be81bb641801c2699408da5ae SHA1 266b9f9a56357ee2a4bf3ace8df47da1c803c0d1 SHA256 9d1b721d5100b6a56e0d60de9a9c1e164f7516e5ce4fbca3c932c78e820fbe32
-EBUILD tor-0.2.3.10_alpha-r1.ebuild 2235 RMD160 201b677dda443a9835dadac774ede5eb100f89a4 SHA1 869e47596b1a136453af189e2416d45e37da632e SHA256 57760efeb5ac932fd9cc34f67ace47268819c3de7c32594ac91b2ba563a5dda3
 EBUILD tor-0.2.3.10_alpha.ebuild 2235 RMD160 c285bf6b77f26a07702b92cec2fa43f27bef8886 SHA1 3988a0a43376ae2225af616560cfba09f32ddc13 SHA256 4a1b65966109205874f569cd18886445bc9971552bc381d387b9e983f5ea22ca
-MISC ChangeLog 46164 RMD160 103c1d8533b0c5443db6cd6aef1cca2fb984fdcd SHA1 4698600ff38de70e81f47ac9f1f1bddb9ad89e01 SHA256 ea2d83627944f72b4ec5ed190a10ae0ffb8cb3de25e693ae941f5f69e0757ed6
+MISC ChangeLog 46313 RMD160 f01c1a81b7f93e1508063322b48a0e80b1c204fc SHA1 ac00bf4b0fdadc645edadab21935a46e766af938 SHA256 b9b36b8760782a8fa3b7bf4c6eca4b9d21fd9ffe31e6ca8c2c51ea198203a1f7
 MISC metadata.xml 596 RMD160 2527172185bb74e5ea6167d56b2e3476c48eb078 SHA1 93be4ae496f77aa63bb77d720f51bf3510798daa SHA256 c7622b255363171fd1b351e14e592beb901d332f976a2e77c409e14ef5ed20bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk792M0ACgkQl5yvQNBFVTXm+QCgh97IG0Hp1NDLbdO+kjOg2pxJ
-EDkAniqpoSmHTXqLBM+auB836V+FmSqE
-=PGQc
+iEYEAREIAAYFAk7+ZjMACgkQl5yvQNBFVTWQYQCgixqqsHNz5ef7Zd8oMfWItTTB
+WJYAnA4vn2nT9JeMFADwfExwU8DAS+CJ
+=WlkI
 -----END PGP SIGNATURE-----

diff --git a/net-misc/tor/tor-0.2.3.10_alpha-r1.ebuild b/net-misc/tor/tor-0.2.3.10_alpha-r1.ebuild
deleted file mode 100644 (file)
index 1291dc4..0000000
--- a/net-misc/tor/tor-0.2.3.10_alpha-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.10_alpha-r1.ebuild,v 1.1 2011/12/30 15:29:06 blueness Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic versionator
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
-
-DEPEND="dev-libs/openssl
-       >=dev-libs/libevent-2.0.14
-       nat-pmp? ( net-libs/libnatpmp )
-       upnp? ( net-libs/miniupnpc )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-       enewgroup tor
-       enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/torrc.sample.patch
-}
-
-src_configure() {
-       # Upstream isn't sure of all the user provided CFLAGS that
-       # will break tor, but does recommend against -fstrict-aliasing.
-       # We'll filter-flags them here as we encounter them.
-       filter-flags -fstrict-aliasing
-       econf --docdir=/usr/share/doc/${PF} \
-               $(use_enable bufferevents) \
-               $(use_enable doc asciidoc) \
-               $(use_enable nat-pmp) \
-               $(use_enable tor-hardening gcc-hardening) \
-               $(use_enable tor-hardening linker-hardening) \
-               $(use_enable transparent-proxy transparent) \
-               $(use_enable threads) \
-               $(use_enable upnp)
-}
-
-src_install() {
-       newconfd "${FILESDIR}"/tor.confd tor
-       newinitd "${FILESDIR}"/tor.initd-r6 tor
-       emake DESTDIR="${D}" install
-       keepdir /var/lib/tor
-
-       dodoc README ChangeLog ReleaseNotes \
-               doc/{HACKING,TODO} \
-               doc/spec/README
-
-       fperms 750 /var/lib/tor
-       fowners tor:tor /var/lib/tor
-
-       insinto /etc/tor/
-       newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-       elog
-       elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-       elog "change it according to your needs.  Use the torrc.sample that is in"
-       elog "that directory as a guide.  Also, to have privoxy work with tor"
-       elog "just add the following line"
-       elog
-       elog "forward-socks4a / localhost:9050 ."
-       elog
-       elog "to /etc/privoxy/config.  Notice the . at the end!"
-       elog
-}