Documentation now installed via the doc USE flag.

  Example configs for ldap and sql are now copied instead of moved, #136812.
Package-Manager: portage-2.1

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index e26adae0adb0490d61f09c99ec29713a7a650dbc..a40c973e85b61f20556a3a7cf499b4ab7b704a24 100644 (file)
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,8 +1,10 @@
 # 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.51 2006/06/14 15:36:06 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.52 2006/06/14 22:22:05 uberlord Exp $
 
   14 Jun 2006; Roy Marples <uberlord@gentoo.org> dovecot-1.0_beta9.ebuild:
+  Documentation now installed via the doc USE flag.
+  Example configs for ldap and sql are now copied instead of moved, #136812.
   Set ssl_listen = * when emerged without ipv6, #136781
 
 *dovecot-1.0_beta9 (13 Jun 2006)

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index e25b3d28f4f25a3df8652029cdc3fc944a71704c..887bfc088a94aff140717475edfaa46789dcec08 100644 (file)
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -12,14 +12,14 @@ EBUILD dovecot-1.0_beta8.ebuild 4645 RMD160 4792da7ed1922b0c11caa5710f2f073d8fa7
 MD5 9394fb4f53cb69bb777019adf947d2e7 dovecot-1.0_beta8.ebuild 4645
 RMD160 4792da7ed1922b0c11caa5710f2f073d8fa7a92d dovecot-1.0_beta8.ebuild 4645
 SHA256 6d68b17728695ef6d79dd229c74847ef1e0d106d46215d82df694f48c6e129a6 dovecot-1.0_beta8.ebuild 4645
-EBUILD dovecot-1.0_beta9.ebuild 5289 RMD160 ce6812e03dfce719040bc5169dbc8b77aea5a894 SHA1 d28408ee63326d7ad49ecce855e4bb42f99489b7 SHA256 90cf64ab31a5f9e60d8f8558bcea40a625c607d69922d28bb5194b365c411974
-MD5 5775b0b1d88f7e78b68421743dfdd7ad dovecot-1.0_beta9.ebuild 5289
-RMD160 ce6812e03dfce719040bc5169dbc8b77aea5a894 dovecot-1.0_beta9.ebuild 5289
-SHA256 90cf64ab31a5f9e60d8f8558bcea40a625c607d69922d28bb5194b365c411974 dovecot-1.0_beta9.ebuild 5289
-MISC ChangeLog 9427 RMD160 9e2842c00df0eb7cf5fbbc14743a3a4740deef63 SHA1 647aa13146abe7433f526c735a25f671e2c6cb9c SHA256 21685de0b48b57d73d8f8c0b251f3726c57e37dd26bd6220e06a8586c9136d62
-MD5 4cbb37cd9dfb61a0a722cc917bfb2e11 ChangeLog 9427
-RMD160 9e2842c00df0eb7cf5fbbc14743a3a4740deef63 ChangeLog 9427
-SHA256 21685de0b48b57d73d8f8c0b251f3726c57e37dd26bd6220e06a8586c9136d62 ChangeLog 9427
+EBUILD dovecot-1.0_beta9.ebuild 5318 RMD160 1efc51fd331bbba41a9936cd31ec6a8d47a37428 SHA1 b2a56f0fd44bdb4ce493f96bbe26b710591670d4 SHA256 62c21a4ddbfc4b8fe5d4f0bb71a549dec13a61bece2eeb980b13c812b2e03847
+MD5 23c2fdc7072a231c7b99bc50d62127d9 dovecot-1.0_beta9.ebuild 5318
+RMD160 1efc51fd331bbba41a9936cd31ec6a8d47a37428 dovecot-1.0_beta9.ebuild 5318
+SHA256 62c21a4ddbfc4b8fe5d4f0bb71a549dec13a61bece2eeb980b13c812b2e03847 dovecot-1.0_beta9.ebuild 5318
+MISC ChangeLog 9556 RMD160 27ef9293ceb4ab1dd40afce9228c5b8bc8a78eec SHA1 cfb089f7d09715f9304d9a48f39d559f75f952e0 SHA256 7167c726b3c464b2b49a43d28d0b0d22d884ba9c6056b9b01972ea2f3452b303
+MD5 3af4f71d693be7893dd0c8fa928342b8 ChangeLog 9556
+RMD160 27ef9293ceb4ab1dd40afce9228c5b8bc8a78eec ChangeLog 9556
+SHA256 7167c726b3c464b2b49a43d28d0b0d22d884ba9c6056b9b01972ea2f3452b303 ChangeLog 9556
 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_beta9.ebuild b/net-mail/dovecot/dovecot-1.0_beta9.ebuild
index 88e2aed0f068c870d38cef6d6a5985ae17d0a273..28b33c0ce808851671275ce56d91cade7b206b25 100644 (file)
--- a/net-mail/dovecot/dovecot-1.0_beta9.ebuild
+++ b/net-mail/dovecot/dovecot-1.0_beta9.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_beta9.ebuild,v 1.2 2006/06/14 15:36:06 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_beta9.ebuild,v 1.3 2006/06/14 22:22:05 uberlord Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
-IUSE="debug ipv6 kerberos ldap mbox mysql pop3d pam postgres ssl vpopmail"
+IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres ssl vpopmail"
 
 DEPEND=">=sys-apps/sed-4
        kerberos? ( virtual/krb5 )
@@ -106,7 +106,7 @@ src_install () {
 
        # Install SQL configuration
        if use mysql || use postgres ; then
-               mv doc/dovecot-sql.conf "${D}"/etc
+               cp doc/dovecot-sql.conf "${D}"/etc
                fperms 600 /etc/dovecot-sql.conf
                sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' \
                        "${D}"/etc/dovecot.conf
@@ -114,7 +114,7 @@ src_install () {
 
        # Install LDAP configuration
        if use ldap ; then
-               mv doc/dovecot-ldap.conf "${D}"/etc
+               cp doc/dovecot-ldap.conf "${D}"/etc
                fperms 600 /etc/dovecot-ldap.conf
                sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' \
                        "${D}"/etc/dovecot.conf
@@ -122,8 +122,10 @@ src_install () {
 
        # Documentation
        rm -rf "${D}"/usr/share/doc/dovecot
-       dodoc AUTHORS NEWS README TODO dovecot-example.conf
-       dodoc doc/*.txt doc/*.conf doc/*.cnf doc/mkcert.sh
+       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