Merge updates from master

45 files changed, 306 insertions, 139 deletions

diff --git a/app-doc/abs-guide/metadata.xml b/app-doc/abs-guide/metadata.xml
index 4eb20a048df2..e70c63a3ec25 100644
--- a/app-doc/abs-guide/metadata.xml
+++ b/app-doc/abs-guide/metadata.xml
@@ -5,4 +5,5 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/autobook/metadata.xml b/app-doc/autobook/metadata.xml
index 4eb20a048df2..e70c63a3ec25 100644
--- a/app-doc/autobook/metadata.xml
+++ b/app-doc/autobook/metadata.xml
@@ -5,4 +5,5 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/blas-docs/metadata.xml b/app-doc/blas-docs/metadata.xml
index 4bb6d2f417d7..2560465d18af 100644
--- a/app-doc/blas-docs/metadata.xml
+++ b/app-doc/blas-docs/metadata.xml
@@ -5,6 +5,7 @@
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>
+<stabilize-allarches/>
 <longdescription lang="en">
 BLAS (Basic Linear Algebra Subroutines) is a set of efficient routines
 for most of the basic vector and matrix operations. They are widely
diff --git a/app-doc/cantera-docs/metadata.xml b/app-doc/cantera-docs/metadata.xml
index fcc1fbde7c8c..f1f309bd141b 100644
--- a/app-doc/cantera-docs/metadata.xml
+++ b/app-doc/cantera-docs/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
 <longdescription lang="en">
 Cantera Doxygen API Documentation for C++ library
 and Sphinx API Documentation for CTI tool, Python module and Matlab interface.
diff --git a/app-doc/diveintopython/metadata.xml b/app-doc/diveintopython/metadata.xml
index 226979bb2ad8..7f7ace7f43b2 100644
--- a/app-doc/diveintopython/metadata.xml
+++ b/app-doc/diveintopython/metadata.xml
@@ -9,4 +9,5 @@
     <email>monsieurp@gentoo.org</email>
     <name>Patrice Clement</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/geant-docs/metadata.xml b/app-doc/geant-docs/metadata.xml
index 7bccd71dfa13..5223a28cd011 100644
--- a/app-doc/geant-docs/metadata.xml
+++ b/app-doc/geant-docs/metadata.xml
@@ -9,4 +9,5 @@
     <email>sci-physics@gentoo.org</email>
     <name>Gentoo Physics Project</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/jargon/metadata.xml b/app-doc/jargon/metadata.xml
index 6f49eba8f496..411b829a50a1 100644
--- a/app-doc/jargon/metadata.xml
+++ b/app-doc/jargon/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/lapack-docs/metadata.xml b/app-doc/lapack-docs/metadata.xml
index ee64f36fe486..9973085abcf2 100644
--- a/app-doc/lapack-docs/metadata.xml
+++ b/app-doc/lapack-docs/metadata.xml
@@ -5,6 +5,7 @@
 	<email>sci@gentoo.org</email>
 	<name>Gentoo Science Project</name>
 </maintainer>
+<stabilize-allarches/>
 <longdescription lang="en">
 LAPACK is a comprehensive FORTRAN library that does linear
 algebra operations including matrix inversions, least squared
diff --git a/app-doc/linkers-and-loaders/metadata.xml b/app-doc/linkers-and-loaders/metadata.xml
index 6f49eba8f496..411b829a50a1 100644
--- a/app-doc/linkers-and-loaders/metadata.xml
+++ b/app-doc/linkers-and-loaders/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/linux-device-drivers/metadata.xml b/app-doc/linux-device-drivers/metadata.xml
index 6f49eba8f496..411b829a50a1 100644
--- a/app-doc/linux-device-drivers/metadata.xml
+++ b/app-doc/linux-device-drivers/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/linux-kernel-in-a-nutshell/metadata.xml b/app-doc/linux-kernel-in-a-nutshell/metadata.xml
index 7a38bb900964..3c58a0219fbe 100644
--- a/app-doc/linux-kernel-in-a-nutshell/metadata.xml
+++ b/app-doc/linux-kernel-in-a-nutshell/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/linuxfromscratch/metadata.xml b/app-doc/linuxfromscratch/metadata.xml
index 0dddac7578fb..74f3ff43e3fb 100644
--- a/app-doc/linuxfromscratch/metadata.xml
+++ b/app-doc/linuxfromscratch/metadata.xml
@@ -5,6 +5,7 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="htmlsingle">Install all-on-one-page HTML version.</flag>
 	</use>
