Version bump closes #81391. Reported by: valli <gentoo@valli.org>. Headers updated.

(Portage version: 2.0.51-r15)

12 files changed, 162 insertions, 41 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index e595248b562e..38d91eef3eea 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/maildrop
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.19 2004/12/30 21:53:09 kloeri Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.20 2005/02/09 21:09:31 ferdy Exp $
+
+*maildrop-1.8.0 (09 Feb 2005)
+
+  09 Feb 2005; Fernando J. Pereda <ferdy@gentoo.org> +maildrop-1.8.0.ebuild:
+  Version bump, closes #81391. Reported by: valli <gentoo@valli.org>
 
   30 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
   maildrop-1.7.0.20040907-r1.ebuild:
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 198fb358106e..077db5fc3874 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,32 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d4fdebbe5e32a756c90ce0fb40dc08b0 maildrop-1.7.0.20040907-r1.ebuild 3247
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 775ecfe921ead64a3b3cfac58912b3dc maildrop-1.7.0-r2.ebuild 3296
+MD5 fca1c425da7abe0dd2b2271170e7a1c7 maildrop-1.7.0.20040907.ebuild 3111
 MD5 2f6b908e9a85e034339c04df7218ed8a maildrop-1.5.2.ebuild 2531
-MD5 cd5b95543ea004da5346384c4e1deec8 maildrop-1.7.0.ebuild 2580
 MD5 eddbe46e7fa90588dd5ed2099f8803bb maildrop-1.4.0-r1.ebuild 1617
-MD5 fca1c425da7abe0dd2b2271170e7a1c7 maildrop-1.7.0.20040907.ebuild 3111
-MD5 b002f952118977811af2a0f42dd64da3 ChangeLog 8170
+MD5 cd5b95543ea004da5346384c4e1deec8 maildrop-1.7.0.ebuild 2580
+MD5 ce9c5781e3fa8caac5559ddbd1bc7e03 maildrop-1.8.0.ebuild 3217
 MD5 15157536de2356260894b623b3dbbc0b maildrop-1.5.3.ebuild 2508
+MD5 775ecfe921ead64a3b3cfac58912b3dc maildrop-1.7.0-r2.ebuild 3296
 MD5 de4ecb43fe9d690e3d007552e51638f3 maildrop-1.5.3-r1.ebuild 2432
+MD5 b002f952118977811af2a0f42dd64da3 ChangeLog 8170
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 d4fdebbe5e32a756c90ce0fb40dc08b0 maildrop-1.7.0.20040907-r1.ebuild 3247
 MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907 77
-MD5 72eeead0d2cb72de0ee2571af5c63bd5 files/maildrop-1.7.0-db4-configure.in.patch 1290
-MD5 54e776919d1cd1729e5c6c1f27c40444 files/maildrop-1.7.0-0x0B-fix.patch 525
-MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0-r2 68
 MD5 a0e238f4cd5c4a52dfb06754051b6dfe files/digest-maildrop-1.5.2 67
-MD5 953fc332e6ec019b91dba0b85d9745e9 files/digest-maildrop-1.4.0-r1 66
-MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3-r1 67
-MD5 532cc225eb7ae73b01639168857445be files/maildrop-1.7.0-db4-bdbobj_configure.in.patch 1211
-MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907-r1 77
 MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3 67
 MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0 68
+MD5 eb7acda28529a85c74150a140f143d75 files/digest-maildrop-1.8.0 68
+MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907-r1 77
+MD5 953fc332e6ec019b91dba0b85d9745e9 files/digest-maildrop-1.4.0-r1 66
+MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3-r1 67
+MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0-r2 68
+MD5 72eeead0d2cb72de0ee2571af5c63bd5 files/maildrop-1.7.0-db4-configure.in.patch 1290
 MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB1HjhugEuf3OQ0akRAi/xAJ4phfftyXXna+uUqI7wG4LlK/F4OgCfXcub
