gentoo resync : 28.12.2017

24 files changed, 18 insertions, 667 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index aee3d95f67a5..029b6563e5d4 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 bc8be6a79fcd..30116ac61cf4 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -1,21 +1,13 @@
 DIST c++-gtk-utils-2.0.27.tar.gz 2608722 BLAKE2B 06f5663435a75d7a5560b982574f06c124842f2cb77fa1e4e171428944916da7b4f493294e0373243a062794739336719f548c4cd3b3e6789fffa3eebf0115ba SHA512 8d6c12797d54d9b379302bfd572ded8b9e6e64ea5911ba4b13a0dd6d588711ec6d10bc3a83af8cab23165feeaae8873de5c3945cec94954590806f60490038bc
-DIST c++-gtk-utils-2.0.29.tar.gz 2704000 BLAKE2B 68a20ad9334aee1fcfd795071185de60d133519a2dbf5c06a01b1d96031c9e69734e316b3bceeabacdaeda1f71341df80b5b244ba6698954c038a563b25e1fce SHA512 500002a74609eee41c53b91de119533c67627f68900509763717c7c8738bcdab0747a0f0f62b4b25110a311ad0951bdb5670bf13898787a576438663face967d
-DIST c++-gtk-utils-2.0.30.tar.gz 2707580 BLAKE2B 6dab84bf67b4a23c50e0c652c0324f96f3438669d74f6d32a908cf7578ccba2276fa6fa80322dc4dc113ec96ac0467cf50c184fc695fdb49cb19e71eeb3a0297 SHA512 220048b2ad1121c0cface6fd8bceaa86f1c228a1156ef5a4b1d13af421583fd6dfefe6309259f4f23125578b80fe945625b089dad272041d9681ac032d18b6a7
 DIST c++-gtk-utils-2.0.31.1.tar.gz 2749035 BLAKE2B b01c7cdc48f3d5d5a54bfcc56fff88fa21cadd099dd764fe0cc15dc167b966bd3448824327dcab34bcbb8e01574b2555a5e14cfc96d79168bfb5f15e5c3aabaf SHA512 592397fcfcb8b2b8f479fac432c5d8974706487a121e5a8cee877472bd764d702035380f52a6f520325d7393afa4971fe6beab56818ab3d23c1ffa42a3f752fc
-DIST c++-gtk-utils-2.0.31.tar.gz 2756583 BLAKE2B 086e9a183c9a7673f6e37af56bc712d188f4e9f33ccff2503a161add9d2c98f3cb7fd7a36026eaf27e1e19ba5e18fdf950d411eee101b5c3278d36d78d71783a SHA512 688e738c2433838ea8eaa6f51f34d201f93b186b3689ac7ff93b1467fa178a17fd31884a7fe2f1358cbfc0cc7001c0c95ce8aaadaaf9b84f11e476b94f777311
+DIST c++-gtk-utils-2.0.32.tar.gz 2753596 BLAKE2B 8b3cccca9a5229084df5c929b5ec88f300f57fb985961d56ec41e76f237247d8853e3cbb621590fcd5adb41dc57a3da0c48628310f89cec2160ee23ff19ca615 SHA512 583b6199c3c8cfd3d13157e871e4562000ac8df63bb10dd7cc44faf380cf10ee8e5f04a2d9bd0ed2ffb70b8c11cab70006bc525024790657e52e6d082ec34b38
 DIST c++-gtk-utils-2.2.10.tar.gz 2643918 BLAKE2B 3953b8acb7e8fcb47cfc55ade75baa6dd344e2e6e25187e67346137ef4cc241817c893597d75ae58462aaf0a0b58db5f018fd053e1da0b38716ae41c8ed40af3 SHA512 a0ea673988c95404846da6af6ff7ea51978653df3781be6a8323db5fe96826e94b0de9bbda5d3b821bbba2286dda6e66f4c099de4cd8da7bdefa4caa684d7a31
-DIST c++-gtk-utils-2.2.12.tar.gz 2738884 BLAKE2B 3868ebe1cb9632b3189667d052826be792bd61cd11203b569ad8536c46b616698a7e9b08a154f8f024995967165b155d8e849868201e754918969e8c5ac01ddc SHA512 c2edca67104b304a0cdbceb9903f6060594e80024a7e156db9abc0a8a9360361467bf356860197a0d1eb9549e2452c5e5075d0a1a34cedc3e29760783b82f270
-DIST c++-gtk-utils-2.2.13.tar.gz 2742099 BLAKE2B 8bef9d026ba87604cf97533049182eb8b5d1908d3de00903f4385850e8e8113b02fec2d98068b1b26fc4034371647b77bc65a6fdc012d813536ed9f839265e6c SHA512 42b4f92722e3e03546311702ed233e248d39fcb38b51c687e34ce48e57abe31078c31a99d199aeb3c8de68ae0cf280b606a2585c43898d4a003f962bbe132c2f
 DIST c++-gtk-utils-2.2.14.1.tar.gz 2790401 BLAKE2B 14b1a90d054ffcd1fc31db61a0ec4a2aa140f1560ff5332cbf97cf179da0bce087d8602ff820fe10fe448fa14691eb8200d25e467ce0dec2114a0ca426e2a0d7 SHA512 f6ce101bdc4b10f7afe05af5d90924e5ca7999e2c3db22885666e6528ae87b35cb75a40b92af9df823e12c3fd0dbf45cb8385e3637326829b9d0bcab0f691831
