Version bump

Package-Manager: portage-2.2.0_alpha132/cvs/Linux x86_64

3 files changed, 164 insertions, 6 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 0be45e60635d..3c851a02060e 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/maildrop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.133 2012/07/05 15:20:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.134 2012/09/25 11:32:18 eras Exp $
+
+*maildrop-2.6.0 (25 Sep 2012)
+
+  25 Sep 2012; Eray Aslan <eras@gentoo.org> +maildrop-2.6.0.ebuild:
+  Version bump
 
   05 Jul 2012; Jeroen Roovers <jer@gentoo.org> maildrop-2.5.5-r1.ebuild:
   Stable for HPPA (bug #413597).
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 04251db11130..b1dc6394bb69 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX maildrop-1.8.1-disable-fam.patch 2511 SHA256 e4621bbe990d7a90d703e7a8b8cf07bb59655a22a96e62c275352d28c79684a3 SHA512 88337c94f928e5bdc5d41cd02a48bb8e9475a34348b0bc75c0af36ca369d4432b4eb15190814b14f4b83b3f4104f476198a9333982fe326aaaa98bd5a3f1f18f WHIRLPOOL 6610849b7e51f9b58a985bf7964f3e9a5b065c99a1ebf7e40c54b2c6d855fdaf8f8729938de8441d77cbf7029c6cab364c81396b2a7bdff703e047134f9a14a8
 AUX maildrop-2.5.1-db.patch 2512 SHA256 194985d2da02add048129eddc7ff9a928944a849b5f303eabfdfb2b0a8beceb8 SHA512 b8cfc9f5040193848a6d892142180b2cbef63d3bfd1f89fc71978751e47a81c45eb0ffc896bd2f9328e366fe106926455bab71eb1b606eb5514d5e8973127089 WHIRLPOOL f6babc571f7abf3bec136120afa022b66daa68baefd6b26fc799471aafbd080208f2c47fc9282f99caa18752634b18457bbbf74b9abf19ce5ca8941de7dbf945
@@ -8,15 +8,27 @@ AUX maildrop-testsuite.patch 2141 SHA256 ab1fc5d152bf59a1063ea51a3a25e68b0ba096c
 AUX maildroprc 58 SHA256 2feec7b63d9b3fae442ddab96810929ce4080871c31a1f23401cd3b61d00add1 SHA512 3077160382882db22d095dff4b27368e7482b63a9756a3cf7a61e8470ed933af0fdb04a61ebae155b14a7b1fafc598a4cdd1bb660d957f00190b95eb41e81f4e WHIRLPOOL f46440c576985e308b973a1a34cb470ff96c92cadc9b9b56535542e3ad7c21d4f78bdb227bb81a35ffe4f11745a9e51f47ead92880a9bd052ad896d6cc50a709
 DIST maildrop-2.5.4.tar.bz2 2082167 SHA256 7621b4aede007d478dbd8bf88216e0289c18beddd36bbf429e85e3e66ca9e002 SHA512 b1f24f0cefc7f4ec87d30d57e91d881c136d83805d1c4c422fa17b0a759790ab6eee87f49acd038a03da142a360ae5708d285b878e814f7ae0f071e5a221fccd WHIRLPOOL 76d678c34bebd4b1e2155e7719da9b22632b10f02dae72b2439491b68ae31a0d98536d74caa6b32fcea5bcfebdbc073369d9143ddcf0079c76f60fc0190a5f3f
 DIST maildrop-2.5.5.tar.bz2 2158846 SHA256 7484382852075f452850a082454c8c47a65d52f00fe64e0b1a63ed7ccf25288c SHA512 ffafe3372739a5cc64a5b5bcad5e028539888d828a789698fb6962fe5394daa0bc8a8b637da855fb10890141ef18dd9a29c3bcc9ed0f2b49e1261cd0c34b9c7b WHIRLPOOL 5d26810eb4e23870cee8e4759e442f672b059188780efcdc1552691f68a7fbfa9101aadc65b8e782c00ab3fce60a6ab210cdc7bdfb1cc2826e529b0ade3e6df2
+DIST maildrop-2.6.0.tar.bz2 2174922 SHA256 afc115119b2d3197c565002e158c2cb69d525288bf72c71919c3c74096b824a9 SHA512 210841add8aff389589802f15ea74776815ecfd0dd9d5fb4f244d101e3d3f5dbb833a38f1d539b869c49685cfe34b0e6e014a5888c2537c9d89c68d754248db4 WHIRLPOOL c6d8f2be69a02fa757ac4dd653c22c79c8da6c2c1c112d48e0d4c491238d20e4c093d01f728ea337b1ba12bc75d88c5a252ff036114fe2339666776f2be44e80
 EBUILD maildrop-2.5.4.ebuild 3781 SHA256 040859960310de9006981b2ecf06f19acdc3f65157d2d102431d24a8a527d69f SHA512 0705166b802a07d687bb428afbb9f7eabf315693ea323b01cf8658658dd2b8e99700d27733e67b20cb328bb009dc1509ce75b9a62e355da98a680268cb65ac67 WHIRLPOOL a280de53c44b381860d5442d55b338390739f1e5017b9bd19e1950535d0f77a6a4b6b2bae52194bf7402a53bc2dc2c9a7ed12195764429b0a621c9682defe5ce
 EBUILD maildrop-2.5.5-r1.ebuild 3883 SHA256 8fc478d1f89673df619969be6c09c244095ebe1884b42a3ea374a878cd4b47e1 SHA512 fa34900e2d7a34c670ddbb8d1e76386f19e842fbfc9028f513098b0149ec2d8c2b8035ea1236dd174ad251f1249bef88b963b736a81f86ed2dfb6c051c54865e WHIRLPOOL c874e8be10345a6e01a85744894e53502c274489fc194d4b228e2f8ff3a2fe5f9ff04c38d839eef89aac4a03401898ad46004912a957d59669751d706b37c779
 EBUILD maildrop-2.5.5.ebuild 3793 SHA256 c819d52f784b0a9468e48041573a83bb23d57e2935edff2943a7867b2e6f52c3 SHA512 aa071b6ee94b0dd048a13c80ca50f1de7f7c4b1196ea623ce19f115568f19c582952d9e75dd997e2b688ae13fe50e10ec1aa03422e1b1b43c84d51cdfedba052 WHIRLPOOL ea274ee406d322310ab1d1f4ddb880bf945ef78af4ea4d1303e8f41fda67b803c613a817d1a730dac59a6a89b6d04722ec989f82b6c232fa00c442ae40ac17fa
-MISC ChangeLog 24379 SHA256 dcbece6ad495281aed2bdd96cb9af4a25fed493c7d19038c0a48783d82a9b3fc SHA512 292d538944f14f8a5f73810960a2886d11edf3edfce805fcd4476ef4e709b078f91e538249b720ee5913afa9c6d3139951dd27265c0338e1d830089b24fbc950 WHIRLPOOL 798330c0c9f59a87d35b22ae8ff1a80bc45789052dea7d4be7481aed541fee5772db0c3beb400f551ac9a04a33f4ee3767e6f82becffc107c80613cb901b162b
+EBUILD maildrop-2.6.0.ebuild 3892 SHA256 378a6521291ddcc4b1040dbe209dd38c9549bc7de0c51d502a6ca7d96bd0917d SHA512 56c465f516b832c847c0f5b2cfc20c770ca04f2ddc4d8eddd7124a07292f559a3153ae61269c10af2323533912ae19037ead82573993fbd97fcb7904c0fd6020 WHIRLPOOL b98f35f70cca0c70111f98e953e96791d565aee7304895b1509681e2cab5d80dd113830bc29cafb9c8f1652e7bf5c5c38cb680811ebe29305bf135cb2afd0cd1
+MISC ChangeLog 24495 SHA256 32fd23c853e7d6806d8a56f264b9338e198b05e1a27c2188fe6d57fd2cde63a9 SHA512 8c73646c12e144649393ff5f52ce321405d59a9af43957cd4962ae2ca158d1a8c124a60b4fc6a6269ea8a9acbb3b2fce6b28b4aa0c97882e6f89b8210d8d2f73 WHIRLPOOL f921355788018389e45e2351ea61ba4129b2c944af9172c8578f1867b29fdbfbd5e4d0d300d40882b88f117b92a01f838ce6167233ec678ca569ed48e575a541
 MISC metadata.xml 400 SHA256 9cdaee423aee027a354f501415ace396a57ab19ec2633562ede17db5d52eeecd SHA512 526b73b58d567afffc201c4feb418efaf2239d224098e9000593bc7aa503b0e27eace65f79ede704a45a37f2b8de136e62e43103520fcbc9a51270285815e0df WHIRLPOOL 17adbc041a6f428982a04a60d5f61c11e4d4173bad326ae71d95f4b58c68877b781d58c4904efc6fd76d5f23e77e91c22a3d35a0dab6e08bc0df852cf3ca7943
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/1sMIACgkQVWmRsqeSphPGFgCfWUyW2hiW9A6S9RY3tZLI/ToZ
-GhUAnREjy6eLgFcN8WPHhtnjLvN2kWyJ
-=ibwm
+iQIcBAEBCAAGBQJQYZZQAAoJEHfx8XVYajsfdDkP/Alem2DsGfyKbcXPScCkTTrK
+u1Q/qkuSwi435vTZLzR/28a9+yfm+zRGgUR1L+44DWIFkZdUIwdnaA3nKERseWPb
+A+9ojQCgiq58uM1MrUAZrqak5g9YPzsUOrZ31WBPiQRX8u8foE4GXXYbW2OCSSTW
+qxpoBp31cy3xQ3zYrgMlGn5JLOKUzyD+MHxnEQFU++E+imfhP41FWqxtnFb8Uw0j
+YwtdIjIbe2WDcZqvJZaPkX1RULlrdl9YY12U1xt6hyScRWzYC7ZSq4ryBzmDSMmk
+QoA5g82SYzYLqcqXvIVuV5D1IvmHYjLu2BGQhVpadfnHlEO489S4XOr4rH73A2UJ
+PHIT7hPXCRt4c5GQo2EWHsoC/AgSabWSWPlPfY7O45/muGHpQdvRLDIBeL6U3UPA
+/isdk4YvNrGVYOmn8Ichvh6s/CrZ5h2Lxj75Fcu1EGfeDs2jSbUYgoCVSDuiSpy2
+QnmtFP5zKt2OwCnwML8chb0+iwzjJ2+eWHWtrr+tmLiIzRz58VouPFRc0G1iBVKD
+EFN5m/j8bP3z0MCdQ7GOqzmf8MsKKihuqjJ5kQ9Ym18ER2hK+CsjPObDGe4pMHO3
+JTrqpqc/TmUaalWfBdhX3tg1PVliyw5ADQ5GsiaO7pQD5X92IC72MGQLIuAYpoOo
+F71m2z/iOYtSu6eZAjYr
+=JKHJ
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/maildrop-2.6.0.ebuild b/mail-filter/maildrop/maildrop-2.6.0.ebuild
new file mode 100644
index 000000000000..d5ec3cedd179
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-2.6.0.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.6.0.ebuild,v 1.1 2012/09/25 11:32:18 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}
+	virtual/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
+}