-vjHVeVHE4taB9NTyOLpmUUg=
-=txVA
------END PGP SIGNATURE-----
+MD5 54e776919d1cd1729e5c6c1f27c40444 files/maildrop-1.7.0-0x0B-fix.patch 525
+MD5 532cc225eb7ae73b01639168857445be files/maildrop-1.7.0-db4-bdbobj_configure.in.patch 1211
diff --git a/mail-filter/maildrop/files/digest-maildrop-1.8.0 b/mail-filter/maildrop/files/digest-maildrop-1.8.0
new file mode 100644
index 000000000000..70344e5442cc
--- /dev/null
+++ b/mail-filter/maildrop/files/digest-maildrop-1.8.0
@@ -0,0 +1 @@
+MD5 caf59c78d6689b4cfba98d979af63407 maildrop-1.8.0.tar.bz2 2013203
diff --git a/mail-filter/maildrop/maildrop-1.4.0-r1.ebuild b/mail-filter/maildrop/maildrop-1.4.0-r1.ebuild
index 34f4f3d50674..499fa751dc20 100644
--- a/mail-filter/maildrop/maildrop-1.4.0-r1.ebuild
+++ b/mail-filter/maildrop/maildrop-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.4.0-r1.ebuild,v 1.4 2004/09/20 07:43:01 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.4.0-r1.ebuild,v 1.5 2005/02/09 21:09:31 ferdy Exp $
 
 DESCRIPTION="Mail delivery agent/filter"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.gz"
diff --git a/mail-filter/maildrop/maildrop-1.5.2.ebuild b/mail-filter/maildrop/maildrop-1.5.2.ebuild
index 8e4fcc813361..a55f878f88bc 100644
--- a/mail-filter/maildrop/maildrop-1.5.2.ebuild
+++ b/mail-filter/maildrop/maildrop-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.5.2.ebuild,v 1.5 2004/09/20 07:43:01 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.5.2.ebuild,v 1.6 2005/02/09 21:09:31 ferdy Exp $
 
 IUSE="mysql ldap gdbm berkdb"
 
diff --git a/mail-filter/maildrop/maildrop-1.5.3-r1.ebuild b/mail-filter/maildrop/maildrop-1.5.3-r1.ebuild
index c9f01834b8e2..5cee90c1f293 100644
--- a/mail-filter/maildrop/maildrop-1.5.3-r1.ebuild
+++ b/mail-filter/maildrop/maildrop-1.5.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.5.3-r1.ebuild,v 1.6 2004/09/20 07:43:01 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.5.3-r1.ebuild,v 1.7 2005/02/09 21:09:31 ferdy Exp $
 
 IUSE="mysql ldap gdbm"
 
diff --git a/mail-filter/maildrop/maildrop-1.5.3.ebuild b/mail-filter/maildrop/maildrop-1.5.3.ebuild
index b029cf7813f1..4c158632fc58 100644
--- a/mail-filter/maildrop/maildrop-1.5.3.ebuild
+++ b/mail-filter/maildrop/maildrop-1.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.5.3.ebuild,v 1.5 2004/09/20 07:43:01 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.5.3.ebuild,v 1.6 2005/02/09 21:09:31 ferdy Exp $
 
 IUSE="mysql ldap gdbm berkdb"
 
diff --git a/mail-filter/maildrop/maildrop-1.7.0-r2.ebuild b/mail-filter/maildrop/maildrop-1.7.0-r2.ebuild
index 7bf1e49e8de7..bd058f23a9ed 100644
--- a/mail-filter/maildrop/maildrop-1.7.0-r2.ebuild
+++ b/mail-filter/maildrop/maildrop-1.7.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0-r2.ebuild,v 1.4 2004/12/13 23:50:45 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0-r2.ebuild,v 1.5 2005/02/09 21:09:31 ferdy Exp $
 
 
 inherit eutils
diff --git a/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild b/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild
index 40e65087020d..e39b44078260 100644
--- a/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild
+++ b/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild,v 1.2 2004/12/30 21:53:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild,v 1.3 2005/02/09 21:09:31 ferdy Exp $
 
 
 inherit eutils
diff --git a/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild b/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild
index a386ec111ca8..e416d7c8a90c 100644
--- a/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild
+++ b/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild,v 1.4 2004/12/21 13:14:41 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild,v 1.5 2005/02/09 21:09:31 ferdy Exp $
 
 
 inherit eutils
diff --git a/mail-filter/maildrop/maildrop-1.7.0.ebuild b/mail-filter/maildrop/maildrop-1.7.0.ebuild
index cc5956b817e3..48a0a6fd480c 100644
--- a/mail-filter/maildrop/maildrop-1.7.0.ebuild
+++ b/mail-filter/maildrop/maildrop-1.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0.ebuild,v 1.5 2004/12/13 23:50:45 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0.ebuild,v 1.6 2005/02/09 21:09:31 ferdy Exp $
 
 IUSE="mysql ldap gdbm berkdb"
 
