gentoo resync : 25.01.2019

3 files changed, 80 insertions, 2 deletions

diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 318d5364a426..812299742a9d 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,4 +1,6 @@
 DIST libdrm-2.4.96.tar.bz2 829518 BLAKE2B d9a21ce31af65812c1b23968ef6c1901aea106b4cc68d76d3641a17b98423024b804bfda509862174eba98271bd7156c7f08d81bc0a520ea4a25c8e2e0bfd598 SHA512 008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b
+DIST libdrm-2.4.97.tar.bz2 837329 BLAKE2B b47393d81917a0b43c22f7798ff2e1c21a05fc716a63092dbe0e49cda0fe3bd899d5cc4d703ae49f781e283f5067c62cd37a4931362427e21c3356584cb5e810 SHA512 3e08ee9d6c9ce265d783a59b51e22449905ea73aa27f25a082a1e9e1532f7c99e1c9f7cb966eb0970be2a08e2e5993dc9aa55093b1bff548689fdb465e7145ed
 EBUILD libdrm-2.4.96.ebuild 2108 BLAKE2B 93712eaa89535583609141df925fea1adb0fc8a2c8b823f350b226a9e3da2e69d59f84e6710c05187bcca02de441cafcaf85a1b9b406f4ce5d76f92403354802 SHA512 92d56214c62dabc60c34474efe647e5b974fb17846bad4210f6759bd1d7b6c51ddba657121855368e1286d999bf7356809ddcb607a2a710c0c4ebd69a70132e3
-EBUILD libdrm-9999.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
+EBUILD libdrm-2.4.97.ebuild 2119 BLAKE2B 7ba7f825b0a221702978149560e67b012d516361d87e8e710e5d9588a0c0f1f5605ac4d7e11fafb9cd297c367641e1b077b2a17575b42c21acdc69b893c849e0 SHA512 92171812e0d96e0c7e05315f62afe14692450b6fb6ae7634dd7b6ecc2879712720fc3068af25603c834d97596aae9abd465ed9706b49b5258993cb8630c32ef3
+EBUILD libdrm-9999.ebuild 2119 BLAKE2B 7ba7f825b0a221702978149560e67b012d516361d87e8e710e5d9588a0c0f1f5605ac4d7e11fafb9cd297c367641e1b077b2a17575b42c21acdc69b893c849e0 SHA512 92171812e0d96e0c7e05315f62afe14692450b6fb6ae7634dd7b6ecc2879712720fc3068af25603c834d97596aae9abd465ed9706b49b5258993cb8630c32ef3
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.97.ebuild b/x11-libs/libdrm/libdrm-2.4.97.ebuild
new file mode 100644
index 000000000000..f376bc40fae6
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.97.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/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/"
+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-fbsd ~x86-fbsd ~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/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index ec0bdd16c350..f376bc40fae6 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6