Fix sieve SRC_URI and directories - bug #393173

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

3 files changed, 37 insertions, 25 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index f2d5a0b1cb2e..bc4f90987b62 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.331 2011/12/04 06:59:12 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.332 2011/12/05 11:24:12 eras Exp $
+
+  05 Dec 2011; Eray Aslan <eras@gentoo.org> dovecot-2.1_rc1.ebuild:
+  Fix sieve SRC_URI and directories - bug #393173
 
 *dovecot-2.1_rc1 (04 Dec 2011)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 779bc1bfd32d..2207c495f74e 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -27,23 +27,23 @@ EBUILD dovecot-2.0.14.ebuild 8854 RMD160 926c22e953d956dc3983fbbb8d7eef43e9700d1
 EBUILD dovecot-2.0.15.ebuild 8852 RMD160 d22cf98e15958acb6d414b6a6a56268e9f36f050 SHA1 ca3e304979825f8da066ffdf97d39e9a0be87d9f SHA256 5451118790e070c118639421aa834d8829e554578af514f1c1eb08a4395e6158
 EBUILD dovecot-2.0.16-r1.ebuild 8784 RMD160 f77f1e16ebaa8819387070acf2d1be84d5c7f7ea SHA1 2f7470cb0c53aa9a6badeb66e0e458ee24bb5799 SHA256 e66d6271f8b453e6fa62186db248e11900f7f7be4659662aa31c6e67f9abcdb5
 EBUILD dovecot-2.0.16.ebuild 8773 RMD160 44299f1dec54e065b0c54328c5aced0a2cfbe894 SHA1 08b7a5805f8dbc0b589e8635ef0a466bc16838b4 SHA256 ed58e56c96e49b28c5c6ccd58d22b0eda96df3a0ae0678badf7f3d015e3c9bc7
-EBUILD dovecot-2.1_rc1.ebuild 9081 RMD160 0dbe98b586ba3c925fe22a8c7d928fa2751c1ea2 SHA1 4c1aaa7637006d23da180f9fd86879c5891d3a11 SHA256 95d54cbf4cfb9979d0f2674fef769454b0f03c4f77696f9c03d40d6c21ec2a2b
-MISC ChangeLog 51515 RMD160 2218a33d0655aebd41637e2c105160f7e3bce095 SHA1 538c77aa045017ecc9cffea82ae39bb6156212ce SHA256 5d18b3d622c93cac94a8a1959a6b56beadc95cfd6a36d8224a75fac866f86c16
+EBUILD dovecot-2.1_rc1.ebuild 9496 RMD160 1a65ba842135dfffc1ab91221e09506d908b8754 SHA1 064a7b454743c8623e16cdbbbfa286a202138cdd SHA256 d85433d7f9a12f2c102846163c54e1b7b1a4dca9098201a49b886571c79d0137
+MISC ChangeLog 51634 RMD160 0560e9fa9ada9638e8d31adc9cdd68f0675049c1 SHA1 088b41b90de823404d2d70633349f61fe96a71ee SHA256 0df3084276c6b5eafbf04e780b4685fd9dd44a452b9293dd693487921bc49ac1
 MISC metadata.xml 871 RMD160 8e53e66f2ad0b595ef424cf855c108d103a87f49 SHA1 ea5616a16a1cb3394600ad17a1422383acb100f5 SHA256 64805284b8602318ba8b8902d58adc8b4edacba0468037a9c8abae4aac46ddb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO2xpPAAoJEHfx8XVYajsf+GoQAIj7E2Q8nOhdgsevgO1nKLFy
