gentoo resync : 06.08.2019

5 files changed, 3 insertions, 120 deletions

diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 7b255936c516..937d3683aca2 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -1,12 +1,8 @@
-AUX 50vm-gentoo-8.0.el 147 BLAKE2B 3f4da8804a26a4b931aa52409062cd9de6e4b16941e64a139216b2afcb27d09447ea3e8d4ee03ed35931f2163d1932c66b5a247ee2dee60868ba2472572e112d SHA512 9573b5ff6b747c8ac8a8d41c52391c320fe93d9e3a2aa8c22bfe5b4ea2e703fdd1cf18c59ec22aebc8fbedbc324561945bdd3407ebde432edb0015af7ad2c4e1
 AUX 50vm-gentoo.el 62 BLAKE2B 2e5093b9d4244ac229fa63fd62b7bacdf3902ea0f33616adb94852424d2078c11743f4ebd9d080e0aeaa628f66a2de38ed40dc00d6ec9023902a0670468fcb71 SHA512 e58660519b0f7e6d4f608ef09d0861293133ce25e7799e163a1afdf62193f73f0c29a081b4eb26d808a54168ab6f5f6083a107dec7228bf054357bbf16bc90c7
 AUX vm-8.0-no-pcrisis.patch 620 BLAKE2B eb8615854424645a673a62da4c9546e8ac42679d0fb74a14cc54b38006865c3e8c59fd84fb8f0d3a7b7a216cda84403836b6b759340c397de942291f8f17e042 SHA512 57e0ca67484db7a517f1e45cd7ef6974a0938c1ebb9ea740cab36ee328b1b99ce152c14701109862d89918445efc918ab1f7dacfd9228f6466f40177f38f1ae2
-AUX vm-8.1.2-texinfo-5.patch 2608 BLAKE2B 1cbfe5cfd5d633f577a3767c930d2a78e5ea29b7f880529b10e6017e1e16463be89a6c47b2d5fac70d3417b3badb390e5dd6eda0928720bc1e498586a4994ffa SHA512 cfb55e3ec2311fc1b5ca5268e8ee07ad2ea8a276804c9e891727b90fab6aec0b0f7bad274b65bb692fc7391bb95892ca1f87092594ba48716621925b82347bc9
 AUX vm-8.2.0_beta-datadir.patch 1177 BLAKE2B bb0379126f4521ba8c75e1c7fe0d3c7e179333c10acb915ce8cc9e034202d17ebd89855d0ec7b682f174d27022ace06deb545df5a73130b380aa83797b4732ed SHA512 2097837ee4d7fe28356102452f4b110d358624b607c440aee654edcaf577b3e1319bac0eb0a44c2ecefb64334e28a08731c512116bcedd4c8930ba2cee1d48c3
 AUX vm-8.2.0_beta-optional-args.patch 556 BLAKE2B 9c07937f43b99484b5973aa63b386e6e127444b11d026192be868542d98dd83a3d6d6b0816dbba4c78a3d8b8c30f1759beac7d6406bc8280e2c50dde8db884f4 SHA512 4861df97f0f1fe05a85f019a2e74ca4588fa877f67bc0a9dabfe43e9fda7ff7a349cfe23693ec29ba04f75d1698d200b39afd88550c82f1dda1e2667f52fe8c8
 AUX vm-8.2.0_beta-texinfo-5.patch 8594 BLAKE2B 542c755aa7aee4f39c8977ec0a33eab53954bdecfc9e9b65a5fa069c3f3fa89311a00356a8dfdebc2159bfd5a047dbb3500b78e0f1f21398e41fe1ac55516aba SHA512 dbc8f9456735f4d1757a7094bf2cde86148444bf4c46136eb5170b94e9124bee48c08d8f7d82e3b3c03ebd3443f0ec3dc988178e335189904c3d2b4edb6d2cd3
-DIST vm-8.1.2.tgz 703527 BLAKE2B 34b6326363893b830d76a48dc6e103100d8da6891392926d21eff00bb25217af58eb6f161ba38e99becc31f6bf1496eb75fb71709b57b08cd247fa1b28543a1b SHA512 6b879e237d6509ecd95aff3fb5e26018cb38dd19b29a57545bd28b0ca45961a7106cefd6fdd42e123119ac465a4b9ef66b683c47a9f1d9ac683a954b484a0ff4
 DIST vm-8.2.0b.tgz 839789 BLAKE2B fc032e0a6259d2397d80cc80fbb7cf5845e43a228124f867402738a9123c78c798822d8d9c8edbdb823bfe3bce946d53afb6cd24e02d28925a51d458cf21eedf SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d
-EBUILD vm-8.1.2.ebuild 1112 BLAKE2B 978e66b2ed8cb96d8ea78afc5724359edd1d5d0137386d8e8cb55f58c974f4f8e5d758176bd1f8722fcbb4df08455058476658e619635271ea72e6265881d1ee SHA512 2679c307a2aed43826913b48b3e4055f6fb4ae0c1effec8180376ac8ae037d15a184982fde37142fe86fd0778478bdb45cdc5ed4e6e3aa5e53c4e92c58662339
-EBUILD vm-8.2.0_beta-r1.ebuild 1545 BLAKE2B 400750df3f9fc3418cf41ea127101c79e673cd7bbb1e84b186081ce296ebc433fbbf0c7d922cf5bba9d1ba486535a9f36a00a01edc2ff10cd41b1c6daee85f16 SHA512 0e056ceb100b49ec6aad8067f76971ec686f8589f266f6bd4e1519267038ec48eec0494fa3ee234cba0b3723188da7a3bdee06e364fe419018d016e7b0cb55cb
+EBUILD vm-8.2.0_beta-r1.ebuild 1546 BLAKE2B f0c2917580d70d1ac4a8a279d4b87d341c7fd233049246fa7dae22bfb271af4853d043870aeafcb84da02023cdfd5997f4cb5c486acc1b8f18c6c5f878f50247 SHA512 a24bee960aa97ad25f8f4d1d1f09d672cb9383fddfafdf873a872995dbe667c31efa4be4fca6b80a135c4b04353f6d4e16a3a9d58f71350ada40353389e2ec88
 MISC metadata.xml 785 BLAKE2B 1d8be69c7be90cb03815bad0324c55e4ed4be6443246922054dc6ebf4b66090bb9f7f30916cb5df07a664d151a77de6591a45d923847547898ebc32ac9505038 SHA512 62df38ecfe4b3de679d856cbca5b58d73c73a885f86998f00aa75e67efc2def4ce973bc1e2f40fa22f6f79cc9f4fc4185a916e6ba176a89d685b1092ea9eddfe
diff --git a/app-emacs/vm/files/50vm-gentoo-8.0.el b/app-emacs/vm/files/50vm-gentoo-8.0.el
deleted file mode 100644
index 554b6634a2ee..000000000000
--- a/app-emacs/vm/files/50vm-gentoo-8.0.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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/vm-8.1.2-texinfo-5.patch b/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch
deleted file mode 100644
index 0283e19a8a73..000000000000
--- a/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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/vm-8.1.2.ebuild b/app-emacs/vm/vm-8.1.2.ebuild
deleted file mode 100644
index 3cc65011f9ca..000000000000
--- a/app-emacs/vm/vm-8.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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-r1.ebuild b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
index 2027647cf11c..143e0808b91d 100644
--- a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
+++ b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="bbdb ssl"
 
 DEPEND="bbdb? ( app-emacs/bbdb )"