gentoo resync : 14.05.2020

9 files changed, 131 insertions, 85 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 6d443529f2e7..e377c0735c20 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/copyq/Manifest b/x11-apps/copyq/Manifest
index 42df4ed0f1bc..080808cf0500 100644
--- a/x11-apps/copyq/Manifest
+++ b/x11-apps/copyq/Manifest
@@ -1,5 +1,3 @@
-DIST CopyQ-3.7.2.tar.gz 2882944 BLAKE2B 3fd90b719b931ad9d92cca97f3ad284dc454ea5644907fa61b51b70eef5c42f41d52323346c0d24611c99cd2004a0528111125726d5cefe64f2cc9ead22d1f94 SHA512 dff6530375ea674502b754866c0011f3436796fc0535dc9cd317640b8cab4620e821b440df62d229a3d1dba371a7ae0c4a03e5d3366dd845218ab1516196d730
-DIST CopyQ-3.8.0.tar.gz 2909764 BLAKE2B 73b5f1b088bdea6db7a1141d8b029329210c18f980caf8ff52746894d672885c0940b7eeea2e66ed4d7957ea83649780860fd97e93f8eb02aad4cb8d3e687472 SHA512 ae22e5e00a2624b5fb551790ccda82f4a10a026cfd16d6526b370a0a210a939f2a11d0729f2b735e201085083514ff9eff8cda69ee2d360766fbfb7ea49b6c5e
-EBUILD copyq-3.7.2.ebuild 1204 BLAKE2B 1a21218b0b1c79a82c867c3e41464dfa2991be477c614a41688259597f7a41639e8717eda27fb5dd696a2514f8b53f89ce7adf2a25d1a3017ee4cd378cea16dc SHA512 3b127d20561489756ac26c3128ac50bb1d00ef5395d375e481058e2cee4a92eea368cb68313f5bc0b034f97139e7cce48cc3adcc8b42524a3821b7c8872ddc36
-EBUILD copyq-3.8.0.ebuild 1192 BLAKE2B 4236a8df6c392e4ce62d7e4ffb5f14a299f61c4fe456dd97d3098971289f03e16db1fd424056294c6deef4a30abc213f231aba1a051af74aa7b87d3852043643 SHA512 f7abe5f272d984d6a33465a3d12fcff01a3ae40cc79ec971fcc87158c865d25516dc50e9500d969d1616f851f82aa59e41b13140b22543182b6c9d5fd6e05839
+DIST CopyQ-3.10.0.tar.gz 2832904 BLAKE2B 78866a3ecbd1ed4d1ab06db552ef517234c1354609ef2bc18f8c4d8fa22342c7479a5bde79b9333f896dee4fe18543e47657c780b821f45121e0413c597b45aa SHA512 6cae338a144d7f92850ce88c991ed99222613c57540ced49dab719e43af884bbd9d15e6e8f074c6af94b0ac2ecd1b355eff8b83ec99f688c0f93fa19f253d653
+EBUILD copyq-3.10.0.ebuild 1251 BLAKE2B 7625f9f5019c664118d61c08e61c44c9a0d7e0e3b9f7f5502cba93aa712798b7d01532f6caa4aa540a5b528c88d701157ebb024df01c6f010a130d2f0b4dd2cd SHA512 3795857f32dde0059f08fdc20bbc743c84bb9a5335c9236547439fffc2cdd6b185f25a55f934d11e21c94c08d0aad5e03878ec034029cf4d40ae0ff0ca6fa98c
 MISC metadata.xml 583 BLAKE2B 9e4775c1555d5759d86b6fff357a02b15a8ec9f4fb177e4263c7a47ec5ea539f5d42c44371a79e0fcc96144b5b1fedd2844706d1c658d21f03a46854c8303821 SHA512 6b5df0cdd51515d5a2b03da10a8a7b794c92394858774dbd45bb0dd4e52f2722daf8ba4aa6954960eef592e061c53588b4c2c0bfa84225305f04553ba06b062e
diff --git a/x11-apps/copyq/copyq-3.8.0.ebuild b/x11-apps/copyq/copyq-3.10.0.ebuild
index 9f5c1deeaa86..857bb8af4b57 100644
--- a/x11-apps/copyq/copyq-3.8.0.ebuild
+++ b/x11-apps/copyq/copyq-3.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake gnome2-utils
+inherit cmake xdg-utils
 
 MY_P=CopyQ-${PV}
 
@@ -32,10 +32,9 @@ RDEPEND="
 	webkit? ( dev-qt/qtwebkit:5 )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )
-"
-S=${WORKDIR}/$MY_P
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+S="${WORKDIR}/$MY_P"
 
 src_configure() {
 	# CMakeLists.txt concatenates INSTALL_PREFIX with INSTALL_MANDIR leading to /usr/usr
@@ -50,9 +49,11 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/x11-apps/copyq/copyq-3.7.2.ebuild b/x11-apps/copyq/copyq-3.7.2.ebuild
deleted file mode 100644
index 0c5b8ccd84f5..000000000000
--- a/x11-apps/copyq/copyq-3.7.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-MY_P=CopyQ-${PV}
-
-DESCRIPTION="Clipboard manager with advanced features"
-HOMEPAGE="https://github.com/hluk/CopyQ"
-SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test webkit"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )
-"
-S=${WORKDIR}/$MY_P
-
-src_configure() {
-	# CMakeLists.txt concatenates INSTALL_PREFIX with INSTALL_MANDIR leading to /usr/usr
-	local mycmakeargs=(
-		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
-		-DWITH_QT5=ON
-		-DWITH_TESTS=$(usex test)
-		-DWITH_WEBKIT=$(usex webkit)
-		-DCMAKE_INSTALL_MANDIR="share/man"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index 428ef1734469..0664ec52e1b3 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,4 +1,6 @@
 DIST igt-gpu-tools-1.24.tar.xz 1207436 BLAKE2B 0b04033be0195a4fee5611aeae2f47334ce1de5df65c652ebc0b36d1185286268bb426f472e3c1311ff576e8184e7a4efb95ef3181006ed8c448ea76452940d7 SHA512 22c25e27ead64f561fe8f46b132d6c7562a90d7bff09dc2618a532b16d7b8fdf54ed94d986a45655657b54219d350ce1b1e6c89da2b6073024e9bbe0973fa190
+DIST igt-gpu-tools-1.25.tar.xz 1425652 BLAKE2B 1dd17e8542c126d356478acd07344d8732013a24fd180064d6f2277be76170924e7031fd2529b2aa054b40d5093d9cd95271e156bc6b97a75158c84de142f1ba SHA512 a24ee46092241da26fc2dac2b9b54c9f16f7a408c8740c9c7209e876929e2908a36261ba258ca4a4a4e4a21c1e9c919457bf98d514f81d8b7dbfcf5f89a74daf
 EBUILD igt-gpu-tools-1.24.ebuild 2509 BLAKE2B e5d7344a2cc59a3fe6f6e72abe3433fdb88344faa20b00ab11e7499b5911e734a983ea6cf64637f3e3e56df57c8a9fd766eb0832854ad2f30fc34ccf873e46e0 SHA512 2d50a2db3f8dd94138b0c7479b7a6dc5839efe4ac4c5e1cf5956db79cbb721f789d660f4f6620c8c201687e25cc6309b112d9ff2b28bde69c7fe1b964ad161ff
-EBUILD igt-gpu-tools-9999.ebuild 2509 BLAKE2B e5d7344a2cc59a3fe6f6e72abe3433fdb88344faa20b00ab11e7499b5911e734a983ea6cf64637f3e3e56df57c8a9fd766eb0832854ad2f30fc34ccf873e46e0 SHA512 2d50a2db3f8dd94138b0c7479b7a6dc5839efe4ac4c5e1cf5956db79cbb721f789d660f4f6620c8c201687e25cc6309b112d9ff2b28bde69c7fe1b964ad161ff
+EBUILD igt-gpu-tools-1.25.ebuild 2428 BLAKE2B 4892f54073a77fbe6e1fcb3cf803f7b681b9b4d3cf862e327dcd490b00513c8d815e1a872ba88bd5dc81cc3d85a1a37bee76da9e38349f600412d9c4f80308c5 SHA512 77ec10d17a40ffd70901914d4e67c286004432b7f71a5e368b46cd9d771d19ed82d1626aff8244b676a67550766c16f117d7be8f0c339d40c530271ac1c81100
+EBUILD igt-gpu-tools-9999.ebuild 2428 BLAKE2B 4892f54073a77fbe6e1fcb3cf803f7b681b9b4d3cf862e327dcd490b00513c8d815e1a872ba88bd5dc81cc3d85a1a37bee76da9e38349f600412d9c4f80308c5 SHA512 77ec10d17a40ffd70901914d4e67c286004432b7f71a5e368b46cd9d771d19ed82d1626aff8244b676a67550766c16f117d7be8f0c339d40c530271ac1c81100
 MISC metadata.xml 673 BLAKE2B 02cde7d4028a16cef77b898e88892e8d459f058c4894b8b738cd4e394562cb9ba529ad20d2d25e79f2f6ac8720ebba5d41ec1439abb7399dec9b743cb6460041 SHA512 881ce13108dbc798afd31e68fdbcd9d4cf7631f0be5776bc9eeb6c9948f9080fb098d05b96d193e26044e9435e8312c711e08fc9e0348e4a525a083c7527e036
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
new file mode 100644
index 000000000000..e87a5ccf4a7a
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 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
+
+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 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"
+
+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
+	)
+"
+
+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 doc tests) # Test build is required for docs
+		$(meson_feature valgrind)
+		$(meson_feature unwind libunwind)
+		-Doverlay_backends=${overlay_backends%?}
+		-Dlibdrm_drivers=${gpus%?}
+	)
+	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 8662c0102ba5..e87a5ccf4a7a 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
 if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
