gentoo resync : 02.11.2017

10 files changed, 69 insertions, 181 deletions

diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index bc594b4ab74d..a4c7e5b8df88 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -3,7 +3,7 @@ DIST libXfont-1.5.2.tar.bz2 530367 SHA256 02945ea68da447102f3e6c2b896c1d2061fd11
 DIST libXfont-1.5.3.tar.bz2 519793 SHA256 ab85c10fd2683481dfef672a77fe60e6a2039558cbc0e9bf56b5e1df471c93d0 SHA512 e7c8a09c4d174129e5d550194d3c3dc2b4abf797e52fe588c6002920727c52cf33b7db8d07fc69c2987e766d3af2d6ddda72f0c70eb21b135c691c97656a81b4 WHIRLPOOL 956af4caed82144124499f7d132a7dde21d738c3048e124b3007be65be6e093cb1247a4af24c36a1c6ef1cca52e96756c95d0b3db1940efd147fe8499378311b
 EBUILD libXfont-1.4.9.ebuild 825 SHA256 5b3dc24e49b3449c7619a7863ad375e71e3dd121deeb244a0a3d2435d066c37c SHA512 a55701a7daa83a3c66d0f81101e3ef0e2f90c13d9f21fd280ad8c202326b47e2837cba8eb3bb196b4d7f23d3b8df63be5629b64078cf46a1518a31a962abbff9 WHIRLPOOL ed29dae1a46755f17f1ef7456dbfb130427a608a468b1e29780905ea6151dcc1cc16b5ffaa2e100b647bf8fac5d82fc86380719e8691c01fd52fbeb9fa8ed549
 EBUILD libXfont-1.5.2.ebuild 868 SHA256 f3e12148c4cdcfe8ac3b01be33afe898f5f7bebc870fdf6378f6c92cd43265ad SHA512 bf29ce3df705a3ac6072722c520da24b838cc93577267a27491f1121ca2aa6bec548f1cdb50c92ceb93ffdc12b3914df92139a7839ca19a4ebd20cd8eaef698f WHIRLPOOL 7c85e7287508e208f32023d4fbf28eefc4751fc12d8af80926c9bcf05a125194c60e1bc5774f137fc6ada619a83e868caf2dd016613591cb50e35395dc2bf594
-EBUILD libXfont-1.5.3.ebuild 871 SHA256 0f6d3e581131889a1001ec7b5639220949ee893e50ad50e5a7db963c57290617 SHA512 3b0f09111e5ad0a11b1f4199829a10ca35439c83a1975cf66945414b6dbf3b86c755ba16df0fd1c3ce30ef5e8ad73872a1163e573c70fda4e321c2fb53d9cb58 WHIRLPOOL 51a285b6f79a71192a871893e02bcf6cded5243fe4bc257a12362655059a72699559185a8227ecabd767a5e068ff1abc99a026c63cb6d1856c4a5b39756aba22
+EBUILD libXfont-1.5.3.ebuild 870 SHA256 7c031784f66d3585d12d9f3342d67bd7cdca4752753031a644745a755acdc091 SHA512 fcce3e40b1b2c31a98b7f69cdddd33113fa8bc65d5d4597563bd012d2cd18630d05c84c40083fe6f46700d115a20ff2b3f6ebd99c3eaceb38031a9ecb0ae8e5d WHIRLPOOL 37719e35361a0d865677b51e99674c17ea060892e055196bf7ada3ba314ff88fdb7467d4e037c525a1c8deadcb3577855dd5349b08c82eca84748d773d74b0ea
 MISC ChangeLog 2614 SHA256 e7d8991fdf45b22339592f5121acbf852bf6a2eb31d4e443daaf6530a37921db SHA512 e8c7e7b5a5401692b5d198a6780a0495af69a5bd491137230b22578055e5fcca53f0c92af6e69ced3b47df1278fcce61d45fef083b9baaed81d8cf027acaf3b8 WHIRLPOOL ddb4dcb927c51fbb194e603594f9c0743392a856b5e49f737a14101e2d56759860ce856ae92ce4ae6449994d14f4751e78f231fd13d44b6c6c4964ccee1ee8d5
 MISC ChangeLog-2015 30579 SHA256 79130e72d7d8d9d09b93e0bac7a7c13312b36bdc978ac00020c6c10c181fe223 SHA512 3558560f9a19d1ee228569baa41990709fb5230f9bb60ebf8709a1e344df8263d8274cd516e23ae3e62aa713cb341798bcaa36d33f99de2a6c3e11674248da4c WHIRLPOOL f2669a53caa00ada7cecbb7d64b15e0e5f50952cd812e93d03e24af49786db318935a768112472b6af37eac094899cf44b1d5eeb6e60c7f0c57e7e030391c606
 MISC metadata.xml 475 SHA256 a50b5ca3973b98cbe9bee0d84bf5dd9d6d582ac3f4db19330e42368809221109 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852 WHIRLPOOL 7bca65639e5c11e4310b9e4e702cb47ddfc5d769d235c586ec97110e2e960f11b4bdea448dd7e525f14ba809278fbad25270fcad15c367a7a7f390643358b124
