gentoo resync : 18.12.2020

22 files changed, 99 insertions, 459 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f4c7c2c3ec84..01ad743cfad6 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
index 0dae72719eb2..28aa68ca8c97 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -1,13 +1,5 @@
-DIST c++-gtk-utils-2.0.27.tar.gz 2608722 BLAKE2B 06f5663435a75d7a5560b982574f06c124842f2cb77fa1e4e171428944916da7b4f493294e0373243a062794739336719f548c4cd3b3e6789fffa3eebf0115ba SHA512 8d6c12797d54d9b379302bfd572ded8b9e6e64ea5911ba4b13a0dd6d588711ec6d10bc3a83af8cab23165feeaae8873de5c3945cec94954590806f60490038bc
-DIST c++-gtk-utils-2.0.33.tar.gz 2837861 BLAKE2B d76333ea2c285e35c9c59ac6705c6c4321dfc84d638c2e95070b262b5b46bb6a2d8457e95febf2d3673cd50e78e35d3cd58ebc3ceb14c9e912d0b8a3437191c5 SHA512 dda1cf024ee80e872fc93e7d69203ee0f927b93c269100f9e80df42d53899240bc391a3e8bfbd8abd6549ace35da9f8f60952c5a1e905185d28561f594748d06
 DIST c++-gtk-utils-2.0.34.tar.gz 2865687 BLAKE2B 4978bf9ce5ce364db5ad51bcb2d604ac2e7a22656e2affbc39785b7f27db6c75a77c1965e3524b6c617836aa5ae840c4ef45e0ea65eff01f12acb1ea770c04b2 SHA512 f155e50d152cd1444d282c47e995ea8cd93ead529d0cd86c11d548a266a567c83cf3367cdb82dd8d68af1bce28809c957d3e39595bcb0affe87db8f48718f6d4
-DIST c++-gtk-utils-2.2.10.tar.gz 2643918 BLAKE2B 3953b8acb7e8fcb47cfc55ade75baa6dd344e2e6e25187e67346137ef4cc241817c893597d75ae58462aaf0a0b58db5f018fd053e1da0b38716ae41c8ed40af3 SHA512 a0ea673988c95404846da6af6ff7ea51978653df3781be6a8323db5fe96826e94b0de9bbda5d3b821bbba2286dda6e66f4c099de4cd8da7bdefa4caa684d7a31
-DIST c++-gtk-utils-2.2.18.tar.gz 3031253 BLAKE2B 46b06cc8af02336784da301386f1eac7e5f70a6c03f1507baf8771958f120e44aa55e82040608b83f1f6cedbf6081b33006a790b97c57114367b181e0939adbd SHA512 46fece74e3a3908573cfe161c870f63b9bd442eaf9eea6da03843dc03e010ba073696232206c37a10dd7eedf1aa748cedbbd5e3a58af1cabc98d804095aa3d54
 DIST c++-gtk-utils-2.2.19.tar.gz 3060284 BLAKE2B 5edd6a5042cb79cc95e8080cd76d284dfa47641c8a01a6d80ff6cfdbecf5797b6a99a5b7f209c35e0da9a2bc5331225dd2f13f30bbcc3bbb04aaabdadb3cb643 SHA512 c6527cc32b6a14a5fe24705a91a6918863f418ec8a274d24c79b65e905efefab53a5e53edfa57b31ed8b14ab8d9d26b4876861cab37e3702df456feb84e1cc5c