diff --git a/mail-filter/maildrop/maildrop-1.8.0.ebuild b/mail-filter/maildrop/maildrop-1.8.0.ebuild
new file mode 100644
index 000000000000..b4c6186a7129
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-1.8.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.8.0.ebuild,v 1.1 2005/02/09 21:09:31 ferdy Exp $
+
+
+inherit eutils
+IUSE="mysql ldap gdbm berkdb"
+
+DESCRIPTION="Mail delivery agent/filter"
+HOMEPAGE="http://www.courier-mta.org/maildrop/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~alpha ~amd64 ~ia64"
+
+DEPEND="dev-lang/perl
+	virtual/mta
+	berkdb? ( >=sys-libs/db-3* )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	ldap? ( >=net-nds/openldap-2.0.23 )"
+PROVIDE="virtual/mda"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# patch for db-4.x detection
+	epatch ${FILESDIR}/maildrop-1.7.0-db4-configure.in.patch \
+		|| die "patch failed."
+	epatch ${FILESDIR}/maildrop-1.7.0-db4-bdbobj_configure.in.patch \
+		|| die "patch failed."
+
+	ebegin "Recreating configure."
+	autoconf || die "recreate configure failed."
+	eend $?
+
+	ebegin "Recreating configure in bdbobj."
+	cd ${S}/bdbobj
+	autoconf || die "recreate configure failed."
+	eend $?
+	cd ${S}
+}
+
+src_compile() {
+	local myconf
+	use mysql \
+		&& myconf="${myconf} --enable-maildropmysql \
+			--with-mysqlconfig=/etc/maildrop/maildropmysql.cf" \
+		|| myconf="${myconf} --disable-maildropmysql"
+
+	use ldap \
+		&& myconf="${myconf} --enable-maildropldap \
+			--with-ldapconfig=/etc/maildrop/maildropldap.cf" \
+		|| myconf="${myconf} --disable-maildropldap"
+
+	if use gdbm; then
+		# both flags present; default to gdbm.
+		einfo "build with GDBM support."
+		myconf="${myconf} --with-db=gdbm \
+		--enable-userdb"
+	elif use berkdb; then
+		einfo "build with DB support."
+		myconf="${myconf} --with-db=db \
+		--enable-userdb"
+	else
+		# without a db library support, can't build this.
+		einfo "moving ${S}/makedat to ${S}/makedat.org"
+		mv ${S}/makedat ${S}/makedat.org || "failed to move makedat."
+		einfo "build without-db."
+		myconf="${myconf} --without-db"
+	fi
+
+	libtoolize --copy --force
+
+	econf \
+		--with-devel \
+		--disable-tempdir \
+		--enable-syslog=1 \
+		--enable-use-flock=1 \
+		--enable-maildirquota \
+		--enable-use-dotlock=1 \
+		--enable-restrict-trusted=1 \
+		--enable-trusted-users='apache dspam root mail daemon postmaster qmaild mmdf vmail' \
+		--with-default-maildrop=./.maildir/ \
+		--enable-sendmail=/usr/sbin/sendmail \
+		${myconf} || die
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	local i
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README \
+		README.postfix UPGRADE maildroptips.txt
+	mv ${D}/usr/share/maildrop/html ${D}/usr/share/doc/${PF}
+	dohtml {INSTALL,README,UPGRADE}.html
+
+	# this just cleans up /usr/share/maildrop a little bit..
+	for i in makedat makeuserdb pw2userdb userdb userdbpw vchkpw2userdb
+	do
+		rm -f ${D}/usr/bin/$i
+		mv -f ${D}/usr/share/maildrop/scripts/$i \
+			${D}/usr/share/maildrop
+		dosym /usr/share/maildrop/$i /usr/bin/$i
+	done
+	rm -rf ${D}/usr/share/maildrop/scripts
+
+	insinto /etc
+	doins ${FILESDIR}/maildroprc
+
+	insinto /etc/maildrop
+	if use mysql
+	then
+		sed -e "s:/var/lib/mysql/mysql.sock:/var/run/mysqld/mysqld.sock:" \
+		 	${S}/maildropmysql.config > ${S}/maildropmysql.cf
+		newins ${S}/maildropmysql.cf maildropmysql.cf
+	fi
+	use ldap && newins ${S}/maildropldap.config maildropldap.cf
+}
+