gentoo resync : 07.05.2021

12 files changed, 36 insertions, 99 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 9e42be8e5e17..5d7077891a3a 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/beaver/Manifest b/app-editors/beaver/Manifest
deleted file mode 100644
index fdf3dd5830ee..000000000000
--- a/app-editors/beaver/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX beaver-0.4.1-desktop-file-validate.patch 545 BLAKE2B 33bb8b9c5b90d2257b7e083b832f0a9cfc82b512b51da8e1cc56eee657793c4ed248f97606e6cb4679d398e35d3b5bcea6be9a83230061a5cc7f877c44772769 SHA512 ec33d4a2132bd03859426e7bbaa7a178d808ccd949387a85d18bc0fb01cb907cdb61ce28f52405f71f1b397b6221fa20c00f415e4979db51256511621ffb8475
-DIST beaver-0.4.1.tar.bz2 436321 BLAKE2B 034829d795b5a0502a2df1e675e01d34cc62efbc482959e2d3e0ecf9eeddf1d8450e92ee9c2f98af3e2778ad4c14fac926291ca935ec79822f8f552a9579363e SHA512 3000bed3aa2a67d6c38a68a7782a9d5423bcec0b8420272b0f0dade604c094a7b52058b43222af38d56313f0aa27998028c984f69340bf28eeaa8b8a93548a1e
-EBUILD beaver-0.4.1-r1.ebuild 990 BLAKE2B 47dfecd8802fd5653665df362c5b7ba8b5af7a9b0af7d244c8eb7a19951b34f99463bb06d765d94c0a65bd52f061716e2a5f43b3983ed1f603219f9ae5f170cd SHA512 7e7b8102bde6602e533d99fdb53df06ef01ce0d3a9a51170c0273bd4fe814a73f8a173e8d41cfc1402b54e39829eb776799169800413762c78fee8d2dceea3e3
-MISC metadata.xml 359 BLAKE2B d0b8402f3a7a6f77f7c79733394a2bf595320b8f51a65432fd545975b72e9d94ecd5845b8f9f446b3519f6ee2d44c111dadfe6d86cd78bee0f1ba4c3bd7da31c SHA512 7fec5e4168c877d16d8d744244e0aa3cfef4d6d219dc3485caeb21802de8aab2a00188572393b885ef7f8f7ed72b3bad3f5622ecf057347ce6969fb1d3fc5759
diff --git a/app-editors/beaver/beaver-0.4.1-r1.ebuild b/app-editors/beaver/beaver-0.4.1-r1.ebuild
deleted file mode 100644
index b10106d1207b..000000000000
--- a/app-editors/beaver/beaver-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic xdg-utils
-
-DESCRIPTION="Beaver is an Early AdVanced EditoR"
-HOMEPAGE="https://sourceforge.net/projects/beaver-editor/"
-SRC_URI="mirror://sourceforge/beaver-editor/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	>=x11-libs/gtk+-2.10:2
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.1-desktop-file-validate.patch
-)
-
-src_configure() {
-	append-cflags -fgnu89-inline -fcommon
-
-	econf \
-		$(use_enable doc doxygen-doc) \
-		--disable-debug
-}
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-editors/beaver/files/beaver-0.4.1-desktop-file-validate.patch b/app-editors/beaver/files/beaver-0.4.1-desktop-file-validate.patch
deleted file mode 100644
index f786565ced04..000000000000
--- a/app-editors/beaver/files/beaver-0.4.1-desktop-file-validate.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/data/beaver.desktop
-+++ b/data/beaver.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Beaver
- GenericName=Programmer's Text Editor
- Comment=Beaver's an Early AdVanced EditoR
-@@ -9,4 +8,4 @@
- MimeType=text/plain;application/x-shellscript;text/x-c;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;
- StartupNotify=false
- Type=Application
--Categories=Application;Development;TextEditor;GTK;
-+Categories=Development;Utility;TextEditor;GTK;
diff --git a/app-editors/beaver/metadata.xml b/app-editors/beaver/metadata.xml
deleted file mode 100644
index 086adea88901..000000000000
--- a/app-editors/beaver/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">beaver-editor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 602cb3a90496..a0a9f7820d00 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,4 +1,5 @@
 AUX kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch 433 BLAKE2B 3cfe90cfa73bb82faa45402041160ce644f7cbff9a6072b4be7a68e8ea9249eda49946e6ffca898f38213aea2515c614b0b47f66bda7f53479c68ed6019fefb6 SHA512 790c0b84b044fc90a4ec8e9c6c116a169748326c383ee3d3e993a9768588749fb409291092edc3df93ae72a6e8a649c13c1c3a86d8ade6a70735483909e47cd0
