diff options
author | Fabian Groffen <grobian@gentoo.org> | 2006-03-18 12:13:43 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2006-03-18 12:13:43 +0000 |
commit | 31e85c9a43d86b75f495aa2bb266d02eebc4d39c (patch) | |
tree | 67cfe09ced2d54607d3bd63e8480ab259373e445 /mail-client/muttng | |
parent | Marked ~ppc-macos (diff) | |
download | gentoo-2-31e85c9a43d86b75f495aa2bb266d02eebc4d39c.tar.gz gentoo-2-31e85c9a43d86b75f495aa2bb266d02eebc4d39c.tar.bz2 gentoo-2-31e85c9a43d86b75f495aa2bb266d02eebc4d39c.zip |
Adding a new snapshot with some homebrewn bugfixes. Removing anchient snapshots. Adding ~ppc-macos keyword.
(Portage version: 2.1_pre5-r1)
Diffstat (limited to 'mail-client/muttng')
-rw-r--r-- | mail-client/muttng/ChangeLog | 14 | ||||
-rw-r--r-- | mail-client/muttng/Manifest | 33 | ||||
-rw-r--r-- | mail-client/muttng/files/digest-muttng-20050809-r1 | 1 | ||||
-rw-r--r-- | mail-client/muttng/files/digest-muttng-20050814 | 3 | ||||
-rw-r--r-- | mail-client/muttng/files/digest-muttng-20060309 | 3 | ||||
-rw-r--r-- | mail-client/muttng/files/muttng-20050809-nodoc.patch | 14 | ||||
-rw-r--r-- | mail-client/muttng/files/muttng-20060309-break_thread.patch | 13 | ||||
-rw-r--r-- | mail-client/muttng/files/muttng-20060309-nodoc.patch | 11 | ||||
-rw-r--r-- | mail-client/muttng/files/muttng-20060309-smarttime.patch | 123 | ||||
-rw-r--r-- | mail-client/muttng/files/muttng-20060309-statusbar_length.patch | 14 | ||||
-rw-r--r-- | mail-client/muttng/muttng-20050809-r1.ebuild | 156 | ||||
-rw-r--r-- | mail-client/muttng/muttng-20060309.ebuild (renamed from mail-client/muttng/muttng-20050814.ebuild) | 47 |
12 files changed, 220 insertions, 212 deletions
diff --git a/mail-client/muttng/ChangeLog b/mail-client/muttng/ChangeLog index 87c24d893ba7..108212fe5dab 100644 --- a/mail-client/muttng/ChangeLog +++ b/mail-client/muttng/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for mail-client/muttng # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.14 2006/02/14 22:13:13 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.15 2006/03/18 12:13:42 grobian Exp $ + +*muttng-20060309 (18 Mar 2006) + + 18 Mar 2006; Fabian Groffen <grobian@gentoo.org> + -files/muttng-20050809-nodoc.patch, + +files/muttng-20060309-break_thread.patch, + +files/muttng-20060309-nodoc.patch, + +files/muttng-20060309-smarttime.patch, + +files/muttng-20060309-statusbar_length.patch, -muttng-20050809-r1.ebuild, + -muttng-20050814.ebuild, +muttng-20060309.ebuild: + Adding a new snapshot with some homebrewn bugfixes. Removing anchient + snapshots. Adding ~ppc-macos keyword. 14 Feb 2006; Fabian Groffen <grobian@gentoo.org> muttng-20060212.ebuild: remove accidental ppc-macos keyword: it's not ready yet diff --git a/mail-client/muttng/Manifest b/mail-client/muttng/Manifest index 90b335a1edc8..67548368dc79 100644 --- a/mail-client/muttng/Manifest +++ b/mail-client/muttng/Manifest @@ -1,27 +1,30 @@ MD5 c664e4ca545fa39d603e2a048faaac9d ChangeLog 2625 RMD160 cda5e1344e1c78bf85231185ebb648e765aa48d2 ChangeLog 2625 SHA256 dc26e6de5cf1c8a63c1e07bb02980e48cbafb413016e5df5aaccaf7c7e54a9be ChangeLog 2625 -MD5 04627fce26bec87a8f2ff9a601b92a3a files/digest-muttng-20050809-r1 68 -RMD160 cd7a71d5ffce10bd799bf41197027c371b8de395 files/digest-muttng-20050809-r1 68 -SHA256 4777194fe87c71d06a25c47764f249a1d7446e3bf5cb91dfb006d0a7c0ba77da files/digest-muttng-20050809-r1 68 -MD5 de7bb37cc8104137a915965cbe542b51 files/digest-muttng-20050814 250 -RMD160 e27a71cfe8d8adcf6c9703184bac4b862ece5a03 files/digest-muttng-20050814 250 -SHA256 3a2fd42295cb26b3516f71a18e260db038813d5fd56d1a3b0f8d8f7a0e01a344 files/digest-muttng-20050814 250 MD5 bd54bd286ea38a392d06d9f2dcaebbf1 files/digest-muttng-20060212 250 RMD160 f5937103f1591cc596adeffd16533b46fff92de9 files/digest-muttng-20060212 250 SHA256 412bbe4aa846e0686601a0e9b360e2f95b6b68806f91666bf503b810347cafed files/digest-muttng-20060212 250 -MD5 7f8dd20237497b4bba89df29f400bd6d files/muttng-20050809-nodoc.patch 566 -RMD160 6ba03c9c4fed74f4f398bf8b875dd652a5f42854 files/muttng-20050809-nodoc.patch 566 -SHA256 9b6c9ca6563db4db23bf56a76fdc7017ce708ab0c4bccd92796c87f9bec937f2 files/muttng-20050809-nodoc.patch 566 +MD5 671bed51cc0241195b83035bda561573 files/digest-muttng-20060309 250 +RMD160 7eb42190f22ec6981831ddcfd465e0bd8f0c5fe9 files/digest-muttng-20060309 250 +SHA256 09967931e6b1c1bc408544d8e2210579bc080d934207666e483876de4fe928ba files/digest-muttng-20060309 250 +MD5 c21325b42cf2c622ab52c80de5521fe0 files/muttng-20060309-break_thread.patch 437 +RMD160 649315818212db525833557b6c1db83601196bc4 files/muttng-20060309-break_thread.patch 437 +SHA256 5a0b5b7e6ba41d7c7aa3b7aaf27d7c89af4801ae4b7548c7564b7af1a333e474 files/muttng-20060309-break_thread.patch 437 +MD5 773e2d1ebb9519fb4c8e84d99cd0c214 files/muttng-20060309-nodoc.patch 478 +RMD160 4094dc10a297e4d65e4d13233f4c0640dc76db74 files/muttng-20060309-nodoc.patch 478 +SHA256 0a76b63c30a893b82ab34b12f9d6f096479fdbd73d4449f62f1a8adb96c1940b files/muttng-20060309-nodoc.patch 478 +MD5 8a929ad66fdad47209a98f4335f7ae98 files/muttng-20060309-smarttime.patch 3709 +RMD160 5754effa0ee52e4260f32d80f8f830dc835e9c20 files/muttng-20060309-smarttime.patch 3709 +SHA256 97d7dc7611e178bd220f730de1b090b9a7654f0a835bccb780a9b71b80665b64 files/muttng-20060309-smarttime.patch 3709 +MD5 f9b88fa28c766dcc15f27ded3bf7f892 files/muttng-20060309-statusbar_length.patch 549 +RMD160 4cf9bb0c64d1adda69ad836e46d6ea053e9f3bdd files/muttng-20060309-statusbar_length.patch 549 +SHA256 f2c2e6651f14e0aa488d028673417b1531a4dcef0e5d66c37f3af6501c39b399 files/muttng-20060309-statusbar_length.patch 549 MD5 856e89d80001e53a31845405dfef7f03 metadata.xml 227 RMD160 616aff994f5c341874112505920241b3d4d9cbfa metadata.xml 227 SHA256 1c5377e37b9c43ed35a6528e7240e31408fa418ee710e571afe23e37a132e09c metadata.xml 227 -MD5 20afb0657c04992fd2b17c3504dca569 muttng-20050809-r1.ebuild 4523 -RMD160 496c0ea55f960f676597e6c5a8b3e0569b301299 muttng-20050809-r1.ebuild 4523 -SHA256 fa4fb87c8d4d9bd784467c4c1d8d23126dc66184147dbb7bd028135bb250dfad muttng-20050809-r1.ebuild 4523 -MD5 158aab7d2451ef38376663f4958975ca muttng-20050814.ebuild 4491 -RMD160 59f212187b20b33ef115922c70e4c7d64fcde2cb muttng-20050814.ebuild 4491 -SHA256 3c3799911f312bf8b80a8a63d3201d686f4e6f94d6951aad299228cdff4ef282 muttng-20050814.ebuild 4491 MD5 1a3c7fb2529f4cb38e84a520615bb919 muttng-20060212.ebuild 4224 RMD160 35393a854fbf9c0a7c2b13257873bb215977bb0d muttng-20060212.ebuild 4224 SHA256 145501566aee5e68bbc65d8c8c2590468fadda75d41e503b33694a9349f629a5 muttng-20060212.ebuild 4224 +MD5 f31a6c7214cd3611181c4594d1168f72 muttng-20060309.ebuild 4556 +RMD160 9c955df3adcd3f2acd33c0c7513ccb1084310778 muttng-20060309.ebuild 4556 +SHA256 10f2931863eeca95bccd0e495e2ad819b1285c9b8a7670c6812901bec2d77a34 muttng-20060309.ebuild 4556 diff --git a/mail-client/muttng/files/digest-muttng-20050809-r1 b/mail-client/muttng/files/digest-muttng-20050809-r1 deleted file mode 100644 index 7fd4b4b91975..000000000000 --- a/mail-client/muttng/files/digest-muttng-20050809-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 cff8c65d17ca2f0da52cc84b3eae1031 muttng-20050809.tar.gz 2448668 diff --git a/mail-client/muttng/files/digest-muttng-20050814 b/mail-client/muttng/files/digest-muttng-20050814 deleted file mode 100644 index 817aa6be64d1..000000000000 --- a/mail-client/muttng/files/digest-muttng-20050814 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b45c7d17043b14e4aa0b331b9b2cc50a muttng-20050814.tar.gz 2472447 -RMD160 d2ac84effda350e82021d5d4fa25cc3c980a8b78 muttng-20050814.tar.gz 2472447 -SHA256 f4425c5cc594ceeb4eb47c7965aa3f6802f7be2a86581aa0921e04a8b886cb61 muttng-20050814.tar.gz 2472447 diff --git a/mail-client/muttng/files/digest-muttng-20060309 b/mail-client/muttng/files/digest-muttng-20060309 new file mode 100644 index 000000000000..3419493e8eb9 --- /dev/null +++ b/mail-client/muttng/files/digest-muttng-20060309 @@ -0,0 +1,3 @@ +MD5 ce7976a03d02c1f324cd1e3586f284a7 muttng-20060309.tar.gz 2733534 +RMD160 c84f9727fefe131fa6ba78f824f4bdad4578fe34 muttng-20060309.tar.gz 2733534 +SHA256 d1820c7d48487736f910dded1f130c0f23ce0248d8cb16ed37eebd9c44cae7f6 muttng-20060309.tar.gz 2733534 diff --git a/mail-client/muttng/files/muttng-20050809-nodoc.patch b/mail-client/muttng/files/muttng-20050809-nodoc.patch deleted file mode 100644 index f89a8c18c9fc..000000000000 --- a/mail-client/muttng/files/muttng-20050809-nodoc.patch +++ /dev/null @@ -1,14 +0,0 @@ -sgml2html from sgmltools-lite fails miserably trying to build the -documentation. Just skip it for now... - ---- muttng-20050809/doc/Makefile.in.nodoc 2005-08-06 14:07:10.000000000 -0400 -+++ muttng-20050809/doc/Makefile.in 2005-08-10 16:50:11.000000000 -0400 -@@ -62,7 +62,7 @@ - topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ - UPGRADING README NEWS TODO TODO.mutt-ng README.SSL - --all: muttng.1 muttrc.man try-html try-txt -+all: muttng.1 muttrc.man - - try-html: ../makedoc$(EXEEXT) - test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ diff --git a/mail-client/muttng/files/muttng-20060309-break_thread.patch b/mail-client/muttng/files/muttng-20060309-break_thread.patch new file mode 100644 index 000000000000..3be2cc7c05a1 --- /dev/null +++ b/mail-client/muttng/files/muttng-20060309-break_thread.patch @@ -0,0 +1,13 @@ +Index: thread.c +=================================================================== +--- thread.c (revision 791) ++++ thread.c (working copy) +@@ -1271,7 +1271,7 @@ + { + mutt_free_list (&hdr->env->in_reply_to); + mutt_free_list (&hdr->env->references); +- hdr->env->irt_changed = hdr->env->refs_changed = 1; ++ hdr->env->irt_changed = hdr->env->refs_changed = hdr->changed = 1; + clean_references (hdr->thread, hdr->thread->child); + } + diff --git a/mail-client/muttng/files/muttng-20060309-nodoc.patch b/mail-client/muttng/files/muttng-20060309-nodoc.patch new file mode 100644 index 000000000000..55c9bc3e10bc --- /dev/null +++ b/mail-client/muttng/files/muttng-20060309-nodoc.patch @@ -0,0 +1,11 @@ +--- Makefile.in ++++ Makefile.in +@@ -365,7 +365,7 @@ + @BUILD_POP_TRUE@POP_INCLUDES = -I$(top_srcdir)/pop + @BUILD_NNTP_TRUE@NNTP_SUBDIR = nntp + @BUILD_NNTP_TRUE@NNTP_INCLUDES = -I$(top_srcdir)/nntp +-SUBDIRS = m4 po intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR) ++SUBDIRS = m4 po intl contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR) + bin_SCRIPTS = muttngbug fleang + BUILT_SOURCES = keymap_defs.h patchlist.c version.h + muttng_SOURCES = $(BUILT_SOURCES) \ diff --git a/mail-client/muttng/files/muttng-20060309-smarttime.patch b/mail-client/muttng/files/muttng-20060309-smarttime.patch new file mode 100644 index 000000000000..c367c0b0c588 --- /dev/null +++ b/mail-client/muttng/files/muttng-20060309-smarttime.patch @@ -0,0 +1,123 @@ +Index: hdrline.c +=================================================================== +--- hdrline.c (revision 790) ++++ hdrline.c (working copy) +@@ -302,11 +302,11 @@ + case '(': + case '<': + +- /* preprocess $date_format to handle %Z */ ++ /* preprocess $date_format to handle %Z and %Q,%q */ + { + const char *cp; +- struct tm *tm; +- time_t T; ++ struct tm *tm, *TM; ++ time_t t, T; + + p = dest; + +@@ -318,6 +318,29 @@ + else + do_locales = 1; + ++ if (do_locales && Locale) ++ setlocale (LC_TIME, Locale); ++ ++ tm = alloca(sizeof(struct tm)); ++ if (op == '[' || op == 'D') ++ tm = localtime_r (&hdr->date_sent, tm); ++ else if (op == '(') ++ tm = localtime_r (&hdr->received, tm); ++ else if (op == '<') { ++ T = time (NULL); ++ tm = localtime_r (&T, tm); ++ } ++ else { ++ /* restore sender's time zone */ ++ T = hdr->date_sent; ++ if (hdr->zoccident) ++ T -= (hdr->zhours * 3600 + hdr->zminutes * 60); ++ else ++ T += (hdr->zhours * 3600 + hdr->zminutes * 60); ++ tm = gmtime_r (&T, tm); ++ } ++ t = mktime (tm); ++ + len = destlen - 1; + while (len > 0 && (((op == 'd' || op == 'D') && *cp) || + (op == '{' && *cp != '}') || +@@ -335,6 +358,40 @@ + } + else + break; /* not enough space left */ ++ } else if (*cp == 'Q' || *cp == 'q') { ++ T = time (NULL); ++ TM = localtime (&T); ++ ++ if (len < 6) ++ break; /* not enough space left */ ++ ++ /* figure out what the date format should be: ++ * if the message is in the future: treat as if it were in ++ * the past ++ * if the message was within the last 12 hours: "%k:%M " ++ * if the message was within the last 7 days: "%a-%d" ++ * if the message was within the last 12 months: "%d-%b" ++ * if the message is older than a year: "%b-%y" ++ */ ++ ++ if (t > T) /* future: reverse */ ++ t -= 2 * (t - T); ++ ++ if (t > T - 43200) { /* 12 hours */ ++ sprintf (p, "%s", "%H:%M "); ++ p += 1; ++ len -= 1; ++ } else if (t >= T - 518400) { /* 6 days */ ++ sprintf (p, "%s", "%a-%d"); ++ } else if (((TM->tm_year - tm->tm_year) * 12 + TM->tm_mon) - ++ tm->tm_mon < 12) ++ { /* last 11 months */ ++ sprintf (p, "%s", "%d-%b"); ++ } else { /* older than a year */ ++ sprintf (p, "%s", "%b-%y"); ++ } ++ p += 5; ++ len -= 5; + } + else { + if (len >= 2) { +@@ -354,27 +411,6 @@ + } + *p = 0; + +- if (do_locales && Locale) +- setlocale (LC_TIME, Locale); +- +- if (op == '[' || op == 'D') +- tm = localtime (&hdr->date_sent); +- else if (op == '(') +- tm = localtime (&hdr->received); +- else if (op == '<') { +- T = time (NULL); +- tm = localtime (&T); +- } +- else { +- /* restore sender's time zone */ +- T = hdr->date_sent; +- if (hdr->zoccident) +- T -= (hdr->zhours * 3600 + hdr->zminutes * 60); +- else +- T += (hdr->zhours * 3600 + hdr->zminutes * 60); +- tm = gmtime (&T); +- } +- + strftime (buf2, sizeof (buf2), dest, tm); + + if (do_locales) +@@ -751,3 +787,4 @@ + mutt_FormatString (dest, destlen, s, hdr_format_str, (unsigned long) &hfi, + flags); + } ++/* vim:set expandtab sw=2 ts=2: */ diff --git a/mail-client/muttng/files/muttng-20060309-statusbar_length.patch b/mail-client/muttng/files/muttng-20060309-statusbar_length.patch new file mode 100644 index 000000000000..0f409bf2966c --- /dev/null +++ b/mail-client/muttng/files/muttng-20060309-statusbar_length.patch @@ -0,0 +1,14 @@ +Index: status.c +=================================================================== +--- status.c (revision 791) ++++ status.c (working copy) +@@ -316,6 +316,8 @@ + * if we have enough space for buffer, format lines to $COLS-$SidebarWidth + * only to not wrap past end of screen + */ +- mutt_FormatString (buf, (COLS-SW)>len?len:(COLS-SW), p, status_format_str, ++ int width = COLS - SW; ++ mutt_FormatString (buf, (width >= len ? len : (width + 1)), ++ p, status_format_str, + (unsigned long) menu, 0); + } diff --git a/mail-client/muttng/muttng-20050809-r1.ebuild b/mail-client/muttng/muttng-20050809-r1.ebuild deleted file mode 100644 index 717dc77cd041..000000000000 --- a/mail-client/muttng/muttng-20050809-r1.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/muttng-20050809-r1.ebuild,v 1.5 2005/08/12 02:35:43 agriffis Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="mutt-ng -- fork of mutt with added features" -HOMEPAGE="http://www.muttng.org/" -SRC_URI="http://nion.modprobe.de/mutt-ng/snapshots/${P}.tar.gz" -IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl slang smime ssl" # smtp -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~sparc" -RDEPEND="nls? ( sys-devel/gettext ) - >=sys-libs/ncurses-5.2 - idn? ( net-dns/libidn ) - qdbm? ( dev-db/qdbm ) - !qdbm? ( - gdbm? ( sys-libs/gdbm ) - !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) - ) - slang? ( >=sys-libs/slang-1.4.2 ) - imap? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - pop? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - gpgme? ( >=app-crypt/gpgme-0.9.0 )" - # smtp? ( net-libs/libesmtp ) -DEPEND="${RDEPEND} - sys-devel/automake - >=sys-devel/autoconf-2.5 - net-mail/mailbase" - -src_unpack() { - unpack ${P}.tar.gz && cd ${S} || die "unpack failed" - - # disable sgml conversion since it fails with sgml2html - epatch ${FILESDIR}/muttng-20050809-nodoc.patch - - aclocal -I m4 || die "aclocal failed" - autoheader || die "autoheader failed" - emake -C m4 -f Makefile.am.in || die "emake in m4 failed" - automake --foreign || die "automake failed" - WANT_AUTOCONF=2.5 autoconf || die "autoconf failed" -} - -src_compile() { - declare myconf=" - $(use_enable nls) \ - $(use_enable gpgme) \ - $(use_enable imap) \ - $(use_enable pop) \ - $(use_enable crypt pgp) \ - $(use_enable smime) \ - $(use_enable cjk default-japanese) \ - $(use_enable debug) \ - $(use_enable nntp) \ - $(use_with idn) \ - --disable-libesmtp \ - --enable-compressed \ - --sysconfdir=/etc/${PN} \ - --with-docdir=/usr/share/doc/${PN}-${PVR} \ - --with-regex \ - --disable-fcntl --enable-flock --enable-nfs-fix \ - --with-mixmaster \ - --without-sasl \ - --enable-external-dotlock" -# $(use_with smtp libesmtp) \ - - # muttng prioritizes qdbm over gdbm, so we will too. - # hcache feature requires at least one database is in USE. - if use qdbm; then - myconf="${myconf} --enable-hcache \ - --with-qdbm --without-gdbm --without-bdb" - elif use gdbm; then - myconf="${myconf} --enable-hcache \ - --with-gdbm --without-qdbm --without-bdb" - elif use berkdb; then - myconf="${myconf} --enable-hcache \ - --with-bdb --without-gdbm --without-qdbm" - else - myconf="${myconf} --disable-hcache \ - --without-gdbm --without-qdbm --without-bdb" - fi - - # there's no need for gnutls or ssl without either pop or imap. - # in fact mutt's configure will bail if you do: - # --without-pop --without-imap --with-ssl - if use pop || use imap; then - if use gnutls; then - myconf="${myconf} --with-gnutls" - elif use ssl; then - myconf="${myconf} --with-ssl" - fi - # not sure if this should be mutually exclusive with the other two - myconf="${myconf} $(use_with sasl sasl2)" - else - myconf="${myconf} --without-gnutls --without-ssl --without-sasl2" - fi - - # See Bug #11170 - case ${ARCH} in - alpha|ppc) replace-flags "-O[3-9]" "-O2" ;; - esac - - if use buffysize; then - ewarn "USE=buffy-size is just a workaround. Disable it if you don't need it." - myconf="${myconf} --enable-buffy-size" - fi - - if use slang; then - myconf="${myconf} --with-slang" - ewarn "If you want a transparent background, merge ${PN} with USE=-slang." - else - # --without-slang doesn't work; - # specify --with-curses if you don't want slang - # (26 Sep 2001 agriffis) - myconf="${myconf} --with-curses" - fi - - if use mbox; then - myconf="${myconf} --with-mailpath=/var/spool/mail" - else - myconf="${myconf} --with-homespool=Maildir" - fi - - econf ${myconf} - emake || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die "install failed" - find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip - if use mbox; then - insinto /etc/muttng - newins ${FILESDIR}/Muttngrc.mbox Muttngrc - else - insinto /etc/muttng - doins ${FILESDIR}/Muttngrc - fi - - dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION -} - -pkg_postinst() { - echo - einfo "NOTE: muttng is still under heavy development" - einfo "If you find a bug please report at http://bugs.gentoo.org" - echo -} diff --git a/mail-client/muttng/muttng-20050814.ebuild b/mail-client/muttng/muttng-20060309.ebuild index 70fa2c77cde9..62a0073f973a 100644 --- a/mail-client/muttng/muttng-20050814.ebuild +++ b/mail-client/muttng/muttng-20060309.ebuild @@ -1,16 +1,16 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/muttng-20050814.ebuild,v 1.2 2006/02/14 22:13:13 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/muttng-20060309.ebuild,v 1.1 2006/03/18 12:13:43 grobian Exp $ inherit eutils flag-o-matic DESCRIPTION="mutt-ng -- fork of mutt with added features" HOMEPAGE="http://www.muttng.org/" SRC_URI="http://nion.modprobe.de/mutt-ng/snapshots/${P}.tar.gz" -IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl slang smime smtp ssl" +IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl slang smime smtp ssl doc" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~sparc" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86" RDEPEND="nls? ( sys-devel/gettext ) >=sys-libs/ncurses-5.2 idn? ( net-dns/libidn ) @@ -31,23 +31,33 @@ RDEPEND="nls? ( sys-devel/gettext ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) - gpgme? ( >=app-crypt/gpgme-0.9.0 )" + gpgme? ( >=app-crypt/gpgme-0.9.0 ) + doc? ( + www-client/lynx + dev-libs/libxslt + app-text/htmltidy + app-text/openjade + app-text/tetex + )" DEPEND="${RDEPEND} sys-devel/automake >=sys-devel/autoconf-2.5 net-mail/mailbase" src_unpack() { - unpack ${P}.tar.gz && cd ${S} || die "unpack failed" - - # disable sgml conversion since it fails with sgml2html - epatch ${FILESDIR}/muttng-20050809-nodoc.patch - - aclocal -I m4 || die "aclocal failed" - autoheader || die "autoheader failed" - emake -C m4 -f Makefile.am.in || die "emake in m4 failed" - automake --foreign || die "automake failed" - WANT_AUTOCONF=2.5 autoconf || die "autoconf failed" + unpack ${A} || die "unpack failed" + cd "${S}" + epatch "${FILESDIR}/${P}-smarttime.patch" + epatch "${FILESDIR}/${P}-break_thread.patch" + epatch "${FILESDIR}/${P}-statusbar_length.patch" + + use doc || epatch "${FILESDIR}/${P}-nodoc.patch" + +# aclocal -I m4 || die "aclocal failed" +# autoheader || die "autoheader failed" +# emake -C m4 -f Makefile.am.in || die "emake in m4 failed" +# automake --foreign || die "automake failed" +# WANT_AUTOCONF=2.5 autoconf || die "autoconf failed" } src_compile() { @@ -136,15 +146,8 @@ src_compile() { src_install() { make DESTDIR=${D} install || die "install failed" find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip - if use mbox; then - insinto /etc/muttng - newins ${FILESDIR}/Muttngrc.mbox Muttngrc - else - insinto /etc/muttng - doins ${FILESDIR}/Muttngrc - fi - dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION + dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO } pkg_postinst() { |