-DIST c++-gtk-utils-2.2.14.tar.gz 2797320 BLAKE2B c65ceef056a998c6c1fa1ef30560100ef4008474ec36697c6d16c70007e71ee9280815496df58d3e6c35d40c8c260519c6d92e9bc9a73aa8857cca97251e20f1 SHA512 c32de0023f6e1bf0c32cc9b2ee4a38394f938e8ae631ed702f3a5b941cda024594dc147924239e24d94462393cc49e408a1cbafc06f9a31006b639165600941e
+DIST c++-gtk-utils-2.2.15.tar.gz 2943272 BLAKE2B 3eae2d8d0d724e005b0843fb8124d946fc89c48ef8b4f30a5aced222106693826c0bb23ea45005eb545b09f3a45aa191f04ad2932ec56a0050d6764cc0944329 SHA512 0181fb0400173fb99f89d72b52bc2ef458d25688d5f3be064f7baafbee6586fde386b3400d90e2178bdd3228c9dc184f87a0db0a50a020db5785b50f34785acc
 EBUILD c++-gtk-utils-2.0.27.ebuild 814 BLAKE2B 9bec2efb2c1780aade415a7d1b5798ae06f5f7a974d1be5bf040e3fc36061b7e96d8df3e87cb94538995272c70b4b55f74d42ed0be041c148b41671f9a9d5bbe SHA512 7d59db175d274483e9bd6efc88ec69962a154a2c4c9efe259844a20eb0dfea0980b031fe1c609bf9a64abd846a57a0f933050eda73ac619d078058f76e337629
-EBUILD c++-gtk-utils-2.0.29.ebuild 816 BLAKE2B 3fb8c887ebb2c314dbf38b0a7a9f77d08ba563a75abf79a8dc8364039caf877728cca641e6388c85c54d9336e1e88560708812bb569fc633cd2d79f3568b41a5 SHA512 ab1c52473ba9a1d850edd411236a85feb98412e1e8c1d58f1b1ba9024c53179f4e981dc91289beba87e3cad7fb788ba440f746f659e1c578153408710a0808c0
-EBUILD c++-gtk-utils-2.0.30.ebuild 816 BLAKE2B 3fb8c887ebb2c314dbf38b0a7a9f77d08ba563a75abf79a8dc8364039caf877728cca641e6388c85c54d9336e1e88560708812bb569fc633cd2d79f3568b41a5 SHA512 ab1c52473ba9a1d850edd411236a85feb98412e1e8c1d58f1b1ba9024c53179f4e981dc91289beba87e3cad7fb788ba440f746f659e1c578153408710a0808c0
 EBUILD c++-gtk-utils-2.0.31.1.ebuild 816 BLAKE2B 49119d75860355531ab0a36761d3b72dcaf45e2c797e4c0e313bc43d224971096551b2960cd96c859363416b1a59da1b9144b387f138261e3916f7ee2ac7cd96 SHA512 48f36745fdf7b559e73ab9bd111a5ef12700754a4c8aeacb91cd4673048662384f088fa300ecd95bbb9bd2e1de048a3146f4fae0ffcfd4cc5f7893e40e84dce5
-EBUILD c++-gtk-utils-2.0.31.ebuild 816 BLAKE2B 49119d75860355531ab0a36761d3b72dcaf45e2c797e4c0e313bc43d224971096551b2960cd96c859363416b1a59da1b9144b387f138261e3916f7ee2ac7cd96 SHA512 48f36745fdf7b559e73ab9bd111a5ef12700754a4c8aeacb91cd4673048662384f088fa300ecd95bbb9bd2e1de048a3146f4fae0ffcfd4cc5f7893e40e84dce5
+EBUILD c++-gtk-utils-2.0.32.ebuild 816 BLAKE2B 519c5bc25fc8b8a75709c6f87613f4a1890d46e5cfc74cfeeaa36fb0f1f011ebccc047388e207d341e09089ecb9ad2b997f538bae423f0ddb5908e3c0e0e19e7 SHA512 5221794b86eff79d5ab6a590af081426fe9535faf00b590532cbf72ceb9e86b0b7c6da1a6a706dd8187d700c3ea42884ec76ca51ab7d6e7b99bda7c6af382476
 EBUILD c++-gtk-utils-2.2.10.ebuild 814 BLAKE2B e928b81d913cd8c4b7727b8387fcbf50d8670aa4656978eeb83cb6d237466a3f9fc28b22b19bd2ad42d1efe0ea045b5350947a6041ff9680f2e4796200983e0f SHA512 1d6525bff24df95ae55ca10e865e7b2a594a7f2ca6c193c1ca72e4b5f332eef2268762f547f626db7a97cf4fd8004c9fb2d236fcc7eea43d2af070d49af383ff