+AUX kakoune-2020.01.16-gcc-11.patch 181 BLAKE2B b7d35b65a352012fc065aab8d912e1f2bbdfaa1c7d276e1c13c132a2f1202d637a05f082b3ff0d87b1ab4bc81f8f20e78d3f84e3d17c28da3a9ace0dd78d2f84 SHA512 77bb0a994fe22e8a6aab67780d6bb1dbcd00e42a6ac86462635afa7449354d08548e52176b94d99335cec199f16893f970fb84e0b8b9f904e3958366d5b8ec05
 DIST kakoune-2020.01.16_p20200601.tar.gz 597946 BLAKE2B c3d831132e29ea46c4c92a942eae1b9eeaa30c68e17e7178b00277f45fdf76784386801627125c653b50507ebebcad282512446c0cff94f7234013aa8a17efd1 SHA512 b137fa71a151e80da50bfd980a264d1d0aa98d48e585794eb1429196a6c81ef51277cc15d5db015ce8550c1cf0d6fa29f5cdeefd3930e90e2a0480dd7bbe5bf8
-EBUILD kakoune-2020.01.16_p20200601.ebuild 903 BLAKE2B 8307aba24da0c372e10e301834651e586ef8f7f4d95c465643452e7de4d6a9f8c557e1104db04267bb0609940217f5f5574a41ea0a7a58004dbb29a66ae650ac SHA512 a0af7953ad6d02eeee286ebd3a519b0315a2f47e408efe33bcf1a6ddf49b408da15747e30d64f6158fadcc210ec4046d9f02b49a745c5ff5793f5551d330687f
+EBUILD kakoune-2020.01.16_p20200601.ebuild 1048 BLAKE2B b9d2da90932008b085d2e38aa1f84ad2c241bb35dc7ae6f89a23b3e4b1531b6ee9361d9ce80aefd39a38e860549f8678494f9b9b0712e611230aa04c5d4690ad SHA512 e91618763b8509d0b964bafc4e46109811af02a81c80ae710da2d9e27c52ca7a285ff933d017c3aa32d59dd0ad0c95ea3e7246378a7cc37fed19267bbbc56d2b
 MISC metadata.xml 245 BLAKE2B cc6e199e8d1ff374bdb7d8a466333d0b9b4bab77b928756235369130ee369e7da62755bf02a0eae323aff90ea39af9f63667448a0c6f9f0098665f515041ef7b SHA512 785c49f9d46f2e7f05705e108b98bbd80f2a241d72a00ab9a698c837d0644bb651d708ff9a21dbe53314e838d1c3dd114b76dc8241378d29ca942923c9ff20bc
diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch b/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
new file mode 100644
index 000000000000..d558c49347c1
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/787029
+--- a/src/regex_impl.cc
++++ b/src/regex_impl.cc
+@@ -12,6 +12,7 @@
+ 
+ #include <cstdio>
+ #include <cstring>
++#include <limits>
+ 
+ namespace Kakoune
+ {
diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild b/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
index bcbba4882812..20c792e1d588 100644
--- a/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
+++ b/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
@@ -1,13 +1,15 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
+inherit toolchain-funcs
 
+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"
+S="${WORKDIR}/kakoune-${MY_COMMIT}"
 
 LICENSE="Unlicense"
 SLOT="0"
@@ -17,25 +19,31 @@ DEPEND="sys-libs/ncurses:0=[unicode]"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch
+	"${FILESDIR}"/${PN}-2020.01.16-gcc-11.patch
+)
 
-S="${WORKDIR}/kakoune-${MY_COMMIT}"
+src_prepare() {
+	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
+	default
+}
 
-src_configure() { :; }
+src_configure() {
+	tc-export CXX
+}
 
 src_compile() {
-	cd src/ || die
-	emake all
+	emake -C src all
 }
 
 src_test() {
-	cd src/ || die
-	emake test
+	emake -C src test
 }
 
 src_install() {
-	emake PREFIX="${D}"/usr docdir="${D}/usr/share/doc/${PF}" install
+	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
 
-	rm "${D}/usr/share/man/man1/kak.1.gz" || die
+	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
 	doman doc/kak.1
 }
diff --git a/app-editors/lpe/Manifest b/app-editors/lpe/Manifest
index 67e96314fdd8..50e2aa3ac1e1 100644
--- a/app-editors/lpe/Manifest
+++ b/app-editors/lpe/Manifest
@@ -3,5 +3,5 @@ AUX lpe-1.2.6.13-make-382.patch 797 BLAKE2B 548091708e01e3baf9d52eaa7f8638d870f1
 DIST lpe-1.2.8_p20210401.tar.gz 840016 BLAKE2B 81fa0b1c3f9a7164eb219692a2e7bc092d0ee09c9de15f6fd2a4f66cc486be5b744eaa2fb0569a9f44f45d6a19159c55286be76d9ae0f4947f5b7c749e84a8fb SHA512 0b40f2f3fc1241e07291dfdbfcf2466cf5dedc1c91bf36c4f36c8af792ce718be2ad66884b049e25d7b9f9e796d60ce25ca42b37610d26894cd1dc6b74e51157
 DIST lpe_1.2.6.13-0.1.tar.gz 600523 BLAKE2B 8866aff63276d5e39ed48b4d9e8b9a23d541c13e196815c29586df83f8c6b5895a8dde8fb16b0929bffc49416907d74d48fdbc5ce736a855f2d2daad6472fb96 SHA512 f02769baca396285fe8f98c934f6274185d2bf8b08f3b007cbfa4e6aadb455abfb7cab13d53a3d1fa71ea0c29c4222784dcbc9a7508501c7d1839671503758ed
 EBUILD lpe-1.2.6.13.ebuild 1269 BLAKE2B 4f7a1a3d6518c184ba76f39b4dc427430eb8450feb3a91e736f81448afdfab2e59b6dd3c8f0bff2c7f08b1d4c76c42046e6fba0a5e72865d9314afc8c53c3ea7 SHA512 261ffa5abdecf4d522cfb25eb83333af1770a6d919ec9d99717dbf440bf600500c5b9653ccb18a373f29f3cb4c737f20e464fb6b3be17536c56209a1de910ba7
