gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /x11-libs
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
87 files changed, 401 insertions, 894 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 9e0d4a198627..148d431e5300 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 7d86b9c66d30..4b99df088c28 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -16,9 +16,9 @@ AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a
 DIST fltk-1.3.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b44674f55d019239ebc0cbf8d70e04d9d1bce7a7c8463740bcd4c4a8ffcc8ef5e44b3f0cb591358d53d513844605c868 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
 DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
 DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
-EBUILD fltk-1.3.3-r3.ebuild 3775 BLAKE2B 473dbdb2628cce6ec66ad687c95f68d006f39aac41ad0565c67403fd1fc9991e35ad01bd3e36d2fa111b6fa84f4d314019ba05a2c9278a98d3666d05aab6b076 SHA512 b33cfbd9e53888a2cda5a484de729e8e499d0a1e1e8cc9b98e254cc3029714c6e2a3f1c0aac691385abe3813ed64ace1f3d3f79ed0bb6068f07249086dc48d54
-EBUILD fltk-1.3.4.ebuild 4333 BLAKE2B 7853f3c29261e27b6aeab227e6d4ddd39d2e0ce297e8e5edea33b17a32ce72af6d8d055c9c5cc2d97a33b65b50ce77af354a0605f0adfa1fc285dd36468e6793 SHA512 58b6eaa0c0bfce02860eb05cf853c123664ce5aeef2dc6d7dd81b0023f26a97337a24c204f72c296010da58fef56378151378980d05d158eed5c8ecf4cbcc6dd
-EBUILD fltk-1.3.5-r4.ebuild 4462 BLAKE2B 9d21882239323eb77450d589f90ad789e88db8f9c9d17a19911353f579331407be1f4ec1aa6b32cc0a003cf2e11dba2056ab44526f6e06feadf609d35cbd730b SHA512 c34b4d94927cdd7478d1a0ead2353b49aa4bc5f6561a74a4db76e2cdc06e96355655839472a2ca7a637f2a83d463cab43fc09983dca3774ddc97640dd0a5f496
-EBUILD fltk-1.3.9999.ebuild 4490 BLAKE2B 16fc1991447c30a8053dea7e332b0042c57c3226ca32be52fb65b73b8bb98f48d67d165bc3b3704dfaa11982e07f6b0ef0db7205bea6409f24eae91dac147f0d SHA512 4a848b42926be713e6fbbe606c7f4a06cd0b6d5e578c18ac9567390b1cb6e91b7c65d2ea0e4713c63e4dc5416198d278d19f8d0ecc8812d119cc84c0b3f3e1a4
-EBUILD fltk-1.4.9999.ebuild 4523 BLAKE2B f891f1268cb60fd616b169ffe0e92c5de5f025c0d7461a2702cff871f4a211ff4c953f125a2858879a4ee3ba0f584292da0f35a4397f5c9cd82d3b218d743505 SHA512 1d1001bd02f51d6bc8e24224ed71a60ef29117080c016c5d64db3a6acb85a35217c06c317d5e410b86e18e1aedda85f0897d37840345f1ed8346d8ba364f55a0
+EBUILD fltk-1.3.3-r3.ebuild 3759 BLAKE2B 94e3155d506b27679db23dcd61b3c74e3c8b8bd08ad8e06417b258ca7acad1b42c5ba44e73619e847ffeaeeb1d56fc7fa19a905061da754dbf746f14680731fd SHA512 a4c311154df42c8d5d60d02cdc969ad061879cbc929ebabf2f7d2e551594f1d1d81e43f84c62ed1827acec0aa305d447acfeff45996b36b4aec5e6e1be3e3fb1
+EBUILD fltk-1.3.4.ebuild 4316 BLAKE2B b024fa783f7ddcb27856acb69a8a74c6137333f5bfe9be83f903155e387c0853397e1e0de08765d0a949e45dd6c6bc81badecf31f3db85a8a947856cd3931c3a SHA512 812e53a8c00059c4c384220596065fb3f9aaa9dc1d9cfad44c4c43126bf81a5357cd57738c616e9052e2183105271e672e269f5f3c74239e0bc66cfab61eef0e
+EBUILD fltk-1.3.5-r4.ebuild 4445 BLAKE2B a19ab85242cbc81e64f6111253a6e3319f6601e07787f34b4c2c29c5b13c459580e3cc866148a955c6b1585e3119d81d3a09d149c935ad93a0d8ff7c03d33572 SHA512 3e106bf157918b575fc43d565a6a8c0e0be84520d1f7cf9e01254d7da3e9d8c2a820ecff5320c44103f82937f77f91a87341d61ba9baacf604aadd885e30c7d2
+EBUILD fltk-1.3.9999.ebuild 4473 BLAKE2B 3ae316ba98fcd88c7344db7c78ca497620283eadc7419146af71e421862c6fdf30d02ef2e51e9a4d3e7bfb09dcaccb1496b1529e38aa20849bf29f3f959d2617 SHA512 ec27297bad9358c6ed4339c138fe38e69be71c386f0d0ac550999d1f31b4f713203d36cc2498b986c3e1aee82ffc8a1df4e8d61a93d1ff44d4109809f360bbf7
+EBUILD fltk-1.4.9999.ebuild 4506 BLAKE2B 3891ff70b01adc480baf56abe5de071d177893d0718cb7901b2fec1afdb4a3149644d5c77bdb7c126c890215711c3f17b261fcb686c3c80f4de803a302ba9610 SHA512 2b737473c748d04424a41657875096d78dfef7f96853c27f77554f41b963883ef4d25e82ff415da25be3f7372e5eaba65e707e310c131913ac85f0dc469efb46
 MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 74e6007fed11..01db48d25b2c 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
 inherit autotools eutils fdo-mime flag-o-matic
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
@@ -112,6 +113,7 @@ src_install() {
 
 	emake -C fluid \
 			DESTDIR="${D}" install-linux
+
 	if use doc; then
 		emake -C documentation \
 			DESTDIR="${D}" install
@@ -134,8 +136,8 @@ src_install() {
 	dodoc CHANGES README CREDITS ANNOUNCEMENT
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{h,cxx,fl} test/demo.menu
+		docinto examples
+		dodoc -r test/*.{h,cxx,fl} test/demo.menu
 	fi
 
 	insinto /usr/share/cmake/Modules
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index b1dbc2b941e3..a390fa4097e4 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit autotools fdo-mime flag-o-matic multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
@@ -157,8 +158,8 @@ multilib_src_install_all() {
 	done
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{h,cxx,fl} test/demo.menu
+		docinto examples
+		dodoc -r test/*.{h,cxx,fl} test/demo.menu
 	fi
 
 	insinto /usr/share/cmake/Modules
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 7af2106929bc..30f91c3198fd 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic xdg-utils multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
@@ -162,8 +163,8 @@ multilib_src_install_all() {
 	done
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{h,cxx,fl} test/demo.menu
+		docinto examples
+		dodoc -r test/*.{h,cxx,fl} test/demo.menu
 	fi
 
 	insinto /usr/share/cmake/Modules
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index f8b095c4b45d..de2c6eb095ec 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
@@ -170,8 +171,8 @@ multilib_src_install_all() {
 	done
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{h,cxx,fl} test/demo.menu
+		docinto examples
+		dodoc -r test/*.{h,cxx,fl} test/demo.menu
 	fi
 
 	insinto /usr/share/cmake/Modules
diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
index 7940dc7b3efe..4ab26198da79 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
@@ -174,8 +175,8 @@ multilib_src_install_all() {
 	done
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{h,cxx,fl} test/demo.menu
+		docinto examples
+		dodoc -r test/*.{h,cxx,fl} test/demo.menu
 	fi
 
 	insinto /usr/share/cmake/Modules
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index f29d6c8cac8f..99d09be49a9e 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -4,8 +4,8 @@ DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a623
 DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
 DIST gdk-pixbuf-2.38.2.tar.xz 5509752 BLAKE2B f78ba049edc7b1a6c909746ec68948764b3602988e110ee2ad752d26d8b3a37c3f2957a91d3c8a5fe3455cf11b477eaa43d097554048e8988c563b4074bfd751 SHA512 b0f83cca9bfbe45dab200b19a5ec6231b628c09633fd41348f433c226d523c2f9b805d41e4d955e9fd65c5b6d24df59c7c94193032379d6f09b0472ae988a0c1
 DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa
-EBUILD gdk-pixbuf-2.36.12.ebuild 3985 BLAKE2B d300526a1cc0ba33aef18a84ccd7ed69f1c905f8266e01184819f97163af630028ba6141c048288a1df0eaf15c6b67346d63d55f7e9e16fd2f2e38bc49052a04 SHA512 c5619adee03329f4612eecf9b09c5518ccd3d9c23b12de46c31c91db1b83a9c55a55c7d683a56c28b4461cc83896a962205d817135efe21d56a45ab23cc35846
+EBUILD gdk-pixbuf-2.36.12.ebuild 4012 BLAKE2B 37df83a187e728f2d9796ef163a7b1dc87dad4804b6a245a5451b09c2e7bb0f5b75e81753fbcceaafeea24d902aa5f1e90c4a1f645d01db158738f1346acb107 SHA512 d3bdf7f546b3451c939aa62422a6673fbdf5b844718597895e9feadea017ebca8670ce47e4c5224b9239c40420c36382b79a324dbf92d87dd4ac819e406a8995
 EBUILD gdk-pixbuf-2.38.1-r1.ebuild 4019 BLAKE2B e504c2bf8227bd236f7f2a2de5166b396ec8edfaaa6592da40c6f63861e20add23f704ab2f57b53487d0ca424d3727820a3b9c9d93d02f7ff01084bd6943e6a4 SHA512 7716c02cc2b64cde65f434fa43f001a9b3fb4ab2608e4c575d50cac64b4a622c059ec158918a90eb1b329079c9aa78bd6613d139115ee6f145a3d8d938674fee
 EBUILD gdk-pixbuf-2.38.2-r1.ebuild 3863 BLAKE2B 664593a683237f7e987b5feeb8a13d713f0ee513a723dc41b16126c84388b3e7c2ac3132826a141393f91ffffc80e28ca8e6bf41e30cb408d34761fec782e7f3 SHA512 b9543eb2055d4c73cef3eafdfbc55b0d3c35f45e635737102463669e34f76f7eb444d1056d7d6fa12d33bcf66116d8d4d7973f61979e218154900fa9a5d41ed3
-EBUILD gdk-pixbuf-2.40.0.ebuild 3863 BLAKE2B 664593a683237f7e987b5feeb8a13d713f0ee513a723dc41b16126c84388b3e7c2ac3132826a141393f91ffffc80e28ca8e6bf41e30cb408d34761fec782e7f3 SHA512 b9543eb2055d4c73cef3eafdfbc55b0d3c35f45e635737102463669e34f76f7eb444d1056d7d6fa12d33bcf66116d8d4d7973f61979e218154900fa9a5d41ed3
+EBUILD gdk-pixbuf-2.40.0.ebuild 3855 BLAKE2B e619040cb8ccd2c9fbe2cc499c189810b22e960dfbf840fda36b87b012cba00fdfabd89367063d9b7d62be7c407cdbab00ffd15f364a98c266f5088cadbaf843 SHA512 357356802c23016a0851bfd490e80a67d09fa882f1d8825d937750afce288097940c71d7e5a8328d024cf081f1bb6d36443de20c9d6fd3a688d99f5cd54460e1
 MISC metadata.xml 424 BLAKE2B 07b31586e47af1803baf8ce93c9e61334fbe566e8fae5bcc9d442d09b3ddfc51b06be8f02ffebf663b0307130c57e94b63ff57a83856ebec755704b8d3b232bd SHA512 3ef93327d28195a186bcc16c8acbb931c2cedcc7893173ca76af0db90eb088a838f5cb1c2f43f4b72fcf9067f6c483c96a5549c57c3542cccbb70450cce485bd
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index 63600effa7dd..f3e6666b170a 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg tiff test"
+RESTRICT="!test? ( test )"
 
 # Remove SRC_URI when gnome bug #795069 is fixed
 SRC_URI="${SRC_URI} test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> ${PN}-2.36.12-bug753605-atsize.jpg )"
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
index 751e7ed0fff8..b12ae08a0959 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.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-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-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
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index fe2fe680aefc..2ebcbb78744f 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -8,16 +8,11 @@ AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ecd021817e34e71b101a7d222604b395c850c559f3ff0c38e0848abdffc483efe65f086357532be85db872028e7 SHA512 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d
 DIST gtk+-3.24.10.tar.xz 20958300 BLAKE2B 60a70341f15b59b95316cbce55cd18b54a6dff3735fb5f375c1bc21ca2591874b583d4879021d868d78fe1714bc037d80d44fb3384efd1167962b8c6e9588c5a SHA512 1f7980189f522fd3646fb480b965c21801cc30b3316eb8bad8ded1efd25d3054f62160ddbe9ea241628c11b24f746024fbc3d22b17b9bd61fa6c301ab91d6498
 DIST gtk+-3.24.11.tar.xz 20974300 BLAKE2B f338782d6141df64f83caae84649558296e11240ab082d4db129480a77e85cd26f86dee66e7f2650db48f13a30b0cb7191a8deb4bc545c9c7ee3b73796638a98 SHA512 15e33169030aa38e363730e5b19bbde614897b1a0de5db29c5292940a97e3613383b3eeb1c83ab8c09015a2a3f3ad425511bacd8fdbb79b30e0a47d4d4b57008
 DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1
-DIST gtk+-3.24.8-patchset.tar.xz 3684 BLAKE2B 686356993b95f5342942764af5f92ab52b17fcd326ee3fd0de5179ed2a55b6e0192e16707ee882866d39ede7d28150b8b8bc6945355f04a4b191b671ae70fb7d SHA512 31f9b982592a81095afad91f16ad96e72a7a2b0e2bf812f0b719da56d70235bc06bc991b5f619fefded3e1634efc5b7e8ef00053929c89e967351d8625518428
-DIST gtk+-3.24.8.tar.xz 22419364 BLAKE2B 262384d0bf1d843edfcb13007eae3584235fa166286f071b8b98803d452df3f4f8934f2b1830427d0c0cd956b67170e576f8c3f733e9b6323b8f89f6d0ddea71 SHA512 a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5
 EBUILD gtk+-2.24.32-r1.ebuild 9986 BLAKE2B 59dbdb49cf5600fc37402663acba725096faaa2eafe7bda998c231f7057f7477e0857624fc422ecb0c5811e6dbfd10bb61bc7b6df5794063bec65c3680725f47 SHA512 814faa5bb885e55db9d24a74d7571b1f61da82005768b891b9a737af8870a9bbe4e74fbad2b218bdfcddeb3f5309843f0bf0755746aacf6e4dd9a73c01d88456
-EBUILD gtk+-3.24.1.ebuild 6889 BLAKE2B 5a2493b590a26980386026ed1e70f32323ea24ea64dd2ae5897184226b016cbaaceaf4d0f184c981dabd55efafce6e592d6fab62043ffa528a226529d6f1d8e8 SHA512 7e0bdea9c47c39f84bfbcc8a31050b399b94ef8d996d29170ccf5b2cd9068a23f173f222343723499bcb36bee7b42a719d3f8acf48d2cecad0a43e80b76e8b81
-EBUILD gtk+-3.24.10.ebuild 7294 BLAKE2B 85907bd20f2f989a944304d13e632ce5adec47eb4411b3d93d1ecd99bc1f6188e344486d8d3fad75fbcf086b2810747be5c32911cb3117f84e4f6185a1cd601f SHA512 b76218f80bc002e477c6585ba2ca650df4441fa078733f5cdd5be5bc8c033fe389d14d30729191bca139832211de19301868536da70ce31f83158b2819bcb2df
-EBUILD gtk+-3.24.11.ebuild 7334 BLAKE2B 2c1ba3642f9565edeb04cadcdf2a74efb98bd78f5908351a026c01d81fb7a33516d6b7c11c14d47a7b4212956d605d547008fad4f58a0c5cd2c8909c6bca8ffc SHA512 51409aea0ef5464019b9bd38cb0662f33c7fda0d559d37ba6c60d5eefec37289b0726453714ff4640bc9cde3a680ea98ad238cb911bf4eed0fa1fa88c065682a
+EBUILD gtk+-3.24.10.ebuild 7293 BLAKE2B de22448a92e0993ec1d1fa45e66ca4c5cd943348b52e0df3ac95f9659a3de20d03630d488b818d3d012f9caef033ad29b9723d4f7b82439b04c9c1efe62ad54f SHA512 819c2e3ca38a02cf4338121b17f03239375ef9464c8eefc6bedc9d352ec353143f451488bb4442d3b3a19b8bed146b3f1f23fff915eba05c7f62b08c8bfa1c5f
+EBUILD gtk+-3.24.11.ebuild 7326 BLAKE2B 85bc5f0477a8658335fe8490276ce3fde818ad1e3d6279bc52439ed2d41de0de394553c36f2a6374b170e9498b87873bb306e2378d6693514a5ee403daeb3963 SHA512 01cce72d8c70d9bcfb89dcf83982cf45c27da90f2d4586bfa57366dab0b0597ed96868ffb8eefe421190d4f67250d2b13d838ca4cbd3460c94bb11468a05e2c9
 EBUILD gtk+-3.24.4-r1.ebuild 7255 BLAKE2B 45402dc053928d65c2e6ebfe52d23038e3283fc543af7358b31fc543a7696d12cc6ae670aa915852ee62df827c1666bac98c2336012cbb0d019c0a4e79fe5ef5 SHA512 05a35c8edb716a2052527cfecd461af62ce256d6fc522669dbf475bc1c5f7115d90e62a4ec4c426c717ca28265920130d8cbbeae5cfa9635249c15c72e875429
-EBUILD gtk+-3.24.8.ebuild 7085 BLAKE2B 35a30df174c1bfb293919f171691b5af07a13ca4ed893f5624914e4e8eed0a96131bba6596c60f29030911cb38e39b51b522a3f282731af30ea940e26ba31142 SHA512 d72192a4c8c0bdf7f6ac4af3eeb17709547c7204dd267db9f35f5c08012ea0ac3aff7a45a6e9bec42755e29a858d3006f8ed6ddb5472df576a244a554889ec13
 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
deleted file mode 100644
index f11ad18ee97f..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit 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 gtk-doc +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-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}]
-		media-libs/mesa[X(+),${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
-	gtk-doc? ( >=dev-util/gtk-doc-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
-
-	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 gtk-doc) \
-		$(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/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
index 2791a8697237..68d236b8db3a 100644
--- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.10.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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-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/gtk+/gtk+-3.24.11.ebuild b/x11-libs/gtk+/gtk+-3.24.11.ebuild
index 05a59ced16c3..718af42d9e93 100644
--- a/x11-libs/gtk+/gtk+-3.24.11.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.11.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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-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/gtk+/gtk+-3.24.8.ebuild b/x11-libs/gtk+/gtk+-3.24.8.ebuild
deleted file mode 100644
index 0f01ee9831f7..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.8.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples gtk-doc +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-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/fribidi-0.19.7[${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}]
-		media-libs/mesa[X(+),${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
-	gtk-doc? ( >=dev-util/gtk-doc-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
-
-	# Select patches from origin/gtk-3-24 on 2019-04-20
-	eapply "${WORKDIR}"/patches
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${P}-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
-	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 gtk-doc) \
-		$(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/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index d6893e722f7e..c4b41a5929bf 100644
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,3 +1,3 @@
 DIST gtkextra-3.3.3.tar.gz 1503817 BLAKE2B dc99923ad962348d617b8db2171b99e925d0dc06501110d805f166ba25cff72094c02031e3375304ddfd96cc7d3f76a1b06d56b196aec1d1868f10d154acfc8e SHA512 864fa2e957941a05a9c4b4a4283ae48e733d72ab334e2fb8440fc884166b0d1ad34d381924184f7a88f829d00bbd857d5f3f32d89f159e0133dd89233a8a93e9
-EBUILD gtk+extra-3.3.3.ebuild 852 BLAKE2B aa7bd51f6e45f8a046f0a97cb5630ed581523613f0f7a6c073a434e540fe3b0bfd4686f39a9124524639f88043bf2a5cadb4ab66333c2da1fdd4b6ff14f2f5d4 SHA512 d7ddd41cd69b7f613253d1d6b43face44c9809fe0e7ac456af623667e0e0ed8849ced06d0a55a198e9d9af6bbbd260aa1d6bb96767d07312e8d8f69360c97013
+EBUILD gtk+extra-3.3.3.ebuild 879 BLAKE2B 71b3eca32db12de4dea51e16220b1b27f588dd9fe8d143b3b74e3959e2f504ceac00b9de0e0282d95fca9e9ce11f2a68312be62c51040ae0c31bb19194239362 SHA512 bfd32583e4842b00261e039f5635e883de68093b0cee4d3adfcf41ab52dc0a2992705579da501636486f47f2977d5d9529f8b8000f2dbb16618393e3656dd4d4
 MISC metadata.xml 331 BLAKE2B aba9451bf53641f26c08773cf5146351d4bce301ae44d153dfe6650de8523ca85144e850e1ad3363094afd27b592d54b551f02c92e3de58bf6b5733752a43fe8 SHA512 af4ad9c00fe60299ada4ee678335173a37696f53b35fb9409b477622952b9b952d897168eed5c1bdb18d11d1797a9a80b6cce3782f3b6dd487a7cb682bfe127c
diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
index b91ed6667f0c..ae91f559dbfc 100644
--- a/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
+++ b/x11-libs/gtk+extra/gtk+extra-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="FDL-1.1 LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=x11-libs/gtk+-2.12.0:2
diff --git a/x11-libs/gtkdatabox/Manifest b/x11-libs/gtkdatabox/Manifest
index 8e8b52ffbcf3..6cb651058ed1 100644
--- a/x11-libs/gtkdatabox/Manifest
+++ b/x11-libs/gtkdatabox/Manifest
@@ -1,5 +1,5 @@
 DIST gtkdatabox-0.9.2.0.tar.gz 2836730 BLAKE2B 8ac4c3a4335fd5850d21ad035ed68292da08f19ed83be4e50a30439782e6b3a0b3aea31d56a27e6cfd3af0a60ee71f8fd2b51f0dfe5307412ad6baa2159012b2 SHA512 cb36c4ec7b1b4db747520e00c80c037d02c26f60c04bd9d8e4eac06e4e0ec6a605d39e8f11d518751d3137a0ab38631916e98f15cb55cf024b3e5ed37a716f91
 DIST gtkdatabox-0.9.3.0.tar.gz 2883977 BLAKE2B d9d5de1c4d07bd01940ea6f75f2b2f455b46cf018dbae67bcb643f523353e675e1a97cfc10b696fe16aa0391cb006e5e866bef52cefcdd8ca4de057589164e6e SHA512 5c2464dafcf9cdd4ee11bec6f8e627533c0270fe28d736e1be45ad084c42d430a50c39cf08531138627cc59ab034a191ecd7b97ccfce633467ff99e6e9cd593a
-EBUILD gtkdatabox-0.9.2.0.ebuild 1361 BLAKE2B c46ca09796e744a86003aa8bf7945799ddfc062822e08d65d09cdaf0f9a9bea3712d9df363d75f5f805800b399c262976d9ac8fdfa5d476a853349cce5d257d3 SHA512 fd6e782fe5b326fe61a4be6155cb2a8f70792e7a793ec09e4f0b00692fbd614e61be5606fd7cf99385e7e7fd0074af2fa0ecdfdd8c3cdf9f7ce99d840660891c
-EBUILD gtkdatabox-0.9.3.0.ebuild 1298 BLAKE2B c97a446cbc8049de77daa309c05b861889003baabc2f506f9034b39f7b26b8465d038012432531434ce556925ee1f664d2d378f75f89fdeeeb1ad4b1f371dc7c SHA512 cc43c4eadfb0a1a5edee1dc7e379329ffdfdda6c34081ca8a7676b1f8a3cfa62ae17f58853f852b0fca3cc82b2c86c1cee454df1830c2066a4f86895d952150d
+EBUILD gtkdatabox-0.9.2.0.ebuild 1385 BLAKE2B d3b683369f03e0876ae85c44a390c218bd07195396c73e9acbb4dfe111d87a146c20a62c099cd5950136020458149a3ebb6cfd28b07aebe8a9ea40acd4f5153d SHA512 3aab1a2fcfed72447f4a1c85613f4fc7cc148dce8ccdad57eb028b52c2f46a1bbb9f8e7ebdb2460f847d23b537727499c92ba51eb997467374dc094c1592000e
+EBUILD gtkdatabox-0.9.3.0.ebuild 1322 BLAKE2B f38111f1913c016eb32effaff1703b21b4d4472596ecdc706e322eea6cf38b370bc65805974eeb2e11dc65b59d07a222a30522e16cfe8eb7a92a756a570ae23e SHA512 438ce128a95daf45b1d3e15590ce4a51ef73b9b425022b8f3900192c383d231af7eb60adf5aacdadbf52442d400f332e44fbc906c91f6fce2b24678cd2c0f99d
 MISC metadata.xml 581 BLAKE2B ff0d8d541a11821321883ac414d4de93a7e2a8daeee8e2e4540c72018775a8b37b83e52d97df8e7fc279e0c629fc9d46f9514dfba55e30e64eadf00ab100f8af SHA512 34e6d588df560865aec420e4d400c13e931bf97d402fd8ee5e2ee1df8ebe6df8673bacb59c14f8ef258165d0802e160c8f105648fcf42eac15ed888f267b87fa
diff --git a/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild b/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
index 432198462bb0..1f83e52ef5b2 100644
--- a/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
+++ b/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,6 +12,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc examples +glade static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	glade? (
diff --git a/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild b/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
index fdea59496fad..dface576ae48 100644
--- a/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
+++ b/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples +glade static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="x11-libs/cairo
 	x11-libs/gtk+:2
diff --git a/x11-libs/gtkglarea/Manifest b/x11-libs/gtkglarea/Manifest
index d427a71cf88d..e91699e2591e 100644
--- a/x11-libs/gtkglarea/Manifest
+++ b/x11-libs/gtkglarea/Manifest
@@ -1,5 +1,5 @@
 DIST gtkglarea-2.0.1.tar.bz2 298744 BLAKE2B a60ee019af111b6f1da92a6c81cc0d5dac003fa79ae95aaf79f1f5bc38c558e1a084d69b556570d1710966d1d25590467a612d9e0f17a994084960537bd744f1 SHA512 54d3c23637e4347c9cdc25fa0159f720bc6bf76e167b025efd14361f1026af18f41686860444083100f939bec66309b1ffbb84c776c88e513d6ad4a06f66c79e
 DIST gtkglarea-2.1.0.tar.xz 264100 BLAKE2B 453a867581a09bab4ad2c71a5d66f567afe8fa8315467beb39d48e242fd46119c4b77b75a662eb1d4c88398811c0ccb4328b8695f584f692bfd53f43c8bcf4a9 SHA512 c790c1b542d85d86cd57f333c87ab2c930c8065d6f75320d588688b9a0adb8c4270522b6b88734720db1b71170f4f12c95e650e9a599a5d7e4b7baadf1f9f06b
-EBUILD gtkglarea-2.0.1-r1.ebuild 1129 BLAKE2B 8670d355a8a97d8e023aaec217a6be2e07ea291f695f63e1020cf2ee24019ad6bc684fa5994cdea57e3c3a12bebe61c313ea15f6cef92eb17500f8bd17c496a8 SHA512 8dd4b8c41dab632350e90bb9a0bb49060e9cd97d07fcaad948dfa9c35e152b7ebc203820ea8369c0c2315023e2fbbaaf463e8b4bf735e1c151c1ac0dbde37a79
-EBUILD gtkglarea-2.1.0.ebuild 998 BLAKE2B 713f8074722faee344b7242bfeaa9814709693aab52fe6608c5463d66da539506e70a385a3b8aec9b0518be15bbe63463044529186532c72dabf832294ab17b7 SHA512 6fb5d9ab7023052e68becef39895f401cadc14fbb68da90ddb57fa3582adc18863b8d082b8457df030681d08e901bf1472064c57aa617176bff6daf3900ed217
+EBUILD gtkglarea-2.0.1-r1.ebuild 1107 BLAKE2B b0813700c7463be4dd5ca2db7253e67f63cd2a81ed169027e50928565532c6883fab58b5e11fbcab09c15cae0a8532bf4602e29678b230d31569c1a98245a6e9 SHA512 d14a57e79901acd3a49cdef8a795d0d85c705f88b1f48047fc8587b545ad9f25cd18ef36822fe81680e8869b71518ec010d4e16294e647f0c5a6abda01faaffb
+EBUILD gtkglarea-2.1.0.ebuild 976 BLAKE2B 73b014af129fbcc0b5d1c869d084c0b3045ae1420752643914b18df8d8308cdd95bbc4bd9015de42f5dc28feecffdc3a0f8c9807d93af27ad49ef2cb0b21e7d3 SHA512 53a1f1710b46a03cec206dc644d1ce95e2cfc2bc1bd26483d1aa6721a1f7b64742234cfd2aa3994167a2ee0958442fc20ee2e10a10bd25d66aee48b925fdf465
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
index a90b252b4c68..8e2d39c4b40b 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
@@ -41,6 +41,6 @@ src_install() {
 	if use examples; then
 		cd "${S}"/examples
 		insinto /usr/share/doc/${PF}/examples
-		doins *.c *.h *.lwo README || die "doins failed"
+		doins *.c *.h *.lwo README
 	fi
 }
diff --git a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
index 96ee0444ee5f..b21107ae36e4 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
@@ -41,6 +41,6 @@ src_install() {
 	if use examples; then
 		cd "${S}"/examples
 		insinto /usr/share/doc/${PF}/examples
-		doins *.c *.h *.lwo README || die "doins failed"
+		doins *.c *.h *.lwo README
 	fi
 }
diff --git a/x11-libs/libGLw/Manifest b/x11-libs/libGLw/Manifest
index 2b52a1033f74..5761ac4d7b7c 100644
--- a/x11-libs/libGLw/Manifest
+++ b/x11-libs/libGLw/Manifest
@@ -1,3 +1,3 @@
 DIST glw-8.0.0.tar.bz2 221136 BLAKE2B fcbd1fa99da4fa5d45b0ec14af1a9798c53ad13adfa6e2fb46b45a214397b7a7d11186f2efa2f64cddd589fba9c24280825bca11163eba8fd4149fbfefd822e9 SHA512 09e1352edb16a9a34b9031996c2a1545d69dc690d7eda10a1aad6a7ad9ef0576d0af8a1b7740dba47f9647b7c957c1d7a078b38747d2d2c28ea39314a0e53587
-EBUILD libGLw-8.0.0.ebuild 664 BLAKE2B 65d00142369b9b697324e7bfb231094508112f8cd1cd4b099a38b774e08d98503e3ae1d96706003ce69ccec2eaafbb95549789c836586c22997aecd009355926 SHA512 3aa270d027a55105a5827b8df1eab0bc70cc1a058e5b36a7fb803ffff5f55b3ee194ff3b9d665667b8e6b81159f789b79b4f3aa2b6b75af19fc9766f5c27203f
+EBUILD libGLw-8.0.0.ebuild 699 BLAKE2B f11b2beba45aae0307eaae5a47f14b5ecfff72e24845f247fc3d1f50a1abbc7397bddf53a33cde57b0938966341f49e029444eb85081389700d655c7ee4cc72b SHA512 6c9dcbf09f1845f5693fa762ed23e05ed4fd35b8b504e8ee482c11e150b797b30665b6c73b146536d5fc297883ea8822baedb4c0a85c31d1b3ba48a66bf1226b
 MISC metadata.xml 310 BLAKE2B 6cd072bd58e5525e3e31fecd7d823e85498858e9109ff94707a21aa801697d59f21cc1ba8d477511a14bdc1d10238bdb34da1402c1b431ad25b52b2adcdd96f6 SHA512 797bbd05193951c317b30062db58f04f950889b9c5b31d1e3338142c9ea826d10e2f4c6d55fd076bb9c409239667bf3bf9f7ccec3c7c5d4aedf9187619ee1196
diff --git a/x11-libs/libGLw/libGLw-8.0.0.ebuild b/x11-libs/libGLw/libGLw-8.0.0.ebuild
index f0bdadb77125..94fc2c6d16f3 100644
--- a/x11-libs/libGLw/libGLw-8.0.0.ebuild
+++ b/x11-libs/libGLw/libGLw-8.0.0.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 MY_P=glw-"${PV}"
 
-inherit autotools-utils
-
 DESCRIPTION="Mesa GLw library"
 HOMEPAGE="http://mesa3d.sourceforge.net/"
 SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/glw/${MY_P}.tar.bz2"
 
-SLOT="0"
 LICENSE="MIT"
+SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+motif static-libs"
+IUSE="+motif"
 
 RDEPEND="
 	!media-libs/mesa[motif]
@@ -22,14 +20,20 @@ RDEPEND="
 	x11-libs/libXt
 	x11-libs/motif:0
 	virtual/opengl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}"/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_configure() {
-	local myeconfargs=(
+	econf \
+		--disable-static \
 		--enable-motif
-		)
-	autotools-utils_src_configure
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index db95d9f266ae..be0b510b02ed 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,5 +1,3 @@
-DIST libX11-1.6.8.tar.bz2 2395911 BLAKE2B 50f8871d7ff2aee14767085a6cf78e9f6e2b01c5143227089590c86db8006836432cb051d6259893850d78d2daea3332a26885a34f07989b869c14b8ddeefa28 SHA512 1de8e0ec466308bc48946d1ce7a7dc6bd3120b1b365cd01afd1bd51dd7369e3d1870dd379b0b7c5b07699095d59761bd23e2e02ab60929de32c39b6885016e76
 DIST libX11-1.6.9.tar.bz2 2283814 BLAKE2B 00fb965b9cd19bde79c4e598c677d21058c85a8ac37d9addab7fb0b2faf67e3d65b91e1864bcd7180e5fd8b0ab7ec3cf68ae7f95ac8e82a049529b5a139b43bd SHA512 fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31
-EBUILD libX11-1.6.8.ebuild 638 BLAKE2B df0bca68761f8a528cd02f5f3bfb0a302ac86527eff19302dc2272c1417a72da78de5ca2a4deef04e5dfc96b6722bae58c6209be305e67b098857ee00a34f8c5 SHA512 810880c3051469e8a2a0b172523db120036bccb7130ba774bf01c81410c19fc5ea27786d52f53492a9777074a29dd14431e7e2d897d67584fa67b41608ca840a
-EBUILD libX11-1.6.9.ebuild 679 BLAKE2B 76913392bde18272f013d7a2b8592c2f4f5783533c855f21873e52de2471cb65979baff576d869a48700dd6c1e713af708753539efcc637ed1567cb1511afe51 SHA512 a3c65e76bce76c8c77ade297ea3c8bdbc7a0a9e3a6cfdfc7d98e02b95f0c6594cb35f01f616e01eb436a300166bf06b1c029b0bfd7d79a7a5793048f4953432f
+EBUILD libX11-1.6.9.ebuild 696 BLAKE2B d3e3165e0f1d476b607e236e7b689877da741314e60e6b32fb67ae502afde7814622e9dcbab570e6e7e0d1df24d1df40b2768042948dd190a0d3bfd792594c87 SHA512 1ccf05374d1f40b77f1addae66b4a3040f7900761606b65e29e5b74fbad3f6ebd1a2d114dffc0e588fce8135488a773dc1ea05fd5b8b1b04ce70a055233c9ff5
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.8.ebuild b/x11-libs/libX11/libX11-1.6.8.ebuild
deleted file mode 100644
index 5eeda9313350..000000000000
--- a/x11-libs/libX11/libX11-1.6.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="ipv6 test"
-
-RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-BDEPEND="test? ( dev-lang/perl )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-	)
-}
diff --git a/x11-libs/libX11/libX11-1.6.9.ebuild b/x11-libs/libX11/libX11-1.6.9.ebuild
index ed1704469e0a..432b7ef0c9ed 100644
--- a/x11-libs/libX11/libX11-1.6.9.ebuild
+++ b/x11-libs/libX11/libX11-1.6.9.ebuild
@@ -9,8 +9,9 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
 	!<x11-base/xorg-proto-2019.2"
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index ca6eb430ea1c..edd78fc9b1a3 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1,3 +1,5 @@
 DIST libXpm-3.5.12.tar.bz2 430736 BLAKE2B 738838f37643e4e8ce489d34adf33d2459e7bcd7b1eafb21415cd44620c3d4eb18750381a80d1e2c9a2f44ccf00159a029df18164ea7a7834dfee8d104303783 SHA512 a5707d5f758d577414101b0723af334fc8ac223e5b9f869994765735e1cbd8dafed48ea2851ebc479fecaf84381bfd5fbef842ec971a487f7fa9e77d54d3a17e
+DIST libXpm-3.5.13.tar.bz2 463251 BLAKE2B eb8a390802f13ffdd8199e21f5f18d4d17141783d7259c6b558dbaddd2dce05f7cb27306dd5cb73e27d01cffa62f5e4808c143b72974dae443e958069e70cd17 SHA512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5
 EBUILD libXpm-3.5.12-r1.ebuild 909 BLAKE2B a0d4a798ade6ef57afda0b10910ef82429c4c0b33d4183901107830a64aa2c4e560931d719953a76ee608d7a7f060c846c2f1d034850b209f5c130120326bd78 SHA512 8c69439be41fe1dcf9ddaac7e7ab67e8d039e28d28dae97a65c3c3e33d07ae104a739fef50ccc603df51c1f7b4744c918e74e287e054356e4cd711a77e79b7f6
+EBUILD libXpm-3.5.13.ebuild 627 BLAKE2B bac3eb5c9b8bdd711f834bcba47be9ac5959434190b4078e4227606dfc3277d8ce51036deef6ab00081c040ebe9930d017a941e76f77330123c42af485e92c5e SHA512 f6e62776a4a04d2e27dc997d4672677c8774de4a9fa7112907d431b0bbb7bbb378e283f6ad097d3f887853223325c9bf8c19c3cffbfd6e9f7638cec8ec10eb46
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpm/libXpm-3.5.13.ebuild b/x11-libs/libXpm/libXpm-3.5.13.ebuild
new file mode 100644
index 000000000000..8d0022af7a2e
--- /dev/null
+++ b/x11-libs/libXpm/libXpm-3.5.13.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xpm library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="sys-devel/gettext"
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index a6fb1909104a..ccce4cf0819b 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,3 +1,3 @@
 DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
-EBUILD libXt-1.2.0.ebuild 829 BLAKE2B 9fa906da2488b911adf9fb09ebff62eca21da238470b41e8bbf10271c584f73f9253e089cb0d675240044886924adb1e084f14f0bc3dd68630b2589b7e49a5f6 SHA512 e38c49292f2db6629c54c425a38309c22a6e326449b9dfd8b3951748f681e689fda1c94127d313728afe68e312476b5558d1dc1a30073de7de5b3b46b6f3812f
+EBUILD libXt-1.2.0.ebuild 856 BLAKE2B 8484476bd7534f5a408b2210c351985053464ae0d2b5fa6e2ed9aef9dd1a84df8b673ee3d2e255284b088d5f78be97f79e6ee6a43f15a283678a4f1fb1dcbae4 SHA512 95125d9ae1f79ea5c5536c08ef0b6d676d0086047f9e445681171804066dfcbc40a8e240792815c7ac20366caa6e689ba620e37e6ad4f675f44b6a80b32386d9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
index a3031eda5bdc..9bb826b113c6 100644
--- a/x11-libs/libXt/libXt-1.2.0.ebuild
+++ b/x11-libs/libXt/libXt-1.2.0.ebuild
@@ -11,6 +11,7 @@ DESCRIPTION="X.Org X Toolkit Intrinsics library"
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index ed9a7b146456..9a6dc6da2382 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,5 +1,3 @@
-DIST libXvMC-1.0.11.tar.bz2 303516 BLAKE2B df1a34ead982c9b88428143d1c6250ef7d4353a6fc4e151c587f62ab91195e3e2c3b320beb1817b5e0b8a6db485aa0b839084361ec60a798ac1476b684542af3 SHA512 4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476
 DIST libXvMC-1.0.12.tar.bz2 306581 BLAKE2B 180867489863f45ee2cbeb259ae07cead3cef595652f6c02fcb5ffeadb8c286f4dc6fc8ef4b7df0c30b95ef51d8626798a76b50165689927c3449157fbe1a552 SHA512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955
-EBUILD libXvMC-1.0.11.ebuild 539 BLAKE2B 30e26a39dafd451010ff967f187f88a46716928bcf06654ea6cfb83e5ac95c7cca7a7747ac2b7bb5be57c89c8b40014188932dbe53b7c428303e4457d8589fc9 SHA512 ab0cc15158645e6231e531143b9ce496ffcd792833619e0dc48d765387f0dce96dae536d5329446226f66706de4c98e62e4c64e14d72038712c884f81af498f2
-EBUILD libXvMC-1.0.12.ebuild 580 BLAKE2B adfab6307321fad2fa2568dc80fef644561a9372c6469502f243e23ccea61ca6ff711551c61ca50dbac60680b20c798d8f8bb2265db0e4353ed34fb8b5656418 SHA512 e4f63d8e2c8814ff51e0f2e07c7d578f5cdba3d3de91c6e0280e0a7d78154bececdf5a4e4dfe128794d3da028a0992191cbc222b5a3aad4fdd57b1d8c8f45e16
+EBUILD libXvMC-1.0.12.ebuild 570 BLAKE2B 84f909f089ca534c9cb4a3e53801fb02e56a69a5eefdf673b77bed7850f43b596f1b94474e137a3f86cd1d9dd50961168e3a8cbc42fec562eb8641af07db5926 SHA512 c54be0b5b70941e78fae7ae544180d442c4e9bc5e4ae45ad3494005dacd569758e5c0254e6881e5e93c23b15e86a5291e1d7e148e48489111e206cbd6fdf8d10
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXvMC/libXvMC-1.0.11.ebuild b/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
deleted file mode 100644
index 95960c872143..000000000000
--- a/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org XvMC library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-PDEPEND="app-eselect/eselect-xvmc"
diff --git a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
index bc7f23ae07be..97ac2c3193eb 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XvMC library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libdlo/Manifest b/x11-libs/libdlo/Manifest
index 3c0a05650647..ae64dfef0ce3 100644
--- a/x11-libs/libdlo/Manifest
+++ b/x11-libs/libdlo/Manifest
@@ -1,4 +1,4 @@
 AUX disable-testprogram.patch 832 BLAKE2B d0658618b0042f51e0f85efbff77933e62efc2acf571bbc539f908a771d290834d5b60f3840cac317d56f378f0c3b1c457fb966782df417d8d3af33c6dee88c5 SHA512 b07a0ddd5eca10f13e82039690c3d310981cdafebc38a9e632a55be38c5c8ff22b7dddffcf0ab0f9795e650e61f9079ff1d9c12b3ddaad8d018f060c377aecd3
 DIST libdlo-0.1.2.tar.gz 476865 BLAKE2B b2391b58046e1f403b7e0d1eb915a46aa17c47e8ad804246f12f3b94f9ffb4dbc811e5d08aac29c2f4196b5d384e7244bddad3193adff5d5e890a7463a503fbb SHA512 6df69bebcf3142e0a87f66bb9d690fd78b96e08c2ae5d46fe0f3d91bc135364d5f5dd0c3a481705c3cd90c78a0a076757220fbcc3b0ad4343cdddb54501e3f2f
-EBUILD libdlo-0.1.2-r1.ebuild 1163 BLAKE2B 3bfaf98dff2388afcfeaf8a9248f7cedd64c3fc85d00f83683a6c627c2a6d817c92280546c825a71558610d2bbda697a137c2cf1fe57f8d11b517baa49c4c9a1 SHA512 19536bf1f1b22e8d29c9bb80b1095e7e885be44a98fcd4a0dfde3ab01af878ca89e5fe3a5ee175ffb9ef26cb98ffece45462b4af4c89013037906e2143bf3db3
-MISC metadata.xml 807 BLAKE2B 84e05485afa5f0e78ea57310124a541c4f1855c36ae9b49568fa9a4d672484e6fe5d02b71e4325c3a07cf5edda074b02410c4b7b52a967840bb695b98e135546 SHA512 56c18fe35f8c672f9d694fc2c62ffd864774baeeeb9cfd8f75118cf7e51376ee7a4280933d53aa5ed5e85dd605ecca737a70a37c4b82b7293bc2963d250a4c96
+EBUILD libdlo-0.1.2-r1.ebuild 1162 BLAKE2B df9077140343d43520acbd26c355d5f3068f44830f089499162a83f952446d946a5c4c6ed3a532a0114f4eb581d690f77d03dd56f1b36cc2034668ce9cb6d624 SHA512 356e537db2805770b73280720b355e5548f09e121515cb74b7e73e1e79b126810e1a024c8dac9a21147978fb1607d1072d800500a3225b2ab13b09986992cdfa
+MISC metadata.xml 688 BLAKE2B be81329fed2ac95d959cb2b40a7b8f4030d336ea28a02d927229ac96575094a4cffac4ba9556a7237513cb0c28ddd3fa034ee9d02b18395a0928233425a8e2b2 SHA512 fe68cccf9964207ab4c4c13927360e8a00f02548d5ff0562c5fb4710d7367ac9c51176668d740c1e0ab8ebcf7448601f430818ca4b9a4db35c9df137143d169b
diff --git a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild b/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
index 968a92485e07..bded69069db1 100644
--- a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
+++ b/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~berniet/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="static-libs test-program"
 
 RDEPEND="virtual/libusb:0="
diff --git a/x11-libs/libdlo/metadata.xml b/x11-libs/libdlo/metadata.xml
index 0dae7351b410..aa25988e5b07 100644
--- a/x11-libs/libdlo/metadata.xml
+++ b/x11-libs/libdlo/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		A fully open source GPL driver which supports all DisplayLink devices
 		in the mainline Linux kernel, called udlfb. It's possible to write
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 9611b24ca0e6..f0ae650f6dff 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,4 @@
 DIST libdrm-2.4.100.tar.bz2 855793 BLAKE2B ba2c631de860b8e2a8bb34d8ac0ba2ed11c05cc98a156bb81ffafa0395e22f79878b9936efd1ae33c31049c2a5cc281586a867a974eeb4018dd713a8481ed269 SHA512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247
-DIST libdrm-2.4.99.tar.bz2 853659 BLAKE2B 66fb3f757ab468b6f6285ae740f67d6c38473f3866b57c6a1e24b322bdd46f2d21132b5ea7a737f1d3fa8dcf55162d4c904f181f17227c239b3322c0af50181c SHA512 04702eebe8dca97fac61653623804fdcb0b8b3714bdc6f5e72f0dfdce9c9524cf16f69d37aa9feac79ddc1c11939be44a216484563a612414668ea5eaeadf191
-EBUILD libdrm-2.4.100.ebuild 2132 BLAKE2B 355ab8265fbb85c26623fce83ab593b860248b4b8350d1daf8183b5492a73e8621abc4f99edcd017676b6333d63cbf84b2703ca8d2da7d737ded91ea7d99d4c6 SHA512 d4d44bd07c2815a299a8f32ded02c76a46529d8430684164227f5b47d6806d97a76f4e65c32de72262744190abb01b1c35702535f56f6fcc8eac3cc0746d8f1a
-EBUILD libdrm-2.4.99.ebuild 2121 BLAKE2B 56438f523d5b51d46aa69a4d93a6aeac3eb6dad195ac54117327b3dc106f2cb94d9e5d0c5b43ab488feb76d0f54f35b343109ef76b00ea6517757c1dc5f9bbea SHA512 0554b9dba51949e6c14d80c01b87431b8deb1c4f917129c4929e37adb3036826ea3267cb69c69c41b9bd26f8fbf0d562d0ea87d0ab631f68604e36099f248800
+EBUILD libdrm-2.4.100.ebuild 2122 BLAKE2B 77ef1c64f81b719759ad3de3c43af0fb2c02166e137c429c3c56b9d7dca5ce70734bebbb54c098f6289ba60383dcb177b1bad1317e59137f05c35f700b1bd3cb SHA512 d459f2f3349d9a1ba1487f0844494439f245ca5b3988941c09ee41ad14d73cf85af8e5188f7e03a97c2cf49fabc480d01decc6c825f804ab91eec985472ef403
 EBUILD libdrm-9999.ebuild 2132 BLAKE2B 355ab8265fbb85c26623fce83ab593b860248b4b8350d1daf8183b5492a73e8621abc4f99edcd017676b6333d63cbf84b2703ca8d2da7d737ded91ea7d99d4c6 SHA512 d4d44bd07c2815a299a8f32ded02c76a46529d8430684164227f5b47d6806d97a76f4e65c32de72262744190abb01b1c35702535f56f6fcc8eac3cc0746d8f1a
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.100.ebuild b/x11-libs/libdrm/libdrm-2.4.100.ebuild
index 7178075e7431..7e8eed29e20f 100644
--- a/x11-libs/libdrm/libdrm-2.4.100.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.100.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-2.4.99.ebuild b/x11-libs/libdrm/libdrm-2.4.99.ebuild
deleted file mode 100644
index 0c94777c8673..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.99.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-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}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libfakekey/Manifest b/x11-libs/libfakekey/Manifest
index 77738873895a..0101417a423c 100644
--- a/x11-libs/libfakekey/Manifest
+++ b/x11-libs/libfakekey/Manifest
@@ -1,4 +1,7 @@
 AUX libfakekey-0.1-ac.patch 746 BLAKE2B 01bcc6cabd6f138eaeb6fba8452a3c7348e1ad7a6e91b6676bf8d7a29a05004af4b295d134072697bb6d34370f9a3cfffa1358c774f785a4c05652feaa06412d SHA512 b1cabad39d87d8df492f48b2afff78e182e64167d5253a40abf74ab786c8598bb1ee6e24ee62f394c787e08e5f7740e23864ccc82624efa9d2a533b9a37877cf
+AUX libfakekey-0.3-ac.patch 764 BLAKE2B 733cdb11da016a2d3b9e196943d6c0a948404ed15de0684d8bf7bba28d700a5cc83a3cb0ed5b82ca95ed2d7c531136362f0373c87bab3c979a33ce8c2f613e64 SHA512 8cfe2a3185580e26c5d76d6b392003b96b73a1aabb15255b1aab54a777b3759e496d4c0323b18ee2a67a5537e68388b9c67f6d885bd791f62b42b39e37fb635c
 DIST libfakekey-0.1.tar.bz2 203504 BLAKE2B f3e51a1ff38dd95238a1035617045f728177c9dca96d760dfe3c4485511b500944e6f64aeb5acb3e65db3badc4c189ae25ea50f42f58a927f3ec1899c4778751 SHA512 1fda0548cf14657083a6602f8d6c08efae8cae2236de7ed17fc4058765156c6bb923956e3c7fd75f2db586399f1d8a3320ab5bbed71cc5a8b0d146590a14a808
+DIST libfakekey-0.3.tar.bz2 9672 BLAKE2B 1cd86581148e218879b14ff52fb085fd20248a475ccf00a08918d64db811b21bbba3632e799d798077a197298da4d976be3180c060a6016c396428519d1aaef2 SHA512 b0502dbb01839009de7120f8ca939c839850e7c3c88678b52d6df9f4205cbec20769cedd61c9307e8307f6bf789eee25b20d4fe20c25e7285318f5ea1334555a
 EBUILD libfakekey-0.1-r3.ebuild 1144 BLAKE2B c917446ab90d8a19ddc565ff85d0f02c864dab602c7e68e0a121953f238f86a83525dbdcbf3d991fe8dfb4d01ebd97b15245e3fef856d625865a5ff282d5d076 SHA512 bc35111648791927ef1923a65780abccf84a25db23aa8d0004a340b90fbbd2362d3fc8390d188b9119cf76f854e4bc7c4c0f0a3364f383434e887b997ca4b888
+EBUILD libfakekey-0.3.ebuild 1151 BLAKE2B 7dece2bc252046d6fa46de727b8da01b02c073c47a2c39322fde1c2acbe64150d95e60b1590d8f5a9ebc4d08bbfab89bbe1fa4365143134b983579fbb281bbe2 SHA512 6a1e925fc595a60c5d6b43474bbd97aa466d38713b4b3adee3f5ac53c20b15f02713739448839bb67456ca2c01d2d71710f47d58d0b61728e452452c085e6643
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-libs/libfakekey/files/libfakekey-0.3-ac.patch b/x11-libs/libfakekey/files/libfakekey-0.3-ac.patch
new file mode 100644
index 000000000000..3e0e14d79961
--- /dev/null
+++ b/x11-libs/libfakekey/files/libfakekey-0.3-ac.patch
@@ -0,0 +1,25 @@
+--- a/configure.ac	2011-05-22 14:59:45.801746472 +0100
++++ b/configure.ac	2011-05-22 15:02:59.437159981 +0100
+@@ -14,17 +14,14 @@ AC_HEADER_STDC
+ 
+ dnl ------ libtool versioning -----------------------------------------------
+ 
+-LT_CURRENT=0
+-LT_REVISION=1
+-LT_AGE=0
+-AC_SUBST(LT_CURRENT)
+-AC_SUBST(LT_REVISION)
+-AC_SUBST(LT_AGE)
++m4_define(LT_CURRENT, 0)
++m4_define(LT_REVISION, 1)
++m4_define(LT_AGE, 0)
+ 
+-LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
++LT_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()"
+ AC_SUBST(LT_VERSION_INFO)
+ 
+-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
++LT_CURRENT_MINUS_AGE="m4_eval(LT_CURRENT() - LT_AGE())"
+ AC_SUBST(LT_CURRENT_MINUS_AGE)
+ 
+ dnl ------ Check for X Stuff ------------------------------------------------
diff --git a/x11-libs/libfakekey/libfakekey-0.3.ebuild b/x11-libs/libfakekey/libfakekey-0.3.ebuild
new file mode 100644
index 000000000000..4cee737959b9
--- /dev/null
+++ b/x11-libs/libfakekey/libfakekey-0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package"
+HOMEPAGE="https://www.yoctoproject.org/tools-resources/projects/matchbox"
+SRC_URI="https://git.yoctoproject.org/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="x11-libs/libXtst"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-ac.patch" ) # Allow configure to use libtool-2
+
+src_prepare() {
+	default
+
+	# Fix underlinking bug #367595
+	sed -i -e 's/^fakekey_test_LDADD=/fakekey_test_LDADD=-lX11 /' \
+		tests/Makefile.am || die 'Cannot sed Makefile.am'
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# --with/without-x is ignored by configure script and X is used.
+		--with-x
+		$(use_enable debug)
+		$(use_enable doc doxygen-docs)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+}
diff --git a/x11-libs/libgxim/Manifest b/x11-libs/libgxim/Manifest
index 082e2dae7b27..06f7f2ad59b1 100644
--- a/x11-libs/libgxim/Manifest
+++ b/x11-libs/libgxim/Manifest
@@ -1,3 +1,3 @@
 DIST libgxim-0.5.0.tar.bz2 469547 BLAKE2B 183ea514b990b93efcf41a56704385e8b84b18d1f4f992ddaa8f7481a74b132f05b56322450258d53bc1fbcaf42d2528d297922ae042f5831010d58540974982 SHA512 ca143e16e8ddd8e3cea01cc0857cb0e665f9cf397462e2fd9ed714b825eaa06056dae4115aacd117f8113e815f11184d9dd9f239259a1eee691d0b120db580f7
-EBUILD libgxim-0.5.0.ebuild 1289 BLAKE2B 9d5938a280e0028969d3dd3f78ac9fc4b1fcbae09f874b49a095d72a7da663ba8d82aa51d2eb76de73acba413091071e38a84cefb3d193cbb17a8e4a870ab29f SHA512 d23c05d84e9d26d01b5a7401cd12d73901871aafdb99ddbcf4391abdc5f86d56144db8c3e04fb8d7f5677a7de6c38e1d48b6b368e8d934b6f3e7530edc42e755
+EBUILD libgxim-0.5.0.ebuild 1316 BLAKE2B 8ecfa36b017820f6b746bcf3f89e7b6b1485d6db38e465cc3af34a300ea7569785f62cd28f6c8eaf155871326ed0e35d714f6d0e20a40e7f7bf06a36561e8bb4 SHA512 e4804165cf59023897120bce329e6c276258c9bc00ac327fe5536975735529075b4e054d4fc9611b714dfa710969c83b2331bd82c3f76c4b7d13d980cc3cce42
 MISC metadata.xml 325 BLAKE2B 842e0838af5a3aa081c0cd65b5ffda14736b9d597c8f9117d8e61be977078741a61edec36a1eaf11d3dd8883ab9c821e664194dd298aab39ebee684e20c8e757 SHA512 20ad59c0776da8a8541052eed41f71d8e40604056ffab37a1899d822880d8423d26395ef46d581d71c10128d943a5ad5b45b26f126bd446790c1ba72e33356c0
diff --git a/x11-libs/libgxim/libgxim-0.5.0.ebuild b/x11-libs/libgxim/libgxim-0.5.0.ebuild
index b712cd49c53e..3dd8ae007f62 100644
--- a/x11-libs/libgxim/libgxim-0.5.0.ebuild
+++ b/x11-libs/libgxim/libgxim-0.5.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="${USE_RUBY//ruby/ruby_targets_ruby} static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/dbus-glib
 	dev-libs/glib:2
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 99aa6304c8ec..5b9f8b1b9768 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,5 +1,5 @@
 DIST libnotify-0.7.7.tar.xz 285356 BLAKE2B ace0eedb1beecfbb89726960e441821d64f5ac456dfc6294b051479078726aed6fbacbd1e8cb17578933adbc4c94711b0d69a292778ba4bce096552a5197722b SHA512 133874114407bf12267ef609f5941657181760bc7cf115c5973b1810cb72bf55072b621c143e32be1e7e8b49f244851925d14bc3f9f26457747b8a8695ee9954
 DIST libnotify-0.7.8.tar.xz 108436 BLAKE2B 0a73eabe58faca55e16774cda6f649ab3187bd73a1f87b538d5098f390571a6a34078883dbd2447731d6e4cae315d8286e9e8acc06e85590c8b05a693a83e7f7 SHA512 9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94
-EBUILD libnotify-0.7.7-r1.ebuild 1490 BLAKE2B ca47ca4beeaa35f52278c3ce905cff60e863b45df9c9f723c262c0826b7b126c37b73b98ad670f36029d515de70e9dbd8bb4251dbe585ee652db83c4474915d3 SHA512 25c15ae5af5b5f6c5804b6ac040c037af1fdf7a018b9a80fee67d91372fe22f1802940d0235b6568eda9f50fb9db6468978e563dd28b66ee54a76632f97ec0cb
-EBUILD libnotify-0.7.8.ebuild 1359 BLAKE2B 3c63f310a5db3499de2de082ed5d0e709368582aa5baa3178f303c6a131b3a179217a40112771bbb3ba3dc294fd337d15f2ca5ae09d29c39e9bf8debe19461de SHA512 c35c846a9a621a9c0143dfb1e069edf9e0095821b74a77a31007fb979c6b6da66ae264941b60ff6d1dbceffddad66e8ca098b65e9bc08e84f65acfcde60fb17c
+EBUILD libnotify-0.7.7-r1.ebuild 1517 BLAKE2B 65d9fe4dd605898d9eb768321ad49fac46e4587d321726149f7ca85a045a6d65e2456e309396bc37d71c7b15d809cf2c8535dd511660584265e720a309eae5ca SHA512 77a7fa2111f9ca0f266b92a35767898dc51bc6bcdad8e1d3d3ddcb9b7e5b62fbb3943d2c020085434f565a2f44277ec56a8503dbe150482b443ffd6963c2818d
+EBUILD libnotify-0.7.8.ebuild 1380 BLAKE2B a25cb43f74a9bb66ee98058b68960e909bd9bb26ba96146d827e7a641ea79cfccbd6c8ede205e8dc8abf635d757bf9c86f16c8966605c7a972b9b66735b7212b SHA512 91e5835186b42c97672437e26c989fa32d0f38a882bb1b2c4183da47d62197cb1fa036a9162a7e5e6b425a669593a32aa1df54314f1af16b6550f5160e02dbc8
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild b/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
index 25aba2e29347..e82fecf43792 100644
--- a/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
@@ -12,6 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="+introspection test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-eselect/eselect-notify-send
diff --git a/x11-libs/libnotify/libnotify-0.7.8.ebuild b/x11-libs/libnotify/libnotify-0.7.8.ebuild
index eb6735bdd7cc..1c11ad27b1e5 100644
--- a/x11-libs/libnotify/libnotify-0.7.8.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.8.ebuild
@@ -10,8 +10,9 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="+introspection test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-eselect/eselect-notify-send
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 70ea5c19ada1..1e5e438edf07 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,4 +1,6 @@
 DIST intel-vaapi-driver-2.3.0.tar.bz2 2901075 BLAKE2B 606635c2b4ad05119a3fe1269354e2a27b944c56117360b5c4171b679506f3aa10d48057f1c99957efa1cff3b625a315138ac93e616aa14d30d20d540a3bb6a8 SHA512 60f37c09269e6ae07e55ecfc2c046ae7b6321abe71647625310ea7c75627ea875b94ed8e14813a36ec068bbd605c6d447dfa2c3bd692eb7953a58a871064fd5b
+DIST intel-vaapi-driver-2.4.0.pre1.tar.bz2 2888363 BLAKE2B fc7861e5d7625ed598feadc3b5649335c4f6bc0cacd66bdc38a58bbe4d95909c27c9b84478abdda687725070fa9fea850b3d86925ae6a7ea821a168e2bb98a13 SHA512 f637ca24b34573ae022f24f0352be8a6e2904a703ccfa005fb84da00c54e9e02ff0282e882312b86dd7e2d1a1611fba3eef37909ac66a3c2beb056d8cba6019f
 EBUILD libva-intel-driver-2.3.0.ebuild 1308 BLAKE2B 2aed9e5ffb8b4c557fbe3fe405025a987653f308a9e87435b69270a0b3269d00341c4eb6087a3c118dc8027de17ff0516d90fc698948eaf8f8ea7b586e2e92ef SHA512 284c598bd7933a807ee0e63e782cb5a0e03c0a2e863e2df559605434e1679779774f636d9f963fa58cb492483853d49d70012b5ce29e66dcace78cf686b41736
-EBUILD libva-intel-driver-9999.ebuild 1310 BLAKE2B 0941bb1ef76ddfcd7346c12e31ffd1f98cf76f4b15260a9584bb2398c3ffda64b675f401535b2d987a0df74799ba576caee2641b6b2c9f87e23750c8b4c97ee3 SHA512 9f6aea6aae9b45d0ec612b072089ba1f794487447a27b332505cf6390558c33fc8fba3363e9090a8fd61f339ccad5ffb12c54670663ffea30767a78875d591a7
+EBUILD libva-intel-driver-2.4.0_pre1.ebuild 1326 BLAKE2B 99e4ae3fa927ec988c9526d161464f256f88d71624cc760616d6e7e13c94c3096ec1a4a3f9a402680cd6778741e8e67314392a495ece792ca1a05b8e010ca213 SHA512 5d9e98f4565911b00ac59fa672f968eab8695dc9a9826314110107104d762286353e6fb0e65548692d83c7ca28f8e3b23adefa3b6d138943dfd6d08d0139ee7b
+EBUILD libva-intel-driver-9999.ebuild 1314 BLAKE2B 10eaf18d44d1e5a583e665c7e423caaede7909748fc62dfc270affcb3b0e9db3ce7ee8e9c00cfca3d5aa936857e50a019ec7295a28489281e28a80915393ec66 SHA512 225cacaa64b8a4dbdf2d1c7ea29e45d90422fd15fdf938d8957de1e3ccf2d60951e52663f9f5bee9a08e267ff60ca7595816f74d2829f29f5693e389b310ae84
 MISC metadata.xml 348 BLAKE2B dcf3a9c208ab7377f3e6e8fdb8e790f894cff749b32f5cd2840a2bb25aaa74ddb5a6260c8fa7cc332b8d49d3ab51277658d8a7d7814200839f9bd64f0d09ffc2 SHA512 438300201f9bef74270eff620b64bde08d4ad5952acd18adae4e73c20ee364e133f19fa885332aa1e14ae9a874669057c6fed8a10536ce5f9b2bc6c949da5ee0
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.0_pre1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.0_pre1.ebuild
new file mode 100644
index 000000000000..4da19b9b7c0d
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.0_pre1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="intel-vaapi-driver"
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
+fi
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV/_/.}/${MY_PN}-${PV/_/.}.tar.bz2"
+	S="${WORKDIR}/${MY_PN}-${PV/_/.}"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+RESTRICT="test" # No tests
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index 1d8bbf4cd84b..4e4df0e31706 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_PN="intel-vaapi-driver"
 if [[ ${PV} = *9999* ]] ; then # Live ebuild
 	inherit git-r3
-	EGIT_BRANCH=master
 	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
 fi
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="HW video decode support for Intel integrated graphics"
 HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
@@ -23,6 +22,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 IUSE="wayland X"
+RESTRICT="test" # No tests
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
@@ -32,22 +32,23 @@ RDEPEND="
 		>=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS NEWS README )
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	eapply_user
 	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
-	autotools-multilib_src_prepare
+	eautoreconf
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
+	local myconf=(
 		$(use_enable wayland)
 		$(use_enable X x11)
 	)
-	autotools-utils_src_configure
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
 }
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index a10ed239eabf..0ce47ccb2bc8 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,3 @@
 DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
-EBUILD libxcb-1.13.1.ebuild 1435 BLAKE2B 6e026dcc9b760a79bfe3d42fefb1e95cdba5e3c0b017061aec062a4ea3a1bbf9b57fbea4590f885e8f574c7719dfcb17a98b97ce75f8de08d44af637f3784070 SHA512 6a24339f9343c62d9538fbdbe789c04213533c74633a49e858bbcb900755ab57f96be34bc60d45f51a33892230246b7b0900fdf16981741aa3ef92a67805dc93
+EBUILD libxcb-1.13.1.ebuild 1462 BLAKE2B 9f07746942a04bc5c2b68ac7f667ab29f444288731daf45bede6895195456a2817c309f4cdc1eb5c93b48884d49957d16b98403979b46ce57f2d6dfe4b87c70d SHA512 c246038a3ab99472316b1e47a4af3df13c03ac5831fc93e21989b6de1436b3dae6124a20d53eae89ecb0abb69473ed368abde35fa74370044baa0744eb8a1ee1
 MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
index 8cd3208c9f4a..1eafafb3fd8c 100644
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.1.ebuild
@@ -17,6 +17,7 @@ HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/l
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc selinux test xkb"
+RESTRICT="!test? ( test )"
 SLOT="0/1.12"
 
 RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 014291fc2499..e2949a187f14 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,7 +1,3 @@
-DIST libxkbcommon-0.8.4.tar.xz 648592 BLAKE2B 6205ca08f1ccb6d85320428317e9d023e2f2a56dcaa77e34a9f9ea42bbf67c9ee27a3123dd8e880ead3fa92c4cd7718bde55a255c52f16fef8d33c395c2511a9 SHA512 dbd441d0d7d5ba4fb352d64d150d163d4cdcf8340059457c291dc1fc69d1606ff6589732cb41a7fcfe106af0192977b243d7d68c4d95b90ece7abb620df360e3
-DIST libxkbcommon-0.9.0.tar.xz 376160 BLAKE2B 9a349a7ce9dcd1e9475f4a3b2365c11e91dcf4833d53c99b7231c1a757a410b4e347f90c77013d2a3a2a724765c1f2187d8c1fe96ad4441d34772f62ec081620 SHA512 7e3b03f1fa5abca31574c02e8308be9d5a6e2bdd369e808faeaa62e63a3d3592158cc695df55828275fc10219d79e1915e4f7331f1967aed0c9c54025272e9c4
 DIST libxkbcommon-0.9.1.tar.xz 376164 BLAKE2B 16c95081136ea9ce742f494ae2192cce815f3fb4a3d33d3e525f8ad61f1f720fa6bfe74088a9ab88f3c6ef9cdf78c4d8d4dc87e7478fd84e4b09e03a337efbdf SHA512 8d4551a06e7dd4936633f544409401dc33f8f1900adb5daa6403615c71f321d17212db739f89a5b3e393d729b3f33167691404849a25d5526b403fd9ec3e8878
-EBUILD libxkbcommon-0.8.4.ebuild 871 BLAKE2B e1ecb34684b9999a0a68f1561ecd5e27870308abd51ad2713fb5ece66b2b99b222252d19ef0c01be3b8e8e27d32ce42a963912bae89dcc5c40f8dfe19ab5e27b SHA512 9af26d68f893e7fcf17415df441e3d86ffb7fee253b5092c7000f145d9ca5a5d0db1ac09399c3af4eef5719b6d2461e82d7d4d720891c434c2665ae7d0d33967
-EBUILD libxkbcommon-0.9.0.ebuild 1199 BLAKE2B 2b6283d7f1e7d9c07ede218fab1998b8b5fa8f13e49343210741ed3adcee02adaaf255c8297ab7411ac5488d09cfd340d276b77bdcf3417842937380229ae1c4 SHA512 577ee5974be646aaa8d5782122fa9432f1ed7b0770fb97311bc495a038e9de30efa9a496c5e5ff80be44033a8a3e475a8839138e1fdf86ec4f9bbe1838540ab9
-EBUILD libxkbcommon-0.9.1.ebuild 1199 BLAKE2B 2b6283d7f1e7d9c07ede218fab1998b8b5fa8f13e49343210741ed3adcee02adaaf255c8297ab7411ac5488d09cfd340d276b77bdcf3417842937380229ae1c4 SHA512 577ee5974be646aaa8d5782122fa9432f1ed7b0770fb97311bc495a038e9de30efa9a496c5e5ff80be44033a8a3e475a8839138e1fdf86ec4f9bbe1838540ab9
+EBUILD libxkbcommon-0.9.1.ebuild 1216 BLAKE2B 82435dab35e380f00f48f0d1fb3a54e8c22e163913e72189859039f10fa83dc0498893cdb8ab0c7195164874cc51176735d78e16adc187e4665354d48a4e9a3c SHA512 2628f7a00dc614764708aad7a88830f6b68e4c2291866c9e29f4b5747ff55aa142091f647c4dc6dcfd62aaf4815d2eb050e65d95dda35fb4603bc2437bcbc900
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
deleted file mode 100644
index e92a52c52bd9..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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-3 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="X doc test"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(use X || use_enable X x11)
-		$(use_with doc doxygen)
-	)
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.9.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.9.0.ebuild
deleted file mode 100644
index be655c7b43b2..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.9.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit meson multilib-minimal ${GIT_ECLASS}
-
-DESCRIPTION="keymap handling library for toolkits and window systems"
-HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
-LICENSE="MIT"
-IUSE="X doc test"
-SLOT="0"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		-Denable-wayland=false # Demo applications
-		$(meson_use X enable-x11)
-		$(meson_use doc enable-docs)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
index be655c7b43b2..3c8da7b78001 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
 else
 	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 inherit meson multilib-minimal ${GIT_ECLASS}
@@ -17,6 +17,7 @@ DESCRIPTION="keymap handling library for toolkits and window systems"
 HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
 LICENSE="MIT"
 IUSE="X doc test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 BDEPEND="
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index bb3acbec9bae..2df4c38fed6e 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,5 +2,5 @@ AUX 1.42.4-CVE-2019-1010238.patch 1088 BLAKE2B 7517b2b4c3502546a554d3b592c8c48af
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-EBUILD pango-1.42.4-r2.ebuild 2308 BLAKE2B a436048985ecb5e8f37b5d650d90eca0ca8abd0ef8ca5afb345db1f52beec2cbc38a03453b30147ac0c0c418b6a02aedb0b11ddcc8dd8e407d8ab5e0e0a617dc SHA512 0cfd417cf6e82c511bf0f87c3387958d15bfd5412127c7505cf04525d3e0e1f9a943a3552974c6ad283a773bf957f3acca1860e1c9a18629766d9bbf589ca974
+EBUILD pango-1.42.4-r2.ebuild 2335 BLAKE2B 75ea8501c2d36ec6a4e523ec05f076ed2de4252c18424ce10cc41d76f4c43299115e35640daf52a2b79c10c32c9e87eea7a989ee3d99dc3cd2c7d417fbba9d51 SHA512 22ee1035c822380fc2f2d4fb89507ac945ae6752e90114f6b1a8695b9821d9bf551692ae56717f2bc6febd51926bc833455515d58b6e37f0b94f19ae76d3ddab
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild
index 667c939a2b03..55f956cec0bb 100644
--- a/x11-libs/pango/pango-1.42.4-r2.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index ee6dd6859d92..a8c8aa933040 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,7 @@
+DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
 DIST QScintilla_gpl-2.11.1.tar.gz 2932060 BLAKE2B 9f2f9fd89667cc04c95d0a36e4a615dcf3c1c11a5446e19a43104513894b76bc7478f2aed7e8c94ce413f940327deb09e51507bee1fa35c79c176e01e6b74767 SHA512 40b600aa8eec17bc99491a08aeaee72bf498a66f0257d310a8df2667de82805715b9c859885c092acfb03ba8f69433a6517d0d4bb324bf99bd9db461172c08d5
 EBUILD qscintilla-2.10.8.ebuild 1796 BLAKE2B d32e1be6bd53bbd8b893c4dbd755350430907213b38b95462ce26742affda2b3c93588189b636cfe6df1b3854e7b825555b5993fe4a766135ee802c239b8d906 SHA512 7f5906dc73b378fc93bbbd97394e269d55f335f7404b05e8d04f3048084637710a6ab6d4c4e4a7e121834b1f966bff07bf53df13400735af301d8026c63d3f61
 EBUILD qscintilla-2.11.1.ebuild 1961 BLAKE2B 4c43f10d33d3019b2500640314b0c02fe88f112a4e76d40334a7476a4b44c75da6b8b747e82a79e10fb1406cc32c89a0f6589288e122fe1761f9c24aea7476a1 SHA512 0fcc9259f8f3d8f391faa6180b7f440132c2e59814b22f3b8c80ceeaccd6e2187d353a29b36db21189d48d22d17bfdd77031365da2d9217e21f6a1bb9fdeac13
+EBUILD qscintilla-2.11.3.ebuild 1957 BLAKE2B 84a7752f28ce961ab39d41f5c2c63c6c040bb78ce4789075305496024d5fd0878689b095af9d01503998bc8c9c070750827314b6c1ce1abdb0ddc4c9235f2702 SHA512 d139200a4e02325878bded6c8f6858a47ed0444a1a6044992e783e79034b3896fe2aa68726f917faddf83dc112ae6b1764eac305394aea55efa7c6d069150078
 MISC metadata.xml 705 BLAKE2B c0c287bbd6ea54929cae6ebc67434bed9fb068a3f560a870412e6182e0da5543abcaf0c38aa3c84e4597cbdcbc4be09775be679d6c83b52a8d6f10166fdb6c53 SHA512 39849b3d5febe51eb9dcad9333ca64ee7cc81c48fa411b167e3398a03a2d4f75d5380bf4650e2e625952e0b3d842242859f487136d25cea768dcf128f35f490e
diff --git a/x11-libs/qscintilla/qscintilla-2.11.3.ebuild b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
new file mode 100644
index 000000000000..9c5354a9b46e
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.11.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 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 ~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/snorenotify/Manifest b/x11-libs/snorenotify/Manifest
index 37b0b9d31dab..afbc3fa0888f 100644
--- a/x11-libs/snorenotify/Manifest
+++ b/x11-libs/snorenotify/Manifest
@@ -1,5 +1,5 @@
 AUX snorenotify-0.7.0-desktop.patch 1517 BLAKE2B fc126c421ca7feae0f64e913ac9ff9d19fb47bf2ac8743d70756b04b2d17bcee8736c16377208bbf81c61281797effe783e3ed6b9a827529eb1046b2f4ffe189 SHA512 be7663b95e7884f9b77891bf175ae87bae33d2aeec1076538428785aa496b60a7dbe5f48aae8ab443100cba4cd90f4638545df80184df9d98f2c0222775da072
 AUX snorenotify-0.7.0-include.patch 561 BLAKE2B e6d75957732b6cef79ca9c043efdcb2d860cbb6de90ad231edc8d5364a6544e466ff296ad1ffcbfb89671e9173fd7936dee81dc76c9f4fd2a6272e1ddcfa7b2c SHA512 5f644739f76aafea122e30ce0978371fecab5ab2c4a13ae11cae69fbfa23be0ea1f7075d296f181d9568e84a54a683f13b0a1cb1a83d47ba7d3c7febb2de391e
 DIST snorenotify-0.7.0.tar.xz 200032 BLAKE2B 4eb4f7a57bfde7a780b868a8c57c5d1e262809fd2b591597d69c3e98b712b926e287009b453a5e00ba5f805728d986441824eb226bd73c94375d11129be03d4d SHA512 2030a7b6bc69d3803e83e1a6d26efa5bfdd3facf53dcaade6059b85cea3db879ea49b9e02dbce3b043b4ddded21509a6d5859a4002cfd57a870a0e39cd11011a
-EBUILD snorenotify-0.7.0-r1.ebuild 1083 BLAKE2B cd446af76fee8c8c4010654b1e979c9353190809246fdc963cc670ea0a483282f04c14891a7fada497e8851e4964212b802b6c78fe6ec82df123eb25ddf08c30 SHA512 bf58163387e75e5e05a2de9f98fc7cf326e419bef91acc4b4a2febd3ae81a79442bf367cb301a279fd0041ef0353d6b8517c169f6e34aff92225a8578bd4c814
+EBUILD snorenotify-0.7.0-r1.ebuild 1046 BLAKE2B 4168c35b6ebf19b820b552eaac495dfca9fda7cf1608275c93eee8be2dd86db9cf965ed3f8ef7342f115ec0e68053e1f76f35adfa0e9033e2a469f0ab60ac2eb SHA512 f19ac2666c201a6ad39abf463ff1f1495443a0220ae96517fb107d1c01a28874c6f5d6827a9556a0cd19b2438400dd1405325057e9489357b6c827a35f785305
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
index f814dda6bb2c..5fa613294bc7 100644
--- a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
+++ b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils virtualx
+VIRTUALX_REQUIRED="test"
+inherit ecm
 
 DESCRIPTION="Multi platform Qt notification framework"
 HOMEPAGE="https://techbase.kde.org/Projects/Snorenotify"
@@ -13,9 +14,12 @@ LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="sound test"
+RESTRICT="!test? ( test )"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 RDEPEND="
-	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
@@ -25,8 +29,6 @@ RDEPEND="
 	sound? ( dev-qt/qtmultimedia:5 )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules
 	test? ( dev-qt/qttest:5 )
 "
 
@@ -35,23 +37,17 @@ PATCHES=(
 	"${FILESDIR}/${P}-include.patch"
 )
 
+src_prepare() {
+	ecm_src_prepare
+	sed -e "/Categories/s/;Qt//" \
+		-i src/{settings/snoresettings,daemon/snorenotify}.desktop.in || die
+}
+
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package sound Qt5Multimedia)
-		$(cmake-utils_use_find_package test Qt5Test)
+		$(cmake_use_find_package sound Qt5Multimedia)
+		$(cmake_use_find_package test Qt5Test)
 	)
 
-	cmake-utils_src_configure
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	ecm_src_configure
 }
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 995cfc90b9bf..a702b65068c4 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -14,5 +14,5 @@ EBUILD vte-0.28.2-r208.ebuild 2952 BLAKE2B 40d1d998937dceb5b3f614a4c5ad959721463
 EBUILD vte-0.48.4.ebuild 2444 BLAKE2B 3b5f8f9758b15039aacd4dd88845383307802cb8069e85616e0979d5e9f4167927d41c77e83eadc5d006ba0e750fdabb8d9a0cfed0ce0c4344176ce4ae4839c1 SHA512 4612220c197a3fa90170e5e97e52ee6a1ac63a61f6d346f5d00a315b359a3a80935ef5e9000966e4aea68ef1fc1bd61199c6ae229fd4075fbb8148964c7f31f8
 EBUILD vte-0.54.4.ebuild 2362 BLAKE2B 4fd6478ea2fe7abf6b56d4ccbcb2edd53ec112b4bbf01393d2dd59bdc612909aa535ef92cdc00be191ba87865af1618facd805909cfa1bc5e19118526d16b9d6 SHA512 9b2698e69433cefaa16b21089b4d42565d6baf60f195780ee481f4f7aa39d80ecbd186ee4ee57d0152fdd84bbb7c0a47ebb0c7ca46dae808c4683c86d1a2ab2b
 EBUILD vte-0.56.3.ebuild 2287 BLAKE2B 667fd7416f0f552d15e243ad688f83e46f0126ef65dcf7b8e9ac8d27ebab17298f7ffd17b66de9e1bd072adf596b757cef91b2af2288c56aa41b8ab5b0fb432e SHA512 7031557db7b036d17af586af95539db8c635f30edebbaad596178f86d6958a11326f7155ab37e83fa4120bb575f67641932dd39c0445f0da252e731d08007c18
-EBUILD vte-0.56.4.ebuild 2287 BLAKE2B 667fd7416f0f552d15e243ad688f83e46f0126ef65dcf7b8e9ac8d27ebab17298f7ffd17b66de9e1bd072adf596b757cef91b2af2288c56aa41b8ab5b0fb432e SHA512 7031557db7b036d17af586af95539db8c635f30edebbaad596178f86d6958a11326f7155ab37e83fa4120bb575f67641932dd39c0445f0da252e731d08007c18
+EBUILD vte-0.56.4.ebuild 2281 BLAKE2B 9299dade4e846d07e7357500605eb738707e30178036c9ceb797532b88b27c97eea379abc558d1a2cf0b07eed383aabccbfeb5c27b4f98ee0f52efb375c173b5 SHA512 6b64d957c2a9cc3de53cff59c1a4029f1f90aab4f3bdf752a8c9e2ebb9a4d2ad4085e43a9372e5420655ab16624ea2be284b41e4c848c8ea32b9f89ae4d70b29
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.56.4.ebuild b/x11-libs/vte/vte-0.56.4.ebuild
index a1d0b27dbcdd..d446e9e70d31 100644
--- a/x11-libs/vte/vte-0.56.4.ebuild
+++ b/x11-libs/vte/vte-0.56.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
diff --git a/x11-libs/xbae/Manifest b/x11-libs/xbae/Manifest
index 002811f350a9..dc0d4e83fee6 100644
--- a/x11-libs/xbae/Manifest
+++ b/x11-libs/xbae/Manifest
@@ -1,6 +1,6 @@
-AUX xbae-4.60.4-Makefile.in.patch 824 BLAKE2B 26259c4f52026050921b6aed09307b94acc6d36d222e9ad8be3364c12c0e14d277b98a88a3db0d4875069eda20ace20585cacad76070c3347748a0a489d45568 SHA512 5cae2c85b471324b136957236829f0fd416bc82e654ba752bf0b8de07918ec65e2e6a3879cac5a4508d9ef6d08355069db34e0281af0b56ea36b536201b9c7ba
-AUX xbae-4.60.4-lxmp.patch 437 BLAKE2B fcd694b2f45b3db39d23f371d396bd41a25c02e8ab8aea0cf7f4f53b36a2f0e458901d8ad16689568a3445396a7412f7cb16bb5c035db228bf96be356bcd8800 SHA512 79eae095bc565b67030590bcac0ef1f9e75def35774a8214c5be4227a764e418e9db2e2c1617d2f38f29ea70923e1daad7bc343785800f9e2f96c5a64b11b142
-AUX xbae-4.60.4-tmpl.patch 255 BLAKE2B b7819d868def4094c36c9cc7dece319e2b96e1839b8fc000142654eb6281c82a4a2d008d5c3f6688f87f65c6d571d9bf09125661b94d23f7f49631e72c2d401b SHA512 03bb77bd5ad97b8bf38149a8421ba5cb80e7fdd6488ba69566ba74df1a8025b1078ecff1acffaf19c3d835fc23a44260ed59d2d81fbcfc7ccde5b7d5e678b433
+AUX xbae-4.60.4-Makefile.in.patch 751 BLAKE2B cc40a6d58a1e6ae6c68f2dd989807fedac591c6e107dbda4d9876e93070142e2b8809db93efcf7866cc2adfb1df6e5ad39bb27575e260669606a5c882be13b37 SHA512 0fbbb49dd9dcb5571591ef214fc5318f8a4b09966a8cac6b94d17e1554747714d4aa79387fde970d0e83804397f5fe7e9988ec82164023ab3d2562397ba31308
+AUX xbae-4.60.4-lxmp.patch 364 BLAKE2B c7defbca432abd679c5afbab2e95de3270097617d7a52cf4c781d3d44e36887c18901a045d9ca36d107aa71343e7f1ce974ec0634062318a56c14351335e8425 SHA512 90a348e0f67b3954ce2c1965e4252ef5b1be9b0c6c232981219a79af5a705dcc09bada6e87b7a2ae25e9d9220130c1321af90d079843317cc82d8e2a11dd78fa
+AUX xbae-4.60.4-tmpl.patch 182 BLAKE2B fb68a556359b2825879567ad53e4fcdcb3f5d41198cc8f3bb7626e45251881b8b7e7ebc4f244c4df0973d21e62a797d38b7a429dc94ca84a97700a4f2f9055d8 SHA512 dc360679441f2c8a4642a8b12b624acc739e4e7bd4ccb931d385212e418291eaf8d05501a420cb0407ab953826cd477634938c1b3fb89b3aa5ea1fefa57a8a60
 DIST xbae-4.60.4.tar.gz 1770938 BLAKE2B c9790dae438a4a35ca58274d96b3d4cdcf61191e3c8336e7df3df419a64a790bd010890f88082add21c304ec520ddec3545915c5babf267bd9ebb985b0acf0f4 SHA512 e9c2ea59ab598217a5d6a3df0b86ca9fa084c364116d9789334984a0ac83dec0d5b5e3fb643e067036fca10f13b175f6d5134325eb5041af614a4ed00745ba16
-EBUILD xbae-4.60.4.ebuild 1283 BLAKE2B fb622ebf698f47d970c9dde317661d10150896943a71ae303f0c5e5ffb849e4fe79e9b4f19ad993f581df28bf7c576e134b7974e4beffafad8d2822264f76adb SHA512 5c0b0c13bdc30fcdc7c3f18cb621424709a6366aa2e1ca6d6a4c9eb0fa75ec5c237b55949328fb08870336caddc2e84d5a10a52de34db438a3230268377b6072
+EBUILD xbae-4.60.4.ebuild 1239 BLAKE2B 215b85d42917d33734dc6d5e47f9166e5b5eb26c5c07ae62cad25f4c0415d0fd54c89acbc6362760c466c3f49df8f474a9c6f2caf7cf93fe97bac6609a50f1d6 SHA512 a3e5a9eed9da22beb663b67801ed9f06bd6842faa946dcc4c760e8aea7496a261dccaa6b1532fd625b2ea9c30b823ec36dde085824ecb3f7d34be500f87806f1
 MISC metadata.xml 965 BLAKE2B f76eac30d4f1d0ab6d41cdc26f8cb309936558efba912f56520f2f84ffad4463c8653de937dc2e6cb9757ebd7f60a5e147fea5d3c15dea1dd5f1ee0234a62604 SHA512 ecbdf447ab2b5b6c41888e8d2f7f02547de650fa1ca1bf708195753fc5e76dfc0e43a7a108c9dcc39e176b5456032b2e5d94c492075651267de4499eddc67451
diff --git a/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch b/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch
index aa0625b815af..2c16bdf489c0 100644
--- a/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch
+++ b/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2007-04-03 15:06:53.066980500 +0100
-+++ Makefile.in	2007-04-03 15:16:53.795027250 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -230,14 +230,13 @@
  x_includes = @x_includes@
  x_libraries = @x_libraries@
diff --git a/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch b/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch
index d5b66015eb0c..8d14303d4d78 100644
--- a/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch
+++ b/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch
@@ -1,5 +1,5 @@
---- examples/Mri/Makefile.in.orig	2007-04-03 14:52:55.326625000 +0100
-+++ examples/Mri/Makefile.in	2007-04-03 14:53:12.731712750 +0100
+--- a/examples/Mri/Makefile.in
++++ b/examples/Mri/Makefile.in
 @@ -219,7 +219,7 @@
                  -I$(top_builddir)/include @MOTIF_CFLAGS@ @X_CFLAGS@
  
diff --git a/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch b/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch
index 0e87ba3da39c..671cd3f9218d 100644
--- a/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch
+++ b/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch
@@ -1,5 +1,5 @@
---- Xbae.tmpl.orig	2007-04-03 14:45:54.548519000 +0100
-+++ Xbae.tmpl	2007-04-03 14:46:12.053613000 +0100
+--- a/Xbae.tmpl
++++ b/Xbae.tmpl
 @@ -13,7 +13,7 @@
  
  #define DoNormalLib		YES
diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4.ebuild
index b4d5e7e4ae29..b9fe5e37dde0 100644
--- a/x11-libs/xbae/xbae-4.60.4.ebuild
+++ b/x11-libs/xbae/xbae-4.60.4.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="Motif-based widget to display a grid of cells as a spreadsheet"
 HOMEPAGE="http://xbae.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="doc examples static-libs"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+# tests need X display
+# and are interactive so virtualx will not help
+RESTRICT="test"
 
 RDEPEND="
 	x11-libs/motif:0
@@ -22,43 +23,40 @@ RDEPEND="
 	x11-libs/libXmu
 	x11-libs/libXpm
 	x11-libs/libXt"
-
 DEPEND="${RDEPEND}"
 
-# tests need X display
-# and are interactive so virtualx will not help
-RESTRICT=test
-
 PATCHES=(
 	"${FILESDIR}"/${P}-tmpl.patch
 	"${FILESDIR}"/${P}-lxmp.patch
 	"${FILESDIR}"/${P}-Makefile.in.patch
-	)
+)
 
 src_configure() {
-	local myeconfargs=( --enable-production )
-	autotools-utils_src_configure
+	econf --enable-production
 }
 
 src_test() {
-	cd ${AUTOTOOLS_BUILD_DIR}/examples
-	emake
-	"${S}"/examples/testall
-	emake clean
+	emake -C examples
+	emake -C examples/testall clean
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	insinto /usr/share/aclocal
 	doins ac_find_xbae.m4
 
-	 use doc && dohtml -r doc/*
-
 	if use examples; then
 		find examples -name '*akefile*' -delete || die
 		rm examples/{testall,extest} || die
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		dodoc -r examples
+	fi
+	if use doc; then
+		rm doc/{,images/}Makefile* || die
+		docinto html
+		dodoc -r doc/.
 	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index 81f48221ac65..6af2198905ab 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
-EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1348 BLAKE2B 2ba24cc7b0c776d4b45acc4436f6c183b62bb91d7bf543dbd665b130469a58cb3e20d1d73a6da32abaebad911242f70aa7c89d68cec1cfb2ca55100907a7731a SHA512 f569bb941fb180c24008ab5996325d5ca3bb4d463084f7419548a3a062d119058a7dd6aeeeee02cc22af6a430053250a3572ae9d9e4a46d30b6ef57eac57a828
+EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1375 BLAKE2B 29e7ac7e5ccb731168b6870472b3760f1aba9b92fb987ebbe720d94b122afea899eeb0d97dcfa6d65ecf72fc228169b97c22acc82f9c8dd615aa35da3d4a0a51 SHA512 fe000f7d555dfac5ed4ab5798c7aa5b908dce8619dc2789d43d424a4d1f1657798e3342a8999a793654d1a21e7c2cbe5619acbc192ed52fa5f239bdedaa6ce98
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
index 1834b93a127b..a7559fd27eca 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
@@ -17,6 +17,7 @@ HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/l
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index c6da297ccfb7..bda8b3dc373f 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
-EBUILD xcb-util-image-0.4.0-r1.ebuild 947 BLAKE2B f9ea878298f6f3b67620806f10327fbd3ee4b431564bbb5aa0b96bf95a79f635899d24c9e790266ffc6c41087a8dc333bb713024411aefa8ee996ea34a8faeb7 SHA512 cb0e0d134de82c7bed16e07bb219c81ddfecd574cffe87d05c215865afa98ceceef1e52d7fd0c7c6c4cba30189f7def534a0228a50c06c8cf12cffb121febda9
+EBUILD xcb-util-image-0.4.0-r1.ebuild 974 BLAKE2B 6b5fbe7fcc8994b744bdc87b46162439c0c3a76c24efc24c8629fc818521f1791955cdfed2db5cf095c9947c8521b228cff7588b711cf09c3e87dcb729e28922 SHA512 b2359063ae67a5bcabb13d2db97cddfa49a1b729712171e04090fc2b7fbc3aba36f378274ef1b914827e152075ac9f99f2bc9312a6813eb7a97b0747fbe17c88
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
index 78f7fa079303..c612777a22e5 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
@@ -16,6 +16,7 @@ HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/l
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="x11-base/xorg-proto
 	>=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index 94cd00cb75b1..200a34ee1f32 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4
-EBUILD xcb-util-keysyms-0.4.0-r1.ebuild 894 BLAKE2B 48e1fdccee45e302cb40c8238d11dfa12edb5aeb468137d27a0c4f78bc286e247337477f4f287de309e207544235e0d6d59dca03ba42c310aab6cf89feedb5bd SHA512 2b144a173eda2a36dfa353fb2d730a9ab63b9d73f40310ce46d31e76192f5b9b0a8a81eda3fcffb050616b4b5ffa5c744b50a6fa174a4b40a76e31291ee3af85
+EBUILD xcb-util-keysyms-0.4.0-r1.ebuild 921 BLAKE2B 2235583b94fd70c8485d4f898a1f71036fd8a9578683d9ad82e0db726f2e4db21c848a372e5bf131cd0fe8c23c4b52168d54792fbefa5bfb6d7a730bf38e6add SHA512 eb1cdaae9482266684499db51a9a5bc46a23c6dbd4929110a2b966271e435a64c1e628940e8ea092d60308d58c83f725b9914253eac35d33d55afe160f5e4b0f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
index 90590ca324eb..b9a5a3e0af95 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
@@ -16,6 +16,7 @@ HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/l
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index 298361966652..6dfed7035b6b 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc
-EBUILD xcb-util-renderutil-0.3.9-r2.ebuild 914 BLAKE2B a73f6b8b75ce8640158cb9026ad29bd67fff14f74a11d896ea970f2a0916fbc18805e4ca14c9c619eb8a7c3c51a69a8ee5d3e00402dc2e4c03a33c9da2d29836 SHA512 64bdd4d5ae2e91114dd3385da94846c827bd01999ffbb74878764f8656a189edeeda19c89a9b5eb13261efaac7deeaa7b365fb79128047517a277539d22d6db4
+EBUILD xcb-util-renderutil-0.3.9-r2.ebuild 941 BLAKE2B dbd588a8bf743db9fe31f85d9ea01af309bd93e72a4068fc14c05c3f2c0b52fe55bd71e67f58527424888ff313aed024b6bfd4d5920dda8fc80d7db874f6371f SHA512 571cb7f4cfedfa6d597d153313ba5f98061fa107e446739bca9c6e410e9f7d965e162abe56b89ad08769f2c967cd4edb2a4bff28678890bc7d235b1d245605bf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
index 4bc4fe6626e5..31ea19d331cc 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
@@ -17,6 +17,7 @@ HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/l
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index 0fefe6a70e51..fd099546cf33 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
-EBUILD xcb-util-wm-0.4.1-r2.ebuild 895 BLAKE2B e29f3e9f468e0b2759775aefd9de42e4481a47739edc3d4c031620a2e840377eb528c9b79631beae587129e4a99b943979a387bb686cf7b1830543f937653ffe SHA512 d8c4929768a18a36c5e6ee21c7c66d3571899510b39fb52f024023413ab7c9385b8acdeaaf6978a9b33a8f66502fdded5a98ad36ca5b2d8f8b676c0bbbd50a47
+EBUILD xcb-util-wm-0.4.1-r2.ebuild 922 BLAKE2B ac3e8eb7f01240f2397fc3b327dd280f2379ce53cfaca0b46b5e5aa34ad7d00b4335e9e78cb797459bdb55961a5ba05adfa8758dc3d6f03e581ebbff96dd902f SHA512 1cce7f6ad61b7fe624207acad4364ee1fdae09858d60cb9603dca968bc0888d68501672519c06258eb4ef68fdd1f3d5d33f53b1cecc74b828147f31d2ad3dc28
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
index 2514f2919205..e8c75262d6b0 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
@@ -17,6 +17,7 @@ HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/l
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-xrm/Manifest b/x11-libs/xcb-util-xrm/Manifest
index e4c15604dcdc..f0a745ad0435 100644
--- a/x11-libs/xcb-util-xrm/Manifest
+++ b/x11-libs/xcb-util-xrm/Manifest
@@ -1,7 +1,3 @@
-DIST xcb-util-xrm-1.0.tar.bz2 327196 BLAKE2B 6bba57de372371ca7829a477ddc57f86e1faa86829c7f32e46eb5667505c6b3fd0b5acd2dd74f4f1223bbbba678234948bf5d499019b089e3abe23ffb5631843 SHA512 b49d97b018a231b5642bb05a287eb7720d9e1ffe15024d46a4c7ebf2f9cc37a0a4a3262d9aa963fe9554ca801ba013ad6cb5d3f87b67daf4d69efd180d7ba8fd
-DIST xcb-util-xrm-1.2.tar.bz2 324708 BLAKE2B ca5176fb848735b856541930f37e46ec093df6d86a981c87c910bfd64e1a8d5a7e2e20405994dd2a8b9c1200dae48bec0df3a6546be984e3ff316a271b0d84eb SHA512 c6031844d3a197b234cb1b22166c02fe8d03f8a8def836b8c974324a0b6b453889680011406c7940bd04fde1389c5a2ff508f84b080f811ca69cbdb0334994e8
 DIST xcb-util-xrm-1.3.tar.bz2 327586 BLAKE2B 06ba03ba22c9a51cad5045024b63d48f32e5ad38d2cf03035bd1132a04ef4906a71d89030141b407329bd8ec04cb131846be2cb3a95e755a57c2841a45b58fa4 SHA512 ebca5d92c9e2363f58485970a0c3a948b13652ce7acdd51dff918fc2e8bc7fcb69892eb3fc8b5f7eaf721ccd8dc2db42727d206bc5155481ec5e7e41d0c7f304
-EBUILD xcb-util-xrm-1.0.ebuild 616 BLAKE2B 2d4b35ef4ddd4a6b7133a5fc69758b9053d5399868d2ae3cc20cee62204d924487d63ab108c93635126ed03dc9d976ea301f70731443a2489c4bc9c5379d271a SHA512 e9f2431c09ffc6eaf1c581730be68497503e192240714c2ea7b21aa38a34ba26f27a8eadc441a6fcd5954684f01d5f641076297c5225080d1e317dab6408642c
-EBUILD xcb-util-xrm-1.2.ebuild 635 BLAKE2B bd63f4b129d9ce086512ca654ad90e59891398436027f6ff0dbd4776c037363c1ecda07ccdb4f2b4753ba914e57524c24e787e58dcde62512bf739d027faadd4 SHA512 07f558e9d8f186da44e75d434e4cd803ae5322a1312df263b6be14db3b3f17a765b07ead11913fa7528a90e1aa1309284242ae550bd89b427d9f410ea3e0a487
-EBUILD xcb-util-xrm-1.3.ebuild 669 BLAKE2B 343ec1a1f633cd5577e010b92649ff0270c6f2bbab04aeeaf43f291c62da6e2fee0ce74ac6c1f066c72b1c81593c8af95a42535cd82de38b64612797154e7643 SHA512 8a2d245d2833b7c56fb75c3ef83030ff36ba9f3ef57e35b8f09840826552cd5dcb3d4d20e6f6c6077265df7ae3770f259886e5f2510763108bce963fa995e020
+EBUILD xcb-util-xrm-1.3.ebuild 696 BLAKE2B fd75ffdbf2a57ae132b8e109cc809af9d457895efff25affa555d6028fe53edfd5c2fefd55553fa7fb29cf4ce4b7d953a0195aa347e89510a0d4945fd10d3794 SHA512 e1f7f401b0f02976b284544e34dc6dc27e99357803595cd7e939525d06b19b4825e1b18c23762a89df3b102ba3901416db5ab27911a50bb78e07c2fbe658e593
 MISC metadata.xml 784 BLAKE2B 802cbe25eb9804eb0fcf6332867c9028695327fc96577ecd6bb608a125fa2f47d90a0afe9f634878e7deae7362e83fb95c753138c28ab733e1b8b743ccd77bc3 SHA512 c9c5f617e17bd3d25005a5ebf3c394939055f0376ef0e4e68be19fdffa9716fe2bd57a4d5b912cbc4d908b0498e189d484266872dd7afa41e5dfa54570b75509
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.0.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.0.ebuild
deleted file mode 100644
index 5263c0f25ed5..000000000000
--- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_BASE_INDIVIDUAL_URI=""
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
-SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	x11-libs/xcb-util[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.2.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.2.ebuild
deleted file mode 100644
index 7094258a3ec7..000000000000
--- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_BASE_INDIVIDUAL_URI=""
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/"
-SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="test"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	x11-libs/xcb-util[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild
index 7531ec4172c0..97a2a94bdd05 100644
--- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild
+++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild
@@ -14,6 +14,7 @@ SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
 	x11-libs/xcb-util[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index b1c5694807ba..7a4a605df8a2 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-0.4.0.tar.bz2 297412 BLAKE2B 55970cddd8d4bfb313f5d6e4ea82a169a90311c1c0bb5ebf796ac1ceb1d1e1baea4268dc37bd8adf557514a752eec9f957ad3e3e0747384f2cf6e1985f26247f SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e
-EBUILD xcb-util-0.4.0-r1.ebuild 1168 BLAKE2B b54d56c4ce29b23565c5d9a2e8d405710d390c671f0ecfd6a77e8d277c9efa5dc0b926c1516105fe68fd062c2e0223270e8b820adbf673e46acc5979e0a89878 SHA512 92173e408e8b11df4448c98e3399c1933a1fb32118c9cf91b7a88622051e04205a5324043b2ab2d4b9ba874c038604880eedfe845d4824e6386de9631f954b3d
+EBUILD xcb-util-0.4.0-r1.ebuild 1195 BLAKE2B c63700b9db3a4e075f6035095eae91ae66ee3411cc024fdb351f0a63df4485556025895373490cb0dc5112b338ee035ad85b92454669002f3e7c340d2f9243ed SHA512 ae1cf33ac90c85c2827961ef4c578c01b2b16198b65c35f11c864a97398d3e85a7cfefe4e4678eef4997797b3240ecb14fff8eef1ce6978c70c0ab0c07d7ff94
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
index c026a21ea9ac..ae0639fcfe89 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
@@ -16,6 +16,7 @@ HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/l
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /x11-libs
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)