-EBUILD c++-gtk-utils-2.0.27.ebuild 819 BLAKE2B d09bebff5c1e0bede76e7fc2a9a28cfd7d721f092a24f237b7ea4bcc33375c7f3749351fec6b40b1ffee2d5d6547b577f81da5839fc0e9b2dd05b1a729b19d22 SHA512 ace1ef7dd7699746243335ca004ad1ce840cd3612a39e59a349aaad96ec6a3d979a53034b89f3d53c11ca4ad5fb677ea528cc704e21591f5b7927f8e57812106
-EBUILD c++-gtk-utils-2.0.33.ebuild 747 BLAKE2B 76bcb93ceaffc63f81d81924e3ebb02e85dd4bd0b43a682965cfe6ca79c6cae15b041731b204c11922016e012015ac12f3d83fe4d444e14a9df874e6526d853f SHA512 e8b3027faa69f1bbdb00915122f94af72051affba1028d360433cf4228a4d17874b97c1501378465d7a6a5830cd99400b252ebc61280380707103a2046cee7fb
-EBUILD c++-gtk-utils-2.0.34.ebuild 747 BLAKE2B fda0bc015db28f47592133e6d295fbdc29c71c2b3ba1626e55168639f0afab8f544050b9c82993e05622cd74eb6d2e79ff2564b7c1a3d4f69efc9b7312aa2336 SHA512 000a26f9fcf3e0c8e1b487106a1b678492e99d4b16d2ee26d0e29c9aa85d2be7b92c709b95fd340b535c6fe3672f88f435f033659327c27cdb9a5bfc1bae2d49
-EBUILD c++-gtk-utils-2.2.10.ebuild 819 BLAKE2B 96c11451095fb183c3cca765b01257493f5c57720a808fd00f8f5617b36f79b2860443b8b66ce3361f49017373dec460960ea772f2dc7b77a79d43fecfa75d30 SHA512 284f9b24dd8cb086900743cb2562fc969a32c16fdbb64f89e029a2b884cff7f87e5e2e1f695c498c2056bd90d6ce64412091b09bd769165505594a7766413bf3
-EBUILD c++-gtk-utils-2.2.18.ebuild 747 BLAKE2B 57d93a33e7d504dba4f42a74d813380397af7e6edf30787a7da2b45f7cf4269f9e3db3cf49b01773289b9eee2270a6a8a306a13d69e1603f109b899cb3c1ec83 SHA512 c470c51cb574822c112e1f0c821afa501143cff95d042911ae87d486243c38efc69d831505838003b7f33d6923f4dded03f35793532bdb908d9e24aeb5fda063
-EBUILD c++-gtk-utils-2.2.19.ebuild 747 BLAKE2B d40dbe12cadaffcae386d49a289481500bf7f83c604fa1d6e5207e0728d185cb9ec30881f511d39edba957c59d0f42e20f39cbb646f5eb8b702e8099ab557ae1 SHA512 ec159db81906f12a21de81bbce18883e4bff41d1154951fbec17c5ac1d22d1a54f2ebd37921bfe8675678c0a9e05de8e61ec24b7a5cdc01d06a2f5a6a79409fc
+EBUILD c++-gtk-utils-2.0.34.ebuild 746 BLAKE2B dd431696a569a2ac39d9d8d4bf2a750bcffc2fdf7ea4f40e82d88c557a3f873eae4545fdb07c99a2155e07df9741639c8a1d07a8528c6da0740b096062bd723b SHA512 08807c989f800413730a0591b1803c6295a960619eb5af48f4deae7b1da70d9d6aa2358e8329e7e1ae2f080ca7fcbd3831d1f4dc91e1cdb93515482df9f30d8a
+EBUILD c++-gtk-utils-2.2.19.ebuild 746 BLAKE2B 7e03e1d22caa067619be45fe7551551f34969f64011b25170f432c00f621e6e63a2a82b703b73ac715b43db3c78468574f8f515118cc2c030a610d073cc4112f SHA512 680c25fc481028baf29f172274824cc5960c13fa0e5be9ebc5ea95cf6e3e9dac8bcdfdad329e9fdfd1494b5fdb26f2cbf709d1e4088c6b8f73cb7b0348ec88d8
 MISC metadata.xml 359 BLAKE2B dbeed9c4bd60595eb059509d6ca0b7a0c5be034480fef5144b5221a58ac0284b1eb7dd4f1cae5ddc1487aed1f01d4ff79e3b3480bc3e46180e67cda078049e77 SHA512 531e6b6e9c7fc1668965508fa32687fda9bd697e1d46ee4de064a574e505365e4436bd50638e4eea79c42693f2f0feee3d4305cbc4e2ee09a9cb1777f23245de
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild
deleted file mode 100644
index 5579cb7226d3..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils ltprune
-
-DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
-HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="+gtk nls static-libs"
-SLOT="3"
-
-RDEPEND="
-	>=dev-libs/glib-2.26
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk) \
-		$(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--without-guile
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.33.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.33.ebuild
deleted file mode 100644
index 3cb2a188c992..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.33.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils ltprune
-
-DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
-HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+gtk nls static-libs"
-SLOT="3"
-
-RDEPEND="
-	>=dev-libs/glib-2.26
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk) \
-		$(use_enable static-libs static) \
-		--without-guile
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild
index 00999e928753..fd6edc7c4c07 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="3"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="+gtk nls"
 
 RDEPEND="
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild
deleted file mode 100644
index 62c3dd8183df..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils ltprune
-
-DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
-HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="+gtk nls static-libs"
-SLOT="0"
-
-RDEPEND="
-	>=dev-libs/glib-2.26
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk) \
-		$(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--without-guile
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.18.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.18.ebuild
deleted file mode 100644
index 0a96955cf377..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.18.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils ltprune
-
-DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
-HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+gtk nls static-libs"
-SLOT="0"
-
-RDEPEND="
-	>=dev-libs/glib-2.26
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk) \
-		$(use_enable static-libs static) \
-		--without-guile
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild
index 0d304c9947d7..42f154e8f10d 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="+gtk nls"
 
 RDEPEND="
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 112898a34901..124cf5591b56 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -5,6 +5,6 @@ AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b
 AUX cairo-1.16.0-strings.patch 690 BLAKE2B 2509bdb3d6592c9606c92730f1e052c0ce5dbbd557daaeb5955b998b8d89184063f15c583ea745fc16c07185cfe06e5f8ef9c18f749d35341918d626ceadd2b3 SHA512 90c9595698b30cceecc17ca186e7936d7884c382a23b8d536bdb10b912e6f1640037fc55326833a4977f332e02fc88d967ded751e50543c68dd80763b5fc43fe
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r4.ebuild 3934 BLAKE2B 8f0b90ec33ff1349504fd4c48e745921e1e5f994647ce26877d39b372bb0226438a72182c12fc04477ab6966eb18b058f0b4221737f590a5c6bcb55f4494cf0a SHA512 59fb487a89aa335fcfbfee6db85a386cfc4ebe09e20b378160165a923e0090be4eb5bf2d666a78e945dcba5be1eb89fdcd40e63270e07c0ff9ae43f73c1b4d75
-EBUILD cairo-9999.ebuild 3775 BLAKE2B 881817b40ccafbf1b08d8625c14726e6cf4ef830a5db0db4ceb33184eb5281df9984ee8a878cd56817dd0cffd9b5c2f5cbd8f02584ae336462db73c7be6a11ce SHA512 b1a2b120987ca449367491559bb16af21e8b78ce0c4dc94f1284bc17068c04f387d816f6c8d15ccb0a822751260386f8e7b7640233b23fc57a6b6e9383d543db
+EBUILD cairo-1.16.0-r4.ebuild 3938 BLAKE2B 3347962836cf41fec67b7f0bcb36b3e8fe645ec3a48cd914df97fa71507da166d41a44b105c99eb71e352ff5111b22e7b9d206a30c99b728fa6682e76d76f22c SHA512 a589f74ebfb72d6311b34a32fc35bca4b946a813d3ba194e98f3b3778a257724a73df99398ff4b6231caafa1f7de5d5c36ee15a02d1e07a185cc233c432595a5
+EBUILD cairo-9999.ebuild 3779 BLAKE2B e787538a42eb540358404db1ad22d0560154a2d8b51faa197d40186a6b8edecfdabfc80cfb9bbe3e1311889a2e4e2081d74a30f14ea927fafbf7d9c0da3ad1d7 SHA512 f64936d117da31c4701b443e703e9a0bfce9555b77598c7e7e9c23b76d29887e3e2833775df8d085bb044e71b6b79caa8822f33760f8aa8cb3c1f27763e2a7d2
 MISC metadata.xml 709 BLAKE2B 7cdfba4d24004ca9d45af33b49ec0f27344306a42d2269010957d085f527a8ef6e95b521f00344e3280852b1b57d06f4f84ead4b5e149baac7a2c5a48de44d14 SHA512 5ff7d97521b43486f6a9d51fe36c7546e229a66deeb308d9f5f84b5473678f5db869d3f58634d044fddc00af499a8e03699b22bca0582290b3a322dd6ae66b1b
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index 2423c2db9abe..e200da77f6d3 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 RDEPEND="
 	>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
 	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
 	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
 	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 453aa1b0d5ea..ad1c3a73e92f 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 RDEPEND="
 	>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
 	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
 	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
 	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 2e9b845059b1..8f5a270d2e15 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,8 +1,4 @@
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
-DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa
-DIST gdk-pixbuf-2.42.0.tar.xz 6510964 BLAKE2B 1299d050620a08582cb80d3d726713a1c005de3148e6e24a425248ea85f705ee741199c8ab445e4de4c3338904bf37c7a4ff0e61fee4fb23d68a93489b972b84 SHA512 c9962d42e5bf13514091234342e259be1e06b2c4dea2936e16104a3b58f0b6837f070224c04be9541d75f5ea34d1da398f178a1eed1f9059f6429faf5c223e34
 DIST gdk-pixbuf-2.42.2.tar.xz 6514352 BLAKE2B 1230378ee1843f7a861772e708eba64d80a55379104c64b45efa35617aa6d9f0b49ea7996762d91ba1223172162b2b7c1209a53d906c1be43448163f9e230e08 SHA512 f341d032ea410efed7a35f8ca6a7389bf988f663dae16e774d114d6f11611e9e182c835e90d752b71c258c905cc5c4c785ea697feed5e6921a2a676c9deaa5f2