@@ -88,16 +88,16 @@ src_configure() {
 	use overlay && use X && overlay_backends+="x,"
 
 	local emesonargs=(
-		$(meson_feature chamelium build_chamelium)
-		$(meson_feature doc build_docs)
-		$(meson_feature man build_man)
-		$(meson_feature overlay build_overlay)
-		$(meson_feature runner build_runner)
-		$(meson_feature doc build_tests) # Test build is required for docs
-		$(meson_feature valgrind with_valgrind)
-		$(meson_feature unwind with_libunwind)
+		$(meson_feature chamelium)
+		$(meson_feature doc docs)
+		$(meson_feature man)
+		$(meson_feature overlay)
+		$(meson_feature runner)
+		$(meson_feature doc tests) # Test build is required for docs
+		$(meson_feature valgrind)
+		$(meson_feature unwind libunwind)
 		-Doverlay_backends=${overlay_backends%?}
-		-Dwith_libdrm=${gpus%?}
+		-Dlibdrm_drivers=${gpus%?}
 	)
 	meson_src_configure
 }
diff --git a/x11-apps/radeon-profile/Manifest b/x11-apps/radeon-profile/Manifest
index 7f6738e3b17e..5bed094644ae 100644
--- a/x11-apps/radeon-profile/Manifest
+++ b/x11-apps/radeon-profile/Manifest
@@ -1,6 +1,6 @@
-DIST radeon-profile-20190603.tar.gz 382652 BLAKE2B 60d22d59bcc0d91a70775579877300b6e2191187c295da2761b0be3bbac0d761e8a82a9bec958afabec652f6920439c48dedbeeb520849360f890e8205aa39ec SHA512 5def76cd69e347d3caf0ffbd6ae41982e516e72cb869b019f31316bcfaaa4487fd6ec87c7598d56e01640874f3e1d08febdb8e62362851bd6d7c3dc2f2cfb347
 DIST radeon-profile-20190903.tar.gz 383822 BLAKE2B d6551bb8e504147104a106cd2f1b4e5115d650d70b77e89e95f1915ba2d59bcda5b0d726260f905f953596cd673d61bcc9b563ddff0147edf981bec40d5ff2e2 SHA512 8417ddb53fb31cd753c8b7adf42390220eba401e424eff6ea82b8535832ddf9e7f59cb9083d51a003f0453ebdf91a594fbadfd37da1c47b7b0e87447e1f600f3
-EBUILD radeon-profile-20190603.ebuild 1110 BLAKE2B 3baabee798f25dcb245be9891df0514a7e38f5df4a7f7f2b3bffdcd2c4359f2f1118c157afd6d87181c700d333db84ccf26c728092bdfe031f9042dbf922a179 SHA512 83cfbd6c8473cb2fc3dae3f592b65b484b2985fb892c6531bbba44c6cc455d7b42ecaadffaf3da71baaee1dab25d7ea5aadf823b5ef88bb9420f8cb7389cf80b
+DIST radeon-profile-20200504.tar.gz 395674 BLAKE2B 6435dfcf9d2ce25789f429f12071cdb1c3f85050654b7fdec45c51a59d562d60369b28cfcd2854dfd5841e4af8f9166afed266e0a48d9010619972b653e0d4a8 SHA512 73f7eb59369af57aba5f067202fb1f772e48260c42ad194876926c29d278022daa86235f8d591bc763b8c6d80682553fe9a55f848137a8ec1de1bf9531c162c6
 EBUILD radeon-profile-20190903.ebuild 1110 BLAKE2B 3baabee798f25dcb245be9891df0514a7e38f5df4a7f7f2b3bffdcd2c4359f2f1118c157afd6d87181c700d333db84ccf26c728092bdfe031f9042dbf922a179 SHA512 83cfbd6c8473cb2fc3dae3f592b65b484b2985fb892c6531bbba44c6cc455d7b42ecaadffaf3da71baaee1dab25d7ea5aadf823b5ef88bb9420f8cb7389cf80b
+EBUILD radeon-profile-20200504.ebuild 1110 BLAKE2B 4d8889767cd00610a5c30544cb6378cab53f1f68b806060fb7fbf1ce7eda59bbdeb95419bd956fee5eee58ce3b879b478a034d93b31e6bcc8e1606f0b6c21e29 SHA512 7197ab783431d3b69d80b32f3e11433d748f4a75738981cb6b6c3badda6ad7910fb62c076dab9ad09dd8769f02c5c648a151de9c47838f3a0d5a6a7e0d0efcac
 EBUILD radeon-profile-99999999.ebuild 1110 BLAKE2B 3baabee798f25dcb245be9891df0514a7e38f5df4a7f7f2b3bffdcd2c4359f2f1118c157afd6d87181c700d333db84ccf26c728092bdfe031f9042dbf922a179 SHA512 83cfbd6c8473cb2fc3dae3f592b65b484b2985fb892c6531bbba44c6cc455d7b42ecaadffaf3da71baaee1dab25d7ea5aadf823b5ef88bb9420f8cb7389cf80b
 MISC metadata.xml 351 BLAKE2B 9bd8e162fadd4298b4cad8421104f7a75fcbfd41afba232789443b55e7a0c5befa8da030dc2fdccddedcab6296f51963158bf822e272182d98bf47dde9e63936 SHA512 0dd848bf98523b34bfb961b5711314bfda5294b2e7292a2b9a38c45c3bbb8f3d71ee22640a00068aadf97ee6aec3bf393a288f9d0b0533b7d5c9fa83aeacc2b1
diff --git a/x11-apps/radeon-profile/radeon-profile-20190603.ebuild b/x11-apps/radeon-profile/radeon-profile-20200504.ebuild
index ad6e34fec998..830f17504e3f 100644
--- a/x11-apps/radeon-profile/radeon-profile-20190603.ebuild
+++ b/x11-apps/radeon-profile/radeon-profile-20200504.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7