gentoo resync : 16.01.2021

16 files changed, 206 insertions, 15 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index b72bc1e711bc..b9cd2bc15c2c 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index 9d09ae849692..e160c90e5b9f 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -1,3 +1,6 @@
 DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025ec8ea5901cf64c2014f8c32b83ce60870ca754dd15e8982a7023b77d3856b39dbbbdd636de6da47d361cb15a940e SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688
+DIST goocanvas-3.0.0.tar.xz 556832 BLAKE2B 4ee632a614b6b881000bbee8d5e21a166151a94667c603c92b94c5e076fab78a6df44fe1d45fb4d7c4d65c0e060b599abf3970313542836a63efbca33d6a075b SHA512 a53839af4d98afdfc0f92531bdb09013dd71e964185dc2670af077bb7b41b9ff5c75f2801f6e77c99055b38f3603d8cf197f84affb8d7c3196526ce824b228e3
 EBUILD goocanvas-2.0.4-r1.ebuild 1289 BLAKE2B 6b0a74060e137eaacee6a6402fec2277d6ef9cbbcc7a765f249316e1d48c3c7fcfc9e0442f607bf7dc11687f5264222617a902da815530216e9c72ad80f3b7fc SHA512 7b87bdf8645a9090eaddec1bdf4e9ed151eb8e377a3e0c8094a281374855657f0e05312a4c22c5990c5f5ceb179deb0d053a33595aa8da765a9e0873d724b49b