-EBUILD c++-gtk-utils-2.2.12.ebuild 816 BLAKE2B eee8c40376093a064d22c011801e65e2b10f93ca4c2a0903efc6774bb321aae15416e57e912559781f375375bf325b63ed5abdd3392010df34ffc7babc663345 SHA512 3cdbb1f5d8f9cc5070fca90d1e9fe1f9ad94a9c946fa7cb14121e4d672a1f6005caa8acde19052ae81bf855cfed98dd6ff1e86cb4800e5f4e23e4836e3e49889
-EBUILD c++-gtk-utils-2.2.13.ebuild 816 BLAKE2B eee8c40376093a064d22c011801e65e2b10f93ca4c2a0903efc6774bb321aae15416e57e912559781f375375bf325b63ed5abdd3392010df34ffc7babc663345 SHA512 3cdbb1f5d8f9cc5070fca90d1e9fe1f9ad94a9c946fa7cb14121e4d672a1f6005caa8acde19052ae81bf855cfed98dd6ff1e86cb4800e5f4e23e4836e3e49889
 EBUILD c++-gtk-utils-2.2.14.1.ebuild 816 BLAKE2B 31cded542be5e9727ab3cc67619a5f4ed703c9e13b556412444b3622a19d2cb57fee7a2886a620d5956d429ebabd8690a3a4f2865996b69bf324653c715e9729 SHA512 c604704df34d056c89c780d01e8558fdf3883e420044ee03e5ea0db0f929cbb314710f620ecb6021b72bf84aa84d9bc0119fd90d0678851d20116c4f973cd3af
-EBUILD c++-gtk-utils-2.2.14.ebuild 816 BLAKE2B 31cded542be5e9727ab3cc67619a5f4ed703c9e13b556412444b3622a19d2cb57fee7a2886a620d5956d429ebabd8690a3a4f2865996b69bf324653c715e9729 SHA512 c604704df34d056c89c780d01e8558fdf3883e420044ee03e5ea0db0f929cbb314710f620ecb6021b72bf84aa84d9bc0119fd90d0678851d20116c4f973cd3af
+EBUILD c++-gtk-utils-2.2.15.ebuild 816 BLAKE2B 5ece0dbb53c79f43e05e9c337556db1ec3a8b8ecf1bca097e04bdec8e2f22e57c6fe18533fe3739a731b8d980cce1dd94cbe6362ae948794b6080d509fd058eb SHA512 a979cd070c6264909a2851c41aa0aef7cacd6c019366504d097634a3486c85a1a703bbbb404648bc7185c04edae55bf53a18e6d40d9537715f2edd72e45adbf0
 MISC metadata.xml 359 BLAKE2B dbeed9c4bd60595eb059509d6ca0b7a0c5be034480fef5144b5221a58ac0284b1eb7dd4f1cae5ddc1487aed1f01d4ff79e3b3480bc3e46180e67cda078049e77 SHA512 531e6b6e9c7fc1668965508fa32687fda9bd697e1d46ee4de064a574e505365e4436bd50638e4eea79c42693f2f0feee3d4305cbc4e2ee09a9cb1777f23245de
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.30.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.30.ebuild
deleted file mode 100644
index dbd301d79cb7..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.30.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-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.31.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.31.ebuild
deleted file mode 100644
index 39e01a5069b5..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.31.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-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.29.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.32.ebuild
index dbd301d79cb7..54010a2c72e2 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.29.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.32.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils
 
 DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild
deleted file mode 100644
index 6ce05b0095d5..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-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.14.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.14.ebuild
deleted file mode 100644
index 667bb7c4d976..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-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.13.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.15.ebuild
index 6ce05b0095d5..e2e2c0185b1e 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.13.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.15.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils
 
 DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 0d500f09610a..b33083995492 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -3,8 +3,6 @@ AUX 2.36.11-fix-libtiff-disable.patch 879 BLAKE2B bc50115c3255892187a3e78b5f0277
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
 DIST gdk-pixbuf-2.36.10.tar.xz 5772196 BLAKE2B 542df9a5b9d3e790cb592b714a402633eaf37ecd4a21d597f307bdc3f5a0a35e3c3d9e3f6c822e163d0d64b9de62d7b120cb2b174f3109bdffc5e08225506f0c SHA512 d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35
 DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa SHA512 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3
