Clean-up and version bump

5 files changed, 17 insertions, 130 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 73c0d31..b6a27d4 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*maildrop-2.5.1 (27 Oct 2010)
+
+  27 Oct 2010; Daniel Solano Gómez <gentoo@sattvik.com>
+  -maildrop-2.4.0.ebuild, -maildrop-2.4.1.ebuild, maildrop-2.4.2.ebuild,
+  +maildrop-2.5.1.ebuild:
+  Clean up and version bump.
+
 *maildrop-2.4.1 (16 Feb 2010)
 
   16 Feb 2010; Daniel Solano Gómez <gentoo@sattvik.com>
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index dd61115..0a65ffe 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -2,11 +2,9 @@ AUX maildrop-1.8.1-disable-fam.patch 2511 RMD160 3fc7bf21d425c6e676475458c99a5ed
 AUX maildrop-2.0.4-makedat.patch 1119 RMD160 e6f8a0b677b3ab3a03c87e7cddc2506b45539579 SHA1 78bb74fde5fab0156e1a26951a7847d3541fd86e SHA256 5636617c387769f295812b9aceb63ad90c8117f52f29071f09351331165983e6
 AUX maildrop-2.2.0-db4.patch 2509 RMD160 15d213da460130f30cdfae26686883f127dd20c9 SHA1 2a46020bd957c198306acbb695d9b92ac3c48282 SHA256 d42b04c4d8557d2c82f9dea6f176b3cd935c839bcc2ccc2212f0356cf42edecb
 AUX maildroprc 58 RMD160 1d53d6c05cb809bb9d637ae347d9dee1362f1b09 SHA1 a2fd605991606a3bf89296f2d3f3a5f7a7327aba SHA256 2feec7b63d9b3fae442ddab96810929ce4080871c31a1f23401cd3b61d00add1
-DIST maildrop-2.4.0.tar.bz2 2415851 RMD160 bf9febe5db917920f4a0b3ddefe9d6d40246e1ca SHA1 982bdeb25c975cd14f64a0135f92e989c2d42050 SHA256 93eb5868f52cf430646b7bc688f7da6db3da8e61a3d2e3bdbc8e54e01d887c85
-DIST maildrop-2.4.1.tar.bz2 2415694 RMD160 d21c173eafe7d2695e013aa89f7592aacbb79591 SHA1 d451a3d934162cc35f95a3a59a7aaa260eefcd24 SHA256 8acc74e2bf7eadd85be6392b9817af0b9435f9af1f30a603ce2ffba3771c82ac
 DIST maildrop-2.4.2.tar.bz2 2413925 RMD160 8f7a93ab242ea83f7c9cc07abd13c0e3acae52f0 SHA1 191f580cc05a4935d9061514017713f025437c73 SHA256 e020bfebb8287ff81f9d8668e871c3c252c0e6f2a7d3c5ec21e8377131635303