diff --git a/x11-libs/libXfont/libXfont-1.5.3.ebuild b/x11-libs/libXfont/libXfont-1.5.3.ebuild
index 49df73e73ae4..d3922c84f7fc 100644
--- a/x11-libs/libXfont/libXfont-1.5.3.ebuild
+++ b/x11-libs/libXfont/libXfont-1.5.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 6f80e6f6ceb4..91826f2271cf 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,7 +1,7 @@
 DIST libXfont2-2.0.1.tar.bz2 472822 SHA256 e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e SHA512 5e4dcb587b4d25dd41124bb50d71c30b5e29663ce675b0830def82fb6e00b64ba34e1b1ed7fad947fd0da95007aa55d14f587383e4cff08c3e0a0241c8879d16 WHIRLPOOL 305b33b83f6bb3c5e73e39f8be597e0d0934d5ed190691b141bf792987cef6b50ee1c31310b955eafea0e16869d52378e453805cddf4e06c8d172385ccc81228
 DIST libXfont2-2.0.2.tar.bz2 476173 SHA256 94088d3b87f7d42c7116d9adaad155859e93330c6e47f5989f2de600b9a6c111 SHA512 d62b0c3d663a2c668796cca8c6c2a90f83feeae1253b7d946668d33502cd8099c963285b88db4f745efb0d4ff783c118eb3d84cb8e6e1724586e1ef2be23e593 WHIRLPOOL 8e04eebcf81bfcbbd02af60bc047551c30379950b50b3e9d284c918f9241fa18885b5172a416d04cfa6ff44637de1b69ab5cb51e7af37354e0f23e9a052f7600
 EBUILD libXfont2-2.0.1.ebuild 833 SHA256 5cc05dc427e71cf247870d357e79806abaa75b195fd791264dbca830f9bc0f07 SHA512 79693fcda9ec5c9990d28371a6817ff79c2bfd6a0d18b48b070e9455fa896e21a2602c7916f474dd1cd060f0d5347e5d4984fec7c74e6350556aad94f972c9fd WHIRLPOOL 9cf4fa661a4567b451f03795e7f9c8b041805a37b98c3444b14ae7dd7a83d6f853fe90dcf0558d377675a5885f3a071ac5a2887a2fedff9463440b82c56877e7
