commit: 63e84c8efc156cbbe07582eaac96fd2fee77352f
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 22:31:33 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 22:38:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63e84c8e
x11-wm/xpra: Use single Python implementation, EAPI 7
Package-Manager: Portage-3.0.14, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/xpra-4.0.6_p28363.ebuild | 64 ++++++++++++++++++++++--------------
1 file changed, 40 insertions(+), 24 deletions(-)
diff --git a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
index 22424531d4a..01ec69226da 100644
--- a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
+++ b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
@@ -1,11 +1,12 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 eutils tmpfiles prefix
+inherit xdg distutils-r1 tmpfiles prefix
MY_P="${PN}-${PV%_p*}"
DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based
on wimpiggy"
@@ -23,8 +24,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
opengl? ( client )
"
-COMMON_DEPEND="${PYTHON_DEPS}
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+DEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+ opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+ sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+ ')
x11-libs/gtk+:3[introspection]
x11-libs/libX11
x11-libs/libXcomposite
@@ -37,40 +43,50 @@ COMMON_DEPEND="${PYTHON_DEPS}
csc? ( >=media-video/ffmpeg-1.2.2:0= )
ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
jpeg? ( media-libs/libjpeg-turbo )
- opengl? ( dev-python/pyopengl )
pulseaudio? (
media-sound/pulseaudio
media-plugins/gst-plugins-pulse:1.0
)
- sound? ( media-libs/gstreamer:1.0
+ sound? (
+ media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
- dev-python/gst-python:1.0 )
+ )
vpx? ( media-libs/libvpx media-video/ffmpeg )
webp? ( media-libs/libwebp )
"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+ ${DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/netifaces[${PYTHON_USEDEP}]
+ dev-python/rencode[${PYTHON_USEDEP}]
+ dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+ cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+ lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+ opengl? (
+ client? (
dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+ )
+ webcam? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ media-libs/opencv[${PYTHON_USEDEP},python]
+ )
+ ')
acct-group/xpra
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
virtual/ssh
x11-apps/xmodmap
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
- lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
- lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
- opengl? (
- client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
- )
- server? ( x11-base/xorg-server[-minimal,xvfb]
+ server? (
+ x11-base/xorg-server[-minimal,xvfb]
x11-drivers/xf86-input-void
)
- webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/opencv[python]
- dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
+"
+BDEPEND="
virtual/pkgconfig
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ >=dev-python/cython-0.16[${PYTHON_USEDEP}]
+ ')
+"
RESTRICT="!test? ( test )"
