gentoo resync : 12.08.2018

11 files changed, 186 insertions, 11 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 6a9ba954f6e1..a119264525f8 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index b25dd89a82a0..c62da5c9fe59 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -1,5 +1,8 @@
 AUX 50gnuserv-gentoo.el 237 BLAKE2B 53e2fb102e832b852ebd23d3a7cda10a1cde7e1733818dd357edaa0ba67e66d925ea589195dd5b797ba37e62f44e26706669594f875409fb6afb294bba05d549 SHA512 24edf596178da29d68add510382241bf257ccb6ed0f9bd1aa65a2bda268b2fa506be616f70c75628d82cc8fda06617f5a4b58e602a9dc082476ac4ad4f0e047d
 AUX gnuclient.desktop 608 BLAKE2B b50695688d76ec34dae2fb68b4865769ab531a2a5add76a48c71eac6542ea3736f6e2239f1b05775e88bee3bc2ccfc6e50bc0c49a6eacbb277d822bb2cfb3003 SHA512 35616b5fe182f4127635454f4af89b307c0c52653878ef163efee4741c4b5fe5ab88d78f89ebfe499cc02516d2a7093c49dc2232a2768e952acd61651ff16468
+AUX gnuserv-3.12.8-backquotes.patch 521 BLAKE2B dd2d150bc56e5f7cdc699fb0876bdcff014cb456f1362c7f050224c359567d4235c056a7dce63b00301abcf70f44723c20e511b76b011f84cf4e329861cd031f SHA512 ae68d03e5cd7be4e178a7eecb581487e39b1fb1ea06ea1990054eb14e1b30be4123d6e2cc309ca96a47f71ad4c9351aec7dd6e4f7e6ace801da3b02d96cf0bbe
+AUX gnuserv-3.12.8-process-query.patch 554 BLAKE2B 94f09a1e86ea787a05e51ed5e2742174067b7cca0fbe2fe83619b6f829048172a9e46f70f8e2c22f2787f43390730f07520553e7d659ccfd451869b1a074d707 SHA512 bc01b928003cf5050934972eeb7830b14957693c1484b061dbcf1809176388b75297b6884b7f5c963e59d8ec4a7cc4d9bf9ec265b414574a7de6bb5875f6b607
 DIST gnuserv-3.12.8.tar.gz 124070 BLAKE2B 7531d85f6cd1873f75499c37230907f96ac484e1d58a4a3459f44d3bfaa6a6124d44f99a7c27d1fa3deb16b1cc29d08313b911cdc1782a1c5b24bd702ef4c9ba SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31
 EBUILD gnuserv-3.12.8-r3.ebuild 1548 BLAKE2B 2e959c2585f0c3000fae5129cdef1f33c67f9cabbea1242ac71b8ce9d5087579232fd1afe24357adb407e0855318e47c735b6c36c15eff94370e8a4b02a2c219 SHA512 5f36aaa6cfc4e643b7a8ed019d3063bd58f0730a86120772af34e749f537680619014097336353a631902fc8ecffdda763b9ad3aa17f17c255b1663964c9be71
