gentoo resync : 02.08.2019

4 files changed, 2 insertions, 80 deletions

diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index 022241bd5045..e56fdc359e6a 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -1,9 +1,6 @@
 AUX 50wanderlust-gentoo.el 244 BLAKE2B 57be93cdfb9e1854ec5841996b586843ca6e514830d2c979ba9aa400200a6514220e632985a5fd6191969ef5b8a2ff32c4d2d7edfb83017c4230028107b4ab87 SHA512 2057a8d18d5c7c91c968921799d502e02a61718d437ce9a69de68ebe4f409414a799ca7b5737a8994afd52793cf03eebce03b85311db02c441efba92f0d30233
-AUX wanderlust-2.15.9_p20130619-default-truncate-lines.patch 538 BLAKE2B db1e43daadd1a90eb25f1da6049956af1a242da0579b7e6f5bed31663c380d0626deaf33061eccd35c6def09f3f31243736eed44bf831f1e60fb5a1f06ae6baa SHA512 80cfa3aa2353cab77032111da3527660c9458d3bab74f73dde7030744f0ea3318f53c614e325bf4b971e1307f7dbecd9f645f4f4ba6e902820df5e56f02740f6
-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 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
+EBUILD wanderlust-2.15.9_p20190623.ebuild 1335 BLAKE2B 2fe37f003e660137388d46587c743ba3581509b10795dfcb46cdc22b014a62db95acd16c430ebf3f4e83864b6be835956fcf68c08c11f426ac56f9b8b973cdc5 SHA512 615a1fe8b68b3f2c0684fa150fd0b548992e8322b00e36e42db5db663836042401e5e268cde98c19692c76aebf27c1b63d2aa140e5eb1ff5589be368a4177472
 MISC metadata.xml 452 BLAKE2B 79c5173a90f5687cadfb5fbf4bddfdaf4838d7b8b13d8df5f6221f2fc3a8ef777eebd7f13ec4bad09621082d688566cde30154b9c684deadd0e05c083e079857 SHA512 449539b7243e9d6646fa5cf7d56aa2cf227a6104c1dd2f1fbfdb843d7561b94315e649e2cfd5646093bed06f4f172e08adeb034a52b7b654fb3e49cabc45f8e6
diff --git a/app-emacs/wanderlust/files/wanderlust-2.15.9_p20130619-default-truncate-lines.patch b/app-emacs/wanderlust/files/wanderlust-2.15.9_p20130619-default-truncate-lines.patch
deleted file mode 100644
index d6da446cc84a..000000000000
--- a/app-emacs/wanderlust/files/wanderlust-2.15.9_p20130619-default-truncate-lines.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/wl/wl-vars.el.orig	2018-07-27 21:05:15.768467090 -0500
-+++ b/wl/wl-vars.el	2018-07-27 21:05:45.590468576 -0500
-@@ -1742,12 +1742,12 @@
-   :group 'wl-pref
-   :type 'string)
- 
--(defcustom wl-message-truncate-lines default-truncate-lines
-+(defcustom wl-message-truncate-lines nil
-   "*Truncate lines in Message Buffer."
-   :type 'boolean
-   :group 'wl-pref)
- 
--(defcustom wl-draft-truncate-lines default-truncate-lines
-+(defcustom wl-draft-truncate-lines nil
-   "*Truncate lines in Draft Buffer."
-   :type 'boolean
-   :group 'wl-draft
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
deleted file mode 100644
index d655a9b90794..000000000000
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Yet Another Message Interface on Emacsen"
-HOMEPAGE="https://github.com/wanderlust/wanderlust
-	https://www.emacswiki.org/emacs/WanderLust"
-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 ~x86-macos"
-IUSE="bbdb ssl l10n_ja"
-
-DEPEND=">=app-emacs/apel-10.6
-	app-emacs/flim
-	app-emacs/semi
-	bbdb? ( app-emacs/bbdb )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-ELISP_PATCHES="${P}-default-truncate-lines.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	local lang="\"en\""
-	use l10n_ja && lang="${lang} \"ja\""
-	echo "(setq wl-info-lang '(${lang}) wl-news-lang '(${lang}))" >>WL-CFG
-	use ssl && echo "(setq wl-install-utils t)" >>WL-CFG
-}
-
-src_compile() {
-	emake
-	emake info
-}
-
-src_install() {
-	emake \
-		LISPDIR="${ED}${SITELISP}" \
-		PIXMAPDIR="${ED}${SITEETC}/wl/icons" \
-		install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" wl
-
-	insinto "${SITEETC}/wl/samples/en"
-	doins samples/en/*
-	doinfo doc/wl*.info
-	dodoc BUGS ChangeLog INSTALL NEWS README.md
-
-	if use l10n_ja; then
-		insinto "${SITEETC}/wl/samples/ja"
-		doins samples/ja/*
-		dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja
-	fi
-}
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
index 232c0e9e7dee..bfb9cae0e084 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
@@ -12,7 +12,7 @@ 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.8