Version bump

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 205 insertions, 3 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index e86fe67b7e1f..7a1a9fefe99c 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/maildrop
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.82 2009/03/21 17:00:49 jmbsvicetto Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.83 2009/05/16 06:58:56 tove Exp $
+
+*maildrop-2.1.0 (16 May 2009)
+
+  16 May 2009; Torsten Veller <tove@gentoo.org> +maildrop-2.1.0.ebuild,
+  +files/maildrop-2.1.0-db4.patch:
+  Version bump
 
   21 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 4e5c6591a8ee..be3abc287ff3 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,8 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX maildrop-1.8.0-db4-r1.patch 2529 RMD160 bf6e31be2227b53f5e7cbc5838b819f81dcd62d9 SHA1 4ba67fa469c422deef77c461e0ea33d97c511687 SHA256 1e5eef7afba0c496e8e6ee627bb8ccf182ffd39ea4c8f8fc8f9723fce97c51ae
 AUX maildrop-1.8.1-disable-fam.patch 2511 RMD160 3fc7bf21d425c6e676475458c99a5ed2d4e93469 SHA1 7b6148b485bbc0379fa849a8af2706b93ea22432 SHA256 e4621bbe990d7a90d703e7a8b8cf07bb59655a22a96e62c275352d28c79684a3
 AUX maildrop-2.0.4-makedat.patch 1119 RMD160 e6f8a0b677b3ab3a03c87e7cddc2506b45539579 SHA1 78bb74fde5fab0156e1a26951a7847d3541fd86e SHA256 5636617c387769f295812b9aceb63ad90c8117f52f29071f09351331165983e6
+AUX maildrop-2.1.0-db4.patch 2918 RMD160 ffefd7239c185fead426f825c1372e6c99bef29b SHA1 f0f28156cc019f9199c725da568ffaa59e04d4c4 SHA256 2755dca67984c5716bf7b7b7f381082f3e00a274b3f1fe00dc8ccac3bffb285b
 AUX maildroprc 58 RMD160 1d53d6c05cb809bb9d637ae347d9dee1362f1b09 SHA1 a2fd605991606a3bf89296f2d3f3a5f7a7327aba SHA256 2feec7b63d9b3fae442ddab96810929ce4080871c31a1f23401cd3b61d00add1
 DIST maildrop-2.0.4.tar.bz2 2286125 RMD160 9c0a349879cc0791ad01e5bae04b680de3a7a606 SHA1 df2755c1d0e00d19506b0659e59bf5d4756cce17 SHA256 573032d6525ac7454377eb400372c363446bb3d9abd9249da9cf6676aef85671
+DIST maildrop-2.1.0.tar.bz2 2482163 RMD160 3ff0a331ae59f3ebc48370f24aa244540f841e33 SHA1 4da332b51ed899da320844ba05ab532b8881c449 SHA256 f041f387d3785886ac9c8e404b60760b109daf96c5e3ae0de764243fd4c877f1
 EBUILD maildrop-2.0.4.ebuild 2896 RMD160 47af7fda54dad6715e6073626ff9cd3187218c3e SHA1 babce3864c9276a7474e4aa3a86fe4f627adbaa2 SHA256 a67103c042126cb8a18df224c7188dfe6529f133c36722955a69b82809d60b90
-MISC ChangeLog 18031 RMD160 be7daa038d8d88a965da43d6d926d1fd21350599 SHA1 a9e76f7fc2cbf5f44ae1a984eaeadf20c2d84b77 SHA256 ab40a8f34482f3aebb8dbd2ecb143b5d93e7baded2edabe00b23003c8404e763
+EBUILD maildrop-2.1.0.ebuild 2868 RMD160 f1b78fb769179948b833adbdc406347cae21dbdd SHA1 cb694fc998792422eaf442de7ec0fd9814a14fdb SHA256 a98148c3450e9fceecee56e4309566da9299fbc0518349368e2d6b86262fb46e
+MISC ChangeLog 18178 RMD160 02e0e1722f47fa55f8ff3c83427a7564096b3d08 SHA1 4553cf01d4d03c6b802c343203f99bffb18390a4 SHA256 623348056d18d43d9d6cdff5d7b4d55e3e222a19d98e471440d83d220b96686f
 MISC metadata.xml 240 RMD160 e5b053c0a14b143e22acb63661529b036ac18428 SHA1 4a9701163fe5473fdbd5eaf6f286bc0a539519b1 SHA256 4e7e2f285c777bc7c6657086935b69d68e8c248546dda4e87b9279ca732308bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoOZD4ACgkQV3J2n04Eauxe4gCcCRj7jZ3tEz+aYikBys/d+vFH
