Fix lz4 lzma automagic dependency - bug #531302

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

3 files changed, 317 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index cb2e212383e8..4be5d550210c 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.497 2014/11/04 07:51:23 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.498 2014/12/04 08:55:35 eras Exp $
+
+*dovecot-2.2.15-r3 (04 Dec 2014)
+
+  04 Dec 2014; Eray Aslan <eras@gentoo.org> +dovecot-2.2.15-r3.ebuild:
+  Fix lz4 lzma automagic dependency - bug #531302
 
 *dovecot-2.2.15-r2 (04 Nov 2014)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 2428af14535e..68ba2010044b 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -19,24 +19,25 @@ EBUILD dovecot-2.2.14-r1.ebuild 8919 SHA256 5af94c50424ed47f12da46375e3e975c871d
 EBUILD dovecot-2.2.14.ebuild 8916 SHA256 d255b86217c7594aa6d9c2beda74e089b009c5e6eebfb17627439b2298e19763 SHA512 d380038d451414582f7f8133c26eed1c37a32d62ed7a6ff6579f489949662593fe08128e3f1879c430c097c233614aead7c83e3084af2d2d4f49f9d239439a14 WHIRLPOOL b5b09a4168af4f09af0884396e0330b6747bc5e134e0325d01c60c68af468a3d250974098a401c3e6623c74c4d297fa152b5d125fd7d38340ed47854944fb56a
 EBUILD dovecot-2.2.15-r1.ebuild 9133 SHA256 a92b2930adcd8ea601e63b25c4d25fe980d0d165cc2551e0601399c8cce95e65 SHA512 45af30982d1b8c9161d3caff0681abaae9cf0db4e9a9d40c13d97e106111e35ec6e1f4cfabcdb472ecf2cd5a15a126bf712abdb2c2754e1a87cbb884075fa265 WHIRLPOOL 7fbeed407fd60d1b6d81b80cb3a5523133545ad12a59b58f9c4ceb5c845c784e76651de97af67225875d3cbe63a17b298bfca21ae86df0f2380a0632de537ad7
 EBUILD dovecot-2.2.15-r2.ebuild 8937 SHA256 0e182fa2c5dc5dd1707d8656e87992e2a563f2d2b47936e1c3c7a30acf433d17 SHA512 1c5989600568d8bb05732e9b172336ab928142fa268904f0f1166eeba88579373d2b148eaf1dcc089c3e678f9751ed8a7cfa1f808ebdc282c5a74edb997eb668 WHIRLPOOL a5dcda477be276f9f8966d41a7bf0caecdb81f3fe502ea04a6b3f88190bff95bba5826aba0d5e77da594548204ff450cd7bae28fec47c40a35ceef67dcbf63ff
+EBUILD dovecot-2.2.15-r3.ebuild 8972 SHA256 882c30ab8586fad7e595c375b396c83f291c2731097c82459cc0f1a14c07e999 SHA512 419b1aacf4598a05c065dc55c85bee4de37a14dc4032f5913f8591b78c9dfa1558c6e24871c0ff7bbeb4cf9f68fdc0baae91fd9a80cb6d14f1390a30e8ae2da7 WHIRLPOOL 7351c87566a88b81200888d018ddc118a8aa5137fe71c38fc01f7200afb163a5dd735a8c104f164733f2d2060ac004a47e02ce24fa257abe3f98708befc71cb8
 EBUILD dovecot-2.2.15.ebuild 8930 SHA256 9e3acff5e766e4e15f0cf4b7f6e20f3c185510cfcb9284c8351da7b284e221ad SHA512 7d5218025e9edc09c55ef56c5d99eb4468f8917e74e9f953b65353719461b357dfa02567d2a0c5ec213ea67635cae9182f6fb2bedcb2150fe3b1daf1204624eb WHIRLPOOL d30ea936b2bcfbb102f4daacb33dbd357939112afbc48352e52c04002b10db83efad3343a35add5f3fd598fcf5a305a3109e252f0eddd3fc8edd56969ac32dd2
 EBUILD dovecot-2.2.9.ebuild 8621 SHA256 5fcf76456860701cda3cd442d8573ef8196a07d30df7c06684692069d42233c6 SHA512 fefd5aaed1344585753c4d8c9cfffc75661bd2c689ef09bd7b053b6fda9e33fd6dd00a5f8810d9140b1dbc48ca0537204822c332308d9333762a923888c494b8 WHIRLPOOL 4df63c633dadb2d1d8e7dcac367422f0080164b7d7c431a9cfd8b53e385decddb865031cb95f879a19bdedd4bdd719ad7942ca3d722a63d2b1cfae164b007ef0
