diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8105b6e03e1a..0e0e2862b76d 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 5240fe0ab725..9282af040d65 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/cppo/cppo-1.6.6.ebuild b/dev-ml/cppo/cppo-1.6.6.ebuild
index 320c0464d7fa..893668e3e2a6 100644
--- a/dev-ml/cppo/cppo-1.6.6.ebuild
+++ b/dev-ml/cppo/cppo-1.6.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.t
 
 SLOT="0/${PV}"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 
 IUSE="+ocamlopt"
 
diff --git a/dev-ml/dune/dune-2.7.1.ebuild b/dev-ml/dune/dune-2.7.1.ebuild
index 36da8ec6f77d..010bc0fc6a56 100644
--- a/dev-ml/dune/dune-2.7.1.ebuild
+++ b/dev-ml/dune/dune-2.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="test"
 
 DEPEND="dev-lang/ocaml"
diff --git a/dev-ml/extlib/extlib-1.7.7.ebuild b/dev-ml/extlib/extlib-1.7.7.ebuild
index 008178d6306b..3e4ea690aacb 100644
--- a/dev-ml/extlib/extlib-1.7.7.ebuild
+++ b/dev-ml/extlib/extlib-1.7.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc +ocamlopt"
 
 # See bug #704146
diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
index b3b53b409f96..9c3988c304ea 100644
--- a/dev-ml/findlib/findlib-1.8.1-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 96c655729b85..c1bc0d053fbd 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.29.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.29.0.ebuild
index fa1227477627..21f682a67156 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.29.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.29.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 2570eb034fa3..32a55818a0c0 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/cssc/cssc-1.4.1.ebuild b/dev-vcs/cssc/cssc-1.4.1.ebuild
index 0a3f9485a090..be215e05db13 100644
--- a/dev-vcs/cssc/cssc-1.4.1.ebuild
+++ b/dev-vcs/cssc/cssc-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${CSSC_P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/cssc/"
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 IUSE="test valgrind"
 RESTRICT="!test? ( test )"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 43548a3b21b5..76d90083c648 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4e72bdf46e52..cbdccd78eb79 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Dec 2020 12:08:37 +0000
+Thu, 17 Dec 2020 12:38:36 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4e72bdf46e52..cbdccd78eb79 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Dec 2020 12:08:37 +0000
+Thu, 17 Dec 2020 12:38:36 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 3ac84dd28435..588f833fef67 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 52193a9935fe..7bb3d6458d75 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.6 b/metadata/md5-cache/dev-ml/cppo-1.6.6
index bb522410bda1..81927e0002eb 100644
--- a/metadata/md5-cache/dev-ml/cppo-1.6.6
+++ b/metadata/md5-cache/dev-ml/cppo-1.6.6
@@ -5,10 +5,10 @@ DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-community/cppo/
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.6.6
 SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.6.tar.gz -> cppo-1.6.6.tar.gz
 _eclasses_=dune	31e50aa986270c1f8ba957a9dd3f6fcf
-_md5_=8dcae85f8e509f964b5b7e6029471dc1
+_md5_=8386d5e36b6e291d9d5209bb697269bf
diff --git a/metadata/md5-cache/dev-ml/dune-2.7.1 b/metadata/md5-cache/dev-ml/dune-2.7.1
index 3b877b2c6c38..c36e510f4bf4 100644
--- a/metadata/md5-cache/dev-ml/dune-2.7.1
+++ b/metadata/md5-cache/dev-ml/dune-2.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=A composable build system for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/ocaml !dev-ml/jbuilder
 RESTRICT=test
 SLOT=0/2.7.1
 SRC_URI=https://github.com/ocaml/dune/archive/2.7.1.tar.gz -> dune-2.7.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=8a88dff9e2c585637dba8c351a5b7474
+_md5_=2d79f615ddff73769984f2a1bd7920f4
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.7 b/metadata/md5-cache/dev-ml/extlib-1.7.7
index 36995d5654b2..4cc88d7738e0 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.7
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.7
@@ -5,10 +5,10 @@ DESCRIPTION=Standard library extensions for O'Caml
 EAPI=7
 HOMEPAGE=https://github.com/ygrek/ocaml-extlib
 IUSE=doc +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.7.7
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.7.tar.gz -> extlib-1.7.7.tar.gz
 _eclasses_=findlib	2d5f502be83d6fc5f8372442a59856b6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54ff063a9250a17464b5a512d59906d0
+_md5_=a8ff5a49753cae90cde26a946bf3ec7b
diff --git a/metadata/md5-cache/dev-ml/findlib-1.8.1-r1 b/metadata/md5-cache/dev-ml/findlib-1.8.1-r1
index 0b7c665611d5..3763c5f3aa74 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.8.1-r1
+++ b/metadata/md5-cache/dev-ml/findlib-1.8.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=OCaml tool to find/use non-standard packages
 EAPI=7
 HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
 IUSE=doc +ocamlopt tk
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.8.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fb8101d034630e481cc97820a14c4d3c
+_md5_=8e2fd336e987a148f1d9f65fb2e3d5bf
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 0532ad780a00..c034a944e01d 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.29.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.29.0
index 5e36319d11c3..e54a4efe1d8b 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.29.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.29.0
@@ -4,7 +4,7 @@ DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templ
 EAPI=7
 HOMEPAGE=https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/boto3-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/serverless-application-model/archive/v1.29.0.tar.gz -> aws-sam-translator-1.29.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0650f7a652ac0f96752cd1afceebefb9
+_md5_=7ff2658129f138d8ceefff53832b8de9
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index fea6c48e0bb6..19a176c4a0ae 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/cssc-1.4.1 b/metadata/md5-cache/dev-vcs/cssc-1.4.1
index ae4ad83283c7..3f1a289d30d7 100644
--- a/metadata/md5-cache/dev-vcs/cssc-1.4.1
+++ b/metadata/md5-cache/dev-vcs/cssc-1.4.1
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU Project's replacement for SCCS
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/cssc/
 IUSE=test valgrind
-KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/cssc/CSSC-1.4.1.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=00141090ada59e6c7fb0a19828113e0c
+_md5_=304638e36b5e37907e41000a2026d4b4
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index c28baeb0f30f..6c21552f89b5 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1 b/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
index 380ff5e2da39..ee8f3b516cf8 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
+++ b/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
@@ -11,4 +11,4 @@ RDEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 SLOT=0/6
 SRC_URI=mirror://gnu/gdbm/gdbm-1.18.1.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb7e4df012e1a20485476b13122458f3
+_md5_=b55d412ef1aa089d69411cdf138bb307
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index f43a35f10597..44476f95b756 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/wmbattery-2.54 b/metadata/md5-cache/x11-plugins/wmbattery-2.54
index c1a9840d9d08..75a1cfbd2903 100644
--- a/metadata/md5-cache/x11-plugins/wmbattery-2.54
+++ b/metadata/md5-cache/x11-plugins/wmbattery-2.54
@@ -5,9 +5,9 @@ DESCRIPTION=A dockable app to report APM, ACPI, or SPIC battery status
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmbattery
 IUSE=apm +upower
-KEYWORDS=~amd64 ~ppc -sparc x86
+KEYWORDS=amd64 ~ppc -sparc x86
 LICENSE=GPL-2
 RDEPEND=apm? ( sys-apps/apmd ) x11-libs/libX11 x11-libs/libXext x11-libs/libXpm upower? ( >=sys-power/upower-0.9.23 )
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmbattery-2.54.tar.gz
-_md5_=c6daee0be92623b5ec28803bc1d81a98
+_md5_=6484bf3dc779a98494f4492d5c09eb5e
diff --git a/metadata/md5-cache/x11-plugins/wmblob-1.0.4 b/metadata/md5-cache/x11-plugins/wmblob-1.0.4
index b123591d9786..149593a606f9 100644
--- a/metadata/md5-cache/x11-plugins/wmblob-1.0.4
+++ b/metadata/md5-cache/x11-plugins/wmblob-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext virtual/
 DESCRIPTION=a fancy but useless dockapp with moving blobs
 EAPI=6
 HOMEPAGE=https://github.com/bbidulock/wmblob
-KEYWORDS=~amd64 ppc sparc x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 SLOT=0
 SRC_URI=https://github.com/bbidulock/wmblob/releases/download/1.0.4/wmblob-1.0.4.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f021b7fd9ba4cdf9001e1e78dc04acc8
+_md5_=0c53e2caae00652ce2973469911ab089
diff --git a/metadata/md5-cache/x11-plugins/wmbutton-0.7.1 b/metadata/md5-cache/x11-plugins/wmbutton-0.7.1
index d0af7833a5c3..207a40e90849 100644
--- a/metadata/md5-cache/x11-plugins/wmbutton-0.7.1
+++ b/metadata/md5-cache/x11-plugins/wmbutton-0.7.1
@@ -4,9 +4,9 @@ DESCRIPTION=a dockapp application that displays nine configurable buttons
 EAPI=6
 HOMEPAGE=https://www.dockapps.net/wmbutton
 IUSE=branding
-KEYWORDS=~amd64 ~ppc sparc x86
+KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmbutton-0.7.1.tar.gz
-_md5_=386f57c067d748e5362f524f41cfaba5
+_md5_=40629a3aa52e8cc0b855af92bc6b96fb
diff --git a/metadata/md5-cache/x11-plugins/wmix-3.5 b/metadata/md5-cache/x11-plugins/wmix-3.5
index 0af9e7ef7587..90435e08be9a 100644
--- a/metadata/md5-cache/x11-plugins/wmix-3.5
+++ b/metadata/md5-cache/x11-plugins/wmix-3.5
@@ -3,9 +3,9 @@ DEPEND=media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-
 DESCRIPTION=Dockapp mixer for OSS or ALSA
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmix
-KEYWORDS=~amd64 ~ppc sparc x86
+KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmix-3.5.tar.gz
-_md5_=7da0863094b91997514b3e9de2d7e964
+_md5_=f310d9f22f8452ea3be19d346dbfbeed
diff --git a/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r1 b/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r1
index b77748d7dddb..1d8a702f12b2 100644
--- a/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r1
+++ b/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libXpm virtual/pkgconfig
 DESCRIPTION=dockapp that monitors one or more mailboxes
 EAPI=6
 HOMEPAGE=http://tnemeth.free.fr/projets/dockapps.html
-KEYWORDS=~amd64 ppc ~ppc64 sparc x86
+KEYWORDS=amd64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libXpm
 SLOT=0
 SRC_URI=http://tnemeth.free.fr/projets/programmes/wmmaiload-2.3.0.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cfd10129c8dfcd19d8e6c5271be1d885
+_md5_=568456ae30ef301ada1b3fe96fdd0075
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4e72bdf46e52..cbdccd78eb79 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Dec 2020 12:08:37 +0000
+Thu, 17 Dec 2020 12:38:36 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 852faad12316..f27b47e5744d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Dec 17 12:08:37 PM UTC 2020
+Thu Dec 17 12:38:36 PM UTC 2020
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c5f5ee5b7804..fd6c5092a641 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Dec 2020 12:30:01 +0000
+Thu, 17 Dec 2020 13:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 78b985d9d3e0..20cb60203b55 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3fb6f1f4e14e772de722a6250be0c42e31036cfa 1608206654 2020-12-17T12:04:14+00:00
+77cf2a578be1b597c79077c230c59038b7aaf6f6 1608208358 2020-12-17T12:32:38+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 23a08413a6fe..22f924afd4df 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1608206701 Thu 17 Dec 2020 12:05:01 PM UTC
+1608208501 Thu 17 Dec 2020 12:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4e72bdf46e52..cbdccd78eb79 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Dec 2020 12:08:37 +0000
+Thu, 17 Dec 2020 12:38:36 +0000
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index b57f0ac817a9..c2d0ea2d8c51 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch b/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch
new file mode 100644
index 000000000000..2f0c0c450733
--- /dev/null
+++ b/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch
@@ -0,0 +1,12 @@
+diff -ruN gdbm-1.18.1.orig/configure.ac gdbm-1.18.1/configure.ac
+--- gdbm-1.18.1.orig/configure.ac	2018-10-27 08:46:09.000000000 +0300
++++ gdbm-1.18.1/configure.ac	2020-12-17 14:12:14.249678303 +0200
+@@ -94,7 +94,7 @@
+ 
+ dnl Internationalization macros.
+ AM_GNU_GETTEXT([external], [need-ngettext])
+-AM_GNU_GETTEXT_VERSION(0.18)
++AM_GNU_GETTEXT_REQUIRE_VERSION(0.18)
+ 
+ AC_CHECK_HEADERS([sys/file.h sys/termios.h string.h locale.h getopt.h])
+ 
diff --git a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
index a4583e1df778..b7c4e924cac2 100644
--- a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
@@ -19,7 +19,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}"/${PN}-1.18.1-gcc-10.patch)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.1-gcc-10.patch
+	"${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838
+)
 
 src_prepare() {
 	default
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 62dfd2958de4..815a359eda22 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/wmbattery/wmbattery-2.54.ebuild b/x11-plugins/wmbattery/wmbattery-2.54.ebuild
index 1163ee081469..f8aa6f8bd2fa 100644
--- a/x11-plugins/wmbattery/wmbattery-2.54.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.54.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc -sparc x86"
+KEYWORDS="amd64 ~ppc -sparc x86"
 IUSE="apm +upower"
 
 RDEPEND="apm? ( sys-apps/apmd )
diff --git a/x11-plugins/wmblob/wmblob-1.0.4.ebuild b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
index 60206498e9ec..215c1fd29f0e 100644
--- a/x11-plugins/wmblob/wmblob-1.0.4.ebuild
+++ b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
index 9beb0fa72849..4a90d6d6e8a4 100644
--- a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="branding"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmix/wmix-3.5.ebuild b/x11-plugins/wmix/wmix-3.5.ebuild
index 1853696d8c69..c0b6a38e180f 100644
--- a/x11-plugins/wmix/wmix-3.5.ebuild
+++ b/x11-plugins/wmix/wmix-3.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
index 40f3b8d428ab..c0e09e894497 100644
--- a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
+++ b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2