10 files changed, 235 insertions, 46 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 8b1a54385dad..927502c64a26 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 5a829d28b46d..897911d76c86 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -13,6 +13,7 @@ DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41
 DIST gtk+-3.22.29.tar.xz 18964852 BLAKE2B a7551d604a1e27cba1d0580f2645bf4afff900908ce40d3d4d05cfb7348afc0620922e9b7939cf4ce2314ff489ffe38386aaf2634f3eff6591dfd0a225f19bc7 SHA512 046fa4458626e81ea7b1ddb753d53ecd91d0f2101af428cfdf77fe866bbe430cb3622203cc5e895b220a9364e35009245cdaf76e0cfa30d32d31095b5fcb42bc
 DIST gtk+-3.22.30.tar.xz 18946084 BLAKE2B 020512f61ae9d265849bb684c55c6ad3f1e1726d73ce169cd482e781e614f22f37ac23bc721b1dc11df03f0d4e07333266cc8549633cb255ca99a85a499108d3 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38
 DIST gtk+-3.24.0.tar.xz 19273044 BLAKE2B c1ecf7f0cb5e58ce4b3b4f5422b0d479a6078f124cc101e5fabd57c32dd6d8c75c5c90da3db373ff9f71ecec64527adec432775a7ad8f87a85d8d9cdfae097eb SHA512 c82228f31a422d7f180b1157de697d941f2826f9a85a44d2a583564130626c88759a62269bb01f54969e00ff7499db4e1b026dbfb060dda1b6e62f36f3267981
+DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ecd021817e34e71b101a7d222604b395c850c559f3ff0c38e0848abdffc483efe65f086357532be85db872028e7 SHA512 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d
 EBUILD gtk+-2.24.31-r1.ebuild 9836 BLAKE2B 4400023180fc795df2169345fce2a2cb2b315368a7874fba61eaf65e547ca75dcfd1a929930f7581114a7912a1b89ee5e94e710fd334a594270707a9e60b49c1 SHA512 027bcdcafb2a62f11f0b737d6ae46c8fa0331601ea8e166b7a9c13cb533b79af3c814c9e0e14747dae804c8c03072d8b6cbaba870145ceb678cabe14d098a63d
 EBUILD gtk+-2.24.32-r1.ebuild 10022 BLAKE2B f8c96cf303148709c5b0b26fc17c41f4d9029d3c32b06fd1c0fec34f46f1b90e71641f61a2a2ec2645ef099da58468a38d33a71107389cccb71be17773f1ee13 SHA512 fda1dfb9c0a1cfe64a492b49c0af8206669bc0dd6746a3fc5a4fd648e1144aafc7689ca5cdcdf7b49f92d8f43a3a3c8e4fe5565ba672d77773486ced073c0159
 EBUILD gtk+-2.24.32.ebuild 9991 BLAKE2B 600affbb940664dc8765af635d394ea68472a0476acb9ee63347fc6bd08fd1a9c2a30b81e92c31731176dc8b2df2301df1bc42c6bfa07b184238fd6c3bfc4bcb SHA512 559c6691daac95ec50b503f682f8eea280cf9164a3e66b14dcf91e0ba11bb9d34c266aa340655590d6a784ee0d7afa7888866ad87a880e9eb19846bd43b5cc46
@@ -20,4 +21,5 @@ EBUILD gtk+-3.22.19.ebuild 6559 BLAKE2B 3bd0611294ee3a3811e5d99c910e48c935e32acf
 EBUILD gtk+-3.22.29.ebuild 6734 BLAKE2B e9d0774ca24b5db57ea83e4a2df0340402814150aad1c382bc89ad3ff7fb110f462aa1920c47a477c282f7f1fc1391d9afe908d4c34bc07fc80a3d23dad736e6 SHA512 908ec9a5128cdb285ce4745dbdf72101d36fae133528c86e2864c3852f5a75ab22b7c29d12f46608030da6a92e4bf55d1f8b855af7fa36336e232a2b9fead310
 EBUILD gtk+-3.22.30.ebuild 6736 BLAKE2B ebc3d6792a7507e41f5d196f77353bc1554f8239c9986e105e0b09bee58d4dd357ffd174cdce1f6f86f6aab8815a6b78117ca1dcd453f735da749b80e44eb85d SHA512 48278952460713c7bcde954b0f61f72a81ccaff1401a80fe9178e609696834daea611302762a2239e004f2aaefc4232a28a99a5eb58224cbf8236fc0852cc392
 EBUILD gtk+-3.24.0.ebuild 6792 BLAKE2B 32c0dfea563e15d5c7f7671b4562f60a9eb231bdf70acb76ebca84554ed8c462256367f17438fe3e6f0e2696745d0fba5fd19a34cc1a88afe40861c87f70df6e SHA512 d683b4d197c90d723b29167cb1e4b3395665ad3ddf783e5ccdfee4d4eeea07fc2001a65d10b49896e48b841cd2f839672c203b3371ded916dd0ef48af21136ef
