gentoo resync : 22.05.2021

4 files changed, 118 insertions, 6 deletions

diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index 71810dcee82b..4d2177e7dac0 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,5 +1,7 @@
 AUX 1.25-python-3.9.patch 687 BLAKE2B b0abe02391df5bff2e1de47f1fea220a5dc3b9b9b0e8cd0bf7f17a7b96bd4879412c95daf2e824cb18a46ca95fae403050db4ec9054affe0a8bb10fb805383f5 SHA512 55aec8584771723fb96d5361f4588d2a1d9da1ed30832bf77a85862d5030e5a2c0e6149e3c899e2a536b7b1a252a6537fd91d1d0298eef3affa08696c220776f
 DIST igt-gpu-tools-1.25.tar.xz 1425652 BLAKE2B 1dd17e8542c126d356478acd07344d8732013a24fd180064d6f2277be76170924e7031fd2529b2aa054b40d5093d9cd95271e156bc6b97a75158c84de142f1ba SHA512 a24ee46092241da26fc2dac2b9b54c9f16f7a408c8740c9c7209e876929e2908a36261ba258ca4a4a4e4a21c1e9c919457bf98d514f81d8b7dbfcf5f89a74daf
-EBUILD igt-gpu-tools-1.25.ebuild 2462 BLAKE2B 1e43a538ff075d43501d925d4eb5ce8ff4968ec8d1aa98cd2444fa7f68cee117239c1fe289e62587012e8ec3ebdf495d66f202c1daa89b866cb80d068008b66b SHA512 aebf56bb749808b8e76d9d4282c18606ba5a6d595473a5b7e71a03233f874807d2563006c37fea6a9d31176421cd554c5affe84a8159ea05f18d32ba8e8dcac4
-EBUILD igt-gpu-tools-9999.ebuild 2412 BLAKE2B 4c39dd0e40dc0fee05a6ca778b99fd81c1841192944323b85703182d91778e9220448c6a9883a1f6ce812801c84e152cc632115be52197536cbb67bdf09b6c94 SHA512 e9f77e2cb65a3a09cf7f3e1d6b460fa24c34b16ada0c439b6d6c2b0e183055b8f13c6ef0bc7b0280186e791e6e5e33488ee222ad484db5e5c07276e0170f83fd
+DIST igt-gpu-tools-1.26.tar.xz 1573468 BLAKE2B 31fa9cd61fd9a120c72e78cb5ecbc686477ae82572c702bdd6bbc11ba49dc052b7cf52fa486b93e51c87389d73f892577c1d22ebe71d6f50b1565f32355021d1 SHA512 6eb67f68da1c79fac61e5abd57433ef51dbeb2b6f0923dc84aefb81d7059fbc94378fadcd7321a8f059edd9bac640032bf53c3aa058cf570fe5c31924396af8f
+EBUILD igt-gpu-tools-1.25.ebuild 2535 BLAKE2B 0673e15c7e166b666161cf8eb33ed205d4483dd2d800ec43cf6707f3a3a15f8ce1b4ec000877787ad4f52ccce06d889fed1c27ff48dcef6bf4099a787aed5d08 SHA512 faffb919192214282f6211fc30d38b34a2bb2e62c883091ee01fc4fd2bf822c926714205d3da5ec3bceb3ff14536c003fd559b147f6edbb7baff4a98d75f156c
+EBUILD igt-gpu-tools-1.26.ebuild 2485 BLAKE2B ba2d914516afda130e180b805c871c2dd75d2306282402d7a1b65a5fb6e91182f587e3bdb8adf52a5942f96ac3e8714aa3dc1fe1eeca5eaeb4a97b67a6af9aa1 SHA512 bc06407c76c41b1b858e9e6b4d3d97512b95f791afc7a0b6c1e8792ea0915d02d9fc25aaacb29b3709dc5f60e961c14232e87507df34e7dbc9b9503fc67ff1a3
+EBUILD igt-gpu-tools-9999.ebuild 2485 BLAKE2B ba2d914516afda130e180b805c871c2dd75d2306282402d7a1b65a5fb6e91182f587e3bdb8adf52a5942f96ac3e8714aa3dc1fe1eeca5eaeb4a97b67a6af9aa1 SHA512 bc06407c76c41b1b858e9e6b4d3d97512b95f791afc7a0b6c1e8792ea0915d02d9fc25aaacb29b3709dc5f60e961c14232e87507df34e7dbc9b9503fc67ff1a3
 MISC metadata.xml 671 BLAKE2B 847c9a3454c616a473f104d0a01bb85333b90fdc2a72f5332d7f3964b5fc33f5c6ef63728ef35f1b493db6ca86a228de0724030f995ff80fcd6840bba74633e5 SHA512 55e0a7ebcede09e10972fe224d2f4ad85a9c25a1e688c281d6b962c70b0648e2eb850b7376029c309e19ef5b9b6b22d42464e59353208642e97f9cdf04e9a495
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
index 6bb31b86e9f1..3296899fe02c 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,8 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson
+PYTHON_COMPAT=( python3_{7..10} )
+inherit ${GIT_ECLASS} meson python-any-r1
 
 DESCRIPTION="Intel GPU userland tools"
 
