diff options
| author |   Torsten Veller <tove@gentoo.org> | 2009-10-26 10:34:18 +0000 |
|---|---|---|
| committer | Torsten Veller <tove@gentoo.org> | 2009-10-26 10:34:18 +0000 |
| commit | 66d2c9e9bb70b68387fa499f68e25810511fd110 (patch) | |
| tree | 27e150f00839b1f7a8aa4aa22258f81206f1ba7d /mail-filter | |
| parent | x11-proto/fixesproto: sync with overlay, update deps (diff) | |
| download | gentoo-2-66d2c9e9bb70b68387fa499f68e25810511fd110.tar.gz gentoo-2-66d2c9e9bb70b68387fa499f68e25810511fd110.tar.bz2 gentoo-2-66d2c9e9bb70b68387fa499f68e25810511fd110.zip | |
Add support for db-4.8 too
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'mail-filter')
| -rw-r--r-- | mail-filter/maildrop/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-filter/maildrop/files/maildrop-2.2.0-db4.patch | 67 | ||||
| -rw-r--r-- | mail-filter/maildrop/maildrop-2.2.0.ebuild | 4 |
3 files changed, 74 insertions, 3 deletions
diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog index ac79ac1ff323..c3861f243fb0 100644 --- a/mail-filter/maildrop/ChangeLog +++ b/mail-filter/maildrop/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-filter/maildrop # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.86 2009/10/20 10:57:16 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.87 2009/10/26 10:34:18 tove Exp $ + + 26 Oct 2009; Torsten Veller <tove@gentoo.org> maildrop-2.2.0.ebuild, + +files/maildrop-2.2.0-db4.patch: + Add support for db-4.8 too 20 Oct 2009; Torsten Veller <tove@gentoo.org> maildrop-2.0.4.ebuild: Parallel make fails (#247716) diff --git a/mail-filter/maildrop/files/maildrop-2.2.0-db4.patch b/mail-filter/maildrop/files/maildrop-2.2.0-db4.patch new file mode 100644 index 000000000000..f70b23ee67a8 --- /dev/null +++ b/mail-filter/maildrop/files/maildrop-2.2.0-db4.patch @@ -0,0 +1,67 @@ +--- maildrop/bdbobj/configure.in ++++ maildrop/bdbobj/configure.in +@@ -23,15 +23,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.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 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, 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) + + LIBS="$saveLIBS" + +--- maildrop/configure.in ++++ maildrop/configure.in +@@ -99,21 +99,24 @@ + USE_GDBM=1 + ;; + 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.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 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, HAVE_BDB=1) ++ 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) ++ + if test "$HAVE_BDB" != "1" + then +- AC_MSG_ERROR(GDBM library not found) ++ AC_MSG_ERROR(DB library not found) + fi + dblibrary=bdbobj/libbdbobj.la +- USE_GDBM=0 ++ USE_DB=1 + ;; + *) + ;; diff --git a/mail-filter/maildrop/maildrop-2.2.0.ebuild b/mail-filter/maildrop/maildrop-2.2.0.ebuild index d40387abb763..bc69865052dc 100644 --- a/mail-filter/maildrop/maildrop-2.2.0.ebuild +++ b/mail-filter/maildrop/maildrop-2.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.2.0.ebuild,v 1.1 2009/06/29 19:20:35 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.2.0.ebuild,v 1.2 2009/10/26 10:34:18 tove Exp $ EAPI=2 @@ -44,7 +44,7 @@ src_prepare() { if use gdbm ; then use berkdb && elog "Both gdbm and berkdb selected. Using gdbm." elif use berkdb ; then - epatch "${FILESDIR}"/${PN}-2.1.0-db4.patch + epatch "${FILESDIR}"/${PN}-2.2.0-db4.patch fi if ! use fam ; then |