gentoo resync : 30.06.2019

31 files changed, 322 insertions, 124 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index d8145716e9b7..9982d4efe586 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index dc5628c001d7..eadfd05604bd 100644
--- a/app-emacs/apel/Manifest
+++ b/app-emacs/apel/Manifest
@@ -5,5 +5,7 @@ AUX apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch 888 BLAKE2B 1e79046bec7
 AUX apel-10.8-050_escape-backslash.patch 942 BLAKE2B ab6ed79c8d6a8a75a1023dde38a9f8dae6b4d4252d8453dbd3bedd60999abb797294b4c66f291cf334df2e4f47d318aad4c411f3a8a84dbf9318b10934db6a69 SHA512 287d84ff23a22cbf0ae9ebeeb0e20759030239573c1d49d6e4b9bf67a8f7008fc494dade31c05bfb9f3383ea8882ebd9ff775f9ef9a139030cd083a9d5fd20ce
 DIST apel-10.8-030_Use-new-style-backquotes.patch.gz 7869 BLAKE2B 93b93a089693a2fec68033b44f1cf96117fcdcb9dad5dbbf4283a79cd19f358c2a3bdc80ce2f7517e8b396182141583a371c21a8df7db7d05156ffd16987a872 SHA512 4074dc612feb2d63637bea2e9303423d4e9e035fad7f440d2da5331a6adc08f5ec61abb5087c2c4c72ec8931d1ccc4db3ffd061bcf3150d20c222c8df2e0b274
 DIST apel-10.8.tar.gz 126326 BLAKE2B 6fc8f04006a971e9d48dbf5f7b43e201a4f5fa515210bb69829bc3b0f05aba2e9f205915e6117e20220ae5b48a6543520533dc95a90754a30ff3fb8094779901 SHA512 39f13f15ec0a078d8f8dfe797899474cf4dfeb0bf7b8432a0c05bb38cf134d805c171a66b3d3efd074fbf294d68006d1e1d49903e45f1991d79cdcb4cca4aa9d
+DIST apel-10.8_p20190407.tar.gz 94808 BLAKE2B 47540e8c3ce96cc91efefe521942a3df4ee8423c7796d7e66b14bed7e9d662469a0767dd4863ae130fb114a1f9335d95abd13d61b6811e039db75e28679ac0f6 SHA512 6c780b0643f248e2a1409f1cea794dc6be515ee2ae766ead0834996bd9c13852492af1b9c343c4efda06fd057fae0c1b8a1ffc6b55b1469afbc7cbf1b579ea68
 EBUILD apel-10.8-r1.ebuild 1494 BLAKE2B 330d33b3436b607e3de6d46ef5ff15fb4208230c166ff3eccc837a57cdbc7885b5ec0bfad83976b1d3c2ad54e71c5dd1433903daf18c4b00fb14400f6d5c2538 SHA512 5b4881c7a966d1ee0fd82d931964d377c91a4df4647190000e3fb53a46c3eca0df9c705a34a762f2846a5a9696049d240b9549551e6a2e7151f772a16acf5c15
+EBUILD apel-10.8_p20190407.ebuild 1204 BLAKE2B 085ba890197b63f8e8d246603ae08b27b96467867240a283097fdc9394405d4871ad322f42b22b61fce46a5ac1bc5b32d76611f069aeca35d22b12868dfb0705 SHA512 3648abf3f30419bdf733f6178a086654fcea5382370ea8bf7b356cd88286dd20ea4eb39a5cf90c12a4f1e0ea171e2509d8c6bed158f4ddb8052b49e7435083b6
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apel/apel-10.8_p20190407.ebuild b/app-emacs/apel/apel-10.8_p20190407.ebuild
new file mode 100644
index 000000000000..6dd02e5f803a
--- /dev/null
+++ b/app-emacs/apel/apel-10.8_p20190407.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A Portable Emacs Library is a library for making portable Emacs Lisp programs"
+HOMEPAGE="https://github.com/wanderlust/apel"
+GITHUB_SHA1="d146ddbf8818e81d3577d5eee7825d377bec0c73"
+SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+src_prepare() {
+	elisp_src_prepare
+	cat <<-EOF >>APEL-CFG || die
+	(setq APEL_PREFIX "apel")
+	(setq EMU_PREFIX "apel")
+	EOF
+}
+
+src_compile() {
+	emake PREFIX="${ED}/usr" \
+		LISPDIR="${ED}/${SITELISP}" \
+		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}"
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" \
+		LISPDIR="${ED}/${SITELISP}" \
+		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" \
+		install
+	elisp-site-file-install "${FILESDIR}/50apel-gentoo.el"
+	dodoc ChangeLog README*
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	elog "See the README.en file in /usr/share/doc/${PF} for tips"
+	elog "on how to customize this package."
+}
diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest
index d03d17494376..5a008080a9db 100644
--- a/app-emacs/ecb/Manifest
+++ b/app-emacs/ecb/Manifest
@@ -3,5 +3,5 @@ AUX ecb-2.32-gentoo.patch 3430 BLAKE2B 8d373b5ebc1064d5b2fb713f6d3bc31ec34eddfeb
 DIST ecb-2.41_pre20140215.tar.xz 565404 BLAKE2B 135aa4a71bb41e78933604c5e549d8a163715061c7946e90a115cf802499f9a78884e554cbf4fd4edc9b5856b1f32b3189eb3e1e2537b16e5dd57cfe3ccd1ee3 SHA512 bf87bdd38e7ddaeec044fc56d56f7c456ef0a1922f50b962f932bf739895f046387bab7a934439e749fd7e838d9f742938408f4f9cb47079440abd8c1ba181b6
 DIST ecb-2.50_pre20170728.tar.xz 562144 BLAKE2B 922a1f101d01717c5d078fbb055903c43e91360061b792e96e9aa9421d19df2cd47f7e69aae6dba4f188e26682d2a758ff8aa57ff500e5b6fdeaea6920b21a25 SHA512 074738cc323b595caf3d34d6eaa08d6a1a8d3a53762c9bf48b751ab25a16a26a8c71984996b7e7616f4999a0876c6d03751e1e45b68aad712020778da387a59d
 EBUILD ecb-2.41_pre20140215-r1.ebuild 1226 BLAKE2B 1cdc2a77228d611fd8ffea0f7f7136d0fbe7a519a0ede55eb06e83a6fb1098ebf8314bc1aed6086bc129c9787bfa4f28654c1082fbe953b4e90a428da0f554d5 SHA512 9cf484eb1e4cd0a895eacd2730e0d991b62d6bb3187ba096583e2c6a091496efcfddd86db61368c8bc2e83acf7fe0716791dd6620ddfe3ea064fc93ca093bbaa
