mail-mta/citadel: Version Bump. Also removed mailwrapper support and added postfix useflag, since that combination is supported by upstream.

svn path=/sunrise/; revision=11740

4 files changed, 23 insertions, 19 deletions

diff --git a/mail-mta/citadel/ChangeLog b/mail-mta/citadel/ChangeLog
index 3f5d3db65..e1bef026a 100644
--- a/mail-mta/citadel/ChangeLog
+++ b/mail-mta/citadel/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for mail-mta/citadel
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jan 2011; the_mgt the_mgt themgt@mail.ru -citadel-7.84.ebuild,
+  +citadel-7.85.ebuild, metadata.xml:
+  Version Bump. Also removed mailwrapper support and added postfix useflag,
+  since that combination is supported by upstream.
+
   20 Dec 2010; the_mgt themgt@mail.ru -citadel-7.83.ebuild,
   +citadel-7.84.ebuild:
   Late version bump to most recent version of Citadel suite packages
diff --git a/mail-mta/citadel/Manifest b/mail-mta/citadel/Manifest
index 6629afbfc..2fd8265c1 100644
--- a/mail-mta/citadel/Manifest
+++ b/mail-mta/citadel/Manifest
@@ -1,7 +1,7 @@
 AUX citadel.confd 957 RMD160 50f8ade88eb6b0c88aa94b42e13f81b725099027 SHA1 091d9223315c5d390ecd18bba44198ed6dfe2c22 SHA256 ef9309d200cb0617b91ee0983db41b53e424a9b4095e0f5ec76112866865871f
 AUX citadel.init 767 RMD160 afd16e3aec56496d4fa3ee59966428e742d31dd1 SHA1 719871e18211554f1088ef3ad2ca438c9c67c20d SHA256 16fc77dc01825c920d38864b880f0a00bc22aee5ebc552518c0bf94cb8b4b7c7
 AUX mailer.conf 236 RMD160 a01981ea92dfafa4039c7f09f41a9b5722bf56d6 SHA1 5e8e0cd326bda077831a309ff3825897b3156279 SHA256 f0df591d761bb078447d666fdf18c42e511fb5765a4ddc2fca2bc96f7df50be8
-DIST citadel-7.84.tar.gz 828418 RMD160 1d0f90ea6662ce8f7822391aecb97785d92b4db0 SHA1 55756bcc6ef0ebfa23e0b138d0b37d28d10316e5 SHA256 dd664c9dc4cbf975d3584e55a5f018ad547840fc4859408b87d1dff2b9f6aae0
-EBUILD citadel-7.84.ebuild 6703 RMD160 4c6738d987c7b056bead232697cb2a2d087a17dd SHA1 c4a52f1f826e27633b58a291f84a552b080a5e05 SHA256 633d959af2d4c05273deca061b7d2f4b8696093527ca12b7744c9fe2822eca11
-MISC ChangeLog 1403 RMD160 a1e7f89e5bafabaef9eb95c834737433a8e28092 SHA1 79d8171a8dfbc6850662e170379a88faf04a4ad0 SHA256 ebbf86da098533ec8cbc11299880e36d0fe31e411ef30dc5a6910a5d1aa5fd30
-MISC metadata.xml 1129 RMD160 930f30bb3ea1a44bba945b1b47f267e59dfbc59e SHA1 ec741f1c7da2b0ce7364925932cdeed1dbdbc55f SHA256 fb9524b90c4c10dfee051e4134364435781ff124a6170050fabf58d49178db75
+DIST citadel-7.85.tar.gz 843482 RMD160 23acbd412acc41b8997e24e32d3f977b93d3ffd5 SHA1 8ff31f65688ab283686845219d3fb24c80c1ebfe SHA256 8b0b0dca615377019fb6a55281cba166c1ca3fcaf5846bbf7994daf26edba49e
+EBUILD citadel-7.85.ebuild 6715 RMD160 10163ec79657b9f58a871706ae84798b4e7f1197 SHA1 4011f0cc869f3f2ee61f889ca550e32631032ace SHA256 90845ece75b73fefdc605a5aac83fb13eb6499102a49dab63546f20bf12e7e53
+MISC ChangeLog 1637 RMD160 113e4c3957e25c69f8adbb2d07129f31d6e9b220 SHA1 d7f6049e4a068b8556ab4f2a399ad9eea5ad4c2b SHA256 fbf1e2f033e33ac1649c1ded619bb06614c055f902098a85ad7c0ff1c4f7f96c
+MISC metadata.xml 1236 RMD160 501b6be668d5f9c31d97e2b8db18714996c6c4a6 SHA1 ee54b0709e82180b66f48a3275f62b83382cbac4 SHA256 e9bfbadf88cbfc0cdc523bfa44b012d8fd2744a25c1f9bae5994a7ca5aee483b
diff --git a/mail-mta/citadel/citadel-7.84.ebuild b/mail-mta/citadel/citadel-7.85.ebuild
index ba8f265e8..6525e3529 100644
--- a/mail-mta/citadel/citadel-7.84.ebuild
+++ b/mail-mta/citadel/citadel-7.85.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,21 +12,22 @@ SRC_URI="http://easyinstall.citadel.org/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ldap mailwrapper pam pic ssl threads"
+IUSE="ldap pam pic postfix ssl threads"
 
 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
