Depend on libmilter or sendmail - bug #390927

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

diff --git a/mail-filter/amavisd-milter/ChangeLog b/mail-filter/amavisd-milter/ChangeLog
index fb59eb6949a1ad40f85e839318ed87d576da5a40..8ac49772bcf58e01ef34c74277c6856360bb7a2d 100644 (file)
--- a/mail-filter/amavisd-milter/ChangeLog
+++ b/mail-filter/amavisd-milter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/amavisd-milter
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-milter/ChangeLog,v 1.1 2011/04/25 09:52:07 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-milter/ChangeLog,v 1.2 2011/11/18 20:53:16 eras Exp $
+
+  18 Nov 2011; Eray Aslan <eras@gentoo.org> amavisd-milter-1.5.0.ebuild:
+  Depend on libmilter or sendmail - bug #390927
 
 *amavisd-milter-1.5.0 (25 Apr 2011)
 

diff --git a/mail-filter/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index bab7be4ce88c74dc13d4f7c10a65437a3045288e..e58522dafadcfda6e97dc900c70cf0e364ceba87 100644 (file)
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -4,23 +4,23 @@ Hash: SHA256
 AUX amavisd-milter.confd 357 RMD160 4bb35ac71e5df7322e1e41bb924e6c93aa52adf1 SHA1 59d3f7bd16181418ea7362387976ec0e82c31fb0 SHA256 fa8208d3bd15141808fc4612011a1f58850758a6191dbb81fad52e30312d9746
 AUX amavisd-milter.initd 816 RMD160 8534bf8a4248f2b67a2b859f80513a067e574e92 SHA1 a358ed7f59abdd4d01d614923528318f610d86f4 SHA256 7825c0b39893b1dd7a7432c02cc7d154f63e587be09ef49938a1dcf40317299a
 DIST amavisd-milter-1.5.0.tar.gz 175759 RMD160 4786278ff09cd8c0e7b268329f827058913796d2 SHA1 b0d36953787fea1a4d94b22d0b7402f30f1ca93b SHA256 cef897e2c172272d52a6e5d9415b25252bf669f0481f9bdf24e95d3071c5a2c5
-EBUILD amavisd-milter-1.5.0.ebuild 761 RMD160 a398bfa3f2544d6a4039e6fbdc3a336c262e4687 SHA1 24e06f150a4ab345d355b444501f4eb55b430e72 SHA256 577316b024294cdf456b480820726f98abb6c670daf25b3884106405899a349b
-MISC ChangeLog 466 RMD160 6191fa40628296ca40449a0f49d5d8310b4c3b7e SHA1 a7e3000993a14e59f1daf2c680f27681f62c4397 SHA256 a4b88736e7978c7043fc3b3275dc8cda24930ca6a8ee3e791e449c32d5e6a350
+EBUILD amavisd-milter-1.5.0.ebuild 760 RMD160 429ba5f4d1d1e7151203346d0bdca7fbbe2116a4 SHA1 f57a518888859069a3b5472e59901b55dd4cbaa8 SHA256 7a43d5b6d7c5bd9bc968b879de21f70efe59df705c0cf9d0aecfeed0ed6ae875
+MISC ChangeLog 588 RMD160 d738c16f4ea82ef2dbeb72df6221b389f7d7d27f SHA1 314fad433d721e7474644c150a8a24c25fb8e90a SHA256 194575cdc8e35970eec80efdb91cf9182c7fbe363ad2e8c34b3568dafa8776d1
 MISC metadata.xml 208 RMD160 f6fe85df5beae9c2d27e251e6685a7f580f47404 SHA1 71e2df0ec974065fd0527d7e69b0fe07148d70ab SHA256 fc3144c7664167b56b0babaed686a8f63744ecabdd9490486e035040f9676e58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNtURSAAoJEHfx8XVYajsfc0IP/1nVlQVt+B5ekZahaYZ03s8M