-EBUILD ecb-2.50_pre20170728.ebuild 1191 BLAKE2B 13d7aa4c1eef3d532f05529e44f9c7e044e16d091faa6589e2e7e8abf7c07101544ccf19be2a905b80e980fb2873ed1fe222c85ba8fef6ff2fd308bba5c12691 SHA512 21128dffa364255c202b1e7b630bba0b20decf7bacdc2885edee40a5822c01ea277a8b7b40fa767a3ac7e1835e9c5f039a9deca45a27c1ac263f85001603f7d0
+EBUILD ecb-2.50_pre20170728.ebuild 1188 BLAKE2B a95389be81a77807f50441abd494082d9c0deec50e8e26b10f1e800466e93de3a4312f109e25fa1ccbaec3c29aea17d903a97bc7509950dc65b86b7ef777482e SHA512 8ebf9de92d861d87d4534b8398803bdfad30ac81b00aba09710dfd2d715b94b85551bfa6f93618ee1a7e9a859b6656f3af98681467ea1db7e9ba4c88e09b3aae
 MISC metadata.xml 1593 BLAKE2B 611c6e5a6f1bf4bcc78dcc3fd35e6e01067162d7fd4f6f0186f94011e9d4e154eb343189302713ec911fc70e00f603b08f2add5da2acf9272d5d3f90db1387e4 SHA512 613a3f9a08c5f467de2190b4de2a794c5f8cf8ff1fc3bca4328581be199799d01a312391176a6469643e4cfdf8aab757dce922115910f282931783993d81e392
diff --git a/app-emacs/ecb/ecb-2.50_pre20170728.ebuild b/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
index 15d6ed4c6d14..204485437855 100644
--- a/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
+++ b/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="java"
 
 RDEPEND="java? ( app-emacs/jde )"
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index f20001a8088c..56ad65f48e0f 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,3 +1,4 @@
 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
 EBUILD emacs-common-gentoo-1.6-r1.ebuild 2882 BLAKE2B ab454de8e5f8b8c555b60a2129865214337279c9082c3927c455c1bfbac8f4a1de3e2f56a9be3fd7f9a181cd7c9295ebe90a00a64d158991f3f6808a0e14c17c SHA512 f7e4f173fa3c84a7c91e38b6d94b8555483a5c91875a2d87277e4e11423fc162590d45376643ddea08806b4c76a849c09404da421fb693c72e0b6ffa13ee2d9d