-	!mailwrapper? ( !virtual/mta !net-mail/mailwrapper )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-
-PROVIDE="virtual/mta
-	virtual/mda
+	!postfix? ( !virtual/mta )
+	!net-mail/mailwrapper"
+# dropped virtual/mta from PROVIDE in order to install with postfix on a system
+# removed mailwrapper stuff entirely and made sure it isn't left on system
+PROVIDE="virtual/mda
 	virtual/imapd"
 
 MESSAGEBASE="/var/lib/citadel"
@@ -78,12 +79,9 @@ src_install() {
 	#Fix some permissions and sendmail stuff
 	fowners citadel:citadel /etc/citadel /var/lib/citadel || die "Changing owner failed"
 	fowners root:citadel /usr/sbin/citmail || die "Changing owner failed"
-	rm "${D}"/usr/sbin/sendmail || die "Removinf sendmail bin failed"
+	rm "${D}"/usr/sbin/sendmail || die "Removing sendmail bin failed"
 
-	if use mailwrapper ; then
-		insinto /etc/mail
-		doins "${FILESDIR}"/mailer.conf || die "Installing mailer.conf failed"
-	else
+	if ! use postfix ; then
 		dosym /usr/sbin/citmail /usr/sbin/sendmail || die "Linking sendmail to citmail failed"
 		dosym /usr/sbin/citmail /usr/$(get_libdir)/sendmail || die "Compatibility sendmail link failed"
 	fi
@@ -193,9 +191,9 @@ pkg_config() {
 	einfo
 	einfo "The server should now be up and running, enjoy!"
 	einfo "Citadel will listen on its default port 504"
-	if use mailwrapper; then
+	if use postfix ; then
 		einfo
-		einfo "Citadel listens on port 25 by default, even with mailwrapper useflag!"
+		einfo "Citadel listens on port 25 by default, even with postfix useflag!"
 		einfo "Right now this can only be disabled in WebCit or with the cli client."
 		einfo "There is no elegant way to disable that atm, will be fixed upstream."
 		einfo "Sorry for this inconvenience!"
diff --git a/mail-mta/citadel/metadata.xml b/mail-mta/citadel/metadata.xml
index f5eb7bed8..90c951e0f 100644
--- a/mail-mta/citadel/metadata.xml
+++ b/mail-mta/citadel/metadata.xml
@@ -15,6 +15,7 @@
 	</longdescription>
 	<use>
 		<flag name="pic">Build position-independent executables</flag>
+		<flag name="postfix">Makes it possible to run citadel alongside Postfix. Mailwrapper replacement.</flag>
 	</use>
 	<upstream>
 		<maintainer>