gentoo resync : 25.09.2021

3 files changed, 0 insertions, 136 deletions

diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index e1a9d84f0671..896ffaf3e0a6 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,7 +1,4 @@
-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
 DIST igt-gpu-tools-1.26.tar.xz 1573468 BLAKE2B 31fa9cd61fd9a120c72e78cb5ecbc686477ae82572c702bdd6bbc11ba49dc052b7cf52fa486b93e51c87389d73f892577c1d22ebe71d6f50b1565f32355021d1 SHA512 6eb67f68da1c79fac61e5abd57433ef51dbeb2b6f0923dc84aefb81d7059fbc94378fadcd7321a8f059edd9bac640032bf53c3aa058cf570fe5c31924396af8f
-EBUILD igt-gpu-tools-1.25-r1.ebuild 2539 BLAKE2B 592e7a6f9ba2d7dcbab7776fe226be1d5f4481a95375083ee017d881412217c8c6c7f1c036f08cfb26d8ae42b9cb08e142b2464ec8323f43c5237649bb87f453 SHA512 f5fde319ea0558f6827f09dac7aa330fe3d764c59d7b851527ca04b67613065bf4e6a404678d241708909e9e266675cb1f70ba6850c36c60a1b7edb49d3199cd
 EBUILD igt-gpu-tools-1.26-r1.ebuild 2489 BLAKE2B 768e86dede939ecb1abd954a655789461d26904f7b2df19d12b86a8ccf521bca715fc253e69dfb5d198a11d3a993d6ef27d9ed96ed3910f21a15f8fdbfdbe1e0 SHA512 e6f345dc0b5b59dc853442167ee166747857c6395221105bffd784f395c20b9ead84f65452efd1f79fa29b4f663b0757ec47916a92e52ab97e9985b664aa7919
 EBUILD igt-gpu-tools-9999.ebuild 2489 BLAKE2B 768e86dede939ecb1abd954a655789461d26904f7b2df19d12b86a8ccf521bca715fc253e69dfb5d198a11d3a993d6ef27d9ed96ed3910f21a15f8fdbfdbe1e0 SHA512 e6f345dc0b5b59dc853442167ee166747857c6395221105bffd784f395c20b9ead84f65452efd1f79fa29b4f663b0757ec47916a92e52ab97e9985b664aa7919
 MISC metadata.xml 672 BLAKE2B 00c8c12ec3f3edb3aa57947b00ffd68dcc3f13901e2fb090e217cc954557d1e13802f71dec233d07501ea88e24a5fa9c84e669b0bb5f5d36d4649ea99727991b SHA512 24f16d407f48f21d85cbf38337573fb711ded60283b6766de02923ebe5f4e86e6ff044629518bfaba64a9f66c87c6597233a7227145f7a827934c72754224fb8
diff --git a/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
deleted file mode 100644
index 689dca411e5b..000000000000
--- a/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-manual backport of upstream commit
-https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/201da47cb57b8fadd9bc45be16b82617b32a2c01
-
---- a/docs/reference/igt-gpu-tools/generate_description_xml.py
-+++ b/docs/reference/igt-gpu-tools/generate_description_xml.py
-@@ -4,7 +4,7 @@ import re
- import sys
- import os.path
- import subprocess
--import xml.etree.cElementTree as ET
-+import xml.etree.ElementTree as ET
- 
- from collections import namedtuple
- 
---- a/lib/i915/perf-configs/perf-codegen.py
-+++ b/lib/i915/perf-configs/perf-codegen.py
-@@ -26,7 +26,7 @@ import os
- import sys
- import textwrap
- 
--import xml.etree.cElementTree as et
-+import xml.etree.ElementTree as et
- 
- import codegen
- 
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25-r1.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25-r1.ebuild
deleted file mode 100644
index 7e5aee3e536e..000000000000
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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}"
-
-PATCHES=( "${FILESDIR}/${PV}-python-3.9.patch" )
-
-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
-}