+EBUILD emacs-common-gentoo-1.6-r2.ebuild 2891 BLAKE2B 82a73eebc027e56c308aa2532dd9e09072252635659c7d401dc937548db759cbac8e0c98b9eb69d5155aef4ad185328214723eda1100f316b6531a72a0a579db SHA512 bfe17dc4f7699d3032bcf3e34c309964ebefffc06eecd07d8cac111181a27396c49e7944d05468fc1a89c18ebc70002d03fa0cc6ffb292469329aada8af15ad4
 MISC metadata.xml 360 BLAKE2B e7e420afb7a8377bffcf2a23f3954bbf4cc80fcd19a8514733e2e0164f4235271e21dc860bf77cb9cfcd1a4026ef3dafe97a10dc397e2d8e6f001f02bf6e9bc7 SHA512 d57f8f097617229f774b06437aaa83595aab2a6d9321d51b97dac8bd56fa94db396c7bdca538570f0912390e25ae8643c5adc374908757f67f1422fa1f872605
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r2.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r2.ebuild
new file mode 100644
index 000000000000..e7d0b6437284
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1
+
+DESCRIPTION="Common files needed by all GNU Emacs versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="games X"
+
+RDEPEND="games? ( acct-group/gamestat )"
+DEPEND="${RDEPEND}"
+PDEPEND="virtual/emacs"
+
+src_install() {
+	insinto "${SITELISP}"
+	doins subdirs.el
+	newins site-gentoo.el{,.orig}
+
+	keepdir /etc/emacs
+	insinto /etc/emacs
+	doins site-start.el
+
+	if use games; then
+		keepdir /var/games/emacs
+		fowners 0:gamestat /var/games/emacs
+		fperms g+w /var/games/emacs
+	fi
+
+	if use X; then
+		local i
+		domenu emacs.desktop emacsclient.desktop || die
+
+		pushd icons || die
+		newicon sink.png emacs-sink.png
+		newicon emacs25_48.png emacs.png
+		for i in 16 24 32 48 128; do
+			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
+			newicon -s ${i} emacs23_${i}.png emacs23.png
+			newicon -s ${i} emacs25_${i}.png emacs.png
+		done
+		doicon -s scalable emacs23.svg
+		newicon -s scalable emacs25.svg emacs.svg
+		popd
+
+		gnome2_icon_savelist
+	fi
+
+	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
+		added to ${SITELISP}/site-gentoo.el. In order for this site
+		initialisation to be loaded for all users automatically, a default
+		site startup file /etc/emacs/site-start.el is installed. You are
+		responsible for maintenance of this file.
+		\n\nAlternatively, individual users can add the following command:
+		\n\n(require 'site-gentoo)
+		\n\nto their ~/.emacs initialisation files, or, for greater
+		flexibility, users may load single package-specific initialisation
+		files from the ${SITELISP}/site-gentoo.d/ directory."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# make sure that site-gentoo.el exists since site-start.el requires it
+	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
+		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+	fi
+	if [[ -d ${EROOT}${SITELISP} ]]; then
+		elisp-site-regen
+		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
+	fi
+
+	if use games; then
+		local f
+		for f in /var/games/emacs/{snake,tetris}-scores; do
+			if [[ -e ${EROOT}${f} ]]; then
+				cp "${EROOT}${f}" "${ED}${f}" || die
+			fi
+			touch "${ED}${f}" || die
+			chgrp gamestat "${ED}${f}" || die
+			chmod g+w "${ED}${f}" || die
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use X; then
+		xdg_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	if use X; then
+		xdg_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index ad613498aa00..ad1aa974f7d9 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -2,5 +2,5 @@ AUX 50ess-gentoo.el 58 BLAKE2B a643ea2780e8bb7c211ad438b41d709d39e3484a99ab1d603
 DIST ess-17.11.tgz 3275703 BLAKE2B 50ec08040135fb05be35494829b347f1ce1c8fdb8bbc5c11f9327800cbfafbb4e7dd5dc46c2b6ce8d506e4e9ade90e369d14c0498e06f990eccbbacbb7d16cec SHA512 b2bb09d079922ed8bded04387e6aecd38d760d7a3b9a521044fb7e2537fdc0cbb59c707e5aa550fc76aa92a6c47eab0fa40f554060707cfc7656b19adbdea222
 DIST ess-18.10.2.tgz 2939425 BLAKE2B f9a6181dfaffc820a55214418d14aef1443945d6b15cb156ecfb70a8f5878df545662f37114a44ea8aa20338a5eaea6a6ce0884b02f108bd3372653db13e1eff SHA512 9bc04c5ec87ed639e56de9fd7817c3adb1a823f091254a91b906e22e8537fb097b21b80020bf245acbd61420d09949d66fc079f3c552d79bf32b95dc7fa1dca9
 EBUILD ess-17.11.ebuild 1124 BLAKE2B 126dc327e8e0f412d08a5c6adb8daa604ecdd85bde5e0e6fee730bcd2d2173ba4a05e7067253be798b2e3db6c6597e0c97a6bab59e3ebdd8fd3eae919c4d2ac7 SHA512 7ee82320175b473c4546833e082d9e100cd7a34d4037a4959942785fb25b2d927ec1430c4da343269b724c4a758ca65ea18702c0838f56413da2f563da68dda8
-EBUILD ess-18.10.2-r1.ebuild 1151 BLAKE2B 6829c65356024a1e6a93372e245ca85a192c56ec50c3cbfb8097f1b9aa046226b62b8841d1cb12b9156b2fbed0e242a0d74747d6747f5d9368b232cba3eaad60 SHA512 49a8f781838fa66690e121e11e08ecb5ef91fd0338ef8aa3d51e3262b5319821567f1bf2a46f6e0a9d06130efd7ae063153f6346305689d0c9f40bbac2397d39
+EBUILD ess-18.10.2-r1.ebuild 1148 BLAKE2B 5bf8ae9241f25270aac0e26b701e090c78a3f51cafa7b82d408122eab6dd43bb567fbe2488cd353ae91442739b481b8f8fa2b12a4ab022e6a8f2b86029324cca SHA512 36ddbc40021cae2135df9982aba8d7dc2780de020ebd66317df2a0f827cac502f492524033ab29a71006bf1f648ef0e3a1fedd6950540daa641fe04b901f8fda
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ess/ess-18.10.2-r1.ebuild b/app-emacs/ess/ess-18.10.2-r1.ebuild
index 9152a7ea4f81..dffe580968c9 100644
--- a/app-emacs/ess/ess-18.10.2-r1.ebuild
+++ b/app-emacs/ess/ess-18.10.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
 
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 RESTRICT="test"
 
 BDEPEND="app-text/texi2html
diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
index 95c81b770933..8844e71bad82 100644
--- a/app-emacs/flim/Manifest
+++ b/app-emacs/flim/Manifest
@@ -1,5 +1,7 @@
 AUX 60flim-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 AUX flim-1.14.9-mel-q-ccl.patch 1362 BLAKE2B 4883dfdb3ede7b93ec41cd02fe1da397a820101611afa51164a521aedbb780f04d2a7dbdf87e70506b2387d3edd95aacdaf46bc2adabb901b5a365ffecbca3b4 SHA512 b2edee110d53e2b31fe13ccfffd792668febd20e27a8014d77e9ad0b0a4540ab38cde97742ed67c515e58594808713edf9079812604521f1f1d481cd717a0132
 DIST flim-1.14.9.tar.gz 182065 BLAKE2B e15779e93a422bc2c2b82ab5969f2b3d30a31d47b96769abf89bfe7e9aebf74e5f0f0e87270bcc187bdaf3e1af4bdd663c7d6661f1adc9575af0e4ba1dd316f1 SHA512 a272a30f27cea24f537b9bf3a6dbb25113deff0ab8e1c03bd802e4d32d673d567d282297ed9e4d35217f069699a1fc25bfdde09778171a188dfa46f49e9bb7dd
+DIST flim-1.14.9_p20190526.tar.gz 173261 BLAKE2B f28b0d1474d894fd93d9899fe66bc88d6669cc6bdbb2511dcd0b2f13c05abbe42ad4cc06e2de34664204f3ddbb3cb4f09e232394419892b3fd8e71c1ab3aab75 SHA512 8991c460bf9eb411e89edb8fb05088cc09dc354e4c14d7accba26d922b2d1041742e96d8a64407ee8dd2574984c5b3a8fbd66e828c8f8fadc55f8da6428d634e
 EBUILD flim-1.14.9-r2.ebuild 969 BLAKE2B 97aa74a6ad442c1d762001782ac19a5438dc06a4cdf06718a598aefe2e134851f97fe0cc844c84904bcb336edf2016e04d9691051f4832b0eb2b97b621ac1dce SHA512 fb65778615d632680803699f358cc8c66f422638e87308ec9a387f280a6594eec500d7ef77eb3679bdfc68511eb427e7273707ebbd714965927f82a05d07c1a7
+EBUILD flim-1.14.9_p20190526.ebuild 1026 BLAKE2B e32c8fd9bffc82f1aecd825b9be9ec8c4cc0413517240d36f15fb711f3908b3924b85373431af082732ad52ec0ecb2dd8b7213add619cf8502aa4e6e5c0156d1 SHA512 7240a5a5a6b603853d2c2ce793ce0b2664c3eeb3bb863495320cad04e28eb756177d2304263c6bd966bcac166e2fc5f2a65b26b0a1c1d511ee64bafff3e51b2d
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/flim/flim-1.14.9_p20190526.ebuild b/app-emacs/flim/flim-1.14.9_p20190526.ebuild
new file mode 100644
index 000000000000..6bdc1e10d71f
--- /dev/null
+++ b/app-emacs/flim/flim-1.14.9_p20190526.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A library to provide basic features about message representation or encoding"
+HOMEPAGE="https://github.com/wanderlust/flim"
+GITHUB_SHA1="e4bd54fd7d335215b54f7ef27ed974c8cd68d472"
+SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+DEPEND=">=app-emacs/apel-10.8"
+RDEPEND="${DEPEND}
+	!app-emacs/limit"
+
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+	emake PREFIX="${ED}/usr" \
+		LISPDIR="${ED}/${SITELISP}" \
+		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}"
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" \
+		LISPDIR="${ED}/${SITELISP}" \
+		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	dodoc FLIM-API.en NEWS VERSION README* ChangeLog
+}
diff --git a/app-emacs/mu-cite/Manifest b/app-emacs/mu-cite/Manifest
index 2091513cefb4..e74401628278 100644
--- a/app-emacs/mu-cite/Manifest
+++ b/app-emacs/mu-cite/Manifest
@@ -1,6 +1,6 @@
 AUX 50mu-cite-gentoo.el 142 BLAKE2B f6631cf5bb32bf66af28c56cf21e0dd51ffc545a47ac82edb0db125b78bbf6a183553b6d0afedcde766df0ae349085253f3edb91718b949341a899f01e6f1733 SHA512 737b4c0c5ae0790e7cc8dbf0d253aadf7cd2680c54940967d93f95dbf6fe80fdbf5290560ef4eacfa16c1a26ab9567726228af7b3b649f859c01b021c10563ef
-DIST mu-cite-200709030413.tar.gz 19439 BLAKE2B 279627608af2759ee5fe566c315f8c2be168e0e4a01bc179ae7289f6c990f4a569d59288b02097a3230271ec4c1ba6aefa3db9e46271eb476eb50e912bacc9d0 SHA512 aee355abf8d77ca9ce6d5d2f00e5e8d9a1123b82bb15169bbbdf22c9447c37f1d200ffe1cd05abb61f1011c0d9731d3300d0e5bbf6f10ca6155c00a610a46703
 DIST mu-cite-201202272330.tar.gz 19212 BLAKE2B d52378258b3804e2867d6f8f6f471a73eebb3ff955df70a2ddc5dfd91d6ada2ea2349d44e86c81e1c314b88787b08b39f40238b22760a74b77f8393361aecdcc SHA512 78013bed020c46baeecf56bcd155eb6058d11b1d61a0af55b075454601e3cd1a992bdad887e125ffd569782a38e4509d60efdc431ded501c35da096133b475b8
