gentoo resync : 15.06.2021

4 files changed, 41 insertions, 8 deletions

diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index 8ce47b5f53e3..566a4f1a75e8 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,6 +1,6 @@
 DIST picom-8.2.tar.gz 242653 BLAKE2B 1c76ad4b3152d47155f957f8f1e75447ec8e30d05bc5fb9bf09c890552168cc3c607c8980b262b18cd5f3dc2654a3416cad20cb7fe829eaef8380783d1847c82 SHA512 bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1
 DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
-EBUILD picom-8-r1.ebuild 1393 BLAKE2B 98d6ac86569ea21777a86c2d47191a9c45f54e55ff6654835e0c3022b29194c946c70132462100cfd90420946dbac54dec9026b889b550f30b9e3bd912bae514 SHA512 38dc9bcd19ec7d7199140ff7435c349a05e7abc79030aedce62ae63d57d68eeae248d0bd02a41e3782d58c74b4a283987eea23bc29634928bef00f623092a399
-EBUILD picom-8.2-r2.ebuild 1435 BLAKE2B f93a31b0e6b298f84fa6b4b451643c811f6d2efedd10af3bc1f9d129eaf101e52e54c499e4e144441978ae4185749fdfe6e3a18f28c593457dd58ce0cfbc16a7 SHA512 114865710cbec12676514dcc22ee5692c2a36f0dc5936872e4b6ed2ead6f18d8301e972b7c310dfcfe03f8d8107158112bba7e7c4533bbcdab05c8259aa11247
-EBUILD picom-9999.ebuild 1070 BLAKE2B e205156372dd7195b6124ca4a419f7cbd66ef37ad30e49c882dcf3d285b5f8e46f2b3ce8aeedbacd139d9f2b611b13036950ba7e86501906e7b3aef50fab69ad SHA512 231d1ac258ab08334d7cd6d67d1cf1850dec8b35f5b335873265f6589abf1e7799f909de22e8278babbaebc9de2a510e688dddc027691cee4e1b37b9d0ecabfd
+EBUILD picom-8-r1.ebuild 1526 BLAKE2B b016d3cbaa1b37d83866fc56923fe5d5d0c9d98f84b7ffaf61420cc929b902f2ff19c33f4a4f9b5220451c4124feca2e31aa53e48c9689510a1a92a12f6cfe25 SHA512 965f59726b168898fef69380c6d397632f19a9fcd7fb9b6458af815270700edd709ed845a37d59cf2b8329a6ccefd113516a03c2a57042b421c7b2c635f295ad
+EBUILD picom-8.2-r2.ebuild 1566 BLAKE2B b670c66324ebd845705367e77df8a7a5eb118e9fad48d07c61b9f7f7a71ac7daa879d221bc4c687f3b7a8070cdd919b45213f1e005bf7ad6880e5cd409e22180 SHA512 a399373fb4257f5ccae6aa71c2cf53669859081ba12a59f3337d67fc613215a9eed44049b3a499853c94ce61fadda06aea59b60b9dcc3bae59fe25fc641188f9
+EBUILD picom-9999.ebuild 1516 BLAKE2B 35d49008bffd1956f30f1038a23f4a34b242e5690fb84013ee2b968265b07522221720093a1b43eb01dbcdd6467bdc8cfb2ab66178b8b3d3f78072b2b4b1e69e SHA512 f51ef9e05acfd8d6e1dee42eccd6b029edc076395db79cf1e8235a696c856d322d53267d0dc68b5ccfe0ae2a8a1496409182a8c710acd8b3f048e6048f63c937
 MISC metadata.xml 677 BLAKE2B 3d9d1ca23a81c30ac451c45ecad35c3cfbc63ea0a1d5c2cfed587990b33158ca8b3c188fe611aa51b77d2c66a270f8cc95ea5f38cb6270bd1ebf92411cb8ba8f SHA512 9a77cc79578426ae9e1e89e471d4368ef662f3bff757015d4cb48f08e2cbec446753ad16233bafde8ae1c61da0ec1bbd8539534c6097c7525c5905532c8cc9a5
diff --git a/x11-misc/picom/picom-8-r1.ebuild b/x11-misc/picom/picom-8-r1.ebuild
index ff42b3981ea5..a266247cac0b 100644
--- a/x11-misc/picom/picom-8-r1.ebuild
+++ b/x11-misc/picom/picom-8-r1.ebuild
@@ -42,6 +42,14 @@ BDEPEND="virtual/pkgconfig
 	test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') )
 "
 
+python_check_deps() {
+	has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use config-file config_file)
diff --git a/x11-misc/picom/picom-8.2-r2.ebuild b/x11-misc/picom/picom-8.2-r2.ebuild
index b0f968999550..dbceb7f81df7 100644
--- a/x11-misc/picom/picom-8.2-r2.ebuild
+++ b/x11-misc/picom/picom-8.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+config-file dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
@@ -44,6 +44,14 @@ BDEPEND="virtual/pkgconfig
 
 DOCS=( README.md picom.sample.conf )
 
+python_check_deps() {
+	has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use config-file config_file)
diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
index ae0a2c9641a2..7551a069f44f 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit git-r3 meson xdg
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit git-r3 python-any-r1 meson virtualx xdg
 
 DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
 HOMEPAGE="https://github.com/yshui/picom"
@@ -11,8 +12,10 @@ EGIT_REPO_URI="https://github.com/yshui/picom.git"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE="+config-file dbus +doc +drm opengl pcre"
+IUSE="+config-file dbus +doc +drm opengl pcre test"
+
+REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
+RESTRICT="test" # but tests require dbus_next
 
 RDEPEND="dev-libs/libev
 	dev-libs/uthash
@@ -33,10 +36,20 @@ RDEPEND="dev-libs/libev
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig
-	doc? ( app-text/asciidoc )"
+	doc? ( app-text/asciidoc )
+	test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') )
+"
 
 DOCS=( README.md picom.sample.conf )
 
+python_check_deps() {
+	has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use config-file config_file)
@@ -48,3 +61,7 @@ src_configure() {
 
 	meson_src_configure
 }
+
+src_test() {
+	virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}"
+}