gentoo resync : 21.10.2017

8 files changed, 139 insertions, 4 deletions

diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index 7b31b6ee3ad7..a93e9b842f8d 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -2,9 +2,11 @@ AUX goocanvas-1.0.0-gold.patch 848 SHA256 d4bcfc3f6b8c83fb4f1e1f1d858342382306d6
 DIST goocanvas-1.0.0.tar.bz2 570552 SHA256 1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644 WHIRLPOOL fb8592136bacf10d73e3aeeac9366c0614f8cd60e74a30d31e475b1ae9a1ac76c97b64837490f916733d31191a90c121ac0d60e077acef7cc61a861f5b57fde7
 DIST goocanvas-2.0.2.tar.xz 502732 SHA256 f20e5fbef8d1a2633033edbd886dd13146a1b948d1813a9c353a80a29295d1d0 SHA512 2b3014b832a5426884aa472fbfabcca171ef90305afccd312583d259517725a1839509e39b13b30c5097bf54ed9b3dfd2bf9eeca4e813a82d14cf1d5a54578ac WHIRLPOOL 714682b70d747e5db94140e5067e4df3c396332cab9f8b112141f39135758cea0a7e07405d796a70d81b95b76ce68ec17c58b317d0508dc413f2e6139dc39c87
 DIST goocanvas-2.0.3.tar.xz 584532 SHA256 6b5b9c25d32c05b9bafc42f5fcc28d55f1426e733e78e9fe4d191cfcd666c800 SHA512 e7db229d029906febc5cc8154cecfe9a7c81497abfb1cdf8e41b8135ef87ef7478dac60bd160adb0d6efbe69680be488c67e78497cb89b1ba295a407af04b786 WHIRLPOOL 8f94970f348d4abdfcc5411a9f5cac6a729db837c6b31693ebcc3af4aee15be898f1f973e58e20f2b6668dc6cc02db26cb9cbbd7f042e79bf25958d6e1a9ffa2
+DIST goocanvas-2.0.4.tar.xz 584272 SHA256 c728e2b7d4425ae81b54e1e07a3d3c8a4bd6377a63cffa43006045bceaa92e90 SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688 WHIRLPOOL cd91684ff57e928c10c7d99b15e296b9c392988a28995f2f0c44cb12d426cd24d5a93bcb8ce4a95299d8916a8cb54a1528a57eb7be52736889cdad3afe1ae16e
 EBUILD goocanvas-1.0.0.ebuild 1256 SHA256 16dd68c341f10b953a0fec7acbec199577dc3d65fb847ace340e13b392e2b88e SHA512 83729254a1f425bd1e953b4a69dec8fee7f8f28357c1e71e635c46b7b7615da090883c5ff914bea81825cb923b43dcbedbf793d842dc9fcd0df9ce577b08fea8 WHIRLPOOL 0f5c339ae64de706f1ace29e855073336aca0fdde8a84147a25b9375a60fcd4e85c896100e48849bae6ad0651eab9ddd49bd6749a83c58ed818142221b960158
 EBUILD goocanvas-2.0.2.ebuild 1598 SHA256 d4d539f0b8b6756994676a057ed9901446b64bc804e70cb08cadd8275c25e97a SHA512 3c3bfcba036750a75c294d1ba430a3e966e76874c4e678dfa5a8d2d3446ce66df259f653fb997a69dc7d397ff1d2b2fa0d0356a28ae8b284d50037db88f13e89 WHIRLPOOL c5bcc14d16989ef5c98231923481a64123acefef76f84ce74b215ae3e06356955d78eaeeb4723d3a11514e598b86af73839da5b65ae3655a08e7db58bfddd7b4
 EBUILD goocanvas-2.0.3.ebuild 1617 SHA256 b87f076361db05f6acc967a538eb881106d1e4ad2ab08ad593000789982d4f3b SHA512 d98cbc2076ad9113e93ced77f2288a6ceda157e3e6fa4552e471667a190755ca4947aa7e699605ff09c1c3f49fc55c7049dd5ebb1c9295f3d20ec5ff06659e52 WHIRLPOOL 438eb898adbc3d6cf1601523c6f6b08aaa5c9a5f5b83e3c59ea5c1ede68a8887e34d70f12d273c17933a94b240eadff035d8cbf2beaab389836421ce95be6187
