Install the manpages unconditionally, bug #407057

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 20 insertions, 12 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 06bd9152d68d..5f919d2f1a40 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.321 2012/03/08 14:50:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.322 2012/03/08 16:14:22 blueness Exp $
+
+  08 Mar 2012; Anthony G. Basile <blueness@gentoo.org> tor-0.2.2.35-r1.ebuild,
+  tor-0.2.3.12_alpha-r1.ebuild:
+  Install the manpages unconditionally, bug #407057
 
   08 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
   -tor-0.2.3.11_alpha.ebuild:
diff --git a/net-misc/tor/tor-0.2.1.32.ebuild b/net-misc/tor/tor-0.2.1.32.ebuild
index 53ca42c2b02a..2ac0cddc1eed 100644
--- a/net-misc/tor/tor-0.2.1.32.ebuild
+++ b/net-misc/tor/tor-0.2.1.32.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.32.ebuild,v 1.3 2012/02/07 21:11:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.1.32.ebuild,v 1.4 2012/03/08 16:14:22 blueness Exp $
 
-EAPI=4
+EAPI="4"
 
 inherit autotools eutils flag-o-matic
 
diff --git a/net-misc/tor/tor-0.2.2.35-r1.ebuild b/net-misc/tor/tor-0.2.2.35-r1.ebuild
index 2428570a51b6..86b134869358 100644
--- a/net-misc/tor/tor-0.2.2.35-r1.ebuild
+++ b/net-misc/tor/tor-0.2.2.35-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.35-r1.ebuild,v 1.1 2012/02/07 21:11:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.35-r1.ebuild,v 1.2 2012/03/08 16:14:22 blueness Exp $
 
-EAPI=4
+EAPI="4"
 
 inherit autotools eutils flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.torproject.org/dist/${PN}-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc tor-hardening +transparent-proxy threads selinux"
+IUSE="tor-hardening +transparent-proxy threads selinux"
 
 DEPEND="dev-libs/openssl
 	>=dev-libs/libevent-2.0
@@ -38,8 +38,9 @@ src_configure() {
 	# 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 doc asciidoc)					\
+	econf \
+		--enable-asciidoc \
+		--docdir=/usr/share/doc/${PF} \
 		$(use_enable tor-hardening gcc-hardening)	\
 		$(use_enable tor-hardening linker-hardening)\
 		$(use_enable transparent-proxy transparent)	\
diff --git a/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild b/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild
index 71d9bbbe6fb3..2276b7862e83 100644
--- a/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild
+++ b/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.12_alpha-r1.ebuild,v 1.1 2012/02/14 22:32:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.12_alpha-r1.ebuild,v 1.2 2012/03/08 16:14:22 blueness Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ 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 selinux"
+IUSE="+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux"
 
 DEPEND="dev-libs/openssl
 	>=dev-libs/libevent-2.0.14
@@ -40,9 +40,10 @@ src_configure() {
 	# 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} \
+	econf \
+		--enable-asciidoc \
+		--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) \
@@ -54,7 +55,9 @@ src_configure() {
 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 \