From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- x11-misc/picom/Manifest | 6 ++-- x11-misc/picom/metadata.xml | 1 + x11-misc/picom/picom-7.5-r1.ebuild | 64 ++++++++++++++++++++++++++++++++++++++ x11-misc/picom/picom-7.5.ebuild | 63 ------------------------------------- x11-misc/picom/picom-9999.ebuild | 7 +++-- 5 files changed, 72 insertions(+), 69 deletions(-) create mode 100644 x11-misc/picom/picom-7.5-r1.ebuild delete mode 100644 x11-misc/picom/picom-7.5.ebuild (limited to 'x11-misc/picom') diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest index a04e33105123..8c4bed07146a 100644 --- a/x11-misc/picom/Manifest +++ b/x11-misc/picom/Manifest @@ -1,5 +1,5 @@ AUX picom-7.5-no_opengl.patch 680 BLAKE2B d0d0e9cf752ac003bc312b736dd64388924b6a0371180da0aac7578a85b988c554c7d30a4e419b930775020b99480fed2c1fbd95868989c94ad9997727fdacfc SHA512 b15c5a471bf343667d3fbc14d16d04789eaadcb2cb906668f6235a085c3a91c2bf0e1f0822a5dc5bab5272ca7b1dd3de97087faa6916526ca49e703ae69772d1 DIST picom-7.5.tar.gz 219456 BLAKE2B 54113547b575ad6aa1329e92ae331b7d49207fdcdc6b49d31d8ab125f7335730a7e53b260c6a6c33d5350bec1e9e6357fd34023dc7837de165289446f8f492b8 SHA512 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a -EBUILD picom-7.5.ebuild 1319 BLAKE2B 3eedb0c1c067387f223bee4876ef26d6a4398edfe799ddb8e0863fbc95b7710473a7c1221e74d130ac24f60b567c6d64f53b8c13d4f058b159297a56a5207b10 SHA512 d83a6f837462b0853f9ff0e42497440be1008914209ee609cf48c0e96bec1531d79155192dcf5621b5ade55fb9e837d789ec93a8dcb68808fb93fb388ab82c36 -EBUILD picom-9999.ebuild 1037 BLAKE2B e56f67c6bfaddb20669f4a298cdafbb96870757ce2ac9659b05758f82c8dc893f3188b606150b859b7def9c61abc9acf20b2c62d4b4a623fb3c3dd841ee8e88a SHA512 3102f7c837005513855a3ca06d4f219cf3fe816b1e546e9c0e98f913fef6acb980979efcd5b1decd759f799ee2178a9b37a2bb5487caecbbd57a7365a27dbb4a -MISC metadata.xml 577 BLAKE2B 03bf133766c29ef57009d5f5ccec8d6557dbf2acde1a234dadcd6a49fdb20f0b59c2dc4c6aaca4dc9f668e31d067e98491916c040c1992e6e845c0efae9dda10 SHA512 46f801d5a03d4dd377232a866a40d90316f5f93746cdb89e179df65c0dc333d338e49070dcc5f49eeac6625c1376c678fbdc326e140902c0bb28cff4ea4c515b +EBUILD picom-7.5-r1.ebuild 1337 BLAKE2B b182183e4f925658e829d85e5f8ac7338e1163c7346fff50659a92a713ed97a3a215b0cbc018732144920c9823b365e7a7ceb9b1e598df38fbbd2d769d0d73e2 SHA512 81d006790296018f0057098f9485a74f25b867a1685a189f7b26a1f43bdab80539aeef41c35d6a4a5d381f399bf84e5c1df5c08c6ba7da488295b8c69649592c +EBUILD picom-9999.ebuild 1057 BLAKE2B e5d700777b0e76cbec5967e0149f61842c79de34372f861fe9ea0256d079aa20004a6f77eeba74655f9e63de8b24e9548816dae5a12648bf7fa0a8410da086fe SHA512 9e60499fcb059bbc8a846ca532daf07ba0cc02e7b56fbf956a5f52a3b84cd75e1049349be779f5ba31f87275ca6010a9df8f3f5fdbc0b45df4df0aef76613e4d +MISC metadata.xml 677 BLAKE2B 3d9d1ca23a81c30ac451c45ecad35c3cfbc63ea0a1d5c2cfed587990b33158ca8b3c188fe611aa51b77d2c66a270f8cc95ea5f38cb6270bd1ebf92411cb8ba8f SHA512 9a77cc79578426ae9e1e89e471d4368ef662f3bff757015d4cb48f08e2cbec446753ad16233bafde8ae1c61da0ec1bbd8539534c6097c7525c5905532c8cc9a5 diff --git a/x11-misc/picom/metadata.xml b/x11-misc/picom/metadata.xml index 1cda4a2c157c..4cd1bd6f8bcb 100644 --- a/x11-misc/picom/metadata.xml +++ b/x11-misc/picom/metadata.xml @@ -7,6 +7,7 @@ Enable config file support + Build documentation and man pages (requires app-text/asciidoc) Enable support for using drm for vsync Enable features that require opengl (opengl backend, and opengl vsync methods) diff --git a/x11-misc/picom/picom-7.5-r1.ebuild b/x11-misc/picom/picom-7.5-r1.ebuild new file mode 100644 index 000000000000..23b072007fae --- /dev/null +++ b/x11-misc/picom/picom-7.5-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit meson python-r1 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 ~x86" +IUSE="+config-file dbus +doc +drm opengl pcre" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + 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 )" + +PATCHES=( + "${FILESDIR}"/${P}-no_opengl.patch + ) + +src_configure() { + local emesonargs=( + $(meson_use config-file config_file) + $(meson_use dbus) + $(meson_use doc build_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 +} diff --git a/x11-misc/picom/picom-7.5.ebuild b/x11-misc/picom/picom-7.5.ebuild deleted file mode 100644 index 5c07720ed5f7..000000000000 --- a/x11-misc/picom/picom-7.5.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7,8} ) -inherit meson python-r1 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 ~x86" -IUSE="+config-file dbus doc +drm opengl pcre" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - 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 )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig - doc? ( app-text/asciidoc )" - -PATCHES=( - "${FILESDIR}"/${P}-no_opengl.patch - ) - -src_configure() { - local emesonargs=( - $(meson_use config-file config_file) - $(meson_use dbus) - $(meson_use doc build_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 -} diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild index 2141a6126a2d..34d4a6e2fb59 100644 --- a/x11-misc/picom/picom-9999.ebuild +++ b/x11-misc/picom/picom-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ 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" RDEPEND="dev-libs/libev dev-libs/uthash @@ -29,7 +29,8 @@ RDEPEND="dev-libs/libev dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) - pcre? ( dev-libs/libpcre )" + pcre? ( dev-libs/libpcre ) + !x11-misc/compton" DEPEND="${RDEPEND} x11-base/xorg-proto" BDEPEND="virtual/pkgconfig -- cgit v1.2.3