@@ -72,6 +73,7 @@ DEPEND="${RDEPEND}
 		sys-devel/flex
 	)
 "
+BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=( "${FILESDIR}/${PV}-python-3.9.patch" )
 
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26.ebuild
new file mode 100644
index 000000000000..ff456add5f08
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit ${GIT_ECLASS} meson python-any-r1
+
+DESCRIPTION="Intel GPU userland tools"
+
+HOMEPAGE="https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
+fi
+LICENSE="MIT"
+SLOT="0"
+IUSE="chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
+REQUIRED_USE="
+	|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau )
+	overlay? (
+		video_cards_intel
+		|| ( X xv )
+	)
+	doc? ( tests )
+"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/elfutils
+	dev-libs/glib:2
+	sys-apps/kmod:=
+	sys-libs/libunwind:=
+	sys-libs/zlib:=
+	sys-process/procps:=
+	virtual/libudev:=
+	>=x11-libs/cairo-1.12.0[X?]
+	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
+	>=x11-libs/libpciaccess-0.10
+	x11-libs/pixman
+	chamelium? (
+		dev-libs/xmlrpc-c[curl]
+		sci-libs/gsl
+		media-libs/alsa-lib:=
+	)
+	overlay? (
+		>=x11-libs/libXrandr-1.3
+		xv? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXv
+		)
+	)
+	runner? ( dev-libs/json-c:= )
+	unwind? ( sys-libs/libunwind )
+	valgrind? ( dev-util/valgrind )
+	"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	man? ( dev-python/docutils )
+	overlay? (
+		>=dev-util/peg-0.1.18
+		x11-base/xorg-proto
+	)
+	video_cards_intel? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+BDEPEND="${PYTHON_DEPS}"
+
+src_prepare() {
+	sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
+	default_src_prepare
+}
+
+src_configure() {
+	local gpus=""
+	use video_cards_amdgpu  && gpus+="amdgpu,"
+	use video_cards_intel   && gpus+="intel,"
+	use video_cards_nouveau && gpus+="nouveau,"
+
+	local overlay_backends=""
+	use overlay && use xv && overlay_backends+="xv,"
+	use overlay && use X && overlay_backends+="x,"
+
+	local emesonargs=(
+		$(meson_feature chamelium)
+		$(meson_feature doc docs)
+		$(meson_feature man)
+		$(meson_feature overlay)
+		$(meson_feature runner)
+		$(meson_feature tests)
+		$(meson_feature valgrind)
+		$(meson_feature unwind libunwind)
+		-Doverlay_backends=${overlay_backends%?}
+		-Dlibdrm_drivers=${gpus%?}
+	)
+	meson_src_configure
+}
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
index b202d340de99..ff456add5f08 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,8 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson
+PYTHON_COMPAT=( python3_{7..10} )
+inherit ${GIT_ECLASS} meson python-any-r1
 
 DESCRIPTION="Intel GPU userland tools"
 
@@ -72,6 +73,7 @@ DEPEND="${RDEPEND}
 		sys-devel/flex
 	)
 "
+BDEPEND="${PYTHON_DEPS}"
 
 src_prepare() {
 	sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build