Dont die with conflicting USE flags. PREFIX support bug #302785. Thanks to Leho Kraav for the patch. Managesieve pam.d name change bug #331115. Correct LICENSE. New revision in bug 333239, work done by Eray Aslan

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

3 files changed, 47 insertions, 38 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index ac48e32a54f0..a403457af81a 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.253 2010/08/16 19:57:00 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.254 2010/08/19 02:31:37 darkside Exp $
+
+*dovecot-1.2.13-r1 (19 Aug 2010)
+
+  19 Aug 2010; Jeremy Olexa <darkside@gentoo.org> -dovecot-1.2.12.ebuild,
+  +dovecot-1.2.13-r1.ebuild:
+  Dont die with conflicting USE flags. PREFIX support bug #302785. Thanks to
+  Leho Kraav for the patch. Managesieve pam.d name change bug #331115.
+  Correct LICENSE. New revision in bug 333239, work done by Eray Aslan
 
 *dovecot-2.0_rc5 (16 Aug 2010)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index b0ea35fba752..99f276795fcf 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -12,8 +12,6 @@ DIST dovecot-1.2-sieve-0.1.16.tar.gz 1049918 RMD160 1609c33226946e403bcb00d97d7d
 DIST dovecot-1.2-sieve-0.1.17.tar.gz 1029070 RMD160 7b53742c7388bf27521a46b8e1121f45a764df87 SHA1 420142a8438d76e3849727c3ab4bde5a5b7fb7e4 SHA256 e02a4a1b5958bbe1c8e216f11d00166e33c31b304cbd4180de29b1a1dd5e7d0b
 DIST dovecot-1.2.11-managesieve-0.11.11.diff.gz 6454 RMD160 bfd7593b8ffa36ac6062e0ff147c9759447d6352 SHA1 f27d32144e6db35715ac9de3acd7a7d8948f3323 SHA256 fc024e9f68c6ab82f811af3155c94f1609670d85c7240dfbd34aa045e6fc8a8b
 DIST dovecot-1.2.11.tar.gz 2878057 RMD160 cb2090a21e99cfaf98d7cbfdc98adbf42df6e2cc SHA1 97e63377be3641d4c7aa5a0c6d4e2bd602d45972 SHA256 2971691d4f8307b7014ca6671f44151cb53379f80746aa4a95cdeb0b846e0474
-DIST dovecot-1.2.12-managesieve-0.11.11.diff.gz 6455 RMD160 8f55a97e9a68e53faafa78a5f725969403f1f295 SHA1 f3719fc5427c97c65416658d73ff3234eaa204c9 SHA256 ea6549ed32cb1968971ef00725b43c8154023b4ed67ae1eb272485a0cf90a64f
-DIST dovecot-1.2.12.tar.gz 2882517 RMD160 9a2ecf836607905acebee57d082b0b4c36108260 SHA1 72fedd20c00eb3763012555c3622f84286cb8e65 SHA256 1ef0c40822cf64f20af1e65b4402da75296489aba25df8b13e2386df6952c281
 DIST dovecot-1.2.13-managesieve-0.11.11.diff.gz 6463 RMD160 d26fa4db66c74d46fc562703f4493ee4d5a1b2a7 SHA1 636b1bb4dbcfd9e82c93faf4e4fdf83e2dcee755 SHA256 8646fcdf8c0fda69f8b0df88d9356861e124d7f70c75df1afb714769cd84e9ed
 DIST dovecot-1.2.13.tar.gz 2946123 RMD160 083dd4504dbf0e86187019853514811155c9087f SHA1 8a6e12cc40df02083480f9e9eef57939a81fd7af SHA256 22fa612b4c3250d33bc6e5010efd81d082b10dbce73da732fea644e085701869
 DIST dovecot-2.0.rc5.tar.gz 3081921 RMD160 8da8e8da9cfcd3feff2d10f06c4e2d66328b72f5 SHA1 3616954f4c8e1987dfabeb79240e1fcbb5fc02f8 SHA256 528125d2deca6539af04128ebed0ce17da714f35fd7519bfd6ea59413348b034
@@ -21,8 +19,8 @@ DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa7109285
 EBUILD dovecot-1.1.19.ebuild 8581 RMD160 4cfb649e5cd577ab715f831210d6bdf7ddb7ea05 SHA1 3217a1cef3a0cd9192c7093d4cc3403eb1bcc9ea SHA256 b0fb355d36c9fc56016bfa3c6bcca07582dc60900c13c6c8d99848c98d8dada2
 EBUILD dovecot-1.2.11-r1.ebuild 8541 RMD160 f31a3cff9606f0254ba14d5bd5f60962daf99dba SHA1 874ee918a521b1995da49d9e7bb9d7d28d78fd36 SHA256 0e75be8e0338a01c54e72b507d8fe3c17ef1aa31a19ece769a5e3311897ca0ed
 EBUILD dovecot-1.2.11-r2.ebuild 8548 RMD160 d1f883279cca7db1cfbe7738a46ec658a0ea58d2 SHA1 8779360f729cf1ffdb08bd6837a89bd017a2436e SHA256 946f195e5434105bbdfb423599514914c08ab958f3afeac6f2e82cda62df1a20
