Add support for app-emacs/vm.

svn path=/emacs-overlay/; revision=1116

5 files changed, 154 insertions, 13 deletions

diff --git a/app-emacs/mairix/ChangeLog b/app-emacs/mairix/ChangeLog
index e7b77bb..682aaf0 100644
--- a/app-emacs/mairix/ChangeLog
+++ b/app-emacs/mairix/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mairix-20080714-r1 (27 Jun 2008)
+
+  27 Jul 2008; Ulrich Mueller <ulm@gentoo.org>
+  files/mairix-20080714-info-dir-entry.patch,
+  +files/mairix-20080714-vm-gentoo.patch, -mairix-20080714.ebuild,
+  +mairix-20080714-r1.ebuild:
+  Add support for app-emacs/vm.
+
+*mairix-20080714 (27 Jun 2008)
+
   27 Jul 2008; Ulrich Mueller <ulm@gentoo.org> +files/50mairix-gentoo.el,
   +files/mairix-20080714-info-dir-entry.patch, +metadata.xml,
   +mairix-20080714.ebuild:
diff --git a/app-emacs/mairix/Manifest b/app-emacs/mairix/Manifest
index ad32a24..f1fa4df 100644
--- a/app-emacs/mairix/Manifest
+++ b/app-emacs/mairix/Manifest
@@ -1,6 +1,7 @@
 AUX 50mairix-gentoo.el 383 RMD160 0a8b8f5c4a3fb08c8ce30d52600e83faa67c8f81 SHA1 e6056c8309efb37915c0e1238c3c8e4da4da488a SHA256 cd07f0fc25331b6ae16d4af901bada42bb9eeb5916e8a257834eca0000992003
-AUX mairix-20080714-info-dir-entry.patch 428 RMD160 e80377cbd3a7467fcbce51d36aca589d70f311f3 SHA1 f56a0fa2447f3a95ca0adbd727b8b4f5d8911bb0 SHA256 117d672b70bd094ca2e77d5eea42e6a39286c2a4a68113a1e80a77622b48db58
+AUX mairix-20080714-info-dir-entry.patch 326 RMD160 76c131471e0f9a5b160f645afc1b708b911320af SHA1 3edc11a460a969f61cc6a0cf778e2ada57fcda71 SHA256 6f74fb520867a128c9a966cb387cb8138759ab0a68b51abef2bfbc2d3a7f1209
+AUX mairix-20080714-vm-gentoo.patch 5138 RMD160 66c765c481e9dd332ff51eb56c6457ae0b966910 SHA1 084d354277ece8036fed67ac4a55db39ed083d06 SHA256 f5a42b1b292dc1318c8c94ad8f2c527aadd4bc34211b3c203dc7dada031d7251
 DIST mairix-20080714.tar.bz2 13706 RMD160 bb56c8f9ffe14d969732efa8350990b3eb7448a1 SHA1 3ebdb13348acc5eee68b4fc88ebd6a3252df58f3 SHA256 99739ef3290c145bc9500827d046705291e2d5b8f2dcfe67de1a7ea1cab5231f
-EBUILD mairix-20080714.ebuild 611 RMD160 8f8793970b870488681f5e31290826ee4bd6732f SHA1 5ea1d82e997607f632708735b350aa3c6062b2f1 SHA256 afd7355e41bbb8924933bd3bb2c71ffe4a21f410b54a16ee755adc09ce9d57f6
-MISC ChangeLog 325 RMD160 216234496ee94fba8b2418992217ff5c7a01fa8e SHA1 886a7de306a1e26896ab586c5dd27c29e5548cf3 SHA256 d0acb6e49336ce3559d972208751a93a99fd01a8296f5ac92f176855f10c6ddd
+EBUILD mairix-20080714-r1.ebuild 717 RMD160 0ef2b65331328481551976f420b6b17b26a84c63 SHA1 8653f584364b615b0937bc6069ce70bee09fe270 SHA256 fd6e05453458780b5631f9befd5168c41cde0b466019fdf89d3fe5be6d5dba57
+MISC ChangeLog 615 RMD160 ed65da969214a9a179dc26e08f6ba6b9351570f8 SHA1 8c3d21892671524e3b97f519ef713ce57aa28145 SHA256 b617ebcdcc838b5b4a8b7bd3a4b209497519f954a73647044f2ae7223d46963f
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-emacs/mairix/files/mairix-20080714-info-dir-entry.patch b/app-emacs/mairix/files/mairix-20080714-info-dir-entry.patch
index 8a5ead6..c3748be 100644
--- a/app-emacs/mairix/files/mairix-20080714-info-dir-entry.patch
+++ b/app-emacs/mairix/files/mairix-20080714-info-dir-entry.patch
@@ -1,14 +1,14 @@
---- mairix-el.info~	2008-07-14 22:12:12.000000000 +0200
-+++ mairix-el.info	2008-07-27 07:17:55.000000000 +0200
-@@ -13,6 +13,11 @@
-      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-      02111-1307, USA.
+--- mairix-el.texi~	2008-07-14 22:12:14.000000000 +0200
++++ mairix-el.texi	2008-07-27 07:37:07.000000000 +0200
+@@ -20,6 +20,11 @@
+ @end quotation
+ @end copying
  