-Y2D53KUXp+TV2ZOPEyq9RzxfAUx/84QxuaxwroAOCTIbJuAPh/9ILCS0kluseWE9
-2BFBqw9IzxxB2Vskscq16Ipkb1jnQjwQL8K+cnBdjvjU/HTvOWlCR++htMnBTcMG
-uinlNiegvSG194MO4d8IUYkUCVkSCzGXaQHyYSz88yRWmRhMb2+3S/KZhtweq0nd
-8IKXZfWG7Eat4sOAp9gu3RmmWkOrtMhXQcIEyHXm4DVnuJdHsv5iIqNWyqOplQpW
-SU7aK6DKr0HIllphEKrAEaveluewVx7835FkwrF+xPgyXmixON6ER0UHWfu2oN0P
-kq4fOzAZmbwmmq9njFU05Qg4HxxUhLMyrhKZtsKVxkQP1kH3Hn5eyxd8eROhjIlm
-GAITVk4Ok3lVIvkWqJlT4YOcvdJqE8RWiSAlNQ/iobSpx8v91l1vpF7UdZv5vd9N
-D6kAFXovh+mpaFL8YH6gL8xZyKVa2g1gfjO7MbaFwbSy93bSg2uS2aNBGSFNzmFi
-04t486tCHhK861rKm66y0g4qg6k8koAnoPybVHqpcexzh+iXWrh5nSQH8Yjs7QyN
-FJaoyBN0PEYai3/fyUo2LQrQRpkNU4hySYIC3T7E7RdLWjsjhgOXHqiqwqb05iZX
-MclBZZ14JWfiIH95vodc
-=+3xQ
+iQIcBAEBCAAGBQJO3KniAAoJEHfx8XVYajsf64YP/j9F8CZTEEYTPx5tK4ySK+3Y
+ZEyW6d+uCsC2LqqZ91kEYBMHBTGZ9NCk4RosbEQ0ACmbID9owV4lSTdFz1YS1AWi
+LhGtCF+C8eg0KxJZX0MaMqSYSKLmGbGQEA3LZ17eXWGxK6cepvaeaM6maTzmcZu+
+Q1KkGpVn+nTsze+hBDjWhWQswPYtbyWlXSp4cZSnvA/1hCPENk6NjtS8QZwFld1n
+wDjn701Bbf25eklZOLc4qBa3ksof2KnM3brJsQC/OYj+KRttIY1MNzaR8qCZ/sV6
+HzQKKu9oZI+309mzBeWiAIk2WcSJ7u+83TTnEQsuRtgtQ0nwm2hr4UEnL34S3gLh
+YechmPGjkfMNYeDm1H1hbUOivdt+EObX1Z7HvbK7++0WTT0bmzqxVXQSbkbEcL2s
+MUEbuUCQKm1/yeBc2kxoWAPtaEobWKdvth7UKwOeiTgpUYEaQr31ricQWv36jtae
+vz2rqfxORw67w4nJ31EkM+tbiDb88XSJ3ap8gafnnwbKWYEcXgWQQRMn/oVVIU7x
+aKMBbqRwqfyJZByIB8/Z8fL9fn8N3QiOUNgVetMdSe3yPPvm1/HSmpmQ2U6aQhvv
+N1ifEEt35SCAPLa4wOvAnR+/67tqR6wxoAUyqK6NL6q42uSNYSpR+gya7Ivd1EmQ
+l04GRbe4jN+v/oOs/g5B
+=zu4O
 -----END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-2.1_rc1.ebuild b/net-mail/dovecot/dovecot-2.1_rc1.ebuild
index 61136cca5084..1fe65c14548d 100644
--- a/net-mail/dovecot/dovecot-2.1_rc1.ebuild
+++ b/net-mail/dovecot/dovecot-2.1_rc1.ebuild
@@ -1,28 +1,31 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1_rc1.ebuild,v 1.1 2011/12/04 06:59:12 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1_rc1.ebuild,v 1.2 2011/12/05 11:24:12 eras Exp $
 
 EAPI=4
 
-inherit eutils versionator ssl-cert
+inherit eutils versionator ssl-cert autotools
 
 MY_P="${P/_/.}"
 major_minor="$( get_version_component_range 1-2 )"
+major_dash_minor="$( replace_version_separator 1 - ${major_minor} )"
 sieve_version="0.3.0"
 sieve_snapshot="b3bff60a18da"
 SRC_URI="http://www.dovecot.org/releases/${major_minor}/rc/${MY_P}.tar.gz
 	sieve? (
-	http://www.rename-it.nl/${PN}/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
+	http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/{sieve_snapshot}.tar.bz2 \
+	-> ${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
 	)
 	managesieve? (
-	http://www.rename-it.nl/${PN}/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
+	http://hg.rename-it.nl/${PN}-${major_minor}-pigeonhole/archive/{sieve_snapshot}.tar.bz2 \
+	-> ${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2
 	) "
 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~s390 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="bzip2 caps cydir sdbox doc ipv6 imapc kerberos ldap lucene +maildir managesieve mbox
 mdbox mysql pam postgres sieve sqlite +ssl static-libs suid vpopmail zlib"
@@ -45,6 +48,7 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
+	elog "${PN}-${major_minor}-pigeonhole-${sieve_snapshot}.tar.bz2"
 	if use managesieve && ! use sieve; then
 		ewarn "managesieve USE flag selected but sieve USE flag unselected"
 		ewarn "sieve USE flag will be turned on"
@@ -65,6 +69,11 @@ pkg_setup() {
 src_prepare() {
 	cp "${FILESDIR}/SnowballAnalyzer.h" "${S}/src/plugins/fts-lucene" || die
 	cp "${FILESDIR}/SnowballFilter.h" "${S}/src/plugins/fts-lucene" || die
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" \
+		|| die "cd failed"
+		eautoreconf
+	fi
 }
 
 src_configure() {
@@ -107,7 +116,7 @@ src_configure() {
 		# 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"
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed"
 		econf \
 			$( use_enable static-libs static ) \
 			--localstatedir="${EPREFIX}/var" \
@@ -121,7 +130,7 @@ src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 
 	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed"
 		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 	fi
 }
@@ -129,7 +138,7 @@ src_compile() {
 src_test() {
 	default_src_test
 	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed"
 		default_src_test
 	fi
 }
@@ -243,7 +252,7 @@ src_install () {
 	fi
 
 	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		cd "../dovecot-${major_dash_minor}-pigeonhole-${sieve_snapshot}" || die "cd failed"
 		emake DESTDIR="${ED}" install
 		sed -i -e \
 			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \