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

Package-Manager: portage-2.0.51.22-r2

6 files changed, 52 insertions, 22 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/Manifest b/mail-filter/maildrop/Manifest
index 01eec53e0f5d..953f84badb51 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 572398e0dc4c55a532433635a82d1408 maildrop-1.7.0.20040907-r1.ebuild 3248
-MD5 5f6880961f0f9dbe612f2672e0cfebf3 maildrop-1.8.1-r2.ebuild 3279
+MD5 1b7667f17727f2ff5bb8b8ffa61d69e2 maildrop-1.7.0-r3.ebuild 3318
 MD5 3cbb6f6a6e1be7d2339173ab6d4a23cd maildrop-1.8.0-r3.ebuild 3642
-MD5 a9dca70c4d001c88be08a1bf90464de1 maildrop-1.8.1.20050828.ebuild 3306
+MD5 5f6880961f0f9dbe612f2672e0cfebf3 maildrop-1.8.1-r2.ebuild 3279
+MD5 6347b34195b9a30f5e3b8b38238725e2 maildrop-2.0.0.ebuild 3617
+MD5 54f986a49eb57771a0a3a9e3e9fc9c17 ChangeLog 12651
 MD5 2fc9863fa18fa7e25fedaa87a92a3c43 metadata.xml 259
-MD5 86e46157fdb088b873af327367966c6e ChangeLog 12372
-MD5 1b7667f17727f2ff5bb8b8ffa61d69e2 maildrop-1.7.0-r3.ebuild 3318
-MD5 2f8014fea76e32d9bb682d00ee5ce7c7 files/maildrop-1.8.0-db4.patch 2501
-MD5 532cc225eb7ae73b01639168857445be files/maildrop-1.7.0-db4-bdbobj_configure.in.patch 1211
-MD5 54e776919d1cd1729e5c6c1f27c40444 files/maildrop-1.7.0-0x0B-fix.patch 525
+MD5 572398e0dc4c55a532433635a82d1408 maildrop-1.7.0.20040907-r1.ebuild 3248
+MD5 6c7f94803aeb7b2d4e434d84dc6452de files/maildrop-2.0.0-fix-maildir_la.patch 455
+MD5 7449f2af2083ee2e518794c2e0c53402 files/digest-maildrop-2.0.0 68
+MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907-r1 77
 MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0-r3 68
-MD5 d3ff5b0605f18ab7671174933686ead8 files/digest-maildrop-1.8.1.20050828 77
+MD5 72eeead0d2cb72de0ee2571af5c63bd5 files/maildrop-1.7.0-db4-configure.in.patch 1290
 MD5 eb7acda28529a85c74150a140f143d75 files/digest-maildrop-1.8.0-r3 68
-MD5 e7efb3052fe6605244b78179990197f0 files/maildrop-1.8.1-disable-fam.patch 2511
 MD5 7e45a27e2694fb9f4d62724fb0ad25f8 files/digest-maildrop-1.8.1-r2 68
-MD5 72eeead0d2cb72de0ee2571af5c63bd5 files/maildrop-1.7.0-db4-configure.in.patch 1290
 MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
-MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907-r1 77
+MD5 e7efb3052fe6605244b78179990197f0 files/maildrop-1.8.1-disable-fam.patch 2511
+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 2f8014fea76e32d9bb682d00ee5ce7c7 files/maildrop-1.8.0-db4.patch 2501
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDK0cgLLFUmVNQ7rkRAsyJAKDU62rjQLfuJ6/YJmwjwqrF6rSrhACePp0d
-8ZqJ9xNxcDDYvGR6lMdibxk=
-=cH1b
+iD8DBQFDL9ziViELBEf1JB0RAo0/AJ9pdb7cFUAvHm5wDeQ4zVTNnd3qWQCbBPHh
+auLx5VOzY4aGuqu/DjxmhIQ=
+=orKc
 -----END PGP SIGNATURE-----
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/ \