reinit the tree, so we can have metadata

10 files changed, 515 insertions, 0 deletions

diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
new file mode 100644
index 000000000000..304e5da6e326
--- /dev/null
+++ b/app-emacs/vm/Manifest
@@ -0,0 +1,13 @@
+AUX 50vm-gentoo-8.0.el 147 SHA256 b79981760d6c58e03cd1b57d8e413f2c1b2ebc2d083da03cbe6eac287e89bcad SHA512 9573b5ff6b747c8ac8a8d41c52391c320fe93d9e3a2aa8c22bfe5b4ea2e703fdd1cf18c59ec22aebc8fbedbc324561945bdd3407ebde432edb0015af7ad2c4e1 WHIRLPOOL 77d0c10883d135794a1254d6c759743ac25f9d543c18b63fdf71e152c31459efc026bd004860ce9a6fa02e5bab70168f2625ab7012cb43ce0faaa48c891604fe
+AUX 50vm-gentoo.el 62 SHA256 ac5d651e855d765a458cbc33a78ca9c86bd3604e0d972a0cfbce1dbcb6dc72b1 SHA512 e58660519b0f7e6d4f608ef09d0861293133ce25e7799e163a1afdf62193f73f0c29a081b4eb26d808a54168ab6f5f6083a107dec7228bf054357bbf16bc90c7 WHIRLPOOL 0378c36ad9d8ad9de344608ce13b5a5ac47e0af87c1f41d8db68b5adb163d9519d74f41ddb68959a529a57bc4cec3270aa7330efa22e41e01d9815ed068fc42d
+AUX vm-8.0-no-pcrisis.patch 620 SHA256 2c343d31649a152791f31bf14e8ee3d7a849e5645ba028661ab84309f73a5886 SHA512 57e0ca67484db7a517f1e45cd7ef6974a0938c1ebb9ea740cab36ee328b1b99ce152c14701109862d89918445efc918ab1f7dacfd9228f6466f40177f38f1ae2 WHIRLPOOL be263b230a0d97b583bc474e5eedb98c2b70b89f52697a462da900e649478107a32eb5cfeb2afa47d73b2d45fa068510f95bbd833177270915572fa4436c4833
+AUX vm-8.1.2-texinfo-5.patch 2608 SHA256 721e0611865be16c5bba5d2c826830833c71ddc91efa0aaa7c9547396326d6fb SHA512 cfb55e3ec2311fc1b5ca5268e8ee07ad2ea8a276804c9e891727b90fab6aec0b0f7bad274b65bb692fc7391bb95892ca1f87092594ba48716621925b82347bc9 WHIRLPOOL 8e988e1570caff9abf3e04af6894089fadc680cfea439f3d6dcc6d3eebd4b4d4c03dc9ced04b08c02f60d9dbec3e20ea62b83185efd6e3841fa4a99161bfd849
+AUX vm-8.2.0_beta-datadir.patch 1177 SHA256 49dfe87f98e6e479a1050891494daa9c43a4aeed260a2c8bfa03c5aaa8071165 SHA512 2097837ee4d7fe28356102452f4b110d358624b607c440aee654edcaf577b3e1319bac0eb0a44c2ecefb64334e28a08731c512116bcedd4c8930ba2cee1d48c3 WHIRLPOOL 543c05496d7052d017ba56ca3277b63eb639873c53ce242ed2993b87d495a4b92966b10a01eb16769649ac8a151c06ee7cedc6f5dc5a54c71c4bc45eb9922ed7
+AUX vm-8.2.0_beta-texinfo-5.patch 8594 SHA256 30161513d3b39ba67a065567dccbada85512e0d88edbf88679b1547ea4a29436 SHA512 dbc8f9456735f4d1757a7094bf2cde86148444bf4c46136eb5170b94e9124bee48c08d8f7d82e3b3c03ebd3443f0ec3dc988178e335189904c3d2b4edb6d2cd3 WHIRLPOOL a9e849120e7cf78d7359713e2d633dec48a1f6d54ef293268810f58d9693531bd8d479abdcfb29a9bfd1bbee2d4789ff2b8fe702d077a8cf2371af741db75786
+DIST vm-8.1.2.tgz 703527 SHA256 c779f65d422ea169a1030b1c86c72e8b6f8e6c589396331c4688d8e1d0814636 SHA512 6b879e237d6509ecd95aff3fb5e26018cb38dd19b29a57545bd28b0ca45961a7106cefd6fdd42e123119ac465a4b9ef66b683c47a9f1d9ac683a954b484a0ff4 WHIRLPOOL 2c459cadc4944ee8e5719cfe5d5b5edda281e58edd13ce697748b3b2da2bb6d085b5473c069da3521618ad86a7239e0cfd8b65ecccc63b6e64665aaa37bcea8f
+DIST vm-8.2.0b.tgz 839789 SHA256 6945821a521844a429ae3d0e25db69755185fa848343fdc3c754ab16344d2a12 SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d WHIRLPOOL c35abe4d3ae3e9470733d761b3f6b8087dbda19b68cc99ed73b7d489e218e6fa257defccca72ed1b242d447ee43041da9bd8a3482d5b8df3893d5c81203d1578
+EBUILD vm-8.1.2.ebuild 1112 SHA256 052c43a8b56b61af76ae04fd48bfe2735a66d9d5cda9ec34ad413b7cd4f1cdbf SHA512 2679c307a2aed43826913b48b3e4055f6fb4ae0c1effec8180376ac8ae037d15a184982fde37142fe86fd0778478bdb45cdc5ed4e6e3aa5e53c4e92c58662339 WHIRLPOOL 687094b65cc042edff6e73564ed1af373147b7f2d0261493df43443211c8c41ee72c6d6eb1b113b2ebbe76433928ad46c416d35de3fabe1502e408212c45531b
+EBUILD vm-8.2.0_beta.ebuild 1525 SHA256 94bc7bf0383961d158124ef81b635dba6b292f553108352d0efa3a0bae80b420 SHA512 24dbebe03a041153d07bd89b2ea0a97a535e165e359d3123a0144e1989f2b43baea1cca840ced61d1c2710d73db124c9673893b7d8cdebbb2838bef3cd2e13e5 WHIRLPOOL f5900d986a23d5c6c3a4849845ed2d43d34a288ab3c0f4f33f9e21cf55f8dc040989e91907cc582a06e4ad2309c3638b4a8a6195930effd7315290de8a3ed5e6
+MISC ChangeLog 3039 SHA256 cc0a40e9b5967dd9403b05320e8e1676771e13db4af4b11c69c5bc3b1a04c17d SHA512 abbdeb8bd5c1e1deba8e6b569f71c6aef2da78877f481d3aceda09df3facfa54bd39e9e122365c4e9487d343649ea89519b76dac1c8206c6258b9ea3be99a15a WHIRLPOOL 8b9ef782e18a79442dac00d46021607fa4dd71ddcff82fe39198bee8d945d7103a875cf87a2752982cb46b0549ee9f45cc9d7a6255d7f10b66116bbc56194ef7
+MISC ChangeLog-2015 14557 SHA256 96e39360f0a50c8ca2727e1070b6281d2b775b3ea9f31bf3ae4c2f6dc3ce9d0e SHA512 a4fef4b0835df3b139d4686d9940ce5ab087c679f3172475a68fe75d6884b86c60a69bdf4069c485954af4a4edfbff5bab73a55e496724873a96ea55f6b2378c WHIRLPOOL d37cfbfde356977d9c7772ca6b046ad976aa62432360ffcb324d179035009fd8831000bcddf7ccbd24af0aa3a8e3fdab8354819beee7e93781d64d6f4aab323b
+MISC metadata.xml 785 SHA256 901c10a63722f3e8780aeb386e61013208a5b80107b8ae1e0d4a6760cfb9e0e4 SHA512 62df38ecfe4b3de679d856cbca5b58d73c73a885f86998f00aa75e67efc2def4ce973bc1e2f40fa22f6f79cc9f4fc4185a916e6ba176a89d685b1092ea9eddfe WHIRLPOOL 4a9609ddf281f6e29fdaa64eeb16f1a0ee2073cd696dd1882b48a1b3c7fdb64a512e7b7aa13319b60176edb173c989c55b6f73634e92473b1b417c400699167c
diff --git a/app-emacs/vm/files/50vm-gentoo-8.0.el b/app-emacs/vm/files/50vm-gentoo-8.0.el
new file mode 100644
index 000000000000..554b6634a2ee
--- /dev/null
+++ b/app-emacs/vm/files/50vm-gentoo-8.0.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(setq vm-toolbar-pixmap-directory "@SITEETC@")
+(setq vm-image-directory "@SITEETC@")
+(require 'vm-autoloads)
diff --git a/app-emacs/vm/files/50vm-gentoo.el b/app-emacs/vm/files/50vm-gentoo.el
new file mode 100644
index 000000000000..d823436d3bd2
--- /dev/null
+++ b/app-emacs/vm/files/50vm-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'vm-autoloads)
diff --git a/app-emacs/vm/files/vm-8.0-no-pcrisis.patch b/app-emacs/vm/files/vm-8.0-no-pcrisis.patch
new file mode 100644
index 000000000000..33b1a1a9679e
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.0-no-pcrisis.patch
@@ -0,0 +1,21 @@
+--- vm-8.0.1-465-orig/info/Makefile.in	2007-06-29 00:35:41.000000000 +0200
++++ vm-8.0.1-465/info/Makefile.in	2007-07-13 20:07:38.000000000 +0200
+@@ -35,7 +35,7 @@
+ 
+ all: info
+ 
+-info: vm.info vm-pcrisis.info
++info: vm.info
+ 
+ Makefile: @srcdir@/Makefile.in
+ 	cd @srcdir@/..; ./config.status
+--- vm-8.0.1-465-orig/lisp/Makefile.in	2007-06-29 00:35:41.000000000 +0200
++++ vm-8.0.1-465/lisp/Makefile.in	2007-07-13 20:08:00.000000000 +0200
+@@ -30,7 +30,6 @@
+ SOURCES += vm-motion.el
+ SOURCES += vm-mouse.el
+ SOURCES += vm-page.el
+-SOURCES += vm-pcrisis.el
+ SOURCES += vm-pgg.el
+ SOURCES += vm-pine.el
+ SOURCES += vm-pop.el
diff --git a/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch b/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch
new file mode 100644
index 000000000000..0283e19a8a73
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch
@@ -0,0 +1,59 @@
+diff -up emacs-vm-8.1.2/info/vm.texinfo.texinfo5 emacs-vm-8.1.2/info/vm.texinfo
+--- emacs-vm-8.1.2/info/vm.texinfo.texinfo5	2012-03-05 18:43:21.000000000 +0100
++++ emacs-vm-8.1.2/info/vm.texinfo	2013-05-19 00:05:10.000000000 +0200
+@@ -783,7 +783,8 @@ following formats:
+ 
+ @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{POP folders} or @dfn{IMAP
+@@ -996,8 +997,7 @@ The variable's value should be an associ
+  ((@var{IMAPDROP} @var{NAME}) ...)
+ @end example
+ 
+-@var{IMAPDROP} is an IMAP maildrop specification (@ref{maildrop
+-  specification}). 
++@var{IMAPDROP} is an 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}.
+@@ -2342,7 +2342,7 @@ MIME encode it as necessary.
+ * MIME preview::        Previewing a MIME message before sending.
+ @end menu
+ 
+-@node MIME attachments, MIME characters, MIME Composition, MIME Composition, 
++@node MIME attachments, MIME characters, MIME Composition, MIME Composition
+ @unnumberedsec MIME attachments
+ 
+ @kindex C-c C-a
+@@ -3328,13 +3328,15 @@ The fifth is `f' or ` ', for messages fi
+ The sixth is `w' or ` ', for messages written.
+ @*
+ The seventh is `e' or ` ', for messages that have been edited.
++@vindex vm-summary-attachment-indicator
+ @item P
+ indicator for a message with attachments.
+-The variable @vindex vm-summary-attachment-indicator
++The variable
+ @code{vm-summary-attachment-indicator} is the inserted string, by default a @code{$}.
++@vindex vm-summary-postponed-indicator
+ @item p
+ indicator for a postponed message. 
+-The variable @vindex vm-summary-postponed-indicator
++The variable
+ @code{vm-summary-postponed-indicator} is the inserted string, by default a @code{P}.
+ @item c
+ number of characters in message (ignoring headers)
+@@ -4588,7 +4590,7 @@ The project code base is maintained at t
+ @uref{http://launchpad.net/vm}.  The ``VM Development Team'' can be
+ reached here using the email address @code{vm@@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
diff --git a/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch b/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch
new file mode 100644
index 000000000000..86608e77c97a
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch
@@ -0,0 +1,31 @@
+--- vm-8.2.0b-orig/lisp/Makefile.in
++++ vm-8.2.0b/lisp/Makefile.in
+@@ -96,7 +96,10 @@
+ datadir= @datadir@
+ datarootdir= @datarootdir@
+ lispdir = @lispdir@
++etcdir= @etcdir@
+ pixmapdir= @pixmapdir@
++docdir = @docdir@
++infodir = @infodir@
+ 
+ EMACS_PROG = @EMACS_PROG@
+ EMACS_FLAVOR = @EMACS_FLAVOR@
+@@ -137,7 +140,7 @@
+ 	 "$(EMACS_PROG)" $(FLAGS) -l autoload \
+ 		-f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
+ 	echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@
+-	echo "(setq vm-configure-datadir \"${datadir}/vm\")" | tr -d '\015' >> $@
++	echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> $@
+ 	echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" | tr -d '\015' >> $@
+ 	echo "(setq vm-configure-docdir \"${docdir}\")" | tr -d '\015' >> $@
+ 	echo "(setq vm-configure-infodir \"${infodir}\")" | tr -d '\015' >> $@
+@@ -168,7 +171,7 @@
+ 	cat $@.tmp >> $@
+ 	echo "(setq features (delete 'vm-autoloads features))" >> $@
+ 	echo "(require 'vm-vars)" >> $@
+-	echo "(setq vm-configure-datadir \"${datadir}\")" >> $@
++	echo "(setq vm-configure-datadir \"${etcdir}\")" >> $@
+ 	echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" >> $@
+ 	$(RM) $@.tmp
+ 
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/metadata.xml b/app-emacs/vm/metadata.xml
new file mode 100644
index 000000000000..3fd3c5b75b23
--- /dev/null
+++ b/app-emacs/vm/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+  VM is a mail reader that runs inside GNU Emacs and XEmacs. It was written as
+  an alternative to the Emacs RMAIL mail reader. VM is highly configurable and
+  easy to use. It supports POP and IMAP for mail retrieval, understands MIME,
+  and reads both the standard UNIX mailbox format and the BABYL format used by
+  the RMAIL mailer.
+</longdescription>
+<use>
+  <flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
+</use>
+<upstream>
+  <remote-id type="launchpad">vm</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/vm/vm-8.1.2.ebuild b/app-emacs/vm/vm-8.1.2.ebuild
new file mode 100644
index 000000000000..3cc65011f9ca
--- /dev/null
+++ b/app-emacs/vm/vm-8.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+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="https://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_prepare() {
+	if ! use bbdb; then
+		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
+		epatch "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
+	fi
+	epatch "${FILESDIR}/${P}-texinfo-5.patch"
+}
+
+src_configure() {
+	econf \
+		--with-emacs="emacs" \
+		--with-pixmapdir="${SITEETC}/${PN}" \
+		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	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
new file mode 100644
index 000000000000..7a2006d18d99
--- /dev/null
+++ b/app-emacs/vm/vm-8.2.0_beta.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp eutils
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="The VM mail reader for Emacs"
+HOMEPAGE="http://www.nongnu.org/viewmail/"
+SRC_URI="https://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 )"
+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."
+		epatch "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-emacs="emacs" \
+		--with-lispdir="${SITELISP}/${PN}" \
+		--with-etcdir="${SITEETC}/${PN}" \
+		--with-docdir="/usr/share/doc/${PF}" \
+		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	# delete duplicate documentation
+	find "${D}/${SITEETC}/${PN}" -type d -name pixmaps -prune \
+		-o -type f -exec rm '{}' '+' || die
+	rm "${D}/usr/share/doc/${PF}/COPYING" || die
+
+	dodoc example.vm
+	# NEWS is accessed from lisp and must not be compressed
+	docompress -x /usr/share/doc/${PF}/NEWS
+}