Merge updates from master

14 files changed, 76 insertions, 11 deletions

diff --git a/app-arch/lha/lha-114i_p20201004.ebuild b/app-arch/lha/lha-114i_p20201004.ebuild
index 92565451f48d..2301e49b8312 100644
--- a/app-arch/lha/lha-114i_p20201004.ebuild
+++ b/app-arch/lha/lha-114i_p20201004.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jca02266/lha/archive/${MY_COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="lha"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
 
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
diff --git a/app-misc/beep/beep-1.4.9.ebuild b/app-misc/beep/beep-1.4.9.ebuild
index d6a43378d510..f12b88f7e035 100644
--- a/app-misc/beep/beep-1.4.9.ebuild
+++ b/app-misc/beep/beep-1.4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/spkr-beep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 IUSE="suid"
 
 # Tests require a speaker
diff --git a/app-text/djvu/djvu-3.5.27-r2.ebuild b/app-text/djvu/djvu-3.5.27-r2.ebuild
index ed3eea609053..ac5aa9e4aeb8 100644
--- a/app-text/djvu/djvu-3.5.27-r2.ebuild
+++ b/app-text/djvu/djvu-3.5.27-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/git/d/dj/djvu/djvulibre-git.git/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 RDEPEND="jpeg? ( virtual/jpeg:0 )
diff --git a/dev-libs/tre/tre-0.8.0-r2.ebuild b/dev-libs/tre/tre-0.8.0-r2.ebuild
index 49a2fb41c822..e0fc19639f17 100644
--- a/dev-libs/tre/tre-0.8.0-r2.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
index fc736f0e1e48..7a4380e38091 100644
--- a/dev-util/dejagnu/dejagnu-1.6.2.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
index 79dc0516a190..beaf8390a005 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/mail-client/mutt/mutt-1.14.4-r1.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild
index 71ee91f00c6d..65056ee741dd 100644
--- a/mail-client/mutt/mutt-1.14.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.14.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	autocrypt?        ( gpgme )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/media-libs/libpano13/metadata.xml b/media-libs/libpano13/metadata.xml
index cf2a5088ea2c..85d1086b8193 100644
--- a/media-libs/libpano13/metadata.xml
+++ b/media-libs/libpano13/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>maekke@gentoo.org</email>
+		<name>Markus Meier</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">panotools</remote-id>
 	</upstream>
diff --git a/net-libs/libvncserver/libvncserver-0.9.13.ebuild b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
index 6a10ad068579..c28d1ca321a0 100644
--- a/net-libs/libvncserver/libvncserver-0.9.13.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.13.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild
index 0b22a34502e8..9ce55ba847ab 100644
--- a/net-misc/rsync/rsync-3.2.0-r1.ebuild
+++ b/net-misc/rsync/rsync-3.2.0-r1.ebuild
@@ -16,7 +16,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
 	S="${WORKDIR}/${P/_/}"
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
index b25482a3b41e..a67f621eee70 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 sparc ~x86"
 IUSE="tcl tk"
 
 DEPEND="
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index cf64e35bb7c4..0fd0089ca3d5 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -10,6 +10,9 @@ DIST genpatches-4.14-193.extras.tar.xz 17528 BLAKE2B 4c73309b4d54a62dc3effc3ac1e
 DIST genpatches-4.14-194.base.tar.xz 4284304 BLAKE2B 3a657017572b12b19f5c9c32d455949634460f574cac1fc1c00b7416589e3452f944c3764bdf755fba7b7bea08872364c31e38f8b53025542b3186696b3afb15 SHA512 b8e2393047eaf6f974621aa04ace41a997cf7f1ae51446eed8652a75cc721385f3087a5c5b07c361640f82367698056ba3ac68d62fcbb63de2c834739e2f6314
 DIST genpatches-4.14-194.experimental.tar.xz 5932 BLAKE2B 021af3fbd9407a3e179089a79104ad113871f90be6c23dd1ac6eacc4b5f27b39c1de40736b7a7c6a54bac7074e4f2d8f5fc5bfc1ea17e6848008d0fe07a5680f SHA512 1424a7dcacc87cf5aba5d7dee36584156f1ca7abca97530ff551d16604aede76fa43a076261bdb78e9de9caab57751eff3e7e200bf4a0122b10050cfa578b10d
 DIST genpatches-4.14-194.extras.tar.xz 17528 BLAKE2B 1da392ce372e204598450d4bdaf68c260de44a9a248e3e9582ddca2d2f45a3ea4264443784f96a658513bfca76349502dee339f7398fafc20cc633ef4cfe5674 SHA512 94256c82c1486c535c116a8604fc30c28fd20362e53bd4e62952dba2bfbad44f5a0e2e17333898adf361788bd64609afe76a145c20792d26f468b825dc6ef386
+DIST genpatches-4.14-195.base.tar.xz 4329400 BLAKE2B a17042f43952d5245c2833a8a59e6898db6b5ca0314d453527220ff1fb39a4f8054ac1cc032251f1852d07a2ec1001755f4eef637a881be460f34b9f0e6c8294 SHA512 c6d31fe4fc95f04ccf8abe8bb4aff2b78e22bed69188c7ca857c7b1230fc7c637f5a97bbb17bee960ef2c8900cf2decfd1a1dfd58bcd66a442815f8cf52db735
+DIST genpatches-4.14-195.experimental.tar.xz 5932 BLAKE2B 33f6f50601c11f832846305eff70afd279a7f2284f9fe25b001fb3e45951d46cd9b861737c7c4c030a0cded6d119428583d8aaf003d03b487aa355f5289b9be7 SHA512 5505bd69959c8a40a17d649fd13521fd5a7b872ea66ee82c21fcdc7f6fe0330dd00b8361007fdd2505289d38e0354bfa31a377aa8863facac6ac9bf14fc9f9d5
+DIST genpatches-4.14-195.extras.tar.xz 17536 BLAKE2B 9b9d57324fc8770f8e9af0d62de34691694a21bba9c8ba54fc302709fa1d2e631ff0c91cd6a3ff275cc76c0cd1f87b1d2681a874c44fd2e7287e729ece3ee654 SHA512 89c02042dbca98380d0ea0f48f4af9a1508ab76ee764099a1ab63aca54f6173c2e249df99b676ada58391b24b4d4762f973cba72304e762e9948c46666e2b37c
 DIST genpatches-4.19-119.base.tar.xz 3427592 BLAKE2B 162b414b2480bf6f2c380680b2a27fb14aa9a715e07d0af2a45433e8b20dc48c3c317c308d082d328c7312cd707adb528dcc88a0515942e4c794adf63ae916e9 SHA512 ca403e6cc5037ca4c8b25c53b0f5a60f6a006f0d7486ff32cb7e7e634a3ef34883ee96ec5049825a0c07111fcc7561e172f95c4cdbf5fb7d21c1e986081a9593
 DIST genpatches-4.19-119.experimental.tar.xz 6424 BLAKE2B 52329f89b354a12cffa0eb0fa35f237b9ae1b2bf81e0ecce3a90331bbbee7e1c4b41161286952c84ba64ca54235aa134dffd09ecf164eda3fdb7f0e000a35f32 SHA512 3db0a42d06fbee6e0a6f1afa50c48e42cd4c43365f91a800a4f99a9444db2b5030a5c367ea09409efa8d7f14494c6b8eefec47d2e8a8e14f52da040d26bce845
 DIST genpatches-4.19-119.extras.tar.xz 17508 BLAKE2B fd7ac78c365d496e3a3ef6584c2690205fe6ade564ef1c6104d9995943f32e3669d8f1bc7403792f2570db01c7afbe205e343a863a391489725cd7a82c1d1295 SHA512 153134a2f1a684a185efa3effc5e254857b79e5a07a06cbc5ae43f7d852d51fb4e920c6fd020d8eeb88a7b863d09679a90df28ce5d0c39bd77f055109824a3f4
@@ -22,6 +25,9 @@ DIST genpatches-4.19-126.extras.tar.xz 17520 BLAKE2B d0c02bf09bbca9f936edd26f22d
 DIST genpatches-4.19-127.base.tar.xz 3516816 BLAKE2B 28e28340e31bbcbd5d2ef42667ab3d01ee616b8c68cbf1feb8275932d5c416cd534dad7426f95c8982cc415abc5c465f75f9b85ab9ce949608675923ff985a4b SHA512 2b0261a4cf9582c01a94a6e276f9a46b758b1398fb4e8fb1ecdb6fee401413928ee1741fce70e595c8adde8dfe213827d34a96b5de075329b1a6fc21e99ccd98
 DIST genpatches-4.19-127.experimental.tar.xz 6428 BLAKE2B 1364a7af3a58bd0c7b5eb48468e7bd1060374a15eb7c8e259ff7fffc879a0a6b6af7f29aa7b29d678315a52c447624a58f36eaf4cadebdf60d932dd22d2c1e33 SHA512 c6debd22d0e905458a6388de22c187d81d6fcc183ac1f7e6139d73fa4d8bb4a99c9b8546812ae969786e6576a6cfec06e63213381e9e85942caf57714d97cee6
 DIST genpatches-4.19-127.extras.tar.xz 17516 BLAKE2B 3818bad82a4ef179b34e9dc59038706f29d09fbb21ab49df36a0ed117ff5e6c9487b2a54ae7c33e71ac6ff3b431c51f8c61e8a16b22b5dc244a0754da16a0e49 SHA512 5f069c781b7ca35803043359a94d1e471d1acecbe13ae8c969de0b6bbb4104bdd09fe93129c411871b4228541eb60e8fe39e476fb937f68a170cd51fcf33ca71
+DIST genpatches-4.19-128.base.tar.xz 3579128 BLAKE2B 3826eb7e22f0c03382d3c417d9b58bd27f86ea2f06e2569f7eb10ecfe031c5e9bcf12dc6522a5bc7896a0777a4b3ac21ae89f2e9c9a75f5f8ea9539ac7193b36 SHA512 b3fdd7120bb07c5b8da15725d20d6f7d7b877d9b0aa4dea0deeed92026a958362cd3741dfd407129e282aaf3ffbe1257fbe1e2c77c640cbe7a78894c307c6ecd
+DIST genpatches-4.19-128.experimental.tar.xz 6432 BLAKE2B 94f7574d43c1c970c21b581d9b52ee1d150a676ebbdfd956be06e9f2af03d44128e842b88f47f92c219751f6552b480399b02e88f63869c6be4762905cce9e56 SHA512 be0a40143e569fcf3b17126b21cf8d74453a6009875f41e891691573b8026bf3ca85f12ea49e46951a5c9e0dd8971f72f3870fe756a7c916918400631d2b1bb3
+DIST genpatches-4.19-128.extras.tar.xz 17524 BLAKE2B 885ad7ab0be8ad9c2f2094e8dda22ea8b5a07dcf2da1478f1e5c6c5019b32f224dc589b5a9fe300e9c55dc2a462f6430e55d72eb130c52226ee58302946a6797 SHA512 e732168665d86658ceb92d0dbb5794c9dd441fcb09c6a9a28208668fcf63830da118c247156e177967016900e08e5754cbc573672ca90728447263f073c7f4f0
 DIST genpatches-4.4-222.base.tar.xz 3571800 BLAKE2B 4402f71d528f74ba4da4fab9e0209ca9f169f78ff3619f04b6c448bbd7a21613118d1f79a470f63785180e7080289fb9ab2a59673b9ef3b67838e5fe769e297b SHA512 d03f6b31adbf185918cb71a9a276cc09c500f2d6234c6d86e9d4341e487204b4b50ee3a0af48002bb529a0445ee50f7ce187ffabb9b76a69e789a7a930caf23a
 DIST genpatches-4.4-222.experimental.tar.xz 83348 BLAKE2B fbb8c234d060b3c54b0ecb3763ca0b36700556817d4bec51ceace60a68b82c7d93c673ab3372e9e0aecfc9e0cf688340c6122070b509096971f98e1bee86d71b SHA512 d8c39c415bcb5f40e1d3877f85e9ac649936af66108d9106f5c6732b2f75b37b6a18893889fc4ed6f8409ad47b0d5a2ba1e45a16bf31a0fa3b0e771789841d83
 DIST genpatches-4.4-222.extras.tar.xz 16496 BLAKE2B cc06659a35fed7d1bac1d7c8076f1199b5985b99202c64b6f09a8557361151b51be540189b1ffeb8acfe222cfb4908e401f74b5757e6ba65a2c16dd035fb831b SHA512 294bf913915ca2669475be17dcc91f2b65c5c48bf59964650a869f1d2773e2940a09b8caf51fa92db7933d3eafa3569df64699ff10bcf1b16bed1c722fef7581
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.185.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.185.ebuild
new file mode 100644
index 000000000000..489005130c24
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.185.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="195"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.129.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.129.ebuild
new file mode 100644
index 000000000000..8e07229489da
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.129.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="128"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}