-lwaLt5iYyjY69nTmaC/1sTPkiOEHNyZiGeFY4tPMK5sRTdCBRMwqhWtNbC88OhVI
-vOCTwfG0qd8d2DS05CdYwJhXEWxg1tzYvTm9JB7uLAAimLZ0OoMjTEoz48SWkZ20
-0P1s8/Rc++lZ4WIMLvbFwgFxj1wwTMc2liNDvAZzZBRIxxY8BqvjyZvVWtk2GoHd
-g8lfz00NhCvNLqoVl1GlpAuNkk66IS+vllhanchHismUotKXXdzUcK0ORYjE+UxX
-nyuXsL3YfhkMLN7pEYvTMILAH55yGOv4RZYHXcivcOMa4ltT5H5nw1KEDEsj3g4k
-2m+LLf/gTXFPKF8mojRGdVNqKI8VaUE+SkiLy9jXNq55IIAEQRjLnEEXLhSvC0K/
-zQ60H97YPtL5qWup2YB799xYc3Ri1CUvsZv+WCy2xezgES0GEVo9AriRRTXq4UBR
-vxpYXQ2K0pmUjN7wQJvV2vc1fwqR4pCREGKOhT31rI6QJyuNx456p4R8OCZeNre6
-obD3q0g29Fnx8DOPD3OQHyvABp3j0wYSnEhMVQSxocHBZPblRWZR5aY0nnmul1DL
-tbQELJEDJMB2kHtVyLlsNUpQXjafNjPqMKp3gspOxwjlPzEkd8uNFO77O3KyGrWN
-mnJFUnT3hMMT4KUjei+P
-=tiGb
+iQIcBAEBCAAGBQJOxsXJAAoJEHfx8XVYajsfMnMQAIf/DogT4ctg7bdUxfPWawqz
+9fDOQU1LRz1MraPyLINx0/2+ATDXqOeCdvszLvbn0+3gmDBReHZwPwYHJPKvyFZs
+2nPhN5HENQ/5B2wi1NffTeBf+jNnQAY/1QkKokCm1x7nf13ohmTLt7vCGB0f+wTL
+W8WLuwjKjr7lhhGg9+yn46/tBS4Xb/Y1p+7fy359Hs/4NohpQSdDJWFfrwiJiY+n
+w8U1MhKLG3n7qGj7ZI8f0m2whn+1OT0476iNIb/ph3mL7c6mcJBkRbLu9+qcw5Ey
+2C/C6qUuAASIUNLLqrPgf2SEBlDnhJl0YMmd9oIVtUfeZsxzh6K2jcSveyTRvhEt
+QsEjEPPxeGZgTruVLZVwIsbOTm9Ra/M8LMqS9iH6XNy9EZxPkK2/HImOFq9HRCEm
+GShJQ3hwlwFhoXTmk+YvuB3WdPdHG06CFuPY2i4n1lbzH/Ax/Cgr1K+eTisHPSI1
+CXWMyOgoHdHLeRSe+WrjFmTkLCxo8RRnWkAGBq0fdlkBy0yL1bzV95xlmRHfFryb
+xEB5zgZv0kkQPJY1tzX1uHk/ZV8NnxmHROkS3l52GplbsgIkp7NTyQI8uXGojoux
+va7yliElgI/VMG7cD+JV9pFH5rODeUyJcOpOQT65N1K9jICu/PGloMu7HAriVQjd
+pF208aWjPeAWj1+aFb5i
+=LLPH
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.5.0.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.5.0.ebuild
index 73658ad7437cc854f71f84a0113d8148a50569c0..a858360be5efedda7bcdb3c85556cee26c97a58f 100644 (file)
--- a/mail-filter/amavisd-milter/amavisd-milter-1.5.0.ebuild
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-milter/amavisd-milter-1.5.0.ebuild,v 1.1 2011/04/25 09:52:07 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-milter/amavisd-milter-1.5.0.ebuild,v 1.2 2011/11/18 20:53:16 eras Exp $
 
 EAPI=4
 
@@ -13,12 +13,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="mail-mta/sendmail
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
                mail-filter/amavisd-new"
 RDEPEND="${DEPEND}"
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
+       emake DESTDIR="${D}" install
 
        dodoc AUTHORS CHANGES INSTALL README TODO