gentoo resync : 28.04.2021

5 files changed, 3 insertions, 67 deletions

diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index 69a559ef6393..8ce47b5f53e3 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,7 +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 1419 BLAKE2B ea4232941560214b8708bdaf11b790b9af1a464f81087aedf5e11e286f1947d26b6468f09bf6802a2d8106333a3ab57011bbd83f10c64c31eeade0ae02bc121d SHA512 41c1567cc212e77bab89a2485e08735c74e1fdeffb13bcb4661e346b17ce38ce7584f430463ac330be05df5df82693591515ae893d9981dfd04353e2d553d45b
-EBUILD picom-8.2-r1.ebuild 1423 BLAKE2B 767569af8624b82bb251174a66ec8229b7b2aee6ea70b6bf0ffb6cbcb84d3be4d0c0964561846fda2627b1314c374f9b3e155aaadadfac6f827fbdbfd8e9230b SHA512 25477b10c34776c3d5abd223ffa12e0cb9488bdd4f04fb7d6b78e80d1da313913337e8075682733e654dc59de9a78f77331f1f3627b5f66f224768f7866e6287
-EBUILD picom-8.2-r2.ebuild 1461 BLAKE2B 77dbd81c844cc8384f44ba87177e9b41408d60e19911d754df3f42bee68db833fcf47849d4c5190565424a052ce9205d5a3a67f87a03503bc413c62504c62ddf SHA512 87f36c83cbb776b3ac9f325bb33f3d40db5b6687c431bf7eb43be37c83bac58670cbe1155fa30058674a20668104defb26e09a12c1429a4c58d046295ddf7113
-EBUILD picom-9999.ebuild 1096 BLAKE2B 7c79067573673bbd8a1f4a5b9a657bc455d27a546ed13b6d8d3b6020a549db058e28b8645598ccc6900d86604b8550a19dc230c463959bea114957dcdca04bb3 SHA512 173699c0b8c2ac442ba83e6366c5f343b0f842843cbd640da53fd96f0910e225d9a5532016282150e13df976c7f13d42bbf355bf31f17f7fbae738dd89a98d3a
+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
 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 5634d6a6e002..ff42b3981ea5 100644
--- a/x11-misc/picom/picom-8-r1.ebuild
+++ b/x11-misc/picom/picom-8-r1.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
 	x11-libs/xcb-util-renderutil
 	config-file? (
 		dev-libs/libconfig:=
-		dev-libs/libxdg-basedir
 	)
 	dbus? ( sys-apps/dbus )
 	drm? ( x11-libs/libdrm )
diff --git a/x11-misc/picom/picom-8.2-r1.ebuild b/x11-misc/picom/picom-8.2-r1.ebuild
deleted file mode 100644
index 2fae5bbe96d7..000000000000
--- a/x11-misc/picom/picom-8.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-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"
-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
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/pixman
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-renderutil
-	config-file? (
-		dev-libs/libconfig:=
-		dev-libs/libxdg-basedir
-	)
-	dbus? ( sys-apps/dbus )
-	drm? ( x11-libs/libdrm )
-	opengl? ( virtual/opengl )
-	pcre? ( dev-libs/libpcre )
-	!x11-misc/compton"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig
-	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 with_docs)
-		$(meson_use opengl)
-		$(meson_use pcre regex)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}"
-}
diff --git a/x11-misc/picom/picom-8.2-r2.ebuild b/x11-misc/picom/picom-8.2-r2.ebuild
index 705966851270..b0f968999550 100644
--- a/x11-misc/picom/picom-8.2-r2.ebuild
+++ b/x11-misc/picom/picom-8.2-r2.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
 	x11-libs/xcb-util-renderutil
 	config-file? (
 		dev-libs/libconfig:=
-		dev-libs/libxdg-basedir
 	)
 	dbus? ( sys-apps/dbus )
 	drm? ( x11-libs/libdrm )
diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
index 00061878b52a..ae0a2c9641a2 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-9999.ebuild
@@ -24,7 +24,6 @@ RDEPEND="dev-libs/libev
 	x11-libs/xcb-util-renderutil
 	config-file? (
 		dev-libs/libconfig:=
-		dev-libs/libxdg-basedir
 	)
 	dbus? ( sys-apps/dbus )
 	drm? ( x11-libs/libdrm )