[gentoo-commits] repo/gentoo:master commit in: x11-misc/picom/

["Bernard Cafarelli" <voyageur@gentoo.org>]

commit:     0223e295f3db8e6ba654e142c86314aa3fcf932f
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  9 19:18:50 2021 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Mar  9 19:19:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0223e295

x11-misc/picom: install sample config file in doc

Closes: https://bugs.gentoo.org/774843
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../{picom-9999.ebuild => picom-8.2-r2.ebuild}     | 25 ++++++++++++++++------
 x11-misc/picom/picom-9999.ebuild                   |  2 ++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-8.2-r2.ebuild
similarity index 59%
copy from x11-misc/picom/picom-9999.ebuild
copy to x11-misc/picom/picom-8.2-r2.ebuild
index 8bfde4079c7..70596685127 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-8.2-r2.ebuild
@@ -3,18 +3,23 @@
 
 EAPI=7
 
-inherit git-r3 meson xdg
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit meson python-any-r1 virtualx xdg
 
 DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
 HOMEPAGE="https://github.com/yshui/picom"
-EGIT_REPO_URI="https://github.com/yshui/picom.git"
+SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE="+config-file dbus +doc +drm opengl pcre"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+config-file dbus +doc +drm opengl pcre test"
 
-RDEPEND="dev-libs/libev
+REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
+RESTRICT="test" # but tests require dbus_next
+
+RDEPEND="
+	dev-libs/libev
 	dev-libs/uthash
 	x11-libs/libX11
 	x11-libs/libxcb
@@ -34,7 +39,11 @@ 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 )
 
 src_configure() {
 	local emesonargs=(
@@ -47,3 +56,7 @@ src_configure() {
 
 	meson_src_configure
 }
+
+src_test() {
+	virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}"
+}

diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
index 8bfde4079c7..00061878b52 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-9999.ebuild
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 BDEPEND="virtual/pkgconfig
 	doc? ( app-text/asciidoc )"
 
+DOCS=( README.md picom.sample.conf )
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use config-file config_file)