+EBUILD gtk+-3.24.1.ebuild 6792 BLAKE2B 32c0dfea563e15d5c7f7671b4562f60a9eb231bdf70acb76ebca84554ed8c462256367f17438fe3e6f0e2696745d0fba5fd19a34cc1a88afe40861c87f70df6e SHA512 d683b4d197c90d723b29167cb1e4b3395665ad3ddf783e5ccdfee4d4eeea07fc2001a65d10b49896e48b841cd2f839672c203b3371ded916dd0ef48af21136ef
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.1.ebuild b/x11-libs/gtk+/gtk+-3.24.1.ebuild
new file mode 100644
index 000000000000..dfe5d458286c
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-0.9:=
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	wayland? (
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.12
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? ( x11-base/xorg-proto )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	>=x11-themes/adwaita-icon-theme-3.14
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
+
+	# Fix broken autotools logic
+	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	# cloudprovider is not packaged in Gentoo
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable broadway broadway-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-cloudproviders \
+		--disable-mir-backend \
+		--disable-papi \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
+	DOCS=( AUTHORS NEWS README )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 7386b6ff2bf7..78dc81303e2b 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -4,5 +4,5 @@ AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf
 DIST libX11-1.6.5.tar.bz2 2361556 BLAKE2B 6001d745cd989dad2586690da69b8d67c68a4f148a4b3f595a7b58d5ed3a054928b302307b73d776a2a707f62c2d6d97453dd1484790ed8f4e9cf36ca4758148 SHA512 63c40d37c92b8d1ac78541830b0c624c4e936924b26bce769936e0e2523fa8997be364647705057065f803f804897ea8173d1c41ef69a92832f20cc7c0fd40a0
 DIST libX11-1.6.6.tar.bz2 2342730 BLAKE2B 7b3936606a6cf8981d691caa06b2ebbf2383259a4b74ebc6fa72277ce4870222d7e797037f21cd669dc1f1177f5a08f7fdd5d0158b6579c3ca3d0587a3e4e950 SHA512 9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7
 EBUILD libX11-1.6.5-r1.ebuild 1278 BLAKE2B b77b105807f0740d4207a1dfb980532f91f06d4b1ba4bd0575e9cd14976597afee960ba722315839cde89c883d7054b0c7a94c98dbb115cce2ed7259ec188a73 SHA512 e521b1fb9b085feda4ea22ccaa36b2bbfcfc5756287ecfc3dba6823b6dbadc2620981b15d6b2e22473005cb3fe7adc6b5382eeeda18331e7c5e061457817ca00
-EBUILD libX11-1.6.6.ebuild 1280 BLAKE2B 635b16bd4022b320587dcacee54f09b51e63a76ee208d6265acd6990183e6b56c32a4899c058e59a07921f1f05b88d0beb5cf0360a70d22b190ca72ea52b5c9b SHA512 c6a746a7994caaba4bcbea2997ae0c7bc95237c078c710b3a4e14d0e83ba2b393afa4cd62cffcadcf21dbc74cfcb70fb09675e8ae22c1c68003ca4caa133741d
+EBUILD libX11-1.6.6.ebuild 1278 BLAKE2B b77b105807f0740d4207a1dfb980532f91f06d4b1ba4bd0575e9cd14976597afee960ba722315839cde89c883d7054b0c7a94c98dbb115cce2ed7259ec188a73 SHA512 e521b1fb9b085feda4ea22ccaa36b2bbfcfc5756287ecfc3dba6823b6dbadc2620981b15d6b2e22473005cb3fe7adc6b5382eeeda18331e7c5e061457817ca00
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.6.ebuild b/x11-libs/libX11/libX11-1.6.6.ebuild
index 5b3773b2e27f..765aa43ccd5a 100644
--- a/x11-libs/libX11/libX11-1.6.6.ebuild
+++ b/x11-libs/libX11/libX11-1.6.6.ebuild
@@ -10,7 +10,7 @@ inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 test"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 46085bc5b964..565ea620f97e 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,3 @@
-DIST libxkbcommon-0.8.0.tar.xz 643456 BLAKE2B 37f8e8ccff63354dc37ec26091a7da28f5a1f05ca0656b03716cdcdbf3172344d600b3b2b646da309ea3e4f04bde1b1279c96b07c493266ec6489935177efbbc SHA512 ad64baa03685b72e1047f9fdfc95661acf5bace59280a95d3defaca73c91fb77c31ecde00b430726e3521ff90cf8dd93ecbc816c18be0971cb616e00b81cf163
 DIST libxkbcommon-0.8.2.tar.xz 644040 BLAKE2B c323384308d9730924d6f1cb7ad55fdb3d1a37289f648b981c54dc5997c67c857d33f8ad872fc7646b462ebc97252dca30efe2a2e12d1f1f08a8a1604a5de23f SHA512 b714240ec6120bbe44b5da7a4f89b1c2f24cfd6e5ebbe81e5290d135c8f2e5a68f89ac256b73430a446167345f8db309b35dcf74f3d3840e20897cd91eccc172
-EBUILD libxkbcommon-0.8.0.ebuild 932 BLAKE2B 98608f210178be94f2406156ee8d67c684d701b5d75d447654dde06f364df6eb74e938516f01141b737ec8897c5a3cec358cd7b18729bcf5b66a75b0369598be SHA512 4f50217c180e8a09a34fa89ce939136f8ef59b6989ba07390b8568f74736ed017754759b7f7e2a7f08dd61191713565e6dff9dcd6b1a5a25e4fa29e7f04ca8ea
-EBUILD libxkbcommon-0.8.2.ebuild 936 BLAKE2B 9c9a0b8518004ef7c2c338ec969f14c2e591c8f039809608c4b5f4db76ef45f51580c7108f1cdadc7c069128d5204007cffc142796caba758d5cc94faa757f47 SHA512 fa65b0474f8f038a14cdcfcfec246e4a3eb013e3cddf5ce87e6e8b6e6f24a7899c727185d0c7bc2f4319517286c4e88a74ae760512562c21350d9b1f7657c6da
+EBUILD libxkbcommon-0.8.2.ebuild 933 BLAKE2B db4da050b560240c163d8f846a6a1619e7ff272041f30b5814d14b8c676a13e6d36a43f4ee9e5c846c1422086a7825af631a87bb675ad66bea5e2727413c5304 SHA512 1e3ebd94a5bd0aa185c23eae81076de3ccaed85168dfb1ffdb5464f801be262fdc3ccf856af8b7ca537b5ff715acbf2aaae13eb607f1d22bc9de6aaff3d3014c
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
deleted file mode 100644
index d8045057b5c9..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB="yes"
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	XORG_BASE_INDIVIDUAL_URI=""
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-fi
-
-inherit xorg-2 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
-IUSE="X doc test"
-
-DEPEND="sys-devel/bison
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
-	)
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(use X || use_enable X x11)
-		$(use_with doc doxygen)
-	)
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.2.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.2.ebuild
index eaeb52b50682..10e9d37a7b4e 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.2.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.2.ebuild
@@ -17,7 +17,7 @@ inherit xorg-2 ${GIT_ECLASS}
 
 DESCRIPTION="X.Org xkbcommon library"
 HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd"
 IUSE="X doc test"
 
 DEPEND="sys-devel/bison
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index e56cd6f8d765..93aed60d2d7a 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,5 +2,5 @@ AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbe
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 EBUILD pango-1.40.14-r1.ebuild 1662 BLAKE2B e367786214b081a64fa9036f06ed205200ee2a2ff110d269efd5eb0d3fab3d3ec401d327369a901c415aa6aa93ccdfcd740f729f2fbc6a361c50e2f8fbb5067b SHA512 be9bc00dcb297db2b0d367640ced582685c2aa452ad129b6bdfb9426183b634c094cc985a91309c82e003f23ff9f5714292e54f67d3e5874596f2ec0f7014550
-EBUILD pango-1.42.4.ebuild 2016 BLAKE2B 07cbd6e1caf4045203d1a6b0467129ece8770aa6bec1e928660ee25d6ba8e81cf68fef86aab4fef9edb343527360319862c7e3742065da514f7a2d8585cf87e8 SHA512 a11c6981dca7509c7d01bb4a436cc9ef7e0a2c7c795ffb5f893f05dcbfe1b089e4d70bacd8195fe2347302a7d2c3b1284e0a78818b797c72cb733f8639581f5a
+EBUILD pango-1.42.4.ebuild 2013 BLAKE2B 4326042dd1f3ccd825945515400896f46c45d505f152ad8445bd5f4ffb8fefc3d7f1a3c57f12a1c84daf42dd302d4b11a277581a3e65c87efd461d6ded013e49 SHA512 f1409a9a2b0b2be9d19584bbae8ed1a837fffc2bef88ec04d1d9ef113339198d5556009bf2e3f6dc1c6ffe0a032fd938935bfc5f0a983c8dc5daae33c955f9b6
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.42.4.ebuild b/x11-libs/pango/pango-1.42.4.ebuild
index ff440cf4d8ef..9b2387917637 100644
--- a/x11-libs/pango/pango-1.42.4.ebuild
+++ b/x11-libs/pango/pango-1.42.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"