+tHQAoJfAFSFUJwCw18snnwoCczO/Rhkv
+=YJ1L
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/files/maildrop-2.1.0-db4.patch b/mail-filter/maildrop/files/maildrop-2.1.0-db4.patch
new file mode 100644
index 000000000000..9f7fedc18da3
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-2.1.0-db4.patch
@@ -0,0 +1,71 @@
+diff -ur maildrop-2.1.0-orig/bdbobj/configure.in maildrop-2.1.0/bdbobj/configure.in
+--- maildrop-2.1.0-orig/bdbobj/configure.in	2009-02-15 22:50:45.000000000 +0100
++++ maildrop-2.1.0/bdbobj/configure.in	2009-05-15 22:02:53.000000000 +0200
+@@ -23,15 +23,19 @@
+ dnl Checks for libraries.
+ 
+ saveLIBS="$LIBS"
+-AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-	))
++for dbname in db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++  do
++        AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++          AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++            AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++              AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
+ 
++  done
+ FOUND_DB=0
+-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
+-AC_CHECK_FUNC(db_open, FOUND_DB=1)
+-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
++AC_CHECK_FUNC(db_create, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
+Only in maildrop-2.1.0/bdbobj: configure.in.orig
+diff -ur maildrop-2.1.0-orig/configure.in maildrop-2.1.0/configure.in
+--- maildrop-2.1.0-orig/configure.in	2009-05-10 15:03:10.000000000 +0200
++++ maildrop-2.1.0/configure.in	2009-05-15 22:03:39.000000000 +0200
+@@ -99,21 +99,24 @@
+ 	USE_GDBM=1
+ 	;;
+ db)
+-	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-		AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-		AC_CHECK_LIB(db, db_env_create,
+-					[ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-		))
+-
+-	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
++  for dbname in db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++    do
++	AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	  AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	    AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	      AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
++    done
++  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
++
+ 	if test "$HAVE_BDB" != "1"
+ 	then
+-		AC_MSG_ERROR(GDBM library not found)
++		AC_MSG_ERROR(DB library not found)
+ 	fi
+ 	dblibrary=bdbobj/libbdbobj.la
+-	USE_GDBM=0
++	USE_DB=1
+ 	;;
+ *)
+ 	;;
+Only in maildrop-2.1.0: configure.in.orig
diff --git a/mail-filter/maildrop/maildrop-2.1.0.ebuild b/mail-filter/maildrop/maildrop-2.1.0.ebuild
new file mode 100644
index 000000000000..3e77c1eba678
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-2.1.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.1.0.ebuild,v 1.1 2009/05/16 06:58:56 tove Exp $
+
+EAPI=2
+
+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 ~s390 ~sh ~sparc ~x86"
+IUSE="berkdb debug fam gdbm ldap mysql postgres authlib"
+
+DEPEND="!mail-mta/courier
+	net-mail/mailbase
+	dev-libs/libpcre
+	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
+		)
+	)"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+PROVIDE="virtual/mda"
+
+S=${WORKDIR}/${P%%_pre}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.4-makedat.patch
+
+	# Prefer gdbm over berkdb
+	if use gdbm ; then
+		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
+	elif use berkdb ; then
+			epatch "${FILESDIR}"/${P}-db4.patch
+	fi
+
+	if ! use fam ; then
+		epatch "${FILESDIR}"/${PN}-1.8.1-disable-fam.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local mytrustedusers="apache dspam root mail \
+		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
+
+	econf \
+		$(use_enable fam) \
+		--disable-dependency-tracker \
+		--with-devel \
+		--disable-tempdir \
+		--enable-syslog=1 \
+		--enable-use-flock=1 \
+		--enable-maildirquota \
+		--enable-use-dotlock=1 \
+		--enable-restrict-trusted=1 \
+		--enable-trusted-users="${mytrustedusers}" \
+		--enable-maildrop-uid=root \
+		--enable-maildrop-gid=mail \
+		--with-default-maildrop=./.maildir/ \
+		--enable-sendmail=/usr/sbin/sendmail \
+		--cache-file="${S}"/configuring.cache \
+		${myconf}
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	fperms 4755 /usr/bin/maildrop
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README \
+		README.postfix UPGRADE maildroptips.txt || die
+
+	dodir /usr/share/doc/${PF}
+	mv "${D}"/usr/share/maildrop/html "${D}"/usr/share/doc/${PF}/
+
+	dohtml {INSTALL,README,UPGRADE}.html || die
+
+	insinto /etc
+	doins "${FILESDIR}"/maildroprc || die
+}