gentoo resync : 25.11.2020

3 files changed, 15 insertions, 47 deletions

diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index e4b3a4fb5ec4..d29e203dc483 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,9 +1,8 @@
-AUX picom-7.5-no_opengl.patch 680 BLAKE2B d0d0e9cf752ac003bc312b736dd64388924b6a0371180da0aac7578a85b988c554c7d30a4e419b930775020b99480fed2c1fbd95868989c94ad9997727fdacfc SHA512 b15c5a471bf343667d3fbc14d16d04789eaadcb2cb906668f6235a085c3a91c2bf0e1f0822a5dc5bab5272ca7b1dd3de97087faa6916526ca49e703ae69772d1
-DIST picom-7.5.tar.gz 219456 BLAKE2B 54113547b575ad6aa1329e92ae331b7d49207fdcdc6b49d31d8ab125f7335730a7e53b260c6a6c33d5350bec1e9e6357fd34023dc7837de165289446f8f492b8 SHA512 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a
 DIST picom-8.1.tar.gz 242262 BLAKE2B 69583a7a188f62387f0784e33acfc3d84e6b7b1987f44f7634b1bd2244ae8e8763c2131a824f8ddd748558002a876cb359c656a93fcb55ad33a24cca2b7dc56e SHA512 d1d0428e5761db6820c775c07b966b5fec6a9e9d049ba9f555eb49721f855a018df7242ef61e29c0ea003644b20e1bb733ddf668053a8d4040240e98707fa4d3
+DIST picom-8.2.tar.gz 242653 BLAKE2B 1c76ad4b3152d47155f957f8f1e75447ec8e30d05bc5fb9bf09c890552168cc3c607c8980b262b18cd5f3dc2654a3416cad20cb7fe829eaef8380783d1847c82 SHA512 bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1
 DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
-EBUILD picom-7.5-r1.ebuild 1335 BLAKE2B 09bd5c512559e6767258c7729d0756a5654f4eed20adb0d81d768a7ab546a828becbc73c861385cc15063658cb934614a57f12bc6ae1c5851aed2e1a2c0a8e87 SHA512 589200086b027dc00a743f8d30bba2d48e20480c8c2c2f7462aeb88668fef202211e891e7967d8d6e7baea23c00ea0df863a5806e6b5280375958f935a5c08a2
 EBUILD picom-8.1.ebuild 1423 BLAKE2B 982c38dcfab72f6b6c97168e785f88c2a5c74ac69909abb4d40beeec3442cadf8525b4279b026c5ec65a2e24b6cd796f38a0be279f2b814a174d6adc30f9a62b SHA512 ee99faa95b5510d6c3d6726eb8c07b2a7156b6a52d361e1796909ec3def0fb81578ae8b87acc4a277043b4e6d25c518a49582af9010007ffb81b345ad4e71994
+EBUILD picom-8.2.ebuild 1423 BLAKE2B 982c38dcfab72f6b6c97168e785f88c2a5c74ac69909abb4d40beeec3442cadf8525b4279b026c5ec65a2e24b6cd796f38a0be279f2b814a174d6adc30f9a62b SHA512 ee99faa95b5510d6c3d6726eb8c07b2a7156b6a52d361e1796909ec3def0fb81578ae8b87acc4a277043b4e6d25c518a49582af9010007ffb81b345ad4e71994
 EBUILD picom-8.ebuild 1419 BLAKE2B a991549fde6f0bec57766fe29e7a0c15fe9277ec4c178b6697789bbb0d1f923e3e9c307161e2fc2557b4d8bcdc58d705325c018cf19f7518165fcddf21fede18 SHA512 3611ee43a9782ff7df23edab1a509450573daea133ff32c01c8149dbedf70a3ff6f3b49c73931a69aba2cd401ab1daf5217b603b4b9c8351ca01342f5c42af65
 EBUILD picom-9999.ebuild 1056 BLAKE2B 658917c293650ee1b6a44c61fe5ee5704221c8bd36881c289dbd503a13c2b4b6b70c6324b88027b486b2cdd9f4d6414558e1825fc2e3c45a7312669c9b724d72 SHA512 88b6b3d7fabd2baaef316d301663bfb61a7b8ba0d131fb6235d6bd294c3bed28fa61178d32b829e38d9faec09e7984b73e02952c2d9c4aed9f31248299f80cde
 MISC metadata.xml 677 BLAKE2B 3d9d1ca23a81c30ac451c45ecad35c3cfbc63ea0a1d5c2cfed587990b33158ca8b3c188fe611aa51b77d2c66a270f8cc95ea5f38cb6270bd1ebf92411cb8ba8f SHA512 9a77cc79578426ae9e1e89e471d4368ef662f3bff757015d4cb48f08e2cbec446753ad16233bafde8ae1c61da0ec1bbd8539534c6097c7525c5905532c8cc9a5
diff --git a/x11-misc/picom/files/picom-7.5-no_opengl.patch b/x11-misc/picom/files/picom-7.5-no_opengl.patch
deleted file mode 100644
index ca9f715140ee..000000000000
--- a/x11-misc/picom/files/picom-7.5-no_opengl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bd5a5fb56812ee5644e4c4bd1fdd82b9899317a7 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Sat, 12 Oct 2019 13:29:10 +0000
-Subject: [PATCH] Unbreak -Dopengl=false clean build
-
-In file included from ../src/x.c:17:
-../src/backend/gl/glx.h:10:10: fatal error: 'GL/glx.h' file not found
- #include <GL/glx.h>
-         ^~~~~~~~~~
----
- src/x.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/x.c b/src/x.c
-index ed6668a8..2f802f1e 100644
---- a/src/x.c
-+++ b/src/x.c
-@@ -14,7 +14,9 @@
- #include <xcb/xfixes.h>
- 
- #include "atom.h"
-+#ifdef CONFIG_OPENGL
- #include "backend/gl/glx.h"
-+#endif
- #include "common.h"
- #include "compiler.h"
- #include "kernel.h"
diff --git a/x11-misc/picom/picom-7.5-r1.ebuild b/x11-misc/picom/picom-8.2.ebuild
index b2473732a34a..993b85a8ab0f 100644
--- a/x11-misc/picom/picom-7.5-r1.ebuild
+++ b/x11-misc/picom/picom-8.2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit meson python-r1 xdg
+PYTHON_COMPAT=( python3_{6,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"
@@ -12,12 +12,13 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+config-file dbus +doc +drm opengl pcre"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+config-file dbus +doc +drm opengl pcre test"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
+RESTRICT="test" # but tests require dbus_next
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
 	dev-libs/libev
 	dev-libs/uthash
 	x11-libs/libX11
@@ -38,27 +39,22 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig
-	doc? ( app-text/asciidoc )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no_opengl.patch
-	)
+	doc? ( app-text/asciidoc )
+	test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') )
+"
 
 src_configure() {
 	local emesonargs=(
 		$(meson_use config-file config_file)
 		$(meson_use dbus)
-		$(meson_use doc build_docs)
+		$(meson_use doc with_docs)
 		$(meson_use opengl)
 		$(meson_use pcre regex)
 	)
 
 	meson_src_configure
-
 }
 
-src_install() {
-	meson_src_install
-
-	python_replicate_script "${ED}"/usr/bin/compton-convgen.py
+src_test() {
+	virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}"
 }