-EBUILD dovecot-1.2.12.ebuild 8547 RMD160 c5fc0acae6570bfcf3d57c772c5fb89ecc311b0e SHA1 a7c705774a4f4683b721a5e5e8692e875be8ffda SHA256 1a11428ec920f63a58f4d70847e26cf1aded769d4c7cfb7f2e98c7bbba4de1e8
+EBUILD dovecot-1.2.13-r1.ebuild 8875 RMD160 90a000f07b26331af8970df14f142f92cfe065fa SHA1 9c02334811cd97f80f10825da06de8e847b59477 SHA256 a37776e57d317f20ef274ea38e51e50d716ae7eb4da2d7b72133cb85904a5e37
 EBUILD dovecot-1.2.13.ebuild 8549 RMD160 2dc0ad1f3ae9048b45083a05e597398b1739126a SHA1 7b91eb5cc1f643e6d4163acc3b1ca2d29b95f90c SHA256 b77f8c1c341e59b1a69db280490f534901e3c08927e74c9b360edfc0c6bfdf21
 EBUILD dovecot-2.0_rc5.ebuild 9250 RMD160 0c1400e06fb9564d4a5848e0f2b18b8a47bb8881 SHA1 66e36204eb673721e9c622319e0270ae3c5fba5c SHA256 243f0093386783ac1c97734138cbebf6036da6ceea7678e028249215d6a51968
-MISC ChangeLog 41466 RMD160 98313ce0183f9d3cf3e2db8cdb3b88f9925a4c62 SHA1 65dadb76600b9c28f04dfc813daa8dc0d547c5c6 SHA256 392e86a546e8d0edda2acd1975f12a06b500966e40d375e98701ca4d489f6c76
+MISC ChangeLog 41823 RMD160 f8514ddaac7569e59d0143ecd4bf956c9d6be88b SHA1 271e1f85524aa2af87d544a384f77a251e09968e SHA256 6face2e4e8b23a20390c6986cdfb0c95850428dcde393ea8d353cc1778b5292e
 MISC metadata.xml 919 RMD160 1e3a625fb64bee092b52fe671c7b51cbbc0cea80 SHA1 d4c9aa0299f149d3d552a10971d3efcc84809a1d SHA256 872564b7c2a02f4c2e042ea7b64e5ef14b0e1b63ddf8f04af36db9aa0efab372
diff --git a/net-mail/dovecot/dovecot-1.2.12.ebuild b/net-mail/dovecot/dovecot-1.2.13-r1.ebuild
index ea14611aa57b..4a4f6b802884 100644
--- a/net-mail/dovecot/dovecot-1.2.12.ebuild
+++ b/net-mail/dovecot/dovecot-1.2.13-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.12.ebuild,v 1.2 2010/07/18 20:44:48 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.2.13-r1.ebuild,v 1.1 2010/08/19 02:31:37 darkside Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils versionator ssl-cert
 
@@ -14,12 +14,13 @@ SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
 	managesieve? (
 		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${PV}-managesieve-${managesieve_version}.diff.gz
 		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
+		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz
 	)"
 DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
 HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
-LICENSE="LGPL-2.1" # MIT too?
+LICENSE="LGPL-2.1 MIT"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
 
 IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
