version bump. removing development version. add alias to trusted users wrt bug #105230

(Portage version: 2.0.51.22-r2)

5 files changed, 35 insertions, 6 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 0a8e73074e71..9d624b5539a1 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,14 @@
 # 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.43 2005/09/16 22:27:58 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.44 2005/09/20 09:56:14 ferdy Exp $
+
+*maildrop-2.0.0 (20 Sep 2005)
+
+  20 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/maildrop-2.0.0-fix-maildir_la.patch,
+  -maildrop-1.8.1.20050828.ebuild, +maildrop-2.0.0.ebuild:
+  version bump. removing development version. add alias to trusted users wrt
+  bug #105230
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/mail-filter/maildrop/files/digest-maildrop-1.8.1.20050828 b/mail-filter/maildrop/files/digest-maildrop-1.8.1.20050828
deleted file mode 100644
index 56869ddb4356..000000000000
--- a/mail-filter/maildrop/files/digest-maildrop-1.8.1.20050828
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fdeba7c2edda14ca47c7276f02a1694 maildrop-1.8.1.20050828.tar.bz2 2101380
diff --git a/mail-filter/maildrop/files/digest-maildrop-2.0.0 b/mail-filter/maildrop/files/digest-maildrop-2.0.0
new file mode 100644
index 000000000000..f04bd9c85dff
--- /dev/null
+++ b/mail-filter/maildrop/files/digest-maildrop-2.0.0
@@ -0,0 +1 @@
+MD5 fc134b638430b7da41f4cdd984cf27a8 maildrop-2.0.0.tar.bz2 2103007
diff --git a/mail-filter/maildrop/files/maildrop-2.0.0-fix-maildir_la.patch b/mail-filter/maildrop/files/maildrop-2.0.0-fix-maildir_la.patch
new file mode 100644
index 000000000000..3dfb5e767469
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-2.0.0-fix-maildir_la.patch
@@ -0,0 +1,10 @@
+--- Makefile.am.old	2005-09-20 11:04:53.000000000 +0200
++++ Makefile.am	2005-09-20 11:04:37.000000000 +0200
+@@ -48,6 +48,7 @@
+ 	maildirshared.c maildirshared2.c maildirdelfolder.c\
+ 	maildirquota.c maildirquota.h maildirrequota.c maildirrequota.h \
+ 	maildirwatch.c maildirwatch.h loginexec.c loginexec.h
++libmaildir_la_LDFLAGS=@LIBPCRE@
+ 
+ noinst_PROGRAMS=deliverquota maildirmake testmaildirfilter maildirkwtest \
+ 	maildirkw maildiracl maildiraclttest
diff --git a/mail-filter/maildrop/maildrop-1.8.1.20050828.ebuild b/mail-filter/maildrop/maildrop-2.0.0.ebuild
index 6106244be8c6..0da510beacc9 100644
--- a/mail-filter/maildrop/maildrop-1.8.1.20050828.ebuild
+++ b/mail-filter/maildrop/maildrop-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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.20050828.ebuild,v 1.5 2005/09/15 10:59:49 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.0.0.ebuild,v 1.1 2005/09/20 09:56:14 ferdy Exp $
 
 inherit eutils gnuconfig
 
@@ -32,7 +32,8 @@ DEPEND="!mail-mta/courier
 			>=sys-libs/db-3
 			~sys-devel/autoconf-2.59
 		)
-	)"
+	)
+	>=sys-devel/automake-1.9.3"
 
 RDEPEND="${DEPEND}
 	dev-lang/perl"
@@ -44,6 +45,13 @@ src_unpack() {
 	# Do not use lazy bindings on /usr/bin/maildrop
 	sed -i -e 's~^maildrop_LDFLAGS =~& -Wl,-z,now~g' maildrop/Makefile.in
 
+	# Fix libpcre linking in maildir/
+	cd ${S}/maildir
+	epatch ${FILESDIR}/${P}-fix-maildir_la.patch
+	aclocal || die "aclocal failed (maildir)"
+	WANT_AUTOMAKE=1.9.3 automake --foreign || die "automake failed (maildir)"
+	cd ${S}
+
 	# Be nice with uclibc also
 	use elibc_uclibc && sed -i -e 's~linux-gnu\*~& | linux-uclibc~' config.sub
 
@@ -58,13 +66,14 @@ src_unpack() {
 	fi
 
 	if ! use fam ; then
-		epatch ${FILESDIR}/${P%.*}-disable-fam.patch
+		epatch ${FILESDIR}/${PN}-1.8.1-disable-fam.patch
 		cd ${S}/maildir
 		WANT_AUTOCONF=2.59 autoconf || die "recreate configure failed (maildir)"
 	fi
 
 	# Only recreate configure if needed
 	if ! use fam || { ! use gdbm && use berkdb ; } ; then
+		cd ${S}
 		gnuconfig_update
 		libtoolize --copy --force
 		WANT_AUTOCONF=2.59 autoconf || die "recreate configure failed (topdir)"
@@ -73,6 +82,8 @@ src_unpack() {
 
 src_compile() {
 	local myconf
+	local mytrustedusers="apache dspam root mail \
+		daemon postmaster qmaild mmdf vmail alias"
 
 	if use gdbm ; then
 		myconf="${myconf} --with-db=gdbm"
@@ -96,7 +107,7 @@ src_compile() {
 		--enable-maildirquota \
 		--enable-use-dotlock=1 \
 		--enable-restrict-trusted=1 \
-		--enable-trusted-users='apache dspam root mail daemon postmaster qmaild mmdf vmail' \
+		--enable-trusted-users="${mytrustedusers}" \
 		--enable-maildrop-uid=root \
 		--enable-maildrop-gid=mail \
 		--with-default-maildrop=./.maildir/ \