Tidy, removed unnecessary patch.

4 files changed, 8 insertions, 219 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 692e5d6267f0..31c69d820cf5 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,10 @@
 # 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.5 2004/08/05 19:54:48 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.6 2004/08/05 20:22:20 slarti Exp $
+
+  05 Aug 2004; Tom Martin <slarti@gentoo.org> -files/maildrop-1.7.0-db3.patch,
+  maildrop-1.7.0.ebuild:
+  Tidy; removed epatch as it seems to be unnecessary.
 
 *maildrop-1.7.0 (05 Aug 2004)
 
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 2806db1c96a6..f6b94669666a 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,14 +1,13 @@
 MD5 fb31c25d1d61faf8f4defab191ab24b4 maildrop-1.5.2.ebuild 2548
 MD5 f8e475410c508e77c0cf9dc29cc47c4b maildrop-1.4.0-r1.ebuild 1634
-MD5 3822984e93674cf5532e63f319a8e9de maildrop-1.7.0.ebuild 2710
+MD5 2d790a783db928dc98a5726f4172a541 maildrop-1.7.0.ebuild 2607
 MD5 02359a95f5fd8598379aa92aee334f61 maildrop-1.5.3.ebuild 2525
 MD5 4248dcfe4907ba9b2247bd2736b82513 maildrop-1.5.3-r1.ebuild 2467
-MD5 aef1db8ad9254c7dc8695e8f8ba4ee86 ChangeLog 5614
+MD5 6890c3b061f1f5b3c29b9b92d3bc6ae0 ChangeLog 5773
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 a0e238f4cd5c4a52dfb06754051b6dfe files/digest-maildrop-1.5.2 67
 MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3 67
 MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0 68
-MD5 80d5477c591d4bfdea9a3e2295af3c8e files/maildrop-1.7.0-db3.patch 6935
 MD5 953fc332e6ec019b91dba0b85d9745e9 files/digest-maildrop-1.4.0-r1 66
 MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3-r1 67
 MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