+EBUILD goocanvas-2.0.4-r2.ebuild 1282 BLAKE2B d39ce74332a8f817b8774b49a6a411b524e964f04cc375965107cf4674d02681684c37b8f15e41ad319b635d169052dcb1996a226a31d6fd8fbf632d766f6df5 SHA512 6ee2c7caa4de06e935ec86d887a9494badd4cac4a53d86625257d3bed22ee4ef247957e6451342e94b34fff1940916ae4f03649b040cf4144abe46ea32219520
+EBUILD goocanvas-3.0.0.ebuild 1282 BLAKE2B e040b8dcf262c63b80dbb4c4b0e867c0a19596fafdbcf5100931ea0de41288d89323b98141f3a587a2fb227970cf5497967897e362a960e5ef2dc293aaa990b4 SHA512 b4e555ea8033ce6455873b511777fb2f1514877563d1f4a9f6bcd80101c5b11f736592824fc7652c4fd43bfc692eee4fd47242c8c4be0cee10943052d3248ed2
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild
new file mode 100644
index 000000000000..73563a3e29f3
--- /dev/null
+++ b/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
+HOMEPAGE="https://wiki.gnome.org/GooCanvas"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples +introspection"
+
+RDEPEND="
+	>=x11-libs/cairo-1.10.0
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.0.0:3
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.16
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not build demos
+	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
+		-i Makefile.{am,in} || die "Failed to sed demo"
+
+	# Python bindings are built/installed manually, but not at all anymore (py2).
+	sed -e "/SUBDIRS = python/d" \
+		-i bindings/Makefile.{am,in} || die "Failed to sed python subdirs"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	PYTHON=true gnome2_src_configure \
+		--disable-rebuilds \
+		--disable-static \
+		$(use_enable introspection) \
+		--disable-python
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto "/usr/share/doc/${P}/examples/"
+		doins demo/*.[ch] demo/*.png
+	fi
+}
diff --git a/x11-libs/goocanvas/goocanvas-3.0.0.ebuild b/x11-libs/goocanvas/goocanvas-3.0.0.ebuild
new file mode 100644
index 000000000000..16b18094e850
--- /dev/null
+++ b/x11-libs/goocanvas/goocanvas-3.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
+HOMEPAGE="https://wiki.gnome.org/GooCanvas"
+
+LICENSE="LGPL-2"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples +introspection"
+
+RDEPEND="
+	>=x11-libs/cairo-1.10.0
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.0.0:3
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.16
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not build demos
+	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
+		-i Makefile.{am,in} || die "Failed to sed demo"
+
+	# Python bindings are built/installed manually, but not at all anymore (py2).
+	sed -e "/SUBDIRS = python/d" \
+		-i bindings/Makefile.{am,in} || die "Failed to sed python subdirs"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	PYTHON=true gnome2_src_configure \
+		--disable-rebuilds \
+		--disable-static \
+		$(use_enable introspection) \
+		--disable-python
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto "/usr/share/doc/${P}/examples/"
+		doins demo/*.[ch] demo/*.png
+	fi
+}
diff --git a/x11-libs/gtkdatabox/Manifest b/x11-libs/gtkdatabox/Manifest
index b8979dfeb07a..7a9c0894834f 100644
--- a/x11-libs/gtkdatabox/Manifest
+++ b/x11-libs/gtkdatabox/Manifest
@@ -1,3 +1,5 @@
 DIST gtkdatabox-0.9.3.0.tar.gz 2883977 BLAKE2B d9d5de1c4d07bd01940ea6f75f2b2f455b46cf018dbae67bcb643f523353e675e1a97cfc10b696fe16aa0391cb006e5e866bef52cefcdd8ca4de057589164e6e SHA512 5c2464dafcf9cdd4ee11bec6f8e627533c0270fe28d736e1be45ad084c42d430a50c39cf08531138627cc59ab034a191ecd7b97ccfce633467ff99e6e9cd593a
+DIST gtkdatabox-1.0.0.tar.gz 520992 BLAKE2B d04dfc833ae6807fd593ebddcdbd45ee3c5be6818d11b8c3da313649d7279ddcfcc635571d84a2da3e2b867e3ec3f50fead2c0ee2fe25fad43851abc19610883 SHA512 63007ab50e1e1eba185a2c05ccc1a8759aded91797688c4b4888728af3527514cc79280851981e36b01e24859fe8e0f95d660a219d456edeb50e0b847d7b9999
 EBUILD gtkdatabox-0.9.3.0.ebuild 1274 BLAKE2B f19ca74d01218bb7a2567ea3b1ca50f37b9c68ad0bbec2dfac9a041c442149f6fee754d3c17878a43a9968fce477f8f9f676b8a3bde2be8539ebc0525fab0fe3 SHA512 6f6bf5c70d4b0cabd1e11e42d921580f6eb1d9434e3e062daa4bfd0ea6a27e44317aa75b3d2f4feb6438148bc65a5c8838e9618b25ef838cdd4c245b3ad73882
+EBUILD gtkdatabox-1.0.0-r1.ebuild 1442 BLAKE2B 3d5b60270151ffcdd9087f7e7edd17a81a0559ce86eed32a0cfdb058ad263bcc8af3a571f22dcd73706caf2c589fb534561699ccf49d0f32ed718584bd77cdbb SHA512 a97626cd3243d1929d3edbaa7ef8995760c036749fc705108e8b69666e1bec806ff00647ca02ce7d62f0d013e805daacc73b5b13e7b82987a63334cfd9f3a069
 MISC metadata.xml 489 BLAKE2B 64f8578f50f88c312798a3a31a463c8c47aef746809f1f7a845579cc285c72f566dfb45d35bcc9ff638b65f97754fb8a831b126f75f38e1dd45cfd11c7438b23 SHA512 d78ccf6e37e39d7f0d883e273874b452d912813795592266cc5f90b80060d2e0809fc56aa441c96e98f34be97e8390afa8bf64b88c6fe436730fdcff1c415456
diff --git a/x11-libs/gtkdatabox/gtkdatabox-1.0.0-r1.ebuild b/x11-libs/gtkdatabox/gtkdatabox-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..e99b9d199435
--- /dev/null
+++ b/x11-libs/gtkdatabox/gtkdatabox-1.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data"
+HOMEPAGE="https://sourceforge.net/projects/gtkdatabox/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +glade"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	media-libs/harfbuzz:=
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	glade? ( dev-util/glade:3.10= )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Remove -D.*DISABLE_DEPRECATED cflags
+	find . -iname 'Makefile.am' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
+	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
+	find . -iname 'Makefile.in' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
+	sed -e '/SUBDIRS/{s: examples::;}' -i Makefile.am -i Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable glade) \
+		--enable-libtool-lock
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	dodoc AUTHORS ChangeLog README TODO
+
+	if use examples; then
+		docinto examples
+		dodoc "${S}"/examples/*
+	fi
+}
+
+maybe_update_xdg_icon_cache() {
+	if use glade; then
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postinst() {
+	maybe_update_xdg_icon_cache
+}
+
+pkg_postrm() {
+	maybe_update_xdg_icon_cache
+}
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 6defd42daa25..26aa8c0dd9c2 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
 DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
-EBUILD libXScrnSaver-1.2.3.ebuild 492 BLAKE2B 17a1975dfc8689362f89a436f7d5bcf1075eca1d5e3d1aeedd979edb766add90a911755474604cc4ac112b5978e25873dfcb6c1e63ef7db62954c15ad5d6388e SHA512 88672a2703780335e6497508079560e85a5ee273ded58ae036f16a05caccbfcc6592f54ee320478590e52f5bd94594dc21efa82915da10e827fea757dc31cedf
+EBUILD libXScrnSaver-1.2.3.ebuild 498 BLAKE2B 5b5981706bc90f52576ec96fc7fc4dda1f7e70bad2f1d85db94912fcd92f5277e1dda03f66f299a3d31d57319bbc5b90e142d1112719fe6b513069c6fadb02a8 SHA512 857ad5e0a332e84b445966ca7762b9abd9c7a5eacb006a632a9b3b668d21e939dd3ad3ec0e30cc85480bbbffbd0a76f3137f20e9dc7d23e6fcccffcd9a9abd83
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index 874333c35650..183ea173d5cb 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XScrnSaver library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 9387f6d4ceac..80a78afc4fc4 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,3 +1,3 @@
 DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
-EBUILD libXcursor-1.2.0.ebuild 881 BLAKE2B c5e90c4ccce463fff9aa90c7f45246bfe332b0de974d8a7e52bb26464b59f39fc2e3e2cc98bda0afc923495d9d680e0eea1decbb3296a90e517e392a1799a0c9 SHA512 b67f6e15f7238814496ccc3028970ad7bae5f22f4ef2e56c78d4ae51b66bea175487ee3ab434ed869d7b8864cbc0ce9db2d16f73854e44e142610a77d1fed4f6
+EBUILD libXcursor-1.2.0.ebuild 887 BLAKE2B 3556729903c8d63bfba3d1e40ae86ba71812a740467bc0485847c2fd4611d00624ba2a138bb07bae79facb1d16ccbafe2f0ccaa5f6b099a0262aa30f7608f898 SHA512 8141cc2c6c1a704b1ca7b33828ceae7dc0e0e0c5b5663076c5b489acf6dcfcf0e52e409277ebffe01583a603b1e07bb2c348c3cffc3c2ae0daa49d9aedbc3656
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
index 91d22c5b049b..6a7647d50d38 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcursor library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-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 ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index 8d671c1a0c4a..da9605b8f85a 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1,3 +1,3 @@
 DIST libXfixes-6.0.0.tar.bz2 297270 BLAKE2B 082f321bb10b02f34c439adf45ed5f9cf3c3045d68673144261aae739bad063b02f235fd80398acd2632e10816f09382c4ea661c5db4cd868d24ae1b3486b83b SHA512 1985ef156f382e9a7e1cc7e044e0f626de1e4c82557a511cbcf6431994c0ac25b1f8b3a0293bd3089331593db8ce01d3a71ddec68f19b5fe6029d5082fb6885d
-EBUILD libXfixes-6.0.0.ebuild 502 BLAKE2B fb47c5db029a086f1e223aeed412701c5d8ca4298a8cf70991fadeca98a2e4495689fe0e6e1ab10cfebe14f540b98d1bd2d507751721bb7f0892a50f12341f80 SHA512 1670ec9528073d888c717c1a6e88db0ca40efeca1242139ea93de5b74607dbccf8ebd1788b0a1c4ac64cd5952154d730fd207b1cfb57ce526d57660258950362
+EBUILD libXfixes-6.0.0.ebuild 508 BLAKE2B f7cd09b26778c3d3cc621f9fbb994f370fa5577e1e5ff7e4a1c8ad0098cb360cda3a1d52eb2cfb4ff6e7d8d113946e0105cdabe0c2f13182aa22ae387653070d SHA512 9ea2d204a33b8bbe00141efaf4749b9c6eee61e543db38657c8fef358975d0fb002e876d84ae6555922ebddba0a60d0c0a32d9241425b671e885cf0eb6b8e060
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXfixes/libXfixes-6.0.0.ebuild b/x11-libs/libXfixes/libXfixes-6.0.0.ebuild
index 65822f02b742..4f256912c43e 100644
--- a/x11-libs/libXfixes/libXfixes-6.0.0.ebuild
+++ b/x11-libs/libXfixes/libXfixes-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xfixes library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-winnt"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index eb29c70c30a9..4f91a1e033d3 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,3 +1,3 @@
 DIST libXi-1.8.tar.bz2 494579 BLAKE2B 6804aa5c666ff489180c7d468e666fd3c986c7e24396f80f69164cc351c4aff5ab3c8e22ded61f03b96e37bceb5fd86d707220479100c5ec44a2a05fe5345d60 SHA512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba
-EBUILD libXi-1.8.ebuild 767 BLAKE2B 25b4b7f52b18726fe3ece90292afbfce8e2afcc8ea2dcb522558d37d427c3f5067053200e6645e2d03ba206cacb8d66773d28d000f6be887af40adb17a4399a0 SHA512 bfe06ad7507a618dd2007002d8dddecb7b25c887c3dacb5e8d935e8d419dfc4e22d789fd9fddadc3565460e28058bc502aa480cd10ec88167454816200f0e24e
+EBUILD libXi-1.8.ebuild 773 BLAKE2B 3b4f7a09875406a177dfa427384586635362d5e2aed9cbd64c63bddfb54ab33a6057ef8822d9b94a32238246059f5d6bbe710a54c6888ce88ac4237b3c526751 SHA512 86bbf260a9604dece0aadde5f2ef405ca24d3ef7bacbeaf73cc9055ffd29a927e7fa22eb35ab1c2ed4ad8346bf56aa8e7b725579156920091ab2f4a4ed6ce9ae
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXi/libXi-1.8.ebuild b/x11-libs/libXi/libXi-1.8.ebuild
index 6c73c17f2432..48c264c756f5 100644
--- a/x11-libs/libXi/libXi-1.8.ebuild
+++ b/x11-libs/libXi/libXi-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-winnt"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 8a3c0c250dbb..ab2a8b291198 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
-EBUILD libXxf86vm-1.1.4-r2.ebuild 510 BLAKE2B 870a771d38704a6b0a36515a10dfe8f2605e73576e9acb04fb5774b9ed999837b4d0201c400786991ce30ce099a7ab10feca474625cf286dc49d63d95fc8ee6f SHA512 355e9e18f07c356b554209cd722001f2fcb623ef95cb2e98fd7fa52f25851a848752472bea3af5fb22e848251399fc95d89092da780a7aae6e1ec9950e0a1642
+EBUILD libXxf86vm-1.1.4-r2.ebuild 516 BLAKE2B 980d8c60c903975181dbabb852d1e48a0f0b7446c49d6b1f29fce35ce7b92da43105e83b589cfe63b61160ada6f3b75d5ad87e7b4f370358b3062433f2dbbe8f SHA512 c0d3d9cbf7aecdc1ee2343fb12ee0a33d3c6cb37cfe7fdda7f2a215df614ac70abfcb7838d4210b6428b984d079fb9fa875bc12c1da3176b16fd7b4c80493ac3
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
index ec377af61680..554d4979d1c5 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="x11-base/xorg-proto
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]