-EBUILD mu-cite-8.1_p200709030413.ebuild 530 BLAKE2B f308931d0d93012c7201a48ab4ba0871e503aaa78cb122d5423dfdfc53bc8782bf7d98c5bd1b61a55b5fb87b0ed82a9754687cdd77352718f5a8e746d1526a6d SHA512 9139ceff997366d98f6bfec34025d3978faeb629232eeab133369e90cb413802a91465b8e6b98f0b6e998ba27456fda60535178127c30a6d38747e672e987068
-EBUILD mu-cite-8.1_p201202272330.ebuild 530 BLAKE2B f308931d0d93012c7201a48ab4ba0871e503aaa78cb122d5423dfdfc53bc8782bf7d98c5bd1b61a55b5fb87b0ed82a9754687cdd77352718f5a8e746d1526a6d SHA512 9139ceff997366d98f6bfec34025d3978faeb629232eeab133369e90cb413802a91465b8e6b98f0b6e998ba27456fda60535178127c30a6d38747e672e987068
-MISC metadata.xml 375 BLAKE2B 022df13d1d586579ed08af80b893ce2a1a9d1275720ec5d447efca002dd05a5544eaa6c1f01a5d6df2c0e7cf594eacf6a0c1fb840989674f8af537e1468ec6ee SHA512 24ea62246bc2d2c433dd071cf9906fe2f0c9dd834ba4d5bfadbbefcb9d47a063cd07da9c6756043c296c2ae56da39f18714416dab862d5f36fbd2f6100dc663b
+DIST mu-cite-201808232348.tar.gz 20443 BLAKE2B 814ebbd3ab45af4af65fee54884a1960a0cecccd07e1e0e084e860fcab4884ca0d97f4042f14f530b8ead4ee4347d13dbde9ecc96f5e82121bad44e0b93855ac SHA512 5a30124041ea5a807f5d8ea8a1ef18afcc7020d3f2d2bee4dd163fa1098d37d27b43db81c1b538bf1d1b06720840fb5c3f95d999fddd624437dd251fa061f699
+EBUILD mu-cite-8.1_p201202272330.ebuild 543 BLAKE2B 76d89b5bc1b895fa73a8979e23b2b76280f6a39821a0c2b06175643111eec9abbf2430f0f7042e06cf2c75405c64ac7009ea8748a3351a053bdc130d76716067 SHA512 097432f31951a446abf5fe1f60d5925189737fcfbeb11464b6524836986620675ac97552a565810d4a7a572d17b6ae41cf5fb14f2b08174cf2f8914ffa277a72
+EBUILD mu-cite-8.1_p201808232348.ebuild 616 BLAKE2B 79e1b6002f78a7cff3efe8eae072563b91fb37c625e378280a9a513913db86bda87e8e50fdc93a00115a166b218f1da5a52da657a7d37667b0ba1392788d68cc SHA512 a04ea2f2776bbd7bd3bbbe05df93baec2f19bbe4476eea309f65991dffd945be6996f82cb8eea513000a977ec7ee5481cb27f6d9beaeb9e5afbc8f16dd350ed2
+MISC metadata.xml 461 BLAKE2B e3af9dfa48edf30c53472e5fa450b7d9d22668845dca046060a5bc3ad14dc6e8d5d3c03b4b4102d65b6cd8d302f783d6e7a62c7d2a359beb7cd6a07ea6d19720 SHA512 0128a20ae81bc9256b1aba5f432a55b2004dec6bdebfac5c2e169c6d23962886fe3da889abdcac1e5dfd84020cf3d95e36c25710fe1323f2692c1e924ad5b241
diff --git a/app-emacs/mu-cite/metadata.xml b/app-emacs/mu-cite/metadata.xml
index c59c7fc25206..eea0cf345971 100644
--- a/app-emacs/mu-cite/metadata.xml
+++ b/app-emacs/mu-cite/metadata.xml
@@ -10,4 +10,7 @@
   <name>Cjk</name>
 </maintainer>
 <stabilize-allarches/>
+<use>
+  <flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild b/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
index 63f2fdaec660..0bf16aaea004 100644
--- a/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
+++ b/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="app-emacs/apel
-	virtual/emacs-flim"
+	app-emacs/flim"
+DEPEND="${RDEPEND}"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="ChangeLog NEWS README.en"
diff --git a/app-emacs/mu-cite/mu-cite-8.1_p200709030413.ebuild b/app-emacs/mu-cite/mu-cite-8.1_p201808232348.ebuild
index 63f2fdaec660..b27d88c3a9c4 100644
--- a/app-emacs/mu-cite/mu-cite-8.1_p200709030413.ebuild
+++ b/app-emacs/mu-cite/mu-cite-8.1_p201808232348.ebuild
@@ -1,27 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit elisp
 
 MY_P="${PN}-${PV#*_p}"
 DESCRIPTION="Message citation utilities for emacsen"
-HOMEPAGE="http://www.jpl.org/elips/mu/"
-SRC_URI="http://www.jpl.org/elips/mu/snapshots/${MY_P}.tar.gz"
+HOMEPAGE="https://www.jpl.org/elips/mu/"
+SRC_URI="https://www.jpl.org/elips/mu/snapshots/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="bbdb"
 
 RDEPEND="app-emacs/apel
-	virtual/emacs-flim"
+	app-emacs/flim
+	bbdb? ( app-emacs/bbdb )"
+DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
 DOCS="ChangeLog NEWS README.en"
 
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	emake EMACS=emacs
+src_prepare() {
+	elisp_src_prepare
+	use bbdb || rm mu-bbdb.el || die
 }
diff --git a/app-emacs/semi/Manifest b/app-emacs/semi/Manifest
index 5656626d19ab..4fa6511c0a68 100644
--- a/app-emacs/semi/Manifest
+++ b/app-emacs/semi/Manifest
@@ -1,5 +1,7 @@
 AUX 65semi-gentoo.el 60 BLAKE2B 19bc99330e4583e19060bba3722f73da5a5e232e0e60673ba21c3b02dd3429098685313380f788bbce5a23c98618f2adc22115a1b47abe2969c25db3d8b6716a SHA512 a8441acdfac8f82dfa65e796e39dd77ce5ff7569e0deb930d31c7c90ce7ccd4be138f51a4866a1036ea6234c6419e548a5df74fc932cb5b588dd99acc2c2d314
 AUX semi-info.patch 1009 BLAKE2B 936ce69c254eca176f7bdbaae92dcda7fe921214b1d089ce8bbdf9d05fad0872ae2c3e1978c6c60663539d427f863f225cb11d604de80c0fe5d2f0bfb4898365 SHA512 d3e3700f8bc19e48d7a5ec419d7a1f5e5683fe18e6097b52d47f73dee47624b095e3dae4a064b023a6ad2cf5d84705aefa04f94ff85aa9a854c1d9cf3dc7f052
 DIST semi-1.14.6.tar.gz 142549 BLAKE2B e417b305ad814b2a23fad4fd37057395efb47bdb61778aa167149eda4277cda47dc81148821d9e4ad3225a858c77f781a6565c3e49747d78882b9401fd5fbac1 SHA512 1011271c58414f4ca23da079f16f273b408643e0d9f4961db321b65c1ed9a7d4ca66a7d7cb5b0c9fa2b4904fa992c9188858de6131180ee30132d3cadaeef33f