diff --git a/mail-filter/maildrop/files/maildrop-1.7.0-db3.patch b/mail-filter/maildrop/files/maildrop-1.7.0-db3.patch
deleted file mode 100644
index c649f85d106b..000000000000
--- a/mail-filter/maildrop/files/maildrop-1.7.0-db3.patch
+++ /dev/null
@@ -1,207 +0,0 @@
---- configure	2003-10-30 00:24:54.000000000 +0000
-+++ configure	2004-03-14 20:47:39.382752947 +0000
-@@ -2914,13 +2914,13 @@
- 
- 	if test "$db" = ""
- 	then
--		echo "$as_me:$LINENO: checking for dbopen in -ldb" >&5
--echo $ECHO_N "checking for dbopen in -ldb... $ECHO_C" >&6
-+		echo "$as_me:$LINENO: checking for dbopen in -ldb-3" >&5
-+echo $ECHO_N "checking for dbopen in -ldb-3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_dbopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb-3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -2971,13 +2971,13 @@
- if test $ac_cv_lib_db_dbopen = yes; then
-    :
- else
--  echo "$as_me:$LINENO: checking for db_open in -ldb" >&5
--echo $ECHO_N "checking for db_open in -ldb... $ECHO_C" >&6
-+  echo "$as_me:$LINENO: checking for db_open in -ldb-3" >&5
-+echo $ECHO_N "checking for db_open in -ldb-3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_db_open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb-3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -3028,13 +3028,13 @@
- if test $ac_cv_lib_db_db_open = yes; then
-    :
- else
--  echo "$as_me:$LINENO: checking for db_env_create in -ldb" >&5
--echo $ECHO_N "checking for db_env_create in -ldb... $ECHO_C" >&6
-+  echo "$as_me:$LINENO: checking for db_env_create in -ldb-3" >&5
-+echo $ECHO_N "checking for db_env_create in -ldb-3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_db_env_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb-3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -3483,13 +3483,13 @@
- 	MAILBOT=mailbot
- 	;;
- db)
--	echo "$as_me:$LINENO: checking for dbopen in -ldb" >&5
--echo $ECHO_N "checking for dbopen in -ldb... $ECHO_C" >&6
-+	echo "$as_me:$LINENO: checking for dbopen in -ldb-3" >&5
-+echo $ECHO_N "checking for dbopen in -ldb-3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_dbopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb-3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -3538,15 +3538,15 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_db_dbopen" >&5
- echo "${ECHO_T}$ac_cv_lib_db_dbopen" >&6
- if test $ac_cv_lib_db_dbopen = yes; then
--   LIBDB=-ldb ; LIBS="-ldb $LIBS"
-+   LIBDB=-ldb-3 ; LIBS="-ldb-3 $LIBS"
- else
--  echo "$as_me:$LINENO: checking for db_open in -ldb" >&5
--echo $ECHO_N "checking for db_open in -ldb... $ECHO_C" >&6
-+  echo "$as_me:$LINENO: checking for db_open in -ldb-3" >&5
-+echo $ECHO_N "checking for db_open in -ldb-3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_db_open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb-3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -3595,15 +3595,15 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_db_db_open" >&5
- echo "${ECHO_T}$ac_cv_lib_db_db_open" >&6
- if test $ac_cv_lib_db_db_open = yes; then
--   LIBDB=-ldb ; LIBS="-ldb $LIBS"
-+   LIBDB=-ldb-3 ; LIBS="-ldb-3 $LIBS"
- else
--  echo "$as_me:$LINENO: checking for db_env_create in -ldb" >&5
--echo $ECHO_N "checking for db_env_create in -ldb... $ECHO_C" >&6
-+  echo "$as_me:$LINENO: checking for db_env_create in -ldb-3" >&5
-+echo $ECHO_N "checking for db_env_create in -ldb-3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_db_env_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb-3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -3652,7 +3652,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_db_db_env_create" >&5
- echo "${ECHO_T}$ac_cv_lib_db_db_env_create" >&6
- if test $ac_cv_lib_db_db_env_create = yes; then
--   LIBDB=-ldb; LIBS="-ldb $LIBS"
-+   LIBDB=-ldb-3; LIBS="-ldb-3 $LIBS"
- fi
- 
- 
-@@ -3891,8 +3891,8 @@
- 
- 	if test "$HAVE_BDB" != "1"
- 	then
--		{ { echo "$as_me:$LINENO: error: GDBM library not found" >&5
--echo "$as_me: error: GDBM library not found" >&2;}
-+		{ { echo "$as_me:$LINENO: error: DB library not found" >&5
-+echo "$as_me: error: DB library not found" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 	MAILBOT=mailbot
---- bdbobj/configure	2003-04-24 06:30:09.000000000 +0100
-+++ bdbobj/configure	2004-03-14 20:42:13.012527928 +0000
-@@ -3892,13 +3892,13 @@
- 
- 
- saveLIBS="$LIBS"
--echo "$as_me:$LINENO: checking for dbopen in -ldb" >&5
--echo $ECHO_N "checking for dbopen in -ldb... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for dbopen in -ldb-3" >&5
-+echo $ECHO_N "checking for dbopen in -ldb-3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_dbopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb-3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -3947,15 +3947,15 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_db_dbopen" >&5
- echo "${ECHO_T}$ac_cv_lib_db_dbopen" >&6
- if test $ac_cv_lib_db_dbopen = yes; then
--   LIBDB=-ldb ; LIBS="-ldb $LIBS"
-+   LIBDB=-ldb-3 ; LIBS="-ldb-3 $LIBS"
- else
--  echo "$as_me:$LINENO: checking for db_open in -ldb" >&5
--echo $ECHO_N "checking for db_open in -ldb... $ECHO_C" >&6
-+  echo "$as_me:$LINENO: checking for db_open in -ldb-3" >&5
-+echo $ECHO_N "checking for db_open in -ldb-3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_db_open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb-3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -4004,7 +4004,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_db_db_open" >&5
- echo "${ECHO_T}$ac_cv_lib_db_db_open" >&6
- if test $ac_cv_lib_db_db_open = yes; then
--   LIBDB=-ldb ; LIBS="-ldb $LIBS"
-+   LIBDB=-ldb-3 ; LIBS="-ldb-3 $LIBS"
- else
-   echo "$as_me:$LINENO: checking for db_env_create in -ldb" >&5
- echo $ECHO_N "checking for db_env_create in -ldb... $ECHO_C" >&6
-@@ -4012,7 +4012,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb-3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -4061,7 +4061,7 @@
- echo "$as_me:$LINENO: result: $ac_cv_lib_db_db_env_create" >&5
- echo "${ECHO_T}$ac_cv_lib_db_db_env_create" >&6
- if test $ac_cv_lib_db_db_env_create = yes; then
--   LIBDB=-ldb; LIBS="-ldb $LIBS"
-+   LIBDB=-ldb-3; LIBS="-ldb-3 $LIBS"
- fi
- 
- 
---- bdbobj/bdbobj.h	1999-12-06 13:13:46.000000000 +0000
-+++ bdbobj/bdbobj.h	2004-03-14 20:32:29.672154565 +0000
-@@ -18,7 +18,7 @@
- #include	<limits.h>
- #endif
- 
--#include	<db.h>
-+#include	<db3/db.h>
- #include	<stdlib.h>
- 
- #ifdef	__cplusplus
diff --git a/mail-filter/maildrop/maildrop-1.7.0.ebuild b/mail-filter/maildrop/maildrop-1.7.0.ebuild
index df64ac536660..e9f0133fb35a 100644
--- a/mail-filter/maildrop/maildrop-1.7.0.ebuild
+++ b/mail-filter/maildrop/maildrop-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2004/08/05 19:54:48 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0.ebuild,v 1.2 2004/08/05 20:22:20 slarti Exp $
 
 IUSE="mysql ldap gdbm berkdb"
 
@@ -8,7 +8,6 @@ inherit flag-o-matic
 filter-flags -funroll-loops
 filter-flags -fomit-frame-pointer
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
 HOMEPAGE="http://www.flounder.net/~mrsam/maildrop/index.html"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -25,12 +24,6 @@ DEPEND="dev-lang/perl
 	ldap? ( >=net-nds/openldap-2.0.23 )"
 PROVIDE="virtual/mda"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/maildrop-1.7.0-db3.patch
-}
-
 src_compile() {
 	local myconf
 	use mysql \