fix use usage and fix bug #100055

(Portage version: 2.0.51.22-r2)

4 files changed, 129 insertions, 18 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index aed0611e3ffb..73c2665a4739 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,12 @@
 # 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.35 2005/07/13 17:15:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.36 2005/07/29 23:36:57 ferdy Exp $
+
+*maildrop-1.8.1-r1 (29 Jul 2005)
+
+  29 Jul 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +maildrop-1.8.1-r1.ebuild:
+  fix use usage and fix bug #100055
 
   13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
   maildrop-1.8.0-r3.ebuild:
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 66466f481660..29633a84fae8 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,25 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c71faf0b35dcfca332e5252de482b7b2 ChangeLog 10898
+MD5 bc1ce34ad190af8b0fab3622619c2d3b maildrop-1.8.1-r1.ebuild 2963
+MD5 d38fa8827146c4d9aba5df9dbf538c7d maildrop-1.8.1.ebuild 3270
 MD5 1b7667f17727f2ff5bb8b8ffa61d69e2 maildrop-1.7.0-r3.ebuild 3318
-MD5 572398e0dc4c55a532433635a82d1408 maildrop-1.7.0.20040907-r1.ebuild 3248
 MD5 3cbb6f6a6e1be7d2339173ab6d4a23cd maildrop-1.8.0-r3.ebuild 3642
+MD5 c71faf0b35dcfca332e5252de482b7b2 ChangeLog 10898
 MD5 2fc9863fa18fa7e25fedaa87a92a3c43 metadata.xml 259
-MD5 d38fa8827146c4d9aba5df9dbf538c7d maildrop-1.8.1.ebuild 3270
-MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0-r3 68
+MD5 572398e0dc4c55a532433635a82d1408 maildrop-1.7.0.20040907-r1.ebuild 3248
+MD5 7e45a27e2694fb9f4d62724fb0ad25f8 files/digest-maildrop-1.8.1 68
 MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907-r1 77
+MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0-r3 68
+MD5 72eeead0d2cb72de0ee2571af5c63bd5 files/maildrop-1.7.0-db4-configure.in.patch 1290
 MD5 eb7acda28529a85c74150a140f143d75 files/digest-maildrop-1.8.0-r3 68
+MD5 7e45a27e2694fb9f4d62724fb0ad25f8 files/digest-maildrop-1.8.1-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
-MD5 72eeead0d2cb72de0ee2571af5c63bd5 files/maildrop-1.7.0-db4-configure.in.patch 1290
 MD5 2f8014fea76e32d9bb682d00ee5ce7c7 files/maildrop-1.8.0-db4.patch 2501
-MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
-MD5 7e45a27e2694fb9f4d62724fb0ad25f8 files/digest-maildrop-1.8.1 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1Uxhj5H05b2HAEkRAqCFAKClBMywEazVXT64wYgC3YXLWl0KjgCgoWlp
-IPlAs62zBU5BGWnA6w0YwCI=
-=/tLX
------END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/files/digest-maildrop-1.8.1-r1 b/mail-filter/maildrop/files/digest-maildrop-1.8.1-r1
new file mode 100644
index 000000000000..a58f5fb55245
--- /dev/null
+++ b/mail-filter/maildrop/files/digest-maildrop-1.8.1-r1
@@ -0,0 +1 @@
+MD5 da7b312da069f8bacf7388804e0d7cc3 maildrop-1.8.1.tar.bz2 2014670
diff --git a/mail-filter/maildrop/maildrop-1.8.1-r1.ebuild b/mail-filter/maildrop/maildrop-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..982a7dddbe15
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-1.8.1-r1.ebuild
@@ -0,0 +1,112 @@
+# 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.1-r1.ebuild,v 1.1 2005/07/29 23:36:57 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"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="mysql ldap gdbm berkdb debug postgres"
+
+PROVIDE="virtual/mda"
+
+DEPEND="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"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Do not use lazy bindings on /usr/bin/maildrop
+	sed -i -e 's~^maildrop_LDFLAGS =~& -Wl,-z,now~g' maildrop/Makefile.in
+
+	# Be nice with uclibc also
+	use elibc_uclibc && sed -i -e 's~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
+			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"
+	elif use berkdb ; then
+		myconf="${myconf} --with-db=db"
+	else
+		myconf="${myconf} --without-db"
+	fi
+
+	if ! use mysql && ! use postgres && ! use ldap ; then
+		myconf="${myconf} --disable-authlib"
+	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' \
+		--enable-maildrop-uid=root \
+		--enable-maildrop-gid=mail \
+		--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
+
+	fperms 4755 /usr/bin/maildrop
+
+	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
+}