-EBUILD gdk-pixbuf-2.40.0.ebuild 3859 BLAKE2B 6323340183ab63df29d32bc7f207714e59fe85269fa12005189a2004f6e8f08137c0555de2a06cc6b53e7744ded3bc6968f30b71e3973da0c4ebd90dd7d96d74 SHA512 916e1b6f5dc694533109a32f343ecca40602e752e4c38ae16d19d53a961aa8857cd624fa99787818cbfab1ab7c73ac38f182a655556d7502e707b579f5bce86b
-EBUILD gdk-pixbuf-2.42.0.ebuild 3474 BLAKE2B 42ecafdb8848b91d67e80018bba908cd7fda22677d9451c05a54c3419f2d799fd84ce48efc7d68232126f8b048b0e2ecb195eeef5c0d2be0b7413cefb5a7bf2c SHA512 0ed8e507e933e0858cfe5a809c7b851d64de2a98d1cad624c162e1565066695062cfaa5dedbde74ae1d70e06a671e5ac8b65203229283392bbf05d3c344dc522
-EBUILD gdk-pixbuf-2.42.2.ebuild 3493 BLAKE2B d508804f69a6f16b0df6a6138671e7375f6e61b461c9e86e2f0b2c33207c97d634da0ec514cab5bc9ff8a4aaa879c44c850a171686477412d83e6e989ae9e769 SHA512 b842427844f0c76472ffb65cfdac7f4e552485a41ab0173888dcdeaaea09d2dfa7a184db074084b1eb99277926f7645591d9aa5c76793799e8cccc63b325f850
-MISC metadata.xml 424 BLAKE2B 07b31586e47af1803baf8ce93c9e61334fbe566e8fae5bcc9d442d09b3ddfc51b06be8f02ffebf663b0307130c57e94b63ff57a83856ebec755704b8d3b232bd SHA512 3ef93327d28195a186bcc16c8acbb931c2cedcc7893173ca76af0db90eb088a838f5cb1c2f43f4b72fcf9067f6c483c96a5549c57c3542cccbb70450cce485bd
+EBUILD gdk-pixbuf-2.42.2.ebuild 3492 BLAKE2B 956820bf8fa59af6dbcfb4bf7ecd5b782704eca2e83e3b98a95cbcf22ed2ff94f36a302d534e5619f56d3782e0734c7e3d3ff9edcfe37b2e8beb784126ada5de SHA512 ec2cf5edd167d08d113a2a32afbb0d1231f42450645cebac4babaf1ff032be97f49da0beb93a655f4c5120597213e79902ef0a731585a7f09381549a4deee5ba
+MISC metadata.xml 331 BLAKE2B 4d198ee50a72d8d34a4cce94c2c7fecccf3fd4918b3100e182bdea1b80132f6773ac7d741ce5d55faef04c22158f8ea6b6ebff10908b8ffcc1f6d1e0caa15837 SHA512 3fe8410456df610566e862c010f9f5a3eb407fb72a842ab22e77d9400c7be98798296d2eab93ab2c97042779c0c5a19df1ad7e6c4ba71f82e17901cefcc4fff4
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
deleted file mode 100644
index a9771c2a5045..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# TODO: EAPI-7 needs gnome2-utils fixes - ${EROOT%/} and co usage for EAPI-7 in gdk_pixbuf_*
-# TODO: functions and eutils inherit for emktemp or some other solution
-
-inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-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="X gtk-doc +introspection jpeg tiff"
-
-# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
-DEPEND="
-	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${DEPEND}
-	!<gnome-base/gail-1000
-	!<gnome-base/librsvg-2.31.0
-	!<x11-libs/gtk+-2.21.3:2
-	!<x11-libs/gtk+-2.90.4:3
-"
-DEPEND="${DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
-)
-
-PATCHES=(
-	# Do not run lowmem test on uclibc
-	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	# See upstream bug #667068
-	# First check that the pattern is present, to catch upstream changes on bumps,
-	# because sed doesn't return failure code if it doesn't do any replacements
-	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
-	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dpng=true
-		$(meson_use tiff)
-		$(meson_use jpeg)
-		-Djasper=false
-		$(meson_use X x11)
-		-Dbuiltin_loaders=png
-		-Drelocatable=false
-		#native_windows_loaders
-		-Dinstalled_tests=false
-		-Dgio_sniffing=true
-	)
-	if multilib_is_native_abi; then
-		emesonargs+=(
-			$(meson_use gtk-doc docs)
-			$(meson_use introspection gir)
-			-Dman=true
-		)
-	else
-		emesonargs+=(
-			-Ddocs=false
-			-Dgir=false
-			-Dman=false
-		)
-	fi
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make sure loaders.cache belongs to gdk-pixbuf alone
-		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
-		if [[ -e ${EROOT%/}/${cache} ]]; then
-			cp "${EROOT%/}"/${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED%/}"/${cache} || die
-		fi
-	}
-
-	multilib_foreach_abi multilib_pkg_preinst
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	xdg_pkg_postinst
-	multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		rm -f "${EROOT%/}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.0.ebuild
deleted file mode 100644
index 7713c4ba6651..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc +introspection jpeg tiff"
-
-# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
-DEPEND="
-	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	!<x11-libs/gtk+-2.90.4:3
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
-)
-
-PATCHES=(
-	# Do not run lowmem test on uclibc
-	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	# See upstream bug #667068
-	# First check that the pattern is present, to catch upstream changes on bumps,
-	# because sed doesn't return failure code if it doesn't do any replacements
-	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
-	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dpng=true
-		$(meson_use tiff)
-		$(meson_use jpeg)
-		-Dbuiltin_loaders=png
-		-Drelocatable=false
-		#native_windows_loaders
-		-Dinstalled_tests=false
-		-Dgio_sniffing=true
-	)
-	if multilib_is_native_abi; then
-		emesonargs+=(
-			$(meson_use gtk-doc gtk_docs)
-			$(meson_feature introspection)
-			-Dman=true
-		)
-	else
-		emesonargs+=(
-			-Dgtk_doc=false
-			-Dintrospection=disabled
-			-Dman=false
-		)
-	fi
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make sure loaders.cache belongs to gdk-pixbuf alone
-		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
-		if [[ -e ${EROOT}/${cache} ]]; then
-			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-
-	multilib_foreach_abi multilib_pkg_preinst
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	xdg_pkg_postinst
-	multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild
index e12f14f25ad3..b1a99738243b 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index 8901219e2688..21782abf0b65 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -5,9 +5,6 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
-<use>
-	<flag name="X">Build and install the legacy gdk_pixbuf_xlib-2.0 library</flag>
-</use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf</remote-id>
 </upstream>
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index e54a8861e716..934811410585 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -5,5 +5,5 @@ DIST gl2ps-1.4.0.tgz 300339 BLAKE2B bda8742dea6c1b4eb3e3a3492e6f38229feb6480131c
 DIST gl2ps-1.4.2.tgz 301134 BLAKE2B 43c93f93d09dd7a6af0711819647f5f82c0853a80822dbc600b7502f2c86612f5cb2edc31729c67abbab44cc8fec7aa1fa7e13f0d115b0d79c7a7d45fa1a3079 SHA512 46652e1b3825ace61dbd77c4b0bf451e7671c248eb18bbd3369e2fac00056ea4cd5d2578561984313c239e3b02f78b9d9a76d963c935af65a13bc2abfc538620
 EBUILD gl2ps-1.3.9.ebuild 1245 BLAKE2B 4aceedc95a5adb17de36248fff3cb41e4439e2ce3624c396c52667352630fb865fb09b56b13277fcb3e4bf2bcb22f33a9106710b9d702dfe76c29f0c50a9c7e2 SHA512 3a8d32deec6854b23401e3068cd1174c13951c71c918791b4c82a5b81e58e1ceb701474a9c6fbb1856c932aafc6dae5c4bfed6ac9150c89b1c46646dbdfa5d14
 EBUILD gl2ps-1.4.0.ebuild 1240 BLAKE2B f367ea59dae36e5406444df3a8e8160c614ee30e742a7a7e471cade787996ce4fd0aec6bec00267df983e2f2492979e78e71085638db3a3a1c05888834c29a55 SHA512 7e1f233e1f6ec156aa1c7b7cb93f69287b2a2793266aa2b8a6c17fe2c00313336ce73f3e80eb315433e5a68fcabf6a4a615cac06d3ee4bda52449e66544069a8
