gentoo resync : 21.10.2017

2 files changed, 65 insertions, 0 deletions

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
+}