gentoo resync : 30.06.2019

6 files changed, 19 insertions, 54 deletions

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"