-EBUILD gl2ps-1.4.2.ebuild 1190 BLAKE2B 50fa5c07fc6fba2a77b5f0147d9a59c124c459642851e77e12e4f754d2cf343d3ee4e1f13141195b0d18f4956be96000bf818626f0160c4e0917cc38ef7c30af SHA512 64ce53255b45d2ddbf2b57e25dc0e90709b622d845584c711d25e94a33a9091731c7b0fe516309ae74a3ad15a27362b48c2596d7b2fe798a7dce4d0aa4404e52
+EBUILD gl2ps-1.4.2.ebuild 1186 BLAKE2B fc9868f8e94444a59ec8a034afa85c133e75b73a467da0baff8c31574a148fa68c73b4edb7bc5505abc456f3f82a814cd20c3ef578437042f1c3a6d13943685d SHA512 a18c17f774aec3eea5d267fcf584d2e08837de331057649011247b3a7ab70a5893bce270a8f8ac0947fb16312918d3afc724b69523ba56b28fc2746b0bdfa74a
 MISC metadata.xml 722 BLAKE2B 357dece0405ffb4a0714a534246c0f119a6b19d08b0d9867695d178af5e68bdf40b55824d35817c44ae85094f1900368ddf167752bc97c184cde687fca631a84 SHA512 0cd6f7dc51149def7310418cf775980f8287b9e40bde438e03dde020623f19b49648662f12e06233be7686eda4a5b75f79e92730dfdfd1a3ae6da80d6413efc9