-+INFO-DIR-SECTION Emacs
-+START-INFO-DIR-ENTRY
++@dircategory Emacs
++@direntry
 +* mairix.el: (mairix-el).	Mairix interface for Emacs.
-+END-INFO-DIR-ENTRY
++@end direntry
 +
- 
- File: mairix-el.info,  Node: Top,  Next: About mairix and mairix.el,  Up: (dir)
+ @titlepage
+ @title mairix.el - Mairix interface for Emacs
  
diff --git a/app-emacs/mairix/files/mairix-20080714-vm-gentoo.patch b/app-emacs/mairix/files/mairix-20080714-vm-gentoo.patch
new file mode 100644
index 0000000..61fb0f2
--- /dev/null
+++ b/app-emacs/mairix/files/mairix-20080714-vm-gentoo.patch
@@ -0,0 +1,124 @@
+--- mairix.el~	2008-07-14 22:10:34.000000000 +0200
++++ mairix.el	2008-07-27 12:56:44.000000000 +0200
+@@ -26,7 +26,8 @@
+ ;; Features of mairix.el:
+ ;;
+ ;; * Query mairix with a search term.
+-;; * Currently supported Emacs mail programs: RMail and Gnus (mbox only).
++;; * Currently supported Emacs mail programs: RMail, Gnus (mbox only),
++;;   and VM.
+ ;; * Generate search queries using graphical widgets.
+ ;; * Generate search queries based on currently displayed mail.
+ ;; * Save regularly used searches in your .emacs customize section.
+@@ -42,10 +43,10 @@
+ ;; has more features and is better integrated with Gnus.  This
+ ;; interface is essentially a stripped down version of nnmairix.el.
+ ;;
+-;; Currently, RMail and Gnus (with mbox files) are supported as mail
+-;; programs, but it is pretty easy to interface it with other ones as
+-;; well.  Please see the docs and the source for details.  In a
+-;; nutshell: include your favourite mail program in
++;; Currently, RMail, Gnus (with mbox files), and VM are supported as
++;; mail programs, but it is pretty easy to interface it with other
++;; ones as well.  Please see the docs and the source for details.
++;; In a nutshell: include your favourite mail program in
+ ;; `mairix-mail-program' and write functions for
+ ;; `mairix-display-functions' and `mairix-get-mail-header-functions'.
+ ;; If you have written such functions for your Emacs mail program of
+@@ -142,15 +143,17 @@
+ 
+ (defcustom mairix-mail-program 'rmail
+   "Mail program used to display search results.
+-Currently RMail and Gnus (mbox) are supported.  If you use Gnus
++Currently RMail, Gnus (mbox), and VM are supported.  If you use Gnus
+ with maildir, use nnmairix.el instead."
+   :type '(choice (const :tag "RMail" rmail)
+-		 (const :tag "Gnus mbox" gnus))
++		 (const :tag "Gnus mbox" gnus)
++		 (const :tag "VM" vm))
+   :group 'mairix)
+ 
+ (defcustom mairix-display-functions
+   '((rmail mairix-rmail-display)
+-    (gnus mairix-gnus-ephemeral-nndoc))
++    (gnus mairix-gnus-ephemeral-nndoc)
++    (vm mairix-vm-display))
+   "Specifies which function should be called for displaying search results.
+ This is an alist where each entry consists of a symbol from
+ `mairix-mail-program' and the corresponding function for
+@@ -162,7 +165,8 @@
+ 
+ (defcustom mairix-get-mail-header-functions
+   '((rmail mairix-rmail-fetch-field)
+-    (gnus mairix-gnus-fetch-field))
++    (gnus mairix-gnus-fetch-field)
++    (vm mairix-vm-fetch-field))
+   "Specifies function for obtaining a header field from the current mail.
+ This is an alist where each entry consists of a symbol from
+ `mairix-mail-program' and the corresponding function for
+@@ -286,6 +290,36 @@
+     (gnus-summary-toggle-header 1)
+     (message-field-value field)))
+ 
++;;; VM
++
++(eval-when-compile
++  (require 'vm nil t)
++  (require 'vm-folder nil t)
++  (require 'vm-macro nil t)
++  (require 'vm-misc nil t)
++  (require 'vm-summary nil t))
++
++;; Display function
++(defun mairix-vm-display (folder)
++  "Display mbox file FOLDER with VM."
++  (require 'vm)
++  ;; check if folder is already open and if so, kill it
++  (let ((buf (get-file-buffer folder)))
++    (when buf
++      (set-buffer buf)
++      (set-buffer-modified-p nil)
++      (kill-buffer nil)))
++  (vm-visit-folder folder 'read-only))
++
++;; Fetching mail header field
++(defun mairix-vm-fetch-field (field)
++  "Get mail header FIELD for current message using VM."
++  (save-excursion
++    (vm-select-folder-buffer)
++    (vm-check-for-killed-summary)
++    (vm-error-if-folder-empty)
++    (vm-get-header-contents
++     (car (vm-select-marked-or-prefixed-messages 1)) field)))
+ 
+ ;;;; Main interactive functions
+ 
+--- mairix-el.texi~	2008-07-27 07:37:07.000000000 +0200
++++ mairix-el.texi	2008-07-27 12:54:16.000000000 +0200
+@@ -83,9 +83,10 @@
+ widgets, similar to a customization buffer.
+ 
+ Currently, @code{mairix.el} is only tested with mbox output together
+-with RMail or Gnus as the Emacs mail program.  However, it should also
+-work with Maildir or MH, and it should be very easy to integrate other
+-Emacs mail programs into @code{mairix.el} (@pxref{Extending mairix.el}).
++with RMail, Gnus, or VM as the Emacs mail program.  However, it should
++also work with Maildir or MH, and it should be very easy to integrate
++other Emacs mail programs into @code{mairix.el}
++(@pxref{Extending mairix.el}).
+ 
+ If you use Gnus with maildir or MH, you should really use the native
+ Gnus back end @code{nnmairix} instead, since it is more tightly
+@@ -154,9 +155,9 @@
+ mairix.el.  The most important items are @emph{Mairix File Path},
+ @emph{Mairix Search File} and @emph{Mairix Mail Program}.  The latter
+ specifies which mail program should be used to display the mairix search
+-results.  Currently, RMail and Gnus with mbox files are supported.  If
+-you use Gnus with maildir or mh, use the native Gnus back end nnmairix
+-instead.
++results.  Currently, RMail, Gnus with mbox files, and VM are supported.
++If you use Gnus with maildir or mh, use the native Gnus back end
++nnmairix instead.
+ 
+ If you use another Emacs mail program which is not yet supported by
+ mairix.el, it is pretty easy to integrate it.  @xref{Extending
diff --git a/app-emacs/mairix/mairix-20080714.ebuild b/app-emacs/mairix/mairix-20080714-r1.ebuild
index 49ba4ff..0bd3b5e 100644
--- a/app-emacs/mairix/mairix-20080714.ebuild
+++ b/app-emacs/mairix/mairix-20080714-r1.ebuild
@@ -22,6 +22,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-info-dir-entry.patch"
+	epatch "${FILESDIR}/${P}-vm-gentoo.patch"
+}
+
+src_compile() {
+	elisp_src_compile
+	makeinfo mairix-el.texi
 }
 
 src_install() {