gentoo resync : 13.06.2020

10 files changed, 57 insertions, 9 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e0f37a4f960f..58b6bde64f92 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/e3/Manifest b/app-editors/e3/Manifest
index 0947f916f1cc..70329f82323b 100644
--- a/app-editors/e3/Manifest
+++ b/app-editors/e3/Manifest
@@ -1,4 +1,4 @@
 AUX e3-2.8.2-makefile.patch 936 BLAKE2B cd06fbaa470d50fbd971b8925d6813ae5040f3826ada652d891e0d5bd3850a0c8136c13b461426115abbefe2c4e5a87d8443ef6471209833972c2ac9f3516dcf SHA512 77fbe6345d0d9285d3e46458c34b09b08e112db1851626ada6aa31aec3a3115a15d3a4a62c78689b228cbbf06a9e4252b85594785a9310461fe5b19c2aeb8112
 DIST e3-2.82.tgz 115504 BLAKE2B 09edea9063657373cf6d7d9d8290dddf17b8fb516538d89b83462176127b8b43832bd81f326eec5504116f05ab780023832b8b5d41d72e3ab8e726d89e364a36 SHA512 07c7e40d26879871b60d7e89839805d779383dbaabe42a6a3a7047fa8a4c501c4cd0cdc828a9d29d4ac1c5b949bda07946d8e71e1320c6c303ffce88a3038547
-EBUILD e3-2.8.2.ebuild 842 BLAKE2B 22e0ce8013a0ca6ce4666485677927d616016179a4cdcdf901dd82ee400a6380c301ce2c1e599f24cba945801c2c1fddc66407e60f88434ba8cc17667896402f SHA512 99cd2915430b264acf41f38bb21f65c9007d83c2568c2a4f74fa404993b4a7920834deaf1dad01896cb777bf9d9177b7b7e439b8b602803167c94c0bca474019
+EBUILD e3-2.8.2.ebuild 881 BLAKE2B 66552a5b2346ff6685025e570dfb5ba6fa2d5dbb315283c4cd239c2cf8d7115a8e23f2b7b73ec99e0fb0058af6e46d98f11018e5b831073148fd96bf5884537b SHA512 65b7d9b207e0bacb5b187dc5478f90fa92037b6980704a67ed515c3103c76a2a750fec42e61cebce37e1a1a1ff6705e34f2187e8db8e938f61c15300062414b9
 MISC metadata.xml 918 BLAKE2B a0bd5163da7fe48664cc720d60b08c11af32234b0b265a8e2cca6d980a3af3b29ad223fdd5a81886ea3b528875fadd0520650a463894040b2f48ad00eabdf8c6 SHA512 9e8d5b6557a492d39c79c06507ea3ee670729e315cee2456e595d53f88178801b629595ac8903ac70878a63e85b46e934c761d70fef328fdfddc78e0c7416f4d
diff --git a/app-editors/e3/e3-2.8.2.ebuild b/app-editors/e3/e3-2.8.2.ebuild
index 41f1d83154db..b554e85be62a 100644
--- a/app-editors/e3/e3-2.8.2.ebuild
+++ b/app-editors/e3/e3-2.8.2.ebuild
@@ -19,6 +19,7 @@ BDEPEND=">=dev-lang/nasm-2.09.04"
 
 S="${WORKDIR}/${MY_P}"
 PATCHES=("${FILESDIR}"/${P}-makefile.patch)