diff --git a/app-doc/motif-reference-manual/metadata.xml b/app-doc/motif-reference-manual/metadata.xml
index c665e48637be..7fccbc10bd18 100644
--- a/app-doc/motif-reference-manual/metadata.xml
+++ b/app-doc/motif-reference-manual/metadata.xml
@@ -4,4 +4,5 @@
 <maintainer type="person">
   <email>ulm@gentoo.org</email>
 </maintainer>
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/php-docs/metadata.xml b/app-doc/php-docs/metadata.xml
index 75da54b95e86..3f26431b360d 100644
--- a/app-doc/php-docs/metadata.xml
+++ b/app-doc/php-docs/metadata.xml
@@ -5,4 +5,5 @@
         <email>php-bugs@gentoo.org</email>
         <name>PHP</name>
     </maintainer>
+    <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/phrack-all/metadata.xml b/app-doc/phrack-all/metadata.xml
index b544accdc525..a279ac5b6e25 100644
--- a/app-doc/phrack-all/metadata.xml
+++ b/app-doc/phrack-all/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<stabilize-allarches/>
 <longdescription>
 "...those who know us know what we do, others do not have to...."
 
diff --git a/app-doc/phrack/metadata.xml b/app-doc/phrack/metadata.xml
index b544accdc525..a279ac5b6e25 100644
--- a/app-doc/phrack/metadata.xml
+++ b/app-doc/phrack/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<stabilize-allarches/>
 <longdescription>
 "...those who know us know what we do, others do not have to...."
 
diff --git a/app-doc/selfhtml/metadata.xml b/app-doc/selfhtml/metadata.xml
index 6f49eba8f496..411b829a50a1 100644
--- a/app-doc/selfhtml/metadata.xml
+++ b/app-doc/selfhtml/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/single-unix-specification/metadata.xml b/app-doc/single-unix-specification/metadata.xml
index 4eb20a048df2..e70c63a3ec25 100644
--- a/app-doc/single-unix-specification/metadata.xml
+++ b/app-doc/single-unix-specification/metadata.xml
@@ -5,4 +5,5 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-doc/tldp-howto/metadata.xml b/app-doc/tldp-howto/metadata.xml
index f1459fc56c90..833f001b2f7a 100644
--- a/app-doc/tldp-howto/metadata.xml
+++ b/app-doc/tldp-howto/metadata.xml
@@ -5,6 +5,7 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="html">Install multi-chapter HTML docs</flag>
 		<flag name="htmlsingle">Install all-on-one-page HTML docs</flag>
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
index 4a8dab5000a0..7e3701689351 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 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-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/dev-lang/ruby/ruby-3.0.0.ebuild b/dev-lang/ruby/ruby-3.0.0.ebuild
index cdedfadfa7bf..5c05821f92fb 100644
--- a/dev-lang/ruby/ruby-3.0.0.ebuild
+++ b/dev-lang/ruby/ruby-3.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 8ffc8cd6661b..8d1972d8698d 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -3,3 +3,4 @@ DIST importlib_resources-3.3.0.tar.gz 29000 BLAKE2B 5fb87c6e15f01733567fef060607
 DIST importlib_resources-3.3.1.tar.gz 29012 BLAKE2B ff4fc6eb6dd1ff89b873076b2709bcd6ed10c51388646560eeb929e8cb8a000329260ff093929163045ba32c0d00b9f797f9e06b9524445b1ef052e8a82a7f87 SHA512 3b484169362b7d7062655668a2035a77440a2e2b81708d41e339b6007e8140162d85cfc14fca464b059a649fcda31ef9718a08cdd2cf7c8e588ba3fafc08bb59
 DIST importlib_resources-4.0.0.tar.gz 27317 BLAKE2B 64cd01b650d82f2d3adf2a734a6da390073b190fbd8f8fd0a5be046931d78c93dcf16873477680fc14daadacdde629fcfd6f5d9cd89c7a5de56ba6c1ff4aad92 SHA512 0d5d175a814462db5bf29645f5d06e4cdff5c40ac1e022282690cba79e8f57885873956659952a086bdf7a1f3f7fbd78c1366030642ac8f6b40fa6df3056d6f1
 DIST importlib_resources-4.1.0.tar.gz 30814 BLAKE2B 50b6f9693df9ee21ae53f27f42a7aeb42e6f50ed305fa1004462bf189366b80d7dc48a40f77eafc41107de91f08015275a69e524421777a8d17e155cb867e943 SHA512 a42e4d66649b285489ea3bc0773761da19c05a03732492eefaaa008a0ddcf0696ceed380e296da9ff392529d681350ff045aeeec9cecbbafcd3bd15141920592
