summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2012-08-02 14:24:45 +0000
committerEray Aslan <eras@gentoo.org>2012-08-02 14:24:45 +0000
commit095233438428bcda9ce39ca0cdb6eafdb310c4b0 (patch)
treefd9da725440bc0c5dfc47b0d1ec6d7305d703885 /net-mail
parentinitial import, ebuild by Guillaume Horel and Jacques-Pascal Deplaix, bug #... (diff)
downloadgentoo-2-095233438428bcda9ce39ca0cdb6eafdb310c4b0.tar.gz
gentoo-2-095233438428bcda9ce39ca0cdb6eafdb310c4b0.tar.bz2
gentoo-2-095233438428bcda9ce39ca0cdb6eafdb310c4b0.zip
Version bump. Fix linking sieve with gold - bug #425792. Remove masked ebuild
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/dovecot/ChangeLog9
-rw-r--r--net-mail/dovecot/dovecot-2.1.9.ebuild (renamed from net-mail/dovecot/dovecot-2.1.8-r1.ebuild)5
-rw-r--r--net-mail/dovecot/files/dovecot-2.1.9_managesieve_gold.patch (renamed from net-mail/dovecot/files/dovecot-2.1.8_managesieve_gold.patch)23
3 files changed, 34 insertions, 3 deletions
diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 0601fc6dabd8..2259ada6c453 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-mail/dovecot
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.370 2012/07/13 14:02:22 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.371 2012/08/02 14:24:45 eras Exp $
+
+*dovecot-2.1.9 (02 Aug 2012)
+
+ 02 Aug 2012; Eray Aslan <eras@gentoo.org> -dovecot-2.1.8-r1.ebuild,
+ -files/dovecot-2.1.8_managesieve_gold.patch, +dovecot-2.1.9.ebuild,
+ +files/dovecot-2.1.9_managesieve_gold.patch:
+ Version bump. Fix linking sieve with gold - bug #425792. Remove masked ebuild
*dovecot-2.1.8-r1 (13 Jul 2012)
diff --git a/net-mail/dovecot/dovecot-2.1.8-r1.ebuild b/net-mail/dovecot/dovecot-2.1.9.ebuild
index 737d83fd4138..8a1287dfff23 100644
--- a/net-mail/dovecot/dovecot-2.1.8-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.1.9.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.8-r1.ebuild,v 1.1 2012/07/13 14:02:22 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.9.ebuild,v 1.1 2012/08/02 14:24:45 eras Exp $
EAPI=4
-inherit eutils versionator ssl-cert systemd
+inherit eutils versionator ssl-cert systemd autotools
MY_P="${P/_/.}"
major_minor="$( get_version_component_range 1-2 )"
@@ -63,6 +63,7 @@ pkg_setup() {
src_prepare() {
cd "${WORKDIR}"/dovecot-2.1-pigeonhole* || die
epatch "${FILESDIR}/${P}_managesieve_gold.patch"
+ eautoreconf
}
src_configure() {
diff --git a/net-mail/dovecot/files/dovecot-2.1.8_managesieve_gold.patch b/net-mail/dovecot/files/dovecot-2.1.9_managesieve_gold.patch
index 97d12b5a6a50..4b65b33e1eb9 100644
--- a/net-mail/dovecot/files/dovecot-2.1.8_managesieve_gold.patch
+++ b/net-mail/dovecot/files/dovecot-2.1.9_managesieve_gold.patch
@@ -1,3 +1,26 @@
+# HG changeset patch
+# User Stephan Bosch <stephan@rename-it.nl>
+# Date 1343690295 -7200
+# Node ID c52a0c5613119fdae86b29a797d5d442c1e8d959
+# Parent e3ea0270985aa297e45e575001a22321b0b87524
+Fix linkage with ld.gold.
+Patch by Eray Aslan.
+
+diff -r e3ea0270985a -r c52a0c561311 src/lib-sieve/Makefile.am
+--- a/src/lib-sieve/Makefile.am Mon Jul 30 10:14:42 2012 +0200
++++ b/src/lib-sieve/Makefile.am Tue Jul 31 01:18:15 2012 +0200
+@@ -70,8 +70,8 @@
+ $(extdir)/vnd.dovecot/duplicate/libsieve_ext_duplicate.la \
+ $(unfinished_plugins)
+
+-libdovecot_sieve_la_DEPENDENCIES = $(plugins)
+-libdovecot_sieve_la_LIBADD = $(plugins)
++libdovecot_sieve_la_DEPENDENCIES = $(plugins) $(LIBDOVECOT_LDA_DEPS)
++libdovecot_sieve_la_LIBADD = $(plugins) $(LIBDOVECOT_LDA)
+
+ libdovecot_sieve_la_SOURCES = \
+ rfc2822.c \
+
# HG changeset patch
# User Stephan Bosch <stephan@rename-it.nl>