gentoo resync : 19.07.2019

4 files changed, 1 insertions, 165 deletions

diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index 93825d18efd4..428ef1734469 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,7 +1,4 @@
-DIST igt-gpu-tools-1.23.tar.xz 1045716 BLAKE2B f5e55ce9b682f2a9f2c6ab73c1e8e933ebea09b343f3af02df50b5bdce3e2ac313b1f92709c6de0d9fc7ffe2e2c9dfa95d2918ae9bd561cc285cff30fe59c6fd SHA512 8697265a978359e28983f483bf95819844597fc2080923d15d0587f6d648081af27e8ea318873e20103bbf8446b9f1005c6bc90a6276d3169837abd181f96839
 DIST igt-gpu-tools-1.24.tar.xz 1207436 BLAKE2B 0b04033be0195a4fee5611aeae2f47334ce1de5df65c652ebc0b36d1185286268bb426f472e3c1311ff576e8184e7a4efb95ef3181006ed8c448ea76452940d7 SHA512 22c25e27ead64f561fe8f46b132d6c7562a90d7bff09dc2618a532b16d7b8fdf54ed94d986a45655657b54219d350ce1b1e6c89da2b6073024e9bbe0973fa190
-EBUILD igt-gpu-tools-1.23-r1.ebuild 2543 BLAKE2B 53e126ad1ff997fc352d502542caf53b186addba0794db766669e199b884a8102fa7252c59eb723c31c002105a5fd1b2c4c0090683b6d45d91e2252b9bb81161 SHA512 42a7178f56cd09440d2d535a0f9bfff6a30c1bc4562224c0d62bb1269a9dfaa787c1b791851cf7c630caa45c6debae6a926cd0cd9e1052406c4f7f96d4ad869d
-EBUILD igt-gpu-tools-1.23.ebuild 1480 BLAKE2B 96daf039d3e8d00c898c34fccfbf55254b954273dded0106b4585510d9a0f724553b40d4c3f6649cb008b80bcaad1975af6121e2198742e7c0cca0ead61a4e80 SHA512 b636e28baa9ae33bc971273c3cb165da041f36aff7eb2cd329d6e62d8b24938d749282674e072fb7a32e2220db068dea89258ae9b2554669bfd02968b79a8b87
 EBUILD igt-gpu-tools-1.24.ebuild 2509 BLAKE2B e5d7344a2cc59a3fe6f6e72abe3433fdb88344faa20b00ab11e7499b5911e734a983ea6cf64637f3e3e56df57c8a9fd766eb0832854ad2f30fc34ccf873e46e0 SHA512 2d50a2db3f8dd94138b0c7479b7a6dc5839efe4ac4c5e1cf5956db79cbb721f789d660f4f6620c8c201687e25cc6309b112d9ff2b28bde69c7fe1b964ad161ff
 EBUILD igt-gpu-tools-9999.ebuild 2509 BLAKE2B e5d7344a2cc59a3fe6f6e72abe3433fdb88344faa20b00ab11e7499b5911e734a983ea6cf64637f3e3e56df57c8a9fd766eb0832854ad2f30fc34ccf873e46e0 SHA512 2d50a2db3f8dd94138b0c7479b7a6dc5839efe4ac4c5e1cf5956db79cbb721f789d660f4f6620c8c201687e25cc6309b112d9ff2b28bde69c7fe1b964ad161ff
