Make maildrop use courier-authlib and clean the ebuild. Re-Closes #81391.

(Portage version: 2.0.51-r15)

5 files changed, 187 insertions, 12 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 38d91eef3eea..c56c8210044b 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/maildrop
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.21 2005/02/13 13:19:18 ferdy Exp $
+
+*maildrop-1.8.0-r1 (13 Feb 2005)
+
+  13 Feb 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/maildrop-1.8.0-db4.patch, +maildrop-1.8.0-r1.ebuild:
+  Make maildrop use courier-authlib and clean the ebuild. Re-Closes #81391.
+  Thanks to Scott Taylor <swtaylor@gentoo.org> for the initial ebuild.
 
 *maildrop-1.8.0 (09 Feb 2005)
 
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index c57be1aec519..b53082f4cfb4 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,15 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 82c63c5d17a6b106d8d5b68f9998d2e6 maildrop-1.7.0.20040907.ebuild 3110
 MD5 9e67ce523864322ba8e622f5312b066c maildrop-1.5.2.ebuild 2531
+MD5 9aaffa69d47448061a24af1cddb1ef4e maildrop-1.8.0-r1.ebuild 3087
 MD5 3e1454badff95e0e8a01a24260f77a06 maildrop-1.4.0-r1.ebuild 1617
 MD5 5f8fb2e1e1e2e6941232e47f31d1520c maildrop-1.7.0.ebuild 2580
 MD5 e02bab1f875ba079e6e5d2ad5d267851 maildrop-1.8.0.ebuild 3322
 MD5 288de83476470795423e4631cb9c6abf maildrop-1.5.3.ebuild 2508
 MD5 e42d4d7c6fe30f0bef7229527f2da340 maildrop-1.7.0-r2.ebuild 3296
 MD5 d7d4dcd6aaeea931bfcdfb353611c171 maildrop-1.5.3-r1.ebuild 2432
-MD5 7a7b5df5761f5659bbda03689425a4eb ChangeLog 8347
+MD5 f7427aef35e9b01994c9f794720eab60 ChangeLog 8644
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 88b7f06e9f2d03007db22e431920e29c maildrop-1.7.0.20040907-r1.ebuild 3246
 MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907 77
@@ -22,13 +20,8 @@ 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 eb7acda28529a85c74150a140f143d75 files/digest-maildrop-1.8.0-r1 68
 MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
 MD5 54e776919d1cd1729e5c6c1f27c40444 files/maildrop-1.7.0-0x0B-fix.patch 525
 MD5 532cc225eb7ae73b01639168857445be files/maildrop-1.7.0-db4-bdbobj_configure.in.patch 1211
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCCnwXViELBEf1JB0RArgXAJ4nZwbCX3nEx1SdP84gZWsrqb8nWgCfRN3z
-1TXB/0eMkFpHKSrhgwc1qWw=
-=J5gE
------END PGP SIGNATURE-----
+MD5 2f8014fea76e32d9bb682d00ee5ce7c7 files/maildrop-1.8.0-db4.patch 2501
diff --git a/mail-filter/maildrop/files/digest-maildrop-1.8.0-r1 b/mail-filter/maildrop/files/digest-maildrop-1.8.0-r1
new file mode 100644
index 000000000000..70344e5442cc
--- /dev/null
+++ b/mail-filter/maildrop/files/digest-maildrop-1.8.0-r1
@@ -0,0 +1 @@
+MD5 caf59c78d6689b4cfba98d979af63407 maildrop-1.8.0.tar.bz2 2013203
diff --git a/mail-filter/maildrop/files/maildrop-1.8.0-db4.patch b/mail-filter/maildrop/files/maildrop-1.8.0-db4.patch
new file mode 100644
index 000000000000..58e871628352
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-1.8.0-db4.patch
@@ -0,0 +1,63 @@
+--- bdbobj/configure.in.orig	2001-09-18 18:26:28.000000000 -0700
++++ bdbobj/configure.in	2004-08-20 22:55:04.468505515 -0700
+@@ -21,15 +21,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.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_4002, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
++AC_CHECK_FUNC(db_create, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
+--- configure.in.orig	2004-07-26 18:36:40.000000000 -0700
++++ configure.in	2004-08-20 22:52:27.419757049 -0700
+@@ -80,18 +80,21 @@
+ 	MAILBOT=mailbot
+ 	;;
+ 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.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_4002, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
++
+ 	if test "$HAVE_BDB" != "1"
+ 	then
+-		AC_MSG_ERROR(GDBM library not found)
++		AC_MSG_ERROR(DB library not found)
+ 	fi
+ 	MAILBOT=mailbot
+ 	;;
diff --git a/mail-filter/maildrop/maildrop-1.8.0-r1.ebuild b/mail-filter/maildrop/maildrop-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..28b31592d746
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-1.8.0-r1.ebuild
@@ -0,0 +1,111 @@
+# 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-r1.ebuild,v 1.1 2005/02/13 13:19:18 ferdy Exp $
+
+inherit eutils gnuconfig
+
+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/courier/${P%%_pre}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/maildrop/"
+S="${WORKDIR}/${P%%_pre}"
+
+SLOT="0"
+LICENSE="GPL-2"
+# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
+KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
+IUSE="mysql ldap gdbm berkdb uclibc debug mysql postgres ldap"
+
+PROVIDE="virtual/mda"
+
+DEPEND="dev-lang/perl
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	!gdbm? ( berkdb? ( >=sys-libs/db-3* ) )
+	mysql? ( net-libs/courier-authlib )
+	postgres? ( net-libs/courier-authlib )
+	ldap? ( net-libs/courier-authlib )"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	virtual/mta"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+	if use gdbm ; then
+		use berkdb && einfo "Both gdbm and berkdb selected. Using gdbm."
+	else
+		if use berkdb ; then
+			epatch ${FILESDIR}/maildrop-1.8.0-db4.patch \
+				|| die "patch failed."
+			export WANT_AUTOCONF="2.5"
+			gnuconfig_update
+			libtoolize --copy --force
+			ebegin "Recreating configure."
+				autoconf || die "recreate configure failed."
+			eend $?
+			cd ${S}/bdbobj
+			libtoolize --copy --force
+			ebegin "Recreating configure in bdbobj."
+				autoconf || die "recreate configure failed."
+			eend $?
+		else
+			einfo "Building without database support"
+		fi
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	if use gdbm ; then
+		myconf="${myconf} --with-db=gdbm"
+	else
+		[ use berkdb ] &&  myconf="${myconf} --with-db=db" || \
+			myconf="${myconf} --without-db"
+	fi
+
+	myconf="${myconf} $(use_enable debug DEBUG)"
+
+	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 \
+		--cache-file=${S}/configuring.cache \
+		${myconf} || die
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README \
+		README.postfix UPGRADE maildroptips.txt
+
+	dodir /usr/share/doc/${PF}
+	mv ${D}/usr/share/maildrop/html ${D}/usr/share/doc/${PF}
+
+	dohtml {INSTALL,README,UPGRADE}.html
+
+	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
+}