summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <opfer@gentoo.org>2007-10-05 13:12:07 +0000
committerChristian Faulhammer <opfer@gentoo.org>2007-10-05 13:12:07 +0000
commitf247bac0e300f187fd565c62c82cf5f4a1679382 (patch)
treeb3927e641a0bdc54c169ed5df0b15b2d51041256 /net-mail
parentstable x86, bug 194797 (diff)
downloadgentoo-2-f247bac0e300f187fd565c62c82cf5f4a1679382.tar.gz
gentoo-2-f247bac0e300f187fd565c62c82cf5f4a1679382.tar.bz2
gentoo-2-f247bac0e300f187fd565c62c82cf5f4a1679382.zip
fixes proposed by jakub: RDEPEND -> DEPEND; econf dies on its own; docert in pkg_postinst instead of src_install
(Portage version: 2.1.3.9)
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/cyrus-imspd/ChangeLog7
-rw-r--r--net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild16
2 files changed, 14 insertions, 9 deletions
diff --git a/net-mail/cyrus-imspd/ChangeLog b/net-mail/cyrus-imspd/ChangeLog
index 42dd7d1756f2..6dc212f4ce2f 100644
--- a/net-mail/cyrus-imspd/ChangeLog
+++ b/net-mail/cyrus-imspd/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-mail/cyrus-imspd
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.13 2007/10/05 13:02:49 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.14 2007/10/05 13:12:07 opfer Exp $
+
+ 05 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
+ cyrus-imspd-1.8.ebuild:
+ fixes proposed by jakub: RDEPEND -> DEPEND; econf dies on its own; docert in
+ pkg_postinst instead of src_install
05 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
-files/cyrus-imspd-db4.patch, -files/cyrus-imspd-gentoo.patch,
diff --git a/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild b/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild
index fac4948f7b34..6fef83c7591e 100644
--- a/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild
+++ b/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild,v 1.3 2007/10/05 13:02:49 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8.ebuild,v 1.4 2007/10/05 13:12:07 opfer Exp $
inherit eutils ssl-cert
@@ -13,15 +13,13 @@ SLOT="0"
KEYWORDS="~x86"
IUSE="kerberos ldap ssl"
-RDEPEND=">=sys-libs/db-3.2
+DEPEND=">=sys-libs/db-3.2
>=dev-libs/cyrus-sasl-2.1.3
>=dev-libs/cyrus-imap-dev-2.1.14
kerberos? ( virtual/krb5 )
ldap? ( >=net-nds/openldap-2.0 )
ssl? ( >=net-misc/stunnel-4 )"
-DEPEND="${RDEPEND}"
-
S="${WORKDIR}/${PN}-v${PV}"
src_unpack() {
@@ -41,8 +39,7 @@ src_compile() {
$(use_with ldap ldap ldap) \
$(use_enable kerberos gssapi) \
--without-krb \
- --with-auth=unix || \
- die "econf failed"
+ --with-auth=unix
# Fix some malloc definitions
sed -i -e \
@@ -62,12 +59,15 @@ src_install() {
if use ssl ; then
insinto /etc/stunnel
newins "${FILESDIR}/stunnel.conf" imspd.conf
+ fi
+ dodoc README imsp/options.sample notes/*
+}
+pkg_postinst() {
+ if use ssl ; then
dosed "s:#IMSPD_USE_SSL:IMSPD_USE_SSL:" /etc/conf.d/imspd
SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMSP Server}"
insinto /etc/ssl/imspd
docert server
fi
-
- dodoc README imsp/options.sample notes/*
}