@@ -40,13 +41,13 @@ RDEPEND="${DEPEND}
 
 pkg_setup() {
 	if use managesieve && ! use sieve; then
-		eerror "managesieve USE flag selected but sieve USE flag unselected"
-		die "USE flag problem"
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
 	fi
 
 	if use dbox && ! use maildir; then
-		eerror "dbox USE flag needs maildir USE flag enabled"
-		die "USE flag problem"
+		ewarn "dbox USE flag selected but  maildir USE flag unselected"
+		ewarn "maildir USE flag will be turned on"
 	fi
 
 	# Add user and group for login process (same as for fedora/redhat)
@@ -73,12 +74,15 @@ src_configure() {
 	for storage in cydir dbox maildir mbox; do
 		use ${storage} && storages="${storage} ${storages}"
 	done
+	if use dbox && ! use maildir; then
+		storages="${storages/dbox/dbox maildir}"
+	fi
 	[ "${storages}" ] || storages="maildir"
 
 	econf \
-		--sysconfdir=/etc/dovecot \
-		--localstatedir=/var \
-		--with-moduledir="/usr/$( get_libdir )/dovecot" \
+		--sysconfdir="${EPREFIX}/etc/dovecot" \
+		--localstatedir="${EPREFIX}/var" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
 		$( use_with berkdb db ) \
 		$( use_with bzip2 bzlib ) \
 		$( use_with caps libcap ) \
@@ -97,7 +101,7 @@ src_configure() {
 		--enable-header-install \
 		${conf}
 
-	if use sieve; then
+	if use sieve || use managesieve; then
 		# The sieve plugin needs this file to be build to determine the plugin
 		# directory and the list of libraries to link to.
 		emake dovecot-config || die "emake dovecot-config failed"
@@ -114,7 +118,7 @@ src_configure() {
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
 
-	if use sieve; then
+	if use sieve || use managesieve; then
 		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
 		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
 
@@ -126,22 +130,22 @@ src_compile() {
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${ED}" install || die "make install failed"
 
 	# insecure:
 	#use suid && fperms u+s /usr/libexec/dovecot/deliver
 	#better:
-	if use suid;then
+	if use suid; then
 		einfo "Changing perms to allow deliver to be suided"
 		fowners root:mail /usr/libexec/dovecot/deliver
 		fperms 4750 /usr/libexec/dovecot/deliver
 	fi
 
-	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
+	rm -f "${ED}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
 
 	newinitd "${FILESDIR}"/dovecot-1.2.init dovecot
 
-	rm -rf "${D}"/usr/share/doc/dovecot
+	rm -rf "${ED}"/usr/share/doc/dovecot
 
 	if use ssl; then
 		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
@@ -152,16 +156,16 @@ src_install () {
 	fi
 
 	dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-	dodoc doc/* || die "dodoc doc/ failed"
+	dodoc doc/*.{txt,cnf,xml,sh}  || die "dodoc doc/ failed"
 	docinto wiki
 	dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
 
 	# 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"
-	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	mv "${ED}"/etc/dovecot/dovecot-example.conf "${ED}"/etc/dovecot/dovecot.conf
 
-	# .maildir is the Gentoo default, but we need to support mbox to
+	# .maildir is the Gentoo default, but we need to support mbox too
 	local mail_location="maildir:~/.maildir"
 	if use mbox; then
 		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
@@ -176,8 +180,8 @@ src_install () {
 	if use pam; then
 		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
 			"${conf}" || die "failed to update PAM settings in dovecot.conf"
-		# mailbase does not provide a managesieve pam file
-		use managesieve && dosym imap /etc/pam.d/managesieve
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
 	fi
 
 	# Listen on ipv6 and ipv4
@@ -195,7 +199,7 @@ src_install () {
 
 	# Install SQL configuration
 	if use mysql || use postgres; then
-		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
+		cp doc/dovecot-sql-example.conf "${ED}"/etc/dovecot/dovecot-sql.conf
 		fperms 600 /etc/dovecot/dovecot-sql.conf
 		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
 			|| die "failed to update SQL settings in dovecot-sql.conf"
@@ -204,33 +208,32 @@ src_install () {
 
 	# Install LDAP configuration
 	if use ldap; then
-		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
+		cp doc/dovecot-ldap-example.conf "${ED}"/etc/dovecot/dovecot-ldap.conf
 		fperms 600 /etc/dovecot/dovecot-ldap.conf
 		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
 			|| die "failed to update LDAP settings in dovecot-ldap.conf"
 		dodoc doc/dovecot-ldap-example.conf
 	fi
 
-	if use sieve; then
+	if use sieve || use managesieve; then
 		cd "../dovecot-${major_minor}-sieve-${sieve_version}"
-		emake DESTDIR="${D}" install || die "make install failed (sieve)"
+		emake DESTDIR="${ED}" install || die "make install failed (sieve)"
 
 		if use managesieve; then
 			cd "../dovecot-${major_minor}-managesieve-${managesieve_version}"
-			emake DESTDIR="${D}" install || die "make install failed (managesieve)"
+			emake DESTDIR="${ED}" install || die "make install failed (managesieve)"
 		fi
 	fi
 
 	dodir /var/run/dovecot
 	fowners root:root /var/run/dovecot
 	fperms 0755 /var/run/dovecot
-	keepdir /var/run/dovecot/login
 	fowners root:dovecot /var/run/dovecot/login
 	fperms 0750 /var/run/dovecot/login
 
 	ewarn "If you are upgrading from Dovecot 1.1, read "
 	ewarn " http://wiki.dovecot.org/Upgrading/1.2"
-	if use sieve; then
+	if use sieve || use managesieve; then
 		ewarn " http://wiki.dovecot.org/LDA/Sieve/Dovecot#Migration_from_CMUSieve"
 		ewarn " In particular, do not forget to change cmusieve to sieve"
 	fi
@@ -240,16 +243,16 @@ pkg_postinst() {
 
 	if use ssl; then
 	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+		if ! [[ -e "${EROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${EROOT}"/etc/ssl/dovecot/server.key ]];	then
 			einfo "Creating SSL	certificate"
 			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
 			install_cert /etc/ssl/dovecot/server
-			chown dovecot:mail "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
+			chown dovecot:mail "${EROOT}"/etc/ssl/dovecot/server.{key,pem}
 		fi
 	fi
 
-	if grep -q '^ssl_key_password' "${ROOT}"/etc/dovecot/dovecot.conf; then
+	if grep -q '^ssl_key_password' "${EROOT}"/etc/dovecot/dovecot.conf; then
 		echo
 		ewarn "You have set ssl_key_password in dovecot.conf!"
 		ewarn "You are URGED to read the advice in the current"