+DIST importlib_resources-4.1.1.tar.gz 30821 BLAKE2B 440adde5ce8604c3dddc6c59f730890b4832076f3f7d5c1f9b46ed4d4fe1d80d714a2f393ae1a1b386ef20812090c7370858ca9d3920bc115a6cedb0d2000c8f SHA512 e277d375f800e8d1be317f90344c10b2848a0f7e0b3b6f28014b71d4b92b496137aa84b8ad865a3b93c983d20d827f18c6baf0d6c540882622b0903bebaae303
diff --git a/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild b/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
new file mode 100644
index 000000000000..b94ce8b4f431
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/zipp[${PYTHON_USEDEP}]
+	' pypy3 python3_{6,7})
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 8a812fbe2520..60dae7e2fbd7 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1 +1,2 @@
 DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
+DIST jaraco.collections-3.1.0.tar.gz 18206 BLAKE2B c420b3c65c048840f2957ebff0e69a7e2d3db515801a54d829bc2dd9f77b804066ef15766c915b764a148eaa945fc9a30576bb00a645f4c124c031b6ccc64184 SHA512 9a3e4e60cd497ee2ed4a092bd823ecffe0d20293dd9ba491fd2c4e5df2481042efa8ba52503b001e11908982608852a0588cd70b4957d0551c066be97389652c
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
new file mode 100644
index 000000000000..57a148e6aa8a
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/jaraco-collections-3.0.0-pypy.patch"
+)
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 711d1beef0f6..19d71b5d79c4 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1 +1,2 @@
 DIST jaraco.logging-3.0.0.tar.gz 10739 BLAKE2B c5cad0b6d7702a1216869dd0cd388d51a0a8e7bd24000108ef818623b54d23ce1adf0de2e017b869d764342484bf25d676ee18af9647b82964933ebb184cec0e SHA512 bc0edeef6223d0eb78110d51159a70afd16542e830e3cd37dec7628e582bce44218cd7669c03c41125db9824b6fc774f608dd7f6540224659f4dc2f1927d681c
+DIST jaraco.logging-3.1.0.tar.gz 11801 BLAKE2B 858f0930b7e04ea6f1e3d13b3d7be1056ad9efa901857ded3759e450e151c8485feb1cb6eb91c8ebf7be53c649bc818759009394b20f606fd5551c82ce0d1e61 SHA512 ce9a9cbad6d6bb448615eac986d361f9c6ff477b1209e85433f12a49055a9e30125cd49bebcf915a08b8efe0732439a8e1d336e63f6454369b3e846a9a1383ba
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
new file mode 100644
index 000000000000..ed7469cd1211
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="https://github.com/jaraco/jaraco.logging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-ruby/brotli/Manifest b/dev-ruby/brotli/Manifest
index 98e45ea64d1c..2e1df751c809 100644
--- a/dev-ruby/brotli/Manifest
+++ b/dev-ruby/brotli/Manifest
@@ -1 +1,2 @@
 DIST brotli-0.2.3.tar.gz 63304 BLAKE2B 96321a480e855ae7e77b93c06fd09153611a8a273ba66a8952093f844f6ccfa908d4bcabfd4dde084813f7f3961e8843208ed71f78e91f924bfe7e2ddece3628 SHA512 7d057d0055836c79744b802bb2401630375cc924035e9a45069c54e5df32711b9aa25234f4743aea729526028b804c518f36112ab721a6761b55311d07a8b79e