+QA_FLAGS_IGNORED="/usr/bin/e3"	#726484
 
 src_compile() {
 	emake -- $(usex amd64 64 32) LD="$(tc-getLD)"
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index e49e7cc21c1f..2c179086ec3c 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,4 +1,6 @@
 AUX kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch 433 BLAKE2B 3cfe90cfa73bb82faa45402041160ce644f7cbff9a6072b4be7a68e8ea9249eda49946e6ffca898f38213aea2515c614b0b47f66bda7f53479c68ed6019fefb6 SHA512 790c0b84b044fc90a4ec8e9c6c116a169748326c383ee3d3e993a9768588749fb409291092edc3df93ae72a6e8a649c13c1c3a86d8ade6a70735483909e47cd0
 DIST kakoune-2020.01.16.tar.gz 579837 BLAKE2B 46abfd7f2bf2db6f9755a5b4f547e63e72ac7eef46ad0903dac08d0f422774632ac5aa3dc1e6c69aa6f0527bdff0ea1792574933ceb35b2495927f747be94aaf SHA512 81a0fb522fd7f289ede36f966e815d03550df389b05d27fa430474dd55a90cc0e1c5231e660328040f3bd79d155d37b7b135b52b93cee536c15d13fc9d06baa0
-EBUILD kakoune-2020.01.16.ebuild 836 BLAKE2B de4895474fc0a779620f6260fcc8f8cd3edee5d284d1090ec287d3df36bf7116e76b2d87530ca26d8a692316330233a4f93d72162a5314f6b83d79de9083f20f SHA512 6ecc3211f65185767bc0abea810aac81486f2bcf7e57068ad6c4b2ce2a66d31e1265a34586c2ff35df81bd7f4ea6771d9fbf2cf31bf07e41fdb7f49a9c544ce5
+DIST kakoune-2020.01.16_p20200601.tar.gz 597946 BLAKE2B c3d831132e29ea46c4c92a942eae1b9eeaa30c68e17e7178b00277f45fdf76784386801627125c653b50507ebebcad282512446c0cff94f7234013aa8a17efd1 SHA512 b137fa71a151e80da50bfd980a264d1d0aa98d48e585794eb1429196a6c81ef51277cc15d5db015ce8550c1cf0d6fa29f5cdeefd3930e90e2a0480dd7bbe5bf8
+EBUILD kakoune-2020.01.16-r1.ebuild 807 BLAKE2B 2feb5925e67ee6e1e8a6b5fa04acff196a938efcbf11ac8673c2bdbcf1fb5e45c59a2a8e8e3139f508708bcb6401e16627d79b18db292dab54680476c182da98 SHA512 bc710c8b691e62db81da592c10cf3fd90a7a45df210ea16f4d95e554575e29ad168c340f021fa7a978060344e232426e1dcfb082416ba0bd760d5178e8ece140
+EBUILD kakoune-2020.01.16_p20200601.ebuild 903 BLAKE2B 8307aba24da0c372e10e301834651e586ef8f7f4d95c465643452e7de4d6a9f8c557e1104db04267bb0609940217f5f5574a41ea0a7a58004dbb29a66ae650ac SHA512 a0af7953ad6d02eeee286ebd3a519b0315a2f47e408efe33bcf1a6ddf49b408da15747e30d64f6158fadcc210ec4046d9f02b49a745c5ff5793f5551d330687f
 MISC metadata.xml 245 BLAKE2B cc6e199e8d1ff374bdb7d8a466333d0b9b4bab77b928756235369130ee369e7da62755bf02a0eae323aff90ea39af9f63667448a0c6f9f0098665f515041ef7b SHA512 785c49f9d46f2e7f05705e108b98bbd80f2a241d72a00ab9a698c837d0644bb651d708ff9a21dbe53314e838d1c3dd114b76dc8241378d29ca942923c9ff20bc
diff --git a/app-editors/kakoune/kakoune-2020.01.16.ebuild b/app-editors/kakoune/kakoune-2020.01.16-r1.ebuild
index 476bbd2e9376..26d369bdf441 100644
--- a/app-editors/kakoune/kakoune-2020.01.16.ebuild
+++ b/app-editors/kakoune/kakoune-2020.01.16-r1.ebuild
@@ -9,8 +9,7 @@ SRC_URI="https://github.com/mawww/kakoune/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 DEPEND="sys-libs/ncurses:0=[unicode]"
 RDEPEND="${DEPEND}"
@@ -23,7 +22,7 @@ src_configure() { :; }
 src_compile() {
 	cd src/ || die
 
-	emake static=$(usex static-libs yes no) all
+	emake all
 }
 
 src_test() {
diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild b/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
new file mode 100644
index 000000000000..bcbba4882812
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
+
+DESCRIPTION="Modal editor inspired by vim"
+HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
+SRC_URI="https://github.com/mawww/kakoune/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=[unicode]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch )
+
+S="${WORKDIR}/kakoune-${MY_COMMIT}"
+
+src_configure() { :; }
+
+src_compile() {
+	cd src/ || die
+	emake all
+}
+
+src_test() {
+	cd src/ || die
+	emake test
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr docdir="${D}/usr/share/doc/${PF}" install
+
+	rm "${D}/usr/share/man/man1/kak.1.gz" || die
+	doman doc/kak.1
+}
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 9960b30ddf9e..510eda947e7b 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,3 +1,3 @@
 DIST mousepad-0.4.2.tar.bz2 696014 BLAKE2B 2591f177b59147e01502329939365c5f18031f3dc9100baa29cb1da04afbff26cc91cc612ea1e5ebbc2d15754375da6afbd4ae9d96399f41cf06191d7d8d7082 SHA512 f3266018ce61683dc62b6866649f3674cc363ea652de04d3f087341c61cf24fb5eb730411948e354d085792f88b59e3dba7e7712715d92711f750b33d8bfb69a
-EBUILD mousepad-0.4.2.ebuild 1135 BLAKE2B 94382272da3c4e73d7116598cd8cc5fd0d0fc8d89e8de32b2ee1b36a4535687ca24168ceed13b7c644c8402a5c455d59f161b65391454493892578bec89c1151 SHA512 70011b57e94d29363a7af9971f8896aeefeeb935df6a6e9006fc42a48ee3182a88ca25cc2da9e852ec100150d17f95681f9f8b18e39070f9d0d9a6281d7700e2
+EBUILD mousepad-0.4.2.ebuild 1142 BLAKE2B b40e37fd3724bdc4da85e4d903719e7874b238cdac06beb2e4e13106d8003cb986133fe2ff25e729676e362fed702ab4ccb11826f174ba2549bfee018517ba7a SHA512 57d209fbedf6b692464384e1ff84beb5eff47ed20e9a6a4fdfab51e58bef068d7419d12b875f5f98ff6aab5db5e8bd210e182a2cc297b85fb47c79b28500a1b5
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
diff --git a/app-editors/mousepad/mousepad-0.4.2.ebuild b/app-editors/mousepad/mousepad-0.4.2.ebuild
index d6c73c134145..de411259d531 100644
--- a/app-editors/mousepad/mousepad-0.4.2.ebuild
+++ b/app-editors/mousepad/mousepad-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="dbus +gtk3"
 # D-Bus code fails to build against GTK+2
 # https://bugzilla.xfce.org/show_bug.cgi?id=15755
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index f203b6da931a..f03ab8673f2d 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,5 +1,5 @@
 DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780
 DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
-EBUILD vis-0.5.ebuild 1623 BLAKE2B e75073e32493bea8a2d9764f5d1795b78a33487bfa06ffdaab69eec731c2711a6e191569c0ad68f9ef836cc691ba415e54922090c552ef2abfc0822189b1e01c SHA512 3552f1361b6fcf450695e7105081c7270eb0232b724a082ff93ab3110bcc7204e298bc4ee25e4140f6be4ceb6f6b17432d3bb1ef124bd59cb710456097c90cc7
+EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
 EBUILD vis-9999.ebuild 1330 BLAKE2B f23e11f2c52c94a7c5211ab6640cc33562874f19c1d0a5a50582c02b49d952f84d98fd7770fe0fa7233678dc1cf896aab920c5410743179d4ed69f5504fa2960 SHA512 fd91bfcc4c52091e91f620f29fe048fc0b277338a318ccaca4b1a45f1a960252f10a85493eb24d41238d9791608519ea7c9f2ef27e9623b5ad9a02f0122d426c
 MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.5.ebuild b/app-editors/vis/vis-0.5.ebuild
index 08274f3b3760..e7cf08742d4e 100644
--- a/app-editors/vis/vis-0.5.ebuild
+++ b/app-editors/vis/vis-0.5.ebuild
@@ -32,6 +32,9 @@ src_prepare() {
 		if ! type -P vim &>/dev/null; then
 			sed -i 's/.*vim.*//' test/Makefile || die
 		fi
+
+		# https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22
+		sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die
 	fi
 
 	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
@@ -42,6 +45,8 @@ src_prepare() {
 }
 
 src_configure() {
+	export CFLAGS="$CFLAGS -fcommon" # https://github.com/martanne/vis-test/issues/21
+
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \