Fix build failure with texinfo-5.1, bug 464312. Specify LICENSE more precisely. Remove old.

(Portage version: 2.1.11.60/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

13 files changed, 275 insertions, 320 deletions

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index a300f9a03f12..1d9431f67378 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emacs/vm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.98 2012/07/29 17:14:56 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.99 2013/04/04 21:17:46 ulm Exp $
+
+  04 Apr 2013; Ulrich Müller <ulm@gentoo.org> vm-7.19-r4.ebuild,
+  -vm-8.0.12-r6.ebuild, -files/vm-8.0.12-autoload-vm-pine.patch,
+  -files/vm-8.0.12-charset-displayable.patch, -files/vm-8.0.12-emacs-23.patch,
+  -files/vm-8.0.12-folder-corruption.patch,
+  -files/vm-8.0.12-supercite-yank-1.patch, -vm-8.1.0.ebuild, -vm-8.1.1.ebuild,
+  vm-8.1.2.ebuild, vm-8.2.0_beta.ebuild, +files/vm-8.2.0_beta-texinfo-5.patch:
+  Fix build failure with texinfo-5.1, bug 464312. Specify LICENSE more
+  precisely. Remove old.
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> vm-7.19-r4.ebuild,
   vm-8.0.12-r6.ebuild, vm-8.1.0.ebuild, vm-8.1.1.ebuild, vm-8.1.2.ebuild,
diff --git a/app-emacs/vm/files/vm-8.0.12-autoload-vm-pine.patch b/app-emacs/vm/files/vm-8.0.12-autoload-vm-pine.patch
deleted file mode 100644
index 34051e44db67..000000000000
--- a/app-emacs/vm/files/vm-8.0.12-autoload-vm-pine.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vm-8.0.12-orig/lisp/vm-pine.el	2008-11-05 21:04:35.000000000 +0100
-+++ vm-8.0.12/lisp/vm-pine.el	2008-11-09 19:05:15.000000000 +0100
-@@ -488,6 +488,7 @@
-         (error "Folder buffer closed before deletion of source message."))))
- 
- ;;-----------------------------------------------------------------------------
-+;;;###autoload
- (defun vm-decode-postponed-mime-message ()
-   "Replace the mime buttons by attachment buttons."
-   (interactive)
diff --git a/app-emacs/vm/files/vm-8.0.12-charset-displayable.patch b/app-emacs/vm/files/vm-8.0.12-charset-displayable.patch
deleted file mode 100644
index e94bf51ec5af..000000000000
--- a/app-emacs/vm/files/vm-8.0.12-charset-displayable.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix display of UTF-8 encoded messages on tty
-Gentoo patch, reported upstream:
-https://bugs.launchpad.net/viewmail/+bug/453351
-
---- vm-8.0.12-orig/lisp/vm-mime.el
-+++ vm-8.0.12/lisp/vm-mime.el
-@@ -4399,9 +4399,11 @@
-   (cond ((and vm-xemacs-mule-p (memq (device-type) '(x gtk mswindows)))
- 	 (or (vm-string-assoc name vm-mime-mule-charset-to-coding-alist)
- 	     (vm-mime-default-face-charset-p name)))
--	((and vm-fsfemacs-mule-p (memq window-system '(x mac win32 w32)))
--	 (or (vm-string-assoc name vm-mime-mule-charset-to-coding-alist)
--	     (vm-mime-default-face-charset-p name)))
-+
-+	;; vm-mime-tty-can-display-mime-charset (called below) fails
-+	;; for GNU Emacs. So keep things simple, since there's no harm
-+	;; if replacement characters are displayed.
-+	(vm-fsfemacs-mule-p)
- 	((vm-multiple-fonts-possible-p)
- 	 (or (vm-mime-default-face-charset-p name)
- 	     (vm-string-assoc name vm-mime-charset-font-alist)))
diff --git a/app-emacs/vm/files/vm-8.0.12-emacs-23.patch b/app-emacs/vm/files/vm-8.0.12-emacs-23.patch
deleted file mode 100644
index aee214333249..000000000000
--- a/app-emacs/vm/files/vm-8.0.12-emacs-23.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Fix wrong charset for outgoing mail with Emacs 23
-Gentoo patch, reported upstream:
-http://groups.google.de/group/gnu.emacs.vm.bug/msg/33d027060b6fffe6
-
---- vm-8.0.12-orig/lisp/vm-mime.el
-+++ vm-8.0.12/lisp/vm-mime.el
-@@ -1409,7 +1409,6 @@
- 
- (defvar buffer-file-coding-system)
- 
--;; TODO: integrate with the FSF's unify-8859-on-encoding-mode stuff.
- (defun vm-determine-proper-charset (beg end)
-   "Work out what MIME character set to use for sending a message.
- 
-@@ -1430,6 +1429,28 @@
- 	(if (or vm-xemacs-mule-p
- 		(and vm-fsfemacs-mule-p enable-multibyte-characters))
- 	    ;; Okay, we're on a MULE build.
-+	  (if (fboundp 'check-coding-systems-region)
-+	      ;; check-coding-systems-region appeared in GNU Emacs 23.
-+	      (let* ((preapproved (vm-get-coding-system-priorities))
-+		     (ucs-list (vm-get-mime-ucs-list))
-+		     (cant-encode (check-coding-systems-region
-+				   (point-min) (point-max)
-+				   (cons 'us-ascii preapproved))))
-+		(if (not (assq 'us-ascii cant-encode))
-+		    ;; If there are only ASCII chars, we're done.
-+		    "us-ascii"
-+		  (while (and preapproved
-+			      (assq (car preapproved) cant-encode)
-+			      (not (memq (car preapproved) ucs-list)))
-+		    (setq preapproved (cdr preapproved)))
-+		  (if preapproved
-+		      (cadr (assq (car preapproved)
-+				  vm-mime-mule-coding-to-charset-alist))
-+		    ;; None of the entries in vm-coding-system-priorities
-+		    ;; can be used. This can only happen if no universal
-+		    ;; coding system is included. Fall back to utf-8.
-+		    "utf-8")))
-+
- 	    (let ((charsets (delq 'ascii
- 				  (vm-charsets-in-region (point-min)
- 							 (point-max)))))
-@@ -1472,9 +1493,7 @@
- 				(while preapproved
- 				  (if (memq (car preapproved) ucs-list)
- 				      (throw 'done 
--					     (car (cdr (assq 
--							(vm-coding-system-name 
--							 (car preapproved))
-+					     (car (cdr (assq (car preapproved)
- 				      vm-mime-mule-coding-to-charset-alist)))))
- 				  (setq preapproved (cdr preapproved)))
- 				;; Nothing universal in the preapproved list.
-@@ -1488,8 +1507,8 @@
- 			    (when (latin-unity-maybe-remap (point-min) 
- 							   (point-max) sys 
- 							   csets psets t)
--			      (throw 'done (second (assq 
--						    (vm-coding-system-name sys)
-+			      (throw 'done
-+				     (second (assq sys
- 				    vm-mime-mule-coding-to-charset-alist)))))
- 			  (setq systems (cdr systems)))
- 			(throw 'done nil))
-@@ -1511,9 +1530,8 @@
- 			    ;; If we encounter a universal character set on
- 			    ;; the preapproved list, pass it back.
- 			    (if (memq (car preapproved) ucs-list)
--				(throw 'done (second (assq 
--						      (vm-coding-system-name
--						       (car preapproved))
-+				(throw 'done
-+				       (second (assq (car preapproved)
- 				     vm-mime-mule-coding-to-charset-alist))))
- 
- 			    ;; The preapproved entry isn't universal. Check if
-@@ -1549,15 +1567,14 @@
- 			    ;; If we encounter a universal character set on
- 			    ;; the preapproved list, pass it back.
- 			    (when (memq (car preapproved) ucs-list)
--				(throw 'done (second (assq 
--						      (vm-coding-system-name
--						       (car preapproved))
-+			      (throw 'done
-+				     (second (assq (car preapproved)
- 				     vm-mime-mule-coding-to-charset-alist))))
- 			    (setq preapproved (cdr preapproved)))))
- 		    (throw 'done nil))))
- 	       ;; Couldn't do any magic with vm-coding-system-priorities. Pass
- 	       ;; back a Japanese iso-2022 MIME character set.
--	       (t (or vm-mime-8bit-composition-charset "iso-2022-jp"))))
-+	       (t (or vm-mime-8bit-composition-charset "iso-2022-jp")))))
- 	  ;; If we're non-MULE and there are eight bit characters, use a
- 	  ;; sensible default.
- 	  (goto-char (point-min))
diff --git a/app-emacs/vm/files/vm-8.0.12-folder-corruption.patch b/app-emacs/vm/files/vm-8.0.12-folder-corruption.patch
deleted file mode 100644
index c7ba30b68e3e..000000000000
--- a/app-emacs/vm/files/vm-8.0.12-folder-corruption.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes (hopefully) a corruption of the message subject cache in X-VM-v5-Data
-http://bugs.gentoo.org/284668
-
---- vm-8.0.12-orig/lisp/vm-folder.el	2008-11-05 21:04:35.000000000 +0100
-+++ vm-8.0.12/lisp/vm-folder.el	2009-09-11 23:22:15.000000000 +0200
-@@ -1806,9 +1806,8 @@
- 	      (let ((print-escape-newlines t))
- 		(prin1-to-string attributes))
- 	      "\n\t"
--	      (vm-mime-encode-words-in-string
--	       (let ((print-escape-newlines t))
--		 (prin1-to-string cache)))
-+	      (let ((print-escape-newlines t))
-+		(prin1-to-string cache))
- 	      "\n\t"
- 	      (let ((print-escape-newlines t))
- 		(prin1-to-string (vm-labels-of m)))
diff --git a/app-emacs/vm/files/vm-8.0.12-supercite-yank-1.patch b/app-emacs/vm/files/vm-8.0.12-supercite-yank-1.patch
deleted file mode 100644
index 6a034227e569..000000000000
--- a/app-emacs/vm/files/vm-8.0.12-supercite-yank-1.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/256886
-
---- vm-8.0.12-orig/lisp/vm-reply.el	2008-11-05 21:04:35.000000000 +0100
-+++ vm-8.0.12/lisp/vm-reply.el	2009-11-03 08:14:30.000000000 +0100
-@@ -343,6 +343,12 @@
-             (vm-insert-region-from-buffer (vm-buffer-of message)
-                                           (vm-headers-of message)
-                                           (vm-text-end-of message))
-+	  (vm-insert-region-from-buffer (vm-buffer-of message)
-+					(vm-headers-of message)
-+					(vm-text-of message))
-+	  (save-excursion
-+	    (goto-char (point-min))
-+	    (vm-decode-mime-message-headers))
-           (vm-decode-mime-layout layout)
-           (if vm-mime-yank-attachments
-               (vm-decode-postponed-mime-message))))
diff --git a/app-emacs/vm/files/vm-8.2.0_beta-texinfo-5.patch b/app-emacs/vm/files/vm-8.2.0_beta-texinfo-5.patch
new file mode 100644
index 000000000000..92ea4b0df578
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.2.0_beta-texinfo-5.patch
@@ -0,0 +1,250 @@
+--- vm-8.2.0b-orig/info/vm.texinfo
++++ vm-8.2.0b/info/vm.texinfo
+@@ -914,7 +914,8 @@
+ 
+ @example
+ ``pop:@var{HOST}:@var{PORT}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
+-``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''@end example
++``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
++@end example
+ 
+ @noindent Remote mailboxes accessed by VM in this fashion are referred
+ to as @dfn{server folders} (and @dfn{@acronym{POP} folders} or @dfn{@acronym{IMAP}
+@@ -1207,8 +1208,8 @@
+  ((@var{IMAPDROP} @var{NAME}) ...)
+ @end example
+ 
+-@var{IMAPDROP} is an @acronym{IMAP} maildrop specification (@ref{maildrop
+-  specification}). 
++@var{IMAPDROP} is an @acronym{IMAP} maildrop specification
++(@ref{maildrop specification}).
+ 
+ @var{NAME} is a string that should give a less cumbersome name that you
+ will use to refer to this maildrop when using @code{vm-visit-imap-folder}.
+@@ -2814,7 +2815,7 @@
+ * @acronym{MIME} preview::        Previewing a @acronym{MIME} message before sending.
+ @end menu
+ 
+-@node @acronym{MIME} attachments, @acronym{MIME} characters, Sending @acronym{MIME} Messages, Sending @acronym{MIME} Messages, 
++@node @acronym{MIME} attachments, @acronym{MIME} characters, Sending @acronym{MIME} Messages, Sending @acronym{MIME} Messages
+ @unnumberedsec @acronym{MIME} attachments
+ 
+ @kindex C-c C-a
+@@ -2868,7 +2869,7 @@
+ before invoking this command.  All the marked messages will be
+ attached as a digest in the outgoing message.
+ 
+-@unnumberedsubsubsec Point-to-point attachment operations
++@unnumberedsubsec Point-to-point attachment operations
+ 
+ @cindex point-to-point attachment operations
+ A number of @dfn{point-to-point operations} allow you to attach objects
+@@ -3425,7 +3426,7 @@
+ works like @code{vm-delete-after-saving} but applies to the @kbd{A}
+ (@code{vm-auto-archive-messages}) command (see below).
+ 
+-@unnumberedsubsec vm-auto-folder-alist
++@unnumberedsec vm-auto-folder-alist
+ 
+ @vindex vm-auto-folder-alist
+ The variable @code{vm-auto-folder-alist} is used to specify
+@@ -3477,7 +3478,7 @@
+ always case-insensitive because the Internet message standard RFC 822
+ specifies that header names are case indistinct.
+ 
+-@unnumberedsubsec Other commands
++@unnumberedsec Other commands
+ 
+ @table @kbd
+ @findex vm-save-message-sans-headers
+@@ -5174,7 +5175,7 @@
+ been expunged in the cache folder are expunged on the server.
+ 
+ @anchor{@acronym{UIDVALIDITY}}
+-@unnumberedsubsec @acronym{UIDVALIDITY}
++@unnumberedsec @acronym{UIDVALIDITY}
+ 
+ @cindex @acronym{UIDVALIDITY}
+ Messages on an @acronym{IMAP} server have unique id numbers called UID's.
+@@ -5198,7 +5199,7 @@
+ setting the @code{vm-enable-external-messages} flag to @code{(imap)} before
+ you refresh the cache so that it will be quicker. @pxref{External Messages}.
+ 
+-@unnumberedsubsec Operations for the IMAP server
++@unnumberedsec Operations for the IMAP server
+ 
+ @cindex vm-list-imap-folders
+ The command @code{vm-list-imap-folders} lists the folders available on the
+@@ -6021,7 +6022,7 @@
+ Useful ways to customize VM.
+ @section Reading messages
+ 
+-@unnumberedsubsubsec Shrunken headers
++@unnumberedsubsec Shrunken headers
+ 
+ @cindex headers, shrunken
+ @vindex vm-enable-addons
+@@ -6045,7 +6046,7 @@
+ 
+ (This add-on was provided by Robert Fenk.)
+ 
+-@unnumberedsubsubsec @acronym{MIME} alternatives
++@unnumberedsubsec @acronym{MIME} alternatives
+ @cindex @acronym{MIME} alternatives
+ The default setting of VM for handling @acronym{MIME} alternatives is
+ @code{best-internal}, which means the best alternative that can be
+@@ -6069,7 +6070,7 @@
+ 
+ @section Saving messages and attachments
+ 
+-@unnumberedsubsubsec Auto saving attachments
++@unnumberedsubsec Auto saving attachments
+ 
+ Messages with attachments get bulky and increase the size of VM
+ folders, slowing down VM.  The functions
+@@ -6179,7 +6180,7 @@
+ @uref{http://launchpad.net/vm}.  The ``VM Development Team'' can be
+ reached here using the email address @email{vm@@lists.launchpad.net}.
+ 
+-@unnumberedsubsec Savannah project site
++@unnumberedsec Savannah project site
+ 
+ The changes made in each of the releases is described in the @samp{NEWS}
+ file, which can be found in the source code repository.  The changes made
+@@ -6197,7 +6198,7 @@
+ takes you to a page that lists various version of VM source code, and
+ gives instructions for downloading it via @samp{Bazaar} (@code{bzr}).
+ 
+-@unnumberedsubsec Technical support
++@unnumberedsec Technical support
+ 
+ VM has a dedicated usenet newsgroup @code{gnu.emacs.vm.info} and a
+ gmane newsgroup @code{gmane.emacs.viewmail}, in which the developers
+@@ -6220,7 +6221,7 @@
+ 
+ The best way to report bugs is via the Launchpad bug tacker.  See below.
+ 
+-@unnumberedsubsec Get Involved
++@unnumberedsec Get Involved
+ 
+ VM is now supported and maintained by the user community.  So, as an
+ active user, your participation is key to keep the project going.  
+@@ -6249,7 +6250,7 @@
+ and merge your branch with the main development when your changes
+ are ready.
+ 
+-@unnumberedsubsec Contributors
++@unnumberedsec Contributors
+ 
+ Contributions to the code from the following members of the VM community
+ are gratefully acknowledged:
+@@ -6276,7 +6277,7 @@
+ 
+ Please let us know if any other contributors have been missed out.
+ 
+-@unnumberedsubsec Selected Releases of Kyle Jones
++@unnumberedsec Selected Releases of Kyle Jones
+ @itemize
+ @item Version 4.10, released in 1989.
+ @item Version 5.00, released in 1990.
+@@ -6291,7 +6292,7 @@
+ @end itemize
+ 
+ 
+-@unnumberedsubsec Releases of Robert Widhopf-Fenk
++@unnumberedsec Releases of Robert Widhopf-Fenk
+ @itemize
+ @item Version 8.0.0, released 31 May, 2007.
+ @item Version 8.0.1, released 29 June, 2007.
+@@ -6311,7 +6312,7 @@
+ @end itemize
+ 
+ 
+-@unnumberedsubsec Releases of VM development team
++@unnumberedsec Releases of VM development team
+ @itemize
+ @item Version 8.1.0, released 21 March, 2010.
+ @item Version 8.1.1, released 25 April, 2010.
+@@ -6545,7 +6546,7 @@
+ @acronym{IMAP} folders.)
+ @end itemize
+ 
+-@unnumberedsubsubsec Folder variables
++@unnumberedsubsec Folder variables
+ 
+ Internal to Emacs, VM stores the folder as simply a text buffer.  However, it
+ remembers a variety of data about the message contents in the buffer
+@@ -6712,7 +6713,7 @@
+ undoing cycle.
+ @end itemize
+ 
+-@unnumberedsubsubsec vm-folder-access-data
++@unnumberedsubsec vm-folder-access-data
+ 
+ The variable @code{vm-folder-access-data} is a vector storing data about the
+ state of the mail server (for @acronym{POP} and @acronym{IMAP} servers).  It contains the
+--- vm-8.2.0b-orig/info/vm-pcrisis.texinfo
++++ vm-8.2.0b/info/vm-pcrisis.texinfo
+@@ -1179,7 +1179,7 @@
+ 
+ @c ***************************************************************************
+ 
+-@unnumberedsubsec vmpc-auto-profiles-file
++@unnumberedsec vmpc-auto-profiles-file
+ @vindex vmpc-auto-profiles-file
+ 
+ The variable @code{vmpc-auto-profiles-file} contains the name of the
+@@ -1191,7 +1191,7 @@
+ 
+ @c ***************************************************************************
+ 
+-@unnumberedsubsec vmpc-auto-profiles-expunge-days
++@unnumberedsec vmpc-auto-profiles-expunge-days
+ @vindex vmpc-auto-profiles-expunge-days
+ 
+ In order to keep vmpc-auto-profiles-file from becoming massive,
+@@ -1203,7 +1203,7 @@
+ 
+ @c ***************************************************************************
+ 
+-@unnumberedsubsec vmpc-sig-face
++@unnumberedsec vmpc-sig-face
+ @vindex vmpc-sig-face
+ 
+ This is the face used to highlight the signature.  You can use
+@@ -1212,7 +1212,7 @@
+ 
+ @c ***************************************************************************
+ 
+-@unnumberedsubsec vmpc-pre-sig-face
++@unnumberedsec vmpc-pre-sig-face
+ @vindex vmpc-pre-sig-face
+ 
+ This is the face used to highlight the pre-signature.  You can use
+@@ -1221,7 +1221,7 @@
+ 
+ @c ***************************************************************************
+ 
+-@unnumberedsubsec vmpc-intangible-sig
++@unnumberedsec vmpc-intangible-sig
+ @vindex vmpc-intangible-sig
+ @anchor{vmpc-intangible-sig}
+ 
+@@ -1240,7 +1240,7 @@
+ 
+ @c ***************************************************************************
+ 
+-@unnumberedsubsec vmpc-intangible-pre-sig
++@unnumberedsec vmpc-intangible-pre-sig
+ @vindex vmpc-intangible-pre-sig
+ 
+ The @code{vmpc-intangible-pre-sig} variable works just like
+@@ -1249,7 +1249,7 @@
+ 
+ @c ***************************************************************************
+ 
+-@unnumberedsubsec vmpc-expect-default-signature
++@unnumberedsec vmpc-expect-default-signature
+ @vindex vmpc-expect-default-signature
+ 
+ Traditionally, signatures are added to new mail messages using a
diff --git a/app-emacs/vm/vm-7.19-r4.ebuild b/app-emacs/vm/vm-7.19-r4.ebuild
index 0cb257fabac4..3e47379de02a 100644
--- a/app-emacs/vm/vm-7.19-r4.ebuild
+++ b/app-emacs/vm/vm-7.19-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-7.19-r4.ebuild,v 1.6 2012/07/29 17:14:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-7.19-r4.ebuild,v 1.7 2013/04/04 21:17:46 ulm Exp $
 
 inherit elisp eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.wonderworks.com/vm/"
 SRC_URI="ftp://ftp.uni-mainz.de/pub/software/gnu/${PN}/${P}.tar.gz
 	ftp://ftp.uu.net/networking/mail/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-1"
+LICENSE="GPL-1+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
diff --git a/app-emacs/vm/vm-8.0.12-r6.ebuild b/app-emacs/vm/vm-8.0.12-r6.ebuild
deleted file mode 100644
index 33be47657e14..000000000000
--- a/app-emacs/vm/vm-8.0.12-r6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r6.ebuild,v 1.7 2012/07/29 17:14:56 armin76 Exp $
-
-inherit elisp eutils
-
-DESCRIPTION="The VM mail reader for Emacs"
-HOMEPAGE="http://www.nongnu.org/viewmail/"
-SRC_URI="http://download.savannah.nongnu.org/releases/viewmail/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="bbdb ssl"
-
-DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="${DEPEND}
-	ssl? ( net-misc/stunnel )"
-
-SITEFILE="50${PN}-gentoo-8.0.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-autoload-vm-pine.patch" #246185
-	epatch "${FILESDIR}/${P}-supercite-yank-1.patch" #256886
-	epatch "${FILESDIR}/${P}-folder-corruption.patch" #284668
-	epatch "${FILESDIR}/${P}-emacs-23.patch"
-	epatch "${FILESDIR}/${P}-charset-displayable.patch"
-
-	if ! use bbdb; then
-		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
-		epatch "${FILESDIR}/vm-8.0-no-pcrisis.patch"
-	fi
-}
-
-src_compile() {
-	econf \
-		--with-emacs="emacs" \
-		--with-pixmapdir="${SITEETC}/${PN}" \
-		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	dodoc NEWS README TODO example.vm || die "dodoc failed"
-}
diff --git a/app-emacs/vm/vm-8.1.0.ebuild b/app-emacs/vm/vm-8.1.0.ebuild
deleted file mode 100644
index c7112649ba05..000000000000
--- a/app-emacs/vm/vm-8.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.0.ebuild,v 1.3 2012/07/29 17:14:56 armin76 Exp $
-
-inherit elisp eutils
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="The VM mail reader for Emacs"
-HOMEPAGE="http://www.nongnu.org/viewmail/"
-SRC_URI="http://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bbdb ssl"
-
-DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="!app-emacs/u-vm-color
-	${DEPEND}
-	ssl? ( net-misc/stunnel )"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo-8.0.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use bbdb; then
-		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
-		epatch "${FILESDIR}/vm-8.0-no-pcrisis.patch"
-	fi
-}
-
-src_compile() {
-	econf \
-		--with-emacs="emacs" \
-		--with-pixmapdir="${SITEETC}/${PN}" \
-		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	dodoc CHANGES NEWS README TODO example.vm || die "dodoc failed"
-}
diff --git a/app-emacs/vm/vm-8.1.1.ebuild b/app-emacs/vm/vm-8.1.1.ebuild
deleted file mode 100644
index 503d94f22647..000000000000
--- a/app-emacs/vm/vm-8.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.1.ebuild,v 1.4 2012/07/29 17:14:56 armin76 Exp $
-
-inherit elisp eutils
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="The VM mail reader for Emacs"
-HOMEPAGE="http://www.nongnu.org/viewmail/"
-SRC_URI="http://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bbdb ssl"
-
-DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="!app-emacs/u-vm-color
-	${DEPEND}
-	ssl? ( net-misc/stunnel )"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo-8.0.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use bbdb; then
-		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
-		epatch "${FILESDIR}/vm-8.0-no-pcrisis.patch"
-	fi
-}
-
-src_compile() {
-	econf \
-		--with-emacs="emacs" \
-		--with-pixmapdir="${SITEETC}/${PN}" \
-		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	dodoc CHANGES NEWS README TODO example.vm || die "dodoc failed"
-}
diff --git a/app-emacs/vm/vm-8.1.2.ebuild b/app-emacs/vm/vm-8.1.2.ebuild
index e9215ef407d2..9c17187d0464 100644
--- a/app-emacs/vm/vm-8.1.2.ebuild
+++ b/app-emacs/vm/vm-8.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.2.ebuild,v 1.5 2012/07/29 17:14:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.2.ebuild,v 1.6 2013/04/04 21:17:46 ulm Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="The VM mail reader for Emacs"
 HOMEPAGE="http://www.nongnu.org/viewmail/"
 SRC_URI="http://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="bbdb ssl"
@@ -45,6 +45,6 @@ src_compile() {
 
 src_install() {
 	emake -j1 DESTDIR="${D}" install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc CHANGES NEWS README TODO example.vm
 }
diff --git a/app-emacs/vm/vm-8.2.0_beta.ebuild b/app-emacs/vm/vm-8.2.0_beta.ebuild
index 0f609dd3d13b..ee1c3996098f 100644
--- a/app-emacs/vm/vm-8.2.0_beta.ebuild
+++ b/app-emacs/vm/vm-8.2.0_beta.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.2.0_beta.ebuild,v 1.2 2012/07/29 17:14:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.2.0_beta.ebuild,v 1.3 2013/04/04 21:17:46 ulm Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="The VM mail reader for Emacs"
 HOMEPAGE="http://www.nongnu.org/viewmail/"
 SRC_URI="http://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="bbdb ssl"
@@ -21,12 +21,15 @@ DEPEND="bbdb? ( app-emacs/bbdb )"
 RDEPEND="!app-emacs/u-vm-color
 	${DEPEND}
 	ssl? ( net-misc/stunnel )"
+DEPEND="${DEPEND}
+	sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-datadir.patch"
+	epatch "${FILESDIR}/${P}-texinfo-5.patch"
 
 	if ! use bbdb; then
 		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
@@ -49,7 +52,7 @@ src_compile() {
 
 src_install() {
 	emake -j1 DESTDIR="${D}" install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 
 	# delete duplicate documentation
 	find "${D}/${SITEETC}/${PN}" -type d -name pixmaps -prune \