-DIST gdk-pixbuf-2.36.9.tar.xz 5769124 BLAKE2B 7e21831659cd0bca44de4858fe37887a8a2ea494fffed5015fd35155873fe820336b762be8e8057c4f41c48dbe7c6b55e8eba9fbbee8692a9b72e7fe6b0dd24e SHA512 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261
-EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3796 BLAKE2B f93b3470a57d2fcfa1e0c47c655a2ca9c9c9fe7e92aad6fedf2380dbeb562488b4d69200985e2c881136efcedffaaa523311d22073ccd9c29cf15cf0dd4bd904 SHA512 c2755fcd4871d37c5c0ab6722b64e0f7174fb6531c7df37c922f83fbfa433c23c8d295a3fafe78f4d002de9607ca7d9ff19ae28249907957c27af40c7328b8b0
+EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3795 BLAKE2B e3a6b029120e43a6395096782c3d73599ef953321e3f46480b7211199e7b7326017b0674f71cae3298a81c183b602545294de14d351edb0fee53970f4e8421fd SHA512 737a797da5cec04c2f61c6cf5df869f87e1050dd608cb2f1a670c28364c349f3aba6b51b45adeda36bb5f58f1a7a39c3b9d989d61c2b118c50a409a622d381c2
 EBUILD gdk-pixbuf-2.36.11.ebuild 3893 BLAKE2B 470bfec07a8c38410284dc44907d4aa09ef02c2a57a7f900174933dec7c002eaaf3cb1da49e4ac969ac0aadc66803ce77da970974dbeb37d12ebf87dab9640fe SHA512 98af3703315a23eecb103d3fab88dfc8369ad72d5e7f5ab50d2f037307c571f23347e968565c3cc9ca18bcbeb41a82ff1f8a1823e70c1f3de8568fa542e1eda5
