--- openssl-0.9.8l-r2.ebuild	2010-01-27 01:35:29.000000000 +0100
+++ openssl-0.9.8l-r2.ebuild	2010-02-07 18:34:23.000000000 +0100
@@ -11,7 +11,7 @@
 LICENSE="openssl"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist gmp kerberos sse2 test zlib"
+IUSE="bindist gmp kerberos sse2 test zlib +doc"
 
 RDEPEND="gmp? ( dev-libs/gmp )
 	zlib? ( sys-libs/zlib )
@@ -49,9 +49,9 @@
 		-e '/DIRS/s: fips : :g' \
 		-e '/^MANSUFFIX/s:=.*:=ssl:' \
 		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
+		-e $(use doc \
+			&& echo '/^MANDIR=/s:=.*:=/usr/share/man:' \
+			|| echo '/^install:/s:install_docs::') \
 		Makefile{,.org} \
 		|| die
 	# show the actual commands in the log
@@ -149,26 +149,28 @@
 	rm -r "${D}"/etc/ssl/certs/{demo,expired}
 
 	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${D}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
+	if use doc ; then
+		cd "${D}"/usr/share/man
+		local m d s
+		for m in $(find . -type f | xargs grep -L '#include') ; do
+			d=${m%/*} ; d=${d#./} ; m=${m##*/}
+			[[ ${m} == openssl.1* ]] && continue
+			[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+			mv ${d}/{,ssl-}${m}
+			# fix up references to renamed man pages
+			sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+			ln -s ssl-${m} ${d}/openssl-${m}
+			# locate any symlinks that point to this man page ... we assume
+			# that any broken links are due to the above renaming
+			for s in $(find -L ${d} -type l) ; do
+				s=${s##*/}
+				rm -f ${d}/${s}
+				ln -s ssl-${m} ${d}/ssl-${s}
+				ln -s ssl-${s} ${d}/openssl-${s}
+			done
 		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+		[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+	fi
 
 	dodir /etc/sandbox.d #254521
 	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl