summaryrefslogtreecommitdiff
path: root/x11-apps
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-06-16 05:02:38 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-06-16 05:02:38 +0100
commitf1bc537f089cc8477a9a18db597cb349e1b00e91 (patch)
treec48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /x11-apps
parentcb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff)
gentoo resync : 16.06.2018
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/Manifest.gzbin14876 -> 14872 bytes
-rw-r--r--x11-apps/intel-gpu-tools/Manifest12
-rw-r--r--x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch28
-rw-r--r--x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch35
-rw-r--r--x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch53
-rw-r--r--x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild55
-rw-r--r--x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild (renamed from x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild)48
-rw-r--r--x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild54
-rw-r--r--x11-apps/intel-gpu-tools/metadata.xml2
-rw-r--r--x11-apps/xhost/Manifest2
-rw-r--r--x11-apps/xhost/xhost-1.0.7.ebuild4
11 files changed, 144 insertions, 149 deletions
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index bc45af5246b6..872f50d44a28 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
Binary files differ
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
index 02ae23a25221..5696f027168f 100644
--- a/x11-apps/intel-gpu-tools/Manifest
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -1,7 +1,5 @@
-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 1312 BLAKE2B aa33654e6b13869db7925a3bb6b9b9e20491c382021289ddb6fb1bdc29f2931c017e30ddf8db7e0e0ab4594545a91f5a7ed35b3197cc423ace1011e48678c0ff SHA512 4c76d129ea87cdc22ec85fd0572978c17bf6a6c11aaf43d0265a3bed1b444741e172c44d89348d7eb94d6ca2f91d8c332a6877c7c6656b336dbf205ab5461bdd
-EBUILD intel-gpu-tools-1.20.ebuild 2334 BLAKE2B c24a37212d73047c26dc01c0ed7509640a1cce1dc0bda2821bb5dc10b7f35fa63bedf3529146c8dce403d3050dd156e8799791781515bd945c919fdaeb5f02d0 SHA512 0beb5211b5416ab7fb6f2137b9ddef140a75434c43dd762d0cad35352fdd3963f26a03fe27898dffb0ffb49981e601331026c01b24e7810261763a9cffb3a1db
-MISC metadata.xml 603 BLAKE2B 45dd9f436fa73acc04e08ad1e3bddde995b09fa16da4bcc66898203eb5b72f72ad57d3e3c07f4669e57bcdcc26e5a2711a0295964c49738041ad06d9d4b9c31c SHA512 1d211baff35dbc0ce425b433b9a1a9897184a53800f7a2e4dde8e88a8de87cc9913341a4ff5cd15115067ac4fcbf9151f6c26fd34fb2feaf9477e9636fa32b1f
+AUX intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch 1823 BLAKE2B df389f5b08771c22fd49b82c425d53560f9ae5fd4176f06ddba4582c4a22d42f67377b2bd99fff6f1d4bd3b7a7c9276149272c1548c0ce166c42063640a48888 SHA512 1e9afea48f3ecc000ca3994e5f9c899bb163a3295dd81012e8bdccf7db90ab4c9fd3ac5a68d3b44879fa93b89ae05a3c6b918055558e66516a0cc5bfda0d26bc
+DIST intel-gpu-tools-1.22.tar.xz 1022396 BLAKE2B c84338f3f84fcbe21a5b918b1afcc47d5419bd37828054fc3fa128d346b0f1b633d42f842464d96b28d4430788bfa9945a7596c14e6a79f8183440d3b9329c92 SHA512 af7964a3782bbc335c50c1c9c42f090306932423e76b9968d6919a2b633f3c11837e7ba572d352632c2b4db79bc98218d9d425c3b62e69abad5aa83d733dea8a
+EBUILD intel-gpu-tools-1.22.ebuild 2351 BLAKE2B d7d48cd4aea4528dbf763f7d2a54df75019d2380d2d6c37d9f453979f4efe0998e6ed85ef1448ffef6a6457e0fbebd368b4f98fb2acfaca6afbe90ff1c07b9cb SHA512 f2b4537671143d7af5b2d65bbedc5ec658aace7d94d1af8845d1134e00a61e93931a481488f112190276d232b006754b8b66d07ad2ba93e143d53556475b07ce
+EBUILD intel-gpu-tools-9999.ebuild 1499 BLAKE2B a818e0e39705fe6842ffecf71e17804abfb283cd6330471e68e51a61336066e786abdc6f105d339e0b4424dbc5588075076c1e33e9907581508e8910c4b10089 SHA512 c533d3ecca88f455c357fe6860fb870c1e9e14bbf4c39fa725e330456df57b516bcb1b2d622bd8450be9bbd977fc755f181d19c4f4c86c67b0ef3b1561f03409
+MISC metadata.xml 603 BLAKE2B 7eaa85a41a130abd8a149127bd2724d989a3e2242576823df58edce57da658e09c8b8e76e449a77974de3403b79a8df85c96eae2eec184d359d1b67366a98949 SHA512 173906d2cd0ef4ea36e4d720e7fd1b4e1a05fc239e89d22205ae8237a5c87f35532a01988bb5af1a647d15293ead89b61e46c886dacc893b1d94e351aea82596
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch
deleted file mode 100644
index 02a97c48d121..000000000000
--- a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/582430
-
-From d24f4a5c5fe45e2fad8942acc137f87cd8f35ea5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 14:37:38 -0400
-Subject: [PATCH] include inttypes.h for PRI defines
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96620
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/igt_fb.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/igt_fb.c b/lib/igt_fb.c
-index 61205f345707..ba29eae5cabd 100644
---- a/lib/igt_fb.c
-+++ b/lib/igt_fb.c
-@@ -28,6 +28,7 @@
- #define _GNU_SOURCE
- #include <stdio.h>
- #include <math.h>
-+#include <inttypes.h>
-
- #include "drmtest.h"
- #include "igt_fb.h"
---
-2.8.2
-
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch
deleted file mode 100644
index c805c120f552..000000000000
--- a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/581080
-
-From 3e8cc82d371b23303cd4f30e4bcc9c5ecb10ad11 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 14:24:42 -0400
-Subject: [PATCH] pull in headers for major/minor/makedev funcs
-
-Use the portable autoconf helper to figure out which header to include
-for these funcs. Linux C libs are moving to not implicitly include them
-via sys/types.h anymore, and other OS's have long required you to pull
-in the right header directly.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96618
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac | 1 +
- lib/igt_sysfs.c | 9 +++++++++
- tools/aubdump.c | 8 +++++++-
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
---- a/tools/aubdump.c
-+++ b/tools/aubdump.c
-@@ -38,6 +38,9 @@
- #include <errno.h>
- #include <sys/mman.h>
- #include <dlfcn.h>
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
- #include <i915_drm.h>
-
- #include "intel_aub.h"
---
-2.8.2
-
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch
new file mode 100644
index 000000000000..ff51969def4d
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch
@@ -0,0 +1,53 @@
+From 0896b88d1b80244832f9eacbca993c5121315d05 Mon Sep 17 00:00:00 2001
+From: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Date: Thu, 26 Apr 2018 17:49:41 -0700
+Subject: lib: sync with the newer i915_pciids.h from the Kernel (KBL + ICL)
+
+I just copied the Kernel file into the IGT repository.
+
+New IDs:
+- KBL GT2 sku from 672e314b21dc ("drm/i915/kbl: Add KBL GT2 sku")
+- ICL IDs from d55cb4fa2cf0 ("drm/i915/icl: Add the ICL PCI IDs")
+
+Cc: Matt Atwood <matthew.s.atwood@intel.com>
+Acked-by: Antonio Argenziano <antonio.argenziano@intel.com>
+Reviewed-by: Jose Roberto de Souza <jose.souza@intel.com>
+Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
+---
+ lib/i915_pciids.h | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/patch/?id=0896b88d1b80244832f9eacbca993c5121315d05
+
+diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
+index 0b2ba46..bab70ff 100644
+--- a/lib/i915_pciids.h
++++ b/lib/i915_pciids.h
+@@ -349,6 +349,7 @@
+ #define INTEL_KBL_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
+ INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
++ INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
+ INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
+ INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
+ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
+@@ -431,4 +432,16 @@
+ INTEL_VGA_DEVICE(0x5A44, info), \
+ INTEL_VGA_DEVICE(0x5A4C, info)
+
++/* ICL */
++#define INTEL_ICL_11_IDS(info) \
++ INTEL_VGA_DEVICE(0x8A50, info), \
++ INTEL_VGA_DEVICE(0x8A51, info), \
++ INTEL_VGA_DEVICE(0x8A5C, info), \
++ INTEL_VGA_DEVICE(0x8A5D, info), \
++ INTEL_VGA_DEVICE(0x8A52, info), \
++ INTEL_VGA_DEVICE(0x8A5A, info), \
++ INTEL_VGA_DEVICE(0x8A5B, info), \
++ INTEL_VGA_DEVICE(0x8A71, info), \
++ INTEL_VGA_DEVICE(0x8A70, info)
++
+ #endif /* _I915_PCIIDS_H */
+--
+cgit v1.1
+
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild
deleted file mode 100644
index a05dea860cfe..000000000000
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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="test-programs unwind video_cards_nouveau"
-RESTRICT="test"
-
-DEPEND="dev-libs/glib:2
- >=x11-libs/cairo-1.12.0
- >=x11-libs/libdrm-2.4.64[video_cards_intel,video_cards_nouveau?]
- >=x11-libs/libpciaccess-0.10
- unwind? ( sys-libs/libunwind )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12-inttypes.patch #582430
- "${FILESDIR}"/${PN}-1.12-sysmacros.patch #581080
-)
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable video_cards_nouveau nouveau)
- $(use_enable test-programs tests)
- $(use_with unwind libunwind)
- )
- 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/intel-gpu-tools-1.20.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild
index 69ac7b3936c9..be16cea0651b 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild
@@ -3,13 +3,21 @@
EAPI="5"
+XORG_EAUTORECONF="yes"
+
inherit xorg-2
DESCRIPTION="Intel GPU userland tools"
+HOMEPAGE="https://01.org/linuxgraphics https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/"
+SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
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 ) )"
+LICENSE="MIT"
+SLOT="0"
+IUSE="alsa chamelium doc glib gsl sound test-programs valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv"
+REQUIRED_USE="
+ test-programs? ( sound? ( alsa gsl ) )
+ chamelium? ( glib gsl )"
RESTRICT="test"
X86_RDEPEND="
@@ -18,17 +26,19 @@ X86_RDEPEND="
x11-libs/libXext
x11-libs/libXv
)"
-X86_DEPEND="x11-base/xorg-proto"
+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 )
- udev? ( virtual/libudev:= )
- unwind? ( sys-libs/libunwind )
valgrind? ( dev-util/valgrind )
video_cards_intel? ( sys-libs/zlib:= )
xrandr? ( >=x11-libs/libXrandr-1.3 )
@@ -36,24 +46,22 @@ RDEPEND="sys-apps/kmod:=
x86? ( ${X86_RDEPEND} )"
DEPEND="${RDEPEND}
amd64? ( ${X86_DEPEND} )
- x86? ( ${X86_DEPEND} )"
+ x86? ( ${X86_DEPEND} )
+ doc? ( >=dev-util/gtk-doc-1.25-r1 )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-KBL-ICL-PCI-IDs.patch
+)
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)
+ $(usex test-programs $(use_enable sound audio) --disable-audio)
+ $(use_enable chamelium)
+ $(use_enable doc gtk-doc)
+ $(use_enable test-programs tests)
+ $(use_enable video_cards_amdgpu amdgpu)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
)
xorg-2_src_configure
}
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild
new file mode 100644
index 000000000000..dcf138f5a867
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/app/${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://cgit.freedesktop.org/xorg/app/intel-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/intel-gpu-tools/metadata.xml b/x11-apps/intel-gpu-tools/metadata.xml
index 82c48e5a7a21..511e4111b43c 100644
--- a/x11-apps/intel-gpu-tools/metadata.xml
+++ b/x11-apps/intel-gpu-tools/metadata.xml
@@ -6,9 +6,9 @@
<name>X11</name>
</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="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>
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
index 48f60c2ce73f..545012ead0b1 100644
--- a/x11-apps/xhost/Manifest
+++ b/x11-apps/xhost/Manifest
@@ -1,5 +1,5 @@
DIST xhost-1.0.6.tar.bz2 133176 BLAKE2B 8cb649716b93d3bf020e4897f2d6f7f1a0a765c4fb8715b1c128475725bc6822cfe49aebfdc6677c1eccc8510938848dae538f7b4c90282c4b01df0af124fb62 SHA512 4e9b8b5b3a13b995e4f3596b26fa637d5892936090516eef1eb296c257358496ed5ad7b5c1e924003fcc18b6c8d4592f83e515d66a605a895f1d9fdc5d064f1a
DIST xhost-1.0.7.tar.bz2 135767 BLAKE2B 0156640ede491a8a2f1610ca5d68d97e88fa349bcbad39a308aae46d29f7cf8f93a8fee8273ba369484efd9641653e7bcfbd8fb3ec14d9f07b20e4ffd7fd6fd2 SHA512 670a8c97291565f6c36c94e135f7bd60a572bb42b4fca9d2460823db0d0576187c64f9b876ed60d348029d3f74a732862eea4ce889a6b6b9c97665746a38b1d7
EBUILD xhost-1.0.6.ebuild 550 BLAKE2B ff9768a392b4a2d746a44996654f5bcdd4893ee495fdf9ca3ce6c08413f184d7d9d524fc9d3a366c6cdd9380d634c870ffd8104c65d9e08cd3e63ba05d47fde4 SHA512 15cea102e965f1e6e329e41e944496c76ebac7d967b82444cc53586127b6b43a705a472c927527ed20fe8b3254f7ceef63a9e8253f22fd1037f5c1d928991242
-EBUILD xhost-1.0.7.ebuild 557 BLAKE2B 6374e2fa9a994b1b862d9d8480dca1d3d7b2f6dad1c193daf58286d454fb823c1463d8218c0da35704c2f9fb710b1b173c8be1436f91e315900742971198143b SHA512 00c35a34cee52bc914a2c5daf0e4d46c5079e2d839b0113383dcba1fbef43300805cc2742c6523d1ac88cb5242f12946ea0bf77c4ce7ddd25ae25b642a9ddd78
+EBUILD xhost-1.0.7.ebuild 556 BLAKE2B 6c18b8604a89b4a074dc428fdfb2f2547cbf7c9b0aa78f9530d2d332e0de814641a9c7328b89edf07c4998143dae05649661340e959c287c6bcd65f32ab4c001 SHA512 3a2752601f044dadc4b8543037d484bbb0292935c1a1dc88a39dd85e5c9df5fd3fb15a8c0c0b1d88117acfc9515a213b0ae4882a722de4bc51bf17e29b3263c9
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xhost/xhost-1.0.7.ebuild b/x11-apps/xhost/xhost-1.0.7.ebuild
index b49a9aa27256..82d2f4637dde 100644
--- a/x11-apps/xhost/xhost-1.0.7.ebuild
+++ b/x11-apps/xhost/xhost-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="Controls host and/or user access to a running X server"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6"
RDEPEND="x11-libs/libX11