gentoo resync : 05.01.2018

3 files changed, 88 insertions, 1 deletions

diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
index 09af8164c501..4ef4819434d6 100644
--- a/x11-apps/intel-gpu-tools/Manifest
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -1,5 +1,7 @@
 AUX intel-gpu-tools-1.12-inttypes.patch 679 BLAKE2B 931206b978425a46566f0d82ce8a754035c50f8af71e58645be1dd2fd376e36c2e626a9690d16d4e30dd1ab87864160947fca0e812c7cef7f2127b8690927bc2 SHA512 d7344bee96c706b077b51e0f01af6de10b0a02ed476919b0dd1383bee703ff97d6bd608a9e731b6f572312745c2484f4039fe8629b9c6cc6cd96abeafbd57e3a
 AUX intel-gpu-tools-1.12-sysmacros.patch 981 BLAKE2B a6183a9d0d07c57ed34205c028cca8244068a5565eebb802dd5282d715c28565310b1e1194e2d8930ec46d06f54f3f763b3c2a3bb5422e9a1e6af68ef40428d6 SHA512 382094cdf8b3303f0691820e8937c15b978d34cd5c99eb43563ad2556eea261085a052bc3e8f8698b22537981a386ca30c824f80e480548a3b20f45a9e533e7a
 DIST intel-gpu-tools-1.15.tar.bz2 1827851 BLAKE2B dac481571603ff36957ad2d5ef89266e744ec39a5623bb2b8e3d2e389d39d7aa09130cd7591e876b02d8edd970fb287c53ea9b520801a4a9ceede294e2917a7f SHA512 407f7c4ce72babbbd3ed08fc77719f88321b56745601b588bb6dce1a659786215e6d1b121af748087746df6f7da1bfd3ae8f9a898173eede5d5bb4a5b24b4559
+DIST intel-gpu-tools-1.20.tar.bz2 2274390 BLAKE2B 55c8614f93f5ed6391d35570ed6e4e36a659bd8ba5d98e321cb1daaf89413a95d1f0911cd07ed00670f0dceacd8f4443894a59b85cce1debeae9f8e01a75f824 SHA512 7b930c6949c04a600792df359f7cd230ca7b843072936c0c674cb9212b2d8c0701c43ef3bebe66b34141ed7a9b39774bbb99466cd52d70b3f1abfe5e52608f25
 EBUILD intel-gpu-tools-1.15.ebuild 1310 BLAKE2B c164f8ec91977160c9ccf41a8a1061089106b837835da44201072e4083cc1a31b480f03645b8d5b0202c448c878025023d947798fa273d2f50e787e87ad2fd39 SHA512 aab618d20956444222de42e8bb27130e6a6f76e2d83555da0fc6e450ed8f8304778366d9533e519e3c01760ec5027d1e83faf55de4de77e373bdf3d90503abc4
-MISC metadata.xml 403 BLAKE2B 1b40d9dca1edb9be2e0b572858bd443c7d231b578ca9156cd5ca8b6ee70001678bc9b49a354f29bcecbfee7383facfd90d1103125a3b9b867ff058cd87326a50 SHA512 a4a315caf4f2ac38b6cfb0bac96776bddc4be6c79abe3a9dff8473a2443fbca7dd569df04abc9557160951e4894ac49f83f925a2fbc7f0a0e1df7924169a2a0a
+EBUILD intel-gpu-tools-1.20.ebuild 2340 BLAKE2B 562eec910f1220fb92d60d161a922864aa0e0fd56fda5540ecb9cdf7785c40d60cb6631c109d9df26ba0d3e8afd558ba1aac774e437c2051cd2234b7d21f3bdc SHA512 8a34d86cfa622addbef622db66d0994c26f7e0390f4bdd2e46a7c8bcfc519c3b949e43f4b2e348fbbae50c4409d6e515dc3659e6c5e6ce4d60ec7a574a57f7b4
+MISC metadata.xml 603 BLAKE2B 45dd9f436fa73acc04e08ad1e3bddde995b09fa16da4bcc66898203eb5b72f72ad57d3e3c07f4669e57bcdcc26e5a2711a0295964c49738041ad06d9d4b9c31c SHA512 1d211baff35dbc0ce425b433b9a1a9897184a53800f7a2e4dde8e88a8de87cc9913341a4ff5cd15115067ac4fcbf9151f6c26fd34fb2feaf9477e9636fa32b1f
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
new file mode 100644
index 000000000000..f14f3fa384ae
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit xorg-2
+
+DESCRIPTION="Intel GPU userland tools"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa glib gsl sound test-programs udev unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv"
+REQUIRED_USE="test-programs? ( sound? ( alsa gsl ) )"
+RESTRICT="test"
+
+X86_RDEPEND="
+	xv? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXv
+	)"
+X86_DEPEND=">=x11-proto/dri2proto-2.6"
+RDEPEND="sys-apps/kmod:=
+	sys-process/procps:=
+	>=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:= )
+	glib? ( dev-libs/glib:2 )
+	gsl? ( sci-libs/gsl )
+	udev? ( virtual/libudev:= )
+	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} )"
+
+src_configure() {
+	sed -i -E \
+		-e "s:\<alsa=(no|yes):alsa=$(usex alsa):g" \
+		-e "s:\<glib=(no|yes):glib=$(usex glib):g" \
+		-e "s:\<gsl=(no|yes):gsl=$(usex gsl):g" \
+		-e "s:\<udev=(no|yes):udev=$(usex udev):g" \
+		-e "s:\<have_valgrind=(no|yes):have_valgrind=$(usex valgrind):g" \
+		-e "s:\<enable_overlay_xvlib=(no|yes):enable_overlay_xvlib=$(usex xv):g" \
+		configure || die
+	XORG_CONFIGURE_OPTIONS=(
+		$(usex test-programs $(use_enable sound audio) --disable-audio)
+		$(use_enable test-programs tests)
+		$(use_with unwind libunwind)
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+	)
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+	if use test-programs; then
+		local testprogram
+		pushd "${AUTOTOOLS_BUILD_DIR}"/tests >/dev/null || die
+		for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
+			if [[ -f ${testprogram} ]]; then
+				dobin "${testprogram}"
+			fi
+		done
+		popd >/dev/null
+	fi
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	if use test-programs; then
+		elog "Test programs for DRM driver development were installed. These are not"
+		elog "designed to run outside their source tree, so may or may not work as"
+		elog "intended."
+	fi
+}
diff --git a/x11-apps/intel-gpu-tools/metadata.xml b/x11-apps/intel-gpu-tools/metadata.xml
index 49b36752d733..82c48e5a7a21 100644
--- a/x11-apps/intel-gpu-tools/metadata.xml
+++ b/x11-apps/intel-gpu-tools/metadata.xml
@@ -6,7 +6,10 @@
  <name>X11</name>
 </maintainer>
 <use>
+ <flag name="glib">Support reading config files via glib helpers</flag>
  <flag name="test-programs">Install test programs for DRM driver development</flag>
  <flag name="unwind">Provide automatic stack traces on test failures</flag>
+ <flag name="valgrind">Support valgrind annotations</flag>
+ <flag name="xrandr">Enable support for the X RandR extension</flag>
 </use>
 </pkgmetadata>