+EBUILD goocanvas-2.0.4.ebuild 1618 SHA256 ceb39e23803f56eb6631990b73e66aedcba859dce37e751ad5e29fce07f23da0 SHA512 25b434c378fa68e4e7e0f3c93cfb0c569c440ae01115a5bda946fa4d253a991bfa9aef7be42517e887f933fcd010295e51bc07b8272f464ebd7ef04fae059f69 WHIRLPOOL f9d29850c8d96d848d2c471961bcb352c5f6a6b93034bfb3b1a1f08ca697c1718624b0f04c2c19776342aaed778d54974441e11a6e6ab4631842f9108cfc1f65
 MISC ChangeLog 2561 SHA256 d5697909195da2188cba57880dd76d71f889e2b3a3a559c97d7ca2a9356e0666 SHA512 df4dd1d72d07ca211160a96c4540645a7c48b9df00852c14a97a23ecb43d87aa1e800dc36c5e431eaf549be1f00123f90681b9fafac3771aa5c1874a0d3e2f06 WHIRLPOOL 00c3618620b1a633bb5ce78b09f18d577010b575f62daf5ff84181a2a030e1daa729231193010285781b397040546700def6115dc858800e386e88523f801747
 MISC ChangeLog-2015 7154 SHA256 73fd77644f9629c2a2034b94c6101be79573b76639c2d7ecd0f87c79901f1aa9 SHA512 d4ef4f158d2fef0984e0744b8dda39b23894a4848ed2e46d8cd7a81046efbab2fa24ba3628c76e5fbaffc3348ddc1095aacc04ffe63689f7a6afbaf6186132e9 WHIRLPOOL ef5bf60a0d33d52dd7971840c13942962b83af498376581b7c49cdbb879e3f227bc32617adf2e416a3f9da6a804b2df16352eb1448a26399660309cfb45ac07b
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
new file mode 100644
index 000000000000..868253609b8d
--- /dev/null
+++ b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
+HOMEPAGE="https://wiki.gnome.org/GooCanvas"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples +introspection python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# python only enables python specific binding override
+RDEPEND="
+	>=x11-libs/gtk+-3.0.0:3
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/cairo-1.10.0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.90.4:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.16
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not build demos
+	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die "sed failed"
+
+	# Python bindings are built/installed manually.
+	sed -e "/SUBDIRS = python/d" -i bindings/Makefile.am bindings/Makefile.in
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-rebuilds \
+		--disable-static \
+		$(use_enable introspection) \
+		--disable-python
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		sub_install() {
+			python_moduleinto $(python -c "import gi;print gi._overridesdir")
+			python_domodule bindings/python/GooCanvas.py
+		}
+		python_foreach_impl sub_install
+	fi
+
+	if use examples; then
+		insinto "/usr/share/doc/${P}/examples/"
+		doins demo/*.[ch] demo/*.png
+	fi
+}
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index a41d31ba95aa..9ae8dfb12afe 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 877 SHA256 cf90d1990f94a506592f13d873cdb16078071267bda48cbac116077be25febf2 SHA512 dfcef19b1f1422a1acd69df841010721613756cbd5051fc9032b1beb79ab4d4dea81fddf117e58ffeab5fd34764cde11010dad6983028d9a056828d1ac126cbd WHIRLPOOL 6f87c765b7c87900e50614a185082a60c0a08419f1cd4aee00b924a4b772e43b2fe796a86b4da35a80ab618a030acc8bc12a67fbdaed3024c6d100e939d61249
+EBUILD libXfont-1.5.3.ebuild 875 SHA256 f89de8a59c3d383350b64b5364155160f781f5ea52e11619e9b2eac322dc5e72 SHA512 fe91429024fd298af6a84e555eb3a31eb7c553f1be63149f558d6df5ea31da7dc0b84e7b0a139e834b314651ce95144e53a59df533b9cea00de79dfa44f3b4fa WHIRLPOOL 00172701b07a8746792682a0a69304070d43ed45cf483d6153dd65596500538b1cab8c0c541b7fe1833b418c6520be6691b054616fc0f11d9bbb4b391be56850
 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 30cc148e1931..8018df256024 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 bbaa1dffd016..ebf9e0035360 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 842 SHA256 86eb1cb75fb767202aa1a1e46f88406c322c00ec3ca891eaf8f6a06632da7654 SHA512 53d8a562af6ab7ff5b05db5d090298a3c5d30341458f73d46a08a2750d3a67887e02fb02491fa1bb3305ff1e7b7f2cd460d65174998d191a4e687a733f49105e WHIRLPOOL b33ed7de98fc4be51aa028c4d0634564e55fa10fe201d9402047c90c76387783c078e3061e43ce32ef5c4207d28fe9a6b1688f8936e97fb84116e1fe87f950d3
+EBUILD libXfont2-2.0.2.ebuild 840 SHA256 7bde12ebb1c2a212b6788b6864fc3df9e34cdc28de6de7b5eeea925cf9333f96 SHA512 573513fc810075d5821ff2bf1e4fac96e785b43afcf9a62c0f26117bdaa63dd730144b0585ec9b32d7a4d8cb6a896914581b1ba60a669da67eee02ed34ada6d3 WHIRLPOOL c979dfa6dd78bc8f9fc9c5a910c013ab76bfc846556392e443b917ac8c39e04d27d4a7d33dfa027b5d73cb49b84feaea3c2327743bfc06eb0b9e532295e32e11
 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 8dd2f474727a..9af70e64eb77 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 b20d8aaeb75e..07310f51ef04 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -4,12 +4,14 @@ DIST libdrm-2.4.80.tar.bz2 771243 SHA256 a82a519601e9cdfad795e760807eb07ac8913b2
 DIST libdrm-2.4.81.tar.bz2 786276 SHA256 8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae SHA512 5f7a1524acad59890d3f890bed90a660a424e18a88d587ca356223bde4a7446d1c540f97ec11cb10d2e7ed1b4ae86127957634354a1be6d04199295ab24782e5 WHIRLPOOL 2694fe988c7ebf34b30076a10dcb2d5ba8a24ddddb1ad348da69874814d64e78ad48f959275faa02fabd798ae214f386ef8437bdf48d485f77519b8759d695df
 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
 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
 EBUILD libdrm-2.4.81.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
 EBUILD libdrm-2.4.82.ebuild 2044 SHA256 2ced701893f3f70eb358ae4a710bbd6b6e5a5c2e367722be407c2b98dd7d1f41 SHA512 e886fa3500543eacefc525a62f420687bd90bdd56edf5370555c3b46b410c91d5174486ed7ab583c9a7736bd31a63550365111675d963a396ac4aaa422874896 WHIRLPOOL 13ef211af44b1b6950b7963fc22f157a982aa2320a12147d5c18b20bd1676fced1c960988b0da6aa78525ac540d25f11be8749b9304859ba6f27d3952bfc95bd
 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-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.85.ebuild b/x11-libs/libdrm/libdrm-2.4.85.ebuild
new file mode 100644
index 000000000000..b8477e723d2a
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.85.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
+}