-EBUILD semi-1.14.6-r2.ebuild 1304 BLAKE2B 9e8de8281fc0c46440ee957baf9d73e73a0926e45f638d800dede6b94f98e2d81d8e951a3ae4886695770b7908f0442894fdee87b4595f0313773b5bc414e668 SHA512 8cbaee733cd898381063722b48502842fb8d3113a95b6416479e234a0b966eb5cd6212edf736bb900a7972d6885998e03ac27d0d5dafd41b1dd799642781a33c
+DIST semi-1.14.7_p20190517.tar.gz 152636 BLAKE2B a22b1f9a5de0a695de2d8e342ca313af05c12a1c0b597890d926496e9ce240e3329365700f91e6268cf399976ec067163ac8197c7a643e499d70851501f63798 SHA512 d25c940fdd0a048d21079d905ae91521a1f1247b8f78145baeba24c994c0d5b30985a76c909a793f82f6253b323fb4699bbf059ea48037bb49ae92505b0c6d18
+EBUILD semi-1.14.6-r2.ebuild 1297 BLAKE2B 9ac36cba82f5bada681bf11756509bc32d112b4c16b4063b8c09b17ba45e8d7dc266b405bce5c38f1686880c75aa6951823fb998c3c33c5e40d72787033a5da0 SHA512 bf13d405220097a73409b90076da8615ed3b773b6b69c7e95d2c1e159fc01aba0d9ee38f3be68fd239134e36d0f398c4dc7dc21728d21bcbc0da6e249b375062
+EBUILD semi-1.14.7_p20190517.ebuild 1335 BLAKE2B 913cd38bcccb9ecae2cafe12f4bd736dfff64e530a4bacd8223fd1dfc896df73aa5f19a7a6fe86538d3d2bc5b48b8dc79062b453c99f0f79dded95696c492b2f SHA512 cddab6a546842c474db2c5a663139401a1a2b3b225d120c1fc5781b0fef289af39cbf138fe9977ce7652b4a56f50342b738363df6413ad5e52b3a4ff7f66ecb5
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/semi/semi-1.14.6-r2.ebuild b/app-emacs/semi/semi-1.14.6-r2.ebuild
index 5555c415b5d7..7d4fcf4b0e63 100644
--- a/app-emacs/semi/semi-1.14.6-r2.ebuild
+++ b/app-emacs/semi/semi-1.14.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-maco
 IUSE="l10n_ja"
 
 DEPEND=">=app-emacs/apel-10.6
-	virtual/emacs-flim"
+	app-emacs/flim"
 RDEPEND="${DEPEND}"
 
 ELISP_PATCHES="${PN}-info.patch"
diff --git a/app-emacs/semi/semi-1.14.7_p20190517.ebuild b/app-emacs/semi/semi-1.14.7_p20190517.ebuild
new file mode 100644
index 000000000000..0641b8318049
--- /dev/null
+++ b/app-emacs/semi/semi-1.14.7_p20190517.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A library to provide MIME feature for GNU Emacs"
+HOMEPAGE="https://github.com/wanderlust/semi"
+GITHUB_SHA1="4cf114c95fb49ad75eb6916f678b45b04bad8122"
+SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="l10n_ja"
+
+DEPEND=">=app-emacs/apel-10.8
+	>=app-emacs/flim-1.14.9"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+ELISP_PATCHES="${PN}-info.patch"
+SITEFILE="65${PN}-gentoo.el"
+
+src_compile() {
+	emake PREFIX="${ED}"/usr \
+		LISPDIR="${ED}/${SITELISP}" \
+		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}"
+
+	${EMACS} ${EMACSFLAGS} --visit mime-ui-en.texi -f texi2info || die
+	if use l10n_ja; then
+		${EMACS} ${EMACSFLAGS} \
+			--eval "(set-default-coding-systems 'iso-2022-jp)" \
+			--visit mime-ui-ja.texi -f texi2info || die
+	fi
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" \
+		LISPDIR="${ED}/${SITELISP}" \
+		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	doinfo mime-ui-en.info
+	dodoc README.en ChangeLog VERSION NEWS
+	if use l10n_ja; then
+		doinfo mime-ui-ja.info
+		dodoc README.ja
+	fi
+}
diff --git a/app-emacs/sumibi/Manifest b/app-emacs/sumibi/Manifest
index d51ad37e0d78..d5291f46a33a 100644
--- a/app-emacs/sumibi/Manifest
+++ b/app-emacs/sumibi/Manifest
@@ -1,4 +1,7 @@
+AUX 50sumibi-gentoo-0.7.4.el 123 BLAKE2B c93fd2b06ba4fb72501271b517e719c81c95653d384cb916e837e3acca183960ac01c5e6fc3b1e80875578368be491a00b6b214650dfb25665600c28ebb9fc71 SHA512 4432779e38518ce204e93eb908b2d1ef0a0cc90c92b7959f5dafcdc468955789ad81f321c5d15dbcebbf5a5fff7263a71770fcb3c1127b9e4afe61c952298dc8
 AUX 50sumibi-gentoo.el 55 BLAKE2B 85278737f6d56a153f6fbf4960bb75a5e1846ac22564f2935973c8998e44fd0293023e5c07cdb1699d0b70f572d3a2a9e19f9d5e5d47630e6c1caeb020d182c1 SHA512 d0042f963199f820cbf231168362873f1a701f81decc0b26a5b63eda68d9cde3485d3cbe23b77e615102bb2f12bf83c41e30c059873f5245555903fd026d453f
 DIST sumibi-0.5.2.tar.gz 26755 BLAKE2B 329c094ed118e9dc53af1fb77fa31f8db5b97d69ac39fb0eaba99eeeeb8ab4588b1f9e232145a3c377fcf38bbaced605e86dd8c1ccb078969762d475d9cff7b7 SHA512 b630be8b7c73ba5e0babc2c2946ddb05019fa15b0a8aaf5b578c97de32094de174d6ced9c0168b2e802e35e2b30b4a02501a0d8c41b90a8f8bb4a85fe501cff3
+DIST sumibi-0.7.4.tar.gz 66886 BLAKE2B 9da3a411bc232061f311e70e9dadcb8399f36842d2e344145604e5c26cdcf46f00f38ef2d8130a2a56dde729a9e0348ad7056d00d764389dde4717d622d24478 SHA512 23c78c445479699551a5a25d67bb909746b6b1377bc81c372ffee02a4baf7968490d454b54340ec0cb46ec92d21a3945b8bb231f8b9833309022c204373d0a2b
 EBUILD sumibi-0.5.2.ebuild 717 BLAKE2B 97f5d613608b7d2af7d139b6197e41fd263cef4db00c6309c64434ad89964f3f1bd5ff2b77447a033522b990abb6011ee81bf1ebc73993b45a734683e60ea405 SHA512 79a7b65b1601cae5a9b86d4103182d38357a5313faa3bf35f75b555916b9c4090dfc7f2b2912accc83f71d304d703aaa65a878d02d3416acbbfa5df2b851dab2