-EBUILD maildrop-2.4.0.ebuild 3094 RMD160 ffa0faffc87b2f6b017afaa9213f7b74057c6234 SHA1 b28dc44bdfa89b6970967fb1570c19e43c68d920 SHA256 8d95b293e4a5e98422ca5f5ca60c8ddd0c00eaabc61d7e9ad313afb66f0a21c4
-EBUILD maildrop-2.4.1.ebuild 3094 RMD160 eaee3e8ddbab552c2cffc7f8baabd91908e4232e SHA1 5c56265753867ab15760a504102c1378453fa38b SHA256 17dc6721fa1fdf827de035d49fe21a5d1d1cb0ec03aed9ad03fdcc3fadef5950
-EBUILD maildrop-2.4.2.ebuild 3094 RMD160 38ec285961ace7c0a49ccb9a6f170600b4131f5e SHA1 55dce0fe92c2df8255d92b50355de5648e69dd21 SHA256 93a8ac187ecd96cdab28605724cc19b03f2452a7ebedd171f5b9669c1025e05b
-MISC ChangeLog 752 RMD160 b65cfecbc2fd5b229798fed66493e7714e5c8259 SHA1 a40b8add478bd3db65bfacea55500f2f6549a703 SHA256 40e74f552dd712acca7097e08e4860d182c37638bb9a91d92634c67e95c91640
+DIST maildrop-2.5.1.tar.bz2 2422151 RMD160 0ff5483790e10cc0a4658278c1154b82f2533d03 SHA1 0d44027e4a19195ab92fbb2d4b3480058690882e SHA256 3bf0d63345b5736b82720fdf0ef1b975b502749c9aed968cae4a51e1d2c3e1e9
+EBUILD maildrop-2.4.2.ebuild 3087 RMD160 23ec58a91ccce7d25552d2037630af92cde6205a SHA1 7c97ad3200a360e413c837215417043bd1f78da6 SHA256 f5be710e2a06bf32584bec25968fe6a5cf9a71ae669cdcc18fd7f868582cc5ba
+EBUILD maildrop-2.5.1.ebuild 3132 RMD160 2ac5d876710ab582760b7ecccf39e85aa8594aa2 SHA1 34b66a54c1ebe58b0bbad1aaadb311915de041a7 SHA256 c5dd7b97d8b5c0d113787775edeeeab8dc7f2dce89c723f821a31b5069b09cbb
+MISC ChangeLog 969 RMD160 c88cbad5a605a4e9edfdd3c29bf732804755d0d5 SHA1 6b767065d402b0c172d57f4b34a8d6863abd5366 SHA256 b1b79be874cab47f24fe633e1d51fabae180880e89a2406cd180ab8d2dbd7cf1
 MISC metadata.xml 313 RMD160 a54c7c17c1fb1708ba9987cdad3e1f91bafd5e7e SHA1 c030dc401f831ea71224dbec6685200e34798962 SHA256 8e4845f749808afe7959162a14069b0eb59436401ee3a2ed8661a3bdc18fb5fe
diff --git a/mail-filter/maildrop/maildrop-2.4.1.ebuild b/mail-filter/maildrop/maildrop-2.4.1.ebuild
deleted file mode 100644
index 185c809..0000000
--- a/mail-filter/maildrop/maildrop-2.4.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.4.1.ebuild,v 1.1 2010/02/16 11:07:42 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 tools"
-
-DEPEND="!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
-		)
-	)"
-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}"/${PN}-2.2.0-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 fetchmail \
-		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-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
-
-	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
-	fi
-
-	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
-}
diff --git a/mail-filter/maildrop/maildrop-2.4.2.ebuild b/mail-filter/maildrop/maildrop-2.4.2.ebuild
index 92f68be..d8c74f7 100644
--- a/mail-filter/maildrop/maildrop-2.4.2.ebuild
+++ b/mail-filter/maildrop/maildrop-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.4.2.ebuild,v 1.1 2010/02/25 08:28:21 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.4.2.ebuild,v 1.7 2010/03/11 19:16:00 armin76 Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.courier-mta.org/maildrop/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
 IUSE="berkdb debug fam gdbm ldap mysql postgres authlib tools"
 
 DEPEND="!mail-mta/courier
diff --git a/mail-filter/maildrop/maildrop-2.4.0.ebuild b/mail-filter/maildrop/maildrop-2.5.1.ebuild
index 42caea8..102c64e 100644
--- a/mail-filter/maildrop/maildrop-2.4.0.ebuild
+++ b/mail-filter/maildrop/maildrop-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.4.0.ebuild,v 1.1 2010/02/06 09:11:26 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.5.1.ebuild,v 1.1 2010/10/05 08:41:06 tove Exp $
 
 EAPI=2
 
@@ -34,6 +34,8 @@ DEPEND="!mail-mta/courier
 	)"
 RDEPEND="${DEPEND}
 	dev-lang/perl"
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
 PROVIDE="virtual/mda"
 
 S=${WORKDIR}/${P%%_pre}
@@ -45,7 +47,7 @@ src_prepare() {
 	if use gdbm ; then
 		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
 	elif use berkdb ; then
-		epatch "${FILESDIR}"/${PN}-2.2.0-db4.patch
+		epatch "${FILESDIR}"/${PN}-2.5.1-db.patch
 	fi
 
 	if ! use fam ; then