-EBUILD libXfont2-2.0.2.ebuild 836 SHA256 412f3a6c7fb50353dc25a3428053ba2c2211310a600402a10fb8921191f4db1b SHA512 c5e1b2558d210db04b8ee7223ce5f5b74f46cc366a7f4470354b5f793d8fb95cf66e717964056c83410c1879dfbc3a2931fbac713d1b0850fcd7f6927de1ef82 WHIRLPOOL 7708a3302bee48954430d0b4d87f400d205ae1bf9aa5682fea9931661d5ccb9751e591a96607893142c39aae93ba87b4b52b2f8426659bbce10ee49d0af5ceec
+EBUILD libXfont2-2.0.2.ebuild 835 SHA256 a289b62fa56f9f333f4f7ab8c4e40f831a9ee86f0d9fbf3e12dffd22b10c7ef9 SHA512 bf30f3509e49eb6da60b2f1d63a6f92f4a60310b6c0f346889b0fbea6df1552e0be1617d20af7933b240327a42373ad0e7336733b45cf17fb49ea62fe80a749b WHIRLPOOL ab8130796cd5b17fe2e201bc033d0575c3e72093b32e8c65912d7339893f4a93709c851e540f0bb890107173d6221802d33c394663931774ff30c87b9aa2cf2d
 EBUILD libXfont2-9999.ebuild 708 SHA256 12d8b9d6f84e979df9fcb44881ae063cafe60db98766f9851e5cb5bc59234e7a SHA512 8056ae3ba2f101b84534c0b3b41e609e11a5673d73a4d135501295c198a0f58c2b1e67e7f7a0bbb4a6c565cc67dd7c9c799d68ea190c18f56d238d6b8f8697f1 WHIRLPOOL 48dd14d2760caa6ed2acc8996401e87c97ea80941e4089248b82b9c28d4ec5b9f6b50e3c9270b56934005d5f4c5d379194863559238a558c10b901de697cef99
 MISC ChangeLog 821 SHA256 2321434d8c275290513cdec74f8bf70440ec93da094bf4b77759f11ed6d03018 SHA512 1bba91fe37673341c61ab6916530753c69dbcea29ea5e47a35fe0fa51cb7e7b23146928c61a9f78ffe66a9253583c5be720d831d7750b01b91b7e9833c835b3f WHIRLPOOL 42fbefe010b45dd74ff4270f75be044e44f8ccd18af786964f18b84d382411ee4de7398465ed795337489f283878296ca9a0f78629f96cb9ddf70e821abecf48
 MISC metadata.xml 475 SHA256 a50b5ca3973b98cbe9bee0d84bf5dd9d6d582ac3f4db19330e42368809221109 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852 WHIRLPOOL 7bca65639e5c11e4310b9e4e702cb47ddfc5d769d235c586ec97110e2e960f11b4bdea448dd7e525f14ba809278fbad25270fcad15c367a7a7f390643358b124
diff --git a/x11-libs/libXfont2/libXfont2-2.0.2.ebuild b/x11-libs/libXfont2/libXfont2-2.0.2.ebuild
index 3f407a183657..83636d0082e0 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.2.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 02b9d9bd5be6..226555f55753 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -5,6 +5,7 @@ DIST libdrm-2.4.81.tar.bz2 786276 SHA256 8cc05c195ac8708199979a94c4e4d1a928c14ec
 DIST libdrm-2.4.82.tar.bz2 754053 SHA256 43fa2dbd422d6d41ac141272cc9855360ce4d08c7cf7f2c7bb55dfe449c4ce1c SHA512 e69fd8c2b392daabbb3a548179e3a21a555d5174c11d76a288eb2a08850849aa867c7777b67798ec00e026e998a3b128c22698f05a7b44eb24cddc5c8a3a02d0 WHIRLPOOL bf600559faf5ffe45b6f0192a561875e5284ea76d7611724c2e7f21e6f8aaa6d2e368546102170cffb713bb37fc4c5f98a08b6828e4f6f48f774d7b9b9d96906
 DIST libdrm-2.4.84.tar.bz2 794348 SHA256 7ae9c24d91139ac9a2cdee06fe46dbe1c401a1eda1c0bd2a6d1ecf72f479e0aa SHA512 860ebc5fa934edee97e9e7e13aaa2f2e70a68b946f4f3893cd7f93b8296c10b3cd4ce4c23b1676eefe375286e6e2292b96e917d7976f65c61da3fa661e5e641a WHIRLPOOL 8984374145694034626d6ccd15d72123989f5e8a127922dd0be5ae26866f8ef9179617689bc75d9a9170bbc55419c7cb2762363e700e91291a78dfb7df740dc9
 DIST libdrm-2.4.85.tar.bz2 795471 SHA256 64e4cd87eaee38ae60b2984ef02b66159b9bdd33030040db2a04339cf15f6173 SHA512 c13b266ca2efd28506b9910306db4be378537dc13229b4d4d8f525e224d0f6a2a9ce326b9ae37dae1d716ae81c9c3bcc88d875104d567899e5854da3c63aa147 WHIRLPOOL ed8f0edf717a09d78d2a2c9d33e806d1eea024a0357c68df5aac684de8587f0ddc437bf03be078062600c0d9d7cee1b4bf8af625f1cea5155b2a6d621d803c52
