Add trashquota USE flag - bug #409205

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

4 files changed, 166 insertions, 17 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 16db9ea2ebfe..62c1f867fd33 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/maildrop
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.123 2011/12/05 13:36:53 eras Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.124 2012/03/22 07:16:04 eras Exp $
+
+*maildrop-2.5.5-r1 (22 Mar 2012)
+
+  22 Mar 2012; Eray Aslan <eras@gentoo.org> +maildrop-2.5.5-r1.ebuild,
+  metadata.xml:
+  Add trashquota USE flag - bug #409205
 
 *maildrop-2.5.5 (05 Dec 2011)
 
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index b748ce8cbfd5..3a1c620eb033 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -9,23 +9,24 @@ AUX maildroprc 58 RMD160 1d53d6c05cb809bb9d637ae347d9dee1362f1b09 SHA1 a2fd60599
 DIST maildrop-2.5.4.tar.bz2 2082167 RMD160 a71c08fc2951dd122740870186693ac112e59ebd SHA1 6d9514bb1df207a2036779e14e4f0ea350f5d1ee SHA256 7621b4aede007d478dbd8bf88216e0289c18beddd36bbf429e85e3e66ca9e002
 DIST maildrop-2.5.5.tar.bz2 2158846 RMD160 a614d3761c8b35cee0ea838d6ab5239bde4e08dd SHA1 57b307972b884b4f8fea840c56d2ff37f95139a3 SHA256 7484382852075f452850a082454c8c47a65d52f00fe64e0b1a63ed7ccf25288c
 EBUILD maildrop-2.5.4.ebuild 3779 RMD160 376e13e47b7c7e98c8400060eb1dec1c806cbcb4 SHA1 14098bc0446f39946e4158d49d54d7c1db4d15b1 SHA256 a5aa4400a5cffba21818b631be971f8431d1e575ab606c20d23c09f0e4b39387
+EBUILD maildrop-2.5.5-r1.ebuild 3896 RMD160 f304bebe7e154d122747bd2bae61ef2958cdc2ad SHA1 dfaa3b10d07211809cbec572e226941d682cf02a SHA256 c128815d6a51e1924a6ee9dacfe971ce26dd7a0f7ceec04a2374f052eea50850
 EBUILD maildrop-2.5.5.ebuild 3792 RMD160 f6b10b1c44fbc8dc1097724d4a29a7e0181d7232 SHA1 3c05cfaa76067f9a9d5add772cd266cf6b98ca21 SHA256 c6f42d9f8ad41c598b1438604232139bf95c089d7d00f8ecead409b2681b636f
