Version bump. Properly fixes #59608.

4 files changed, 131 insertions, 5 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index a3b77cc0b831..f4c16bf9f74a 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2004/09/20 07:43:01 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.12 2004/09/20 16:56:51 ticho Exp $
+
+*maildrop-1.7.0.20040907 (20 Sep 2004)
+
+  20 Sep 2004; Andrej Kacian <ticho@gentoo.org>
+  +maildrop-1.7.0.20040907.ebuild:
+  Version bump. Upstream fixed issue in #59608 here.
 
   20 Sep 2004; Andrej Kacian <ticho@gentoo.org> maildrop-1.7.0-r1.ebuild,
   maildrop-1.7.0-r2.ebuild, maildrop-1.7.0.ebuild:
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 629ccaaa8be4..6c2d0443e610 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d02e129d1a48245a7db0201d028581ee ChangeLog 6752
+MD5 af77054e3c73cf9a8ea5bd20185aa4c4 ChangeLog 6929
 MD5 de4ecb43fe9d690e3d007552e51638f3 maildrop-1.5.3-r1.ebuild 2432
 MD5 e217709594aef52006b31c2988aa6a69 maildrop-1.7.0-r1.ebuild 3278
 MD5 23fd645175c49eaa64a1283cbd678087 maildrop-1.7.0.ebuild 2581
 MD5 f7ba93af866b3229b86c5a8fd855e6be maildrop-1.7.0-r2.ebuild 3291
 MD5 2f6b908e9a85e034339c04df7218ed8a maildrop-1.5.2.ebuild 2531
+MD5 9a3fbdaa55167f2879ec7bc99904bdd6 maildrop-1.7.0.20040907.ebuild 3103
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 15157536de2356260894b623b3dbbc0b maildrop-1.5.3.ebuild 2508
 MD5 eddbe46e7fa90588dd5ed2099f8803bb maildrop-1.4.0-r1.ebuild 1617
 MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3-r1 67
 MD5 953fc332e6ec019b91dba0b85d9745e9 files/digest-maildrop-1.4.0-r1 66
+MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907 77
 MD5 a0e238f4cd5c4a52dfb06754051b6dfe files/digest-maildrop-1.5.2 67
 MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0 68
 MD5 532cc225eb7ae73b01639168857445be files/maildrop-1.7.0-db4-bdbobj_configure.in.patch 1211
@@ -23,7 +25,7 @@ MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBTooO10xuJSrg3/sRAtuzAJ9isaPTqz+0SX+gh3qR8+rya4SQ7ACfem7/
-ajlY10qZv5bLeEMCbvgtNmk=
-=wAIR
+iD8DBQFBTwvh10xuJSrg3/sRAljwAJ9TlqA/G+tqudzgYr7wgSz1w29XEACfQW5b
+p4PQZXQgOvPsP17mjLt3dlA=
+=mgpB
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/files/digest-maildrop-1.7.0.20040907 b/mail-filter/maildrop/files/digest-maildrop-1.7.0.20040907
new file mode 100644
index 000000000000..0ed5befa6046
--- /dev/null
+++ b/mail-filter/maildrop/files/digest-maildrop-1.7.0.20040907
@@ -0,0 +1 @@
+MD5 19c3ee25c71e3508c953cfae2f1fb17e maildrop-1.7.0.20040907.tar.bz2 1210399
diff --git a/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild b/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild
new file mode 100644
index 000000000000..b8954367c34b
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-1.7.0.20040907.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2004 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.1 2004/09/20 16:56:51 ticho 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"
+
+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
+		myconf="${myconf} --without-db"
+	fi
+
+	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
+}
+