-MISC metadata.xml 814 BLAKE2B 361429b06051651da503aaffc4dfd632f1eebc24a1968d7945b86e1a7410a78eb4ef50458dd8d42041b2ad2a18dda4a1b9c767a57c44fc3296717f27a2a64a9b SHA512 094b5cdc37051da14c48bae7a714a29b15a40488c10c0d997c168ee3da16a911186555130fcbd4592c9fb4b948af06a3a00afc2d36b7af9f194c7c801d80e2d0
+MISC metadata.xml 673 BLAKE2B 02cde7d4028a16cef77b898e88892e8d459f058c4894b8b738cd4e394562cb9ba529ad20d2d25e79f2f6ac8720ebba5d41ec1439abb7399dec9b743cb6460041 SHA512 881ce13108dbc798afd31e68fdbcd9d4cf7631f0be5776bc9eeb6c9948f9080fb098d05b96d193e26044e9435e8312c711e08fc9e0348e4a525a083c7527e036
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23-r1.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23-r1.ebuild
deleted file mode 100644
index dd0926bf9fb1..000000000000
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-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 libressl man overlay sound 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 )
-	)
-"
-RESTRICT="test"
-
-RDEPEND="
-	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
-	chamelium? (
-		dev-libs/xmlrpc-c
-		sci-libs/gsl
-		x11-libs/pixman
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	overlay? (
-		>=x11-libs/libXrandr-1.3
-		xv? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXv
-		)
-	)
-	sound? (
-		sci-libs/gsl
-		media-libs/alsa-lib:=
-	)
-	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
-	)
-"
-
-src_prepare() {
-	sed -e "s/rst2man/rst2man.py/" -i man/rst2man.sh
-	sed -e "s/find_program('rst2man'/find_program('rst2man.py'/" -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=(
-		-Dbuild_audio=$(usex sound true false)
-		-Dbuild_chamelium=$(usex chamelium true false)
-		-Dbuild_docs=$(usex doc true false)
-		-Dbuild_man=$(usex man true false)
-		-Dbuild_overlay=$(usex overlay true false)
-		-Dbuild_tests=$(usex doc true false) # Test build is required for docs
-		-Doverlay_backends=${overlay_backends%?}
-		-Dwith_libdrm=${gpus%?}
-		-Dwith_valgrind=$(usex valgrind true false)
-	)
-	meson_src_configure
-}
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23.ebuild
deleted file mode 100644
index 65bdd0b60689..000000000000
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-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="alsa chamelium doc glib gsl sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv"
-REQUIRED_USE="chamelium? ( glib gsl )"
-RESTRICT="test"
-
-X86_RDEPEND="
-	xv? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv
-	)"
-X86_DEPEND="x11-base/xorg-proto
-	>=dev-util/peg-0.1.18"
-RDEPEND="sys-apps/kmod:=
-	sys-libs/libunwind:=
-	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
-	alsa? ( media-libs/alsa-lib:= )
-	chamelium? ( dev-libs/xmlrpc-c )
-	glib? ( dev-libs/glib:2 )
-	gsl? ( sci-libs/gsl )
-	valgrind? ( dev-util/valgrind )
-	video_cards_intel? ( sys-libs/zlib:= )
-	xrandr? ( >=x11-libs/libXrandr-1.3 )
-	amd64? ( ${X86_RDEPEND} )
-	x86? ( ${X86_RDEPEND} )"
-DEPEND="${RDEPEND}
-	amd64? ( ${X86_DEPEND} )
-	x86? ( ${X86_DEPEND} )
-	doc? ( >=dev-util/gtk-doc-1.25-r1 )"
diff --git a/x11-apps/igt-gpu-tools/metadata.xml b/x11-apps/igt-gpu-tools/metadata.xml
index d1c1f29fe122..887359bbc727 100644
--- a/x11-apps/igt-gpu-tools/metadata.xml
+++ b/x11-apps/igt-gpu-tools/metadata.xml
@@ -7,12 +7,10 @@
 </maintainer>
 <use>
  <flag name="chamelium">Enables support for building Chamelium tests</flag>
- <flag name="glib">Support reading config files via glib helpers</flag>
  <flag name="man">Build and install man pages</flag>
  <flag name="overlay">Build the intel-gpu-overlay utility</flag>
  <flag name="runner">Build the test runner</flag>
  <flag name="valgrind">Support valgrind annotations</flag>
- <flag name="xrandr">Enable support for the X RandR extension</flag>
  <flag name="xv">Enable intel-gpu-overlay xv backend</flag>
  <flag name="X">Enable intel-gpu-overlay xlib/cairo backend</flag>
 </use>