-MISC ChangeLog 23253 RMD160 99f8ca702ad21cebc45a7972f9d9080bdcad36a6 SHA1 9d856cb90640de06fdf041cd6229150963257ce1 SHA256 ae86104bb4acb8bb166dcf2514f1d9fb11d37fda8e27c16fb8a5dc536336bce6
-MISC metadata.xml 313 RMD160 a54c7c17c1fb1708ba9987cdad3e1f91bafd5e7e SHA1 c030dc401f831ea71224dbec6685200e34798962 SHA256 8e4845f749808afe7959162a14069b0eb59436401ee3a2ed8661a3bdc18fb5fe
+MISC ChangeLog 23415 RMD160 e4875b00bec86528085d497ac62c9b76a52c0baf SHA1 7af379e19feae20aa38e07d6ae301cb2d2425ddd SHA256 1cedc8ed4b962dba7019cbe8899341bb6c4545fddfeef889b595a2f127c70b80
+MISC metadata.xml 400 RMD160 5f4caf9d91d22e1c17dd79d5504e926cd51d755f SHA1 eb1d5bc144336c8fa2a92a804dc382c57bd1be01 SHA256 9cdaee423aee027a354f501415ace396a57ab19ec2633562ede17db5d52eeecd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO3Mj7AAoJEHfx8XVYajsfy54P/0s3LuH5Cq1ikB/JD/LQWP88
-VP50hrQEzuwIDzzSidyvwLsTtkZSBJdFYXl1cHWjjhF0pdyz1EqQae/qRuxOQYV7
-AIlphu4uaCtDPh4vD39mmKgEhKXaslDJFGB72+O8WbSWFmceok2pH+twjdFxDeU8
-yTeN0Jac8fmh/JLam6I/eALQflp3sOW4tHUlMZvoKaaJ3YUXx780TCp1AwSbmrq6
-mawJNpyWcSRA/3xkrSvFs86nycQ8whd++MGefxDdf1SbpO7ID4mfKXu9P1lgJyqN
-0Mk5/puMsa0VELOQPgXIaqzOCP77J9DuuHRDTCwwBxpaxA+DBWr43yMNunvhPmo4
-a2DPlomR5NfQro5X6mm8zrZ6CNpDUcpZeVC/0N4LruZZERDZ6A4smjrMkcmDN3zS
-Cy7CYWzMqV1aTMSD4LFyOFhlx7Kt6Iuowxozyc2ubW1ThdvsS3ysy0ePinaHDyHS
-1p1dFzBEtULGtg1XzjM8mjtr7+Zth4faheRe2Ugq/iQyaVqUSwumq0SBW2PTUYew
-0x3xd2/nXvkmDWW70GLj1AQ6h8ULUCgE2y4k81YQ0E+c1ZjtxWa/Vgtewg/2ynCC
-RXvl4k2h6xOFTMDEplxd7jwFYnWBPJiF/P8vePn9VAQ2SN3U0rQuQ9BtQun0+E2f
-vACNDM+jJC8NEauYbEMm
-=OCfw
+iQIcBAEBCAAGBQJPatHFAAoJEHfx8XVYajsfK2oP/1sq7k2ZOiXQP39F6/gwwaUX
+Uklm6Upxoee10fQIuKZo36VhbUeZbzfSsYMY24AcXmkUwGKon+Xge6DaOKLCuVRn
+IDaGsOM1v4uSBfxHFl+W70Jn07k0qrF4Vd9e6hM3Ji7MSWqHBPfw9DM/ih94QEjL
++AmLgvPNpRXz11VT58QI+a+68tjxZF84gEC5oinoT+UQ0Co1UqUi6u0HbvfLVUND
+6puOU42qP237hjrfRIJ9yiu5d2DDsaZ24yhoGXby59y/quEjKP6RnDZjlM/IFMgd
+zrla4+cVbGbypy8YYkPwHVkcOMHRn/igwp9noW312ZXCVfRI4P4SzUHKN9XC5YQs
+EvXi7iCvcdw9KQaEnqOTTlt7l0Y3vp6ktAyZmy1RwIb13BUsmQn7oOJrL80ruiBC
+vK6pgj/T8WpNDfBnsBFQbmqU5QYb9F+mdydaxVVworjGHZYlC/JNma56PLxN390l
+2g5pWvomj/nTMOJHALBdYWYHLYssZQFPP5Gz51lQsrBEmgkb3+fT+AtkQdPHp0cF
+o5WKax2HQkUcqSyaY7np6WU9OyOhpK8gE2Sm/nF0b7uDqFFnttNfeMaWnmufIl9e
+06cO1PxUc2ADQoIloh2AoUPjWJd1xgVg6H4+dYyot3pt//c0JzC8ZshgalLXXBTH
+2FFCWFPY4UhNmLHz4sZw
+=xRV5
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/maildrop-2.5.5-r1.ebuild b/mail-filter/maildrop/maildrop-2.5.5-r1.ebuild
new file mode 100644
index 000000000000..219fd58e8031
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-2.5.5-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.5.5-r1.ebuild,v 1.1 2012/03/22 07:16:04 eras Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Mail delivery agent/filter"
+[[ -z ${PV/?.?/}   ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${SRC_URI}   ]] && SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/maildrop/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="berkdb debug fam gdbm ldap mysql postgres static-libs authlib +tools trashquota"
+
+CDEPEND="!mail-mta/courier
+	net-mail/mailbase
+	dev-libs/libpcre
+	net-dns/libidn
+	gdbm?     ( >=sys-libs/gdbm-1.8.0 )
+	mysql?    ( net-libs/courier-authlib )
+	postgres? ( net-libs/courier-authlib )
+	ldap?     ( net-libs/courier-authlib )
+	authlib?  ( net-libs/courier-authlib )
+	fam?      ( virtual/fam )
+	!gdbm? (
+		berkdb? ( >=sys-libs/db-3 )
+	)
+	tools? (
+		!mail-mta/netqmail
+		!net-mail/courier-imap
+		!mail-mta/mini-qmail
+	)"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+	dev-lang/perl"
+REQUIRED_USE="mysql? ( authlib )
+			postgres? ( authlib )
+			ldap? ( authlib )"
+
+S=${WORKDIR}/${P%%_pre}
+
+src_prepare() {
+	# Prefer gdbm over berkdb
+	if use gdbm ; then
+		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
+	elif use berkdb ; then
+		epatch "${FILESDIR}"/${PN}-2.5.1-db.patch
+	fi
+
+	if ! use fam ; then
+		epatch "${FILESDIR}"/${PN}-1.8.1-disable-fam.patch
+	fi
+
+	# no need to error out if no default - it will be given to econf anyway
+	sed -i -e \
+		's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \
+		"${S}"/maildrop/configure.in || die "sed failed"
+	epatch "${FILESDIR}"/${PN}-testsuite.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local mytrustedusers="apache dspam root mail fetchmail"
+	mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
+
+	# These flags make maildrop cry
+	replace-flags -Os -O2
+	filter-flags -fomit-frame-pointer
+
+	if use gdbm ; then
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		myconf="${myconf} --with-db=db"
+	else
+		myconf="${myconf} --without-db"
+	fi
+
+	if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
+		myconf="${myconf} --disable-authlib"
+	fi
+
+	# Default mailbox is $HOME/.maildir for Gentoo
+	maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf \
+		$(use_enable fam) \
+		--disable-dependency-tracker \
+		--with-devel \
+		--disable-tempdir \
+		--enable-syslog=1 \
+		--enable-use-flock=1 \
+		--enable-use-dotlock=1 \
+		--enable-restrict-trusted=1 \
+		--enable-trusted-users="${mytrustedusers}" \
+		--enable-maildrop-uid=root \
+		--enable-maildrop-gid=mail \
+		--enable-sendmail=/usr/sbin/sendmail \
+		--cache-file="${S}"/configuring.cache \
+		$(use_enable static-libs static) \
+		$(use_with trashquota) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	fperms 4755 /usr/bin/maildrop
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README \
+		README.postfix UPGRADE maildroptips.txt
+	docinto unicode
+	dodoc unicode/README
+	docinto maildir
+	dodoc maildir/AUTHORS maildir/INSTALL maildir/README*.txt
+
+	# bugs #61116 #374009
+	if ! use tools ; then
+		for tool in "maildirmake" "deliverquota"; do
+			rm "${D}/usr/bin/${tool}"
+			rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9]
+			rm "${D}/usr/share/maildrop/html/${tool}.html"
+		done
+		rm "${D}/usr/share/man/man5/maildir.5"
+	fi
+
+	dodir "/usr/share/doc/${PF}"
+	mv "${D}/usr/share/maildrop/html" "${D}/usr/share/doc/${PF}/" || die
+	rm -rf "${D}"/usr/share/maildrop
+
+	dohtml *.html maildir/*.html
+
+	insinto /etc
+	doins "${FILESDIR}"/maildroprc
+
+	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
+}
diff --git a/mail-filter/maildrop/metadata.xml b/mail-filter/maildrop/metadata.xml
index 655feda3f073..b58ea1b9a1b4 100644
--- a/mail-filter/maildrop/metadata.xml
+++ b/mail-filter/maildrop/metadata.xml
@@ -5,5 +5,6 @@
   <use>
     <flag name="authlib">Add courier-authlib support</flag>
     <flag name="tools">Install maildirmake and deliverquota tools</flag>
+    <flag name="trashquota">Count deleted messages as part of the maildir quota</flag>
   </use>
 </pkgmetadata>