+DIST libdrm-2.4.87.tar.bz2 796368 SHA256 4c1c5293bdbfa248e029d3e6446767e17a3208387a719ec9da2d20c19849ed48 SHA512 9ce259d38eaffbcaf82a6975ffa513307da6750bcc31a53cade5717f854151b0e7b6d4ce25c0b518cab5a542c544d5984329f216dc4cdc9369b4adae19a68e48 WHIRLPOOL 28a188da6652a9e02d0421ee50ba8c4d46b41b4d52563a39d4d1700c25da77635cccc9afbfb5573dbae07a5d53233f977a976be8075c5126344cdbd10dff5251
 EBUILD libdrm-2.4.75.ebuild 2025 SHA256 2855e3112ce8532496a8289124ccd79b33e829ff460f1b024287149d987feea9 SHA512 8d7a0b34900c817d14da26817ce0df5e3edd961c21b3d8935463bc55110ada6947db1db1205a99d511c3c6abeb3945a38cb40b30e00744aebee342f6b6e85fb8 WHIRLPOOL 20af1655a3d9997d5e82b00451cbdc9d6ef5cd4bd14f94545b9f9b55725f41c34240e593ff5206a3e0f2d53e9e6a685449f799cef2ea100bdf248517658ab35d
 EBUILD libdrm-2.4.79.ebuild 2034 SHA256 a876da26b0bffe7155ac14482a9242be011b1e71d3fea9daa39e2ecba9292a27 SHA512 9d8d83f85a204ed6859affbaa80413f399eeeb5b9981de542cd301e8201136325d1237d0ef74682381f7441e9dace713bef5fc6eb00addf27b37bfbbd3cac70c WHIRLPOOL d3448d0e87f099ec43c28efe56670954827b079c1380dd440cc7d2d0bdeba483d40599a41afe7eafd33cc98cfa63350fead9bb7d4aefdfa18592e898bbb6dec2
 EBUILD libdrm-2.4.80.ebuild 2039 SHA256 70b36a071847c0cb058f1f8e2ab8dfe456b5f0c55e86d7acbbb4c5b7da16ba2f SHA512 2676f7d59c5020432269cfe7450b8b544e73478e9667c0fb7627fc5d09d662675e31218a70d8190a0426381688a7e8d30afe2d3b957a2cd04395540e097913bb WHIRLPOOL 8372438e85786af109efb3a003d74dc9378fab2b560acde1cfa815ac40899e65c98760565d7413b54490edd68408fab61dca472e1d9f282ac68e8fdad07ff7d9
@@ -12,6 +13,7 @@ EBUILD libdrm-2.4.81.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1
 EBUILD libdrm-2.4.82.ebuild 2043 SHA256 4d71f4a888a8b1f90c663d51c7a734547f6859d0f1fef102b0d9693905fa46b4 SHA512 d8615d86466c9d0662fb6e5ebe6cdc6de672e53c631312885d4ce228320d4f73c7f67d8afecad5d34a80ba73cfe1a0dbc2490e1823d86c59ccbfb4c87bfa665c WHIRLPOOL c643eec75808a5606cf891b48acbe2593529b26958610b7c31795353dc37764bd0d6c9d4cd75fa50e613e9fd10b689c2cc731f453881c79b20522eda9aaf0655
 EBUILD libdrm-2.4.84.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
 EBUILD libdrm-2.4.85.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
