gentoo resync : 13.10.2019

4 files changed, 15 insertions, 24 deletions

diff --git a/app-emacs/mmm-mode/Manifest b/app-emacs/mmm-mode/Manifest
index 072ec612f986..c8e3927c8787 100644
--- a/app-emacs/mmm-mode/Manifest
+++ b/app-emacs/mmm-mode/Manifest
@@ -1,6 +1,5 @@
 AUX 50mmm-mode-gentoo.el 58 BLAKE2B 0114bc73a9125264dd76189479ec708455f88c2d50765154c64f7bd5ad386889b055b280a1dae5fe661962f27caabb06a8b6a0fc709fce83abfe9c21be6fd8da SHA512 4cbf0da7bcadcdb30947fdb789542daef059112c894be4ad418321cf526f7789e86f612c92bc5c11504ae2538f0e73650589663b3f87421543f0047932c6126f
-DIST mmm-mode-0.5.4.tar.gz 174680 BLAKE2B fbe69ffe291d7144ddaa22d161545350893285e2594f9343d6b4e3b6c929a83209c8dbdf5f270b179c98c7fd1ab88d2c5f68066e6aca0ef5e8533335c4c194e9 SHA512 71828769f40ca56d87c581481fc6531466de30155af3f22eb96ee176cd9dae354ed95a6c37d79e47a033bb79c67335e0f50dac2fb57f262bbe0ef43266af2b6e
+AUX mmm-mode-0.5.7-texinfo-encoding.patch 224 BLAKE2B c81ec6ca4cbaef71abe743d488a8605b94444f058d6207123f44bb9d1e87bfb2be5c84781c0ff5da1202775042e84cd63b4597e3020950cd412c98aa0ad4a62c SHA512 cbda4268f6e560056abf2618e2a90b1c330a9788e90b77d6353bb0b040d3330a6b4613cf221bdc3fa080d0b3fc362fd67323798ada757d06e8f72ada73f897f4
 DIST mmm-mode-0.5.7.tar.gz 176034 BLAKE2B 23fed0f260c9f46134d83d29e96b96ff331aa0fbe8d121663b74de944489d1a51948f6fba729129e47a34e1ef48cfb0f8bbc45f6ab8f548001bbe0e88a61aeca SHA512 3afb77b3351c8ea5844cd57bb873e6ebe91ce1e268d0d585581482f5039c64ea80fc7aa620e45330eca0eb7839223764164ccc09e932b54f23f3f37c9953cb39
-EBUILD mmm-mode-0.5.4.ebuild 590 BLAKE2B ad5eb39888db88049f25b124eac984cc989393db979ab9ea2f8623f8743151119ffb7b762c901d8bfba4b0dfe683c0058ffae64c1cb08b603b5b8fc893e50332 SHA512 181a5e26bf067446f5be999f4b42f8c2edbfd249e0cacd31f7586a2b401c27fc392f5c4d06ca4bff95c2594f5e998d9212ca3a44d1ac9e7835ce42eb6706d818
-EBUILD mmm-mode-0.5.7.ebuild 581 BLAKE2B 962a19ab381f8e8b0b6b147e7d89ddbadd8987f0a3bf65ee5cb5b498cc58ec480c0bc3dcf9ffd3b551572fe0f2a1b856485b6053c9c19b62a77def58076fdbba SHA512 be5b0830cbc6b85463a605171a0d3110c1563e7fb2c3709769664e5a7d6e92824629c0f6702708a16c8394fbb15e14e2d1175d8d2d9d094d69a24dfea623714e
+EBUILD mmm-mode-0.5.7.ebuild 630 BLAKE2B 0f141a88344af6583ec398deb7ac5e08cfd3546e2137f2f456e56c802c7483a4da07e9585694aa0851370d74fad2350a1496a10e90dd5047289747434b16b068 SHA512 c00f0dca6afbcab6f2a4011fccfe4024128f8ba20b2be79c54c994c56f7524f3575c93230b4e76506a3a3b031d2dee25dd6972fe42bf54db74cb5dfa9420cead
 MISC metadata.xml 414 BLAKE2B f62c75a172d2da325b4f7b0e41e0bc2d7f128e96493b46cd6bc5232915418a506c0d2e2dec88c2b2ac3eace003b4dfdafdeb3da147230c3675a5c3413ee4714f SHA512 ef3005e7c7016dae433d8612bbcf154c928f264ee3203784f2d3756c89c66545cbb3dd29349048b47fb07a1764677068d758d900b4f77fd825c11d5ae82dbd1b
diff --git a/app-emacs/mmm-mode/files/mmm-mode-0.5.7-texinfo-encoding.patch b/app-emacs/mmm-mode/files/mmm-mode-0.5.7-texinfo-encoding.patch
new file mode 100644
index 000000000000..f83d24dae131
--- /dev/null
+++ b/app-emacs/mmm-mode/files/mmm-mode-0.5.7-texinfo-encoding.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/695954
+
+--- a/mmm.texinfo
++++ b/mmm.texinfo
+@@ -1,5 +1,6 @@
+ \input texinfo
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename mmm.info
+ @settitle MMM Mode Manual
+ @c %**end of header
diff --git a/app-emacs/mmm-mode/mmm-mode-0.5.4.ebuild b/app-emacs/mmm-mode/mmm-mode-0.5.4.ebuild
deleted file mode 100644
index a1e8968610bb..000000000000
--- a/app-emacs/mmm-mode/mmm-mode-0.5.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Enables the user to edit different parts of a file in different major modes"
-HOMEPAGE="http://mmm-mode.sourceforge.net/"
-SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="sys-apps/texinfo"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="mmm.texinfo"
-DOCS="AUTHORS ChangeLog FAQ NEWS README README.Mason TODO"
diff --git a/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild b/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild
index 74ec2b53ffae..b9a5768acc63 100644
--- a/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild
+++ b/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild
@@ -11,10 +11,11 @@ SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="sys-apps/texinfo"
 
+PATCHES=("${FILESDIR}"/${P}-texinfo-encoding.patch)
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="mmm.texinfo"
 DOCS="AUTHORS FAQ NEWS README README.Mason TODO"