+DIST brotli-0.4.0.tar.gz 9460 BLAKE2B b5d5e490c3ab086d6817c1ecc9143aefe88487d65d6774bda939b25bdb6aaaea4e28d99e01d49b90dbbccceba6643c0b5fdab0cea930eaf1661454996e61fab7 SHA512 7d1d2a1343aec11e840d840358d7d27b4ef93954bc17170d581b16d46191902b6fdf6380344f0d172e5e7f3fc0948146312659a44dc95973ec30ac3344f4a656
diff --git a/dev-ruby/brotli/brotli-0.4.0.ebuild b/dev-ruby/brotli/brotli-0.4.0.ebuild
new file mode 100644
index 000000000000..3684034a1b87
--- /dev/null
+++ b/dev-ruby/brotli/brotli-0.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="brotli.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Brotli compressor/decompressor"
+HOMEPAGE="https://github.com/miyucy/brotli"
+SRC_URI="https://github.com/miyucy/brotli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" >=app-arch/brotli-1.0.7"
+DEPEND+=" >=app-arch/brotli-1.0.7"
+
+# Depends on the test data in app-arch/brotli
+RESTRICT="test"
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files -z -- spec/find spec -print0/' \
+		-e 's/git ls-files -z/find . -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/brotli extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/brotli
+	mv ext/brotli/brotli.so lib/brotli/ || die
+}
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index fc8ad82cb817..f0202da34ce8 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,5 +1,2 @@
 DIST bson-4.10.0.tar.gz 158673 BLAKE2B 64a2d608a7b5c048a646e15839be9a77b1203067b018b4cd25174a38c71aa9c7ccc8f95525d1656c76f725ca5b4162e2ce408603a97bbeb51798d4ac0f316bf7 SHA512 8ba561f602e81260ec929271d1275a8393c212948b737b3662ba36e1af0ca9f48904e5497d359ed49b323875b54fac4edf6ed2afdde2505aff7e702192d78f5d
-DIST bson-4.7.1.tar.gz 120690 BLAKE2B fbb6eeca2b339eaa80503294cefd1c97abb9f992ce1068bbf64a6ffa9239fabb6df4c982c90ab3522362c5bbe55bbaf479023a2f5f2e24ffb86a1dd8fae80db3 SHA512 75026ab81abf5f629200b008a3a8da38a594751c43335eb0c8e29bc94848d2dfce9479419de136b8176dde5d2cc9e66ceb5a7d2b52cfacdb1813a1c63871fa95
-DIST bson-4.8.2.tar.gz 153029 BLAKE2B bc058d06afecdfcaa029e525f8122bd4e647a432934cd2b7594721920e9f0b1d727a48fcf44ec14d2206a699ea6c24c872b46e821548a99ea66f9c7ce0600d98 SHA512 48b4fc7278cb8e0623acf42241ca3169a98f3a7f754c8af8f94b9046540843d22acafe18db4ba804636f3356dfe79d6c6843004ee980c327726851c28315776d
-DIST bson-4.9.2.tar.gz 155910 BLAKE2B 6c2b8356803f2b6975d5ea84ebf59815cb101eb0394c9fedc34d9e9405f20bc4d4691eb9e5167dfdc7cebad95121e752473d6f244ba4ead8d0c454e4f4f694e1 SHA512 d2619eb18e19b3686ad1c14ebbaebd6a08c8b87295c16091472d7a90e680530c146e95df77efb07a2d8248ebf8eefc0f3afdde38bbd8a814ca26fce2ab470baf
 DIST bson-4.9.4.tar.gz 157187 BLAKE2B 58bc8293b53f19fb1f02a33b42845c935046c745222ac2474b055945e3d15dfee2be17dffc00faec976419ab51d6597414884520cb8de5a91470ea485b805b9d SHA512 0e1c2c14782d321df5056439dd9f2b2cfd61daa572a4921acb3d8afcf6c50ab679f4c06c82b8d40c0997876b9599cf609ddd77bf80c005028ad711f57d0a502c