diff --git a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
index 3a1ddec1798b..b1e839398afb 100644
--- a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc png zlib"
 
 RDEPEND="
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index e79a8f6653bf..661a9161bae0 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,3 +1,5 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
+DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 EBUILD qscintilla-2.11.5.ebuild 1959 BLAKE2B 66709df30efbbee01900254c1fbe9026155fc6a063b2bbc2dee69278c6600a258ba351155519db19588d6a032080be7bdbb2dc0ecad7dcacdd4eb017f2e5b542 SHA512 f786290e1496a6d1ff12f9c235269e5d72d4e5898fd5b57a787df74d84f33359b6eeff3530d96fb9037804e26be126abcd3cf84c9242f4c24238ea94898646b5
+EBUILD qscintilla-2.11.6.ebuild 1964 BLAKE2B d7b1627cc76f089054a76cfb01263cd78278b2ff17295dcac245bea8cbf3ca5ea0830a8e30ea8e3ba69b968f0cf8ecbdbae6a82972ea3f0cd085cb8c54807dca SHA512 3f69bb7fb27ac4c0d3c5292dc98d219f938c10ff73bb78eb62972b5f2f80b66fd9f717ce0b3cae0d3e43f4d2929fc1bc2fc8b12533ac3b0429eb6f0dd3d5938b
 MISC metadata.xml 604 BLAKE2B d353a492de987b1b7898a206a1d29fff43dc25ec7809d95fe8ddd816507c24b7fea26de43ce16cb0b939e31d663d280231202b787fcff2f6b79d4716c9a00713 SHA512 ff45db818793a808f2fee2a85fbf9d3a069bcf406f8d18c5a49f527d332002cad64295ae9b31f5297203610a4497db12e5aace0861069e55f127c736a4065580
