mail-mta/citadel: Version bump, moved postfix to RDEPEND and removed leftover from...

svn path=/sunrise/; revision=11906

diff --git a/mail-mta/citadel/ChangeLog b/mail-mta/citadel/ChangeLog
index 98c312009191218f6993c6fc969e9bac661608c8..1517d83d5ac8d3a7f89bffbc7416158a5b6c7481 100644 (file)
--- a/mail-mta/citadel/ChangeLog
+++ b/mail-mta/citadel/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Apr 2011; the_mgt themgt@mail.ru -citadel-7.85.ebuild,
+  +citadel-7.86.ebuild:
+  Version bump, moved postfix to RDEPEND and removed leftover from binkis
+  PROVIDE cleanup. Need to contact virtual/mta maintainer to get things
+  straight.
+
   26 Mar 2011; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
   citadel-7.85.ebuild:
   Remove old-style virtual virtual/imapd. See bug 350792 comment 14.

diff --git a/mail-mta/citadel/Manifest b/mail-mta/citadel/Manifest
index 6a3b28479d62aedfb466a884c690f8d51dbb0288..8998e64ca81d2bfb96e8b1084902556332ba9a89 100644 (file)
--- a/mail-mta/citadel/Manifest
+++ b/mail-mta/citadel/Manifest
@@ -1,26 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX citadel.confd 957 RMD160 50f8ade88eb6b0c88aa94b42e13f81b725099027 SHA1 091d9223315c5d390ecd18bba44198ed6dfe2c22 SHA256 ef9309d200cb0617b91ee0983db41b53e424a9b4095e0f5ec76112866865871f
 AUX citadel.init 767 RMD160 afd16e3aec56496d4fa3ee59966428e742d31dd1 SHA1 719871e18211554f1088ef3ad2ca438c9c67c20d SHA256 16fc77dc01825c920d38864b880f0a00bc22aee5ebc552518c0bf94cb8b4b7c7
-DIST citadel-7.85.tar.gz 843482 RMD160 23acbd412acc41b8997e24e32d3f977b93d3ffd5 SHA1 8ff31f65688ab283686845219d3fb24c80c1ebfe SHA256 8b0b0dca615377019fb6a55281cba166c1ca3fcaf5846bbf7994daf26edba49e
-EBUILD citadel-7.85.ebuild 6523 RMD160 43424514950ddfb23baaf35f20b0c7e1eaf6071b SHA1 002e972d523375a8cbfa8be43f11ace6c2008cbe SHA256 dbb00d3dfc14d34ab49abcca0dbf2e339547a3b10383f15b18cfe7d8943a41ee
-MISC ChangeLog 2166 RMD160 8cc60972d586da1d89c6fafd22ae63031e7a448c SHA1 1ab209ecbcc39ef4f9f9ea4a8c5a796c59daeb01 SHA256 32006743d0e6ac3c21467fb8df168a8ddeaaf553b3d1ba89e01409d551e1572c
+DIST citadel-7.86.tar.gz 843785 RMD160 d16ac1ecd2fe50398a3de16c9bcbbe66865a68bf SHA1 2635cf494d3453c3aa0cfbae9cdffcd560a07aed SHA256 a23b0a25e441727221d198d429101c811be0c26080d46fab40d74258a1e048b8
+EBUILD citadel-7.86.ebuild 6653 RMD160 8687169bb041d82a51463e1d8a212bb5c9b1255f SHA1 1ffc4c24af8cf18a0d9a4c86c20f3a07578853db SHA256 003cdc08b920c7199fbe4e0ed1488e96555e20252df8f4d546a87690cd86ad73
+MISC ChangeLog 2409 RMD160 b24479f98961119de58b53e3acc027d1c8724647 SHA1 b555f672fa599a84786a5254f16a5a8efbe675f2 SHA256 6ad64a96525ab176f95de09d5221320cd49c69b3b72c2369228f3133838d511b
 MISC metadata.xml 1236 RMD160 501b6be668d5f9c31d97e2b8db18714996c6c4a6 SHA1 ee54b0709e82180b66f48a3275f62b83382cbac4 SHA256 e9bfbadf88cbfc0cdc523bfa44b012d8fd2744a25c1f9bae5994a7ca5aee483b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNjfdxAAoJEHQ6UuhrqBBQAnsP/3djZ5LV0HmQOrg4UGS//zbb
-b1uU9ZSg21ImO4pne4NkzdTLnTKQNK9uAOhg/utIqACw2u/MtfiOZQJPUOCsIu4C
-luk2L759Ml3Ryq/3y9LYQduTQUwEqP9YnaCMNFPjRH/g+3dqgcxGuceEiPDdwu6d
-FMavU1ZBQQIdbZMnnJxmQ7nGYtdFG+sstAy3vGlpjyA9Mawzn88w07Wx8DjwUx4R
-WmY4fqO7q77PQtPNF47oFn+txqSLX5Nt2SvEOZnaGvG/Mz+MGmuvX3l++NGUpI4s
-ch9bx2W4ynO4FNrizNbF83GZlEJC0mPVDWToRLEgWMtCw88kpDAxhTN8JbAiCo8O
-UnPqD65jNxMKvv+tWx0X/fuwA42qch4ktYLmeNob+bm/8FuKmuy3/OB5jUVMs7te
-EupV8XMCVxs2+Bwt8sTE7qyvTmmeSrqpwf7E4btCWSBZ0Njnqf2oPyWnTRY/is+e
-GWTUmc5OkdypVF2xVFvhP5WhbmGaDDOc96RUxDfxHJ/cKWO8vEQ2IY3n2+dPih5d
-rPgAwDIOq+Ljbgd7ucgebImC2iCKcy7lOUCR0XYlUCbyaR+T0H1NNsjssua5pF8M
-TzgA4EWVcjIlQaM3AzVr2iOZWvmTBBcMjgYYkwE2zHEipMay6l2Gs6GK4ntZIIVE
-B/gGcPDv9l2cgNLu6onx
-=RZVQ
------END PGP SIGNATURE-----

diff --git a/mail-mta/citadel/citadel-7.85.ebuild b/mail-mta/citadel/citadel-7.86.ebuild
similarity index 96%
rename from mail-mta/citadel/citadel-7.85.ebuild
rename to mail-mta/citadel/citadel-7.86.ebuild
index 7882f7b5e82ac8f9309d18dd00f137c38ed4a03b..ab50c747a63aaa36ac959f064a1d28e49c5f0795 100644 (file)
--- a/mail-mta/citadel/citadel-7.85.ebuild
+++ b/mail-mta/citadel/citadel-7.86.ebuild
@@ -13,18 +13,19 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ldap pam pic postfix ssl threads"
+# postfix can be used as mta with citadel. citadel needs to provide virtual/mta
+# in all other cases or other ebuilds depending on virtual/mta cause blockers
 
 DEPEND="=dev-libs/libcitadel-${PV}
        >=sys-libs/db-4.1.25_p1
        virtual/libiconv
        ldap? ( >=net-nds/openldap-2.0.27 )
        pam? ( sys-libs/pam )
-       postfix? ( mail-mta/postfix )
        ssl? ( >=dev-libs/openssl-0.9.6 )"
 RDEPEND="${DEPEND}
        net-mail/mailbase
-       !postfix? ( !virtual/mta )
-       !net-mail/mailwrapper"
+       !net-mail/mailwrapper
+       postfix? ( mail-mta/postfix )"
 
 MESSAGEBASE="/var/lib/citadel"