+EBUILD sumibi-0.7.4.ebuild 489 BLAKE2B 44419a075f55137f251557c128c5be6b11c4f48b9b90778289d844d0125c8f37896cb8bb93eca72de36f7d5bb9fe226f15631c9c3c303de512c879fda8986291 SHA512 486458d31440b2373be139f778198eb222abf9f41f8f9c05f3858f7e60805db96f044d2e476bbe4f3042ebe5fd8a24a122741457a87b22386335247bc5fae07a
 MISC metadata.xml 452 BLAKE2B bfbc315b53a31a9c428ee6b2e95efc541114a73cf1f7893c1d8948d2b9c8ef5ab200f038f79fcbb43db63df2020a40bc545b5ed16a8f0a1796bb270e44ca4cde SHA512 732025258d9133fd4a4955cd9958fdcc666fd19486fb2d6d0ce19e152cf28e8779e177c2364a0ddb8a30be370fb0c01339b895cf9e7418ccb72e4463d5d6dc3f
diff --git a/app-emacs/sumibi/files/50sumibi-gentoo-0.7.4.el b/app-emacs/sumibi/files/50sumibi-gentoo-0.7.4.el
new file mode 100644
index 000000000000..38e2089d1256
--- /dev/null
+++ b/app-emacs/sumibi/files/50sumibi-gentoo-0.7.4.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'sumibi-mode "sumibi" nil t)
+(autoload 'global-sumibi-mode "sumibi" nil t)
diff --git a/app-emacs/sumibi/sumibi-0.7.4.ebuild b/app-emacs/sumibi/sumibi-0.7.4.ebuild
new file mode 100644
index 000000000000..bb61812646f8
--- /dev/null
+++ b/app-emacs/sumibi/sumibi-0.7.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Statistical Japanese input method using the Internet as a large corpus"
+HOMEPAGE="http://sumibi.org/sumibi/sumibi.html"
+SRC_URI="mirror://sourceforge.jp/sumibi/26504/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P}/client/elisp"
+SITEFILE="50${PN}-gentoo-${PV}.el"
+DOCS="../../CHANGELOG ../../CREDITS ../../README"
diff --git a/app-emacs/undo-tree/Manifest b/app-emacs/undo-tree/Manifest
index 9f3a3a5e8211..79466761d79e 100644
--- a/app-emacs/undo-tree/Manifest
+++ b/app-emacs/undo-tree/Manifest
@@ -1,8 +1,4 @@
 AUX 50undo-tree-gentoo.el 176 BLAKE2B 4b6922264c736a25a04cf337ccd897b2869594b53ef6c5b4ebba1055ef9affd50d702bf6966b6e8009be4c769c5504c1e099a57320122eb2002d68e351cb0ffc SHA512 bdd1399c0dab9cf7a5f86f41d77062eec5aca2171f1e78f5822f11e2ae5cf9581a1646cc6e3a6e3a53b8835a11e13f04d8c8accdc0d6fadf63f22056bdfe8476
-DIST undo-tree-0.5.2.el.bz2 27985 BLAKE2B a9c4fe9a1cf245278f88df97d6269c81a3ebae9d10a62b8390805c06636516fb7163dc5b4cfc81463e0b45f9cd04664b8aa5c86c3ebb56a7f07e86ee45f0305c SHA512 62b355cbebd4e17a59b70acdae69bdddc9a6fd57d5c684d0560eb03dfac69121bc63941ef6520853b174a6de0a5ae54dc4f240a55f0623312a86e799ea3785d0
-DIST undo-tree-0.6.4.el.xz 31124 BLAKE2B a81bb93489189d04ea81b98912fef6b7a6903f24548dcf9a9f44decc77e3219dd233d2d91c1c6c32047565297aa8583c09dc451ca060a10b52fc7b4e85d32b2d SHA512 e7017b23cceaf544de855bb21059959df539f5380db9c15b62f171d037b6ebb2d31f86f7ab3b724b048dafddfc3d2ace65dfac84c3eb0f6847489afb7f4b99cc
 DIST undo-tree-0.6.6.el.xz 31520 BLAKE2B 01ddd3283ab257de91bd3f38969b7426f21df58e010302d21ea093c9428481a4595ea7806c107c7f87f46825bf379e22423004a72d73fedf8c2a6138afeba510 SHA512 0510ca0020515d0afaf13dcfd1878fa527472a4115534b8f72ed907507a700b34fe7151f0f9aca3e9977f9d48a6fae231483beb14b63f1ce734dd6b3b0322a7a
-EBUILD undo-tree-0.5.2.ebuild 499 BLAKE2B 910b898865e60783ed1d44d978a0bd3f23cb2e2fe8b1680d511208fdb5bfd7de3afacb4d852f5ba27f8fc90dacc64e120731ae0db5ac30c6b0ab9c201612351d SHA512 fc2e445a7ce7227faca4b1f669a1b49a2d46219eabb0f192caaf7fc4c7332c1a1224ba047255f767a22e45796881f0b105462956e65300b6b4f51f3d3e890872
-EBUILD undo-tree-0.6.4.ebuild 486 BLAKE2B 25d6a62f941e76d373abd6a152e7ba0a4145068554526cf3379d9b81506374458cc803015410eb64d9646d711009cdc33f2c2c6c6c9a280cf46195bcb1352bfd SHA512 ba8b8b4d3fe4816e3e30d4c80d864f877346657c27fb741eda701d6cf624c2feb1c290b2529edad3623a64fff7087225f5be65c6977c6ad1413ef257265c2ba9
-EBUILD undo-tree-0.6.6.ebuild 491 BLAKE2B d1581f90c9f9b8cf576400821a674d2840183e557149c48d14eb48856ae894a87b15f22d280d1fb885d96984098cea968c8826076859d6d3b20c46a64fa9f42f SHA512 b80959ee09fe94d3a2213715e9755f349f6a2497cbe151c6649e900f791a84a75e841ed540d4df503e6094a011584a90a26d6503ddbc6aaef2efaf6cd84ab1e3
+EBUILD undo-tree-0.6.6.ebuild 489 BLAKE2B 8ff82dacd967f19d5a69658926f7fc1d5e1746225ca60cef478e24f2c746bb9a9893127619d07cd2b813d51a513a2a468ba44dd54f40c973c274cf895b61db20 SHA512 049649cedfa50eef2519ecf6eb7d29a00dc412f792d54174e40df1ec8cbe013a47380c4a75e31f9a4b794b5c9d4173504794e15da914e4a226cce9c8fc8c76a4
 MISC metadata.xml 1615 BLAKE2B de03d03f942a062e9f6e7321e1e83b9a95d99999f203ac3a054ffe09079ac6de4767a5b52a1320f7d977125a1a461a9fb8b2a7ddfc8fddf361d23815ab5bfb53 SHA512 e9911761e904a9bbbb948db7c91fddfc60858afe46aeb9023e9c737a4e7d1922435023a723d2bc54a7e4098080564f056e4bd8a231e187b70fb652d48ed14eca
diff --git a/app-emacs/undo-tree/undo-tree-0.5.2.ebuild b/app-emacs/undo-tree/undo-tree-0.5.2.ebuild
deleted file mode 100644
index 89bd897ea230..000000000000
--- a/app-emacs/undo-tree/undo-tree-0.5.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Undo trees and visualization"
-HOMEPAGE="http://www.dr-qubit.org/undo-tree.html"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "To enable undo trees globally, place '(global-undo-tree-mode)'"
-	elog "in your .emacs file."
-}
diff --git a/app-emacs/undo-tree/undo-tree-0.6.4.ebuild b/app-emacs/undo-tree/undo-tree-0.6.4.ebuild
deleted file mode 100644
index 57ba4e7aba62..000000000000
--- a/app-emacs/undo-tree/undo-tree-0.6.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-NEED_EMACS=24
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Undo trees and visualization"
-HOMEPAGE="http://www.dr-qubit.org/undo-tree.html"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-SITEFILE="50${PN}-gentoo.el"
-DOC_CONTENTS="To enable undo trees globally, place '(global-undo-tree-mode)'
-	in your .emacs file."
diff --git a/app-emacs/undo-tree/undo-tree-0.6.6.ebuild b/app-emacs/undo-tree/undo-tree-0.6.6.ebuild
index dbbb135425c7..2c494eeba2d4 100644
--- a/app-emacs/undo-tree/undo-tree-0.6.6.ebuild
+++ b/app-emacs/undo-tree/undo-tree-0.6.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
 DOC_CONTENTS="To enable undo trees globally, place '(global-undo-tree-mode)'
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index 0ad56b14cd13..022241bd5045 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -1,12 +1,9 @@
 AUX 50wanderlust-gentoo.el 244 BLAKE2B 57be93cdfb9e1854ec5841996b586843ca6e514830d2c979ba9aa400200a6514220e632985a5fd6191969ef5b8a2ff32c4d2d7edfb83017c4230028107b4ab87 SHA512 2057a8d18d5c7c91c968921799d502e02a61718d437ce9a69de68ebe4f409414a799ca7b5737a8994afd52793cf03eebce03b85311db02c441efba92f0d30233