diff --git a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
new file mode 100644
index 000000000000..82d8a6e8e812
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="designer doc"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+	fi
+
+	qsci_run_in Qt4Qt5 eqmake5
+	use designer && qsci_run_in designer-Qt4Qt5 eqmake5
+}
+
+src_compile() {
+	qsci_run_in Qt4Qt5 emake
+	use designer && qsci_run_in designer-Qt4Qt5 emake
+}
+
+src_install() {
+	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
+	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
+
+	DOCS=( ChangeLog NEWS )
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
+}
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 3e34d004d687..1f2f9eb2bc82 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,5 +1,5 @@
 DIST xapps-1.8.4.tar.gz 179340 BLAKE2B f6558b87320cbd73e73c5294f48a3c0c94c7239abc9ede9cd88e66ccd53fd0c9cba9c638837efbd5eecd8a4f372262fde759e05ba9e97ad9955ab74464c34c21 SHA512 483e8e334d4883e2172e06835d690d20af2752fcc195f63776053b83abc0ffcb25c757633450a02b153e70e67e98c477754de12169c167a2f9f3fea103e12bad
 DIST xapps-1.8.9.tar.gz 187789 BLAKE2B 37b2d2677cb6483533d79853a83d77b30033313c06db89e93491076bb017122f77cd97b30d5ba64ce53fb41a37736791e97da785f516953b76b1d979d341e2fc SHA512 95dd1cbf84b59adf6682d9025e0cfa7a414c24d4f584cde87d0cc6ea82c06338de2c320dad8d997e105980782ec5cb23f0def6f6d60ea84be7d74c90d7cd692c
 EBUILD xapps-1.8.4.ebuild 2044 BLAKE2B 604dd1658fc1a5cb2033defcec921bfb3217feae2d443a656e5f2eafcd03d6eab09b93f850c59c80eb4c48c4823e8c057affdced3cc51cfc34ea1c3f954b0070 SHA512 dbd39ff32234abc3bf8ed777ccea0e6fb586b5ec8d882beb63e6e1b4176731fc555fef2a7c67505988283ab80279b05bd9afbbcf2b4be83032ba85fb4c8ebfcc
