fixes proposed by jakub: RDEPEND -> DEPEND; econf dies on its own; docert in pkg_postinst instead of src_install

Package-Manager: portage-2.1.3.9

3 files changed, 25 insertions, 20 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/Manifest b/net-mail/cyrus-imspd/Manifest
index 87851e7bc08c..41d0f4e94da0 100644
--- a/net-mail/cyrus-imspd/Manifest
+++ b/net-mail/cyrus-imspd/Manifest
@@ -18,14 +18,14 @@ MD5 9cc4403d49faa5913f7cafe219e0ce41 files/stunnel.conf 220
 RMD160 3964a9ee3d8ed070814a7eeaff217155ab7f182b files/stunnel.conf 220
 SHA256 1051f85d65e78debd298c7db8109a5834538365222615fff7da4b5ef9618db04 files/stunnel.conf 220
 DIST cyrus-imspd-v1.8.tar.gz 650596 RMD160 c145cc0a0d8e1fe2950887f6ab0ac84ae9d9a4a4 SHA1 dc8d9de6dc5c9e2ae528c550e624606850b82a95 SHA256 ba1026dca5440b6a24a298cb9aa350321f9c6f921ba6404a74b9d546c02b70cd
-EBUILD cyrus-imspd-1.8.ebuild 1800 RMD160 270da0fb71b7dbf96c3969e9d33ed7451369750f SHA1 0cf8a2ad82159ea8029f4e6e262afdd94a5bda60 SHA256 4a52a7fa3bef90fa64341c4d6faa07911ad808ecf91a8d0a31abd5cf1658eb4e
-MD5 10ad3e0f981ee34822ce3803f5960e98 cyrus-imspd-1.8.ebuild 1800
-RMD160 270da0fb71b7dbf96c3969e9d33ed7451369750f cyrus-imspd-1.8.ebuild 1800
-SHA256 4a52a7fa3bef90fa64341c4d6faa07911ad808ecf91a8d0a31abd5cf1658eb4e cyrus-imspd-1.8.ebuild 1800
-MISC ChangeLog 3955 RMD160 df69fa4623a9ef78b7c3e8ac606bd2ef4f2b9ed6 SHA1 f21fd273d251acbf71e6e1932898dcac0dec2cd4 SHA256 bb664c3253fab1cf8616822e85be4f2e74a15b89c8c5d78c2a7eeefc8502717b
-MD5 c84ad765ed7f7abf2c0e32de1427a574 ChangeLog 3955
-RMD160 df69fa4623a9ef78b7c3e8ac606bd2ef4f2b9ed6 ChangeLog 3955
-SHA256 bb664c3253fab1cf8616822e85be4f2e74a15b89c8c5d78c2a7eeefc8502717b ChangeLog 3955
+EBUILD cyrus-imspd-1.8.ebuild 1792 RMD160 34bf5f3382e579458c4685c1a5813c2db5ac4c56 SHA1 ff0c4fa3df6082b6b7739d5e3ea75fd93a28a959 SHA256 2b33fe7a2d0138981eb5433bdf5df9c5e46863e2569a2c16ac3121222997b418
+MD5 b24ab1d678f423c0f3a9724546ac89a7 cyrus-imspd-1.8.ebuild 1792
+RMD160 34bf5f3382e579458c4685c1a5813c2db5ac4c56 cyrus-imspd-1.8.ebuild 1792
+SHA256 2b33fe7a2d0138981eb5433bdf5df9c5e46863e2569a2c16ac3121222997b418 cyrus-imspd-1.8.ebuild 1792
+MISC ChangeLog 4154 RMD160 955a0fed0da4a9c8054659ce0ba44fe53bec78d6 SHA1 a9de14bee7f23144c63c6ffa14594e81a9b5ab19 SHA256 1ff64d52b9d83dcefd30aac506e69e61cc404722a58e3311c5904e3f120eb68d
+MD5 32957c28180f6d7f3283f51bfa5c5bb3 ChangeLog 4154
+RMD160 955a0fed0da4a9c8054659ce0ba44fe53bec78d6 ChangeLog 4154
+SHA256 1ff64d52b9d83dcefd30aac506e69e61cc404722a58e3311c5904e3f120eb68d ChangeLog 4154
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -36,7 +36,7 @@ SHA256 192b0bc6df4030f191543819f89d5b1c367934572f5a34d694696ff5f08600d4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHBjX/NQqtfCuFneMRAl/jAJ4mrbX0wSEb0e3nbQaGtxniE28nWwCePqtO
-okxE/4U7M4cdtBscWu8LduM=
-=JBRz
+iD8DBQFHBjgtNQqtfCuFneMRAnAeAKCco8S3Jhb4V2mz1Q3uLj6C6Wb82QCeIwtD
+1Emrs/oC4q33qqkKll+uNcY=
+=YI90
 -----END PGP SIGNATURE-----
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/*
 }