-MISC ChangeLog 73118 SHA256 39b9641c9a759a2a93163de879853971da619dd783993b29e20279b0211788c8 SHA512 5c99dde6144b4df95db0894ae3ec5ebcd6dcbdc62c4350d633853f598e9f1a65a910b512ed2103c6e83c363d348af9832073b4969d65b078a1ed8a00b200be3d WHIRLPOOL 1efbf29563eb8bf0b814ca4c2eb5fe2937ac8227faa4afcd78b1fbc501a184b3cf486644d6652f1a92b32a5838b02088cb6d6f2297b9f8f69bb7dfea90dd3866
+MISC ChangeLog 73274 SHA256 7e4afef9dec743a328e4969e4b2bc38f7937a376a57de7e1958e8785218fac5a SHA512 dfc121cbce5e0f1bb836bbd6a59f08dc8f169b84f68b61565123a4d7f98e8db4927a5d2f85690ef414b8b47ec99f4ea6a64455dbd9cad71c838819c93460ddc9 WHIRLPOOL 3827a5c96f6c718aeb107aa276fa2451092b8bc783e6e2b479f04d5999d5b6ef4cb8f1fe7805be8ef3d3d8ad67255ee09403dc0d1742de1731f7c54fb15e3efa
 MISC metadata.xml 1078 SHA256 cad311926efedde5a689ae18496389ca80a1e4c5b4b16f1bfb456e8e27ce118c SHA512 f208e189f4901e1385d4c237cb7c91f333021b7bc4656d8b8365d7f6d827dc3a3e7ef58963baec88f399ffea505577e94e7901c5e58119e5952736f1c129e4bb WHIRLPOOL d94e39a391cf3ce8c31647d55a387c6102e244fcc3ebdb34909024f8b2faecf7a225552c77dbc5d841ac45f2583ec38b7f8e18e9eee92fbc702210dbdb581740
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUWIWHAAoJEHfx8XVYajsf4IIP/2lm1VNa1dbb8wAtiujbN6b4
-2503ZFLc7W+FUrPOBMZFuIlANrDHclXfmaK54pWJLktc5uzL9LKNvY/mEnl8miHl
-NmtkiKU0LnR/eIfoyI3piGM1NYK+n1oxQwn0ZeyahW6NmBXaYcLj90T30aG7iYLy
-C/psf5W+HDSuwdRoc5UPjgUoszZeKKa2PJJELvX/WlU1rNiHSDhreyKutStz0m3T
-tCQiC3TbDBEx6oMNXze8+HlM82wfe3saCMsKJrl8IgGMmGde9MxO73S2OM3K5Awj
-9bYV93STgCJZ1qLVPzkAuWPk8FyAkBA34yjSWlOcwS2AWv3xyyxEipsoHmxyjugo
-qqHuNMulm0vjpdRXmIw/gkRjajmSZKd5535bWPNO8Okh8u37klHkYqNio9DjWK/D
-EQHtsUDMBMesnCGJKFjChRN7oo76lt3hHlVJSMz8IEEg+kp36nHKqg8d0HDvRE4m
-zhbEiDkqzuqfSNOQRy+DnsN8KYBEdDEiG86kEJFTkt1A27NarCVD6LEH/x0nuqAk
-jFrKWRRvIGgkQaHWp4hlZuQb0zMd+BG5X9GQMCxG4SYUCCLy2jfspzyRTqiz6s46
-zTcGJCwfgssU9lkBgrh6QzDRS1VkmyQRjEWs6cXdwl8O22d3Bh46LLY1dm6NRFFv
-XW6g611ipTnByazWNs0e
-=32OJ
+iQIcBAEBCAAGBQJUgCGRAAoJEHfx8XVYajsfgEwQAJ0gI1OFuw6LGh80knM+p60t
+21et61OfsuEhOemGqQIfZ4sEQVKrjhpowuBdxERxh0Ssj0iGbu5GG3IVnS508rXf
+nA6ooOZf4ghrIL4LJ78KiQcwNV4kQw6kI0eddAkTxMthOJ6V+AuM8i0Pv3bm4z8T
+cj26356em4SYULaEqt+9wyr8AvHBXy7El0+j4wgY/XblwLHMxxxzQCZ4JRX9Ef8H
+7Kp3DPWfgw1BCyHS7e0rMqjEmbVVclXGK2Xk65HQn07/NhgyVbJpLP1u5z0UWrOJ
+11gEh7ua3P+ZjkwEqXewehbyZecTbFDIg5xR4ykFDy1HpHItmuw+nClnnXJSo0Yz
+fzkAXuHFP2W/z+1kgZ3q5Y57HV5gdp/lFRwX3Ic85POLRg7Lar2o92OKZOjSn5wP
+2Kt0VAq8MvKF1RdDuv0/TdC35nny1F7inx2kz2MzeCB+txn3UR7+oKCm7D4QBWkH
+OiAi580sUPc0C5VU49kv0UYKzWTTZJ2DgslNml134g6MQSkLckHbHH59I/diYslz
+qZmAiWQIJIlVwwsJjVUyHm+/NZ0O1xEvn+8hrfb7z4vV65B3NX4XiOHRdSOJNTJ4
+qsg+oS1W7BSneHxVA+3/5DDnheGLuiWQnH72ZmhULzRK0X8PU2p+CRW2bbpJNYt1
+1A8hDAPhQVPXqMVraBTO
+=mJik
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.2.15-r3.ebuild b/net-mail/dovecot/dovecot-2.2.15-r3.ebuild
new file mode 100644
index 000000000000..7121d7643de1
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.15-r3.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.15-r3.ebuild,v 1.1 2014/12/04 08:55:35 eras Exp $
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.6"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( virtual/postgresql !virtual/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-10-ssl.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
+		use ${storage} && storages="${storage} ${storages}"
+	done
+	[ "${storages}" ] || storages="maildir"
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--with-storages="${storages}" \
+		--disable-rpath \
+		$( systemd_with_unitdir ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with ssl ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	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
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	if ! use maildir; then
+		if use mbox; then
+			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+			keepdir /var/dovecot
+			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+			"${confd}/10-mail.conf" || die "sed failed"
+		elif use mdbox ; then
+			mail_location="mdbox:~/.mdbox"
+		elif use sdbox ; then
+			mail_location="sdbox:~/.sdbox"
+		fi
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		dodoc doc/*.txt
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+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
+			einfo "Creating SSL	certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+		fi
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}