-EBUILD xapps-1.8.9.ebuild 2101 BLAKE2B 77736fc9943ef13943773fa18feb1876aa5dba32084abae260ade71ee456213376a4664026984b38d0033acf0d3b597e0875c7a21b3e3c6a563d1998fd543c6c SHA512 5606c183f79557682cee07caf074d1d70ef229bbb76d7624e610fcb1bd2dab08b57c67f51b1064f1b94c527de2f16bf0025dc04ae9738bf4bd5b320f63200a40
+EBUILD xapps-1.8.9.ebuild 2108 BLAKE2B 06b128765e850184429940c95fdb45a198f628a28231d5ed20583344c7f61f1980b08495c0e2179e7fd70b1cd7076c82d3c8fbc30c02bdf1614e3d31934d0fbe SHA512 da7dd2e8368ecb0def80ecb874adb2a27d293db03798e673f269fe08d35bb97b488965365fc08a462e81036c9b09ad39f611e738d1dabb466797d85bcdb51f7d
 MISC metadata.xml 577 BLAKE2B ed5786f6e30619e209d841a04547b52f7a9a09eeb5a64f0fcbe9f33031e936610aaef4b80cd29f45d662ac23295448ba336786c31a2b5f302332750497d0f545 SHA512 3af23ee720d2691213fccfbcdde69b5af42259fb0acee32e499c51e13dc8a5414fed038372b2a485db65548b38163886911d4b44ebaaca8ff0e0274c4c40d48b
diff --git a/x11-libs/xapps/xapps-1.8.9.ebuild b/x11-libs/xapps/xapps-1.8.9.ebuild
index dd52321b47f3..dd0832591bb0 100644
--- a/x11-libs/xapps/xapps-1.8.9.ebuild
+++ b/x11-libs/xapps/xapps-1.8.9.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 
 SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/xapp-${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 SLOT="0"
 IUSE="gtk-doc introspection static-libs"