diff --git a/dev-ruby/bson/bson-4.7.1.ebuild b/dev-ruby/bson/bson-4.7.1.ebuild
deleted file mode 100644
index 5e6f5007077a..000000000000
--- a/dev-ruby/bson/bson-4.7.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="bson-ruby"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="https://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="bson-ruby-${PV}"
-
-LICENSE="APSL-2"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE="test doc"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove project-specific rspec options
-	rm .rspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/bson/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/bson/bson-4.8.2.ebuild b/dev-ruby/bson/bson-4.8.2.ebuild
deleted file mode 100644
index 5e6f5007077a..000000000000
--- a/dev-ruby/bson/bson-4.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="bson-ruby"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="https://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="bson-ruby-${PV}"
-
-LICENSE="APSL-2"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE="test doc"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove project-specific rspec options
-	rm .rspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/bson/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/bson/bson-4.9.2.ebuild b/dev-ruby/bson/bson-4.9.2.ebuild
deleted file mode 100644
index 5e6f5007077a..000000000000
--- a/dev-ruby/bson/bson-4.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="bson-ruby"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="https://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="bson-ruby-${PV}"
-
-LICENSE="APSL-2"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE="test doc"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove project-specific rspec options
-	rm .rspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/bson/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/racc/racc-1.5.2.ebuild b/dev-ruby/racc/racc-1.5.2.ebuild
index b7494318c8dd..4460880e8ea3 100644
--- a/dev-ruby/racc/racc-1.5.2.ebuild
+++ b/dev-ruby/racc/racc-1.5.2.ebuild
@@ -40,6 +40,9 @@ all_ruby_prepare() {
 	# Avoid isolation since dependencies are not properly declared.
 	sed -i -e 's/, :isolate//' Rakefile || die
 
+	# Avoid bundler dependency to make bootstrapping easier
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
 	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
 
diff --git a/dev-ruby/rbs/rbs-1.0.0.ebuild b/dev-ruby/rbs/rbs-1.0.0.ebuild
index 84aadf8ad610..33292f43e0bc 100644
--- a/dev-ruby/rbs/rbs-1.0.0.ebuild
+++ b/dev-ruby/rbs/rbs-1.0.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/ruby/rbs"
 SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/rexml/rexml-3.2.4.ebuild b/dev-ruby/rexml/rexml-3.2.4.ebuild
index baf79b539569..9d8d6f36219e 100644
--- a/dev-ruby/rexml/rexml-3.2.4.ebuild
+++ b/dev-ruby/rexml/rexml-3.2.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="3"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rss/rss-0.2.9.ebuild b/dev-ruby/rss/rss-0.2.9.ebuild
index 182408525a62..76de49246db3 100644
--- a/dev-ruby/rss/rss-0.2.9.ebuild
+++ b/dev-ruby/rss/rss-0.2.9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Family of libraries that support various formats of XML feeds."
 HOMEPAGE="https://github.com/ruby/rss"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/typeprof/typeprof-0.11.0.ebuild b/dev-ruby/typeprof/typeprof-0.11.0.ebuild
index ba75d91faf84..6dcae41638d8 100644
--- a/dev-ruby/typeprof/typeprof-0.11.0.ebuild
+++ b/dev-ruby/typeprof/typeprof-0.11.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/typeprof"
 SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/webrick/webrick-1.7.0.ebuild b/dev-ruby/webrick/webrick-1.7.0.ebuild
index de55837cfabf..9e7c443adcab 100644
--- a/dev-ruby/webrick/webrick-1.7.0.ebuild
+++ b/dev-ruby/webrick/webrick-1.7.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/webrick"
 SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 19b84d2160ad..45623faa138e 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1 +1,2 @@
 DIST xfce4-cpugraph-plugin-1.1.0.tar.bz2 391629 BLAKE2B e1a18df75461466abf908100e3ace73c46751d78527a9928a5712e3b3388cb0908b697055bd229f700f3e36e908cbc90f2732fc65568ebbe47d876aa376fd087 SHA512 c928baac776517da8929b8ce3842be7e02a2b3394b7cc848028d1720ca611e1aa4ef706bd00736fecfed0b3b2d0cce94c09b0f905a226db5e50c036dabb8df2a
+DIST xfce4-cpugraph-plugin-1.2.0.tar.bz2 416669 BLAKE2B 1adc1ac15b5280cb20dbc9e346ac99692fa5ce345431ffadad0e202cbad462d8210433b03d58f6970c493987a69866e97287b4a4ce655afe3d867258c8f8c14d SHA512 b7d8402646bb4bca82c767b2a4e25a96d6d9a0327f13b934afd2165e9884a134686cf18e43c6fb30f93f9aba5f41aeceb0cbfb49c15f165ce972ed82eb9eb563
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.0.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.0.ebuild
new file mode 100644
index 000000000000..05bb474023a7
--- /dev/null
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A system load plug-in for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=x11-libs/gtk+-3.22:3
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/xfce4-panel-4.12:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-fsguard-plugin/Manifest b/xfce-extra/xfce4-fsguard-plugin/Manifest
index 78091ce61205..fca5559972d9 100644
--- a/xfce-extra/xfce4-fsguard-plugin/Manifest
+++ b/xfce-extra/xfce4-fsguard-plugin/Manifest
@@ -1 +1,2 @@
 DIST xfce4-fsguard-plugin-1.1.1.tar.bz2 367902 BLAKE2B 2fbd088cc2a53dc99e01fbbc880c6223bb3cb8f030cfbed5373d50b7a1e37a072f71beed2f2e84b7f0adcbce28cd0d6cc0c32356589195482c9dee143d04e46c SHA512 9b8a8c171baddc0261e4253c2e710c5d2e180e7ee669915f5a81e53778775880623af43b1638679b86d6a3e077826a69a948577a558e768fa41924ce5d1006fe
+DIST xfce4-fsguard-plugin-1.1.2.tar.bz2 402703 BLAKE2B d7d4b936510d7cdc153d47c54178aebfb9f3339f6413a1013a18301806e05cf76ff2439e7b1e00637407c113149f9e72632e66e01f287e817d93ba5af208947a SHA512 ff42f3d92292357f432a69fc401dec474b1eadabbcd7602f4453f7567faaa623d3672664c3a2baa98ea4e522c6a607b5a40327c5fea33b2d8535f15a4d511ebb
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.2.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.2.ebuild
new file mode 100644
index 000000000000..5c57fdf7caf3
--- /dev/null
+++ b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A filesystem guard plug-in for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.12:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-verve-plugin/Manifest b/xfce-extra/xfce4-verve-plugin/Manifest
index 2b5830bbca14..bbe1e4828e96 100644
--- a/xfce-extra/xfce4-verve-plugin/Manifest
+++ b/xfce-extra/xfce4-verve-plugin/Manifest
@@ -1 +1,2 @@
 DIST xfce4-verve-plugin-2.0.0.tar.bz2 384165 BLAKE2B 7223a2f52574a41acb07ea777a00470a7b0aed027b1084f6fc706d6af07eceb801b15bf2bcdfb9988806f18189363e34f99f929911e23c7ed702ee94c1ca21d7 SHA512 b6be658f5996857e1c5696dc66f973fa5875ba95682297ad157e107abae821023cdf7101ba5f8e5358740549e392b76bf7d1dae252f43bf1a7e8716d798ed39a
+DIST xfce4-verve-plugin-2.0.1.tar.bz2 384412 BLAKE2B 3a0370b1027fef00d748de43bf420271e8d093a203a1c77dfbb8ecd093e139d35ce6f7d585558635b2f5566dc49d8c226c9d6ebe88e7a785ffeabe1a9c8f63eb SHA512 c8397bd833e2a2cf25d86bd9234bdbafed00ce0783273532a57e87a5182d26b3e84b402ed8c9fd9204d5d46fbca257fcf6601f279d9929d806a4c36338379876
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild
new file mode 100644
index 000000000000..89349ae153f8
--- /dev/null
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A comfortable command line plugin for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/xfce4-panel-4.12:=
+	dev-libs/glib:2=
+	>=dev-libs/libpcre-5:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}