-EBUILD lpe-1.2.8_p20210401.ebuild 1601 BLAKE2B d7276453e57c8206d8d2008356cdb08b770fef42306d71762def3c4641472c1c7945249f95e50a2236296337717e13206b252dc467378ea0920d26304579c574 SHA512 b77f01ebc38f7747de74660a66f87727afab9b78bc4d92d419796383f3aae85465edbdcc9eda2b3e98478fb2d7c0b2f7e4c3ed5e4b0550a4a58e2183a9489086
+EBUILD lpe-1.2.8_p20210401.ebuild 1597 BLAKE2B 92828a1a13c97057f0c92aa36690276fc092499c816a86340745e2cb097eb11c7cc36b30f0cbc2e11b61239423883c134695b4fea14748c43e153ecc61404080 SHA512 5a39b79fc6afa1ff917996304fc719d9f2a3efff2aa3ac09d7a50b3cbf8895230d89d52b54366a4a42e4e24d9e282f4132fd44e4ebba5d72db3c2904efff829e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/lpe/lpe-1.2.8_p20210401.ebuild b/app-editors/lpe/lpe-1.2.8_p20210401.ebuild
index 70babea77f0a..23557f0d1a8a 100644
--- a/app-editors/lpe/lpe-1.2.8_p20210401.ebuild
+++ b/app-editors/lpe/lpe-1.2.8_p20210401.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+KEYWORDS="amd64 ppc sparc x86 ~x86-linux"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 16ba240e3453..eb77bc090eb4 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -2,7 +2,7 @@ DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe8
 DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4662d5b9fc585bd0e2dfe78f8e8c71354e1a5bbf043ca99e0a69742df7846656d1f0706af79bcbfc53b6d1a6 SHA512 e27ca4411472409bd6ff8d812405e4d8aa869c1348c0a6adbb1c538fb5bdd112b322ef6d8a13df0b43c472d925b94111ac676d03f360d79181dee335a4fd09cf
 DIST nano-5.7.tar.gz 2989413 BLAKE2B 604f3140bd963661bb7d13933b5bac867bcfd90635287dc8f160e4bda094641c20f2fe2157fe1b5eda28842f78c4e651a354ed6edcafe67b4f2bf6c9eda0051c SHA512 f6d580918c488b15a5f8f77b4b52ea3e86535c251fe32dd978bae014bcadd543a5696f7741018ffd05b6271c1defe6a67687577f3cfe059ed2b4d3e422b2a694
 EBUILD nano-5.3-r1.ebuild 2430 BLAKE2B 33487afb23e1b01280d6f6fe3f4ffc1008ca820a3e100919fa3c89cc874d80287befc979d3d3848b00cdcdad3954a43eb6fa2d8625320a6e1c9d83b49ad01312 SHA512 98ac275e4a54bee9500d5bd5d71a84e37ac1ce941a4ae5e827d1ae19209fa9d4bd3840e640d6017776f6fcd32df5ae08425f1ba5d2bce0b8e8a5e3ea2fd958d7
-EBUILD nano-5.6.1.ebuild 2288 BLAKE2B 20b38eab68cebdaf26c8fa73017c1fc3d592510259ed6c6581c52bc670f607a174b032c2874a484c1f1c2592b6e60d8d30c62537f3055ded03c63bc8779e82f7 SHA512 2a043e656039c3af4b60b3c6c0d269a4d8924b45926bdd343e43fb2fcc381ce4b317290327ccaea895ba7d7e83a49327107a566189c65db75d1a922a3030e9f3
+EBUILD nano-5.6.1.ebuild 2285 BLAKE2B d92189e9d0925f670490113ffc4a5bfa0bcf3de3e587448cfea31c25eae1f374e4d2d4e0d4c5e2485accd9c65d99b260531286a09df796909a991291fe38c26f SHA512 4c0f9e451b55387aea2fc5ab52b3d2d8d98b84a51437b50bf4052fe9315746f91676a49248842af39a8234418d91a7195b4ce9e2c49f47bf157c1220cd4504c4
 EBUILD nano-5.7.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
 EBUILD nano-9999.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-5.6.1.ebuild b/app-editors/nano/nano-5.6.1.ebuild
index 977773d0f564..5a5e970391ae 100644
--- a/app-editors/nano/nano-5.6.1.ebuild
+++ b/app-editors/nano/nano-5.6.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"