Only install developer documentation with doc USE flag, #145433.

Package-Manager: portage-2.1.1_rc1-r4

3 files changed, 32 insertions, 16 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index c9a930bcb238..ec95aec77c52 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.63 2006/08/30 07:47:47 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.64 2006/09/05 13:18:39 uberlord Exp $
+
+  05 Sep 2006; Roy Marples <uberlord@gentoo.org> dovecot-1.0_rc7.ebuild:
+  Only install developer documentation with doc USE flag, #145433.
 
   30 Aug 2006; <blubb@gentoo.org> dovecot-1.0_beta8.ebuild:
   stable on amd64
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 3af377766f68..e4dd05eb3026 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -32,14 +32,14 @@ EBUILD dovecot-1.0_rc6.ebuild 4923 RMD160 7a61a4ea57f1f75a10ccbf5b1b1cd62626e19c
 MD5 8ae04d5b43aaf966bc39ca5c95a0ffc4 dovecot-1.0_rc6.ebuild 4923
 RMD160 7a61a4ea57f1f75a10ccbf5b1b1cd62626e19c52 dovecot-1.0_rc6.ebuild 4923
 SHA256 c9e47a3721952010c69eb3a057ba5ae472c5a437be7f84fc9cf49758844577b1 dovecot-1.0_rc6.ebuild 4923
-EBUILD dovecot-1.0_rc7.ebuild 5002 RMD160 418f0c55b9e6cc1d1434a70b4144e97e73811b80 SHA1 82e5debf4395d109ea3128059ad0793cb94a45be SHA256 7ed872a398a77c1c085844ac620c7b2de057584c984f6cb3337032720ee91139
-MD5 b4a932886a9d39b81c2a94bc3457af68 dovecot-1.0_rc7.ebuild 5002
-RMD160 418f0c55b9e6cc1d1434a70b4144e97e73811b80 dovecot-1.0_rc7.ebuild 5002
-SHA256 7ed872a398a77c1c085844ac620c7b2de057584c984f6cb3337032720ee91139 dovecot-1.0_rc7.ebuild 5002
-MISC ChangeLog 11434 RMD160 7ac4f9fc293590b8bc3f39f45ba54098ea20c3e6 SHA1 3514f537ee4d456e843d7d7bb869b828d055e3bc SHA256 63e06a8acf8159b0b0fe350bd22e2dc38ed192054deed7a7279800700c27477b
-MD5 184aefd5b74ab05f755b0092c49faaad ChangeLog 11434
-RMD160 7ac4f9fc293590b8bc3f39f45ba54098ea20c3e6 ChangeLog 11434
-SHA256 63e06a8acf8159b0b0fe350bd22e2dc38ed192054deed7a7279800700c27477b ChangeLog 11434
+EBUILD dovecot-1.0_rc7.ebuild 5308 RMD160 079ff85cc144e2e8943c81c9b6060d45b2ccfb46 SHA1 b786f2535dc1a01f3267ecb8d0e8445826f14ee4 SHA256 76e80b9e60750068361ffb1039bc5cb574e5a9773e113a8017a227277e399870
+MD5 88345d5e04a4f052842eeb05a74fd1cb dovecot-1.0_rc7.ebuild 5308
+RMD160 079ff85cc144e2e8943c81c9b6060d45b2ccfb46 dovecot-1.0_rc7.ebuild 5308
+SHA256 76e80b9e60750068361ffb1039bc5cb574e5a9773e113a8017a227277e399870 dovecot-1.0_rc7.ebuild 5308
+MISC ChangeLog 11578 RMD160 5119965ed3b206e1c80b8444e27c23c5fb167ffd SHA1 ef68bb883a673c9021446fd423dfa8df514e3012 SHA256 e294d4d48a5a7e9eeaba0cf42dd8ff59d7801d68e4e03bcfebe9b04a6e33e637
+MD5 f362152fcbbd301a3857303e841a5895 ChangeLog 11578
+RMD160 5119965ed3b206e1c80b8444e27c23c5fb167ffd ChangeLog 11578
+SHA256 e294d4d48a5a7e9eeaba0cf42dd8ff59d7801d68e4e03bcfebe9b04a6e33e637 ChangeLog 11578
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
diff --git a/net-mail/dovecot/dovecot-1.0_rc7.ebuild b/net-mail/dovecot/dovecot-1.0_rc7.ebuild
index 57c8209343c6..91e7dc271eed 100644
--- a/net-mail/dovecot/dovecot-1.0_rc7.ebuild
+++ b/net-mail/dovecot/dovecot-1.0_rc7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_rc7.ebuild,v 1.2 2006/08/20 12:28:03 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_rc7.ebuild,v 1.3 2006/09/05 13:18:39 uberlord Exp $
 
 inherit autotools eutils
 
@@ -16,6 +16,9 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres ssl vpopmail"
 
+# Developer documentation, controlled by the doc USE flag
+DEVDOCS="auth-protocol index multiaccess securecoding"
+
 DEPEND=">=sys-apps/sed-4
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
@@ -58,6 +61,19 @@ src_install () {
 
 	newinitd "${FILESDIR}"/dovecot.init dovecot
 
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf
+	if use doc ; then
+		dodoc doc/*.txt
+	else
+		local x= n=
+		for x in doc/*.txt ; do
+			n=$(basename "${x}" .txt)
+			[[ " ${DEVDOCS} " != *" ${n} "* ]] && dodoc "${x}"
+		done
+	fi
+
 	# Create the dovecot.conf file from the dovecot-example.conf file that
 	# the dovecot folks nicely left for us....
 	local conf="${D}/etc/dovecot/dovecot.conf"
@@ -90,6 +106,7 @@ src_install () {
 		cp doc/dovecot-sql.conf "${D}"/etc/dovecot
 		fperms 600 /etc/dovecot/dovecot-sql.conf
 		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
+		dodoc doc/dovecot-sql.conf
 	fi
 
 	# Install LDAP configuration
@@ -97,14 +114,9 @@ src_install () {
 		cp doc/dovecot-ldap.conf "${D}"/etc/dovecot
 		fperms 600 /etc/dovecot/dovecot-ldap.conf
 		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
+		dodoc doc/dovecot-ldap.conf
 	fi
 
-	# Documentation
-	rm -rf "${D}"/usr/share/doc/dovecot
-	if use doc ; then
-		dodoc AUTHORS NEWS README TODO dovecot-example.conf
-		dodoc doc/*.txt doc/*.conf doc/*.cnf doc/mkcert.sh
-	fi
 
 	# Create SSL certificates
 	if use ssl ; then
@@ -118,6 +130,7 @@ src_install () {
 				SSLDIR="${D}"/etc/ssl sh mkcert.sh && \
 				popd >/dev/null
 		fi
+		dodoc doc/*.cnf doc/mkcert.sh
 	fi
 
 	dodir /var/run/dovecot