-AUX wanderlust-2.14.0-smtp-end-of-line.patch 628 BLAKE2B 0d4252e6ee9df868c2abf68ba43f7a641a295da96830a3f907b75bac92a870391b3f610a52fa778ef130e7196c433befc3ef5b3aaa30c14248f50cddf8dcddbb SHA512 a365e24bd369dd3dcc66c45651742a33bbe847536c1362c466a64cdbcdc0908f5119e8daed70f42e2634bf4d09b9e1c4dabf8405794fa915685b1647aa5eeeef
-AUX wanderlust-2.14.0-texinfo-garbage.patch 473 BLAKE2B 390a5da8f74008b4c4c707d3ac11e8b66a9337e6b904a4072ac319ed7bee22f507a1b1dcbbb025c1ab5647e88c9da0feab4303d53e1336541f26e3f44256a279 SHA512 1f728259179beba3cc543725b5087ce2d80c9167c9f447ed60aa38225b23eef7da2a018f6150ee6eeadea0d7bf4d55269c32df9bdb4120e4a99d3955bba839ce
 AUX wanderlust-2.15.9_p20130619-default-truncate-lines.patch 538 BLAKE2B db1e43daadd1a90eb25f1da6049956af1a242da0579b7e6f5bed31663c380d0626deaf33061eccd35c6def09f3f31243736eed44bf831f1e60fb5a1f06ae6baa SHA512 80cfa3aa2353cab77032111da3527660c9458d3bab74f73dde7030744f0ea3318f53c614e325bf4b971e1307f7dbecd9f645f4f4ba6e902820df5e56f02740f6
-DIST wanderlust-2.14.0-20050405.patch.gz 3926 BLAKE2B 0986f743e512cc7216554585c1c62af659fe35873bfcdfdb520e4085ec2606360ae1a29566ac756ad0e7f03cc51d1e5c0bd7460c8448ceb6251004d887858885 SHA512 103e8eda374eab453363f3a735d877e313ff341e09abd66093bd090b404738d42d98edf5d1c9c8e8966963bf972d462aebc28ea6e470126af9266188247c4044
 DIST wanderlust-2.15.9_p20130619.tar.xz 818124 BLAKE2B b6bbd6f63d862f81a5a0c194f0fe1b276303f75f8ffde29c844f1f7d2d8ef55f1c211ac1d0b6c3357c2507b2abe73ba1c4c8f5fc65e067d93eb6bf23fd8490a6 SHA512 91bdcc1b29370b7be7a2072f4d8c638b3c0604ba31b5419952b848af268e73a3f199f07a88caabec56f66b38013e0f9cd7c1de26b46d1062ddff782e8080d4e0
 DIST wanderlust-2.15.9_p20180814-git.tar.gz 1207081 BLAKE2B f52259b15040287f0afcf0768b3ae3237415b44960e205e48d4b658f3e522db993b87bac59ee3d9ba94ad26c830beaf26d9cf5f03830fcb1f01e4f5567ee4804 SHA512 67616cc1d35b25af1b56fa800943ad0c7e7d9b35f99c48fac96b77a68a3eb8db02b36525021ff8bba4d181530505face2a58725b7dff33b1bfe4f48a4314949f
