gentoo resync : 15.01.2020

3 files changed, 3 insertions, 70 deletions

diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index 4b0c108815f3..0e5318dc922b 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,4 +1,3 @@
 DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535
-EBUILD compton-0.1_beta2.ebuild 1616 BLAKE2B a90f758aca2f89ba4ed9186d23fe54b654a7d256bd64e14024bb0f62ca353145360383990f035334397edeabe95927c377d4a93e2d1e8f954baaf969f0f3f808 SHA512 00bfd8b08b6752b250ebd1dc7695dc118cac68b64a04d3ec20967c69b4143eec61f97d6032e72c1cb92bca46c3ad6884bb1dd3c631629eee5607eba0e26062a6
-EBUILD compton-9999.ebuild 1532 BLAKE2B 5d057277a01c432d816b0198b79363215a1e342854d7d65feaf3e53b6d94ec38841a47729799b7ac71e06c7620c31532f9f2800bea7977d6b4156b46b61ae923 SHA512 cf6f7d09ee30d94f400eb5aa608a915913e0b20b5b461d03aa6d9e05b4c825abec091cbe0a0a6fe78d80cdd491358a79b5ad83bb52315df53ef4641bc18cfe88
+EBUILD compton-0.1_beta2.ebuild 1612 BLAKE2B c2bb025332d6e10ad0b8e9f862b2276f70d9ba8ff4001659a961424859d3615837e40be4c1da718f2c7d710760a227a18260c6cadadbcf21efe8c43dabdb01ce SHA512 9602222cc536892d0f1538b59bb768b379f093eb45641fb362f28ff5013dee6e8715039f0256ef075706998871ce06bdb9673d9edf748abb1004926aa1a5cf5c
 MISC metadata.xml 484 BLAKE2B 903744ba49b9aaae86cec59c83f96f02da325d17813d6ceaedd88eab1450ae76eac7a40c9e1b44086651efd21e5580b605b9095925625fa3bb1e6c708ed8809f SHA512 d01d17901f47f7e2c0201c0a6665d0e27693ac42b27ef8dce8a78763ec775a41fed88b4565db434351a2c9d01e762121bca3f347f467e77e71bde66f019640cb
diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild
index 74466afd44e4..feff59e96fab 100644
--- a/x11-misc/compton/compton-0.1_beta2.ebuild
+++ b/x11-misc/compton/compton-0.1_beta2.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=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit toolchain-funcs python-r1
 
 DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
diff --git a/x11-misc/compton/compton-9999.ebuild b/x11-misc/compton/compton-9999.ebuild
deleted file mode 100644
index 0c8bdd5513e1..000000000000
--- a/x11-misc/compton/compton-9999.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit toolchain-funcs python-r1 git-r3
-
-DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
-HOMEPAGE="https://github.com/chjj/compton"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/chjj/compton.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="dbus +drm opengl +pcre xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/libconfig:=
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	dbus? ( sys-apps/dbus )
-	opengl? ( virtual/opengl )
-	pcre? ( dev-libs/libpcre:3 )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xprop
-	x11-apps/xwininfo"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	drm? ( x11-libs/libdrm )"
-
-nobuildit() { use $1 || echo yes ; }
-
-src_compile() {
-	tc-export CC
-	emake docs
-
-	NO_DBUS=$(nobuildit dbus) \
-	NO_XINERAMA=$(nobuildit xinerama) \
-	NO_VSYNC_DRM=$(nobuildit drm) \
-	NO_VSYNC_OPENGL=$(nobuildit opengl) \
-	NO_REGEX_PCRE=$(nobuildit pcre) \
-		emake compton
-}
-
-src_install() {
-	NO_DBUS=$(nobuildit dbus) \
-	NO_VSYNC_DRM=$(nobuildit drm) \
-	NO_VSYNC_OPENGL=$(nobuildit opengl) \
-	NO_REGEX_PCRE=$(nobuildit pcre) \
-		default
-	docinto examples
-	dodoc compton.sample.conf dbus-examples/*
-	python_foreach_impl python_newscript bin/compton-convgen.py compton-convgen
-}