gentoo resync : 18.05.2019

4 files changed, 185 insertions, 25 deletions

diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index af49c6b65fd4..993e230ee7b1 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,4 +1,5 @@
 DIST igt-gpu-tools-1.23.tar.xz 1045716 BLAKE2B f5e55ce9b682f2a9f2c6ab73c1e8e933ebea09b343f3af02df50b5bdce3e2ac313b1f92709c6de0d9fc7ffe2e2c9dfa95d2918ae9bd561cc285cff30fe59c6fd SHA512 8697265a978359e28983f483bf95819844597fc2080923d15d0587f6d648081af27e8ea318873e20103bbf8446b9f1005c6bc90a6276d3169837abd181f96839
+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-9999.ebuild 1480 BLAKE2B 96daf039d3e8d00c898c34fccfbf55254b954273dded0106b4585510d9a0f724553b40d4c3f6649cb008b80bcaad1975af6121e2198742e7c0cca0ead61a4e80 SHA512 b636e28baa9ae33bc971273c3cb165da041f36aff7eb2cd329d6e62d8b24938d749282674e072fb7a32e2220db068dea89258ae9b2554669bfd02968b79a8b87
-MISC metadata.xml 519 BLAKE2B 6763311f36b9997f2599a385dc7d0978874bab850ca0d06a3620c4767c31e0b35b9173e37ef606559919b2ebda095ac48b846107a8c9b18e87f942b465be91a6 SHA512 77a0a295e8c82570da621c4631d171dbf6564c00a6aee0e9e0261f5217317d19f5cdac134320f486c89e26c84a2f0c1a21d3b1d42b32676a0fe1d48fbc752569
+EBUILD igt-gpu-tools-9999.ebuild 2541 BLAKE2B 86dda1ac85c5e1dc4f2f186ab900f6e7baca930f863d1433727f76d8b6182cd0101bc76412d51019d893aa1dd9e961a6ee4afa30ec2813afe337a7224bc67504 SHA512 81a6499d0c32deee0b399e275adb80720f80432e4bab8e75329979dea97b4038a7414218d115e4dc14f30f2c45e08064f8f81ca90855087f56c4394eedc23ef7
+MISC metadata.xml 814 BLAKE2B 361429b06051651da503aaffc4dfd632f1eebc24a1968d7945b86e1a7410a78eb4ef50458dd8d42041b2ad2a18dda4a1b9c767a57c44fc3296717f27a2a64a9b SHA512 094b5cdc37051da14c48bae7a714a29b15a40488c10c0d997c168ee3da16a911186555130fcbd4592c9fb4b948af06a3a00afc2d36b7af9f194c7c801d80e2d0
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
new file mode 100644
index 000000000000..dd0926bf9fb1
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23-r1.ebuild
@@ -0,0 +1,105 @@
+# 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-9999.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
index 65bdd0b60689..81fff23b3e74 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-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,35 +20,84 @@ else
 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 )"
+IUSE="chamelium doc man overlay runner 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 )
+	)
+"
 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:=
+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
-	alsa? ( media-libs/alsa-lib:= )
-	chamelium? ( dev-libs/xmlrpc-c )
-	glib? ( dev-libs/glib:2 )
-	gsl? ( sci-libs/gsl )
+	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 )
-	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 )"
+	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/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=(
+		-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_runner=$(usex runner true false)
+		-Dbuild_tests=$(usex doc true false) # Test build is required for docs
+		-Doverlay_backends=${overlay_backends%?}
+		-Dwith_libdrm=${gpus%?}
+		-Dwith_libunwind=$(usex unwind true false)
+		-Dwith_valgrind=$(usex valgrind true false)
+	)
+	meson_src_configure
+}
diff --git a/x11-apps/igt-gpu-tools/metadata.xml b/x11-apps/igt-gpu-tools/metadata.xml
index df5e45209705..d1c1f29fe122 100644
--- a/x11-apps/igt-gpu-tools/metadata.xml
+++ b/x11-apps/igt-gpu-tools/metadata.xml
@@ -8,7 +8,12 @@
 <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>
 </pkgmetadata>