-DIST wl-2.14.0.tar.gz 1101505 BLAKE2B 5ceb3a8e294b230d48d50134e3dc07b9e19a9470907a488a2e41e53da54a8826a50cb53c06c5f3f1a5bdd1b5760bc6acd6cc75a25e63d092f1a9b80b3f073ed5 SHA512 edb49c0c9ddbd50cba4ce4cdd1b2d609cee9553d063aeb4775d0b43e0ed83cc6374aa47b11b3ff94a55827f7a9a29f7c1054e0fd9b3a5a25a2c410b241d268d2
-EBUILD wanderlust-2.14.0-r6.ebuild 1424 BLAKE2B 0219b71a6101f9e0c1de504fbcd90e1abde1f16349307b0c55c2010e8461f8a42f9f05c162c91dd0161d45d7dd17223e81cbdad3e9ef383ca225e47da6d19602 SHA512 6bf2c20f0aea275049dbb05d49b441c5a6214a8f81d9a47ea2891e150d1a70a51700c1b9189392d6aa55dd64acab4cdf9607d574094b5ab49139f12655131c24
-EBUILD wanderlust-2.15.9_p20130619.ebuild 1341 BLAKE2B d24c529f032eff7536c0a6593ef1a8296b0d98c690884c989e2fc008ebdb0a2aad1dacc4b6d56977b9c5fc85cce15d03b20ad4d544a170838ff95123e4e74c28 SHA512 585137298c2e4c2a5788cffca6a99911cf1411e36358bd183e7b67f26025bbd34e627cee6001025281377de960dd2b51c3d4094e3cb5063c412d83f5bade2035
-EBUILD wanderlust-2.15.9_p20180814.ebuild 1331 BLAKE2B c527b5a866cb25af4a93c1ad3a9b7af653bf58cad9251d660443df92d3be531e7361d126499efaa94be00fa16f838992fc19f32f3526085e69ee7ba8f912bc5a SHA512 b70725b287be695deb8dbf4b12af7f9c46248d5c7cc5200597e85159e50d8994d1e224c30575cfd7d165418cda0544cf3a40110c60d0b0635c2a0235850a08e8
+DIST wanderlust-2.15.9_p20190623.tar.gz 1210223 BLAKE2B 50416e27062a9837c18660ea9a1a7a3ff596639763965b09925ca16c89617d159b9aa5d08d93d8b5c6a504da2b048df8b4c489d4fc11ff6abc530f741a5d8fb9 SHA512 369f8d93af4d0d98f66c4c8500aa3535e3f772d8a1920c1bdc434f0d9078555f40d0d4278937d97bccf0f417cf1b1fdeb6c8a891d42b2675fb7737382425c91d
+EBUILD wanderlust-2.15.9_p20130619.ebuild 1334 BLAKE2B 005b9b627032bf3722a988e788df39040090d81161cf8629ae26cde5a94eee3e46af3f55cbc7c28e58942c70fa589faa9bd2ba1271ef286a83326430dac75b48 SHA512 4460fde276caa8ae63a9af5ece918f35913f4749916e2abd38268f2aff146bac528f0514fd8d09504dd7dad7fbd6d115e08fc5a459f662afdd23556be97b2053
+EBUILD wanderlust-2.15.9_p20180814.ebuild 1324 BLAKE2B fb7abd2e4252ac534463e89502d674e4481be355bdb3c7c79ac73d09d03d31930a86af306cca4198b5020fd75c390b3864019daed60f22ff9461443bc0af6127 SHA512 a0619df4f09bae8da12e472a86e460f9791f4f95285253fde06a035a5ff469d2ad22e357697202815b9adc40b66942d92779649a3029f744d64de262e7a1aa10
+EBUILD wanderlust-2.15.9_p20190623.ebuild 1338 BLAKE2B 49acbff36a8513f7b9b5a11f9947507ef498b01110118e3434a1c21a6929f2796ac485c87cb7b0fc04bd2826ece6b1257f81a72d042833cdbdbb39d59f4b7f57 SHA512 fdd3dfdb8c0783365f59345651b48378304fa530ac0969cf947b5aa4507d7d1342479c713242668888e5ab57a7192d3d0e666c01570e0b767dde7108d58c4065
 MISC metadata.xml 452 BLAKE2B 79c5173a90f5687cadfb5fbf4bddfdaf4838d7b8b13d8df5f6221f2fc3a8ef777eebd7f13ec4bad09621082d688566cde30154b9c684deadd0e05c083e079857 SHA512 449539b7243e9d6646fa5cf7d56aa2cf227a6104c1dd2f1fbfdb843d7561b94315e649e2cfd5646093bed06f4f172e08adeb034a52b7b654fb3e49cabc45f8e6
diff --git a/app-emacs/wanderlust/files/wanderlust-2.14.0-smtp-end-of-line.patch b/app-emacs/wanderlust/files/wanderlust-2.14.0-smtp-end-of-line.patch
deleted file mode 100644
index f03542522ed2..000000000000
--- a/app-emacs/wanderlust/files/wanderlust-2.14.0-smtp-end-of-line.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/280248
-Don't bind smtp-end-of-line. Patch from upstream CVS, by Yoichi NAKAYAMA.
-
---- wl/wl-draft.el	28 Jan 2006 09:03:41 -0000	1.258
-+++ wl/wl-draft.el	9 Feb 2006 03:57:39 -0000	1.259
-@@ -147,10 +147,6 @@
- 	     (if (eq wl-smtp-connection-type 'ssl)
- 		 #'open-ssl-stream
- 	       smtp-open-connection-function))
--	    (smtp-end-of-line
--	     (if (eq wl-smtp-connection-type 'ssl)
--		 "\n"
--	       smtp-end-of-line))
- 	    smtp-sasl-user-name smtp-sasl-properties sasl-read-passphrase)
-        (setq smtp-sasl-user-name wl-smtp-posting-user
- 	     smtp-sasl-properties (when wl-smtp-authenticate-realm
diff --git a/app-emacs/wanderlust/files/wanderlust-2.14.0-texinfo-garbage.patch b/app-emacs/wanderlust/files/wanderlust-2.14.0-texinfo-garbage.patch
deleted file mode 100644
index 6be41a99b70c..000000000000
--- a/app-emacs/wanderlust/files/wanderlust-2.14.0-texinfo-garbage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wl-2.14.0-orig/doc/wl.texi	2005-02-25 16:05:48.000000000 +0100
-+++ wl-2.14.0/doc/wl.texi	2009-08-10 16:15:29.000000000 +0200
-@@ -4329,7 +4329,7 @@
- 
- @item wl-summary-resend-use-cache
- @vindex wl-summary-resend-use-cache
--The initial setting is @code{nil}¡£If non-nil, messages are resend
-+The initial setting is @code{nil}. If non-nil, messages are resend
- using cache even in the offline status. Note that if you use cache,
- the message identity is not guaranteed.
- 
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
index 51d5a4750a4c..d655a9b90794 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.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=6
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bbdb ssl l10n_ja"
 
 DEPEND=">=app-emacs/apel-10.6
-	virtual/emacs-flim
+	app-emacs/flim
 	app-emacs/semi
 	bbdb? ( app-emacs/bbdb )"
 RDEPEND="${DEPEND}"
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
index 6885a08624db..b425c3ba6b4e 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.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=6
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bbdb ssl l10n_ja"
 
 DEPEND=">=app-emacs/apel-10.6
-	virtual/emacs-flim
+	app-emacs/flim
 	app-emacs/semi
 	bbdb? ( app-emacs/bbdb )"
 RDEPEND="${DEPEND}"
diff --git a/app-emacs/wanderlust/wanderlust-2.14.0-r6.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
index 1f0b3fc12a3e..232c0e9e7dee 100644
--- a/app-emacs/wanderlust/wanderlust-2.14.0-r6.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
@@ -1,32 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit elisp
 
-MY_P="wl-${PV/_/}"
 DESCRIPTION="Yet Another Message Interface on Emacsen"
-HOMEPAGE="http://www.gohome.org/wl/"
-SRC_URI="ftp://ftp.gohome.org/wl/stable/${MY_P}.tar.gz
-	ftp://ftp.gohome.org/wl/beta/${MY_P}.tar.gz
-	mirror://gentoo/${P}-20050405.patch.gz"
+HOMEPAGE="https://github.com/wanderlust/wanderlust"
+GITHUB_SHA1="b9a529a54b9e7eafa4ed230ad28efffe0d25a20e"
+SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bbdb ssl l10n_ja"
 
-DEPEND=">=app-emacs/apel-10.6
-	virtual/emacs-flim
-	app-emacs/semi
+DEPEND=">=app-emacs/apel-10.8
+	>=app-emacs/flim-1.14.9
+	>=app-emacs/semi-1.14.7
 	bbdb? ( app-emacs/bbdb )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-ELISP_PATCHES="${P}-20050405.patch
-	${P}-smtp-end-of-line.patch
-	${P}-texinfo-garbage.patch"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 SITEFILE="50${PN}-gentoo.el"
 
 src_configure() {
@@ -52,7 +47,7 @@ src_install() {
 	insinto "${SITEETC}/wl/samples/en"
 	doins samples/en/*
 	doinfo doc/wl*.info
-	dodoc BUGS ChangeLog INSTALL NEWS README
+	dodoc BUGS ChangeLog INSTALL NEWS README.md
 
 	if use l10n_ja; then
 		insinto "${SITEETC}/wl/samples/ja"