QA: fix some obvious mistakes, make sure to die if the newsbin fails (bug #298587...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-mail/cyrus-imspd/ChangeLog b/net-mail/cyrus-imspd/ChangeLog
index 50d6a5c14138ad8db762dfd04c8ea5eb8ba31b53..bba843fb42870eecf12ffc225efb8d6bdf729667 100644 (file)
--- 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.18 2007/12/26 21:54:03 phreak Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.19 2010/04/19 10:58:08 flameeyes Exp $
+
+  19 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  cyrus-imspd-1.8-r1.ebuild:
+  QA: fix some obvious mistakes, make sure to die if the newsbin fails (bug
+  #298587); fix build with cyrus-imap-dev-2.3.
 
   26 Dec 2007; Christian Heim <phreak@gentoo.org>
   -files/digest-cyrus-imspd-1.8:

diff --git a/net-mail/cyrus-imspd/Manifest b/net-mail/cyrus-imspd/Manifest
index bf402cb88f487a07f26db977a797190fef9a6aa4..1699bacc4318206db7552a75259d2f582f6cf93c 100644 (file)
--- a/net-mail/cyrus-imspd/Manifest
+++ b/net-mail/cyrus-imspd/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cyrus-imspd-1.8-gentoo.patch 4220 RMD160 7fc112653a96cbcaf0fdeb47923186ef01468388 SHA1 f26a013c7cb14d15ba7b533562f1b434cac40d43 SHA256 c5ad4e69c91da01ee17adf374bd11abe8ed7d4f34bb78c6c2270572e2e439f8f
 AUX imspd.conf 156 RMD160 1acaad154c759f91ea3327643785b43b186d08a6 SHA1 eb4f7a67bccff9b318276c6bbc6d55de972c18ff SHA256 5c9e5bb2df3b48e4a62923591459a1d004b92cd9f90066d2607a1004b2125475
 AUX imspd.rc6 1079 RMD160 6cc9136694da5f742c4072841a5d62959a6921cd SHA1 e9db38929c837f26152ae4267cb8267a0b5a8b61 SHA256 dca439db4be069334c9279331911935b0c580f813e296a9064b8a0ada5da7dac
 AUX stunnel.conf 220 RMD160 3964a9ee3d8ed070814a7eeaff217155ab7f182b SHA1 de942315a03d652359caa2f00f3629e75aa9be16 SHA256 1051f85d65e78debd298c7db8109a5834538365222615fff7da4b5ef9618db04
 DIST cyrus-imspd-v1.8.tar.gz 650596 RMD160 c145cc0a0d8e1fe2950887f6ab0ac84ae9d9a4a4 SHA1 dc8d9de6dc5c9e2ae528c550e624606850b82a95 SHA256 ba1026dca5440b6a24a298cb9aa350321f9c6f921ba6404a74b9d546c02b70cd
-EBUILD cyrus-imspd-1.8-r1.ebuild 1806 RMD160 ecb2df7a8563090f4ed07af5af62789d9b9126bf SHA1 8474f3eecf54b31752b8ee494c899b20125e6501 SHA256 f4f82b2e6d5a836a1ba69cbd37d533f5d414befa82532282982c33cf5140273d
-MISC ChangeLog 4693 RMD160 b2e97fad9a3be3e85959c07faf7b38bea2d1c23b SHA1 4ee9202384c14ec2eaff906032a1636609d6456a SHA256 77c0a0849a2fb83af4ec2a5b9a4b2a605916183dfca171727e8f2aec19611319
+EBUILD cyrus-imspd-1.8-r1.ebuild 1824 RMD160 1fc9fd03106391def411e2fe7a248fd09cce60a1 SHA1 3c34e933d63464a24a44adc075d4591c8859d210 SHA256 046eae7eb4fe673ef906000d4e51dab49afcb588be9ec18ac8a07c98e77fe0d2
+MISC ChangeLog 4905 RMD160 eed57decbc377331e6b93d7cb5be17c133435d94 SHA1 dab4033b7e7382a8afc74ac394a3bff6ea42d663 SHA256 bb925a212e61274e17a5a76b355f5a8367a1cf39d749e46455ace70890ad4980
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvMN00ACgkQAiZjviIA2XiJiACfdiLNAMIbysAmN+xpLpsH+bFY
+UcYAnR64pq7m6hsygobA3jlCmS2GOOg/
+=eKhx
+-----END PGP SIGNATURE-----

diff --git a/net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild b/net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild
index 5c416454557e56f5fa35ff5ed32bbefe2de03591..8e36307cc41f0f7e1159d28d702b6290b2a450aa 100644 (file)
--- a/net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild
+++ b/net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2007/12/16 13:48:30 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild,v 1.2 2010/04/19 10:58:08 flameeyes Exp $
 
 inherit eutils ssl-cert
 
@@ -27,7 +27,7 @@ src_unpack() {
        epatch "${FILESDIR}/${P}-gentoo.patch"
 
        # Cyrus 2.2.x has an extra library.
-       if [ "`best_version '=dev-libs/cyrus-imap-dev-2.2*'`" ] ; then
+       if has_version '>=dev-libs/cyrus-imap-dev-2.2'; then
                sed -i -e "s:-lcyrus:-lcyrus -lcyrus_min:" \
                        "${S}/imsp/Makefile.in" \
                        "${S}/cmulocal/libcyrus.m4" || die "sed failed"
@@ -36,7 +36,7 @@ src_unpack() {
 
 src_compile() {
        econf \
-               $(use_with ldap ldap ldap) \
+               $(use_with ldap) \
                $(use_enable kerberos gssapi) \
                --without-krb \
                --with-auth=unix
@@ -49,23 +49,23 @@ src_compile() {
 }
 
 src_install() {
-       newsbin imsp/cyrus-imspd imspd
+       newsbin imsp/cyrus-imspd imspd || die
 
-       newinitd "${FILESDIR}/imspd.rc6" imspd
-       newconfd "${FILESDIR}/imspd.conf" imspd
+       newinitd "${FILESDIR}/imspd.rc6" imspd || die
+       newconfd "${FILESDIR}/imspd.conf" imspd || die
 
        keepdir /var/imsp{,/user}
 
        if use ssl ; then
                insinto /etc/stunnel
-               newins "${FILESDIR}/stunnel.conf" imspd.conf
+               newins "${FILESDIR}/stunnel.conf" imspd.conf || die
        fi
-       dodoc README imsp/options.sample notes/*
+       dodoc README imsp/options.sample notes/* || die
 }
 
 pkg_postinst() {
        if use ssl ; then
-               dosed "s:#IMSPD_USE_SSL:IMSPD_USE_SSL:" "${ROOT:-/}"etc/conf.d/imsp
+               sed -i -e "s:#IMSPD_USE_SSL:IMSPD_USE_SSL:" "${ROOT:-/}"etc/conf.d/imsp
                SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMSP Server}"
                install_cert /etc/ssl/imspd/server
        fi