-EBUILD gdk-pixbuf-2.36.9.ebuild 3662 BLAKE2B 72352663cd372208aac722a3cee1ac2280d332b28168d6f181eebbca4b83acd2ac25e81e001975e9bd4ff3b0312f533dc5a4df486694d42426afb370d861184c SHA512 5622f0a3df9ba6972958d63d08ee0bd6b73c933bca2c05dd2e65a89e3f44076c5d042cec3f519523a8bb778d98a2051d6a5adaffab04238a3f6415741be67694
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
index b789261f4cde..645819ace7a7 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.9.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.9.ebuild
deleted file mode 100644
index 8a32dc232fb3..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.9.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2 multilib multilib-minimal
-
-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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X debug +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19
-	virtual/pkgconfig
-"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${COMMON_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
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
-)
-
-src_prepare() {
-	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
-
-	# 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  'l in libpng16' configure || die "libpng check order has changed upstream"
-	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
-	[[ ${CHOST} == *-solaris* ]] && append-libs intl
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# png always on to display icons
-	ECONF_SOURCE="${S}" \
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes "") \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with tiff libtiff) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with X x11) \
-		--with-libpng
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
-	fi
-}
-
-multilib_src_install() {
-	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
-
-pkg_preinst() {
-	gnome2_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
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	multilib_foreach_abi gnome2_pkg_postinst
-
-	# Migration snippet for when this was handled by gtk+
-	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
-	fi
-}
-
-pkg_postrm() {
-	gnome2_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/gksu/Manifest b/x11-libs/gksu/Manifest
index c593a8256a73..90e15972372a 100644
--- a/x11-libs/gksu/Manifest
+++ b/x11-libs/gksu/Manifest
@@ -3,5 +3,5 @@ AUX gksu-2.0.2-glib-2.31.patch 870 BLAKE2B 63a65cb59c467b17eca4d69c824a83b599081
 AUX gksu-2.0.2-nautilus-dir.patch 2640 BLAKE2B 52eacaab2e59a45aa78e76760f720a7a9da3e03264176ae29446edab0e60292b50fcd4d34365feafead5ea5378b805fc080fa8728bc78965625005c952c48cd5 SHA512 d96e36ea8a9e03808214f5e8cc73eb2aef5f663ff0035c4eab854f8f7d313055d9e2b9058abc7b84adb5657e7a390d8e44b42953c7d8304377400b341a50729b
 DIST gksu-2.0.2.tar.gz 468121 BLAKE2B 42324abed0d79eb00454d23a95b356b023a25e39e1119860d7f271f56b34716e4d4f9084156beb526379fdd9bbe25f2c8591e56e40238d3a79e7b3d8ff4fca58 SHA512 8afde61e10c8a22bef3c8a5c2d90bd599d00ad9b71b30b2edc9c114be91ca8456e1af5c9db03fe02416424e50aa20c23eaefb2a8fd1db77aac37da7e85604f75
 EBUILD gksu-2.0.2-r1.ebuild 2258 BLAKE2B cad0f8890779df52a84d176d0b8110797f04419e39a7a6f1143e6f8b39cbf01f32d06f70bae1933798fd0dc0483d46a6ecb54445b6728ecbc5588e45e8648c51 SHA512 08064d119d87d09c591e475daed04f7b3eefa36b0e0e69d695545c230aae5da045e13bcf391841d7818b9fbd18ecb3433ce61727c329a0788deff0d621a710e9
-EBUILD gksu-2.0.2-r2.ebuild 2298 BLAKE2B dc7f6b2263e670793f23e410446af86623805dd1ffb18e43dee348560be0fa86fda2c55b87467a16802ceb24ba52746dd4e2958f33933e1b04258bac804d751c SHA512 9ac583325b261b956860719ef8fcb83879471451cdde23127c2e859adfd229557890f5153c3ca0a191aa583166db86066a9f337a83c5f4cac5a14171e36daa32
+EBUILD gksu-2.0.2-r2.ebuild 2297 BLAKE2B 6204a4775e30d682347405209e8aa9da7708d7f2150ae9a780f71ce62297173cd05326c835a37254fb9881f4b0fb58c81b7463138c1d15214f22cc5c7a3078af SHA512 dd57a0a7065a6fec395e2f01d4b6a9ac29c60b8c8a63acf71162e5e2f832d94914d274551de0ab3c8c5e50ca3a888b2f8bae4100be75debbe459005610548430
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gksu/gksu-2.0.2-r2.ebuild b/x11-libs/gksu/gksu-2.0.2-r2.ebuild
index 647c40f3e43d..fd75403e6ee2 100644
--- a/x11-libs/gksu/gksu-2.0.2-r2.ebuild
+++ b/x11-libs/gksu/gksu-2.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="gnome"
 
 RDEPEND="
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index f91006f6d951..31c1559829dd 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -5,9 +5,7 @@ AUX gtk+-3.22.2-update-icon-cache.patch 5474 BLAKE2B fe374a5f50ffc69df0d09e5b50d
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
-DIST gtk+-3.22.16.tar.xz 18655144 BLAKE2B 947ef2768afbd7a242834e5eb1cef218f3978543193e18a4c216bb91be30482955f887b298a9a50786b0aa24613b924933994cc8472752587140bb796898afd0 SHA512 a981ba3c420db649645787916d603a22f1da9d839aba39f3786bab47f9a247867d94d342ce4c3aa47de4876072ed9cf3615304a73de7e613063cef08b8c0d612
 DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2
 EBUILD gtk+-2.24.31-r1.ebuild 10104 BLAKE2B 2d9f63b1aaea867dc1bf0267e0e4000590ae10bfc3b4e1f3539cc1d83b55e874383f621db1cb5564283c069f606ed90dcb5c8cc3c45716507bbff31924da0ba3 SHA512 7efbaaa3ffccb8268f50fdf05cc96f0c87a6801a64e89977153368ae334176325ee77822fa663455e808d18008e54faf86c0d5a4cf9b6d5dc995ca8c3d33f61e
-EBUILD gtk+-3.22.16.ebuild 6781 BLAKE2B 80671c5006fda95249da52f1510ba0eb8144a61855afb6ab2d042df61c6ed4de5ef60d16c076f3dfed7e6515815b937607a7aa8b7e60b2e3bc479dcc7d1fc476 SHA512 a1960b76bb8b195cf927facdaa739fae5bec90e22c554d43d1066fb41c9efe869d9ef6fcdab97d46848869be0d46caaa03426ca7987145c56baeea3a7013f400
-EBUILD gtk+-3.22.19.ebuild 6780 BLAKE2B 8ebfa93ff33eafd6712c23b81a4cd0de17038d826f068e6376eec3cd4517dda1b29a0d47bde82057b29596eddc670947ce795093b68b360604801ce1e06a2fc6 SHA512 8785a254b5c74e8aba5ca51532ea83cb081a991edc7934efef15edc2ccd49f4a9d4ae0b8c95a8291602b7695e7c1ad48db59ae8315af0b38dd690467bbc5ac69
+EBUILD gtk+-3.22.19.ebuild 6779 BLAKE2B d3116d1930a2f383ada49111144c8371cce1a07c990757d7e8a936e13f65beb90c33385dc87d13deea0022f89755d3c01d632c922e7fd6ad30619a968d70b418 SHA512 8d04280a143b9ace7b9ee2149e6554149e0306a70c90806cad6063f05afd8cacba30d4ba88091f8bc9ec2344f5bead4c4ee8e61d21cbbfccb9656fe8fbd03345
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.22.16.ebuild b/x11-libs/gtk+/gtk+-3.22.16.ebuild
deleted file mode 100644
index edf7c3562e1b..000000000000
--- a/x11-libs/gtk+/gtk+-3.22.16.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2017 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 ~arm-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.49.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.0[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.37.3[introspection?,${MULTILIB_USEDEP}]
-	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.7
-		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/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/inputproto[${MULTILIB_USEDEP}]
-		x11-proto/damageproto[${MULTILIB_USEDEP}]
-		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
-	)
-	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
-	>=x11-themes/adwaita-icon-theme-3.14
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	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
-
-	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 ...)
-	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-papi \
-		--disable-mir-backend \
-		--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/gtk+/gtk+-3.22.19.ebuild b/x11-libs/gtk+/gtk+-3.22.19.ebuild
index 5126fee61c25..5cfe545d2c1c 100644
--- a/x11-libs/gtk+/gtk+-3.22.19.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.19.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~arm-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
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index f72b3b800e3c..ebbdf7d95395 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,6 @@
 DIST libdrm-2.4.82.tar.bz2 754053 BLAKE2B 83d0a7203826c093bfb6b3ce4836f3ec6182a75f08f4cecb142e5707eb525cfbba9a123a94235b09370ac53cb7beb443604cb7dfba4cf375e0d0a74f71ce8bb4 SHA512 e69fd8c2b392daabbb3a548179e3a21a555d5174c11d76a288eb2a08850849aa867c7777b67798ec00e026e998a3b128c22698f05a7b44eb24cddc5c8a3a02d0
 DIST libdrm-2.4.88.tar.bz2 796583 BLAKE2B 4130633fea39e12514e6c6e7a926ca7ccca618ecb15a67cd27ee577a4ad56ecf6d09e20a323546a2b9698d7e41bd28377e7e04e8f478a3ca957868e1ac51cf98 SHA512 0d9d4bcc0d9be1fb6b1ca075339b22b0f927288a4c02bbcbf95406b5c095051890f3d2e0d32e529ef9b6952ce1250afd1e0765ad3188c2bac924dda8c33afabb
 EBUILD libdrm-2.4.82.ebuild 2038 BLAKE2B 684c6a522fe07fb77bbbaa6f06a45db8055898368e420c6ad555afc795957a789b03a5c2a3a4480d00314b4c9e3a1bb239242c0e2031a4534814ea0f7a6149b8 SHA512 ddb3b11965a574dc79e135df8d6f6b7cd93460fb45f86e7855fb4be704dbf40b18ec15a8cba6154e4c72bd3a1f0bcf0d895cc40906ee95748916846d7bb04d37
-EBUILD libdrm-2.4.88.ebuild 2042 BLAKE2B c826d40361f22fd9488db560bfe5dbb24db932ae58d31d99cb5667447b22af46d5ba3a8b02bf7c19367f924ba34ca685360fd027335c98f81db5f7d4dca82ac0 SHA512 b4929a2072ee0f02e6f60b3e81144f3ba9928998676c7e36241b2043a3ed2b1988009adfc90812604352fe6dcba11f3b3c38aaaec180c7c23bd1b4b414fd6f0a
+EBUILD libdrm-2.4.88.ebuild 2041 BLAKE2B cc0ea5ed53c1656ecccd9450d2a327cc34021446cd008026716272cb5c45bad789510e9a8fdc6b71166a04ae3e1716888105117d90e1fd9b3ff9d9b36f7b19c9 SHA512 2a08c4d798585e0583f13edac2016bc3136ca0fb039d9e9daced0dbe65fa7fd1a3e1a85f873bb162117e9a01ef90c501c960e70c938ffb4405ac08dfe085521d
 EBUILD libdrm-9999.ebuild 1913 BLAKE2B e345ca85c9a743193bac55d2a29d128d68bd7a022f30f8bf1d804a6ceed0b380b41584d96c64642f4d577fd62b027c2fde11a24959fd6e3afd9b8b04173a45e2 SHA512 838f1ee18aba8bf9a31fe3b81300366c63fb7d34d386d5cdcea9aae23241c01d40863f80ecc84844867b72ceb30a9290558311c2302a88a3fdbd933bb5bad531
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.88.ebuild b/x11-libs/libdrm/libdrm-2.4.88.ebuild
index 5008c0b1de84..2452a6ff7951 100644
--- a/x11-libs/libdrm/libdrm-2.4.88.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.88.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
 fi
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest
index f5f95a0e2986..efb28230df29 100644
--- a/x11-libs/libgksu/Manifest
+++ b/x11-libs/libgksu/Manifest
@@ -12,6 +12,5 @@ AUX libgksu-2.0.12-sudo_keep_env.patch 347 BLAKE2B 7b2f5502da0e4083e242c23658c92
 AUX libgksu-2.0.7-libs.patch 3129 BLAKE2B 1ccd6e9fa0dc83c0853375e17c9df1e243b91f030fb81b2d2a7fee0c5f914a6a4c421f371f38555ffd034c0d4dea48434e618742b2b8c09cf22c913eb7961602 SHA512 9c68a54d2f7cb3eb30d070a6946f9416fdf2e2690705f42289608d926aab3cd0742dd3510c262dcbe1b5d81d579f671770107f24366126adace085df2ba54b48
 AUX libgksu-2.0.7-polinguas.patch 749 BLAKE2B 8b8b675686d23cdfc1b30e0cafcb653c4ae3485413f499172f77396f06b1a4dc7da0ec1b8657d0d7926fc6f674b8bd2b033cb809b2451bc7130e215e4a668fb9 SHA512 9a9488703e28ce048ec1a5844ec386ba969d702e499e70342af44cbdc881ead450d182c0c270a54be42cc4ec7f35f66904a94f221a7446280b8bfe7b3b138103
 DIST libgksu-2.0.12.tar.gz 477903 BLAKE2B c4a130b43d1e9acffd740b9160f98ed318f9861db90acaa047fd9c2a162707fdffa86a4b0854b81486f982099f9440ee7d5b8c5ca65122e0cb2872e3a8aa508f SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573
-EBUILD libgksu-2.0.12-r2.ebuild 1669 BLAKE2B 96db459089d7e2d221a58af8b52637abe1f0f114e99842f6b2a19fb1ed9b27357356a3c1444ace5615531528396ae7ffe4be9a46a6189328087206013bfad68b SHA512 8832abf4ecc74673e01eb080bd5dfe4ba39d091964706a90de2de7a16ff7d979d152bd1839be034162cac7036cd2101c63ec233894ea49d0f43cd97262c80d17
-EBUILD libgksu-2.0.12-r3.ebuild 2030 BLAKE2B aaeca0efdf59ac25d4d60a6ccc9c5efd735cede700a819ae6133e4172f0afb169409c50b6c835cdb5b14e89a1b9a2dcd40a9fabbf113aa33dde9b2f302c4fcea SHA512 1eb4a9a9163f9b5c6ab2ea111d52f6e00a61e5802d95c1c59bd284f660b1ee586fc51c45503684f03e447aaaae60bdc50e083c2188abf46455c8bbeed0ed9a48
+EBUILD libgksu-2.0.12-r3.ebuild 2029 BLAKE2B fc8def81a770dae2baf3b2def02f5e94aa741798adf2e4b0d4b202598729959e7af0f83df1a76a79038dc616e0c51ba403826fcb25e52aa2f88ce145ea9d94e3 SHA512 db47d0e8a0184976671ff1b616962ccaa5ca37b61b73d7a83bad2badd5f0799d2d3758edab8276e607018edab1708194516e0c4946f17866031afa6d43fdd089
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild
deleted file mode 100644
index 6b6d834d95c2..000000000000
--- a/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A library for integration of su into applications"
-HOMEPAGE="http://www.nongnu.org/gksu/"
-SRC_URI="http://people.debian.org/~kov/gksu/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="nls static-libs"
-
-COMMON_DEPEND="
-	>=x11-libs/gtk+-2.12:2
-	>=gnome-base/gconf-2
-	gnome-base/libgnome-keyring
-	x11-libs/startup-notification
-	>=gnome-base/libgtop-2:2=
-	nls? ( >=sys-devel/gettext-0.14.1 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	app-admin/sudo
-"
-
-src_prepare() {
-	# Fix compilation on bsd
-	epatch "${FILESDIR}"/${PN}-2.0.0-fbsd.patch
-
-	# Fix wrong usage of LDFLAGS, bug #226837
-	epatch "${FILESDIR}/${PN}-2.0.7-libs.patch"
-
-	# Use po/LINGUAS
-	epatch "${FILESDIR}/${PN}-2.0.7-polinguas.patch"
-
-	# Don't forkpty; bug #298289
-	epatch "${FILESDIR}/${P}-revert-forkpty.patch"
-
-	# Make this gmake-3.82 compliant, bug #333961
-	epatch "${FILESDIR}/${P}-fix-make-3.82.patch"
-
-	# Do not build test programs that are never executed; also fixes bug
-	# #367397 (underlinking issues).
-	epatch "${FILESDIR}/${P}-notests.patch"
-
-	# Fix automake-1.11.2 compatibility, bug #397411
-	epatch "${FILESDIR}/${P}-automake-1.11.2.patch"
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
index f6847cbe25e1..b3efe9f71e4b 100644
--- a/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
+++ b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="nls static-libs"
 
 COMMON_DEPEND="
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 0e97651d7c73..839327ec93ee 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,9 +1,7 @@
 DIST pango-1.40.12.tar.xz 856228 BLAKE2B c6fe562f64ac7b641b5b8519f831b999418ab06c1686ac07aa08b587bfba761a834e698f033bdb79666ea6ddd6c1f672ce968897c7594e4467c5b6dee644877e SHA512 772792edac9ab5b6f76617cd3512432ca6b9af1d5ee6bfb87d0b60293f560026d479df059da66f53ba567f916a275e82f1cdd17ca75bb0da7ae2a79d4a75ed6d
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.40.3.tar.xz 1061044 BLAKE2B 79acd03144b58a3c160888cf4e3638faaf622cfcb406ddcd6a17907bddb7b3c6bf8c4a8ffbedb095664b7d19daa6837239e317d03e9a485f01b832227d1c3b7d SHA512 ff82395e8487624dffe212975b72b3383dcebb197a8675c8b409665e3e2e30fc23d9a6c25c3129a115adb7182b2a71a49550dbe881eb7ee9bbc572de6ba18d27
-DIST pango-1.40.6.tar.xz 832040 BLAKE2B af5597194e02c21b8e3ceb6097482dd23a9eaf74b5ca618cc39a1f44317cdab6ecef3125f5952a7b9fd306e67301de4503efbf082b3c8c172615c523e71d6a55 SHA512 d916b364a77de3e68779e6d841d95bca456daf89405b92eaf51dceef093a9761cbb6c48f4c2971dec47c0bbdb645a3f3f4fb9af425274bf1d1822b278575e1f7
-EBUILD pango-1.40.12.ebuild 1702 BLAKE2B c3148d0e34d82e312ebd631dbc338158637a6df9088211053157ee2b84fc5cf66ab32222b0187da0892aafe8efb6b3d643a5ac918becfc468105ac4f510e4f1c SHA512 8ab3f4ee72474b6d6433f51721968d9e1d513c43e9d4b786360271fb0a76e933a8ca4cc85a99c9de422e01a10c99621b6274169f0df6828e8bd1f74c5c756aa4
+EBUILD pango-1.40.12.ebuild 1701 BLAKE2B 08661b1dbc7dac4666817a1ab895b5eb0d7d30e2312c7bafe95c608bee0db22d2600480061461c4d59d6d0039ef7eb0b24573b7ce7090ec2d3d351038c0c1fc4 SHA512 285956d3935c0ac69d0ce7279bed589b6005342081deb22f5bc5708e08b289135c32a3edfde903ad34b2aeec45a829c0fcc48f1ab3cb00f60985b1e6e2faa771
 EBUILD pango-1.40.14.ebuild 1710 BLAKE2B a558602931b39ae272cf0081fd45a2248d4534eee9280e06269161e8c3b970b007b70e548982b9b6c7e43484be940f4c9a350af919d5f82fa46add17020eba0d SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515
 EBUILD pango-1.40.3.ebuild 1710 BLAKE2B bf310621d2b86abf1162aa80788b5d6c6db33bb05ce13f398705cb0fe45389007f7494ecff8f1d6fb6f1752ef94ee358b27baef1052e4bdb725a6c47c820da70 SHA512 6fbbf1ba010f5d5d527822ff2f4f43a6184dbb61b4c3c9e61507bf65c17f815caea1bfa8793dacd7f902d0d42c66d1beb31ec66ac70452730b6c1d08f6a1f139
-EBUILD pango-1.40.6.ebuild 1702 BLAKE2B 1fa06c4602f29f8961f5935de4f6f52fc643dba2f3f4272864aa708f5da473ce33e0fbd5618c78e4cc395c1beb101232ceb22ed8627db7b7a14232c6a2753450 SHA512 81d280a89db9f79c26c6472247cf373f250eae38861b1105e4ddf7ee979cd0a55bff8aae9ab34cce6a590d72573354d5662bfd16707015dde3d3abeb693f3d5b
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.12.ebuild b/x11-libs/pango/pango-1.40.12.ebuild
index 6c507799a889..2c65f9f55c81 100644
--- a/x11-libs/pango/pango-1.40.12.ebuild
+++ b/x11-libs/pango/pango-1.40.12.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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/pango/pango-1.40.6.ebuild b/x11-libs/pango/pango-1.40.6.ebuild
deleted file mode 100644
index cebaa678c3f0..000000000000
--- a/x11-libs/pango/pango-1.40.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +introspection test"
-
-RDEPEND="
-	>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( media-fonts/cantarell )
-	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
-	!<=sys-devel/autoconf-2.63:2.5
-"
-
-multilib_src_configure() {
-	tc-export CXX
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--with-cairo \
-		$(multilib_native_use_enable introspection) \
-		$(use_with X xft) \
-		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
-		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}