| 1 |
commit: d2639702a4386c7b0d8bb19e32f5ad6c740022d5 |
| 2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 22 19:02:12 2015 +0000 |
| 4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 22 19:02:12 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2639702 |
| 7 |
|
| 8 |
mail-filter/maildrop: fix building with -fam USE flag |
| 9 |
|
| 10 |
Gentoo-Bug: 561184 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.21 |
| 13 |
|
| 14 |
.../maildrop/files/maildrop-disable-fam.patch | 54 ++++++++++++++++++++++ |
| 15 |
mail-filter/maildrop/maildrop-2.8.3.ebuild | 5 +- |
| 16 |
2 files changed, 56 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/mail-filter/maildrop/files/maildrop-disable-fam.patch b/mail-filter/maildrop/files/maildrop-disable-fam.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..fb8a5dd |
| 21 |
--- /dev/null |
| 22 |
+++ b/mail-filter/maildrop/files/maildrop-disable-fam.patch |
| 23 |
@@ -0,0 +1,54 @@ |
| 24 |
+--- configure.ac 2005-05-12 16:45:57.000000000 +0200 |
| 25 |
++++ configure.ac 2005-09-10 20:05:28.000000000 +0200 |
| 26 |
+@@ -145,6 +145,7 @@ |
| 27 |
+ --enable-tempdir=.tmp directory for temp files (in user's home dir) |
| 28 |
+ --disable-tempdir disable temp files in home directory (use |
| 29 |
+ the tmpfile function) |
| 30 |
++ --disable-fam disable libfam.a for maildir operations |
| 31 |
+ --enable-smallmsg=8192 size of buffer for small messages |
| 32 |
+ --enable-global-timeout=300 global watchdog timer (seconds) |
| 33 |
+ --enable-crlf-term=0 enable <CR><LF> line termination |
| 34 |
+--- libs/maildir/configure.ac 2005-03-21 13:11:24.000000000 +0100 |
| 35 |
++++ libs/maildir/configure.ac 2005-09-10 20:10:55.000000000 +0200 |
| 36 |
+@@ -58,26 +58,30 @@ |
| 37 |
+ AC_STRUCT_TM |
| 38 |
+ |
| 39 |
+ dnl Checks for library functions. |
| 40 |
+-AC_CHECK_HEADER(fam.h, :, :) |
| 41 |
+-AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes) |
| 42 |
+-AC_CHECK_LIB(fam, FAMOpen, [ |
| 43 |
++AC_ARG_ENABLE(fam, [ --disable-fam Do not use libfam.a library.]) |
| 44 |
++if test x$enableval = xyes |
| 45 |
++then |
| 46 |
++ AC_CHECK_HEADER(fam.h, :, :) |
| 47 |
++ AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes) |
| 48 |
++ AC_CHECK_LIB(fam, FAMOpen, [ |
| 49 |
+ LIBFAM=-lfam |
| 50 |
+ AC_DEFINE_UNQUOTED(HAVE_FAM,1, |
| 51 |
+ [ Whether libfam.a is available ]) |
| 52 |
+ |
| 53 |
+ AC_CHECK_HEADER(fam.h, : , [ |
| 54 |
+-AC_MSG_WARN([[The development header files and libraries for fam,]]) |
| 55 |
+-AC_MSG_WARN([[the File Alteration Monitor, are not installed.]]) |
| 56 |
+-AC_MSG_WARN([[You appear to have the FAM runtime libraries installed,]]) |
| 57 |
+-AC_MSG_WARN([[so you need to simply install the additional development]]) |
| 58 |
+-AC_MSG_WARN([[package for your operating system.]]) |
| 59 |
+-AC_MSG_ERROR([[FAM development libraries not found.]]) ] |
| 60 |
++ AC_MSG_WARN([[The development header files and libraries for fam,]]) |
| 61 |
++ AC_MSG_WARN([[the File Alteration Monitor, are not installed.]]) |
| 62 |
++ AC_MSG_WARN([[You appear to have the FAM runtime libraries installed,]]) |
| 63 |
++ AC_MSG_WARN([[so you need to simply install the additional development]]) |
| 64 |
++ AC_MSG_WARN([[package for your operating system.]]) |
| 65 |
++ AC_MSG_ERROR([[FAM development libraries not found.]]) ] |
| 66 |
+ ) |
| 67 |
+ ]) |
| 68 |
+ |
| 69 |
+-AC_SUBST(LIBFAM) |
| 70 |
++ AC_SUBST(LIBFAM) |
| 71 |
+ |
| 72 |
+-echo "$LIBFAM" >maildir.libdeps |
| 73 |
++ echo "$LIBFAM" >maildir.libdeps |
| 74 |
++fi |
| 75 |
+ |
| 76 |
+ AC_CACHE_CHECK([for missing gethostname prototype],maildir_cv_SYS_GETHOSTNAME, |
| 77 |
+ |
| 78 |
|
| 79 |
diff --git a/mail-filter/maildrop/maildrop-2.8.3.ebuild b/mail-filter/maildrop/maildrop-2.8.3.ebuild |
| 80 |
index afc63ac..34635b8 100644 |
| 81 |
--- a/mail-filter/maildrop/maildrop-2.8.3.ebuild |
| 82 |
+++ b/mail-filter/maildrop/maildrop-2.8.3.ebuild |
| 83 |
@@ -50,18 +50,17 @@ src_prepare() { |
| 84 |
# Prefer gdbm over berkdb |
| 85 |
if use gdbm ; then |
| 86 |
use berkdb && elog "Both gdbm and berkdb selected. Using gdbm." |
| 87 |
- elif use berkdb ; then |
| 88 |
- epatch "${FILESDIR}"/${PN}-2.5.1-db.patch |
| 89 |
fi |
| 90 |
|
| 91 |
if ! use fam ; then |
| 92 |
- epatch "${FILESDIR}"/${PN}-1.8.1-disable-fam.patch |
| 93 |
+ epatch "${FILESDIR}"/${PN}-disable-fam.patch |
| 94 |
fi |
| 95 |
|
| 96 |
# no need to error out if no default - it will be given to econf anyway |
| 97 |
sed -i -e \ |
| 98 |
's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \ |
| 99 |
"${S}"/libs/maildrop/configure.ac || die "sed failed" |
| 100 |
+ |
| 101 |
epatch "${FILESDIR}"/${PN}-testsuite-r2.patch |
| 102 |
eautoreconf |
| 103 |
} |
Archives