+EBUILD libdrm-2.4.87.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
 EBUILD libdrm-9999.ebuild 1913 SHA256 a1a99fe8335f4dd1da299d84b2b9a536c1696812acfa8c2297b55857fc1c9790 SHA512 838f1ee18aba8bf9a31fe3b81300366c63fb7d34d386d5cdcea9aae23241c01d40863f80ecc84844867b72ceb30a9290558311c2302a88a3fdbd933bb5bad531 WHIRLPOOL d19ff320a2d73409063add688ae4cd547ca34bf2735123ffb2f9b07b010af751b6d0fe02e23137224ed427c3652430a2d68d25c185f1f806b3e69bbc89b6f06f
 MISC ChangeLog 10565 SHA256 0b5bb6e232fdf4da3f832885a9cf2a5941688a40b79fa11d71304a2d60a428ff SHA512 8072f0c334cd09fcabaf4989fc78c3e1f3455e5dca52ec0d71d20c4e74af2dd0464ec8240a32c9f8ac0b16a302b375bb542decf48b84465c88a7dd5ede2c1f2e WHIRLPOOL 48e58d54d58d7c1eb0ce4037a1dd8f3a64242c29fb4bdf29981ce0de0c38691e1b3bca4ccc3523829cb93ffb996efae76e87b980148605de0a3c780dbbfa7f9b
 MISC ChangeLog-2015 38773 SHA256 cd87b1d64a1a2aada2ed0a242dbf4b62a3af4b0cc1a203b6b078dc118ba8d12b SHA512 63c8986631498686718705509b75f5af6e25604f0336b69688039266e3bd6cce959f7b386081e02004e81cd88f7a41821b277bde235c422b4e60d40ea5d91e6f WHIRLPOOL 23a859dc9ddf9920a90a2e5d700c2d003207e20d6be90cd7f82998f0254370c451827c446564699443e5917228b0d84cd6557e41f8a8613c815fdff331a7252f