+EBUILD gnuserv-3.12.8-r4.ebuild 1641 BLAKE2B b835ed957c90b8734014039e2d8e2f68f00ed67d66fb7290f0be9f6c03d5b95e083c9a597ee945ea578bbe69ec61f740d3965006fe85e7caa4a0c1d817209baf SHA512 405540bb8612a87a923cfde83e0fceb1ef207a0d2948cceb5271ac515ea417ddc4541bc5adaa480813b2734dae862554a31970d6c3fef25d0d830b26454e9eca
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch
new file mode 100644
index 000000000000..a16124821ddb
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch
@@ -0,0 +1,16 @@
+Use new-style backquotes, to make it compile with Emacs 27.
+
+--- gnuserv-3.12.8-orig/gnuserv-compat.el
++++ gnuserv-3.12.8/gnuserv-compat.el
+@@ -193,9 +193,9 @@
+     (defmacro defgroup (&rest args)
+       nil)
+     (defmacro defcustom (var value doc &rest args)
+-      (` (defvar (, var) (, value) (, doc))))
++      `(defvar (, var) (, value) (, doc)))
+     (defmacro defface (var value doc &rest args)
+-      (` (make-face (, var))))
++      `(make-face (, var)))
+     (defmacro define-widget (&rest args)
+       nil)))
+ 
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-process-query.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-process-query.patch
new file mode 100644
index 000000000000..4fcbccc2b59b
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-process-query.patch
@@ -0,0 +1,14 @@
+Function process-kill-without-query is obsolete since 22.1 and no
+longer exists in 27.
+
+--- gnuserv-3.12.8-orig/gnuserv.el
++++ gnuserv-3.12.8/gnuserv.el
+@@ -738,7 +738,7 @@
+ 	    (start-process "gnuserv" nil gnuserv-program)))
+     (set-process-sentinel gnuserv-process 'gnuserv-sentinel)
+     (set-process-filter gnuserv-process 'gnuserv-process-filter)
+-    (process-kill-without-query gnuserv-process)
++    (set-process-query-on-exit-flag gnuserv-process nil)
+     (setq allow-deletion-of-last-visible-frame t)
+     (run-hooks 'gnuserv-init-hook)))
+ 
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild
new file mode 100644
index 000000000000..935e23bd8c8f
--- /dev/null
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp multilib desktop xdg-utils
+
+DESCRIPTION="Attach to an already running Emacs"
+HOMEPAGE="http://meltin.net/hacks/emacs/"
+SRC_URI="http://meltin.net/hacks/emacs/src/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+IUSE="X"
+
+RDEPEND=">=app-eselect/eselect-emacs-1.15
+	X? ( x11-libs/libXau )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-backquotes.patch
+	eapply "${FILESDIR}"/${P}-process-query.patch
+	sed -i -e 's/exec gnuclient/&-emacs/' gnudoit || die
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_enable X xauth) \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	exeinto /usr/libexec/emacs
+	doexe gnuserv
+	newbin gnuclient gnuclient-emacs
+	newbin gnudoit gnudoit-emacs
+	# Don't install gnuattach, it is not functional with FSF GNU Emacs
+
+	newman gnuserv.1 gnuserv-emacs.1
+	echo ".so man1/gnuserv-emacs.1" | newman - gnuclient-emacs.1
+	echo ".so man1/gnuserv-emacs.1" | newman - gnudoit-emacs.1
+
+	elisp-install ${PN} *.el *.elc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc ChangeLog README README.orig
+
+	if use X; then
+		domenu "${FILESDIR}"/gnuclient.desktop || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	use X && xdg_desktop_database_update
+	eselect gnuclient update ifunset
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	use X && xdg_desktop_database_update
+	eselect gnuclient update ifunset
+}
diff --git a/app-emacs/mailcrypt/Manifest b/app-emacs/mailcrypt/Manifest
index 2d4fc95279f6..f61ebc4f1146 100644
--- a/app-emacs/mailcrypt/Manifest
+++ b/app-emacs/mailcrypt/Manifest
@@ -1,4 +1,6 @@
 AUX 50mailcrypt-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX mailcrypt-3.5.9-backquotes.patch 424 BLAKE2B 841096ec6593ba9296340356082ff2569bb8d3f08d565c9ac0d750994bf2bf27b3215b1d916298b6fca790c8ab0653a427cb4722011e88a459b8b2447e042c62 SHA512 e0fbecbeb6e10d183747e8c86dd2ca6c9c01340a0109c1eacec17dc1ed7139197074a8985938ebfb79d7ddecb6c2f9da405110ac5fe6f67be7ade3df75898a81
 DIST mailcrypt-3.5.9.tar.gz 172073 BLAKE2B 02a911c0676464a670754cf8ddfccefa1ab9c69c680911ce63faa0affe6d3f72ad7d409f716a1edf326225f3378878caedfd4194201894baf05110d26acba533 SHA512 df6524ecc42d4c7bdddb34439186690192bc4091a1965e405223106fc71047c33e4bbbd571b030c326efec46961ba0aefd018ff1205d230dc74c34daf93ba079
+EBUILD mailcrypt-3.5.9-r1.ebuild 1004 BLAKE2B 7f104dffd7b219f2add3b3cafb0af0f0800e30dc0c5427e7dbb74f7315abf99b800edb9424ad63f37c845cb55cb70dc56b94f007a4a29674ffce22daca0f44a3 SHA512 886d318ecf3c8c22c963604a786e5ae6cbce1a64e776504ca772bf96ed08713bec424498faf72db37cddbb1527be2c085781931e8d49c6eeda719af5f43bb134
 EBUILD mailcrypt-3.5.9.ebuild 900 BLAKE2B 45617c73ae1975ea32b119249b9f0fa46269849e97bf5479d77cc343bc152ac45070755ff9647338955267da4cbeb35678dcc7c535021eff5858f8a521f5c552 SHA512 ef84ff8a3cf59bfd733d4691583ad481738e73af83ca24a3b2632579607fcedf8aa0da5eff7407ed1459186ab5f6a7750e6e008793828ced6aeadb617138cb26
 MISC metadata.xml 359 BLAKE2B 115dd3e46859edda7ac4b23892ba3fd9f76e2a0aeb0f667a37c0a410959048a3a99ddbf052155fdc55bb18cc5fbd8a72af18f7c4b312ddd9f27a25c454662c9b SHA512 0a6b9ca1957a37fcdcf322663a6ae5dcfa9f00810ca7f68548acb9386edcc78f0b7d01f1cd6b2bcf2d9f05a6d34b7add17e9418329072d184c7840aed0f50eb1
diff --git a/app-emacs/mailcrypt/files/mailcrypt-3.5.9-backquotes.patch b/app-emacs/mailcrypt/files/mailcrypt-3.5.9-backquotes.patch
new file mode 100644
index 000000000000..7cacdbb9e482
--- /dev/null
+++ b/app-emacs/mailcrypt/files/mailcrypt-3.5.9-backquotes.patch
@@ -0,0 +1,11 @@
+--- mailcrypt-3.5.9-orig/mc-gpg.el
++++ mailcrypt-3.5.9/mc-gpg.el
+@@ -108,7 +108,7 @@
+       (defmacro with-current-buffer (buffer &rest body)
+ 	"Execute the forms in BODY with BUFFER as the current buffer.
+ The value returned is the value of the last form in BODY."
+-	(` (save-excursion (set-buffer (, buffer)) (,@ body)))))
++	`(save-excursion (set-buffer (, buffer)) (,@ body))))
+   )
+ 
+ (defun mc-gpg-debug-print (string)
diff --git a/app-emacs/mailcrypt/mailcrypt-3.5.9-r1.ebuild b/app-emacs/mailcrypt/mailcrypt-3.5.9-r1.ebuild
new file mode 100644
index 000000000000..7de100b9da94
--- /dev/null
+++ b/app-emacs/mailcrypt/mailcrypt-3.5.9-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 elisp autotools
+
+DESCRIPTION="Provides a simple interface to public key cryptography with OpenPGP"
+HOMEPAGE="http://mailcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mailcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+RESTRICT="test"
+
+RDEPEND="app-crypt/gnupg"
+
+ELISP_PATCHES="${P}-backquotes.patch"
+ELISP_REMOVE="FSF-timer.el"		# remove bundled timer.el
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	export EMACS
+	econf
+}
+
+src_install() {
+	emake \
+		lispdir="${D}${SITELISP}/${PN}" \
+		infodir="${D}/usr/share/info" \
+		install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc ANNOUNCE ChangeLog* INSTALL LCD-entry NEWS ONEWS README*
+
+	DOC_CONTENTS="See the INSTALL file in /usr/share/doc/${PF} for how
+		to customize mailcrypt."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 70bfcb4cbfb6..7b255936c516 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -3,9 +3,10 @@ AUX 50vm-gentoo.el 62 BLAKE2B 2e5093b9d4244ac229fa63fd62b7bacdf3902ea0f33616adb9
 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.ebuild 1525 BLAKE2B ea6c47fd0ced16fb92f463937afc33848e7d94aec80e89b3a8ea7661cc2820349983285c3360e940f21f399219d5ca9d9379c840d0fb6c042bc5da6bf59d3ef1 SHA512 24dbebe03a041153d07bd89b2ea0a97a535e165e359d3123a0144e1989f2b43baea1cca840ced61d1c2710d73db124c9673893b7d8cdebbb2838bef3cd2e13e5
+EBUILD vm-8.2.0_beta-r1.ebuild 1545 BLAKE2B 400750df3f9fc3418cf41ea127101c79e673cd7bbb1e84b186081ce296ebc433fbbf0c7d922cf5bba9d1ba486535a9f36a00a01edc2ff10cd41b1c6daee85f16 SHA512 0e056ceb100b49ec6aad8067f76971ec686f8589f266f6bd4e1519267038ec48eec0494fa3ee234cba0b3723188da7a3bdee06e364fe419018d016e7b0cb55cb
 MISC metadata.xml 785 BLAKE2B 1d8be69c7be90cb03815bad0324c55e4ed4be6443246922054dc6ebf4b66090bb9f7f30916cb5df07a664d151a77de6591a45d923847547898ebc32ac9505038 SHA512 62df38ecfe4b3de679d856cbca5b58d73c73a885f86998f00aa75e67efc2def4ce973bc1e2f40fa22f6f79cc9f4fc4185a916e6ba176a89d685b1092ea9eddfe
diff --git a/app-emacs/vm/files/vm-8.2.0_beta-optional-args.patch b/app-emacs/vm/files/vm-8.2.0_beta-optional-args.patch
new file mode 100644
index 000000000000..2cec28e046fd
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.2.0_beta-optional-args.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/652952
+
+--- vm-8.2.0b-orig/lisp/vm-pcrisis.el
++++ vm-8.2.0b/lisp/vm-pcrisis.el
+@@ -1214,7 +1214,7 @@
+ ;; Functions for vmpc-conditions:
+ ;; -------------------------------------------------------------------
+ 
+-(defun vmpc-none-true-yet (&optional &rest exceptions)
++(defun vmpc-none-true-yet (&rest exceptions)
+   "True if none of the previous evaluated conditions was true.
+ This is a condition that can appear in `vmpc-conditions'.  If EXCEPTIONS are
+ specified, it means none were true except those.  For example, if you wanted
diff --git a/app-emacs/vm/vm-8.2.0_beta.ebuild b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
index 7a2006d18d99..2027647cf11c 100644
--- a/app-emacs/vm/vm-8.2.0_beta.ebuild
+++ b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit elisp eutils
+inherit elisp
 
 MY_PV="${PV/_beta/b}"
 MY_P="${PN}-${MY_PV}"
@@ -17,22 +17,22 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="bbdb ssl"
 
 DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="!app-emacs/u-vm-color
-	${DEPEND}
+RDEPEND="${DEPEND}
 	ssl? ( net-misc/stunnel )"
-DEPEND="${DEPEND}
-	sys-apps/texinfo"
+BDEPEND="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"
+	eapply "${FILESDIR}/${P}-datadir.patch"
+	eapply "${FILESDIR}/${P}-texinfo-5.patch"
+	eapply "${FILESDIR}/${P}-optional-args.patch"
+	eapply_user
 
 	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"
+		eapply "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
 	fi
 }