diff --git a/x11-libs/libdrm/libdrm-2.4.87.ebuild b/x11-libs/libdrm/libdrm-2.4.87.ebuild
new file mode 100644
index 000000000000..b8477e723d2a
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.87.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+	epatch_user
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vc4 vc4)
+		$(use_enable video_cards_vivante etnaviv-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 536539b7813c..632aa3bab95d 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,17 +1,11 @@
-DIST pango-1.40.11.tar.xz 854372 SHA256 5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e SHA512 e4ac40f8da9c326e1e4dfaf4b1d2070601b17f88f5a12991a9a8bbc58bb08640404e2a794a5c68c5ebb2e7e80d9c186d4b26cd417bb63a23f024ef8a38bb152a WHIRLPOOL f1985fc2e4763a49e29e69337d086f9ae51464db4efe4cb2bde72cccfd9b7fc83fdb8d4fd1cb2d0f0ec2fd6682622bd84515e91e45a94ba87dfe6c6e3af6c2b5
 DIST pango-1.40.12.tar.xz 856228 SHA256 75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994d1ade97c5603e2d1f3161cfc SHA512 772792edac9ab5b6f76617cd3512432ca6b9af1d5ee6bfb87d0b60293f560026d479df059da66f53ba567f916a275e82f1cdd17ca75bb0da7ae2a79d4a75ed6d WHIRLPOOL 8c0a64d15dde5cdd578ef16f19b4154ac0bc318f6bb8b280ba0ce53a9ea499d7ebcd6058b8a235ea9afde562f9b737734e988fe3cc25cd8b96bad2d36ae0e9cc
 DIST pango-1.40.3.tar.xz 1061044 SHA256 abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3 SHA512 ff82395e8487624dffe212975b72b3383dcebb197a8675c8b409665e3e2e30fc23d9a6c25c3129a115adb7182b2a71a49550dbe881eb7ee9bbc572de6ba18d27 WHIRLPOOL ba160e7a9f5ecfbb4d88f780b4a9a5f555f38407d4f50f6ae0b0d276a3d4100dce4af519ceadce8b95c3432976af4409e119cfd18bd7c636d70e6c33ed7c5b4c
 DIST pango-1.40.5.tar.xz 1065152 SHA256 24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9 SHA512 40e8bf85dbb4b6fd35da3acec06a0d2b9dde95a3c5a212d243dbcbc0d00f12bd061757a04cb2f4a8db61329efd7ed9be53e3f5d6a2eb2a3defba1d12f9eed43d WHIRLPOOL 8d8eec25ba18096ce9c5fae2ce9f1d54e908784482669daa8f505863f7b5529c50fd432fb93c3d8d6bb3ef2ac311c59e68667393dc0442335a97171c480d2294
 DIST pango-1.40.6.tar.xz 832040 SHA256 ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573 SHA512 d916b364a77de3e68779e6d841d95bca456daf89405b92eaf51dceef093a9761cbb6c48f4c2971dec47c0bbdb645a3f3f4fb9af425274bf1d1822b278575e1f7 WHIRLPOOL 45f32e02007c53f079499c5d4b92c67ed528e3c2108f414b3ef18b53c8114a8fe2ae4f71707ecb977e224e86a5b05d8e048f39f8deef41d6342194b19a84d6e3
-DIST pango-1.40.7.tar.xz 841268 SHA256 517645c00c4554e82c0631e836659504d3fd3699c564c633fccfdfd37574e278 SHA512 225175d23053cf96657f572a44415029c00a76d8d8a82a3d146ee678984aea36492518ed327b271d30826777674d9b25a770ea9b66d7eb025883022c0ea7d58c WHIRLPOOL 990af8f086da2c6118379bfcd2ab178dce58998e4bdf9c70006f1dfcdf8470655a71251e009e7384743de573d8be45f56260bcdab0b065d7fcecef0650d2ca57
-DIST pango-1.40.9.tar.xz 850840 SHA256 9faea6535312fe4436b93047cf7a04af544eb52a079179bd3a33821aacce7e16 SHA512 fcfb6f047dbc1b265447beade2880c4618c1f8ec0111c2191cb44866407dd95fcda662e56f568fd95c47ceba90340346e57ab51413e459866518f1d35173eeba WHIRLPOOL 1642b720c4bb15ac2583c7928491c1f207430434420c182ea843497c844410067dd826c3c687c15c7b23a4e4a248199784e311107f2e33cf2f42086183aab597
-EBUILD pango-1.40.11.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
 EBUILD pango-1.40.12.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
 EBUILD pango-1.40.3.ebuild 1710 SHA256 c8ef2c66ac9ae7e509a043b189d90d9e553b4feb447c909f4bb7007853835cc5 SHA512 6fbbf1ba010f5d5d527822ff2f4f43a6184dbb61b4c3c9e61507bf65c17f815caea1bfa8793dacd7f902d0d42c66d1beb31ec66ac70452730b6c1d08f6a1f139 WHIRLPOOL b5888c87b1ecdc4ed219bb10fbfac97684d0d88d262d42bb2dfd9ebfa50424fb8c5a270716318e57010bc3bf072e3df2d978ea50d9e927be81dc22cbb1bdb981
 EBUILD pango-1.40.5.ebuild 1702 SHA256 ede80a0661b346b4162753e918b15951fca82eed7244c84eb08f9f0fa232e2b4 SHA512 7111f759d6202669fae7a881e298a30962ec2a07184a566ddda64e5f681923803ae60d385b2cbabda05dfbc062de44c3962176ad6ce37aa2e11b7a5a2cd9e1be WHIRLPOOL 510e51d5e24e32be3dcaf8534d14a3d320b5d955fa3135a09b750fb15e811b1cf81ba8e61ff604807744fef0d70dc6e33221c6e27f36baf579eb2a01ad37af4e
 EBUILD pango-1.40.6.ebuild 1702 SHA256 bb0c6e1b23d28060a807fae275e0423bc84a8491094c4344d782a32c839cba59 SHA512 81d280a89db9f79c26c6472247cf373f250eae38861b1105e4ddf7ee979cd0a55bff8aae9ab34cce6a590d72573354d5662bfd16707015dde3d3abeb693f3d5b WHIRLPOOL 3cf805331fd5acfd0e470019094cdd3e23ff3906b36ac6236c364a5113d761434e488565bb6a5613e20c723c2391cecb77d1b3c76988043603f7f96e305a16cd
-EBUILD pango-1.40.7.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
-EBUILD pango-1.40.9.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
 MISC ChangeLog 7537 SHA256 7c240545b3057191c8c21d869e75f5e9adbb6b08467ec1f2e06eefc99f6f291e SHA512 f6a8f82ce7c1ca396fc2381b8659f7cd010ede8290f4b68aa6f36f2fb49ebd26436cc38b8d7215e7db96881c7df71a951a6d6908e3ef4781bcf468f7bad711db WHIRLPOOL 4a10d6f548a5be7da38d1a0ea15f11c13af930c07ffaccfc3151ed1151f8edccb2a7ac144cfa2883e3547897237175b7bc4821a1e4182888a42622228f24b4a1
 MISC ChangeLog-2015 55303 SHA256 d2425a236b8e768ab4026f52c3ff754c0c90fbcc916f2c912b80b5687f992bfe SHA512 afd5a358a1e1304c7e25508691ddc607082de989f9178305600bb14d8da65dfb4c71b55eba358a8824afea034f90d88f005569ad0169ff6dbdb5e1f3e6b9b324 WHIRLPOOL 4be71330b75a50197fefb6797322dd8f2c883494c432d6a572dee714ae56cf3966ee8b208d17183233711905329b90fd3e29798a88014474103ed64923c53bfb
 MISC metadata.xml 412 SHA256 ae0b5d751de8eb7b3896f1216fd5596763a4f1d7c1130ff33ed8a97f720cc1a2 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e WHIRLPOOL 451263c524b780e6696a0c8cf40f6797c29549493f49caffb70508e3ccca12af3cb1365d25c742dd228c34c5b1c1800bbbbfafaa083627924f949922328f77e6
diff --git a/x11-libs/pango/pango-1.40.11.ebuild b/x11-libs/pango/pango-1.40.11.ebuild
deleted file mode 100644
index 0b59c658a54d..000000000000
--- a/x11-libs/pango/pango-1.40.11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +introspection test"
-
-RDEPEND="
-	>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( media-fonts/cantarell )
-	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
-	!<=sys-devel/autoconf-2.63:2.5
-"
-
-multilib_src_configure() {
-	tc-export CXX
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--with-cairo \
-		$(multilib_native_use_enable introspection) \
-		$(use_with X xft) \
-		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
-		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/x11-libs/pango/pango-1.40.7.ebuild b/x11-libs/pango/pango-1.40.7.ebuild
deleted file mode 100644
index 0b59c658a54d..000000000000
--- a/x11-libs/pango/pango-1.40.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +introspection test"
-
-RDEPEND="
-	>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( media-fonts/cantarell )
-	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
-	!<=sys-devel/autoconf-2.63:2.5
-"
-
-multilib_src_configure() {
-	tc-export CXX
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--with-cairo \
-		$(multilib_native_use_enable introspection) \
-		$(use_with X xft) \
-		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
-		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/x11-libs/pango/pango-1.40.9.ebuild b/x11-libs/pango/pango-1.40.9.ebuild
deleted file mode 100644
index 0b59c658a54d..000000000000
--- a/x11-libs/pango/pango-1.40.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +introspection test"
-
-RDEPEND="
-	>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( media-fonts/cantarell )
-	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
-	!<=sys-devel/autoconf-2.63:2.5
-"
-
-multilib_src_configure() {
-	tc-export CXX
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--with-cairo \
-		$(multilib_native_use_enable introspection) \
-		$(use_with X xft) \
-		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
-		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}